diff --git a/dependencies.gradle b/dependencies.gradle index 31eeb52..ced9c69 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,8 +1,9 @@ // Add your dependencies here dependencies { - api 'com.github.GTNewHorizons:GT5-Unofficial:5.09.45.95:dev' + compileOnly 'com.github.GTNewHorizons:GT5-Unofficial:5.09.45.128:dev' api 'com.github.GTNewHorizons:Baubles:1.0.4:dev' + api 'com.github.GTNewHorizons:ModularUI:1.1.42:dev' api 'net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev' api 'thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev' diff --git a/gradle.properties b/gradle.properties index 60f8da8..ae5dd1b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -41,11 +41,11 @@ developmentEnvironmentUserName = Developer # Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8. # See https://github.com/bsideup/jabel for details on how this works. -enableModernJavaSyntax = false +enableModernJavaSyntax = true # Enables injecting missing generics into the decompiled source code for a better coding experience. # Turns most publicly visible List, Map, etc. into proper List, Map types. -enableGenericInjection = false +enableGenericInjection = true # Generate a class with a String field for the mod version named as defined below. # If generateGradleTokenClass is empty or not missing, no such class will be generated. diff --git a/settings.gradle b/settings.gradle index b11efb0..c52d518 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.16' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.19' } diff --git a/src/main/java/emt/EMT.java b/src/main/java/emt/EMT.java index 5834cb8..5610739 100644 --- a/src/main/java/emt/EMT.java +++ b/src/main/java/emt/EMT.java @@ -46,12 +46,15 @@ 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;" - + "after:Avaritia;" - + "after:MagicBees;" - + "after:ForbiddenMagic;" - + "after:dreamcraft;"; + public static final String DEPENDS = """ + required-after:Thaumcraft;\ + required-after:IC2;\ + required-after:modularui;\ + after:gregtech;\ + after:Avaritia;\ + after:MagicBees;\ + after:ForbiddenMagic;\ + after:dreamcraft"""; public static final CreativeTabs TAB = new EMTCreativeTab("EMT.creativeTab"); public static final Logger LOGGER = LogManager.getLogger("Electro-Magic Tools"); public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel("EMT"); @@ -76,7 +79,9 @@ public class EMT { Registry.registerPreInit(); EMTEssentiasOutputs.addPrimalOutputs(); registerPackets(); - Solars.populateCache(); + if (Registry.enableGTCompat) { + Solars.populateCache(); + } } @Mod.EventHandler @@ -103,6 +108,8 @@ public class EMT { public void registerPackets() { INSTANCE.registerMessage(PacketEMTKeys.class, PacketEMTKeys.class, 0, Side.SERVER); - INSTANCE.registerMessage(PacketNodeInfo.class, PacketNodeInfo.class, 1, Side.CLIENT); + if (Registry.enableGTCompat) { + INSTANCE.registerMessage(PacketNodeInfo.class, PacketNodeInfo.class, 1, Side.CLIENT); + } } } diff --git a/src/main/java/emt/block/BlockEssentiaGenerators.java b/src/main/java/emt/block/BlockEssentiaGenerators.java index 4d0b592..66ef866 100644 --- a/src/main/java/emt/block/BlockEssentiaGenerators.java +++ b/src/main/java/emt/block/BlockEssentiaGenerators.java @@ -51,7 +51,7 @@ public class BlockEssentiaGenerators extends BlockBaseContainer { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item id, CreativeTabs tab, List list) { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { list.add(new ItemStack(id, 1, 0)); list.add(new ItemStack(id, 1, 1)); list.add(new ItemStack(id, 1, 2)); diff --git a/src/main/java/emt/block/BlockMachines.java b/src/main/java/emt/block/BlockMachines.java index e01b79f..b3c688a 100644 --- a/src/main/java/emt/block/BlockMachines.java +++ b/src/main/java/emt/block/BlockMachines.java @@ -60,7 +60,7 @@ public class BlockMachines extends BlockBaseContainer { } @SideOnly(Side.CLIENT) - public void getSubBlocks(Item id, CreativeTabs tab, List list) { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { list.add(new ItemStack(id, 1, 0)); list.add(new ItemStack(id, 1, 1)); list.add(new ItemStack(id, 1, 2)); diff --git a/src/main/java/emt/block/BlockPortableNode.java b/src/main/java/emt/block/BlockPortableNode.java index 6d5c401..9e1e9cb 100644 --- a/src/main/java/emt/block/BlockPortableNode.java +++ b/src/main/java/emt/block/BlockPortableNode.java @@ -79,7 +79,7 @@ public class BlockPortableNode extends BlockAiry { } @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + public TileEntity createNewTileEntity(World worldIn, int meta) { return null; } } diff --git a/src/main/java/emt/block/BlockSolars.java b/src/main/java/emt/block/BlockSolars.java index 959eeeb..e67e9fc 100644 --- a/src/main/java/emt/block/BlockSolars.java +++ b/src/main/java/emt/block/BlockSolars.java @@ -105,7 +105,7 @@ public class BlockSolars extends BlockBaseContainer { } @SideOnly(Side.CLIENT) - public void getSubBlocks(Item id, CreativeTabs tab, List list) { + public void getSubBlocks(Item id, CreativeTabs tab, List list) { for (int meta = 0; meta < countOfMetas; meta++) { list.add(new ItemStack(id, 1, meta)); } diff --git a/src/main/java/emt/client/renderer/RenderShield.java b/src/main/java/emt/client/renderer/RenderShield.java index 88c2292..1a93249 100644 --- a/src/main/java/emt/client/renderer/RenderShield.java +++ b/src/main/java/emt/client/renderer/RenderShield.java @@ -89,7 +89,7 @@ public class RenderShield extends Render { glTranslated(x, y, z); } - glCallList(this.glCallList); + glCallList(glCallList); glPopMatrix(); glPopAttrib(); diff --git a/src/main/java/emt/command/CommandOutputs.java b/src/main/java/emt/command/CommandOutputs.java index b1a7557..596c9b8 100644 --- a/src/main/java/emt/command/CommandOutputs.java +++ b/src/main/java/emt/command/CommandOutputs.java @@ -97,7 +97,7 @@ public class CommandOutputs extends CommandBase { } @Override - public String getCommandUsage(ICommandSender p_71518_1_) { + public String getCommandUsage(ICommandSender sender) { return "/emt_outputs"; } @@ -107,7 +107,7 @@ public class CommandOutputs extends CommandBase { } @Override - public List addTabCompletionOptions(ICommandSender command, String[] stringArray) { + public List addTabCompletionOptions(ICommandSender command, String[] stringArray) { return null; } diff --git a/src/main/java/emt/entity/EntityEnergyBall.java b/src/main/java/emt/entity/EntityEnergyBall.java index 28a2754..c582159 100644 --- a/src/main/java/emt/entity/EntityEnergyBall.java +++ b/src/main/java/emt/entity/EntityEnergyBall.java @@ -99,7 +99,7 @@ public class EntityEnergyBall extends Entity implements IProjectile, IEntityAddi } /** Generating Coords for every Entity **/ - ArrayList entities = new ArrayList(); + ArrayList entities = new ArrayList<>(); int chunkSize = ((RADIUS - 1) >> 4) + 2; diff --git a/src/main/java/emt/entity/EntityLaser.java b/src/main/java/emt/entity/EntityLaser.java index 1501593..ada2f47 100644 --- a/src/main/java/emt/entity/EntityLaser.java +++ b/src/main/java/emt/entity/EntityLaser.java @@ -165,7 +165,7 @@ public class EntityLaser extends Entity implements IThrowableEntity, IProjectile } Entity entity = null; - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity( + List list = this.worldObj.getEntitiesWithinAABBExcludingEntity( this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); double d0 = 0.0D; @@ -173,7 +173,7 @@ public class EntityLaser extends Entity implements IThrowableEntity, IProjectile float down; for (l = 0; l < list.size(); ++l) { - Entity entity1 = (Entity) list.get(l); + Entity entity1 = list.get(l); if (entity1.canBeCollidedWith() && (entity1 != this.shootingEntity || this.ticksInAir >= 5)) { down = 0.3F; 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 d8ac336..f2ff1b8 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 @@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import emt.tile.GT_MetaTileEntity_ResearchCompleter; +import emt.util.EMTConfigHandler; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -16,20 +17,18 @@ import gregtech.api.enums.TierEU; import gregtech.api.util.GT_OreDictUnificator; import thaumcraft.common.config.ConfigItems; -public class EMT_GT_Loader implements Runnable { +public class EMT_GT_Loader { - public static int aIDoffset = 13000 - GT_Values.VN.length - 1; public static ItemStack ResearchMultiblock; - @Override - public void run() { + public static void run() { ResearchMultiblock = new GT_MetaTileEntity_ResearchCompleter( - aIDoffset + GT_Values.VN.length + 2, + EMTConfigHandler.aIDoffset + GT_Values.VN.length + 2, "Research Completer", "Research Completer").getStackForm(1L); } - public void runlate() { + public static void runlate() { GT_Values.RA.stdBuilder() .itemInputs( new ItemStack(Items.book), diff --git a/src/main/java/emt/init/EMTBlocks.java b/src/main/java/emt/init/EMTBlocks.java index 1a0526d..be31ba4 100644 --- a/src/main/java/emt/init/EMTBlocks.java +++ b/src/main/java/emt/init/EMTBlocks.java @@ -10,11 +10,9 @@ import emt.block.BlockEssentiaGenerators; import emt.block.BlockMachines; import emt.block.BlockPortableNode; import emt.block.BlockShield; -import emt.block.BlockSolars; import emt.item.block.ItemBlockElectricCloud; import emt.item.block.ItemBlockEssentiaGenerators; import emt.item.block.ItemBlockMachines; -import emt.item.block.ItemBlockSolars; import emt.tile.solar.Solars; import ic2.api.item.IC2Items; import thaumcraft.api.aspects.Aspect; @@ -24,7 +22,7 @@ public class EMTBlocks { public static Block portableNode, essentiaGens, shield, emtMachines, electricCloud; - public static Block[] solars = new Block[Solars.getCountOfInstances()]; + public static Block[] solars = new Block[0]; public static void registerBlocks() { portableNode = new BlockPortableNode("portablenode"); @@ -33,22 +31,17 @@ public class EMTBlocks { shield = new BlockShield("shield"); GameRegistry.registerBlock(shield, "ShieldBlock"); - for (int i = 0; i < solars.length; i++) { - if (i == 0) { - solars[i] = new BlockSolars("solar", Solars.getCountOfMetas(i), i); - GameRegistry.registerBlock(solars[i], ItemBlockSolars.class, "EMTSolars"); - } else { - solars[i] = new BlockSolars("solar" + (i + 1), Solars.getCountOfMetas(i), i); - GameRegistry.registerBlock(solars[i], ItemBlockSolars.class, "EMTSolars" + (i + 1)); - } + if (Registry.enableGTCompat) { + solars = Solars.registerBlocks(); } emtMachines = new BlockMachines("machine"); GameRegistry.registerBlock(emtMachines, ItemBlockMachines.class, "EMTMachines"); - essentiaGens = new BlockEssentiaGenerators("essentia"); - GameRegistry.registerBlock(essentiaGens, ItemBlockEssentiaGenerators.class, "EssentiaGenerators"); - + if (Registry.enableGTCompat) { + essentiaGens = new BlockEssentiaGenerators("essentia"); + GameRegistry.registerBlock(essentiaGens, ItemBlockEssentiaGenerators.class, "EssentiaGenerators"); + } electricCloud = new BlockElectricCloud("electricCloud"); GameRegistry.registerBlock(electricCloud, ItemBlockElectricCloud.class, "electricCloud"); } diff --git a/src/main/java/emt/init/EMTRecipes.java b/src/main/java/emt/init/EMTRecipes.java index 125ffdf..1dbb3be 100644 --- a/src/main/java/emt/init/EMTRecipes.java +++ b/src/main/java/emt/init/EMTRecipes.java @@ -17,7 +17,6 @@ import emt.EMT; import emt.util.EMTConfigHandler; import emt.util.EMTCraftingAspects; import emt.util.EMTResearchAspects; -import gregtech.api.enums.ItemList; import ic2.api.item.IC2Items; import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeInputItemStack; @@ -536,18 +535,19 @@ public class EMTRecipes { new ItemStack(Blocks.soul_sand), new ItemStack(Blocks.obsidian), new ItemStack(Blocks.obsidian) }); - maintenanceFocus = addInfusionCraftingRecipe( - "Wand Focus: Maintenance", - new ItemStack(EMTItems.maintenanceFocus), - 6, - EMTCraftingAspects.maintenanceFocus, - new ItemStack(EMTItems.chargeFocus), - new ItemStack[] { new ItemStack(ConfigItems.itemShard, 1, 5), - new ItemStack(ConfigItems.itemShard, 1, 4), new ItemStack(ConfigItems.itemShard, 1, 3), - new ItemStack(EMTItems.itemEMTItems, 1, 9), new ItemStack(ConfigItems.itemShard, 1, 2), - new ItemStack(ConfigItems.itemShard, 1, 1), new ItemStack(ConfigItems.itemShard, 1, 0), - ItemList.Duct_Tape.get(1) }); - + if (Registry.enableGTCompat) { + maintenanceFocus = addInfusionCraftingRecipe( + "Wand Focus: Maintenance", + new ItemStack(EMTItems.maintenanceFocus), + 6, + EMTCraftingAspects.maintenanceFocus, + new ItemStack(EMTItems.chargeFocus), + new ItemStack[] { new ItemStack(ConfigItems.itemShard, 1, 5), + new ItemStack(ConfigItems.itemShard, 1, 4), new ItemStack(ConfigItems.itemShard, 1, 3), + new ItemStack(EMTItems.itemEMTItems, 1, 9), new ItemStack(ConfigItems.itemShard, 1, 2), + new ItemStack(ConfigItems.itemShard, 1, 1), new ItemStack(ConfigItems.itemShard, 1, 0), + new ItemStack(GameRegistry.findItem("gregtech", "gt.metaitem.01"), 1, 32764) }); + } potentiaGenerator = addInfusionCraftingRecipe( "Potentia Generator", new ItemStack(EMTBlocks.essentiaGens, 1, 0), @@ -616,16 +616,20 @@ public class EMTRecipes { new ItemStack(Blocks.diamond_block), new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigBlocks.blockJar) }); - solarHelmetRevealing = addInfusionCraftingRecipe( - "Solar Helmet of Revealing", - getChargedItem(EMTItems.solarHelmetRevealing, 10), - 5, - EMTCraftingAspects.solarHelmetRevealing, - new ItemStack(EMTItems.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), - new ItemStack[] { new ItemStack(EMTBlocks.solars[0], 1, 1), IC2Items.getItem("glassFiberCableItem"), - new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), - new ItemStack(ConfigItems.itemShard, 1, 4) }); - + if (Registry.enableGTCompat) { + solarHelmetRevealing = addInfusionCraftingRecipe( + "Solar Helmet of Revealing", + getChargedItem(EMTItems.solarHelmetRevealing, 10), + 5, + EMTCraftingAspects.solarHelmetRevealing, + new ItemStack(EMTItems.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), + new ItemStack[] { new ItemStack(EMTBlocks.solars[0], 1, 1), IC2Items.getItem("glassFiberCableItem"), + new ItemStack( + IC2Items.getItem("lapotronCrystal").getItem(), + 1, + OreDictionary.WILDCARD_VALUE), + new ItemStack(ConfigItems.itemShard, 1, 4) }); + } electricBootsTravel = addInfusionCraftingRecipe( "Electric Boots of the Traveller", getChargedItem(EMTItems.electricBootsTraveller, 10), @@ -669,17 +673,19 @@ public class EMTRecipes { new ItemStack(Blocks.iron_block), new ItemStack(EMTItems.itemEMTItems, 1, 5), new ItemStack(EMTItems.itemEMTItems, 1, 5) }); - tripleCompressedSolar = addInfusionCraftingRecipe( - "Compressed Solars", - new ItemStack(EMTBlocks.solars[0], 1, 2), - 2, - EMTCraftingAspects.compressedSolars, - new ItemStack(EMTBlocks.solars[0], 1, 1), - new ItemStack[] { new ItemStack(EMTBlocks.solars[0], 1, 1), new ItemStack(EMTBlocks.solars[0], 1, 1), - new ItemStack(EMTBlocks.solars[0], 1, 1), new ItemStack(EMTBlocks.solars[0], 1, 1), - new ItemStack(EMTBlocks.solars[0], 1, 1), new ItemStack(EMTBlocks.solars[0], 1, 1), - new ItemStack(EMTBlocks.solars[0], 1, 1), new ItemStack(EMTBlocks.solars[0], 1, 1) }); - + if (Registry.enableGTCompat) { + tripleCompressedSolar = addInfusionCraftingRecipe( + "Compressed Solars", + new ItemStack(EMTBlocks.solars[0], 1, 2), + 2, + EMTCraftingAspects.compressedSolars, + new ItemStack(EMTBlocks.solars[0], 1, 1), + new ItemStack[] { new ItemStack(EMTBlocks.solars[0], 1, 1), + new ItemStack(EMTBlocks.solars[0], 1, 1), new ItemStack(EMTBlocks.solars[0], 1, 1), + new ItemStack(EMTBlocks.solars[0], 1, 1), new ItemStack(EMTBlocks.solars[0], 1, 1), + new ItemStack(EMTBlocks.solars[0], 1, 1), new ItemStack(EMTBlocks.solars[0], 1, 1), + new ItemStack(EMTBlocks.solars[0], 1, 1) }); + } electricHoeGrowth = addInfusionCraftingRecipe( "Electric Hoe of Growth", getChargedItem(EMTItems.electricHoeGrowth, 10), @@ -867,26 +873,26 @@ public class EMTRecipes { EMTCraftingAspects.tinyUraniumCrafting, IC2Items.getItem("Uran238")); - compressedSolar = addArcaneCraftingRecipe( - "Compressed Solars", - new ItemStack(EMTBlocks.solars[0], 1, 0), - EMTCraftingAspects.compressedSolars, - "XXX", - "XXX", - "XXX", - 'X', - IC2Items.getItem("solarPanel")); - - doubleCompressedSolar = addArcaneCraftingRecipe( - "Compressed Solars", - new ItemStack(EMTBlocks.solars[0], 1, 1), - EMTCraftingAspects.compressedSolars, - "XXX", - "XXX", - "XXX", - 'X', - new ItemStack(EMTBlocks.solars[0], 1, 0)); - + if (Registry.enableGTCompat) { + compressedSolar = addArcaneCraftingRecipe( + "Compressed Solars", + new ItemStack(EMTBlocks.solars[0], 1, 0), + EMTCraftingAspects.compressedSolars, + "XXX", + "XXX", + "XXX", + 'X', + IC2Items.getItem("solarPanel")); + doubleCompressedSolar = addArcaneCraftingRecipe( + "Compressed Solars", + new ItemStack(EMTBlocks.solars[0], 1, 1), + EMTCraftingAspects.compressedSolars, + "XXX", + "XXX", + "XXX", + 'X', + new ItemStack(EMTBlocks.solars[0], 1, 0)); + } electricScribingTools = addArcaneCraftingRecipe( "Electric Scribing Tools", getChargedItem(EMTItems.electricScribingTools, 10), @@ -935,139 +941,140 @@ public class EMTRecipes { // ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 2), 'Z', new ItemStack(GregTech_API.sBlockCasings8, 1, 6), // 'A', new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5)); - /** Crucible Recipes **/ - ignisGenerator = addCrucibleRecipe( - "Ignis Generator", - new ItemStack(EMTBlocks.essentiaGens, 1, 1), - new ItemStack(EMTBlocks.essentiaGens, 1, 0), - EMTCraftingAspects.ignisGeneratorCrafting); + if (Registry.enableGTCompat) { + /** Crucible Recipes **/ + ignisGenerator = addCrucibleRecipe( + "Ignis Generator", + new ItemStack(EMTBlocks.essentiaGens, 1, 1), + new ItemStack(EMTBlocks.essentiaGens, 1, 0), + EMTCraftingAspects.ignisGeneratorCrafting); - auramGenerator = addCrucibleRecipe( - "Auram Generator", - new ItemStack(EMTBlocks.essentiaGens, 1, 2), - new ItemStack(EMTBlocks.essentiaGens, 1, 0), - EMTCraftingAspects.auramGeneratorCrafting); + auramGenerator = addCrucibleRecipe( + "Auram Generator", + new ItemStack(EMTBlocks.essentiaGens, 1, 2), + new ItemStack(EMTBlocks.essentiaGens, 1, 0), + EMTCraftingAspects.auramGeneratorCrafting); - arborGenerator = addCrucibleRecipe( - "Arbor Generator", - new ItemStack(EMTBlocks.essentiaGens, 1, 3), - new ItemStack(EMTBlocks.essentiaGens, 1, 0), - EMTCraftingAspects.arborGeneratorCrafting); + arborGenerator = addCrucibleRecipe( + "Arbor Generator", + new ItemStack(EMTBlocks.essentiaGens, 1, 3), + new ItemStack(EMTBlocks.essentiaGens, 1, 0), + EMTCraftingAspects.arborGeneratorCrafting); - aerGenerator = addCrucibleRecipe( - "Aer Generator", - new ItemStack(EMTBlocks.essentiaGens, 1, 4), - new ItemStack(EMTBlocks.essentiaGens, 1, 0), - EMTCraftingAspects.aerGenerator); + aerGenerator = addCrucibleRecipe( + "Aer Generator", + new ItemStack(EMTBlocks.essentiaGens, 1, 4), + new ItemStack(EMTBlocks.essentiaGens, 1, 0), + EMTCraftingAspects.aerGenerator); - waterSolar = addCrucibleRecipe( - "Water Infused Solar Panels", - new ItemStack(EMTBlocks.solars[0], 1, 3), - new ItemStack(EMTBlocks.solars[0], 1, 0), - EMTCraftingAspects.waterSolars); + waterSolar = addCrucibleRecipe( + "Water Infused Solar Panels", + new ItemStack(EMTBlocks.solars[0], 1, 3), + new ItemStack(EMTBlocks.solars[0], 1, 0), + EMTCraftingAspects.waterSolars); - doubleWaterSolar = addCrucibleRecipe( - "Water Infused Solar Panels", - new ItemStack(EMTBlocks.solars[0], 1, 4), - new ItemStack(EMTBlocks.solars[0], 1, 1), - EMTCraftingAspects.waterSolars); + doubleWaterSolar = addCrucibleRecipe( + "Water Infused Solar Panels", + new ItemStack(EMTBlocks.solars[0], 1, 4), + new ItemStack(EMTBlocks.solars[0], 1, 1), + EMTCraftingAspects.waterSolars); - tripleWaterSolar = addCrucibleRecipe( - "Water Infused Solar Panels", - new ItemStack(EMTBlocks.solars[0], 1, 5), - new ItemStack(EMTBlocks.solars[0], 1, 2), - EMTCraftingAspects.waterSolars); + tripleWaterSolar = addCrucibleRecipe( + "Water Infused Solar Panels", + new ItemStack(EMTBlocks.solars[0], 1, 5), + new ItemStack(EMTBlocks.solars[0], 1, 2), + EMTCraftingAspects.waterSolars); - darkSolar = addCrucibleRecipe( - "Entropy Infused Solar Panels", - new ItemStack(EMTBlocks.solars[0], 1, 6), - new ItemStack(EMTBlocks.solars[0], 1, 0), - EMTCraftingAspects.darkSolars); + darkSolar = addCrucibleRecipe( + "Entropy Infused Solar Panels", + new ItemStack(EMTBlocks.solars[0], 1, 6), + new ItemStack(EMTBlocks.solars[0], 1, 0), + EMTCraftingAspects.darkSolars); - doubleDarkSolar = addCrucibleRecipe( - "Entropy Infused Solar Panels", - new ItemStack(EMTBlocks.solars[0], 1, 7), - new ItemStack(EMTBlocks.solars[0], 1, 1), - EMTCraftingAspects.darkSolars); + doubleDarkSolar = addCrucibleRecipe( + "Entropy Infused Solar Panels", + new ItemStack(EMTBlocks.solars[0], 1, 7), + new ItemStack(EMTBlocks.solars[0], 1, 1), + EMTCraftingAspects.darkSolars); - tripleDarkSolar = addCrucibleRecipe( - "Entropy Infused Solar Panels", - new ItemStack(EMTBlocks.solars[0], 1, 8), - new ItemStack(EMTBlocks.solars[0], 1, 2), - EMTCraftingAspects.darkSolars); + tripleDarkSolar = addCrucibleRecipe( + "Entropy Infused Solar Panels", + new ItemStack(EMTBlocks.solars[0], 1, 8), + new ItemStack(EMTBlocks.solars[0], 1, 2), + EMTCraftingAspects.darkSolars); - orderSolar = addCrucibleRecipe( - "Order Infused Solar Panels", - new ItemStack(EMTBlocks.solars[0], 1, 9), - new ItemStack(EMTBlocks.solars[0], 1, 0), - EMTCraftingAspects.orderSolars); + orderSolar = addCrucibleRecipe( + "Order Infused Solar Panels", + new ItemStack(EMTBlocks.solars[0], 1, 9), + new ItemStack(EMTBlocks.solars[0], 1, 0), + EMTCraftingAspects.orderSolars); - doubleOrderSolar = addCrucibleRecipe( - "Order Infused Solar Panels", - new ItemStack(EMTBlocks.solars[0], 1, 10), - new ItemStack(EMTBlocks.solars[0], 1, 1), - EMTCraftingAspects.orderSolars); + doubleOrderSolar = addCrucibleRecipe( + "Order Infused Solar Panels", + new ItemStack(EMTBlocks.solars[0], 1, 10), + new ItemStack(EMTBlocks.solars[0], 1, 1), + EMTCraftingAspects.orderSolars); - tripleOrderSolar = addCrucibleRecipe( - "Order Infused Solar Panels", - new ItemStack(EMTBlocks.solars[0], 1, 11), - new ItemStack(EMTBlocks.solars[0], 1, 2), - EMTCraftingAspects.orderSolars); + tripleOrderSolar = addCrucibleRecipe( + "Order Infused Solar Panels", + new ItemStack(EMTBlocks.solars[0], 1, 11), + new ItemStack(EMTBlocks.solars[0], 1, 2), + EMTCraftingAspects.orderSolars); - fireSolar = addCrucibleRecipe( - "Fire Infused Solar Panels", - new ItemStack(EMTBlocks.solars[0], 1, 12), - new ItemStack(EMTBlocks.solars[0], 1, 0), - EMTCraftingAspects.fireSolars); + fireSolar = addCrucibleRecipe( + "Fire Infused Solar Panels", + new ItemStack(EMTBlocks.solars[0], 1, 12), + new ItemStack(EMTBlocks.solars[0], 1, 0), + EMTCraftingAspects.fireSolars); - doubleFireSolar = addCrucibleRecipe( - "Fire Infused Solar Panels", - new ItemStack(EMTBlocks.solars[0], 1, 13), - new ItemStack(EMTBlocks.solars[0], 1, 1), - EMTCraftingAspects.fireSolars); + doubleFireSolar = addCrucibleRecipe( + "Fire Infused Solar Panels", + new ItemStack(EMTBlocks.solars[0], 1, 13), + new ItemStack(EMTBlocks.solars[0], 1, 1), + EMTCraftingAspects.fireSolars); - tripleFireSolar = addCrucibleRecipe( - "Fire Infused Solar Panels", - new ItemStack(EMTBlocks.solars[0], 1, 14), - new ItemStack(EMTBlocks.solars[0], 1, 2), - EMTCraftingAspects.fireSolars); + tripleFireSolar = addCrucibleRecipe( + "Fire Infused Solar Panels", + new ItemStack(EMTBlocks.solars[0], 1, 14), + new ItemStack(EMTBlocks.solars[0], 1, 2), + EMTCraftingAspects.fireSolars); - airSolar = addCrucibleRecipe( - "Air Infused Solar Panels", - new ItemStack(EMTBlocks.solars[0], 1, 15), - new ItemStack(EMTBlocks.solars[0], 1, 0), - EMTCraftingAspects.airSolars); + airSolar = addCrucibleRecipe( + "Air Infused Solar Panels", + new ItemStack(EMTBlocks.solars[0], 1, 15), + new ItemStack(EMTBlocks.solars[0], 1, 0), + EMTCraftingAspects.airSolars); - doubleAirSolar = addCrucibleRecipe( - "Air Infused Solar Panels", - new ItemStack(EMTBlocks.solars[1], 1, 0), - new ItemStack(EMTBlocks.solars[0], 1, 1), - EMTCraftingAspects.airSolars); + doubleAirSolar = addCrucibleRecipe( + "Air Infused Solar Panels", + new ItemStack(EMTBlocks.solars[1], 1, 0), + new ItemStack(EMTBlocks.solars[0], 1, 1), + EMTCraftingAspects.airSolars); - tripleAirSolar = addCrucibleRecipe( - "Air Infused Solar Panels", - new ItemStack(EMTBlocks.solars[1], 1, 1), - new ItemStack(EMTBlocks.solars[0], 1, 2), - EMTCraftingAspects.airSolars); + tripleAirSolar = addCrucibleRecipe( + "Air Infused Solar Panels", + new ItemStack(EMTBlocks.solars[1], 1, 1), + new ItemStack(EMTBlocks.solars[0], 1, 2), + EMTCraftingAspects.airSolars); - earthSolar = addCrucibleRecipe( - "Earth Infused Solar Panels", - new ItemStack(EMTBlocks.solars[1], 1, 2), - new ItemStack(EMTBlocks.solars[0], 1, 0), - EMTCraftingAspects.earthSolars); + earthSolar = addCrucibleRecipe( + "Earth Infused Solar Panels", + new ItemStack(EMTBlocks.solars[1], 1, 2), + new ItemStack(EMTBlocks.solars[0], 1, 0), + EMTCraftingAspects.earthSolars); - doubleEarthSolar = addCrucibleRecipe( - "Earth Infused Solar Panels", - new ItemStack(EMTBlocks.solars[1], 1, 3), - new ItemStack(EMTBlocks.solars[0], 1, 1), - EMTCraftingAspects.earthSolars); - - tripleEarthSolar = addCrucibleRecipe( - "Earth Infused Solar Panels", - new ItemStack(EMTBlocks.solars[1], 1, 4), - new ItemStack(EMTBlocks.solars[0], 1, 2), - EMTCraftingAspects.earthSolars); + doubleEarthSolar = addCrucibleRecipe( + "Earth Infused Solar Panels", + new ItemStack(EMTBlocks.solars[1], 1, 3), + new ItemStack(EMTBlocks.solars[0], 1, 1), + EMTCraftingAspects.earthSolars); + tripleEarthSolar = addCrucibleRecipe( + "Earth Infused Solar Panels", + new ItemStack(EMTBlocks.solars[1], 1, 4), + new ItemStack(EMTBlocks.solars[0], 1, 2), + EMTCraftingAspects.earthSolars); + } ItemStack itemStack = new ItemStack(ConfigItems.itemJarNode); ((ItemJarNode) itemStack.getItem()).setAspects(itemStack, new AspectList()); portableNode = addCrucibleRecipe( diff --git a/src/main/java/emt/init/EMTResearches.java b/src/main/java/emt/init/EMTResearches.java index f57bca0..da97851 100644 --- a/src/main/java/emt/init/EMTResearches.java +++ b/src/main/java/emt/init/EMTResearches.java @@ -229,7 +229,7 @@ public class EMTResearches { } } - if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (Registry.enableGTCompat && !EMTConfigHandler.potentiaGeneratorResearch) { new EMTResearchItem( "Potentia Generator", EMTResearchAspects.potentiaGeneratorResearch, @@ -239,9 +239,7 @@ public class EMTResearches { new ItemStack(EMTBlocks.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed() .registerResearchItem() .setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.potentiaGenerator)); - } - if (!EMTConfigHandler.potentiaGeneratorResearch) { if (!EMTConfigHandler.ignisGeneratorResearch) { new EMTResearchItem( "Ignis Generator", @@ -253,9 +251,7 @@ public class EMTResearches { .setConcealed().registerResearchItem() .setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.ignisGenerator)); } - } - if (!EMTConfigHandler.potentiaGeneratorResearch) { if (!EMTConfigHandler.auramGeneratorResearch) { new EMTResearchItem( "Auram Generator", @@ -267,9 +263,7 @@ public class EMTResearches { .setConcealed().registerResearchItem() .setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.auramGenerator)); } - } - if (!EMTConfigHandler.potentiaGeneratorResearch) { if (!EMTConfigHandler.arborGeneratorResearch) { new EMTResearchItem( "Arbor Generator", @@ -281,9 +275,7 @@ public class EMTResearches { .setConcealed().registerResearchItem() .setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.arborGenerator)); } - } - if (!EMTConfigHandler.potentiaGeneratorResearch) { if (!EMTConfigHandler.lucrumGeneratorResearch) { new EMTResearchItem( "Lucrum Generator", @@ -295,9 +287,7 @@ public class EMTResearches { .setConcealed().registerResearchItem() .setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.lucrumGenerator)); } - } - if (!EMTConfigHandler.potentiaGeneratorResearch) { if (!EMTConfigHandler.aerGeneratorResearch) { new EMTResearchItem( "Aer Generator", @@ -308,23 +298,20 @@ public class EMTResearches { new ItemStack(EMTBlocks.essentiaGens, 1, 4)).setSecondary().setParents("Potentia Generator") .setConcealed().registerResearchItem() .setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.aerGenerator)); + + if (!EMTConfigHandler.wandChargingSationResearch) { + new EMTResearchItem( + "Industrial Wand Charging Station", + EMTResearchAspects.wandCharger, + -4, + 2, + 3, + new ItemStack(EMTBlocks.emtMachines, 1, 0)).setParents("Potentia Generator") + .registerResearchItem() + .setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.wandRecharger)); + } } } - - if (!EMTConfigHandler.potentiaGeneratorResearch) { - if (!EMTConfigHandler.wandChargingSationResearch) { - new EMTResearchItem( - "Industrial Wand Charging Station", - EMTResearchAspects.wandCharger, - -4, - 2, - 3, - new ItemStack(EMTBlocks.emtMachines, 1, 0)).setParents("Potentia Generator") - .registerResearchItem() - .setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.wandRecharger)); - } - } - if (!EMTConfigHandler.thaumiumChainsawResearch) { if (!EMTConfigHandler.streamChainsawResearch) { new EMTResearchItem( @@ -388,7 +375,7 @@ public class EMTResearches { } } - if (!EMTConfigHandler.compressedSolarsResearch) { + if (Registry.enableGTCompat && !EMTConfigHandler.compressedSolarsResearch) { new EMTResearchItem( "Compressed Solars", EMTResearchAspects.compressedSolars, @@ -401,9 +388,6 @@ public class EMTResearches { new ResearchPage(EMTRecipes.compressedSolar), new ResearchPage(EMTRecipes.doubleCompressedSolar), new ResearchPage(EMTRecipes.tripleCompressedSolar)); - } - - if (!EMTConfigHandler.compressedSolarsResearch) { if (!EMTConfigHandler.solarHelmetResearch) { new EMTResearchItem( "Solar Helmet of Revealing", @@ -416,7 +400,6 @@ public class EMTResearches { .setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.solarHelmetRevealing)); } } - if (!EMTConfigHandler.electricBootsResearch) { new EMTResearchItem( "Electric Boots of the Traveller", @@ -483,7 +466,7 @@ public class EMTResearches { .setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.etheralProcessor)); } - if (!EMTConfigHandler.compressedSolarsResearch) { + if (Registry.enableGTCompat && !EMTConfigHandler.compressedSolarsResearch) { if (!EMTConfigHandler.waterSolarsResearch) { new EMTResearchItem( "Water Infused Solar Panels", @@ -498,9 +481,7 @@ public class EMTResearches { new ResearchPage(EMTRecipes.doubleWaterSolar), new ResearchPage(EMTRecipes.tripleWaterSolar)); } - } - if (!EMTConfigHandler.compressedSolarsResearch) { if (!EMTConfigHandler.darkSolarsResearch) { new EMTResearchItem( "Entropy Infused Solar Panels", @@ -515,9 +496,7 @@ public class EMTResearches { new ResearchPage(EMTRecipes.doubleDarkSolar), new ResearchPage(EMTRecipes.tripleDarkSolar)); } - } - if (!EMTConfigHandler.compressedSolarsResearch) { if (!EMTConfigHandler.orderSolarsResearch) { new EMTResearchItem( "Order Infused Solar Panels", @@ -532,9 +511,7 @@ public class EMTResearches { new ResearchPage(EMTRecipes.doubleOrderSolar), new ResearchPage(EMTRecipes.tripleOrderSolar)); } - } - if (!EMTConfigHandler.compressedSolarsResearch) { if (!EMTConfigHandler.fireSolarsResearch) { new EMTResearchItem( "Fire Infused Solar Panels", @@ -549,9 +526,7 @@ public class EMTResearches { new ResearchPage(EMTRecipes.doubleFireSolar), new ResearchPage(EMTRecipes.tripleFireSolar)); } - } - if (!EMTConfigHandler.compressedSolarsResearch) { if (!EMTConfigHandler.airSolarsResearch) { new EMTResearchItem( "Air Infused Solar Panels", @@ -566,9 +541,7 @@ public class EMTResearches { new ResearchPage(EMTRecipes.doubleAirSolar), new ResearchPage(EMTRecipes.tripleAirSolar)); } - } - if (!EMTConfigHandler.compressedSolarsResearch) { if (!EMTConfigHandler.earthSolarsResearch) { new EMTResearchItem( "Earth Infused Solar Panels", @@ -648,7 +621,7 @@ public class EMTResearches { .setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.chargeFocus)); } - if (!EMTConfigHandler.maintenanceFocusResearch) { + if (Registry.enableGTCompat && !EMTConfigHandler.maintenanceFocusResearch) { new EMTResearchItem( "Wand Focus: Maintenance", EMTResearchAspects.maintenanceFocus, diff --git a/src/main/java/emt/init/EMTTiles.java b/src/main/java/emt/init/EMTTiles.java index dfcc7e5..3029150 100644 --- a/src/main/java/emt/init/EMTTiles.java +++ b/src/main/java/emt/init/EMTTiles.java @@ -12,49 +12,51 @@ public class EMTTiles { public static void registerTileEntities() { - // Essentia Gens - // legacy support - GameRegistry.registerTileEntity(TileEntityBaseGenerator.class, "tileentitypotentiagenerator"); - GameRegistry.registerTileEntity(TileEntityBaseGenerator.class, "tileentityignisgenerator"); - GameRegistry.registerTileEntity(TileEntityBaseGenerator.class, "tileentityauramgenerator"); - GameRegistry.registerTileEntity(TileEntityBaseGenerator.class, "tileentityarborgenerator"); - GameRegistry.registerTileEntity(TileEntityBaseGenerator.class, "tileentityaergenerator"); - GameRegistry.registerTileEntity(TileEntityBaseGenerator.class, "tileentitylucrumgenerator"); + if (Registry.enableGTCompat) { + // Essentia Gens + // legacy support + GameRegistry.registerTileEntity(TileEntityBaseGenerator.class, "tileentitypotentiagenerator"); + GameRegistry.registerTileEntity(TileEntityBaseGenerator.class, "tileentityignisgenerator"); + GameRegistry.registerTileEntity(TileEntityBaseGenerator.class, "tileentityauramgenerator"); + GameRegistry.registerTileEntity(TileEntityBaseGenerator.class, "tileentityarborgenerator"); + GameRegistry.registerTileEntity(TileEntityBaseGenerator.class, "tileentityaergenerator"); + GameRegistry.registerTileEntity(TileEntityBaseGenerator.class, "tileentitylucrumgenerator"); - // new TEs will be called TileEntityEssentiaGenerator - GameRegistry.registerTileEntity(TileEntityBaseGenerator.class, "TileEntityEssentiaGenerator"); + // new TEs will be called TileEntityEssentiaGenerator + GameRegistry.registerTileEntity(TileEntityBaseGenerator.class, "TileEntityEssentiaGenerator"); + + // Solars + // legacy support + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitycompressedsolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydoublecompressedsolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitytriplecompressedsolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitywatersolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydoublewatersolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitytriplewatersolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydarksolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydoubledarksolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitytripledarksolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentityordersolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydoubleordersolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitytripleordersolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentityfiresolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydoublefiresolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitytriplefiresolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentityairsolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydoubleairsolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitytripleairsolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentityearthsolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydoubleearthsolar"); + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitytripleearthsolar"); + + // new TEs will be called TileEntityXCompressedSolar + GameRegistry.registerTileEntity(TileEntitySolarBase.class, "TileEntityXCompressedSolar"); + } // Machinery GameRegistry.registerTileEntity(TileEntityIndustrialWandRecharge.class, "tileentityindustrialwandrecharge"); GameRegistry.registerTileEntity(TileEntityEtherealMacerator.class, "tileentityetherealmacerator"); - // Solars - // legacy support - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitycompressedsolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydoublecompressedsolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitytriplecompressedsolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitywatersolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydoublewatersolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitytriplewatersolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydarksolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydoubledarksolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitytripledarksolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentityordersolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydoubleordersolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitytripleordersolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentityfiresolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydoublefiresolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitytriplefiresolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentityairsolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydoubleairsolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitytripleairsolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentityearthsolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitydoubleearthsolar"); - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "tileentitytripleearthsolar"); - - // new TEs will be called TileEntityXCompressedSolar - GameRegistry.registerTileEntity(TileEntitySolarBase.class, "TileEntityXCompressedSolar"); - // Random Stuff GameRegistry.registerTileEntity(TileEntityPortableNode.class, "tileentityportablenode"); GameRegistry.registerTileEntity(TileElectricCloud.class, "tileEntityElectricCloud"); diff --git a/src/main/java/emt/init/EMT_GTNH_Recipes_And_Researches.java b/src/main/java/emt/init/EMT_GTNH_Recipes_And_Researches.java index 0b872b1..39a6f12 100644 --- a/src/main/java/emt/init/EMT_GTNH_Recipes_And_Researches.java +++ b/src/main/java/emt/init/EMT_GTNH_Recipes_And_Researches.java @@ -24,9 +24,7 @@ import gregtech.api.util.GT_Utility; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.CrucibleRecipe; import thaumcraft.api.crafting.IArcaneRecipe; -import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.crafting.ShapedArcaneRecipe; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; @@ -34,8 +32,6 @@ import thaumcraft.api.research.ResearchPage; public class EMT_GTNH_Recipes_And_Researches implements Runnable { private static LinkedHashMap arcaneRecipeLinkedHashMap = new LinkedHashMap<>(); - private static LinkedHashMap infusionRecipeLinkedHashMap = new LinkedHashMap<>(); - private static LinkedHashMap cruciblRecipeLinkedHashMap = new LinkedHashMap<>(); private static AspectList getPrimals(int amount) { return new AspectList().add(ORDER, amount).add(ENTROPY, amount).add(AIR, amount).add(EARTH, amount) @@ -50,10 +46,7 @@ public class EMT_GTNH_Recipes_And_Researches implements Runnable { runResreaches(); } - private void runInfusionRecipes() {} - - private void runKettleRecipes() {} - + @SuppressWarnings("unchecked") private void runArcaneRecipes() { arcaneRecipeLinkedHashMap.put( "DiamondChainsaw", @@ -154,9 +147,7 @@ public class EMT_GTNH_Recipes_And_Researches implements Runnable { throw new UnsupportedOperationException("The Recipe must fit in a 3x3 crafting field!"); rowcolm = Arrays.copyOf(rowcolm, rows); - int k = 0; for (int j = i; j < recipe.length; j += 2) { - k++; if (recipe[j] instanceof Character) translation.put((Character) recipe[j], recipe[j + 1]); } } @@ -181,7 +172,7 @@ public class EMT_GTNH_Recipes_And_Researches implements Runnable { true)) if (!OreDictionary.getOres((String) itemReplacement).contains(slot)) return false; } else if (itemReplacement instanceof ItemStack) { - if (!GT_Utility.isStackValid(itemReplacement)) { + if (!GT_Utility.isStackValid((ItemStack) itemReplacement)) { return false; } if (!GT_Utility.areStacksEqual((ItemStack) itemReplacement, slot, true)) @@ -192,7 +183,7 @@ public class EMT_GTNH_Recipes_And_Researches implements Runnable { return false; } else if (itemReplacement instanceof Collection) { boolean hit = false; - for (Object o : (Collection) itemReplacement) { + for (Object o : (Collection) itemReplacement) { if (GT_Utility.areStacksEqual((ItemStack) o, slot, true) || GT_Utility.areUnificationsEqual((ItemStack) o, slot, true) || (((ItemStack) o).getItem().equals(slot.getItem()) diff --git a/src/main/java/emt/init/Registry.java b/src/main/java/emt/init/Registry.java index 27a3bca..9101962 100644 --- a/src/main/java/emt/init/Registry.java +++ b/src/main/java/emt/init/Registry.java @@ -1,32 +1,40 @@ package emt.init; +import cpw.mods.fml.common.Loader; import emt.gthandler.common.loader.EMT_GT_Loader; import emt.tile.solar.Solars; import emt.util.EMTEssentiasOutputs; public class Registry { - private static final EMT_GT_Loader gtloader = new EMT_GT_Loader(); + public static boolean enableGTCompat; public static void registerPreInit() { + enableGTCompat = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi"); EMTBlocks.registerBlocks(); EMTItems.registerItems(); EMTTiles.registerTileEntities(); } public static void registerInit() { - gtloader.run(); + if (enableGTCompat) { + EMT_GT_Loader.run(); + } EMTRecipes.registerEarlyRecipes(); } public static void registerLate() { EMTEssentiasOutputs.addOutputs(); EMTBlocks.addAspects(); - gtloader.runlate(); + if (enableGTCompat) { + EMT_GT_Loader.runlate(); + } EMTRecipes.registerLateRecipes(); // new EMT_GTNH_Recipes_And_Researches().run(); EMTRecipes.registerUUMInfusionRecipes(); EMTResearches.register(); - Solars.registerReverseRecipes(); + if (enableGTCompat) { + Solars.registerReverseRecipes(); + } } } diff --git a/src/main/java/emt/item/ItemElectricScribingTools.java b/src/main/java/emt/item/ItemElectricScribingTools.java index 76726cc..5a70e28 100644 --- a/src/main/java/emt/item/ItemElectricScribingTools.java +++ b/src/main/java/emt/item/ItemElectricScribingTools.java @@ -26,9 +26,8 @@ public class ItemElectricScribingTools extends ItemInkwell implements IElectricI this.setMaxStackSize(1); } - @SuppressWarnings("unchecked") @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this))); } @@ -53,7 +52,7 @@ public class ItemElectricScribingTools extends ItemInkwell implements IElectricI } @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { ItemStack itemStack = new ItemStack(this, 1); if (getChargedItem(itemStack) == this) { ItemStack charged = new ItemStack(this, 1); diff --git a/src/main/java/emt/item/ItemIC2Baubles.java b/src/main/java/emt/item/ItemIC2Baubles.java index 660c95c..cbe0b2d 100644 --- a/src/main/java/emt/item/ItemIC2Baubles.java +++ b/src/main/java/emt/item/ItemIC2Baubles.java @@ -67,7 +67,7 @@ public class ItemIC2Baubles extends ItemBase implements IBauble, IRunicArmor { } @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) { list.add(new ItemStack(this, 1, 0)); list.add(new ItemStack(this, 1, 1)); } diff --git a/src/main/java/emt/item/ItemMaterials.java b/src/main/java/emt/item/ItemMaterials.java index f17aada..02975e3 100644 --- a/src/main/java/emt/item/ItemMaterials.java +++ b/src/main/java/emt/item/ItemMaterials.java @@ -111,7 +111,7 @@ public class ItemMaterials extends Item { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List result, boolean advanced) { + public void addInformation(ItemStack stack, EntityPlayer player, List result, boolean advanced) { switch (stack.getItemDamage()) { case 16: case 17: @@ -152,7 +152,7 @@ public class ItemMaterials extends Item { } @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) { for (int i = 1; i <= 19; i++) { list.add(new ItemStack(this, 1, i)); } @@ -170,8 +170,8 @@ public class ItemMaterials extends Item { - player.yOffset; double playerZ = player.prevPosZ + ((player.posZ - player.prevPosZ) * f); Vec3 playerLoc = Vec3.createVectorHelper(playerX, playerY, playerZ); - float f3 = MathHelper.cos((-f2 * 0.01745329F) - 3.141593F); - float f4 = MathHelper.sin((-f2 * 0.01745329F) - 3.141593F); + float f3 = MathHelper.cos((-f2 * 0.01745329F) - (float) Math.PI); + float f4 = MathHelper.sin((-f2 * 0.01745329F) - (float) Math.PI); float f5 = -MathHelper.cos(-f1 * 0.01745329F); float f6 = MathHelper.sin(-f1 * 0.01745329F); float f7 = f4 * f5; diff --git a/src/main/java/emt/item/ItemOneRing.java b/src/main/java/emt/item/ItemOneRing.java index 27ced0f..6533280 100644 --- a/src/main/java/emt/item/ItemOneRing.java +++ b/src/main/java/emt/item/ItemOneRing.java @@ -61,7 +61,7 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun } @Override - public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { String colourCode = "" + EnumChatFormatting.DARK_RED; list.add( colourCode @@ -81,7 +81,7 @@ public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRun } @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) { list.add(new ItemStack(this, 1, 0)); } diff --git a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java index dd661ad..de675cc 100644 --- a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java @@ -54,7 +54,7 @@ public class ItemElectricBootsTraveller extends ItemArmor } @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { ItemStack itemStack = new ItemStack(this, 1); if (getChargedItem(itemStack) == this) { ItemStack charged = new ItemStack(this, 1); @@ -108,9 +108,8 @@ public class ItemElectricBootsTraveller extends ItemArmor return 0.15D; } - @SuppressWarnings("unchecked") @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this))); list.add(EMTTextHelper.PURPLE + EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + visDiscount + "%"); } diff --git a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java index 7804d21..fe866d7 100644 --- a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java +++ b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java @@ -410,7 +410,8 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements I @SuppressWarnings("unchecked") @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer player, @SuppressWarnings("rawtypes") List list, + boolean par4) { list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this))); } diff --git a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java index a898892..56020b4 100644 --- a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java @@ -58,7 +58,7 @@ public class ItemElectricGoggles extends ItemArmor public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {} @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { ItemStack itemStack = new ItemStack(this, 1); if (getChargedItem(itemStack) == this) { ItemStack charged = new ItemStack(this, 1); @@ -136,9 +136,8 @@ public class ItemElectricGoggles extends ItemArmor } } - @SuppressWarnings("unchecked") @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this))); list.add(EMTTextHelper.PURPLE + EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + visDiscount + "%"); } diff --git a/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java index bd3edc2..3fc4bb2 100644 --- a/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java @@ -21,7 +21,7 @@ import ic2.core.util.Keyboard; public class ItemQuantumGoggles extends ItemNanoGoggles { - private static final Map potionCost = new HashMap(); + private static final Map potionCost = new HashMap<>(); public ItemQuantumGoggles(ArmorMaterial material, int renderIndex, int armorType) { super(material, renderIndex, armorType); @@ -67,13 +67,14 @@ public class ItemQuantumGoggles extends ItemNanoGoggles { Field f; f = Keyboard.class.getDeclaredField("playerKeys"); f.setAccessible(true); - Map> playerKeys = (Map>) f.get(IC2.keyboard); + @SuppressWarnings("unchecked") + Map>> playerKeys = (Map>>) f.get(IC2.keyboard); - Enum hub = null; - Set set = playerKeys.get(player); + Enum hub = null; + Set> set = playerKeys.get(player); if (set != null) { - for (Enum e : set) { + for (Enum e : set) { if (e.ordinal() == 6) { hub = e; } diff --git a/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java index 18c88d1..0d4c929 100644 --- a/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java +++ b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java @@ -18,7 +18,7 @@ import ic2.api.item.IElectricItem; public class ItemSolarHelmetRevealing extends ItemQuantumGoggles { - private static final Map potionCost = new HashMap(); + private static final Map potionCost = new HashMap<>(); /* * private int ticker; private int generating; private boolean sunIsUp; private boolean skyIsVisible; private * boolean noSunWorld; private boolean dampPlace; @@ -26,7 +26,6 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles { private int genDay; private int genNight; - @SuppressWarnings("unchecked") public ItemSolarHelmetRevealing(ArmorMaterial material, int par3, int par4) { super(material, par3, par4); this.setMaxDamage(27); diff --git a/src/main/java/emt/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java index 99ff8e5..1cb2894 100644 --- a/src/main/java/emt/item/armor/wings/ItemNanoWing.java +++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java @@ -49,7 +49,7 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri } @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { ItemStack itemStack = new ItemStack(this, 1); if (getChargedItem(itemStack) == this) { ItemStack charged = new ItemStack(this, 1); @@ -132,9 +132,8 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri ElectricItem.manager.discharge(stack, damage * getEnergyPerDamage(), 0x7fffffff, true, false, false); } - @SuppressWarnings("unchecked") @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this))); } diff --git a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java index 11a9c90..bb871ad 100644 --- a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java +++ b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java @@ -49,9 +49,8 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD return EMT.TEXTURE_PATH + ":textures/models/thaumiumwing.png"; } - @SuppressWarnings("unchecked") @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { list.add(EMTTextHelper.PURPLE + EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + visDiscount + "%"); } diff --git a/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java b/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java index df620f4..92b2235 100644 --- a/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java +++ b/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java @@ -13,7 +13,6 @@ import org.lwjgl.input.Keyboard; import emt.util.EMTConfigHandler; import emt.util.EMTEssentiasOutputs; import emt.util.EMTTextHelper; -import gregtech.api.enums.GT_Values; import thaumcraft.api.aspects.Aspect; public class ItemBlockEssentiaGenerators extends ItemBlock { @@ -57,11 +56,11 @@ public class ItemBlockEssentiaGenerators extends ItemBlock { } private long getOutputAmperage(double EU) { - return (long) (1L + (EU / 20.0D / 20.0D / GT_Values.V[2])); + return 1L + (long) (EU * 1.953125e-5); // EU/(20 * 20 * 128) } @Override - public void addInformation(ItemStack is, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack is, EntityPlayer player, List list, boolean flag) { if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { switch (is.getItemDamage()) { case 0: diff --git a/src/main/java/emt/item/block/ItemBlockMachines.java b/src/main/java/emt/item/block/ItemBlockMachines.java index 7113b0b..1fdccd0 100644 --- a/src/main/java/emt/item/block/ItemBlockMachines.java +++ b/src/main/java/emt/item/block/ItemBlockMachines.java @@ -46,7 +46,8 @@ public class ItemBlockMachines extends ItemBlock { } @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { + public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, + boolean p_77624_4_) { switch (p_77624_1_.getItemDamage()) { case 2: { p_77624_3_.add("Connects between Essentia Hatches and the Pipe Network"); diff --git a/src/main/java/emt/item/block/ItemBlockSolars.java b/src/main/java/emt/item/block/ItemBlockSolars.java index 75bf448..138c680 100644 --- a/src/main/java/emt/item/block/ItemBlockSolars.java +++ b/src/main/java/emt/item/block/ItemBlockSolars.java @@ -51,7 +51,8 @@ public class ItemBlockSolars extends ItemBlock { } @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean advancedItemTooltips) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, + boolean advancedItemTooltips) { if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { TileEntitySolarBase te = Solars.getTileEntitySolarBase(instance, itemstack.getItemDamage()); if (instance == 0) { diff --git a/src/main/java/emt/item/focus/ItemBaseFocus.java b/src/main/java/emt/item/focus/ItemBaseFocus.java index 348cb14..0cf80be 100644 --- a/src/main/java/emt/item/focus/ItemBaseFocus.java +++ b/src/main/java/emt/item/focus/ItemBaseFocus.java @@ -103,8 +103,10 @@ public abstract class ItemBaseFocus extends ItemFocusBasic { return 5; } + @SuppressWarnings("unchecked") @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer player, @SuppressWarnings("rawtypes") List list, + boolean par4) { AspectList cost = getVisCost(stack); if (cost != null && cost.size() > 0) { list.add(StatCollector.translateToLocal(isVisCostPerTick() ? "item.Focus.cost2" : "item.Focus.cost1")); diff --git a/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java index f556c5a..c7c3815 100644 --- a/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java +++ b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java @@ -43,7 +43,7 @@ public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem { } @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { ItemStack itemStack = new ItemStack(this, 1); if (getChargedItem(itemStack) == this) { ItemStack charged = new ItemStack(this, 1); @@ -118,9 +118,8 @@ public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem { return did; } - @SuppressWarnings("unchecked") @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this))); } diff --git a/src/main/java/emt/item/tool/ItemElectricThorHammer.java b/src/main/java/emt/item/tool/ItemElectricThorHammer.java index a33e1a1..fd3f063 100644 --- a/src/main/java/emt/item/tool/ItemElectricThorHammer.java +++ b/src/main/java/emt/item/tool/ItemElectricThorHammer.java @@ -44,9 +44,8 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem { this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":hammer/electricthorhammer"); } - @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { ItemStack itemStack = new ItemStack(this, 1); if (getChargedItem(itemStack) == this) { ItemStack charged = new ItemStack(this, 1); @@ -66,9 +65,8 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem { return false; } - @SuppressWarnings("unchecked") @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this))); list.add( EMTTextHelper.localize("tooltip.EMT.hammer.electric") diff --git a/src/main/java/emt/item/tool/ItemThorHammer.java b/src/main/java/emt/item/tool/ItemThorHammer.java index ea7f44f..7b70dfa 100644 --- a/src/main/java/emt/item/tool/ItemThorHammer.java +++ b/src/main/java/emt/item/tool/ItemThorHammer.java @@ -46,8 +46,8 @@ public class ItemThorHammer extends ItemSword implements IRepairable { double d1 = (player.prevPosY + ((player.posY - player.prevPosY) * f) + 1.6200000000000001D) - player.yOffset; double d2 = player.prevPosZ + ((player.posZ - player.prevPosZ) * f); Vec3 vec3d = Vec3.createVectorHelper(d, d1, d2); - float f3 = MathHelper.cos((-f2 * 0.01745329F) - 3.141593F); - float f4 = MathHelper.sin((-f2 * 0.01745329F) - 3.141593F); + float f3 = MathHelper.cos((-f2 * 0.01745329F) - (float) Math.PI); + float f4 = MathHelper.sin((-f2 * 0.01745329F) - (float) Math.PI); float f5 = -MathHelper.cos(-f1 * 0.01745329F); float f6 = MathHelper.sin(-f1 * 0.01745329F); float f7 = f4 * f5; @@ -87,7 +87,7 @@ public class ItemThorHammer extends ItemSword implements IRepairable { } @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { list.add(EMTTextHelper.localize("tooltip.EMT.hammer.broken.The Hammer of Thor")); } } diff --git a/src/main/java/emt/item/tool/ItemThorHammerBroken.java b/src/main/java/emt/item/tool/ItemThorHammerBroken.java index f6a8200..45d09f9 100644 --- a/src/main/java/emt/item/tool/ItemThorHammerBroken.java +++ b/src/main/java/emt/item/tool/ItemThorHammerBroken.java @@ -57,7 +57,7 @@ public class ItemThorHammerBroken extends ItemSword implements IRepairable { } @Override - public void addInformation(ItemStack stack, EntityPlayer entityPlayer, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer entityPlayer, List list, boolean par4) { list.add(EMTTextHelper.localize("tooltip.EMT.hammer.broken.thor")); list.add(EMTTextHelper.localize("tooltip.EMT.hammer.broken.danger")); if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { diff --git a/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java index 93330f3..8fe199f 100644 --- a/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java @@ -93,7 +93,7 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { } @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { ItemStack itemStack = new ItemStack(this, 1); if (getChargedItem(itemStack) == this) { ItemStack charged = new ItemStack(this, 1); @@ -270,9 +270,8 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { return EMTConfigHandler.enchanting; } - @SuppressWarnings("unchecked") @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this))); } diff --git a/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java index becb71f..7a91549 100644 --- a/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java @@ -22,7 +22,7 @@ import thaumcraft.common.lib.utils.Utils; public class ItemStreamChainsaw extends ItemThaumiumChainsaw { - public static ArrayList oreDictLogs = new ArrayList(); + public static ArrayList oreDictLogs = new ArrayList<>(); boolean alternateServer; boolean alternateClient; diff --git a/src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java b/src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java index 0433aa4..d4bf4b9 100644 --- a/src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java +++ b/src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java @@ -5,7 +5,6 @@ import java.util.Iterator; import java.util.Locale; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -126,7 +125,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill { } int fortune = EnchantmentHelper.getFortuneModifier(entityLiving); world.setBlockToAir(x + xx, y + yy, z + zz); - ArrayList ret = bl.getDrops(world, x + xx, y + yy, z + zz, md, fortune); + ArrayList ret = bl.getDrops(world, x + xx, y + yy, z + zz, md, fortune); boolean creative = false; if ((entityLiving instanceof EntityPlayer) && ((EntityPlayer) entityLiving).capabilities.isCreativeMode) { @@ -136,7 +135,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill { continue; } ItemStack is; - for (Iterator i$ = ret.iterator(); i$.hasNext(); world.spawnEntityInWorld( + for (Iterator i$ = ret.iterator(); i$.hasNext(); world.spawnEntityInWorld( new EntityFollowingItem( world, (double) x + (double) xx + 0.5D, @@ -145,7 +144,7 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill { is, entityLiving, 3))) { - is = (ItemStack) i$.next(); + is = i$.next(); } } } @@ -193,7 +192,6 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill { 0.2F + world.rand.nextFloat() * 0.2F); return super.onItemUse(stack, player, world, x, y, z, side, xOffset, xOffset, zOffset); } - Minecraft mc = Minecraft.getMinecraft(); Thaumcraft.instance.renderEventHandler.startScan(player, x, y, z, System.currentTimeMillis() + 5000L, 1); player.swingItem(); return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); diff --git a/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java b/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java index 3f4a4d8..996e386 100644 --- a/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java +++ b/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java @@ -47,7 +47,7 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem { } @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { ItemStack itemStack = new ItemStack(this, 1); if (getChargedItem(itemStack) == this) { ItemStack charged = new ItemStack(this, 1); @@ -115,9 +115,8 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem { return EMTConfigHandler.enchanting; } - @SuppressWarnings("unchecked") @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this))); } diff --git a/src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java index b57e412..24a2500 100644 --- a/src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java +++ b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java @@ -50,7 +50,7 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { } @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { ItemStack itemStack = new ItemStack(this, 1); if (getChargedItem(itemStack) == this) { ItemStack charged = new ItemStack(this, 1); @@ -156,9 +156,8 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { return EMTConfigHandler.enchanting; } - @SuppressWarnings("unchecked") @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this))); } diff --git a/src/main/java/emt/tile/DefinitelyNotAIC2Source.java b/src/main/java/emt/tile/DefinitelyNotAIC2Source.java index 11884b6..1fd76d8 100644 --- a/src/main/java/emt/tile/DefinitelyNotAIC2Source.java +++ b/src/main/java/emt/tile/DefinitelyNotAIC2Source.java @@ -3,7 +3,6 @@ package emt.tile; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.FMLCommonHandler; -import gregtech.api.enums.GT_Values; public class DefinitelyNotAIC2Source { @@ -14,7 +13,7 @@ public class DefinitelyNotAIC2Source { protected long energyStored; public DefinitelyNotAIC2Source(TileEntity parent1, long capacity1, int tier1) { - long power = GT_Values.V[tier1]; + long power = 8L << (2 * tier1); this.parent = parent1; this.capacity = capacity1 < power ? power : capacity1; this.tier = (byte) tier1; diff --git a/src/main/java/emt/tile/GT_MetaTileEntity_ResearchCompleter.java b/src/main/java/emt/tile/GT_MetaTileEntity_ResearchCompleter.java index aa174df..cd0f659 100644 --- a/src/main/java/emt/tile/GT_MetaTileEntity_ResearchCompleter.java +++ b/src/main/java/emt/tile/GT_MetaTileEntity_ResearchCompleter.java @@ -26,6 +26,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMul import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; +import gregtech.api.util.shutdown.ShutDownReasonRegistry; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; @@ -209,7 +210,7 @@ public class GT_MetaTileEntity_ResearchCompleter if (syncTimer <= 0) sendClientAnimationUpdate(aBaseMetaTileEntity, lastNodeDistance, lastNodeColor); - if (requiredVis > 0) this.criticalStopMachine(); + if (requiredVis > 0) this.stopMachine(ShutDownReasonRegistry.CRITICAL_NONE); return super.onRunningTick(aStack); } @@ -248,7 +249,12 @@ public class GT_MetaTileEntity_ResearchCompleter this.mEfficiency = 10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000; this.mEfficiencyIncrease = 10000; - this.calculateOverclockedNessMulti(RECIPE_EUT, RECIPE_LENGTH, 1, this.getMaxInputVoltage()); + this.calculateOverclockedNessMultiInternal( + RECIPE_EUT, + RECIPE_LENGTH, + 1, + this.getMaxInputVoltage(), + false); if (this.mMaxProgresstime == 2147483646 && this.mEUt == 2147483646) { return false; } @@ -257,7 +263,7 @@ public class GT_MetaTileEntity_ResearchCompleter } // Create a completed version of the note to output - this.mOutputItems = new ItemStack[] { GT_Utility.copyAmount(1L, stack) }; + this.mOutputItems = new ItemStack[] { GT_Utility.copyAmount(1, stack) }; this.mOutputItems[0].stackTagCompound.setBoolean("complete", true); this.mOutputItems[0].setItemDamage(64); stack.stackSize -= 1; diff --git a/src/main/java/emt/tile/TileEntityEtherealMacerator.java b/src/main/java/emt/tile/TileEntityEtherealMacerator.java index bca26bd..123859b 100644 --- a/src/main/java/emt/tile/TileEntityEtherealMacerator.java +++ b/src/main/java/emt/tile/TileEntityEtherealMacerator.java @@ -9,6 +9,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraftforge.oredict.OreDictionary; import com.gtnewhorizons.modularui.api.ModularUITextures; +import com.gtnewhorizons.modularui.api.drawable.UITexture; import com.gtnewhorizons.modularui.api.forge.InvWrapper; import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI; import com.gtnewhorizons.modularui.api.screen.ModularWindow; @@ -20,13 +21,13 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget; import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import emt.util.EMTTextHelper; -import gregtech.api.gui.modularui.GT_UITextures; import ic2.api.tile.IWrenchable; import thaumcraft.common.config.ConfigItems; public class TileEntityEtherealMacerator extends TileEntityEMT implements ISidedInventory, IWrenchable, ITileWithModularUI { + private static final UITexture PROGRESSBAR_MACERATE = UITexture.fullImage("gregtech", "gui/progressbar/macerate"); private static final int[] slots_top = new int[] { 0 }; private static final int[] slots_bottom = new int[] { 2, 1 }; private static final int[] slots_sides = new int[] { 1 }; @@ -306,7 +307,7 @@ public class TileEntityEtherealMacerator extends TileEntityEMT .setPos(115, 25)) .widget(new SlotWidget(invWrapper, 1).setAccess(true, false).setPos(115, 52)) .widget( - new ProgressBar().setTexture(GT_UITextures.PROGRESSBAR_MACERATE, 20) + new ProgressBar().setTexture(PROGRESSBAR_MACERATE, 20) .setProgress(() -> (float) cookTime / maceratingSpeed).setPos(81, 36).setSize(20, 18)) .widget(new TextWidget(EMTTextHelper.localize("gui.EMT.etherealMacerator.title")).setPos(6, 6)); diff --git a/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java b/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java index 2cb9326..7e252ba 100644 --- a/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java +++ b/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java @@ -152,9 +152,9 @@ public class TileEntityIndustrialWandRecharge extends TileEntityEMT } @Override - public void readFromNBT(NBTTagCompound p_145839_1_) { - super.readFromNBT(p_145839_1_); - NBTTagList nbttaglist = p_145839_1_.getTagList("Items", 10); + public void readFromNBT(NBTTagCompound compound) { + super.readFromNBT(compound); + NBTTagList nbttaglist = compound.getTagList("Items", 10); this.ItemStacks = new ItemStack[this.getSizeInventory()]; for (int i = 0; i < nbttaglist.tagCount(); ++i) { @@ -167,13 +167,13 @@ public class TileEntityIndustrialWandRecharge extends TileEntityEMT } if (this.energyStored == 0) { - this.energyStored = p_145839_1_.getDouble("Energy"); + this.energyStored = compound.getDouble("Energy"); } } @Override - public void writeToNBT(NBTTagCompound p_145841_1_) { - super.writeToNBT(p_145841_1_); + public void writeToNBT(NBTTagCompound compound) { + super.writeToNBT(compound); NBTTagList nbttaglist = new NBTTagList(); for (int i = 0; i < this.ItemStacks.length; ++i) { @@ -185,8 +185,8 @@ public class TileEntityIndustrialWandRecharge extends TileEntityEMT } } - p_145841_1_.setTag("Items", nbttaglist); - p_145841_1_.setDouble("Energy", this.energyStored); + compound.setTag("Items", nbttaglist); + compound.setDouble("Energy", this.energyStored); } @Override diff --git a/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java index 7be5986..8d59e1f 100644 --- a/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java @@ -239,17 +239,17 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) { + public ItemStack decrStackSize(int index, int count) { return null; } @Override - public ItemStack getStackInSlotOnClosing(int p_70304_1_) { + public ItemStack getStackInSlotOnClosing(int index) { return null; } @Override - public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) {} + public void setInventorySlotContents(int index, ItemStack stack) {} @Override public boolean hasCustomInventoryName() { @@ -262,7 +262,7 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { + public boolean isUseableByPlayer(EntityPlayer player) { return true; } diff --git a/src/main/java/emt/tile/solar/Solars.java b/src/main/java/emt/tile/solar/Solars.java index 38dd355..4f49f29 100644 --- a/src/main/java/emt/tile/solar/Solars.java +++ b/src/main/java/emt/tile/solar/Solars.java @@ -8,9 +8,13 @@ import java.util.LinkedHashMap; import javax.annotation.Nullable; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.registry.GameRegistry; +import emt.block.BlockSolars; import emt.init.EMTBlocks; +import emt.item.block.ItemBlockSolars; import emt.util.EMTConfigHandler; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -202,4 +206,18 @@ public enum Solars { } return null; } + + public static Block[] registerBlocks() { + Block[] solars = new Block[getCountOfInstances()]; + for (int i = 0; i < solars.length; i++) { + if (i == 0) { + solars[i] = new BlockSolars("solar", Solars.getCountOfMetas(i), i); + GameRegistry.registerBlock(solars[i], ItemBlockSolars.class, "EMTSolars"); + } else { + solars[i] = new BlockSolars("solar" + (i + 1), Solars.getCountOfMetas(i), i); + GameRegistry.registerBlock(solars[i], ItemBlockSolars.class, "EMTSolars" + (i + 1)); + } + } + return solars; + } } diff --git a/src/main/java/emt/tile/solar/TileEntitySolarBase.java b/src/main/java/emt/tile/solar/TileEntitySolarBase.java index dd9ba95..a3d0b50 100644 --- a/src/main/java/emt/tile/solar/TileEntitySolarBase.java +++ b/src/main/java/emt/tile/solar/TileEntitySolarBase.java @@ -310,17 +310,17 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public ItemStack decrStackSize(int p_70298_1_, int p_70298_2_) { + public ItemStack decrStackSize(int index, int count) { return null; } @Override - public ItemStack getStackInSlotOnClosing(int p_70304_1_) { + public ItemStack getStackInSlotOnClosing(int index) { return null; } @Override - public void setInventorySlotContents(int p_70299_1_, ItemStack p_70299_2_) {} + public void setInventorySlotContents(int index, ItemStack stack) {} @Override public boolean hasCustomInventoryName() { @@ -338,7 +338,7 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public boolean isUseableByPlayer(EntityPlayer p_70300_1_) { + public boolean isUseableByPlayer(EntityPlayer player) { return true; } @@ -353,7 +353,7 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) { + public boolean isItemValidForSlot(int index, ItemStack stack) { return false; } diff --git a/src/main/java/emt/util/EMTConfigHandler.java b/src/main/java/emt/util/EMTConfigHandler.java index 5bd41b8..74c4c34 100644 --- a/src/main/java/emt/util/EMTConfigHandler.java +++ b/src/main/java/emt/util/EMTConfigHandler.java @@ -7,9 +7,6 @@ import java.util.List; import net.minecraftforge.common.config.Configuration; -import emt.gthandler.common.loader.EMT_GT_Loader; -import gregtech.api.enums.GT_Values; - /** * TODO: Need to rewrite... **/ @@ -55,6 +52,7 @@ public class EMTConfigHandler { public static double quantumBootsMaxDrop; public static double EssentiaGeneratorStorage; + public static int aIDoffset; /** * Essentias @@ -235,14 +233,11 @@ public class EMTConfigHandler { "This is the number you have to modify if you want to change the size of the " + "internal buffer of the Essentia Generator") .getDouble(EssentiaGeneratorStorage); - EMT_GT_Loader.aIDoffset = config - .get( - VALUES, - "aID offset for Gregetch Machinery", - (13000 - GT_Values.VN.length - 1), - "This Mod will use " + Integer.toString(GT_Values.VN.length + 1) - + " IDs, do not change if you dont know what you are doing!") - .getInt(13000 - GT_Values.VN.length - 1); + aIDoffset = config.get( + VALUES, + "aID offset for Gregetch Machinery", + 12983, + "This Mod will use 17 IDs, do not change if you dont know what you are doing!").getInt(); wandChargerConsumption = config .get(