update

Co-authored-by: Quarri6343 <[email protected]>

dependencies.gradle

@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.5.25-GTNH:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.11-GTNH:dev')
 
     shadowImplementation('au.com.bytecode:opencsv:2.4')
 }

gradle.properties

@@ -117,7 +117,7 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories.
+# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.19'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
 }
 
 

src/main/java/mcp/mobius/waila/Waila.java

@@ -1,6 +1,7 @@
 package mcp.mobius.waila;
 
 import java.lang.reflect.Field;
+import java.util.Map;
 
 import net.minecraftforge.common.MinecraftForge;
 
@@ -23,6 +24,9 @@ import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import cpw.mods.fml.common.network.NetworkCheckHandler;
+import cpw.mods.fml.common.versioning.ArtifactVersion;
+import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
 import cpw.mods.fml.relauncher.Side;
 import mcp.mobius.waila.api.impl.ConfigHandler;
 import mcp.mobius.waila.api.impl.ModuleRegistrar;
@@ -52,6 +56,7 @@ public class Waila {
     public static ProxyServer proxy;
     public static Logger log = LogManager.getLogger("Waila");
     public boolean serverPresent = false;
+    private final ArtifactVersion minimumClientJoinVersion = new DefaultArtifactVersion("1.7.3");
 
     /* INIT SEQUENCE */
     @EventHandler
@@ -130,4 +135,16 @@ public class Waila {
     public void serverStarting(FMLServerStartingEvent event) {
         event.registerServerCommand(new CommandDumpHandlers());
     }
+
+    /**
+     * Block any clients older than 1.7.3 to ensure the vanilla.show_invisible_players property is respected
+     */
+    @SuppressWarnings("unused")
+    @NetworkCheckHandler
+    public boolean checkModList(Map<String, String> versions, Side side) {
+        if (side == Side.CLIENT && versions.containsKey("Waila")) {
+            return minimumClientJoinVersion.compareTo(new DefaultArtifactVersion(versions.get("Waila"))) <= 0;
+        }
+        return true;
+    }
 }

src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java

@@ -24,11 +24,11 @@ public class BCModule {
             ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerBCTanks(), TileTank);
             ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBCTanks(), TileTank);
 
-        } catch (ClassNotFoundException e) {
-            Waila.log.log(Level.WARN, "[BC] Class not found. " + e);
-        } catch (NoSuchMethodException e) {
-            Waila.log.log(Level.WARN, "[BC] Method not found." + e);
+        } catch (ClassNotFoundException | NoSuchMethodException e) {
+            Waila.log.log(Level.INFO, "[BC] Buildcraft mod not found.");
+            return;
         }
+        Waila.log.log(Level.INFO, "Buildcraft mod found.");
 
     }
 

src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java

@@ -84,8 +84,14 @@ public class IC2Module {
             ModuleRegistrar.instance().addConfigRemote("IndustrialCraft2", "ic2.outputeu");
 
         } catch (Exception e) {
-            Waila.log.log(Level.WARN, "[IndustrialCraft 2] Error while loading generator hooks." + e);
+            if (e instanceof ClassNotFoundException || e instanceof NoSuchFieldException) {
+                Waila.log.log(Level.INFO, "[IndustrialCraft 2] IndustrialCraft 2 mod not found.");
+            } else {
+                Waila.log.log(Level.WARN, "[IndustrialCraft 2] Error while loading generator hooks." + e);
+            }
+            return;
         }
+        Waila.log.log(Level.INFO, "IndustrialCraft 2 mod found.");
     }
 
 }

src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPWires.java

@@ -0,0 +1,41 @@
+package mcp.mobius.waila.addons.projectred;
+
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+
+import mcp.mobius.waila.api.ITaggedList;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaFMPAccessor;
+import mcp.mobius.waila.api.IWailaFMPProvider;
+import mcp.mobius.waila.cbcore.LangUtil;
+import mcp.mobius.waila.utils.NBTUtil;
+
+public class HUDFMPWires implements IWailaFMPProvider {
+
+    @Override
+    public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor,
+            IWailaConfigHandler config) {
+        if (!config.getConfig("pr.showsignal")) return currenttip;
+
+        ITaggedList<String, String> tagList = (ITaggedList<String, String>) currenttip;
+        int signal = ((NBTUtil.getNBTInteger(accessor.getNBTData(), "signal") & 0xff) + 16) / 17;
+        if (tagList.getEntries("signal").isEmpty()) {
+            tagList.add(String.format("%s : %s", LangUtil.translateG("hud.msg.power"), signal), "signal");
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaFMPAccessor accessor,
+            IWailaConfigHandler config) {
+        return currenttip;
+    }
+}

src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java

@@ -18,6 +18,7 @@ public class ProjectRedModule {
 
         ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showio");
         ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showdata");
+        ModuleRegistrar.instance().addConfigRemote("Project:Red", "pr.showsignal");
 
         ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_sgate");
         ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_igate");
@@ -25,6 +26,10 @@ public class ProjectRedModule {
         ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_bgate");
         ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_agate");
         ModuleRegistrar.instance().registerBodyProvider(new HUDFMPGateLogic(), "pr_rgate");
+        ModuleRegistrar.instance().registerBodyProvider(new HUDFMPWires(), "pr_redwire");
+        ModuleRegistrar.instance().registerBodyProvider(new HUDFMPWires(), "pr_insulated");
+        ModuleRegistrar.instance().registerBodyProvider(new HUDFMPWires(), "pr_fredwire");
+        ModuleRegistrar.instance().registerBodyProvider(new HUDFMPWires(), "pr_finsulated");
 
         ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_sgate");
         ModuleRegistrar.instance().registerDecorator(new HUDDecoratorRsGateLogic(), "pr_igate");

src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java

@@ -66,10 +66,13 @@ public class ThaumcraftModule {
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerIAspectContainer(), TileAlchemyFurnace);
 
         } catch (ClassNotFoundException e) {
-            Waila.log.log(Level.WARN, "[Thaumcraft] Class not found. " + e);
+            Waila.log.log(Level.INFO, "[Thaumcraft] Thaumcraft mod not found.");
+            return;
         } catch (Exception e) {
-            Waila.log.log(Level.WARN, "[Thaumcraft] Unhandled exception." + e);
+            Waila.log.log(Level.WARN, "[Thaumcraft] Unhandled exception. {}", e);
+            return;
         }
+        Waila.log.log(Level.INFO, "Thaumcraft mod found.");
 
     }
 

src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java

@@ -21,8 +21,14 @@ public class ThermalDynamicsModule {
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerDuct(), TileFluidDuct);
 
         } catch (Exception e) {
-            Waila.log.log(Level.WARN, "[Thermal Dynamics] Error while loading FluidDuct hooks." + e);
+            if (e instanceof ClassNotFoundException) {
+                Waila.log.log(Level.INFO, "[Thermal Dynamics] Thermal Dynamics mod not found.");
+            } else {
+                Waila.log.log(Level.WARN, "[Thermal Dynamics] Error while loading FluidDuct hooks. {}", e);
+            }
+            return;
         }
+        Waila.log.log(Level.INFO, "Thermal Dynamics mod found.");
     }
 
 }

src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java

@@ -51,6 +51,7 @@ public class ThermalExpansionModule {
     public static Method IBlockInfo_getBlockInfo = null;
 
     public static void register() {
+        boolean printedThermalExpansionNotFound = false;
         // XXX : We register the Energy interface first
         try {
             IEnergyProvider = Class.forName("cofh.api.energy.IEnergyProvider");
@@ -74,7 +75,12 @@ public class ThermalExpansionModule {
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerIEnergyHandler(), IEnergyInfo);
 
         } catch (Exception e) {
-            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy hooks." + e);
+            if (e instanceof ClassNotFoundException) {
+                Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
+                printedThermalExpansionNotFound = true;
+            } else {
+                Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy hooks. {}", e);
+            }
         }
 
         // XXX : We register the energy cell
@@ -88,7 +94,14 @@ public class ThermalExpansionModule {
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerEnergyCell(), TileEnergyCell);
 
         } catch (Exception e) {
-            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy Cell hooks." + e);
+            if (e instanceof ClassNotFoundException || e instanceof NoSuchFieldException) {
+                if (!printedThermalExpansionNotFound) {
+                    printedThermalExpansionNotFound = true;
+                    Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
+                }
+            } else {
+                Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy Cell hooks. {}", e);
+            }
         }
 
         // XXX : We register the Tank interface
@@ -107,7 +120,14 @@ public class ThermalExpansionModule {
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTank(), TileTank);
 
         } catch (Exception e) {
-            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tank hooks." + e);
+            if (e instanceof ClassNotFoundException || e instanceof NoSuchFieldException) {
+                if (!printedThermalExpansionNotFound) {
+                    printedThermalExpansionNotFound = true;
+                    Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
+                }
+            } else {
+                Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tank hooks. {}", e);
+            }
         }
 
         // XXX : We register the Tesseract interface
@@ -123,7 +143,14 @@ public class ThermalExpansionModule {
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTesseract(), TileTesseract);
 
         } catch (Exception e) {
-            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks." + e);
+            if (e instanceof ClassNotFoundException || e instanceof NoSuchFieldException) {
+                if (!printedThermalExpansionNotFound) {
+                    printedThermalExpansionNotFound = true;
+                    Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
+                }
+            } else {
+                Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks. {}", e);
+            }
         }
 
         // XXX : We register the ISecureTile interface
@@ -137,7 +164,14 @@ public class ThermalExpansionModule {
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerISecureTile(), ISecureTile);
 
         } catch (Exception e) {
-            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading ISecureTile hooks." + e);
+            if (e instanceof ClassNotFoundException) {
+                if (!printedThermalExpansionNotFound) {
+                    printedThermalExpansionNotFound = true;
+                    Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
+                }
+            } else {
+                Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading ISecureTile hooks. {}", e);
+            }
         }
 
         // XXX : We register the Cache interface
@@ -153,7 +187,17 @@ public class ThermalExpansionModule {
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerCache(), TileCache);
 
         } catch (Exception e) {
-            Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks." + e);
+            if (e instanceof ClassNotFoundException) {
+                if (!printedThermalExpansionNotFound) {
+                    printedThermalExpansionNotFound = true;
+                    Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found.");
+                }
+            } else {
+                Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks. {}", e);
+            }
+        }
+        if (!printedThermalExpansionNotFound) {
+            Waila.log.log(Level.INFO, "Thermal Expansion mod found.");
         }
     }
 

src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java

@@ -235,6 +235,7 @@ public class HUDHandlerVanilla implements IWailaDataProvider {
         ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.redstone");
         ModuleRegistrar.instance().addConfig("VanillaMC", "vanilla.silverfish");
         ModuleRegistrar.instance().addConfigRemote("VanillaMC", "vanilla.jukebox");
+        ModuleRegistrar.instance().addConfigRemote("VanillaMC", "vanilla.show_invisible_players");
 
         IWailaDataProvider provider = new HUDHandlerVanilla();
 

src/main/java/mcp/mobius/waila/client/KeyEvent.java

@@ -37,19 +37,20 @@ public class KeyEvent {
 
     @SubscribeEvent
     public void onKeyEvent(KeyInputEvent event) {
+        boolean showKey = key_show.isPressed();
         if (key_cfg.isPressed()) {
             Minecraft mc = Minecraft.getMinecraft();
             if (mc.currentScreen == null) {
                 mc.displayGuiScreen(new ScreenConfig(null));
             }
-        } else if (key_show.isPressed() && ConfigHandler.instance()
+        } else if (showKey && ConfigHandler.instance()
                 .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)) {
                     boolean status = ConfigHandler.instance()
                             .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true);
                     ConfigHandler.instance()
                             .setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, !status);
                 } else
-            if (key_show.isPressed() && !ConfigHandler.instance()
+            if (showKey && !ConfigHandler.instance()
                     .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)) {
                         ConfigHandler.instance()
                                 .setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true);

src/main/java/mcp/mobius/waila/overlay/RayTracing.java

@@ -7,6 +7,7 @@ import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -38,8 +39,8 @@ public class RayTracing {
     private final Minecraft mc = Minecraft.getMinecraft();
 
     public void fire() {
-        if (mc.objectMouseOver != null
-                && mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY) {
+        if (mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY
+                && !shouldHidePlayer(mc.objectMouseOver.entityHit)) {
             this.target = mc.objectMouseOver;
             return;
         }
@@ -50,6 +51,15 @@ public class RayTracing {
         this.target = this.rayTrace(viewpoint, mc.playerController.getBlockReachDistance(), 0);
     }
 
+    private static boolean shouldHidePlayer(Entity targetEnt) {
+        // Check if entity is player with invisibility effect
+        if (targetEnt instanceof EntityPlayer thePlayer) {
+            boolean shouldHidePlayerSetting = !ConfigHandler.instance().getConfig("vanilla.show_invisible_players");
+            return shouldHidePlayerSetting && thePlayer.isInvisible();
+        }
+        return false;
+    }
+
     public MovingObjectPosition getTarget() {
         return this.target;
     }
@@ -124,7 +134,7 @@ public class RayTracing {
                             .getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance());
                     if (providerStack != null) {
 
-                        if (providerStack.getItem() == null) return new ArrayList<ItemStack>();
+                        if (providerStack.getItem() == null) return new ArrayList<>();
 
                         items.add(providerStack);
                     }
@@ -141,7 +151,7 @@ public class RayTracing {
                             .getWailaStack(DataAccessorCommon.instance, ConfigHandler.instance());
                     if (providerStack != null) {
 
-                        if (providerStack.getItem() == null) return new ArrayList<ItemStack>();
+                        if (providerStack.getItem() == null) return new ArrayList<>();
 
                         items.add(providerStack);
                     }
@@ -165,12 +175,11 @@ public class RayTracing {
         try {
             ItemStack pick = mouseoverBlock.getPickBlock(this.target, world, x, y, z);
             if (pick != null) items.add(pick);
-        } catch (Exception e) {}
+        } catch (Exception ignored) {}
 
         if (!items.isEmpty()) return items;
 
-        if (mouseoverBlock instanceof IShearable) {
-            IShearable shearable = (IShearable) mouseoverBlock;
+        if (mouseoverBlock instanceof IShearable shearable) {
             if (shearable.isShearable(new ItemStack(Items.shears), world, x, y, z)) {
                 items.addAll(shearable.onSheared(new ItemStack(Items.shears), world, x, y, z, 0));
             }

src/main/resources/assets/waila/lang/en_US.lang

@@ -135,6 +135,7 @@ option.bcapi.consump=Show maximum power
 option.bcapi.trigger=Show triggering energy
 option.pr.showio=Show gates IO
 option.pr.showdata=Show gates data
+option.pr.showsignal=Show wire signal strength
 option.extrautilities.fluidamount=Show fluid amount
 option.openblocks.fluidamount=Show fluid amount
 option.railcraft.fluidamount=Show fluid amount