From bee02c6b287536abb1f2a9d1f7c38a423ce8df1e Mon Sep 17 00:00:00 2001 From: minecraft7771 Date: Wed, 24 Aug 2022 08:45:02 +0200 Subject: Replaced progress with computation info in WAILA --- .../multi/GT_MetaTileEntity_EM_research.java | 32 +++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index 8defa2c64c..7e9e21279b 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -10,7 +10,8 @@ import static com.github.technus.tectech.util.CommonValues.V; import static com.github.technus.tectech.util.CommonValues.VN; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; +import static mcp.mobius.waila.api.SpecialChars.*; +import static mcp.mobius.waila.api.SpecialChars.RESET; import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; @@ -39,13 +40,17 @@ import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; import org.apache.commons.lang3.reflect.FieldUtils; /** @@ -639,6 +644,31 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB return true; } + @Override + public void getWailaNBTData( + EntityPlayerMP player, TileEntity tile, NBTTagCompound tag, World world, int x, int y, int z) { + tag.setBoolean("hasProblems", (getIdealStatus() - getRepairStatus()) > 0); + tag.setFloat("efficiency", mEfficiency / 100.0F); + tag.setBoolean("incompleteStructure", (getBaseMetaTileEntity().getErrorDisplayID() & 64) != 0); + tag.setLong("computation", (computationRequired - computationRemaining) / 20L); + tag.setLong("computationRequired", computationRequired / 20L); + } + + @Override + public void getWailaBody( + ItemStack itemStack, List currentTip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + final NBTTagCompound tag = accessor.getNBTData(); + + if (tag.getBoolean("incompleteStructure")) { + currentTip.add(RED + "** INCOMPLETE STRUCTURE **" + RESET); + } + currentTip.add((tag.getBoolean("hasProblems") ? (RED + "** HAS PROBLEMS **") : GREEN + "Running Fine") + RESET + + " Efficiency: " + tag.getFloat("efficiency") + "%"); + + currentTip.add(String.format( + "Computation: %d / %d", tag.getInteger("computation"), tag.getInteger("computationRequired"))); + } + @Override public int getInventoryStackLimit() { return 1; -- cgit From 147d02111d0f7b7631b5a035070ddfed9aa3d842 Mon Sep 17 00:00:00 2001 From: minecraft7771 Date: Wed, 24 Aug 2022 14:54:13 +0200 Subject: Added comma for digit grouping --- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index 7e9e21279b..c8aeb7933e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -666,7 +666,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB + " Efficiency: " + tag.getFloat("efficiency") + "%"); currentTip.add(String.format( - "Computation: %d / %d", tag.getInteger("computation"), tag.getInteger("computationRequired"))); + "Computation: %,d / %,d", tag.getInteger("computation"), tag.getInteger("computationRequired"))); } @Override -- cgit