From e20d6e4a1d7bc1f7335023bfdabbc619cb037a99 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Tue, 13 Sep 2022 18:42:57 +0200 Subject: [PATCH 1/2] remove dev capes they aren't found in the full pack anyways --- .../mods/ic2/nuclearcontrol/ClientProxy.java | 9 +---- .../nuclearcontrol/ConfigurationHandler.java | 2 +- .../ic2/nuclearcontrol/IC2NuclearControl.java | 39 ++++--------------- 3 files changed, 9 insertions(+), 41 deletions(-) diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java index e27a09ec..431964ad 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java @@ -6,12 +6,9 @@ package shedar.mods.ic2.nuclearcontrol; import com.jadarstudios.developercapes.DevCapes; - import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -22,10 +19,6 @@ import shedar.mods.ic2.nuclearcontrol.renderers.TileEntityIC2ThermoRenderer; import shedar.mods.ic2.nuclearcontrol.renderers.TileEntityInfoPanelRenderer; import shedar.mods.ic2.nuclearcontrol.renderers.TileEntityRemoteThermoRenderer; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; - -import java.net.MalformedURLException; -import java.net.URL; public class ClientProxy extends CommonProxy { @@ -67,7 +60,7 @@ public static EntityPlayer getPlayer() { return Minecraft.getMinecraft().thePlayer; } - public void cape(){ + public void cape() { try { Class.forName("com.jadarstudios.developercapes.DevCapes"); registerSupporterCapes(); diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/ConfigurationHandler.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/ConfigurationHandler.java index 37ce60fc..50da5364 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/ConfigurationHandler.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/ConfigurationHandler.java @@ -27,7 +27,7 @@ private void loadConfiguration() { IC2NuclearControl.instance.dataRefreshPeriod = configuration.get(Configuration.CATEGORY_GENERAL, "sensorDataRefreshPeriod", 4, "can not be longer than infoPanelRefreshPeriod [default: 4]").getInt(); IC2NuclearControl.instance.rangeTriggerRefreshPeriod = configuration.get(Configuration.CATEGORY_GENERAL, "rangeTriggerRefreshPeriod", 20).getInt(); IC2NuclearControl.instance.SMPMaxAlarmRange = configuration.get(Configuration.CATEGORY_GENERAL, "SMPMaxAlarmRange", 256).getInt(); - IC2NuclearControl.instance.disableCapes = configuration.get(Configuration.CATEGORY_GENERAL, "disableCapes", false).getBoolean(false); + IC2NuclearControl.instance.disableCapes = configuration.get(Configuration.CATEGORY_GENERAL, "disableCapes", true).getBoolean(false); //IC2NuclearControl.isHttpSensorAvailableClient = configuration.getBoolean("isHttpSensorAvailableClient", Configuration.CATEGORY_GENERAL, false, "Turns on/off the recipes for the web upgrade client side"); //IC2NuclearControl.isHttpSensorAvailableServer = configuration.getBoolean("isHttpSensorAvailableServer", Configuration.CATEGORY_GENERAL, true, "Turns on/off the recipes for the web upgrade server side"); //IC2NuclearControl.instance.httpSensorKey = configuration.get(Configuration.CATEGORY_GENERAL, "httpSensorKey", UUID.randomUUID().toString().replace("-", "")).getString(); diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java index 03900eb2..0136e9ea 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java @@ -12,18 +12,12 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; -import java.io.File; -import java.util.List; - import net.minecraft.item.Item; import net.minecraftforge.common.MinecraftForge; - import org.apache.logging.log4j.Logger; - import shedar.mods.ic2.nuclearcontrol.blocks.BlockNuclearControlLight; import shedar.mods.ic2.nuclearcontrol.blocks.BlockNuclearControlMain; import shedar.mods.ic2.nuclearcontrol.crossmod.CrossModLoader; -import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib; import shedar.mods.ic2.nuclearcontrol.crossmod.RF.CrossBuildcraft; import shedar.mods.ic2.nuclearcontrol.crossmod.RF.CrossRF; import shedar.mods.ic2.nuclearcontrol.crossmod.gregtech.CrossGregTech; @@ -32,29 +26,15 @@ import shedar.mods.ic2.nuclearcontrol.crossmod.ic2.IC2Type; import shedar.mods.ic2.nuclearcontrol.crossmod.opencomputers.CrossOpenComputers; import shedar.mods.ic2.nuclearcontrol.crossmod.railcraft.CrossRailcraft; -import shedar.mods.ic2.nuclearcontrol.items.ItemCard55Reactor; -import shedar.mods.ic2.nuclearcontrol.items.ItemCardEnergyArrayLocation; -import shedar.mods.ic2.nuclearcontrol.items.ItemCardEnergySensorLocation; -import shedar.mods.ic2.nuclearcontrol.items.ItemCardLiquidArrayLocation; -import shedar.mods.ic2.nuclearcontrol.items.ItemCardMultipleSensorLocation; -import shedar.mods.ic2.nuclearcontrol.items.ItemCardReactorSensorLocation; -import shedar.mods.ic2.nuclearcontrol.items.ItemCardText; -import shedar.mods.ic2.nuclearcontrol.items.ItemKitEnergySensor; -import shedar.mods.ic2.nuclearcontrol.items.ItemKitMultipleSensor; -import shedar.mods.ic2.nuclearcontrol.items.ItemKitReactorSensor; -import shedar.mods.ic2.nuclearcontrol.items.ItemNuclearControlLight; -import shedar.mods.ic2.nuclearcontrol.items.ItemNuclearControlMain; -import shedar.mods.ic2.nuclearcontrol.items.ItemPanelMemoryCard; -import shedar.mods.ic2.nuclearcontrol.items.ItemRemoteMonitor; -import shedar.mods.ic2.nuclearcontrol.items.ItemTimeCard; -import shedar.mods.ic2.nuclearcontrol.items.ItemToolDigitalThermometer; -import shedar.mods.ic2.nuclearcontrol.items.ItemToolThermometer; -import shedar.mods.ic2.nuclearcontrol.items.ItemUpgrade; +import shedar.mods.ic2.nuclearcontrol.items.*; import shedar.mods.ic2.nuclearcontrol.network.ChannelHandler; import shedar.mods.ic2.nuclearcontrol.panel.ScreenManager; import shedar.mods.ic2.nuclearcontrol.recipes.RecipesNew; import shedar.mods.ic2.nuclearcontrol.recipes.RecipesOld; +import java.io.File; +import java.util.List; + @Mod(modid = "IC2NuclearControl", name = "Nuclear Control 2", version = "GRADLETOKEN_VERSION", dependencies = "required-after:IC2; after:gregtech;", guiFactory = "shedar.mods.ic2.nuclearcontrol.gui.GuiFactory") @@ -171,10 +151,7 @@ protected void registerBlocks() { public void preInit(FMLPreInitializationEvent event) { isThorfusionLoaded = Loader.isModLoaded("thorfusion"); logger = event.getModLog(); - if (event.getSide() == Side.CLIENT) - isServer = false; - else - isServer = true; + isServer = event.getSide() != Side.CLIENT; // Loads configuration config = new ConfigurationHandler(); @@ -212,10 +189,8 @@ public void init(FMLInitializationEvent event) { @EventHandler public void postInit(FMLPostInitializationEvent event) { //proxy, tilentity - if (!isThorfusionLoaded) { - if (!disableCapes) { - proxy.cape(); - } + if (!isThorfusionLoaded && !disableCapes) { + proxy.cape(); } CrossModLoader.postinit(); crossBC = new CrossBuildcraft(); From 34d2a90463997bb1cd2ef873138b083aa3e1cb65 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Tue, 13 Sep 2022 18:51:18 +0200 Subject: [PATCH 2/2] GTNH admin said remove it --- .../mods/ic2/nuclearcontrol/ClientProxy.java | 14 -------------- .../ic2/nuclearcontrol/ConfigurationHandler.java | 1 - .../mods/ic2/nuclearcontrol/IC2NuclearControl.java | 4 ---- 3 files changed, 19 deletions(-) diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java index 431964ad..421d8a12 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java @@ -5,7 +5,6 @@ */ package shedar.mods.ic2.nuclearcontrol; -import com.jadarstudios.developercapes.DevCapes; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.registry.GameRegistry; @@ -59,17 +58,4 @@ public Object getClientGuiElement(int ID, EntityPlayer player, World world, int public static EntityPlayer getPlayer() { return Minecraft.getMinecraft().thePlayer; } - - public void cape() { - try { - Class.forName("com.jadarstudios.developercapes.DevCapes"); - registerSupporterCapes(); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - } - - private void registerSupporterCapes() { - DevCapes.getInstance().registerConfig("https://raw.githubusercontent.com/xbony2/xbony2.github.io/master/cape.json"); - } } diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/ConfigurationHandler.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/ConfigurationHandler.java index 50da5364..ffb26fe7 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/ConfigurationHandler.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/ConfigurationHandler.java @@ -27,7 +27,6 @@ private void loadConfiguration() { IC2NuclearControl.instance.dataRefreshPeriod = configuration.get(Configuration.CATEGORY_GENERAL, "sensorDataRefreshPeriod", 4, "can not be longer than infoPanelRefreshPeriod [default: 4]").getInt(); IC2NuclearControl.instance.rangeTriggerRefreshPeriod = configuration.get(Configuration.CATEGORY_GENERAL, "rangeTriggerRefreshPeriod", 20).getInt(); IC2NuclearControl.instance.SMPMaxAlarmRange = configuration.get(Configuration.CATEGORY_GENERAL, "SMPMaxAlarmRange", 256).getInt(); - IC2NuclearControl.instance.disableCapes = configuration.get(Configuration.CATEGORY_GENERAL, "disableCapes", true).getBoolean(false); //IC2NuclearControl.isHttpSensorAvailableClient = configuration.getBoolean("isHttpSensorAvailableClient", Configuration.CATEGORY_GENERAL, false, "Turns on/off the recipes for the web upgrade client side"); //IC2NuclearControl.isHttpSensorAvailableServer = configuration.getBoolean("isHttpSensorAvailableServer", Configuration.CATEGORY_GENERAL, true, "Turns on/off the recipes for the web upgrade server side"); //IC2NuclearControl.instance.httpSensorKey = configuration.get(Configuration.CATEGORY_GENERAL, "httpSensorKey", UUID.randomUUID().toString().replace("-", "")).getString(); diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java index 0136e9ea..9c911d4e 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java @@ -95,7 +95,6 @@ public class IC2NuclearControl { public int screenRefreshPeriod; public int dataRefreshPeriod; public int rangeTriggerRefreshPeriod; - public boolean disableCapes; public String recipes; public CrossBuildcraft crossBC; @@ -189,9 +188,6 @@ public void init(FMLInitializationEvent event) { @EventHandler public void postInit(FMLPostInitializationEvent event) { //proxy, tilentity - if (!isThorfusionLoaded && !disableCapes) { - proxy.cape(); - } CrossModLoader.postinit(); crossBC = new CrossBuildcraft(); crossRailcraft = new CrossRailcraft();