From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: 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 --- .../api/recipe/ExtremeHeatExchangerBackend.java | 4 ++-- .../api/recipe/ExtremeHeatExchangerFrontend.java | 8 ++++---- .../api/recipe/ExtremeHeatExchangerRecipe.java | 4 ++-- .../api/recipe/GoodGeneratorRecipeMaps.java | 24 +++++++++++----------- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/main/java/goodgenerator/api') diff --git a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerBackend.java b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerBackend.java index cdd3a4d57f..cfe6f7c371 100644 --- a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerBackend.java +++ b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerBackend.java @@ -4,7 +4,7 @@ import javax.annotation.ParametersAreNonnullByDefault; import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder; import gregtech.api.recipe.maps.FuelBackend; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; import gregtech.api.util.MethodsReturnNonnullByDefault; @ParametersAreNonnullByDefault @@ -16,7 +16,7 @@ public class ExtremeHeatExchangerBackend extends FuelBackend { } @Override - public GT_Recipe compileRecipe(GT_Recipe recipe) { + public GTRecipe compileRecipe(GTRecipe recipe) { if (!(recipe instanceof ExtremeHeatExchangerRecipe)) { throw new RuntimeException("Recipe must be instance of ExtremeHeatExchangerRecipe"); } diff --git a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java index b933802fc2..79459d3a5a 100644 --- a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java +++ b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java @@ -13,7 +13,7 @@ import com.gtnewhorizons.modularui.api.math.Pos2d; import gregtech.api.recipe.BasicUIPropertiesBuilder; import gregtech.api.recipe.NEIRecipePropertiesBuilder; import gregtech.api.recipe.RecipeMapFrontend; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gregtech.api.util.MethodsReturnNonnullByDefault; import gregtech.nei.RecipeDisplayInfo; import gregtech.nei.formatter.INEISpecialInfoFormatter; @@ -46,12 +46,12 @@ public class ExtremeHeatExchangerFrontend extends RecipeMapFrontend { int threshold = recipeInfo.recipe.mSpecialValue; return Arrays.asList( StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " " - + GT_Utility.formatNumbers(Inputs[0].amount) + + GTUtility.formatNumbers(Inputs[0].amount) + " L/s", StatCollector.translateToLocal("value.extreme_heat_exchanger.1"), - GT_Utility.formatNumbers(Outputs[0].amount / 160) + " L/s", + GTUtility.formatNumbers(Outputs[0].amount / 160) + " L/s", StatCollector.translateToLocal("value.extreme_heat_exchanger.2"), - GT_Utility.formatNumbers(Outputs[1].amount / 160) + " L/s", + GTUtility.formatNumbers(Outputs[1].amount / 160) + " L/s", StatCollector.translateToLocal("value.extreme_heat_exchanger.4") + " " + threshold + " L/s"); } } diff --git a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerRecipe.java b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerRecipe.java index 4a32e882f8..2887c74f2c 100644 --- a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerRecipe.java +++ b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerRecipe.java @@ -3,9 +3,9 @@ package goodgenerator.api.recipe; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; -public class ExtremeHeatExchangerRecipe extends GT_Recipe { +public class ExtremeHeatExchangerRecipe extends GTRecipe { public ExtremeHeatExchangerRecipe(FluidStack[] input, FluidStack[] output, int special) { super(false, null, null, null, null, input, output, 0, 0, special); diff --git a/src/main/java/goodgenerator/api/recipe/GoodGeneratorRecipeMaps.java b/src/main/java/goodgenerator/api/recipe/GoodGeneratorRecipeMaps.java index 7f3915d084..1da3545d78 100644 --- a/src/main/java/goodgenerator/api/recipe/GoodGeneratorRecipeMaps.java +++ b/src/main/java/goodgenerator/api/recipe/GoodGeneratorRecipeMaps.java @@ -6,13 +6,13 @@ import java.util.Comparator; import net.minecraft.util.StatCollector; -import goodgenerator.client.GUI.GG_UITextures; -import gregtech.api.enums.GT_Values; -import gregtech.api.gui.modularui.GT_UITextures; +import goodgenerator.client.GUI.GGUITextures; +import gregtech.api.enums.GTValues; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMapBackend; import gregtech.api.recipe.RecipeMapBuilder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gregtech.nei.formatter.SimpleSpecialValueFormatter; public class GoodGeneratorRecipeMaps { @@ -24,7 +24,7 @@ public class GoodGeneratorRecipeMaps { .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.naquadah_reactor")) .neiRecipeComparator(Comparator.comparing(recipe -> recipe.mSpecialValue)) .dontUseProgressBar() - .addSpecialTexture(59, 20, 58, 42, GG_UITextures.PICTURE_NAQUADAH_REACTOR) + .addSpecialTexture(59, 20, 58, 42, GGUITextures.PICTURE_NAQUADAH_REACTOR) .build(); public static final RecipeMap naquadahFuelRefineFactoryRecipes = RecipeMapBuilder .of("gg.recipe.naquadah_fuel_refine_factory") @@ -35,28 +35,28 @@ public class GoodGeneratorRecipeMaps { public static final RecipeMap neutronActivatorRecipes = RecipeMapBuilder.of("gg.recipe.neutron_activator") .maxIO(9, 9, 1, 1) .dontUseProgressBar() - .addSpecialTexture(73, 22, 31, 21, GG_UITextures.PICTURE_NEUTRON_ACTIVATOR) + .addSpecialTexture(73, 22, 31, 21, GGUITextures.PICTURE_NEUTRON_ACTIVATOR) .neiSpecialInfoFormatter(recipeInfo -> { int minNKE = recipeInfo.recipe.mSpecialValue % 10000; int maxNKE = recipeInfo.recipe.mSpecialValue / 10000; return Arrays.asList( StatCollector.translateToLocal("value.neutron_activator.0"), - GT_Utility.formatNumbers(minNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), + GTUtility.formatNumbers(minNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), StatCollector.translateToLocal("value.neutron_activator.1"), - GT_Utility.formatNumbers(maxNKE) + StatCollector.translateToLocal("value.neutron_activator.2")); + GTUtility.formatNumbers(maxNKE) + StatCollector.translateToLocal("value.neutron_activator.2")); }) .build(); public static final RecipeMap extremeHeatExchangerFuels = RecipeMapBuilder .of("gg.recipe.extreme_heat_exchanger", ExtremeHeatExchangerBackend::new) .maxIO(0, 0, 2, 3) .dontUseProgressBar() - .addSpecialTexture(47, 13, 78, 59, GG_UITextures.PICTURE_EXTREME_HEAT_EXCHANGER) + .addSpecialTexture(47, 13, 78, 59, GGUITextures.PICTURE_EXTREME_HEAT_EXCHANGER) .frontend(ExtremeHeatExchangerFrontend::new) .build(); public static final RecipeMap preciseAssemblerRecipes = RecipeMapBuilder .of("gg.recipe.precise_assembler") .maxIO(4, 1, 4, 0) - .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + .progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE) .progressBarPos(85, 30) .neiTransferRect(80, 30, 35, 18) .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.precise_assembler")) @@ -70,9 +70,9 @@ public class GoodGeneratorRecipeMaps { recipeInfo -> Collections.singletonList( StatCollector.translateToLocalFormatted( "value.component_assembly_line", - GT_Values.VN[recipeInfo.recipe.mSpecialValue]))) + GTValues.VN[recipeInfo.recipe.mSpecialValue]))) .dontUseProgressBar() - .addSpecialTexture(70, 11, 72, 40, GG_UITextures.PICTURE_COMPONENT_ASSLINE) + .addSpecialTexture(70, 11, 72, 40, GGUITextures.PICTURE_COMPONENT_ASSLINE) .frontend(ComponentAssemblyLineFrontend::new) .build(); } -- cgit