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/goodgenerator/util/MaterialFix.java | |
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/goodgenerator/util/MaterialFix.java')
-rw-r--r-- | src/main/java/goodgenerator/util/MaterialFix.java | 129 |
1 files changed, 64 insertions, 65 deletions
diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java index 32827b18b2..8df7b3f4e6 100644 --- a/src/main/java/goodgenerator/util/MaterialFix.java +++ b/src/main/java/goodgenerator/util/MaterialFix.java @@ -4,31 +4,30 @@ import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; - -import gregtech.api.enums.GT_Values; +import bartworks.system.material.Werkstoff; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public class MaterialFix { public static void MaterialFluidExtractionFix(Werkstoff material) { if (material.hasItemType(OrePrefixes.ingot)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) .addTo(fluidExtractionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ingot.get(0)) .fluidInputs(material.getMolten(144)) .itemOutputs(material.get(OrePrefixes.ingot)) @@ -37,13 +36,13 @@ public class MaterialFix { .addTo(fluidSolidifierRecipes); } if (material.hasItemType(OrePrefixes.plate)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.plate)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) .addTo(fluidExtractionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Plate.get(0)) .fluidInputs(material.getMolten(144)) .itemOutputs(material.get(OrePrefixes.plate)) @@ -52,7 +51,7 @@ public class MaterialFix { .addTo(fluidSolidifierRecipes); } if (material.hasItemType(OrePrefixes.gearGtSmall)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.gearGtSmall)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) @@ -60,7 +59,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.stickLong)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.stickLong)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) @@ -68,7 +67,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.spring)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.spring)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) @@ -76,7 +75,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.stick)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.stick)) .fluidOutputs(material.getMolten(72)) .duration(16 * TICKS) @@ -84,7 +83,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.itemCasing)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.itemCasing)) .fluidOutputs(material.getMolten(72)) .duration(16 * TICKS) @@ -92,7 +91,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.wireGt01)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.wireGt01)) .fluidOutputs(material.getMolten(72)) .duration(16 * TICKS) @@ -100,16 +99,16 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.cableGt01)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.cableGt01)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2)) .fluidOutputs(material.getMolten(72)) .duration(16 * TICKS) .eut(8) .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.foil)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.foil)) .fluidOutputs(material.getMolten(36)) .duration(8 * TICKS) @@ -117,7 +116,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.springSmall)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.springSmall)) .fluidOutputs(material.getMolten(36)) .duration(8 * TICKS) @@ -125,7 +124,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.ring)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ring)) .fluidOutputs(material.getMolten(36)) .duration(8 * TICKS) @@ -133,7 +132,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.bolt)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.bolt)) .fluidOutputs(material.getMolten(18)) .duration(4 * TICKS) @@ -141,7 +140,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.wireFine)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.wireFine)) .fluidOutputs(material.getMolten(18)) .duration(4 * TICKS) @@ -149,7 +148,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.round)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.round)) .fluidOutputs(material.getMolten(16)) .duration(4 * TICKS) @@ -157,7 +156,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.screw)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.screw)) .fluidOutputs(material.getMolten(16)) .duration(4 * TICKS) @@ -165,7 +164,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.nugget)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.nugget)) .fluidOutputs(material.getMolten(16)) .duration(4 * TICKS) @@ -173,7 +172,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.rotor)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.rotor)) .fluidOutputs(material.getMolten(612)) .duration(136 * TICKS) @@ -181,7 +180,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.gearGt)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.gearGt)) .fluidOutputs(material.getMolten(576)) .duration(128 * TICKS) @@ -194,8 +193,8 @@ public class MaterialFix { for (Werkstoff tMaterial : Werkstoff.werkstoffHashSet) { if (tMaterial == null) continue; if (tMaterial.hasItemType(OrePrefixes.plateDouble) && tMaterial.hasItemType(OrePrefixes.ingotDouble)) { - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.plate, 2), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plate, 2), GTUtility.getIntegratedCircuit(2)) .itemOutputs(tMaterial.get(OrePrefixes.plateDouble, 1)) .duration( Math.max( @@ -204,8 +203,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingotDouble, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingotDouble, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(tMaterial.get(OrePrefixes.plateDouble, 1)) .duration( Math.max( @@ -214,16 +213,16 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.plateDouble, 1), new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.ingotDouble, 1), new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1) }); } if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) { - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.plate, 3), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plate, 3), GTUtility.getIntegratedCircuit(3)) .itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1)) .duration( Math.max( @@ -232,8 +231,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingot, 3), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingot, 3), GTUtility.getIntegratedCircuit(3)) .itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1)) .duration( Math.max( @@ -242,8 +241,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1)) .duration( Math.max( @@ -252,18 +251,18 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.plateTriple, 1), new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1), 'B', tMaterial.get(OrePrefixes.plateDouble, 1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.ingotTriple, 1), new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1), 'B', tMaterial.get(OrePrefixes.ingotDouble, 1) }); } if (tMaterial.hasItemType(OrePrefixes.plateDense)) { - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.plate, 9), GT_Utility.getIntegratedCircuit(9)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plate, 9), GTUtility.getIntegratedCircuit(9)) .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) .duration( Math.max( @@ -272,8 +271,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingot, 9), GT_Utility.getIntegratedCircuit(9)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingot, 9), GTUtility.getIntegratedCircuit(9)) .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) .duration( Math.max( @@ -284,8 +283,8 @@ public class MaterialFix { .addTo(benderRecipes); if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) { - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.plateTriple, 3), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plateTriple, 3), GTUtility.getIntegratedCircuit(3)) .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) .duration( Math.max( @@ -294,8 +293,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 3), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 3), GTUtility.getIntegratedCircuit(3)) .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) .duration( Math.max( @@ -308,7 +307,7 @@ public class MaterialFix { } if (tMaterial.hasItemType(OrePrefixes.stick)) { if (tMaterial.hasItemType(OrePrefixes.cellMolten)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Rod.get(0)) .fluidInputs(tMaterial.getMolten(72)) .itemOutputs(tMaterial.get(OrePrefixes.stick, 1)) @@ -323,7 +322,7 @@ public class MaterialFix { } if (tMaterial.hasItemType(OrePrefixes.stickLong)) { if (tMaterial.hasItemType(OrePrefixes.cellMolten)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Rod_Long.get(0)) .fluidInputs(tMaterial.getMolten(144)) .itemOutputs(tMaterial.get(OrePrefixes.stickLong, 1)) @@ -336,10 +335,10 @@ public class MaterialFix { .addTo(fluidSolidifierRecipes); } if (tMaterial.hasItemType(OrePrefixes.stick)) { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.stickLong, 1), new Object[] { "PhP", 'P', tMaterial.get(OrePrefixes.stick, 1) }); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tMaterial.get(OrePrefixes.stick, 2)) .itemOutputs(tMaterial.get(OrePrefixes.stickLong, 1)) .duration( @@ -352,11 +351,11 @@ public class MaterialFix { } } if (tMaterial.hasItemType(OrePrefixes.spring)) { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.spring, 1), new Object[] { " s ", "fPx", " P ", 'P', tMaterial.get(OrePrefixes.stickLong, 1) }); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.stickLong, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.stickLong, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(tMaterial.get(OrePrefixes.spring, 1)) .duration( Math.max( @@ -367,11 +366,11 @@ public class MaterialFix { .addTo(benderRecipes); } if (tMaterial.hasItemType(OrePrefixes.springSmall)) { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.springSmall, 1), new Object[] { " s ", "fPx", 'P', tMaterial.get(OrePrefixes.stick, 1) }); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.stick, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(tMaterial.get(OrePrefixes.springSmall, 1)) .duration( Math.max( @@ -383,9 +382,9 @@ public class MaterialFix { } } Materials tUHV = Materials.Longasssuperconductornameforuhvwire; - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stick, tUHV, 2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.stick, tUHV, 2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1)) .duration(Math.max(tUHV.getMass(), 1L) * TICKS) .eut(TierEU.RECIPE_LV / 2) .addTo(hammerRecipes); |