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/postload/recipes | |
| 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/postload/recipes')
51 files changed, 7167 insertions, 7215 deletions
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java index a9e587a145..01d77704f7 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java @@ -1,15 +1,15 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.MaterialStack; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; public class AlloySmelterRecipes implements Runnable { @@ -58,24 +58,22 @@ public class AlloySmelterRecipes implements Runnable { @Override public void run() { for (MaterialStack[] materials : mAlloySmelterList) { - ItemStack dust1 = GT_OreDictUnificator.get(OrePrefixes.dust, materials[0].mMaterial, materials[0].mAmount); - ItemStack dust2 = GT_OreDictUnificator.get(OrePrefixes.dust, materials[1].mMaterial, materials[1].mAmount); - ItemStack ingot1 = GT_OreDictUnificator - .get(OrePrefixes.ingot, materials[0].mMaterial, materials[0].mAmount); - ItemStack ingot2 = GT_OreDictUnificator - .get(OrePrefixes.ingot, materials[1].mMaterial, materials[1].mAmount); - ItemStack outputIngot = GT_OreDictUnificator + ItemStack dust1 = GTOreDictUnificator.get(OrePrefixes.dust, materials[0].mMaterial, materials[0].mAmount); + ItemStack dust2 = GTOreDictUnificator.get(OrePrefixes.dust, materials[1].mMaterial, materials[1].mAmount); + ItemStack ingot1 = GTOreDictUnificator.get(OrePrefixes.ingot, materials[0].mMaterial, materials[0].mAmount); + ItemStack ingot2 = GTOreDictUnificator.get(OrePrefixes.ingot, materials[1].mMaterial, materials[1].mAmount); + ItemStack outputIngot = GTOreDictUnificator .get(OrePrefixes.ingot, materials[2].mMaterial, materials[2].mAmount); - if (outputIngot != GT_Values.NI) { + if (outputIngot != GTValues.NI) { if (ingot1 != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ingot1, dust2) .itemOutputs(outputIngot) .duration((int) materials[2].mAmount * 50) .eut(16) .addTo(alloySmelterRecipes); if (ingot2 != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ingot1, ingot2) .itemOutputs(outputIngot) .duration((int) materials[2].mAmount * 50) @@ -85,7 +83,7 @@ public class AlloySmelterRecipes implements Runnable { } if (ingot2 != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(dust1, ingot2) .itemOutputs(outputIngot) .duration((int) materials[2].mAmount * 50) @@ -93,7 +91,7 @@ public class AlloySmelterRecipes implements Runnable { .addTo(alloySmelterRecipes); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(dust1, dust2) .itemOutputs(outputIngot) .duration((int) materials[2].mAmount * 50) @@ -104,11 +102,11 @@ public class AlloySmelterRecipes implements Runnable { } // We use rubber - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L)) .duration(10 * SECONDS) .eut(8) .addTo(alloySmelterRecipes); diff --git a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java index 755e5ab885..38eb8bc7c7 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java @@ -2,472 +2,472 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.recipe.RecipeMaps.arcFurnaceRecipes; -import static gregtech.api.util.GT_ModHandler.getModItem; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.RECYCLE; -import static gregtech.api.util.GT_RecipeConstants.UniversalArcFurnace; +import static gregtech.api.util.GTModHandler.getModItem; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.RECYCLE; +import static gregtech.api.util.GTRecipeConstants.UniversalArcFurnace; -import gregtech.api.enums.GT_Values; +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_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; public class ArcFurnaceRecipes implements Runnable { @Override public void run() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Block_TungstenSteelReinforced.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Concrete, 1)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 2), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Concrete, 1)) .duration(8 * SECONDS) .eut(96) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Fluid.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 19L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 19L)) .duration(9 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Item.get(1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 12L), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 12L), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 7L)) .duration(9 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 2L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 2L)) .duration(10 * TICKS) .eut((int) TierEU.RECIPE_MV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Long_Distance_Pipeline_Item_Pipe.get(1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L)) + GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Tin, 1L), + GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 1L)) .duration(10 * TICKS) .eut((int) TierEU.RECIPE_MV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Cupronickel.get(1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 8), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 2)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Kanthal.get(1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 8), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Cupronickel, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Nichrome.get(1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 8), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Kanthal, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 4)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_TungstenSteel.get(1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 5)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 8), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 5)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_HSSG.get(1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 6)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 8), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 6)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_HSSS.get(1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 7)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 8), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 7)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Naquadah.get(1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 8), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.HSSS, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 8)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_NaquadahAlloy.get(1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 9)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 8), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 9)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_Trinium.get(1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 10)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 8), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 10)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_ElectrumFlux.get(1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 11)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 8), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Trinium, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 11)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Casing_Coil_AwakenedDraconium.get(1L)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.DraconiumAwakened, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.DraconiumAwakened, 8), + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.ElectrumFlux, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 12)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 0)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 2L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 2L)) .duration(7 * SECONDS + 10 * TICKS) .eut(90) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Glass, 3)) .duration(7 * SECONDS + 10 * TICKS) .eut(90) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 2)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 12L), - GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6)) + GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 12L), + GTOreDictUnificator.get(OrePrefixes.nugget, Materials.Iron, 6)) .duration(7 * SECONDS + 10 * TICKS) .eut(90) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 13)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 2L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 2L)) .duration(9 * SECONDS) .eut((int) TierEU.RECIPE_MV) .metadata(RECYCLE, true) .addTo(UniversalArcFurnace); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(getModItem(Railcraft.ID, "machine.beta", 1L, 14)) .itemOutputs( - GT_OreDictU |
