From 48e6a5fde81f33d3ff4cb2ef610c39abd33a5821 Mon Sep 17 00:00:00 2001 From: miozune Date: Thu, 21 Jul 2022 22:22:20 +0900 Subject: Show voltage tier of transformer for Waila (#1148) --- .../GT_MetaTileEntity_Transformer.java | 45 +++++++++++++++++----- src/main/java/gregtech/common/GT_Proxy.java | 5 +++ .../java/gregtech/loaders/preload/GT_PreLoad.java | 1 + 3 files changed, 41 insertions(+), 10 deletions(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java index 9989378d84..fdef48a86e 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java @@ -5,7 +5,9 @@ import cofh.api.energy.IEnergyStorage; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.capbank.network.ICapBankNetwork; import crazypants.enderio.power.IPowerContainer; +import gregtech.GT_Mod; import gregtech.api.GregTech_API; +import gregtech.api.enums.GT_Values; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -207,13 +209,13 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi @Override public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { return false; - } - + } + @Override public boolean hasAlternativeModeText(){ return true; } - + @Override public String getAlternativeModeText(){ return @@ -239,26 +241,49 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi final NBTTagCompound tag = accessor.getNBTData(); final int side = (byte)accessor.getSide().ordinal(); final boolean allowedToWork = tag.getBoolean("isAllowedToWork"); - + + final byte inputTier = GT_Utility.getTier(tag.getLong("maxEUInput")); + final byte outputTier = GT_Utility.getTier(tag.getLong("maxEUOutput")); + currenttip.add( String.format( - "%s %d(%dA) -> %d(%dA)", + "%s %s(%dA) -> %s(%dA)", (allowedToWork ? (GREEN + "Step Down") : (RED + "Step Up")) + RESET, - tag.getLong("maxEUInput"), + GT_Mod.gregtechproxy.mWailaTransformerVoltageTier + ? GT_Values.TIER_COLORS[inputTier] + GT_Values.VN[inputTier] + RESET + : tag.getLong("maxEUInput"), tag.getLong("maxAmperesIn"), - tag.getLong("maxEUOutput"), + GT_Mod.gregtechproxy.mWailaTransformerVoltageTier + ? GT_Values.TIER_COLORS[outputTier] + GT_Values.VN[outputTier] + RESET + : tag.getLong("maxEUOutput"), tag.getLong("maxAmperesOut") ) ); if ((side == facing && allowedToWork) || (side != facing && !allowedToWork)) { - currenttip.add(String.format(GOLD + "Input:" + RESET + " %d(%dA)", tag.getLong("maxEUInput"), tag.getLong("maxAmperesIn"))); + currenttip.add( + String.format( + GOLD + "Input:" + RESET + " %s(%dA)", + GT_Mod.gregtechproxy.mWailaTransformerVoltageTier + ? GT_Values.TIER_COLORS[inputTier] + GT_Values.VN[inputTier] + RESET + : tag.getLong("maxEUInput"), + tag.getLong("maxAmperesIn") + ) + ); } else { - currenttip.add(String.format(BLUE + "Output:" + RESET + " %d(%dA)", tag.getLong("maxEUOutput"), tag.getLong("maxAmperesOut"))); + currenttip.add( + String.format( + BLUE + "Output:" + RESET + " %s(%dA)", + GT_Mod.gregtechproxy.mWailaTransformerVoltageTier + ? GT_Values.TIER_COLORS[outputTier] + GT_Values.VN[outputTier] + RESET + : tag.getLong("maxEUOutput"), + tag.getLong("maxAmperesOut") + ) + ); } super.getWailaBody(itemStack, currenttip, accessor, config); - + } @Override diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 71063949fe..e4f3051b02 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -305,6 +305,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { */ public boolean mNEIRecipeOwnerStackTrace = false; + /** + * This enables showing voltage tier of transformer for Waila, instead of raw voltage number + */ + public boolean mWailaTransformerVoltageTier = true; + /** * What is the order of the circuits when they are selected? */ diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java index 265b525119..ad741ea27e 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java @@ -538,6 +538,7 @@ public class GT_PreLoad { GT_Mod.gregtechproxy.mNEIRecipeSecondMode = GregTech_API.sClientDataFile.get("nei", "RecipeSecondMode", true); GT_Mod.gregtechproxy.mNEIRecipeOwner = GregTech_API.sClientDataFile.get("nei", "RecipeOwner", false); GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace = GregTech_API.sClientDataFile.get("nei", "RecipeOwnerStackTrace", false); + GT_Mod.gregtechproxy.mWailaTransformerVoltageTier = GregTech_API.sClientDataFile.get("waila", "WailaTransformerVoltageTier", true); final String[] Circuits = GregTech_API.sClientDataFile.get("interface", "CircuitsOrder" ); GT_Mod.gregtechproxy.mCircuitsOrder.clear(); -- cgit