Ic2 support testing

This commit is contained in:
aidancbrady committed 2016-07-02 16:29:50 -04:00
1 parent aa9b9fafb0
commit dff99a764f
4 files changed
+9 -18

No files matched your search

@@ -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")
@@ -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 {
@@ -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
{
@@ -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;
}