diff options
Diffstat (limited to 'src/main/java')
4 files changed, 17 insertions, 9 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 1a74b762bb..a2879c16d8 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -29,7 +29,7 @@ import net.minecraft.item.ItemStack; import java.util.List; @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, dependencies = "required-after:Forge@[10.13.4.1614,);" - + "required-after:YAMCore@[0.5.70,);" + "required-after:gregtech;") + + "required-after:YAMCore@[0.5.70,);" + "required-after:gregtech;" + "after:CoFHCore") public class TecTech { @SidedProxy(clientSide = Reference.CLIENTSIDE, serverSide = Reference.SERVERSIDE) @@ -38,13 +38,15 @@ public class TecTech { @Instance(Reference.MODID) public static TecTech instance; + public static LogHelper Logger = new LogHelper(Reference.MODID); private static IngameErrorLog Module_AdminErrorLogs = null; public static GT_CustomLoader GTCustomLoader = null; public static TecTechConfig ModConfig; public static XSTR Rnd = null; - public static LogHelper Logger = new LogHelper(Reference.MODID); public static CreativeTabs mainTab = null; + public static boolean hasCOFH=false; + public static void AddLoginError(String pMessage) { if (Module_AdminErrorLogs != null) Module_AdminErrorLogs.AddErrorLogOnAdminJoin(pMessage); @@ -68,12 +70,13 @@ public class TecTech { @EventHandler public void load(FMLInitializationEvent event) { - proxy.registerRenderInfo(); } @EventHandler public void PostLoad(FMLPostInitializationEvent PostEvent) { + hasCOFH=Loader.isModLoaded(Reference.COFHCORE); + QuantumGlass.run(); debug_container_EM.run(); diff --git a/src/main/java/com/github/technus/tectech/auxiliary/Reference.java b/src/main/java/com/github/technus/tectech/auxiliary/Reference.java index 709ba7f620..7c858dafc8 100644 --- a/src/main/java/com/github/technus/tectech/auxiliary/Reference.java +++ b/src/main/java/com/github/technus/tectech/auxiliary/Reference.java @@ -7,4 +7,5 @@ public class Reference { public static final String COLLECTIONNAME = "TecTech"; public static final String CLIENTSIDE = "com.github.technus.tectech.proxy.ClientProxy"; public static final String SERVERSIDE = "com.github.technus.tectech.proxy.CommonProxy"; + public static final String COFHCORE = "CoFHCore"; } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/rElementalRecipe.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/rElementalRecipe.java index 98f11cb4d4..a1c153b245 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/rElementalRecipe.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/rElementalRecipe.java @@ -7,12 +7,12 @@ import net.minecraftforge.fluids.FluidStack; * Created by Tec on 02.03.2017. */ public class rElementalRecipe implements Comparable<rElementalRecipe> { - public cElementalDefinitionStackTree inEM; - public cElementalDefinitionStackTree outEM; - public ItemStack[] outItems; - public FluidStack[] outFluids; + public final cElementalDefinitionStackTree inEM; + public final cElementalDefinitionStackTree outEM; + public final ItemStack[] outItems; + public final FluidStack[] outFluids; public Object[] extension = null; - private short comparableID=0; + public final short comparableID; public rElementalRecipe( cElementalDefinitionStackTree inEMnotNull, diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java index 90e1bd655c..8cc69930b8 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java @@ -2,9 +2,12 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import cofh.api.energy.IEnergyContainerItem; import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.auxiliary.Reference; import com.github.technus.tectech.elementalMatter.commonValues; import com.github.technus.tectech.thing.metaTileEntity.GT_MetaTileEntity_MultiblockBase_EM; import com.github.technus.tectech.thing.metaTileEntity.multi.gui.GT_GUIContainer_MultiMachineEM; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Optional; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import ic2.api.item.ElectricItem; @@ -88,7 +91,7 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa doChargeItemStackSpecial((ISpecialElectricItem) ofThis,itemStack); }else if(itemStack.getItem() instanceof IElectricItem){ doChargeItemStack((IElectricItem) ofThis,itemStack); - }else if(itemStack.getItem() instanceof IEnergyContainerItem){ + }else if(TecTech.hasCOFH && itemStack.getItem() instanceof IEnergyContainerItem){ doChargeItemStackRF((IEnergyContainerItem) ofThis,itemStack); } mEfficiencyIncrease = 10000; @@ -150,6 +153,7 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa } } + @Optional.Method(modid=Reference.COFHCORE) private void doChargeItemStackRF(IEnergyContainerItem item, ItemStack stack ) { try { |