Better support for multis with configurable channels (#17)

* support for multis with configurable channels * better zoom adjustment based on multi size * fix button deadzones * remove tooltip when button is hidden * update deps * properly reset channelIndex --------- Co-authored-by: Martin Robertz <[email protected]> Co-authored-by: Jason Mitchell <[email protected]>
GTNewHorizons · Jul 8, 2024 · c617dde · c617dde
1 parent 8a44856
commit c617dde
Show file tree

Hide file tree

Showing 10 changed files with 360 additions and 153 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -2,9 +2,8 @@
 
 dependencies {
     api('com.github.GTNewHorizons:StructureLib:1.3.1:dev')
-    api("com.github.GTNewHorizons:NotEnoughEnergistics:1.6.0:dev")
-
     implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.64:dev")
+    compileOnly("com.github.GTNewHorizons:NotEnoughEnergistics:1.6.0:dev")
 
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:StructureCompat:0.6.3:dev")
 }
diff --git a/gradle.properties b/gradle.properties
@@ -71,7 +71,7 @@ apiPackage =
 # Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
 # There can be multiple files in a space-separated list.
 # Example value: mymodid_at.cfg nei_at.cfg
-accessTransformersFile =
+accessTransformersFile = blockrenderer6343_at.cfg
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false

diff --git a/src/main/java/blockrenderer6343/BlockRenderer6343.java b/src/main/java/blockrenderer6343/BlockRenderer6343.java
@@ -31,6 +31,7 @@ public class BlockRenderer6343 {
 
     public static boolean isGTLoaded;
     public static boolean isBartworksLoaded;
+    public static boolean isNEELoaded;
 
     @Mod.EventHandler
     // preInit "Run before anything else. Read your config, create blocks, items,
@@ -39,6 +40,7 @@ public void preInit(FMLPreInitializationEvent event) {
         proxy.preInit(event);
         isGTLoaded = Loader.isModLoaded("gregtech");
         isBartworksLoaded = Loader.isModLoaded("bartworks");
+        isNEELoaded = Loader.isModLoaded("neenergistics");
     }
 
     @Mod.EventHandler

diff --git a/src/main/java/blockrenderer6343/client/utils/TooltipButton.java b/src/main/java/blockrenderer6343/client/utils/TooltipButton.java
@@ -1,5 +1,8 @@
 package blockrenderer6343.client.utils;
 
+import java.util.function.BooleanSupplier;
+
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.Tessellator;
 
@@ -10,13 +13,27 @@
 public class TooltipButton extends GuiButtonExt {
 
     public final String hoverString;
+    private final BooleanSupplier supplier;
 
     public TooltipButton(int id, int xPos, int yPos, int width, int height, String displayString, String hoverString) {
+        this(id, xPos, yPos, width, height, displayString, hoverString, null);
+    }
+
+    public TooltipButton(int id, int xPos, int yPos, int width, int height, String displayString, String hoverString,
+            BooleanSupplier supplier) {
         super(id, xPos, yPos, width, height, displayString);
         this.hoverString = hoverString;
+        this.supplier = supplier;
+    }
+
+    @Override
+    public void drawButton(Minecraft mc, int mouseX, int mouseY) {
+        if (supplier != null && !supplier.getAsBoolean()) return;
+        super.drawButton(mc, mouseX, mouseY);
     }
 
     public boolean isMouseOver(int mouseX, int mouseY) {
+        if (supplier != null && !supplier.getAsBoolean()) return false;
         return this.enabled && this.visible
                 && mouseX >= this.xPosition
                 && mouseY >= this.yPosition

diff --git a/src/main/java/blockrenderer6343/client/world/ClientFakePlayer.java b/src/main/java/blockrenderer6343/client/world/ClientFakePlayer.java
@@ -2,15 +2,20 @@
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.stats.StatBase;
+import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.IChatComponent;
 import net.minecraft.world.World;
 
 import com.mojang.authlib.GameProfile;
 
+import blockrenderer6343.integration.nei.GUI_MultiblockHandler;
+
 public class ClientFakePlayer extends EntityPlayer {
 
+    private static final String CHANNEL_KEY = "structurelib.autoplace.warning.no_explicit_channel";
+
     public ClientFakePlayer(World world, GameProfile name) {
         super(world, name);
     }
@@ -29,7 +34,11 @@ public ChunkCoordinates getPlayerCoordinates() {
     }
 
     @Override
-    public void addChatComponentMessage(IChatComponent chatmessagecomponent) {}
+    public void addChatComponentMessage(IChatComponent message) {
+        if (message instanceof ChatComponentTranslation msg && msg.getKey().equals(CHANNEL_KEY)) {
+            GUI_MultiblockHandler.channels.add(msg.getFormatArgs()[0].toString());
+        }
+    }
 
     @Override
     public void addStat(StatBase par1StatBase, int par2) {}

diff --git a/src/main/java/blockrenderer6343/integration/gregtech/GT_GUI_MultiblockHandler.java b/src/main/java/blockrenderer6343/integration/gregtech/GT_GUI_MultiblockHandler.java
@@ -53,22 +53,22 @@ protected void placeMultiblock() {
         }
         structureElements.clear();
 
-        if (mte instanceof ISurvivalConstructable) {
+        if (mte instanceof ISurvivalConstructable survivalConstructable) {
             int result, iterations = 0;
             do {
-                result = ((ISurvivalConstructable) mte).survivalConstruct(
-                        getTriggerStack(),
+                result = survivalConstructable.survivalConstruct(
+                        getBuildTriggerStack(),
                         Integer.MAX_VALUE,
                         ISurvivalBuildEnvironment.create(CreativeItemSource.instance, fakeMultiblockBuilder));
                 iterations++;
             } while (result > 0 && iterations < MAX_PLACE_ROUNDS);
-        } else if (tTileEntity instanceof IConstructableProvider) {
-            constructable = ((IConstructableProvider) tTileEntity).getConstructable();
-        } else if (tTileEntity instanceof IConstructable) {
-            constructable = (IConstructable) tTileEntity;
+        } else if (tTileEntity instanceof IConstructableProvider iConstructableProvider) {
+            constructable = iConstructableProvider.getConstructable();
+        } else if (tTileEntity instanceof IConstructable iConstructable) {
+            constructable = iConstructable;
         }
         if (constructable != null) {
-            constructable.construct(getTriggerStack(), false);
+            constructable.construct(getBuildTriggerStack(), false);
         }
 
         if (StructureLibAPI.isInstrumentEnabled()) {