diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java')
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index d80e3b1c1e..88f39309cf 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -4,15 +4,15 @@ import static gregtech.api.enums.ConfigCategories.Recipes.harderrecipes; import static gregtech.api.enums.GT_Values.L; import static gregtech.api.enums.GT_Values.NI; import static gregtech.api.enums.GT_Values.W; +import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; +import static gregtech.api.recipe.RecipeMaps.benderRecipes; +import static gregtech.api.recipe.RecipeMaps.cutterRecipes; +import static gregtech.api.recipe.RecipeMaps.extruderRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; +import static gregtech.api.recipe.RecipeMaps.implosionRecipes; import static gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED; import static gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBenderRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCutterRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sExtruderRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidSolidficationRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sImplosionRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -36,6 +36,7 @@ import gregtech.api.enums.SubTag; import gregtech.api.enums.TextureSet; import gregtech.api.enums.TierEU; import gregtech.api.enums.ToolDictNames; +import gregtech.api.recipe.RecipeCategories; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -104,8 +105,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemInputs(GT_Utility.copyAmount(1, aStack)) .metadata(FUEL_VALUE, aMaterial.mFuelPower) .metadata(FUEL_TYPE, aMaterial.mFuelType) - .duration(0) - .eut(0) .addTo(GT_RecipeConstants.Fuel); } @@ -117,7 +116,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .fluidInputs(aMaterial.getMolten(L)) .duration(1 * SECONDS + 12 * TICKS) .eut(calculateRecipeEU(aMaterial, 8)) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); } GT_ModHandler.addCraftingRecipe( @@ -195,7 +194,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + .addTo(benderRecipes); } // 2 plates -> 1 double plate GT_Values.RA.stdBuilder() @@ -205,7 +204,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_Utility.copyAmount(1, aStack)) .duration(Math.max(aMaterialMass * 2L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + .addTo(benderRecipes); } else { GT_Values.RA.stdBuilder() .itemInputs( @@ -215,7 +214,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .fluidInputs(Materials.Glue.getFluid(10L)) .duration(3 * SECONDS + 4 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } if (!aNoSmashing) { @@ -253,7 +252,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, aMaterial, 1L)) .duration(Math.max(aMaterialMass * 3L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + .addTo(benderRecipes); } GT_Values.RA.stdBuilder() @@ -263,7 +262,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_Utility.copyAmount(1, aStack)) .duration(Math.max(aMaterialMass * 3L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + .addTo(benderRecipes); } else { GT_Values.RA.stdBuilder() .itemInputs( @@ -273,7 +272,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .fluidInputs(Materials.Glue.getFluid(20L)) .duration(4 * SECONDS + 16 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } if (!aNoSmashing) { @@ -310,7 +309,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sImplosionRecipes); + .addTo(implosionRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack), GT_ModHandler.getIC2Item("dynamite", 1, null)) .itemOutputs( @@ -318,7 +317,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sImplosionRecipes); + .addTo(implosionRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack), new ItemStack(Blocks.tnt, 2)) .itemOutputs( @@ -326,7 +325,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sImplosionRecipes); + .addTo(implosionRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack), GT_ModHandler.getIC2Item("industrialTnt", 1)) .itemOutputs( @@ -334,7 +333,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) - .addTo(sImplosionRecipes); + .addTo(implosionRecipes); } } @@ -354,7 +353,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_Utility.copyAmount(1, aStack)) .duration(Math.max(aMaterialMass * 4L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + .addTo(benderRecipes); } else { GT_Values.RA.stdBuilder() .itemInputs( @@ -364,7 +363,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .fluidInputs(Materials.Glue.getFluid(30L)) .duration(6 * SECONDS + 8 * TICKS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } if (!aNoSmashing) { if (GregTech_API.sRecipeFile.get( @@ -408,7 +407,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_Utility.copyAmount(1, aStack)) .duration(Math.max(aMaterialMass * 5L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + .addTo(benderRecipes); } else { GT_Values.RA.stdBuilder() .itemInputs( @@ -418,7 +417,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .fluidInputs(Materials.Glue.getFluid(40L)) .duration(8 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); } if (!aNoSmashing) { if (GregTech_API.sRecipeFile.get( @@ -462,7 +461,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_Utility.copyAmount(1, aStack)) .duration(Math.max(aMaterialMass * 9L, 1L)) .eut(calculateRecipeEU(aMaterial, 96)) - .addTo(sBenderRecipes); + .addTo(benderRecipes); } } @@ -478,7 +477,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .fluidInputs(aMaterial.getMolten(L / 2)) .duration(16 * TICKS) .eut(calculateRecipeEU(aMaterial, 8)) - .addTo(sFluidSolidficationRecipes); + .addTo(fluidSolidifierRecipes); } if (aMaterial.mUnificatable && aMaterial.mMaterialInto == aMaterial @@ -508,7 +507,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_Utility.copyAmount(3, aStack)) .duration(6 * SECONDS + 8 * TICKS) .eut(calculateRecipeEU(aMaterial, 15)) - .addTo(sAlloySmelterRecipes); + .recipeCategory(RecipeCategories.alloySmelterMolding) + .addTo(alloySmelterRecipes); GT_Values.RA.stdBuilder() .itemInputs( @@ -517,7 +517,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.itemCasing, aMaterial, 2L)) .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 45)) - .addTo(sExtruderRecipes); + .addTo(extruderRecipes); } if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { @@ -533,7 +533,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist ((int) Math.max(aMaterial.getMass(), 1L)) * (calculateRecipeEU(aMaterial, 16)) / 320)))) .duration(2 * ((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 16)) - .addTo(sCutterRecipes); + .addTo(cutterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) @@ -547,7 +547,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist ((int) Math.max(aMaterial.getMass(), 1L)) * (calculateRecipeEU(aMaterial, 16)) / 426)))) .duration(2 * ((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 16)) - .addTo(sCutterRecipes); + .addTo(cutterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)) @@ -562,7 +562,7 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist / 1280)))) .duration(((int) Math.max(aMaterial.getMass(), 1L)) * TICKS) .eut(calculateRecipeEU(aMaterial, 16)) - .addTo(sCutterRecipes); + .addTo(cutterRecipes); } GT_RecipeRegistrator.registerReverseFluidSmelting(aStack, aMaterial, aPrefix.mMaterialAmount, null); } @@ -576,20 +576,20 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist .itemOutputs(GT_ModHandler.getIC2Item("windMill", 1L)) .duration(5 * MINUTES + 20 * SECONDS) .eut(8) - .addTo(sAssemblerRecipes); + .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack), new ItemStack(Blocks.glass, 3, W)) .itemOutputs(GT_ModHandler.getIC2Item("reinforcedGlass", 4L)) .duration(20 * SECONDS) .eut(4) - .addTo(sAlloySmelterRecipes); + .addTo(alloySmelterRecipes); GT_Values.RA.stdBuilder() .itemInputs(GT_Utility.copyAmount(1, aStack), Materials.Glass.getDust(3)) .itemOutputs(GT_ModHandler.getIC2Item("reinforcedGlass", 4L)) .duration(20 * SECONDS) .eut(4) - .addTo(sAlloySmelterRecipes); + .addTo(alloySmelterRecipes); } case "plateAlloyAdvanced" -> { GT_ModHandler.addAlloySmelterRecipe( |