diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 708189904..2a3f7c906 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -13,7 +13,6 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismItems; import mekanism.common.Resource; import mekanism.common.multipart.TransmitterType; -//import mekanism.common.multipart.TransmitterType; import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.MekanismUtils; import net.minecraft.init.Items; @@ -69,8 +68,6 @@ public final class MekanismHooks { loadCCPeripheralProviders(); } - - } @Method(modid = "IC2") diff --git a/src/main/java/codechicken/core/launch/DepLoader.java b/src/main/java/mekanism/common/launch/DepLoader.java similarity index 99% rename from src/main/java/codechicken/core/launch/DepLoader.java rename to src/main/java/mekanism/common/launch/DepLoader.java index b9eab1105..4adb396b4 100644 --- a/src/main/java/codechicken/core/launch/DepLoader.java +++ b/src/main/java/mekanism/common/launch/DepLoader.java @@ -1,4 +1,4 @@ -package codechicken.core.launch; +package mekanism.common.launch; import java.awt.Desktop; import java.awt.Dialog.ModalityType; @@ -63,7 +63,7 @@ import com.google.gson.JsonParser; */ public class DepLoader implements IFMLLoadingPlugin, IFMLCallHook { private static ByteBuffer downloadBuffer = ByteBuffer.allocateDirect(1 << 23); - private static final String owner = "CB's DepLoader"; + private static final String owner = "Mekanism DepLoader"; private static DepLoadInst inst; public interface IDownloadDisplay { diff --git a/src/main/java/mekanism/common/asm/LoadingHook.java b/src/main/java/mekanism/common/launch/LoadingHook.java similarity index 88% rename from src/main/java/mekanism/common/asm/LoadingHook.java rename to src/main/java/mekanism/common/launch/LoadingHook.java index 50c46d447..890519742 100644 --- a/src/main/java/mekanism/common/asm/LoadingHook.java +++ b/src/main/java/mekanism/common/launch/LoadingHook.java @@ -1,9 +1,8 @@ -package mekanism.common.asm; +package mekanism.common.launch; import java.util.Map; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; -import codechicken.core.launch.DepLoader; public class LoadingHook implements IFMLLoadingPlugin { diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 8048c4b67..d8f19c4ba 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -1,10 +1,5 @@ package mekanism.common.util; -import ic2.api.energy.EnergyNet; -import ic2.api.energy.tile.IEnergySink; -import ic2.api.energy.tile.IEnergySource; -import ic2.api.energy.tile.IEnergyTile; - import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -131,7 +126,7 @@ public final class CableUtils return true; } - if(MekanismUtils.useIC2()) + /*if(MekanismUtils.useIC2()) { IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos()); @@ -139,7 +134,7 @@ public final class CableUtils { return true; } - } + }*/ return false; } @@ -162,7 +157,7 @@ public final class CableUtils { return true; } - else if(MekanismUtils.useIC2()) + /*else if(MekanismUtils.useIC2()) { IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos()); @@ -173,7 +168,7 @@ public final class CableUtils return true; } } - } + }*/ else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver) { if(((IEnergyReceiver)tileEntity).canConnectEnergy(side.getOpposite())) @@ -285,7 +280,7 @@ public final class CableUtils sent += used*general.FROM_RF; } } - else if(MekanismUtils.useIC2()) + /*else if(MekanismUtils.useIC2()) { IEnergyTile tile = EnergyNet.instance.getSubTile(tileEntity.getWorld(), tileEntity.getPos()); @@ -295,7 +290,7 @@ public final class CableUtils toSend = Math.min(Math.min(toSend, ((IEnergySink)tile).getDemandedEnergy()), Integer.MAX_VALUE); sent += (toSend - (((IEnergySink)tile).injectEnergy(side.getOpposite(), toSend, 0)))*general.FROM_IC2; } - } + }*/ return sent; }