the renaming (#69)

GTNewHorizons · Sep 3, 2024 · e938b0d · e938b0d
1 parent 95c0ffe
commit e938b0d
Show file tree

Hide file tree

Showing 59 changed files with 98 additions and 98 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -22,6 +22,6 @@
  * For more details, see https://docs.gradle.org/7.6/userguide/java_library_plugin.html#sec:java_library_configurations_graph
  */
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.03:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.55:dev")
     api("com.github.GTNewHorizons:CraftTweaker:3.3.1:dev")
 }
diff --git a/src/main/java/gttweaker/mods/gregtech/Fuels.java b/src/main/java/gttweaker/mods/gregtech/Fuels.java
@@ -1,10 +1,10 @@
 package gttweaker.mods.gregtech;
 
-import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
-import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
+import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.GT_RecipeConstants;
+import gregtech.api.enums.GTValues;
+import gregtech.api.util.GTRecipeConstants;
 import gttweaker.mods.AddMultipleRecipeAction;
 import minetweaker.MineTweakerAPI;
 import minetweaker.annotations.ModOnly;
@@ -115,14 +115,14 @@ public AddRecipeAction(IItemStack output, IIngredient input, int euPerMillibucke
 
         @Override
         protected void applySingleRecipe(ArgIterator i) {
-            GT_Values.RA.stdBuilder()
+            GTValues.RA.stdBuilder()
                 .itemInputs(i.nextItem())
                 .itemOutputs(i.nextItem())
                 .metadata(FUEL_VALUE, i.nextInt())
                 .metadata(FUEL_TYPE, i.nextInt())
                 .duration(0)
                 .eut(0)
-                .addTo(GT_RecipeConstants.Fuel);
+                .addTo(GTRecipeConstants.Fuel);
         }
     }
 }
diff --git a/src/main/java/gttweaker/mods/gregtech/RA2Builder.java b/src/main/java/gttweaker/mods/gregtech/RA2Builder.java
@@ -6,10 +6,10 @@
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_RecipeBuilder;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTRecipeBuilder;
 import gttweaker.GTTweaker;
 import minetweaker.IUndoableAction;
 import minetweaker.MineTweakerAPI;
@@ -23,17 +23,17 @@
 @ModOnly("gregtech")
 public class RA2Builder {
 
-    private GT_RecipeBuilder recipeBuilder;
+    private GTRecipeBuilder recipeBuilder;
 
     public RA2Builder() {}
 
-    public RA2Builder(GT_RecipeBuilder recipeBuilder) {
+    public RA2Builder(GTRecipeBuilder recipeBuilder) {
         this.recipeBuilder = recipeBuilder;
     }
 
     @ZenMethod
     public static RA2Builder builder() {
-        return new RA2Builder(GT_Values.RA.stdBuilder());
+        return new RA2Builder(GTValues.RA.stdBuilder());
     }
 
     @ZenMethod
@@ -134,7 +134,7 @@ public RA2Builder noOptimize() {
 
     @ZenMethod
     public void addTo(String recipeMap) {
-        GT_Recipe recipe = recipeBuilder.build()
+        GTRecipe recipe = recipeBuilder.build()
             .orElse(null);
         if (recipe == null) {
             MineTweakerAPI.logError("Could not build recipe!");
@@ -151,10 +151,10 @@ public void addTo(String recipeMap) {
 
     public static class RecipeAddAction implements IUndoableAction {
 
-        GT_Recipe recipe;
+        GTRecipe recipe;
         RecipeMap<?> map;
 
-        public RecipeAddAction(GT_Recipe recipe, RecipeMap<?> map) {
+        public RecipeAddAction(GTRecipe recipe, RecipeMap<?> map) {
             this.recipe = recipe;
             this.map = map;
         }

diff --git a/src/main/java/gttweaker/mods/gregtech/RecipeRemover.java b/src/main/java/gttweaker/mods/gregtech/RecipeRemover.java
@@ -7,7 +7,7 @@
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.recipe.RecipeMap;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
 import gttweaker.GTTweaker;
 import minetweaker.IUndoableAction;
 import minetweaker.MineTweakerAPI;
@@ -28,7 +28,7 @@ public static void remove(String map, IIngredient[] inputs, IIngredient[] fluidI
             MineTweakerAPI.logError("Could not find recipe map named \"" + map + "\"");
             return;
         }
-        GT_Recipe recipe = recipeMap.findRecipeQuery()
+        GTRecipe recipe = recipeMap.findRecipeQuery()
             .items(
                 Arrays.stream(inputs)
                     .map(GTTweaker::getItemStackOrNull)
@@ -50,10 +50,10 @@ public static void remove(String map, IIngredient[] inputs, IIngredient[] fluidI
 
     public static class RecipeRemoveAction implements IUndoableAction {
 
-        GT_Recipe recipe;
+        GTRecipe recipe;
         RecipeMap<?> map;
 
-        public RecipeRemoveAction(GT_Recipe recipe, RecipeMap<?> map) {
+        public RecipeRemoveAction(GTRecipe recipe, RecipeMap<?> map) {
             this.recipe = recipe;
             this.map = map;
         }

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/AlloySmelter.java b/src/main/java/gttweaker/mods/gregtech/machines/AlloySmelter.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
 
 import net.minecraft.item.ItemStack;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Amplifabricator.java b/src/main/java/gttweaker/mods/gregtech/machines/Amplifabricator.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.amplifierRecipes;
 
 import net.minecraft.item.ItemStack;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/ArcFurnace.java b/src/main/java/gttweaker/mods/gregtech/machines/ArcFurnace.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.arcFurnaceRecipes;
 
 import net.minecraft.item.ItemStack;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Assembler.java b/src/main/java/gttweaker/mods/gregtech/machines/Assembler.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 
 import net.minecraft.item.ItemStack;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/AssemblyLine.java b/src/main/java/gttweaker/mods/gregtech/machines/AssemblyLine.java
@@ -1,13 +1,13 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
-import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
+import static gregtech.api.enums.GTValues.RA;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM;
+import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.util.GT_RecipeConstants;
+import gregtech.api.util.GTRecipeConstants;
 import gttweaker.mods.AddMultipleRecipeAction;
 import minetweaker.MineTweakerAPI;
 import minetweaker.annotations.ModOnly;
@@ -66,7 +66,7 @@ protected void applySingleRecipe(ArgIterator i) {
                         .fluidInputs(fluidInputs)
                         .duration(duration)
                         .eut(eut)
-                        .addTo(GT_RecipeConstants.AssemblyLine);
+                        .addTo(GTRecipeConstants.AssemblyLine);
                 }
             });
     }

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Autoclave.java b/src/main/java/gttweaker/mods/gregtech/machines/Autoclave.java
@@ -1,8 +1,8 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes;
-import static gregtech.api.util.GT_RecipeConstants.LOW_GRAVITY;
+import static gregtech.api.util.GTRecipeConstants.LOW_GRAVITY;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/BlastFurnace.java b/src/main/java/gttweaker/mods/gregtech/machines/BlastFurnace.java
@@ -1,8 +1,8 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
-import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
+import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
 import static gttweaker.util.ArrayHelper.itemOrNull;
 
 import java.util.ArrayList;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Brewery.java b/src/main/java/gttweaker/mods/gregtech/machines/Brewery.java
@@ -1,9 +1,9 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.brewingRecipes;
-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 net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Canner.java b/src/main/java/gttweaker/mods/gregtech/machines/Canner.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.cannerRecipes;
 import static gttweaker.util.ArrayHelper.itemOrNull;
 

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Centrifuge.java b/src/main/java/gttweaker/mods/gregtech/machines/Centrifuge.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
 import static gttweaker.util.ArrayHelper.itemOrNull;
 

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/ChemicalBath.java b/src/main/java/gttweaker/mods/gregtech/machines/ChemicalBath.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes;
 import static gttweaker.util.ArrayHelper.itemOrNull;
 

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/ChemicalReactor.java b/src/main/java/gttweaker/mods/gregtech/machines/ChemicalReactor.java
@@ -1,7 +1,7 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
-import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
+import static gregtech.api.enums.GTValues.RA;
+import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/CircuitAssembler.java b/src/main/java/gttweaker/mods/gregtech/machines/CircuitAssembler.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.circuitAssemblerRecipes;
 
 import net.minecraft.item.ItemStack;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Compressor.java b/src/main/java/gttweaker/mods/gregtech/machines/Compressor.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
 
 import gttweaker.mods.AddMultipleRecipeAction;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/CuttingSaw.java b/src/main/java/gttweaker/mods/gregtech/machines/CuttingSaw.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
 import static gttweaker.util.ArrayHelper.itemOrNull;
 

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/DistillationTower.java b/src/main/java/gttweaker/mods/gregtech/machines/DistillationTower.java
@@ -1,13 +1,13 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes;
 import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import gttweaker.mods.AddMultipleRecipeAction;
 import minetweaker.MineTweakerAPI;
 import minetweaker.annotations.ModOnly;
@@ -92,7 +92,7 @@ protected void applySingleRecipe(ArgIterator i) {
 
                     for (int idx = 0; idx < Math.min(fluidOutputs.length, 11); idx++) {
                         RA.stdBuilder()
-                            .itemInputs(GT_Utility.getIntegratedCircuit(idx + 1))
+                            .itemInputs(GTUtility.getIntegratedCircuit(idx + 1))
                             .itemOutputs(output)
                             .fluidInputs(fluidInput)
                             .fluidOutputs(fluidOutputs[idx])

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Distillery.java b/src/main/java/gttweaker/mods/gregtech/machines/Distillery.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
 
 import net.minecraft.item.ItemStack;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Electrolyzer.java b/src/main/java/gttweaker/mods/gregtech/machines/Electrolyzer.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes;
 import static gttweaker.util.ArrayHelper.itemOrNull;
 

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Extractor.java b/src/main/java/gttweaker/mods/gregtech/machines/Extractor.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
 
 import gttweaker.mods.AddMultipleRecipeAction;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Extruder.java b/src/main/java/gttweaker/mods/gregtech/machines/Extruder.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 
 import gttweaker.mods.AddMultipleRecipeAction;
 import minetweaker.MineTweakerAPI;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/Fermenter.java b/src/main/java/gttweaker/mods/gregtech/machines/Fermenter.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.fermentingRecipes;
 
 import net.minecraftforge.fluids.FluidStack;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/FluidCanner.java b/src/main/java/gttweaker/mods/gregtech/machines/FluidCanner.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes;
 
 import net.minecraft.item.ItemStack;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/FluidExtractor.java b/src/main/java/gttweaker/mods/gregtech/machines/FluidExtractor.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
 
 import net.minecraft.item.ItemStack;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/FluidHeater.java b/src/main/java/gttweaker/mods/gregtech/machines/FluidHeater.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.fluidHeaterRecipes;
 
 import gttweaker.mods.AddMultipleRecipeAction;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/FluidSolidifier.java b/src/main/java/gttweaker/mods/gregtech/machines/FluidSolidifier.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
 
 import gttweaker.mods.AddMultipleRecipeAction;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/ForgeHammer.java b/src/main/java/gttweaker/mods/gregtech/machines/ForgeHammer.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.hammerRecipes;
 
 import gttweaker.mods.AddMultipleRecipeAction;

diff --git a/src/main/java/gttweaker/mods/gregtech/machines/FormingPress.java b/src/main/java/gttweaker/mods/gregtech/machines/FormingPress.java
@@ -1,6 +1,6 @@
 package gttweaker.mods.gregtech.machines;
 
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.enums.GTValues.RA;
 import static gregtech.api.recipe.RecipeMaps.formingPressRecipes;
 
 import gttweaker.mods.AddMultipleRecipeAction;