diff options
| author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-09-02 23:17:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-02 23:17:17 +0200 |
| commit | 1b820de08a05070909a267e17f033fcf58ac8710 (patch) | |
| tree | 02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/gregtech/loaders/load | |
| parent | afd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff) | |
| download | GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2 GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip | |
The Great Renaming (#3014)
* move kekztech to a single root dir
* move detrav to a single root dir
* move gtnh-lanthanides to a single root dir
* move tectech and delete some gross reflection in gt++
* remove more reflection inside gt5u
* delete more reflection in gt++
* fix imports
* move bartworks and bwcrossmod
* fix proxies
* move galactigreg and ggfab
* move gtneioreplugin
* try to fix gt++ bee loader
* apply the rename rules to BW
* apply rename rules to bwcrossmod
* apply rename rules to detrav scanner mod
* apply rename rules to galacticgreg
* apply rename rules to ggfab
* apply rename rules to goodgenerator
* apply rename rules to gtnh-lanthanides
* apply rename rules to gt++
* apply rename rules to kekztech
* apply rename rules to kubatech
* apply rename rules to tectech
* apply rename rules to gt
apply the rename rules to gt
* fix tt import
* fix mui hopefully
* fix coremod except intergalactic
* rename assline recipe class
* fix a class name i stumbled on
* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib
* temporary rename of GTTooltipDataCache to old name
* fix gt client/server proxy names
Diffstat (limited to 'src/main/java/gregtech/loaders/load')
| -rw-r--r-- | src/main/java/gregtech/loaders/load/CoverBehaviorLoader.java | 11 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/load/FuelLoader.java | 146 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/load/GTItemIterator.java (renamed from src/main/java/gregtech/loaders/load/GT_ItemIterator.java) | 171 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java | 11 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/load/GT_FuelLoader.java | 146 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/load/GT_SonictronLoader.java | 159 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/load/MTERecipeLoader.java (renamed from src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java) | 3215 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/load/SonictronLoader.java | 159 |
8 files changed, 1865 insertions, 2153 deletions
diff --git a/src/main/java/gregtech/loaders/load/CoverBehaviorLoader.java b/src/main/java/gregtech/loaders/load/CoverBehaviorLoader.java new file mode 100644 index 0000000000..77fc7f4b30 --- /dev/null +++ b/src/main/java/gregtech/loaders/load/CoverBehaviorLoader.java @@ -0,0 +1,11 @@ +package gregtech.loaders.load; + +import gregtech.api.util.GTLog; + +public class CoverBehaviorLoader implements Runnable { + + @Override + public void run() { + GTLog.out.println("GTMod: Adding Cover Behaviors"); + } +} diff --git a/src/main/java/gregtech/loaders/load/FuelLoader.java b/src/main/java/gregtech/loaders/load/FuelLoader.java new file mode 100644 index 0000000000..639b5359a3 --- /dev/null +++ b/src/main/java/gregtech/loaders/load/FuelLoader.java @@ -0,0 +1,146 @@ +package gregtech.loaders.load; + +import static gregtech.api.enums.Mods.BloodMagic; +import static gregtech.api.enums.Mods.EnderIO; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.recipe.RecipeMaps.extremeNaquadahReactorFuels; +import static gregtech.api.recipe.RecipeMaps.hugeNaquadahReactorFuels; +import static gregtech.api.recipe.RecipeMaps.largeNaquadahReactorFuels; +import static gregtech.api.recipe.RecipeMaps.magicFuels; +import static gregtech.api.recipe.RecipeMaps.smallNaquadahReactorFuels; +import static gregtech.api.recipe.RecipeMaps.ultraHugeNaquadahReactorFuels; +import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import gregtech.api.enums.FluidState; +import gregtech.api.enums.GTValues; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.fluid.GTFluidFactory; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeConstants; + +public class FuelLoader implements Runnable { + + @Override + public void run() { + GTLog.out.println("GTMod: Initializing various Fuels."); + ItemList.sBlueVitriol = GTFluidFactory + .of("solution.bluevitriol", "Blue Vitriol water solution", null, FluidState.LIQUID, 295); + ItemList.sNickelSulfate = GTFluidFactory + .of("solution.nickelsulfate", "Nickel sulfate water solution", null, FluidState.LIQUID, 295); + ItemList.sGreenVitriol = GTFluidFactory + .of("solution.greenvitriol", "Green Vitriol water solution", null, FluidState.LIQUID, 295); + ItemList.sIndiumConcentrate = GTFluidFactory + .of("indiumconcentrate", "Indium Concentrate", null, FluidState.LIQUID, 295); // TODO CHECK NEW x3 + ItemList.sLeadZincSolution = GTFluidFactory + .of("leadzincsolution", "Lead-Zinc solution", null, FluidState.LIQUID, 295); + ItemList.sRocketFuel = GTFluidFactory.of("rocket_fuel", "Rocket Fuel", null, FluidState.LIQUID, 295); + + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)) + .duration(0) + .eut(0) + .metadata(FUEL_VALUE, 50_000) + .addTo(smallNaquadahReactorFuels); + + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)) + .duration(0) + .eut(0) + .metadata(FUEL_VALUE, 250_000) + .addTo(largeNaquadahReactorFuels); + + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L)) + .duration(0) + .eut(0) + .metadata(FUEL_VALUE, 500_000) + .addTo(hugeNaquadahReactorFuels); + + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)) + .duration(0) + .eut(0) + .metadata(FUEL_VALUE, 250_000) + .addTo(extremeNaquadahReactorFuels); + + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)) + .duration(0) + .eut(0) + .metadata(FUEL_VALUE, 1_000_000) + .addTo(ultraHugeNaquadahReactorFuels); + + // BloodMagic + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L)) + .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "blankSlate", 1L)) + .duration(0) + .eut(0) + .metadata(FUEL_VALUE, 400) + .addTo(magicFuels); + + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L)) + .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L)) + .duration(0) + .eut(0) + .metadata(FUEL_VALUE, 1000) + .addTo(magicFuels); + + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L)) + .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L)) + .duration(0) + .eut(0) + .metadata(FUEL_VALUE, 8000) + .addTo(magicFuels); + + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(BloodMagic.ID, "bloodMagicBaseItems", 1L, 27)) + .itemOutputs(GTModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L)) + .duration(0) + .eut(0) + .metadata(FUEL_VALUE, 20000) + .addTo(magicFuels); + + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 4)) + .metadata(FUEL_VALUE, 4) + .metadata(FUEL_TYPE, 5) + .addTo(GTRecipeConstants.Fuel); + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Items.experience_bottle, 1)) + .metadata(FUEL_VALUE, 10) + .metadata(FUEL_TYPE, 5) + .addTo(GTRecipeConstants.Fuel); + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Items.ghast_tear, 1)) + .metadata(FUEL_VALUE, 50) + .metadata(FUEL_TYPE, 5) + .addTo(GTRecipeConstants.Fuel); + GTValues.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.beacon, 1)) + .metadata(FUEL_VALUE, Materials.NetherStar.mFuelPower * 2) + .metadata(FUEL_TYPE, Materials.NetherStar.mFuelType) + .addTo(GTRecipeConstants.Fuel); + GTValues.RA.stdBuilder() + .itemInputs(GTModHandler.getModItem(EnderIO.ID, "bucketRocket_fuel", 1)) + .metadata(FUEL_VALUE, 250) + .metadata(FUEL_TYPE, 1) + .addTo(GTRecipeConstants.Fuel); + } +} diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GTItemIterator.java index a44b411ba0..63ac59b7c2 100644 --- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java +++ b/src/main/java/gregtech/loaders/load/GTItemIterator.java @@ -2,10 +2,10 @@ package gregtech.loaders.load; import static gregtech.api.recipe.RecipeMaps.cannerRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.WILDCARD; -import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.WILDCARD; +import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -16,153 +16,154 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.IFluidContainerItem; import buildcraft.api.tools.IToolWrench; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OreDictNames; import gregtech.api.enums.OrePrefixes; -import gregtech.api.items.GT_Generic_Item; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeBuilder; -import gregtech.api.util.GT_RecipeConstants; -import gregtech.api.util.GT_Utility; +import gregtech.api.items.GTGenericItem; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeBuilder; +import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.GTUtility; +import gregtech.common.tools.ToolScoop; import mods.railcraft.api.core.items.IToolCrowbar; -public class GT_ItemIterator implements Runnable { +public class GTItemIterator implements Runnable { @Override public void run() { - GT_Log.out.println("GT_Mod: Scanning for certain kinds of compatible Machineblocks."); - ItemStack tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L); - ItemStack tStack = GT_ModHandler + GTLog.out.println("GTMod: Scanning for certain kinds of compatible Machineblocks."); + ItemStack tStack2 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L); + ItemStack tStack = GTModHandler .getRecipeOutput(tStack2, tStack2, tStack2, tStack2, null, tStack2, tStack2, tStack2, tStack2); if (null != tStack) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tStack) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L)) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); - GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L)); + GTModHandler.addSmeltingRecipe(tStack, GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L)); } - tStack2 = GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1L); - tStack = GT_ModHandler + tStack2 = GTOreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1L); + tStack = GTModHandler .getRecipeOutput(tStack2, tStack2, tStack2, tStack2, null, tStack2, tStack2, tStack2, tStack2); if (null != tStack) { - GT_OreDictUnificator.registerOre(OreDictNames.craftingRawMachineTier00, tStack); + GTOreDictUnificator.registerOre(OreDictNames.craftingRawMachineTier00, tStack); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tStack) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L)) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); - GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L)); + GTModHandler.addSmeltingRecipe(tStack, GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L)); } ItemStack tStack3 = new ItemStack(Blocks.glass, 1, 0); - tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L); - tStack = GT_ModHandler.getRecipeOutput( + tStack2 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L); + tStack = GTModHandler.getRecipeOutput( tStack2, tStack3, tStack2, tStack3, - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), tStack3, tStack2, tStack3, tStack2); if (null != (tStack)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tStack) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L)) .outputChances(10000, 1000) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); } - tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L); + tStack2 = GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L); tStack3 = new ItemStack(Blocks.glass, 1, 0); - tStack = GT_ModHandler.getRecipeOutput( + tStack = GTModHandler.getRecipeOutput( tStack2, tStack3, tStack2, tStack3, - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L), tStack3, tStack2, tStack3, tStack2); if (null != tStack) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tStack) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L)) .outputChances(10000, 1000) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); } - GT_Log.out.println("GT_Mod: Registering various Tools to be usable on GregTech Machines"); - GregTech_API.registerScrewdriver( - GT_ModHandler + GTLog.out.println("GTMod: Registering various Tools to be usable on GregTech Machines"); + GregTechAPI.registerScrewdriver( + GTModHandler .getRecipeOutput(null, new ItemStack(Items.iron_ingot, 1), null, new ItemStack(Items.stick, 1))); - GregTech_API.registerScrewdriver( - GT_ModHandler + GregTechAPI.registerScrewdriver( + GTModHandler .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)"); - GT_Values.RA.stdBuilder() + GTLog.out.println( + "GTMod: Adding Food Recipes to the Automatic Canning Machine. (also during the following Item Iteration)"); + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(Items.rotten_flesh, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L)) .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) .duration(10 * SECONDS) .eut(1) .addTo(cannerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(Items.spider_eye, 2, WILDCARD), ItemList.IC2_Food_Can_Empty.get(1L)) .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) .duration(5 * SECONDS) .eut(1) .addTo(cannerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Food_Poisonous_Potato.get(2L), ItemList.IC2_Food_Can_Empty.get(1L)) .itemOutputs(ItemList.IC2_Food_Can_Spoiled.get(1L)) .duration(5 * SECONDS) .eut(1) .addTo(cannerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(Items.cake, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(12L)) .itemOutputs(ItemList.IC2_Food_Can_Filled.get(12L)) .duration(30 * SECONDS) .eut(1) .addTo(cannerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(Items.mushroom_stew, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(6L)) .itemOutputs(ItemList.IC2_Food_Can_Filled.get(6L), new ItemStack(Items.bowl, 1)) .duration(15 * SECONDS) .eut(1) .addTo(cannerRecipes); - GT_Log.out.println("GT_Mod: Scanning ItemList."); + GTLog.out.println("GTMod: Scanning ItemList."); try { /* (tName.equals("tile.sedimentaryStone")) || **/ for (Object o : Item.itemRegistry) { Object tObject; - if (!(((tObject = o) instanceof Item) && (!(tObject instanceof GT_Generic_Item)))) { + if (!(((tObject = o) instanceof Item) && (!(tObject instanceof GTGenericItem)))) { continue; } @@ -173,29 +174,29 @@ public class GT_ItemIterator implements Runnable { } if ((tItem instanceof IToolCrowbar)) { - if ((tItem.isDamageable()) || (GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { - if (GregTech_API.registerCrowbar(new ItemStack(tItem, 1, WILDCARD))) { - GT_Log.out.println("GT_Mod: Registered valid RC Crowbar: " + tName); + if ((tItem.isDamageable()) || (GTModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { + if (GregTechAPI.registerCrowbar(new ItemStack(tItem, 1, WILDCARD))) { + GTLog.out.println("GTMod: Registered valid RC Crowbar: " + tName); } } } if ((tItem instanceof IToolWrench)) { - if ((tItem.isDamageable()) || (GT_ModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { - if (GregTech_API.registerWrench(new ItemStack(tItem, 1, WILDCARD))) { - GT_Log.out.println("GT_Mod: Registered valid BC Wrench: " + tName); + if ((tItem.isDamageable()) || (GTModHandler.isElectricItem(new ItemStack(tItem, 1, 0)))) { + if (GregTechAPI.registerWrench(new ItemStack(tItem, 1, WILDCARD))) { + GTLog.out.println("GTMod: Registered valid BC Wrench: " + tName); } } } - Block tBlock = GT_Utility.getBlockFromStack(new ItemStack(tItem, 1, 0)); + Block tBlock = GTUtility.getBlockFromStack(new ItemStack(tItem, 1, 0)); if (tBlock != null) { if (tName.endsWith("beehives")) { tBlock.setHarvestLevel("scoop", 0); - gregtech.common.tools.GT_Tool_Scoop.sBeeHiveMaterial = tBlock.getMaterial(); + ToolScoop.sBeeHiveMaterial = tBlock.getMaterial(); } if (OrePrefixes.stone.mDefaultStackSize < tItem.getItemStackLimit(new ItemStack(tItem, 1, 0))) { - if ((tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.stone)) - || (tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.netherrack)) - || (tBlock.isReplaceableOreGen(GT_Values.DW, 0, 0, 0, Blocks.end_stone))) { + if ((tBlock.isReplaceableOreGen(GTValues.DW, 0, 0, 0, Blocks.stone)) + || (tBlock.isReplaceableOreGen(GTValues.DW, 0, 0, 0, Blocks.netherrack)) + || (tBlock.isReplaceableOreGen(GTValues.DW, 0, 0, 0, Blocks.end_stone))) { tItem.setMaxStackSize(OrePrefixes.stone.mDefaultStackSize); } } @@ -204,15 +205,15 @@ public class GT_ItemIterator implements Runnable { && (tItem != ItemList.IC2_Food_Can_Spoiled.getItem())) { int tFoodValue = ((ItemFood) tItem).func_150905_g(new ItemStack(tItem, 1, 0)); if (tFoodValue > 0) { - GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); + GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder(); recipeBuilder .itemInputs(new ItemStack(tItem, 1, WILDCARD), ItemList.IC2_Food_Can_Empty.get(tFoodValue)); - if (GT_Utility.getContainerItem(new ItemStack(tItem, 1, 0), true) == null) { + if (GTUtility.getContainerItem(new ItemStack(tItem, 1, 0), true) == null) { recipeBuilder.itemOutputs(ItemList.IC2_Food_Can_Filled.get(tFoodValue)); } else { recipeBuilder.itemOutputs( ItemList.IC2_Food_Can_Filled.get(tFoodValue), - GT_Utility.getContainerItem(new ItemStack(tItem, 1, 0), true)); + GTUtility.getContainerItem(new ItemStack(tItem, 1, 0), true)); } recipeBuilder.duration(tFoodValue * 5 * SECONDS) .eut(1) @@ -220,80 +221,80 @@ public class GT_ItemIterator implements Runnable { } } if ((tItem instanceof IFluidContainerItem)) { - GT_OreDictUnificator.addToBlacklist(new ItemStack(tItem, 1, WILDCARD)); + GTOreDictUnificator.addToBlacklist(new ItemStack(tItem, 1, WILDCARD)); } switch (tName) { // twilight forest - case "item.fieryBlood", "item.fieryTears" -> GT_Values.RA.stdBuilder() + case "item.fieryBlood", "item.fieryTears" -> GTValues.RA.stdBuilder() .itemInputs(new ItemStack(tItem, 1, 0)) .metadata(FUEL_VALUE, 2048) .metadata(FUEL_TYPE, 5) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); // twilight forest case "tile.TFRoots" -> { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(tItem, 1, 0)) .itemOutputs(new ItemStack(Items.stick, 2), new ItemStack(Items.stick, 1)) .outputChances(10000, 3000) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(tItem, 1, 1)) .itemOutputs(new ItemStack(Items.stick, 4)) .metadata(FUEL_VALUE, 32) .metadata(FUEL_TYPE, 5) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); } // tinker construct - case "item.tconstruct.manual" -> GT_OreDictUnificator + case "item.tconstruct.manual" -> GTOreDictUnificator .registerOre("bookTinkersManual", new ItemStack(tItem, 1, WILDCARD)); // buildcraft - case "item.blueprintItem" -> GT_OreDictUnificator + case "item.blueprintItem" -> GTOreDictUnificator .registerOre("paperBlueprint", new ItemStack(tItem, 1, WILDCARD)); // Thaumcraft - case "item.ItemThaumonomicon" -> GT_OreDictUnificator + case "item.ItemThaumonomicon" -> GTOreDictUnificator .registerOre("bookThaumonomicon", new ItemStack(tItem, 1, WILDCARD)); // BoP case "tile.bop.redRocks" -> { - GT_OreDictUnificator + GTOreDictUnificator .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator + GTOreDictUnificator .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator + GTOreDictUnificator .registerOre(OrePrefixes.stone, Materials.Redrock, new ItemStack(tItem, 1, 2)); } // Thaumcraft case "tile.blockCosmeticSolid" -> { - GT_OreDictUnificator + GTOreDictUnificator .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 0)); - GT_OreDictUnificator + GTOreDictUnificator .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(tItem, 1, 1)); - GT_OreDictUnificator + GTOreDictUnificator .registerOre(OrePrefixes.block, Materials.Thaumium, new ItemStack(tItem, 1, 4)); } // minecraft - case "tile.enderchest" -> GT_OreDictUnificator + case "tile.enderchest" -> GTOreDictUnificator .registerOre(OreDictNames.enderChest, new ItemStack(tItem, 1, WILDCARD)); // buildcraft - case "tile.autoWorkbenchBlock" -> GT_OreDictUnificator + case "tile.autoWorkbenchBlock" -> GTOreDictUnificator .registerOre(OreDictNames.craftingWorkBench, new ItemStack(tItem, 1, 0)); // buildcraft - case "tile.pumpBlock" -> GT_OreDictUnificator + case "tile.pumpBlock" -> GTOreDictUnificator .registerOre(OreDictNames.craftingPump, new ItemStack(tItem, 1, 0)); // buildcraft - case "tile.tankBlock" -> GT_OreDictUnificator + case "tile.tankBlock" -> GTOreDictUnificator .registerOre(OreDictNames.craftingTank, new ItemStack(tItem, 1, 0)); } diff --git a/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java b/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java deleted file mode 100644 index 37f626ef90..0000000000 --- a/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index bed97ca010..0000000000 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ /dev/null @@ -1,146 +0,0 @@ -package gregtech.loaders.load; - -import static gregtech.api.enums.Mods.BloodMagic; -import static gregtech.api.enums.Mods.EnderIO; -import static gregtech.api.enums.Mods.Thaumcraft; -import static gregtech.api.recipe.RecipeMaps.extremeNaquadahReactorFuels; -import static gregtech.api.recipe.RecipeMaps.hugeNaquadahReactorFuels; -import static gregtech.api.recipe.RecipeMaps.largeNaquadahReactorFuels; -import static gregtech.api.recipe.RecipeMaps.magicFuels; -import static gregtech.api.recipe.RecipeMaps.smallNaquadahReactorFuels; -import static gregtech.api.recipe.RecipeMaps.ultraHugeNaquadahReactorFuels; -import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.FluidState; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.fluid.GT_FluidFactory; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeConstants; - -public class GT_FuelLoader implements Runnable { - - @Override - public void run() { - GT_Log.out.println("GT_Mod: Initializing various Fuels."); - ItemList.sBlueVitriol = GT_FluidFactory - .of("solution.bluevitriol", "Blue Vitriol water solution", null, FluidState.LIQUID, 295); - ItemList.sNickelSulfate = GT_FluidFactory - .of("solution.nickelsulfate", "Nickel sulfate water solution", null, FluidState.LIQUID, 295); - ItemList.sGreenVitriol = GT_FluidFactory - .of("solution.greenvitriol", "Green Vitriol water solution", null, FluidState.LIQUID, 295); - ItemList.sIndiumConcentrate = GT_FluidFactory - .of("indiumconcentrate", "Indium Concentrate", null, FluidState.LIQUID, 295); // TODO CHECK NEW x3 - ItemList.sLeadZincSolution = GT_FluidFactory - .of("leadzincsolution", "Lead-Zinc solution", null, FluidState.LIQUID, 295); - ItemList.sRocketFuel = GT_FluidFactory.of("rocket_fuel", "Rocket Fuel", null, FluidState.LIQUID, 295); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)) - .duration(0) - .eut(0) - .metadata(FUEL_VALUE, 50_000) - .addTo(smallNaquadahReactorFuels); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)) - .duration(0) - .eut(0) - .metadata(FUEL_VALUE, 250_000) - .addTo(largeNaquadahReactorFuels); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L)) - .duration(0) - .eut(0) - .metadata(FUEL_VALUE, 500_000) - .addTo(hugeNaquadahReactorFuels); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)) - .duration(0) - .eut(0) - .metadata(FUEL_VALUE, 250_000) - .addTo(extremeNaquadahReactorFuels); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)) - .duration(0) - .eut(0) - .metadata(FUEL_VALUE, 1_000_000) - .addTo(ultraHugeNaquadahReactorFuels); - - // BloodMagic - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L)) - .itemOutputs(GT_ModHandler.getModItem(BloodMagic.ID, "blankSlate", 1L)) - .duration(0) - .eut(0) - .metadata(FUEL_VALUE, 400) - .addTo(magicFuels); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L)) - .itemOutputs(GT_ModHandler.getModItem(BloodMagic.ID, "reinforcedSlate", 1L)) - .duration(0) - .eut(0) - .metadata(FUEL_VALUE, 1000) - .addTo(magicFuels); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L)) - .itemOutputs(GT_ModHandler.getModItem(BloodMagic.ID, "imbuedSlate", 1L)) - .duration(0) - .eut(0) - .metadata(FUEL_VALUE, 8000) - .addTo(magicFuels); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(BloodMagic.ID, "bloodMagicBaseItems", 1L, 27)) - .itemOutputs(GT_ModHandler.getModItem(BloodMagic.ID, "demonicSlate", 1L)) - .duration(0) - .eut(0) - .metadata(FUEL_VALUE, 20000) - .addTo(magicFuels); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 4)) - .metadata(FUEL_VALUE, 4) - .metadata(FUEL_TYPE, 5) - .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.experience_bottle, 1)) - .metadata(FUEL_VALUE, 10) - .metadata(FUEL_TYPE, 5) - .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Items.ghast_tear, 1)) - .metadata(FUEL_VALUE, 50) - .metadata(FUEL_TYPE, 5) - .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder() - .itemInputs(new ItemStack(Blocks.beacon, 1)) - .metadata(FUEL_VALUE, Materials.NetherStar.mFuelPower * 2) - .metadata(FUEL_TYPE, Materials.NetherStar.mFuelType) - .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(EnderIO.ID, "bucketRocket_fuel", 1)) - .metadata(FUEL_VALUE, 250) - .metadata(FUEL_TYPE, 1) - .addTo(GT_RecipeConstants.Fuel); - } -} diff --git a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java deleted file mode 100644 index e5fb8042f7..0000000000 --- a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java +++ /dev/null @@ -1,159 +0,0 @@ -package gregtech.loaders.load; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - |
