Merge pull request #17 from GTNewHorizons/fatalinfo

Replace fatal log with info

dependencies.gradle

@@ -3,23 +3,23 @@
 dependencies {
     api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
 
-    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-213-GTNH:dev") {
+    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-290-GTNH:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:waila:1.6.0:dev") {
+    compileOnly("com.github.GTNewHorizons:waila:1.6.5:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.3.53-GTNH:dev") {
+    compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.4.12-GTNH:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:OpenComputers:1.9.5-GTNH:dev") {
+    compileOnly("com.github.GTNewHorizons:OpenComputers:1.9.19-GTNH:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.43.39:dev") {
+    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.91:dev") {
         transitive = false
     }
 
-    compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.33:dev") {
+    compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.37:dev") {
         transitive = false
     }
     compileOnly("curse.maven:bigreactors-241994:2282591") {

repositories.gradle

@@ -1,22 +1,4 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
-    maven {
-        name = "GTNH Maven"
-        url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-    }
-    maven {
-        name = "ic2"
-        url = "https://maven.ic2.player.to/"
-        metadataSources {
-            mavenPom()
-            artifact()
-        }
-    }
-    maven {
-        url "https://cursemaven.com"
-    }
-    maven {
-        url = "https://jitpack.io"
-    }
 }

src/main/java/shedar/mods/ic2/nuclearcontrol/CommonProxy.java

@@ -14,7 +14,17 @@
 import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.Subblock;
 import shedar.mods.ic2.nuclearcontrol.containers.ContainerRemoteMonitor;
 import shedar.mods.ic2.nuclearcontrol.gui.GuiRemoteMonitor;
-import shedar.mods.ic2.nuclearcontrol.tileentities.*;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAdvancedInfoPanel;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAdvancedInfoPanelExtender;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityHowlerAlarm;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityIndustrialAlarm;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanelExtender;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityRangeTrigger;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityRemoteThermo;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityThermo;
 
 public class CommonProxy implements IGuiHandler {
 

src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java

@@ -31,7 +31,24 @@
 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.*;
+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.network.ChannelHandler;
 import shedar.mods.ic2.nuclearcontrol.panel.ScreenManager;
 import shedar.mods.ic2.nuclearcontrol.recipes.RecipesNew;

src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/BlockNuclearControlMain.java

@@ -37,15 +37,30 @@
 import ic2.api.tile.IWrenchable;
 import ic2.core.item.tool.ItemToolPainter;
 import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl;
-import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.*;
+import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.AdvancedInfoPanel;
+import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.AdvancedInfoPanelExtender;
+import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.AverageCounter;
+import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.EnergyCounter;
+import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.HowlerAlarm;
+import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.IndustrialAlarm;
+import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.InfoPanel;
+import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.InfoPanelExtender;
+import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.RangeTrigger;
+import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.RemoteThermo;
+import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.Subblock;
+import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.ThermalMonitor;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityHowlerAlarm;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityIndustrialAlarm;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanelExtender;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityRangeTrigger;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityRemoteThermo;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityThermo;
-import shedar.mods.ic2.nuclearcontrol.utils.*;
+import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages;
+import shedar.mods.ic2.nuclearcontrol.utils.DyeUtil;
+import shedar.mods.ic2.nuclearcontrol.utils.NuclearHelper;
+import shedar.mods.ic2.nuclearcontrol.utils.RedstoneHelper;
+import shedar.mods.ic2.nuclearcontrol.utils.WrenchHelper;
 
 public class BlockNuclearControlMain extends BlockContainer {
 

src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/CrossTE.java

@@ -14,7 +14,7 @@ public class CrossTE {
     public static void intergrateTE() {
         if (Loader.isModLoaded(ModLib.TE) || Loader.isModLoaded(ModLib.ENDER_IO)) {
             registerThermalExpansion();
-            NCLog.fatal("Another Energy System is Loaded. Adding Intergration!");
+            NCLog.info("Another Energy System is Loaded. Adding Intergration!");
         }
     }
 

src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverInfoPanel.java

@@ -9,7 +9,6 @@
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
 import li.cil.oc.integration.ManagedTileEntityEnvironment;
-import shedar.mods.ic2.nuclearcontrol.crossmod.opencomputers.DriverAdvancedInfoPanel.Environment;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel;
 
 /**

src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverThermalMonitor.java

@@ -9,7 +9,6 @@
 import li.cil.oc.api.network.ManagedEnvironment;
 import li.cil.oc.api.prefab.DriverTileEntity;
 import li.cil.oc.integration.ManagedTileEntityEnvironment;
-import shedar.mods.ic2.nuclearcontrol.crossmod.opencomputers.DriverInfoPanel.Environment;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityThermo;
 
 public class DriverThermalMonitor extends DriverTileEntity {

src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/CrossWaila.java

@@ -1,7 +1,11 @@
 package shedar.mods.ic2.nuclearcontrol.crossmod.waila;
 
 import mcp.mobius.waila.api.IWailaRegistrar;
-import shedar.mods.ic2.nuclearcontrol.tileentities.*;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityHowlerAlarm;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityThermo;
 
 public class CrossWaila {
 

src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardEnergySensorLocation.java

@@ -13,7 +13,12 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import shedar.mods.ic2.nuclearcontrol.api.*;
+import shedar.mods.ic2.nuclearcontrol.api.CardState;
+import shedar.mods.ic2.nuclearcontrol.api.ICardWrapper;
+import shedar.mods.ic2.nuclearcontrol.api.IRangeTriggerable;
+import shedar.mods.ic2.nuclearcontrol.api.IRemoteSensor;
+import shedar.mods.ic2.nuclearcontrol.api.PanelSetting;
+import shedar.mods.ic2.nuclearcontrol.api.PanelString;
 import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData;
 import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl;
 import shedar.mods.ic2.nuclearcontrol.utils.EnergyStorageHelper;

src/main/java/shedar/mods/ic2/nuclearcontrol/network/ChannelHandler.java

@@ -3,7 +3,22 @@
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import cpw.mods.fml.relauncher.Side;
-import shedar.mods.ic2.nuclearcontrol.network.message.*;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketAcounter;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketAlarm;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketChat;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketClientColor;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketClientDisplaySettings;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketClientRangeTrigger;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketClientRemoteMonitor;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketClientRequest;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketClientSensor;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketClientSound;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketDispSettingsAll;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketDispSettingsUpdate;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketEncounter;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketSensor;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketSensorTitle;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketServerUpdate;
 
 public class ChannelHandler {
 

src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientRemoteMonitor.java

@@ -1,6 +1,10 @@
 package shedar.mods.ic2.nuclearcontrol.network.message;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;

src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityRangeTrigger.java

@@ -26,7 +26,10 @@
 import shedar.mods.ic2.nuclearcontrol.IRotation;
 import shedar.mods.ic2.nuclearcontrol.ISlotItemFilter;
 import shedar.mods.ic2.nuclearcontrol.ITextureHelper;
-import shedar.mods.ic2.nuclearcontrol.api.*;
+import shedar.mods.ic2.nuclearcontrol.api.CardState;
+import shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource;
+import shedar.mods.ic2.nuclearcontrol.api.IRangeTriggerable;
+import shedar.mods.ic2.nuclearcontrol.api.IRemoteSensor;
 import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.RangeTrigger;
 import shedar.mods.ic2.nuclearcontrol.items.ItemUpgrade;
 import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl;

src/main/java/shedar/mods/ic2/nuclearcontrol/utils/NuclearNetworkHelper.java

@@ -14,7 +14,19 @@
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import shedar.mods.ic2.nuclearcontrol.network.ChannelHandler;
-import shedar.mods.ic2.nuclearcontrol.network.message.*;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketAcounter;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketChat;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketClientColor;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketClientDisplaySettings;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketClientRangeTrigger;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketClientRequest;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketClientSensor;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketClientSound;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketDispSettingsAll;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketDispSettingsUpdate;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketEncounter;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketSensor;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketSensorTitle;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel;