diff --git a/build.properties b/build.properties index 5e431e2..a7964fb 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ package_group=emt mc_version=1.7.10 forge_version=10.13.4.1614 -mod_version=1.2.7.1a +mod_version=1.2.7.2 mod_name=ElectroMagicTools diff --git a/src/main/java/emt/EMT.java b/src/main/java/emt/EMT.java index e836f14..5a4ee9d 100644 --- a/src/main/java/emt/EMT.java +++ b/src/main/java/emt/EMT.java @@ -2,14 +2,11 @@ package emt; import cpw.mods.fml.common.FMLCommonHandler; 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.event.FMLServerStartingEvent; -import cpw.mods.fml.common.eventhandler.EventBus; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; @@ -19,12 +16,7 @@ import emt.init.EMTResearches; import emt.init.Registry; import emt.network.PacketEMTKeys; import emt.proxy.CommonProxy; -import emt.util.EMTClientEventHandler; -import emt.util.EMTConfigHandler; -import emt.util.EMTCreativeTab; -import emt.util.EMTDungeonChestGenerator; -import emt.util.EMTEssentiasOutputs; -import emt.util.EMTEventHandler; +import emt.util.*; import net.minecraft.creativetab.CreativeTabs; import net.minecraftforge.common.MinecraftForge; import org.apache.logging.log4j.LogManager; @@ -47,7 +39,13 @@ public class EMT public static final String CLIENT_PROXY = "emt.proxy.ClientProxy"; public static final String COMMON_PROXY = "emt.proxy.CommonProxy"; public static final String CHANNEL = "EMT"; - public static final String DEPENDS = "required-after:Thaumcraft ; required-after:IC2; required-after:gregtech"; + public static final String DEPENDS = + "required-after:Thaumcraft;" + + "required-after:IC2;" + + "required-after:gregtech;"+ + "after:Avaritia;"+ + "after:MagicBees;"+ + "after:ForbiddenMagic;"; @SidedProxy(clientSide="emt.proxy.ClientProxy", serverSide="emt.proxy.CommonProxy") public static CommonProxy proxy; public static final CreativeTabs TAB = new EMTCreativeTab("EMT.creativeTab"); @@ -72,7 +70,7 @@ public class EMT } Registry.registerPreInit(); EMTEssentiasOutputs.addPrimalOutputs(); - EMTEssentiasOutputs.addOutputs(); + //EMTEssentiasOutputs.addOutputs(); registerPackets(); LOGGER.info("Planning complete|end preinit"); } @@ -103,6 +101,7 @@ public class EMT public void postInit(FMLPostInitializationEvent event) { LOGGER.info("Starting the world takeover|start postinit"); + EMTEssentiasOutputs.addOutputs(); Registry.registerLate(); EMTResearches.register(); LOGGER.info("World takeover complete. Enjoy!|end postinit"); diff --git a/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java b/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java index 30b0220..9ad21be 100644 --- a/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java +++ b/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java @@ -1,5 +1,6 @@ package emt.gthandler.common.loader; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import emt.gthandler.common.implementations.EssentiaHatch; import emt.gthandler.common.items.EMT_CasingBlock; @@ -12,7 +13,6 @@ import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import net.minecraft.item.ItemStack; import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.config.ConfigItems; public class EMT_GT_Loader implements Runnable { @@ -32,8 +32,12 @@ public class EMT_GT_Loader implements Runnable { GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.Indium,1L),GT_OreDictUnificator.get(OrePrefixes.stickLong,Materials.Tungsten,4L)},Materials.SolderingAlloy.getMolten(576L), new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0],1,3),100, (int)(GT_Values.V[5]-(GT_Values.V[5]/10))); GT_Values.RA.addAssemblerRecipe(new ItemStack[]{new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0],1,3),GT_OreDictUnificator.get(OrePrefixes.plate,Materials.Iridium,8L)},Materials.Osmiridium.getMolten(576L), new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0],1,5),100, (int)(GT_Values.V[5]-(GT_Values.V[5]/10))); GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.Iridium,1L),GT_OreDictUnificator.get(OrePrefixes.stickLong,Materials.Osmiridium,4L)},Materials.SolderingAlloy.getMolten(576L), new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0],1,2),100, (int)(GT_Values.V[5]-(GT_Values.V[5]/10))); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0],1,2), GT_ModHandler.getModItem("ThaumicTinkerer","ichorium",2L)},Materials.Concrete.getMolten(2304L), new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0],1,4),100, (int)(GT_Values.V[5]-(GT_Values.V[5]/10))); + if (Loader.isModLoaded("ThaumicTinkerer")) + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0],1,2), GT_ModHandler.getModItem("ThaumicTinkerer","kamiResource",2L,2)},Materials.Concrete.getMolten(2304L), new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0],1,4),100, (int)(GT_Values.V[5]-(GT_Values.V[5]/10))); + else + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0],1,2), Materials.ElectrumFlux.getPlates(8)},Materials.Concrete.getMolten(2304L), new ItemStack(EMT_CasingBlock.EMT_GT_BLOCKS[0],1,4),100, (int)(GT_Values.V[5]-(GT_Values.V[5]/10))); + for (int i = 0; i < ItemList.HATCHES_INPUT.length; i++) - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.HATCHES_INPUT[i].get(1L), new ItemStack(ConfigBlocks.blockTube,1,1)},Materials.Thaumium.getMolten(288L),EHatch[i],100,(int)(GT_Values.V[i]-(GT_Values.V[i]/10))); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.HATCHES_INPUT[i].get(1L), new ItemStack(ConfigBlocks.blockTube,1,4)},Materials.Thaumium.getMolten(288L),EHatch[i],100,(int)(GT_Values.V[i]-(GT_Values.V[i]/10))); } } diff --git a/src/main/java/emt/gthandler/common/tileentities/machines/multi/generator/EMT_Large_Essentia_Gen.java b/src/main/java/emt/gthandler/common/tileentities/machines/multi/generator/EMT_Large_Essentia_Gen.java index de4b759..a999ff0 100644 --- a/src/main/java/emt/gthandler/common/tileentities/machines/multi/generator/EMT_Large_Essentia_Gen.java +++ b/src/main/java/emt/gthandler/common/tileentities/machines/multi/generator/EMT_Large_Essentia_Gen.java @@ -45,14 +45,14 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase { "Produces energy from magical essentia decay.", "Size(WxHxD): 7x4x7, Controller (Bottom, Center)", "Top-Middle 5x1x5 layer are Muffler Hatches", - "Middle 5x3x5 layer are Essentia Diffusion Cells", + "Middle 5x2x5 layer are Essentia Diffusion Cells", "Everything from here on goes either in the bottom or on the sides", "1x Fluid Input Hatch", "1x Essentia Input Hatch", "1x Dynamo Hatches", "1x Maintenance Hatch", - "Rest is made out of Magic Containing Casings", - "Produces 20x more than the singleblock per essentia", + "The outer hull is made out of Magic Containing Casings", + "Produces 20x more than the singleblock generator per essentia", "Causes magical and serious conventional pollution", "Needs 1L Lubricant per second or will cause way more conventional pollution", "Needs 10 " + EMTTextHelper.LIGHT_BLUE +"Aqua"+ EMTTextHelper.LIGHT_GRAY +" cVis per second or will cause way more magical pollution",