Major Refactor of the SideConfig Buttons in the MechanicalCrafterGUI

Author: RoboXGamer

src/main/java/net/roboxgamer/modernutils/ModernUtilsMod.java

@@ -1,6 +1,5 @@
 package net.roboxgamer.modernutils;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;

src/main/java/net/roboxgamer/modernutils/block/entity/custom/MechanicalCrafterBlockEntity.java

@@ -40,7 +40,6 @@
 import net.roboxgamer.modernutils.block.entity.ModBlockEntities;
 import net.roboxgamer.modernutils.menu.MechanicalCrafterMenu;
 import net.roboxgamer.modernutils.network.ItemStackPayload;
-import net.roboxgamer.modernutils.network.SideStatePayload;
 import net.roboxgamer.modernutils.network.SlotStatePayload;
 import net.roboxgamer.modernutils.util.Constants;
 import net.roboxgamer.modernutils.util.CustomRecipeExtender;
@@ -122,25 +121,24 @@ public Direction getRelativeDirection(Constants.Sides side) {
     return sideDir;
   }
 
-  public void handleSideBtnClick(@NotNull Constants.Sides side, Button button, ClickAction clickAction) {
+  public void handleSideBtnClick(@NotNull Constants.Sides side, boolean isShiftPressed, ClickAction clickAction) {
     Direction sideDir = getRelativeDirection(side);
-  //  Cycle through the side states
     Constants.SideState sideState = getSideState(side);
     int currentState = sideState.ordinal();
-    int nextState = (currentState + 1) % Constants.SideState.values().length;
-    
-    // Check if the Shift key is held down
-    long window = Minecraft.getInstance().getWindow().getWindow();
-    boolean isShiftPressed = InputConstants.isKeyDown(window, InputConstants.KEY_LSHIFT)
-        || InputConstants.isKeyDown(window, InputConstants.KEY_RSHIFT);
+    int totalStates = Constants.SideState.values().length;
 
     if (isShiftPressed) {
       // Handle shift + left-click logic here
       sideState = Constants.SideState.NONE;
       this.sideBtnStates.put(side, sideState);
-    }else{
+    } else {
+      int nextState;
       if (clickAction != null && clickAction.equals(ClickAction.SECONDARY)) {
-        nextState = (currentState - 1) % Constants.SideState.values().length;
+        // For reverse cycling, handle negative numbers
+        nextState = (currentState - 1 + totalStates) % totalStates;
+      } else {
+        // Forward cycling
+        nextState = (currentState + 1) % totalStates;
       }
       this.sideBtnStates.put(side, Constants.SideState.values()[nextState]);
     }
@@ -166,17 +164,9 @@ public void handleSideBtnClick(@NotNull Constants.Sides side, Button button, Cli
         this.exportDirections.put(sideDir,false);
       }
     }
-    if (button != null) {
-      button.setMessage(Component.literal(String.format("%s Side,State: %s",side,sideState)));
-    }
 
     ModernUtilsMod.LOGGER.debug("Side {} State Changed to {}", side, getSideState(side));
     setChanged();
-    if (level != null && level.isClientSide()) {
-      PacketDistributor.sendToServer(
-          new SideStatePayload(side, clickAction, this.getBlockPos())
-      );
-    }
   }
 
   public Constants.SideState getSideState(Constants.Sides side){
@@ -228,6 +218,10 @@ public boolean isAutoExportEnabled() {
     return this.autoExportEnabled;
   }
 
+  public void setSideBtnState(Constants.@NotNull Sides side,Constants.SideState state) {
+    this.sideBtnStates.put(side, state);
+  }
+  
   public class CustomItemStackHandler extends ItemStackHandler {
     public CustomItemStackHandler(int size) {
       super(size);
@@ -1111,8 +1105,14 @@ private void loadSidesConfig(CompoundTag tag) {
       Direction sideDir = getRelativeDirection(side);
 
       switch (sideState){
-        case INPUT -> this.importDirections.put(sideDir,true);
-        case OUTPUT -> this.exportDirections.put(sideDir,true);
+        case INPUT -> {
+          this.importDirections.put(sideDir,true);
+          this.exportDirections.put(sideDir,false);
+        }
+        case OUTPUT -> {
+          this.importDirections.put(sideDir,false);
+          this.exportDirections.put(sideDir,true);
+        }
         case BOTH -> {
           this.importDirections.put(sideDir,true);
           this.exportDirections.put(sideDir,true);

src/main/java/net/roboxgamer/modernutils/client/screen/ExtendedButton.java

@@ -125,7 +125,7 @@ protected void renderWidget(@NotNull GuiGraphics guiGraphics, int mouseX, int mo
     }
   }
 
-  private void renderTooltip(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY) {
+  public void renderTooltip(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY) {
     Component msg = this.getMessage();
     if (this.button != null){
       msg = this.button.getMessage();

src/main/java/net/roboxgamer/modernutils/client/screen/MechanicalCrafterScreen.java

@@ -27,8 +27,8 @@
 import net.roboxgamer.modernutils.util.RedstoneManager;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.Objects;
+import java.util.HashMap;
+import java.util.Map;
 
 import static net.roboxgamer.modernutils.util.RedstoneManager.REDSTONE_MODE_MAP;
 
@@ -73,7 +73,7 @@ public class MechanicalCrafterScreen extends AbstractContainerScreen<MechanicalC
   private ExtendedButton rightSideBtn;
   private ExtendedButton backSideBtn;
   private ExtendedButton frontSideBtn;
-  private ArrayList<ExtendedButton> sideBtns;
+  private Map<Constants.Sides, SideConfigButton> sideButtons = new HashMap<>();
 
 
   public MechanicalCrafterScreen(MechanicalCrafterMenu menu, Inventory playerInv, Component title) {
@@ -172,7 +172,6 @@ public void renderIcon(GuiGraphics guiGraphics, int mouseX, int mouseY, float pa
         guiGraphics.pose().popPose();
       }
     };
-    
     addRenderableWidget(this.sideConfigBtn);
 
 
@@ -199,24 +198,6 @@ public void renderIcon(GuiGraphics guiGraphics, int mouseX, int mouseY, float pa
       }
     };
     updateAutoImportButtonTooltip();
-    SideConfigTab.addChild(this.autoImportBtn);
-    
-    this.upSideBtn = new ExtendedButton(
-        "UpSideBtn",
-        24, 24,
-        Component.literal("Up Side"),
-        true,  // Optional icon
-        ExtendedButton.WidgetPosition.NONE,
-        (button, clickAction, mouseX, mouseY) -> this.blockEntity.handleSideBtnClick(Constants.Sides.UP, button,clickAction),
-        this.player
-    ){
-      @Override
-      public void renderIcon(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick, ExtendedButton extendedButton) {
-        renderSideBtnBackgroundAndIcon(guiGraphics, extendedButton, Constants.Sides.UP);
-      }
-    };
-    SideConfigTab.addChild(this.upSideBtn);
-    
 
     this.autoExportBtn = new ExtendedButton(
         "AutoExportBtn",
@@ -241,97 +222,39 @@ public void renderIcon(GuiGraphics guiGraphics, int mouseX, int mouseY, float pa
       }
     };
     updateAutoExportButtonTooltip();
-    SideConfigTab.addChild(this.autoExportBtn);
 
-    this.leftSideBtn = new ExtendedButton(
-        "LeftSideBtn",
-        24, 24,
-        Component.literal("Left Side"),
-        true,  // Optional icon
-        ExtendedButton.WidgetPosition.NONE,
-        (button, clickAction, mouseX, mouseY) -> this.blockEntity.handleSideBtnClick(Constants.Sides.LEFT, button,clickAction),
-        this.player
-    ){
-      @Override
-      public void renderIcon(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick, ExtendedButton extendedButton) {
-        renderSideBtnBackgroundAndIcon(guiGraphics, extendedButton, Constants.Sides.LEFT);
-      }
-    };
-    SideConfigTab.addChild(this.leftSideBtn);
+    initSideButtons();
 
-    this.frontSideBtn = new ExtendedButton(
-        "FrontSideBtn",
-        24, 24,
-        Component.literal("Front Side"),
-        true,  // Optional icon
-        ExtendedButton.WidgetPosition.NONE,
-        (button, clickAction, mouseX, mouseY) -> this.blockEntity.handleSideBtnClick(Constants.Sides.FRONT, button,clickAction),
-        this.player
-    ) {
-      @Override
-      public void renderIcon(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick, ExtendedButton extendedButton) {
-        renderSideBtnBackgroundAndIcon(guiGraphics, extendedButton, Constants.Sides.FRONT);
-      }
-    };
+    this.upSideBtn = sideButtons.get(Constants.Sides.UP);
+    this.downSideBtn = sideButtons.get(Constants.Sides.DOWN);
+    this.leftSideBtn = sideButtons.get(Constants.Sides.LEFT);
+    this.rightSideBtn = sideButtons.get(Constants.Sides.RIGHT);
+    this.frontSideBtn = sideButtons.get(Constants.Sides.FRONT);
+    this.backSideBtn = sideButtons.get(Constants.Sides.BACK);
+    SideConfigTab.addChild(this.autoImportBtn);
+    SideConfigTab.addChild(this.upSideBtn);
+    SideConfigTab.addChild(this.autoExportBtn);
+    SideConfigTab.addChild(this.leftSideBtn);
     SideConfigTab.addChild(this.frontSideBtn);
-    
-    this.rightSideBtn = new ExtendedButton(
-        "RightSideBtn",
-        24, 24,
-        Component.literal("Right Side"),
-        true,  // Optional icon
-        ExtendedButton.WidgetPosition.NONE,
-        (button, clickAction, mouseX, mouseY) -> this.blockEntity.handleSideBtnClick(Constants.Sides.RIGHT, button,clickAction),
-        this.player
-    ){
-      @Override
-      public void renderIcon(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick, ExtendedButton extendedButton) {
-        renderSideBtnBackgroundAndIcon(guiGraphics, extendedButton, Constants.Sides.RIGHT);
-      }
-    };
     SideConfigTab.addChild(this.rightSideBtn);
-    
-    this.backSideBtn = new ExtendedButton(
-        "BackSideBtn",
-        24, 24,
-        Component.literal("Back Side"),
-        true,  // Optional icon
-        ExtendedButton.WidgetPosition.NONE,
-        (button, clickAction, mouseX, mouseY) -> this.blockEntity.handleSideBtnClick(Constants.Sides.BACK, button,clickAction),
-        this.player
-    ){
-      @Override
-      public void renderIcon(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick, ExtendedButton extendedButton) {
-        renderSideBtnBackgroundAndIcon(guiGraphics, extendedButton, Constants.Sides.BACK);
-      }
-    };
     SideConfigTab.addChild(this.backSideBtn);
-    
-    this.downSideBtn = new ExtendedButton(
-        "DownSideBtn",
-        24, 24,
-        Component.literal("Down Side"),
-        true,  // Optional icon
-        ExtendedButton.WidgetPosition.NONE,
-        (button, clickAction, mouseX, mouseY) -> this.blockEntity.handleSideBtnClick(Constants.Sides.DOWN, button,clickAction),
-        this.player
-    ){
-      @Override
-      public void renderIcon(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick, ExtendedButton extendedButton) {
-        renderSideBtnBackgroundAndIcon(guiGraphics, extendedButton, Constants.Sides.DOWN);
-      }
-    };
     SideConfigTab.addChild(this.downSideBtn);
-    
-    this.sideBtns = new ArrayList<>();
-    this.sideBtns.add(this.upSideBtn);
-    this.sideBtns.add(this.downSideBtn);
-    this.sideBtns.add(this.leftSideBtn);
-    this.sideBtns.add(this.rightSideBtn);
-    this.sideBtns.add(this.backSideBtn);
-    this.sideBtns.add(this.frontSideBtn);
-    
-    updateSideBtnsTooltip();
+  }
+  
+  void initSideButtons() {
+    // Create buttons for all sides
+    for (Constants.Sides side : Constants.Sides.values()) {
+      String btnId = side.toString() + "SideBtn";
+      SideConfigButton button = new SideConfigButton(
+          btnId,
+          side,
+          this,
+          this.blockEntity,
+          this.player
+      );
+      // Store in our map for easy access
+      sideButtons.put(side, button);
+    }
   }
 
   private boolean getAutoImportState() {
@@ -342,51 +265,6 @@ private boolean getAutoExportState() {
     return this.blockEntity.isAutoExportEnabled();
   }
 
-  private void updateSideBtnsTooltip() {
-    for (Constants.Sides side : Constants.Sides.values()) {
-      var sideState = this.blockEntity.getSideState(side);
-      this.sideBtns.get(side.ordinal()).setMessage(Component.literal(String.format("%s Side,State: %s",side,sideState)));
-    }
-  }
-  
-  private void renderSideBtnBackgroundAndIcon(GuiGraphics guiGraphics, ExtendedButton button, Constants.Sides side) {
-    // Get the current mode of the side
-    Constants.SideState sideMode = this.blockEntity.getSideState(side);
-    
-    // Determine the background color based on the mode
-    int backgroundColor = Constants.getColorForMode(sideMode);
-    int margin = 2;
-    // Render the background color
-    guiGraphics.fill(
-        button.getX() + margin,
-        button.getY() + margin,
-        button.getX() + button.getWidth() - margin,
-        button.getY() + button.getHeight() - margin,
-        backgroundColor
-    );
-    
-    // Render the icon with scaling and centering
-    float scale = 1.15f;
-    float offset = (button.getWidth() - (16 * scale)) / 2;
-    
-    guiGraphics.pose().pushPose();
-    guiGraphics.pose().translate(button.getX() + offset, button.getY() + offset, 0);
-    guiGraphics.pose().scale(scale, scale, 1);
-    ItemStack item = ItemStack.EMPTY;
-    var pos = this.blockEntity.getBlockPos().relative(this.blockEntity.getRelativeDirection(side));
-    var state = Objects.requireNonNull(this.blockEntity.getLevel()).getBlockState(pos);
-    if (state.hasBlockEntity() && this.blockEntity.getLevel().isLoaded(pos)){
-      item = state.getBlock().asItem().getDefaultInstance();
-    }
-    guiGraphics.renderFakeItem(
-        item,
-        0,
-        0
-    );
-    guiGraphics.pose().popPose();
-  }
-  
-  
   private void handleAutoExportButtonClick(Button button) {
     this.blockEntity.autoExportBtnHandler();
     updateAutoExportButtonTooltip();