Merge pull request #16 from chochem/bs/sa/deps

Remove DeveloperCapes from deps, also update BS/update deps/spotless apply
GTNewHorizons · May 17, 2023 · b1c74f1 · b1c74f1
2 parents 9c53465 + df24b15
commit b1c74f1
Show file tree

Hide file tree

Showing 117 changed files with 652 additions and 417 deletions.
diff --git a/build.gradle b/build.gradle
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,28 +1,25 @@
 // Add your dependencies here
 
 dependencies {
-    compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
+    api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
 
-    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-70-GTNH:dev") {
+    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-213-GTNH:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:waila:1.5.18:dev") {
+    compileOnly("com.github.GTNewHorizons:waila:1.6.0:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.1.22-GTNH:dev") {
+    compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.3.53-GTNH:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:OpenComputers:1.7.5.20-GTNH:dev") {
+    compileOnly("com.github.GTNewHorizons:OpenComputers:1.9.5-GTNH:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.254:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:DeveloperCapes:master-SNAPSHOT:dev") {
+    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.43.39:dev") {
         transitive = false
     }
 
-    compileOnly("com.mod-buildcraft:buildcraft:7.1.23:dev") {
+    compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.33:dev") {
         transitive = false
     }
     compileOnly("curse.maven:bigreactors-241994:2282591") {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java
@@ -10,15 +10,15 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.client.registry.ClientRegistry;
+import cpw.mods.fml.client.registry.RenderingRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
 import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.Subblock;
 import shedar.mods.ic2.nuclearcontrol.gui.GuiRemoteMonitor;
 import shedar.mods.ic2.nuclearcontrol.renderers.MainBlockRenderer;
 import shedar.mods.ic2.nuclearcontrol.renderers.TileEntityIC2ThermoRenderer;
 import shedar.mods.ic2.nuclearcontrol.renderers.TileEntityInfoPanelRenderer;
 import shedar.mods.ic2.nuclearcontrol.renderers.TileEntityRemoteThermoRenderer;
-import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
 
 public class ClientProxy extends CommonProxy {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientTickHandler.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientTickHandler.java
@@ -24,6 +24,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 public class ClientTickHandler {

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/CommonProxy.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/CommonProxy.java
@@ -9,12 +9,12 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.common.network.IGuiHandler;
+import cpw.mods.fml.common.registry.GameRegistry;
 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 cpw.mods.fml.common.network.IGuiHandler;
-import cpw.mods.fml.common.registry.GameRegistry;
 
 public class CommonProxy implements IGuiHandler {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java
@@ -8,6 +8,18 @@
 
 import org.apache.logging.log4j.Logger;
 
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.Mod.Instance;
+import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
 import shedar.mods.ic2.nuclearcontrol.blocks.BlockNuclearControlLight;
 import shedar.mods.ic2.nuclearcontrol.blocks.BlockNuclearControlMain;
 import shedar.mods.ic2.nuclearcontrol.crossmod.CrossModLoader;
@@ -24,18 +36,6 @@
 import shedar.mods.ic2.nuclearcontrol.panel.ScreenManager;
 import shedar.mods.ic2.nuclearcontrol.recipes.RecipesNew;
 import shedar.mods.ic2.nuclearcontrol.recipes.RecipesOld;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
 
 @Mod(
         modid = "IC2NuclearControl",

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/ServerTickHandler.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/ServerTickHandler.java
@@ -8,10 +8,10 @@
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraftforge.event.world.WorldEvent;
 
-import shedar.mods.ic2.nuclearcontrol.network.ChannelHandler;
-import shedar.mods.ic2.nuclearcontrol.network.message.PacketAlarm;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent;
+import shedar.mods.ic2.nuclearcontrol.network.ChannelHandler;
+import shedar.mods.ic2.nuclearcontrol.network.message.PacketAlarm;
 
 public class ServerTickHandler {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/StorageArrayRecipe.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/StorageArrayRecipe.java
@@ -9,13 +9,13 @@
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.RecipeSorter;
 
+import ic2.api.item.IC2Items;
 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.ItemKitMultipleSensor;
 import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl;
-import ic2.api.item.IC2Items;
 
 public class StorageArrayRecipe implements IRecipe {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/BlockNuclearControlMain.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/BlockNuclearControlMain.java
@@ -32,6 +32,10 @@
 import net.minecraftforge.event.ForgeEventFactory;
 import net.minecraftforge.event.world.BlockEvent.PlaceEvent;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+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.tileentities.TileEntityHowlerAlarm;
@@ -42,10 +46,6 @@
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityRemoteThermo;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityThermo;
 import shedar.mods.ic2.nuclearcontrol.utils.*;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import ic2.api.tile.IWrenchable;
-import ic2.core.item.tool.ItemToolPainter;
 
 public class BlockNuclearControlMain extends BlockContainer {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/subblocks/Subblock.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/subblocks/Subblock.java
@@ -8,8 +8,8 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
-import shedar.mods.ic2.nuclearcontrol.ITextureHelper;
 import ic2.api.tile.IWrenchable;
+import shedar.mods.ic2.nuclearcontrol.ITextureHelper;
 
 public abstract class Subblock {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/CrossModLoader.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/CrossModLoader.java
@@ -1,12 +1,12 @@
 package shedar.mods.ic2.nuclearcontrol.crossmod;
 
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.event.FMLInterModComms;
 import shedar.mods.ic2.nuclearcontrol.crossmod.RF.CrossTE;
 import shedar.mods.ic2.nuclearcontrol.crossmod.appeng.CrossAppeng;
 import shedar.mods.ic2.nuclearcontrol.crossmod.bigreactors.CrossBigReactors;
 import shedar.mods.ic2.nuclearcontrol.crossmod.mekanism.CrossMekanism;
 import shedar.mods.ic2.nuclearcontrol.crossmod.vanilla.Vanilla;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.event.FMLInterModComms;
 
 public class CrossModLoader {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/CrossRF.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/CrossRF.java
@@ -2,12 +2,12 @@
 
 import net.minecraft.tileentity.TileEntity;
 
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.registry.GameRegistry;
 import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData;
 import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter;
 import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.registry.GameRegistry;
 
 public class CrossRF {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/CrossTE.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/CrossTE.java
@@ -2,10 +2,10 @@
 
 import net.minecraft.item.Item;
 
-import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib;
-import shedar.mods.ic2.nuclearcontrol.utils.NCLog;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.GameRegistry;
+import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib;
+import shedar.mods.ic2.nuclearcontrol.utils.NCLog;
 
 public class CrossTE {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/ItemCardRFEnergyLocation.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/ItemCardRFEnergyLocation.java
@@ -10,14 +10,14 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import cofh.api.energy.IEnergyHandler;
 import shedar.mods.ic2.nuclearcontrol.api.CardState;
 import shedar.mods.ic2.nuclearcontrol.api.ICardWrapper;
 import shedar.mods.ic2.nuclearcontrol.api.PanelSetting;
 import shedar.mods.ic2.nuclearcontrol.api.PanelString;
 import shedar.mods.ic2.nuclearcontrol.items.ItemCardEnergySensorLocation;
 import shedar.mods.ic2.nuclearcontrol.utils.LangHelper;
 import shedar.mods.ic2.nuclearcontrol.utils.StringUtils;
-import cofh.api.energy.IEnergyHandler;
 
 public class ItemCardRFEnergyLocation extends ItemCardEnergySensorLocation {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/RFTileEntityAverageCounter.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/RFTileEntityAverageCounter.java
@@ -4,10 +4,10 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData;
-import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter;
 import cofh.api.energy.EnergyStorage;
 import cofh.api.energy.IEnergyHandler;
+import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter;
 
 public class RFTileEntityAverageCounter extends TileEntityAverageCounter implements IEnergyHandler {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/RFTileEntityEnergyCounter.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/RFTileEntityEnergyCounter.java
@@ -4,10 +4,10 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData;
-import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter;
 import cofh.api.energy.EnergyStorage;
 import cofh.api.energy.IEnergyHandler;
+import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData;
+import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter;
 
 public class RFTileEntityEnergyCounter extends TileEntityEnergyCounter implements IEnergyHandler {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/BlockNetworkLink.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/BlockNetworkLink.java
@@ -9,10 +9,10 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl;
 import appeng.tile.networking.TileCableBus;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl;
 
 public class BlockNetworkLink extends BlockContainer {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/CrossAppeng.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/CrossAppeng.java
@@ -3,12 +3,12 @@
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 
-import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl;
-import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib;
-import shedar.mods.ic2.nuclearcontrol.utils.NCLog;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
+import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl;
+import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib;
+import shedar.mods.ic2.nuclearcontrol.utils.NCLog;
 
 public class CrossAppeng {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/ItemCardAppeng.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/ItemCardAppeng.java
@@ -11,14 +11,14 @@
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
+import appeng.tile.crafting.TileCraftingMonitorTile;
 import shedar.mods.ic2.nuclearcontrol.api.CardState;
 import shedar.mods.ic2.nuclearcontrol.api.ICardWrapper;
 import shedar.mods.ic2.nuclearcontrol.api.PanelSetting;
 import shedar.mods.ic2.nuclearcontrol.api.PanelString;
 import shedar.mods.ic2.nuclearcontrol.items.ItemCardEnergySensorLocation;
 import shedar.mods.ic2.nuclearcontrol.utils.LangHelper;
 import shedar.mods.ic2.nuclearcontrol.utils.StringUtils;
-import appeng.tile.crafting.TileCraftingMonitorTile;
 
 public class ItemCardAppeng extends ItemCardEnergySensorLocation {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/ItemKitAppeng.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/ItemKitAppeng.java
@@ -7,10 +7,10 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
+import appeng.block.crafting.BlockCraftingMonitor;
 import shedar.mods.ic2.nuclearcontrol.items.ItemKitEnergySensor;
 import shedar.mods.ic2.nuclearcontrol.utils.ItemStackUtils;
 import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper;
-import appeng.block.crafting.BlockCraftingMonitor;
 
 public class ItemKitAppeng extends ItemKitEnergySensor {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/TileEntityNetworkLink.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/TileEntityNetworkLink.java
@@ -12,7 +12,6 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import shedar.mods.ic2.nuclearcontrol.utils.NCLog;
 import appeng.api.AEApi;
 import appeng.api.implementations.tiles.IChestOrDrive;
 import appeng.api.networking.GridFlags;
@@ -31,6 +30,7 @@
 import appeng.tile.grid.AENetworkTile;
 import appeng.tile.storage.TileChest;
 import appeng.tile.storage.TileDrive;
+import shedar.mods.ic2.nuclearcontrol.utils.NCLog;
 
 public class TileEntityNetworkLink extends AENetworkTile {
 

diff --git a/...java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/BlockActiveReactorInfoFetch.java b/...java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/BlockActiveReactorInfoFetch.java
@@ -9,10 +9,10 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import erogenousbeef.bigreactors.common.multiblock.MultiblockReactor;
+import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl;
 
 public class BlockActiveReactorInfoFetch extends BlockContainer {
 

diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/CrossBigReactors.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/CrossBigReactors.java
@@ -3,14 +3,14 @@
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.registry.GameRegistry;
 import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl;
 import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib;
 import shedar.mods.ic2.nuclearcontrol.crossmod.bigreactors.recipes.BigReactorsRecipesGregtech;
 import shedar.mods.ic2.nuclearcontrol.crossmod.bigreactors.recipes.BigReactorsRecipesNew;
 import shedar.mods.ic2.nuclearcontrol.utils.NCLog;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.registry.GameRegistry;
 
 public class CrossBigReactors {