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 --- .../nei/formatter/DefaultSpecialValueFormatter.java | 10 +++++----- .../gregtech/nei/formatter/FuelSpecialValueFormatter.java | 4 ++-- .../nei/formatter/FusionSpecialValueFormatter.java | 14 +++++++------- .../nei/formatter/HeatingCoilSpecialValueFormatter.java | 4 ++-- .../gregtech/nei/formatter/INEISpecialInfoFormatter.java | 3 ++- .../nei/formatter/SimpleSpecialValueFormatter.java | 4 ++-- 6 files changed, 20 insertions(+), 19 deletions(-) (limited to 'src/main/java/gregtech/nei/formatter') diff --git a/src/main/java/gregtech/nei/formatter/DefaultSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/DefaultSpecialValueFormatter.java index 1c4d486319..b190710368 100644 --- a/src/main/java/gregtech/nei/formatter/DefaultSpecialValueFormatter.java +++ b/src/main/java/gregtech/nei/formatter/DefaultSpecialValueFormatter.java @@ -1,13 +1,13 @@ package gregtech.nei.formatter; -import static gregtech.api.util.GT_Utility.trans; +import static gregtech.api.util.GTUtility.trans; import java.util.Collections; import java.util.List; import javax.annotation.ParametersAreNonnullByDefault; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.util.MethodsReturnNonnullByDefault; import gregtech.nei.RecipeDisplayInfo; @@ -20,13 +20,13 @@ public class DefaultSpecialValueFormatter implements INEISpecialInfoFormatter { @Override public List format(RecipeDisplayInfo recipeInfo) { int specialValue = recipeInfo.recipe.mSpecialValue; - if (specialValue == -100 && GT_Mod.gregtechproxy.mLowGravProcessing) { + if (specialValue == -100 && GTMod.gregtechproxy.mLowGravProcessing) { return Collections.singletonList(trans("159", "Needs Low Gravity")); - } else if (specialValue == -200 && GT_Mod.gregtechproxy.mEnableCleanroom) { + } else if (specialValue == -200 && GTMod.gregtechproxy.mEnableCleanroom) { return Collections.singletonList(trans("160", "Needs Cleanroom")); } else if (specialValue == -201) { return Collections.singletonList(trans("206", "Scan for Assembly Line")); - } else if (specialValue == -300 && GT_Mod.gregtechproxy.mEnableCleanroom) { + } else if (specialValue == -300 && GTMod.gregtechproxy.mEnableCleanroom) { return Collections.singletonList(trans("160.1", "Needs Cleanroom & LowGrav")); } else if (specialValue == -400) { return Collections.singletonList(trans("216", "Deprecated Recipe")); diff --git a/src/main/java/gregtech/nei/formatter/FuelSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/FuelSpecialValueFormatter.java index dcfe2617dd..a4d53c46dc 100644 --- a/src/main/java/gregtech/nei/formatter/FuelSpecialValueFormatter.java +++ b/src/main/java/gregtech/nei/formatter/FuelSpecialValueFormatter.java @@ -7,7 +7,7 @@ import javax.annotation.ParametersAreNonnullByDefault; import net.minecraft.util.StatCollector; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gregtech.api.util.MethodsReturnNonnullByDefault; import gregtech.nei.RecipeDisplayInfo; @@ -22,6 +22,6 @@ public class FuelSpecialValueFormatter implements INEISpecialInfoFormatter { return Collections.singletonList( StatCollector.translateToLocalFormatted( "GT5U.nei.fuel", - GT_Utility.formatNumbers(recipeInfo.recipe.mSpecialValue * 1000L))); + GTUtility.formatNumbers(recipeInfo.recipe.mSpecialValue * 1000L))); } } diff --git a/src/main/java/gregtech/nei/formatter/FusionSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/FusionSpecialValueFormatter.java index 77cd41b343..eb77fba072 100644 --- a/src/main/java/gregtech/nei/formatter/FusionSpecialValueFormatter.java +++ b/src/main/java/gregtech/nei/formatter/FusionSpecialValueFormatter.java @@ -7,8 +7,8 @@ import javax.annotation.ParametersAreNonnullByDefault; import net.minecraft.util.StatCollector; -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_Utility; +import gregtech.api.enums.GTValues; +import gregtech.api.util.GTUtility; import gregtech.api.util.MethodsReturnNonnullByDefault; import gregtech.nei.RecipeDisplayInfo; @@ -26,7 +26,7 @@ public class FusionSpecialValueFormatter implements INEISpecialInfoFormatter { int tier = getFusionTier(euToStart, voltage); return Collections.singletonList( - StatCollector.translateToLocalFormatted("GT5U.nei.start_eu", GT_Utility.formatNumbers(euToStart), tier)); + StatCollector.translateToLocalFormatted("GT5U.nei.start_eu", GTUtility.formatNumbers(euToStart), tier)); } public static int getFusionTier(long startupPower, long voltage) { @@ -43,13 +43,13 @@ public class FusionSpecialValueFormatter implements INEISpecialInfoFormatter { tier = 5; } - if (voltage <= GT_Values.V[6]) { + if (voltage <= GTValues.V[6]) { // no-op - } else if (voltage <= GT_Values.V[7]) { + } else if (voltage <= GTValues.V[7]) { tier = Math.max(tier, 2); - } else if (voltage <= GT_Values.V[8]) { + } else if (voltage <= GTValues.V[8]) { tier = Math.max(tier, 3); - } else if (voltage <= GT_Values.V[9]) { + } else if (voltage <= GTValues.V[9]) { tier = Math.max(tier, 4); } else { tier = 5; diff --git a/src/main/java/gregtech/nei/formatter/HeatingCoilSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/HeatingCoilSpecialValueFormatter.java index f5c17a1163..a02efde73c 100644 --- a/src/main/java/gregtech/nei/formatter/HeatingCoilSpecialValueFormatter.java +++ b/src/main/java/gregtech/nei/formatter/HeatingCoilSpecialValueFormatter.java @@ -8,7 +8,7 @@ import javax.annotation.ParametersAreNonnullByDefault; import net.minecraft.util.StatCollector; import gregtech.api.enums.HeatingCoilLevel; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gregtech.api.util.MethodsReturnNonnullByDefault; import gregtech.nei.RecipeDisplayInfo; @@ -24,7 +24,7 @@ public class HeatingCoilSpecialValueFormatter implements INEISpecialInfoFormatte return Collections.singletonList( StatCollector.translateToLocalFormatted( "GT5U.nei.heat_capacity", - GT_Utility.formatNumbers(heat), + GTUtility.formatNumbers(heat), HeatingCoilLevel.getDisplayNameFromHeat(heat, false))); } } diff --git a/src/main/java/gregtech/nei/formatter/INEISpecialInfoFormatter.java b/src/main/java/gregtech/nei/formatter/INEISpecialInfoFormatter.java index 21228240d4..c8d2db6928 100644 --- a/src/main/java/gregtech/nei/formatter/INEISpecialInfoFormatter.java +++ b/src/main/java/gregtech/nei/formatter/INEISpecialInfoFormatter.java @@ -4,11 +4,12 @@ import java.util.List; import javax.annotation.ParametersAreNonnullByDefault; +import gregtech.api.util.GTRecipe; import gregtech.api.util.MethodsReturnNonnullByDefault; import gregtech.nei.RecipeDisplayInfo; /** - * Getter for description for {@link gregtech.api.util.GT_Recipe#mSpecialValue} etc. that will be drawn on NEI. + * Getter for description for {@link GTRecipe#mSpecialValue} etc. that will be drawn on NEI. */ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault diff --git a/src/main/java/gregtech/nei/formatter/SimpleSpecialValueFormatter.java b/src/main/java/gregtech/nei/formatter/SimpleSpecialValueFormatter.java index 8f2098c0a9..93b060eacb 100644 --- a/src/main/java/gregtech/nei/formatter/SimpleSpecialValueFormatter.java +++ b/src/main/java/gregtech/nei/formatter/SimpleSpecialValueFormatter.java @@ -8,7 +8,7 @@ import javax.annotation.ParametersAreNonnullByDefault; import net.minecraft.util.StatCollector; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gregtech.api.util.MethodsReturnNonnullByDefault; import gregtech.nei.RecipeDisplayInfo; @@ -44,6 +44,6 @@ public class SimpleSpecialValueFormatter implements INEISpecialInfoFormatter { return Collections.singletonList( StatCollector.translateToLocalFormatted( translationKey, - GT_Utility.formatNumbers((long) recipeInfo.recipe.mSpecialValue * multiplier))); + GTUtility.formatNumbers((long) recipeInfo.recipe.mSpecialValue * multiplier))); } } -- cgit