From 0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 30 Jan 2023 10:56:42 -0800 Subject: [ci skip] spotlessApply with the new settings --- src/main/java/gregtech/loaders/ExtraIcons.java | 12 +- .../loaders/load/GT_CoverBehaviorLoader.java | 1 + .../java/gregtech/loaders/load/GT_FuelLoader.java | 68 +- .../gregtech/loaders/load/GT_ItemIterator.java | 351 +- .../gregtech/loaders/load/GT_SonictronLoader.java | 12 +- .../materialprocessing/ProcessingConfig.java | 37 +- .../materialprocessing/ProcessingModSupport.java | 1 + .../gregtech/loaders/misc/GT_Achievements.java | 275 +- .../gregtech/loaders/misc/GT_BeeDefinition.java | 5213 +++---- src/main/java/gregtech/loaders/misc/GT_Bees.java | 32 +- .../gregtech/loaders/misc/GT_BranchDefinition.java | 6 +- .../java/gregtech/loaders/misc/GT_CoverLoader.java | 10 +- .../loaders/oreprocessing/ProcessingAll.java | 12 +- .../loaders/oreprocessing/ProcessingArrows.java | 72 +- .../loaders/oreprocessing/ProcessingBeans.java | 14 +- .../loaders/oreprocessing/ProcessingBlock.java | 57 +- .../loaders/oreprocessing/ProcessingBolt.java | 18 +- .../loaders/oreprocessing/ProcessingCell.java | 52 +- .../loaders/oreprocessing/ProcessingCircuit.java | 33 +- .../oreprocessing/ProcessingCompressed.java | 12 +- .../loaders/oreprocessing/ProcessingCrafting.java | 10 +- .../loaders/oreprocessing/ProcessingCrate.java | 47 +- .../loaders/oreprocessing/ProcessingCrop.java | 70 +- .../oreprocessing/ProcessingCrushedOre.java | 38 +- .../oreprocessing/ProcessingCrystallized.java | 8 +- .../loaders/oreprocessing/ProcessingDirty.java | 110 +- .../loaders/oreprocessing/ProcessingDust.java | 145 +- .../loaders/oreprocessing/ProcessingDye.java | 15 +- .../loaders/oreprocessing/ProcessingFineWire.java | 18 +- .../loaders/oreprocessing/ProcessingFoil.java | 12 +- .../loaders/oreprocessing/ProcessingFood.java | 18 +- .../loaders/oreprocessing/ProcessingGear.java | 64 +- .../loaders/oreprocessing/ProcessingGem.java | 152 +- .../loaders/oreprocessing/ProcessingIngot.java | 98 +- .../loaders/oreprocessing/ProcessingItem.java | 11 +- .../loaders/oreprocessing/ProcessingLens.java | 12 +- .../loaders/oreprocessing/ProcessingLog.java | 63 +- .../loaders/oreprocessing/ProcessingNugget.java | 17 +- .../loaders/oreprocessing/ProcessingOre.java | 111 +- .../loaders/oreprocessing/ProcessingOrePoor.java | 15 +- .../oreprocessing/ProcessingOreSmelting.java | 43 +- .../loaders/oreprocessing/ProcessingPipe.java | 102 +- .../loaders/oreprocessing/ProcessingPlank.java | 16 +- .../loaders/oreprocessing/ProcessingPlate.java | 217 +- .../loaders/oreprocessing/ProcessingPure.java | 8 +- .../loaders/oreprocessing/ProcessingRecycling.java | 11 +- .../loaders/oreprocessing/ProcessingRotor.java | 36 +- .../loaders/oreprocessing/ProcessingRound.java | 16 +- .../loaders/oreprocessing/ProcessingSand.java | 10 +- .../loaders/oreprocessing/ProcessingSaplings.java | 12 +- .../loaders/oreprocessing/ProcessingScrew.java | 10 +- .../loaders/oreprocessing/ProcessingShaping.java | 238 +- .../loaders/oreprocessing/ProcessingSlab.java | 8 +- .../loaders/oreprocessing/ProcessingStick.java | 17 +- .../loaders/oreprocessing/ProcessingStickLong.java | 16 +- .../loaders/oreprocessing/ProcessingStone.java | 23 +- .../oreprocessing/ProcessingStoneCobble.java | 12 +- .../oreprocessing/ProcessingStoneVarious.java | 14 +- .../loaders/oreprocessing/ProcessingToolHead.java | 2128 +-- .../loaders/oreprocessing/ProcessingToolOther.java | 228 +- .../oreprocessing/ProcessingTransforming.java | 35 +- .../loaders/oreprocessing/ProcessingWax.java | 8 +- .../loaders/oreprocessing/ProcessingWire.java | 182 +- .../loaders/postload/GT_BlockResistanceLoader.java | 7 +- .../loaders/postload/GT_BookAndLootLoader.java | 327 +- .../loaders/postload/GT_CraftingRecipeLoader.java | 3925 ++--- .../gregtech/loaders/postload/GT_CropLoader.java | 232 +- .../postload/GT_ExtremeDieselFuelLoader.java | 1 + .../loaders/postload/GT_FakeRecipeLoader.java | 1 + .../postload/GT_ItemMaxStacksizeLoader.java | 8 +- .../loaders/postload/GT_MinableRegistrator.java | 4 +- .../postload/GT_PCBFactoryMaterialLoader.java | 1 + .../gregtech/loaders/postload/GT_PostLoad.java | 324 +- .../postload/GT_ProcessingArrayRecipeLoader.java | 35 +- .../postload/GT_RecyclerBlacklistLoader.java | 105 +- .../loaders/postload/GT_ScrapboxDropLoader.java | 8 +- .../loaders/postload/GT_UUMRecipeLoader.java | 1 + .../loaders/postload/GT_Worldgenloader.java | 894 +- .../gregtech/loaders/postload/PartP2PGTPower.java | 17 +- .../postload/chains/GT_BauxiteRefineChain.java | 59 +- .../loaders/postload/chains/GT_NaniteChain.java | 178 +- .../postload/chains/GT_PCBFactoryRecipes.java | 571 +- .../postload/recipes/AlloySmelterRecipes.java | 161 +- .../postload/recipes/ArcFurnaceRecipes.java | 252 +- .../loaders/postload/recipes/AssemblerRecipes.java | 2776 ++-- .../postload/recipes/AssemblyLineRecipes.java | 940 +- .../loaders/postload/recipes/AutoclaveRecipes.java | 14 +- .../loaders/postload/recipes/BenderRecipes.java | 11 +- .../postload/recipes/BlastFurnaceRecipes.java | 44 +- .../loaders/postload/recipes/BreweryRecipes.java | 74 +- .../loaders/postload/recipes/CannerRecipes.java | 1 + .../postload/recipes/CentrifugeRecipes.java | 58 +- .../postload/recipes/ChemicalBathRecipes.java | 22 +- .../loaders/postload/recipes/ChemicalRecipes.java | 1487 +- .../postload/recipes/CircuitAssemblerRecipes.java | 298 +- .../postload/recipes/CompressorRecipes.java | 63 +- .../postload/recipes/CropProcessingRecipes.java | 46 +- .../loaders/postload/recipes/CuttingRecipes.java | 171 +- .../postload/recipes/DistilleryRecipes.java | 776 +- .../postload/recipes/ElectrolyzerRecipes.java | 12 +- .../recipes/ElectromagneticSeparatorRecipes.java | 3 +- .../loaders/postload/recipes/ExtractorRecipes.java | 95 +- .../loaders/postload/recipes/ExtruderRecipes.java | 7 +- .../loaders/postload/recipes/FermenterRecipes.java | 204 +- .../postload/recipes/FluidCannerRecipes.java | 1 + .../postload/recipes/FluidExtractorRecipes.java | 129 +- .../postload/recipes/FluidHeaterRecipes.java | 7 +- .../postload/recipes/FluidSolidifierRecipes.java | 46 +- .../postload/recipes/ForgeHammerRecipes.java | 47 +- .../postload/recipes/FormingPressRecipes.java | 8 +- .../loaders/postload/recipes/FuelRecipes.java | 6 +- .../postload/recipes/FusionReactorRecipes.java | 5 +- .../recipes/ImplosionCompressorRecipes.java | 1 + .../postload/recipes/LaserEngraverRecipes.java | 38 +- .../loaders/postload/recipes/LatheRecipes.java | 8 +- .../postload/recipes/MatterAmplifierRecipes.java | 1 + .../loaders/postload/recipes/MixerRecipes.java | 89 +- .../loaders/postload/recipes/NEIHiding.java | 4 +- .../postload/recipes/OreDictUnification.java | 1 + .../loaders/postload/recipes/PackagerRecipes.java | 7 +- .../postload/recipes/PlasmaForgeRecipes.java | 36 +- .../loaders/postload/recipes/PrinterRecipes.java | 6 +- .../loaders/postload/recipes/Pulverizer.java | 322 +- .../loaders/postload/recipes/PyrolyseRecipes.java | 28 +- .../loaders/postload/recipes/RecipeRemover.java | 80 +- .../loaders/postload/recipes/SifterRecipes.java | 34 +- .../loaders/postload/recipes/SlicerRecipes.java | 1 + .../loaders/postload/recipes/SmelterRecipes.java | 17 +- .../postload/recipes/ThaumcraftRecipes.java | 820 +- .../postload/recipes/ThermalCentrifugeRecipes.java | 5 +- .../postload/recipes/VacuumFreezerRecipes.java | 84 +- .../loaders/postload/recipes/WiremillRecipes.java | 10 +- .../preload/GT_Loader_CircuitBehaviors.java | 1 + .../loaders/preload/GT_Loader_ItemData.java | 308 +- .../preload/GT_Loader_Item_Block_And_Fluid.java | 2368 ++- .../preload/GT_Loader_MetaTileEntities.java | 15612 +++++++------------ .../preload/GT_Loader_MultiTileEntities.java | 51 +- .../loaders/preload/GT_Loader_OreDictionary.java | 279 +- .../loaders/preload/GT_Loader_OreProcessing.java | 1 + .../java/gregtech/loaders/preload/GT_PreLoad.java | 773 +- 140 files changed, 19068 insertions(+), 27091 deletions(-) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/ExtraIcons.java b/src/main/java/gregtech/loaders/ExtraIcons.java index ff867cce25..42d5c1ec7c 100644 --- a/src/main/java/gregtech/loaders/ExtraIcons.java +++ b/src/main/java/gregtech/loaders/ExtraIcons.java @@ -2,12 +2,14 @@ package gregtech.loaders; import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.TextureStitchEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + public class ExtraIcons { + public static IIcon steelLargeCellInner; public static IIcon aluminiumLargeCellInner; public static IIcon stainlesssteelLargeCellInner; @@ -24,10 +26,10 @@ public class ExtraIcons { if (reg.getTextureType() == 1) { // are for items steelLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/steel_inner"); aluminiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/aluminium_inner"); - stainlesssteelLargeCellInner = - reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/stainlesssteel_inner"); - tungstensteelLargeCellInner = - reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/tungstensteel_inner"); + stainlesssteelLargeCellInner = reg + .registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/stainlesssteel_inner"); + tungstensteelLargeCellInner = reg + .registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/tungstensteel_inner"); titaniumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/titanium_inner"); chromiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/chromium_inner"); iridiumLargeCellInner = reg.registerIcon(RES_PATH_ITEM + "large_fluid_cell_custom/iridium_inner"); diff --git a/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java b/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java index 01987f8b47..37f626ef90 100644 --- a/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java @@ -3,6 +3,7 @@ package gregtech.loaders.load; import gregtech.api.util.GT_Log; public class GT_CoverBehaviorLoader implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Adding Cover Behaviors"); diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index 580223f444..470924053f 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -1,5 +1,9 @@ package gregtech.loaders.load; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -9,24 +13,22 @@ import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class GT_FuelLoader implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Initializing various Fuels."); - ItemList.sBlueVitriol = - GT_Mod.gregtechproxy.addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295); - ItemList.sNickelSulfate = - GT_Mod.gregtechproxy.addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295); - ItemList.sGreenVitriol = - GT_Mod.gregtechproxy.addFluid("solution.greenvitriol", "Green Vitriol water solution", null, 1, 295); - ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy.addFluid( - "indiumconcentrate", "Indium Concentrate", null, 1, 295); // TODO CHECK NEW x3 - ItemList.sLeadZincSolution = - GT_Mod.gregtechproxy.addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295); + ItemList.sBlueVitriol = GT_Mod.gregtechproxy + .addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295); + ItemList.sNickelSulfate = GT_Mod.gregtechproxy + .addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295); + ItemList.sGreenVitriol = GT_Mod.gregtechproxy + .addFluid("solution.greenvitriol", "Green Vitriol water solution", null, 1, 295); + ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy + .addFluid("indiumconcentrate", "Indium Concentrate", null, 1, 295); // TODO CHECK NEW x3 + ItemList.sLeadZincSolution = GT_Mod.gregtechproxy + .addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295); ItemList.sRocketFuel = GT_Mod.gregtechproxy.addFluid("rocket_fuel", "Rocket Fuel", null, 1, 295); new GT_Recipe( new ItemStack(Items.lava_bucket), @@ -39,8 +41,8 @@ public class GT_FuelLoader implements Runnable { GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels.addRecipe( true, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L) }, null, null, null, @@ -49,8 +51,8 @@ public class GT_FuelLoader implements Runnable { 50000); GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels.addRecipe( true, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L) }, null, null, null, @@ -59,8 +61,8 @@ public class GT_FuelLoader implements Runnable { 250000); GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels.addRecipe( true, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L) }, null, null, null, @@ -69,8 +71,8 @@ public class GT_FuelLoader implements Runnable { 500000); GT_Recipe.GT_Recipe_Map.sExtremeNaquadahReactorFuels.addRecipe( true, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L) }, null, null, null, @@ -79,8 +81,8 @@ public class GT_FuelLoader implements Runnable { 250000); GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels.addRecipe( true, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L) }, null, null, null, @@ -89,8 +91,8 @@ public class GT_FuelLoader implements Runnable { 1000000); GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels.addRecipe( true, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L)}, - new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadah, 1L)}, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L) }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadah, 1L) }, null, null, null, @@ -101,8 +103,8 @@ public class GT_FuelLoader implements Runnable { // BloodMagic GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L)}, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "blankSlate", 1L)}, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "blankSlate", 1L) }, null, null, null, @@ -111,8 +113,8 @@ public class GT_FuelLoader implements Runnable { 400); GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L)}, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L)}, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "reinforcedSlate", 1L) }, null, null, null, @@ -121,8 +123,8 @@ public class GT_FuelLoader implements Runnable { 1000); GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L)}, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L)}, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L) }, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "imbuedSlate", 1L) }, null, null, null, @@ -131,8 +133,8 @@ public class GT_FuelLoader implements Runnable { 8000); GT_Recipe.GT_Recipe_Map.sMagicFuels.addRecipe( true, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 1L, 27)}, - new ItemStack[] {GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L)}, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "bloodMagicBaseItems", 1L, 27) }, + new ItemStack[] { GT_ModHandler.getModItem("AWWayofTime", "demonicSlate", 1L) }, null, null, null, diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java index 3e1cf72c06..e894acf4be 100644 --- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java @@ -1,5 +1,15 @@ package gregtech.loaders.load; +import mods.railcraft.api.core.items.IToolCrowbar; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.IFluidContainerItem; + import buildcraft.api.tools.IToolWrench; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; @@ -14,64 +24,62 @@ import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import mods.railcraft.api.core.items.IToolCrowbar; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.IFluidContainerItem; public class GT_ItemIterator implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Scanning for certain kinds of compatible Machineblocks."); ItemStack tStack2; ItemStack tStack; - if (null - != (tStack = GT_ModHandler.getRecipeOutput( - tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), - tStack2, - tStack2, - tStack2, - null, - tStack2, - tStack2, - tStack2, - tStack2))) { + if (null != (tStack = GT_ModHandler.getRecipeOutput( + tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L), + tStack2, + tStack2, + tStack2, + null, + tStack2, + tStack2, + tStack2, + tStack2))) { GT_ModHandler.addPulverisationRecipe( - tStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L), null, 0, false); + tStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L), + null, + 0, + false); GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L)); } - if (null - != (tStack = GT_ModHandler.getRecipeOutput( - tStack2 = GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1L), - tStack2, - tStack2, - tStack2, - null, - tStack2, - tStack2, - tStack2, - tStack2))) { + if (null != (tStack = GT_ModHandler.getRecipeOutput( + tStack2 = GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1L), + tStack2, + tStack2, + tStack2, + null, + tStack2, + tStack2, + tStack2, + tStack2))) { GT_OreDictUnificator.registerOre(OreDictNames.craftingRawMachineTier00, tStack); GT_ModHandler.addPulverisationRecipe( - tStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L), null, 0, false); + tStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L), + null, + 0, + false); GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L)); } ItemStack tStack3; - if (null - != (tStack = GT_ModHandler.getRecipeOutput( - tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), - tStack3 = new ItemStack(Blocks.glass, 1, 0), - tStack2, - tStack3, - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), - tStack3, - tStack2, - tStack3, - tStack2))) { + if (null != (tStack = GT_ModHandler.getRecipeOutput( + tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), + tStack3 = new ItemStack(Blocks.glass, 1, 0), + tStack2, + tStack3, + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), + tStack3, + tStack2, + tStack3, + tStack2))) { GT_ModHandler.addPulverisationRecipe( tStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L), @@ -79,17 +87,16 @@ public class GT_ItemIterator implements Runnable { 0, false); } - if (null - != (tStack = GT_ModHandler.getRecipeOutput( - tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), - tStack3 = new ItemStack(Blocks.glass, 1, 0), - tStack2, - tStack3, - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), - tStack3, - tStack2, - tStack3, - tStack2))) { + if (null != (tStack = GT_ModHandler.getRecipeOutput( + tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), + tStack3 = new ItemStack(Blocks.glass, 1, 0), + tStack2, + tStack3, + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), + tStack3, + tStack2, + tStack3, + tStack2))) { GT_ModHandler.addPulverisationRecipe( tStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L), @@ -98,10 +105,19 @@ public class GT_ItemIterator implements Runnable { false); } GT_Log.out.println("GT_Mod: Registering various Tools to be usable on GregTech Machines"); - GregTech_API.registerScrewdriver(GT_ModHandler.getRecipeOutput( - null, new ItemStack(Items.iron_ingot, 1), null, new ItemStack(Items.stick, 1))); - GregTech_API.registerScrewdriver(GT_ModHandler.getRecipeOutput( - new ItemStack(Items.iron_ingot, 1), null, null, null, new ItemStack(Items.stick, 1))); + GregTech_API.registerScrewdriver( + GT_ModHandler.getRecipeOutput( + null, + new ItemStack(Items.iron_ingot, 1), + null, + new ItemStack(Items.stick, 1))); + GregTech_API.registerScrewdriver( + GT_ModHandler.getRecipeOutput( + new ItemStack(Items.iron_ingot, 1), + null, + null, + null, + new ItemStack(Items.stick, 1))); GT_Log.out.println( "GT_Mod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)"); @@ -144,7 +160,7 @@ public class GT_ItemIterator implements Runnable { GT_Log.out.println("GT_Mod: Scanning ItemList."); try { - /*(tName.equals("tile.sedimentaryStone")) ||**/ + /* (tName.equals("tile.sedimentaryStone")) || **/ for (Object o : Item.itemRegistry) { Object tObject; if (((tObject = o) instanceof Item) && (!(tObject instanceof GT_Generic_Item))) { @@ -155,9 +171,9 @@ public class GT_ItemIterator implements Runnable { if ((!tItem.isDamageable()) && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { if ((GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.disabledrecipes, - "infiniteDurabilityRCCrowbars", - false)) + ConfigCategories.Recipes.disabledrecipes, + "infiniteDurabilityRCCrowbars", + false)) && (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 32767)))) { GT_Log.out.println("GT_Mod: Removed infinite RC Crowbar: " + tName); } @@ -169,9 +185,9 @@ public class GT_ItemIterator implements Runnable { if ((!tItem.isDamageable()) && (!GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { if ((GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.disabledrecipes, - "infiniteDurabilityBCWrenches", - false)) + ConfigCategories.Recipes.disabledrecipes, + "infiniteDurabilityBCWrenches", + false)) && (GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 32767)))) { GT_Log.out.println("GT_Mod: Removed infinite BC Wrench: " + tName); } @@ -194,8 +210,7 @@ public class GT_ItemIterator implements Runnable { } } } - if (((tItem instanceof ItemFood)) - && (tItem != ItemList.IC2_Food_Can_Filled.getItem()) + if (((tItem instanceof ItemFood)) && (tItem != ItemList.IC2_Food_Can_Filled.getItem()) && (tItem != ItemList.IC2_Food_Can_Spoiled.getItem())) { int tFoodValue = ((ItemFood) tItem).func_150905_g(new ItemStack(tItem, 1, 0)); if (tFoodValue > 0) { @@ -283,124 +298,122 @@ public class GT_ItemIterator implements Runnable { GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Lignite, new ItemStack(tItem, 1, 0)); } if ((tName.equals("tile.extrabiomes.redrock")) || (tName.equals("tile.bop.redRocks"))) { - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 2)); } if (tName.equals("tile.rpstone")) { - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 3)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 4)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 6)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 3)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 6)); } if ( - /**(tName.equals("tile.sedimentaryStone")) ||**/ - ((tName.equals("tile.igneousStone")) - || (tName.equals("tile.igneousStoneBrick")) + /** (tName.equals("tile.sedimentaryStone")) || **/ + ((tName.equals("tile.igneousStone")) || (tName.equals("tile.igneousStoneBrick")) || (tName.equals("tile.igneousCobblestone")))) { - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 2)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 3)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 4)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 6)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 7)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 3)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 5)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 6)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 7)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 8)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 9)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 10)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 11)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 12)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 13)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 14)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 15)); - } - if ((tName.equals("tile.metamorphicStone")) - || (tName.equals("tile.metamorphicStoneBrick")) + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.GraniteRed, new ItemStack(tItem, 1, 8)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.GraniteBlack, new ItemStack(tItem, 1, 9)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Rhyolite, new ItemStack(tItem, 1, 10)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Andesite, new ItemStack(tItem, 1, 11)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Gabbro, new ItemStack(tItem, 1, 12)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(tItem, 1, 13)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Komatiite, new ItemStack(tItem, 1, 14)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Dacite, new ItemStack(tItem, 1, 15)); + } + if ((tName.equals("tile.metamorphicStone")) || (tName.equals("tile.metamorphicStoneBrick")) || (tName.equals("tile.metamorphicCobblestone"))) { - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 3)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 4)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 5)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 6)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 7)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 2)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 3)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 5)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 6)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 7)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 8)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 9)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 10)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 11)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 12)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 13)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 14)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 15)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Gneiss, new ItemStack(tItem, 1, 8)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Eclogite, new ItemStack(tItem, 1, 9)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(tItem, 1, 10)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Quartzite, new ItemStack(tItem, 1, 11)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Blueschist, new ItemStack(tItem, 1, 12)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Greenschist, new ItemStack(tItem, 1, 13)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Soapstone, new ItemStack(tItem, 1, 14)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Migmatite, new ItemStack(tItem, 1, 15)); } if (tName.equals("tile.blockCosmeticSolid")) { - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator.registerOre( - OrePrefixes.block, Materials.Thaumium, new ItemStack(tItem, 1, 4)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 1)); + GT_OreDictUnificator + .registerOre(OrePrefixes.block, Materials.Thaumium, new ItemStack(tItem, 1, 4)); } if (tName.equals("tile.enderchest")) { GT_OreDictUnificator.registerOre(OreDictNames.enderChest, new ItemStack(tItem, 1, 32767)); } if (tName.equals("tile.autoWorkbenchBlock")) { - GT_OreDictUnificator.registerOre( - OreDictNames.craftingWorkBench, new ItemStack(tItem, 1, 0)); + GT_OreDictUnificator + .registerOre(OreDictNames.craftingWorkBench, new ItemStack(tItem, 1, 0)); } if (tName.equals("tile.pumpBlock")) { GT_OreDictUnificator.registerOre(OreDictNames.craftingPump, new ItemStack(tItem, 1, 0)); - if (GregTech_API.sRecipeFile.get( - ConfigCategories.Recipes.disabledrecipes, "BCPump", false)) { + if (GregTech_API.sRecipeFile + .get(ConfigCategories.Recipes.disabledrecipes, "BCPump", false)) { GT_ModHandler.removeRecipeByOutput(new ItemStack(tItem, 1, 0)); } } @@ -408,8 +421,8 @@ public class GT_ItemIterator implements Runnable { GT_OreDictUnificator.registerOre(OreDictNames.craftingTank, new ItemStack(tItem, 1, 0)); } if (tName.equals("item.drawplateDiamond")) { - GT_OreDictUnificator.registerOre( - ToolDictNames.craftingToolDrawplate, new ItemStack(tItem, 1, 32767)); + GT_OreDictUnificator + .registerOre(ToolDictNames.craftingToolDrawplate, new ItemStack(tItem, 1, 32767)); } } } diff --git a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java index d067cf74d5..ce66b80a55 100644 --- a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java @@ -1,13 +1,15 @@ package gregtech.loaders.load; -import gregtech.GT_Mod; -import gregtech.api.enums.SoundResource; -import gregtech.api.util.GT_Log; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import gregtech.GT_Mod; +import gregtech.api.enums.SoundResource; +import gregtech.api.util.GT_Log; + public class GT_SonictronLoader implements Runnable { + @Override public void run() { GT_Log.out.println("GT_Mod: Loading Sonictron Sounds"); @@ -110,8 +112,8 @@ public class GT_SonictronLoader implements Runnable { GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.glass_bottle, 1)); GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_BURP.toString()); GT_Mod.gregtechproxy.mSoundCounts.add(1); - GT_Mod.gregtechproxy.mSoundItems.add( - new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1)); + GT_Mod.gregtechproxy.mSoundItems + .add(new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1)); GT_Mod.gregtechproxy.mSoundNames.add(SoundResource.RANDOM_CHESTOPEN.toString()); GT_Mod.gregtechproxy.mSoundCounts.add(1); GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.chest, 1)); diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java index d8fc898cf4..fe8ff8c12d 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingConfig.java @@ -7,6 +7,7 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.TextureSet; public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandler { + public ProcessingConfig() { new GTNH_ExtraMaterials(); Materials.add(this); @@ -17,9 +18,8 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle /** This is just left here as an example of how to add new materials. **/ if (false) { int i = 0; - for (int j = GregTech_API.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16); - i < j; - i++) { + for (int j = GregTech_API.sMaterialProperties.get("general", "AmountOfCustomMaterialSlots", 16); i + < j; i++) { String aID = (i < 10 ? "0" : "") + i; new Materials( -1, @@ -54,25 +54,26 @@ public class ProcessingConfig implements gregtech.api.interfaces.IMaterialHandle @Override public void onComponentInit() { /** This is just left here as an example of how to add components. **/ - /* Enabling specific components: - OrePrefixes.spring.enableComponent(Materials.Cobalt); - OrePrefixes.ingotDouble.enableComponent(Materials.Cobalt); - OrePrefixes.ingotTriple.enableComponent(Materials.Cobalt); - OrePrefixes.ingotQuadruple.enableComponent(Materials.Cobalt); - OrePrefixes.ingotQuintuple.enableComponent(Materials.Cobalt); - OrePrefixes.plateDouble.enableComponent(Materials.Cobalt); - OrePrefixes.plateTriple.enableComponent(Materials.Cobalt); - OrePrefixes.plateQuadruple.enableComponent(Materials.Cobalt); - OrePrefixes.plateQuintuple.enableComponent(Materials.Cobalt); - OrePrefixes.plateDense.enableComponent(Materials.Cobalt); */ + /* + * Enabling specific components: OrePrefixes.spring.enableComponent(Materials.Cobalt); + * OrePrefixes.ingotDouble.enableComponent(Materials.Cobalt); + * OrePrefixes.ingotTriple.enableComponent(Materials.Cobalt); + * OrePrefixes.ingotQuadruple.enableComponent(Materials.Cobalt); + * OrePrefixes.ingotQuintuple.enableComponent(Materials.Cobalt); + * OrePrefixes.plateDouble.enableComponent(Materials.Cobalt); + * OrePrefixes.plateTriple.enableComponent(Materials.Cobalt); + * OrePrefixes.plateQuadruple.enableComponent(Materials.Cobalt); + * OrePrefixes.plateQuintuple.enableComponent(Materials.Cobalt); + * OrePrefixes.plateDense.enableComponent(Materials.Cobalt); + */ } @Override public void onComponentIteration(Materials aMaterial) { /** This is just left here as an example of how to add components. **/ - /*Enabling/Disabling components depending on the current Materials values: - if ((aMaterial.mTypes & 0x40) != 0) { //This material can be made into tool heads - OrePrefixes.plateQuadruple.mDisabledItems.remove(aMaterial); - } */ + /* + * Enabling/Disabling components depending on the current Materials values: if ((aMaterial.mTypes & 0x40) != 0) + * { //This material can be made into tool heads OrePrefixes.plateQuadruple.mDisabledItems.remove(aMaterial); } + */ } } diff --git a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java index d1c7d48f3a..58808e2162 100644 --- a/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java +++ b/src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java @@ -8,6 +8,7 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; public class ProcessingModSupport implements gregtech.api.interfaces.IMaterialHandler { + public static boolean aTGregSupport = Loader.isModLoaded("TGregworks") || Loader.isModLoaded(MOD_ID_DC); public static boolean aEnableUBCMats = Loader.isModLoaded("UndergroundBiomes") || aTGregSupport; public static boolean aEnableThaumcraftMats = Loader.isModLoaded("Thaumcraft") || aTGregSupport; diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 4d5de34782..58f56cbd70 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -1,5 +1,19 @@ package gregtech.loaders.misc; +import java.util.concurrent.ConcurrentHashMap; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; +import net.minecraft.stats.AchievementList; +import net.minecraft.stats.StatBase; +import net.minecraftforge.common.AchievementPage; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import net.minecraftforge.fluids.FluidStack; + +import thaumcraft.api.ThaumcraftApiHelper; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -15,20 +29,9 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.common.items.GT_MetaGenerated_Tool_01; import ic2.core.Ic2Items; -import java.util.concurrent.ConcurrentHashMap; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.Achievement; -import net.minecraft.stats.AchievementList; -import net.minecraft.stats.StatBase; -import net.minecraftforge.common.AchievementPage; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; -import net.minecraftforge.fluids.FluidStack; -import thaumcraft.api.ThaumcraftApiHelper; public class GT_Achievements { + public static int oreReg = -1; public static int assReg = -1; public ConcurrentHashMap achievementList; @@ -64,8 +67,8 @@ public class GT_Achievements { "tools", 0, 4, - GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.HARDHAMMER, 1, Materials.Iron, Materials.Wood, null), + GT_MetaGenerated_Tool_01.INSTANCE + .getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, Materials.Iron, Materials.Wood, null), "flintpick", false); registerAchievement( @@ -73,7 +76,11 @@ public class GT_Achievements { 2, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_LV, 1, Materials.BlueSteel, Materials.StainlessSteel, null), + GT_MetaGenerated_Tool_01.DRILL_LV, + 1, + Materials.BlueSteel, + Materials.StainlessSteel, + null), "tools", false); registerAchievement( @@ -81,7 +88,11 @@ public class GT_Achievements { 2, 6, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.CHAINSAW_LV, 1, Materials.BlueSteel, Materials.StainlessSteel, null), + GT_MetaGenerated_Tool_01.CHAINSAW_LV, + 1, + Materials.BlueSteel, + Materials.StainlessSteel, + null), "driltime", false); registerAchievement( @@ -89,7 +100,11 @@ public class GT_Achievements { 3, 5, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.DRILL_HV, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), + GT_MetaGenerated_Tool_01.DRILL_HV, + 1, + Materials.TungstenSteel, + Materials.TungstenSteel, + null), "driltime", false); registerAchievement( @@ -97,7 +112,11 @@ public class GT_Achievements { 3, 7, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.JACKHAMMER, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), + GT_MetaGenerated_Tool_01.JACKHAMMER, + 1, + Materials.TungstenSteel, + Materials.TungstenSteel, + null), "highpowerdrill", false); registerAchievement("repair", 4, 5, ItemList.Machine_HV_Disassembler.get(1), "highpowerdrill", false); @@ -107,13 +126,22 @@ public class GT_Achievements { -2, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( - GT_MetaGenerated_Tool_01.UNIVERSALSPADE, 1, Materials.Steel, Materials.Iron, null), + GT_MetaGenerated_Tool_01.UNIVERSALSPADE, + 1, + Materials.Steel, + Materials.Iron, + null), "tools", false); registerAchievement("recycling", -4, 4, ItemList.Machine_LV_ArcFurnace.get(1), "unitool", false); registerAchievement( - "crushed", 0, 6, GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L), "tools", false); + "crushed", + 0, + 6, + GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L), + "tools", + false); registerAchievement( "cleandust", 0, @@ -147,7 +175,12 @@ public class GT_Achievements { registerAchievement("reflect", -2, 9, ItemList.Neutron_Reflector.get(1), "newfuel", false); } registerAchievement( - "bronze", 2, 0, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 1L), "flintpick", false); + "bronze", + 2, + 0, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 1L), + "flintpick", + false); registerAchievement( "simplyeco", 2, @@ -170,9 +203,19 @@ public class GT_Achievements { registerAchievement("gtcleanroom", -11, -10, ItemList.Machine_Multi_Cleanroom.get(1), "gtlogiccircuit", false); registerAchievement("energyflow", -13, -10, ItemList.Circuit_Nanoprocessor.get(1), "gtcleanroom", false); registerAchievement( - "gtquantumprocessor", -13, -12, ItemList.Circuit_Quantumprocessor.get(1), "energyflow", false); + "gtquantumprocessor", + -13, + -12, + ItemList.Circuit_Quantumprocessor.get(1), + "energyflow", + false); registerAchievement( - "gtcrystalprocessor", -11, -12, ItemList.Circuit_Crystalprocessor.get(1), "gtquantumprocessor", false); + "gtcrystalprocessor", + -11, + -12, + ItemList.Circuit_Crystalprocessor.get(1), + "gtquantumprocessor", + false); registerAchievement("gtwetware", -9, -12, ItemList.Circuit_Neuroprocessor.get(1), "gtcrystalprocessor", false); registerAchievement("gtwetmain", -7, -12, ItemList.Circuit_Wetwaremainframe.get(1), "gtwetware", false); @@ -185,10 +228,20 @@ public class GT_Achievements { registerAchievement("luck", 2, -6, ItemList.ZPM.get(1), "", false); registerAchievement( - "steel", 4, 0, GT_OreDictUnificator.get(OrePr