Info panel screen rework and tinker station screen tweaks

src/main/java/slimeknights/tconstruct/tables/client/inventory/BaseTabbedScreen.java

@@ -2,7 +2,6 @@
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.renderer.Rect2i;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.resources.ResourceLocation;
@@ -11,7 +10,6 @@
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import slimeknights.mantle.client.screen.ElementScreen;
-import slimeknights.mantle.client.screen.MultiModuleScreen;
 import slimeknights.tconstruct.TConstruct;
 import slimeknights.tconstruct.library.client.GuiUtil;
 import slimeknights.tconstruct.library.client.Icons;
@@ -22,9 +20,8 @@
 import slimeknights.tconstruct.tables.menu.module.SideInventoryContainer;
 
 import javax.annotation.Nullable;
-import java.util.List;
 
-public class BaseTabbedScreen<TILE extends BlockEntity, CONTAINER extends TabbedContainerMenu<TILE>> extends MultiModuleScreen<CONTAINER> {
+public class BaseTabbedScreen<TILE extends BlockEntity, CONTAINER extends TabbedContainerMenu<TILE>> extends ExtendedContainerScreen<CONTAINER> {
   protected static final Component COMPONENT_WARNING = TConstruct.makeTranslation("gui", "warning");
   protected static final Component COMPONENT_ERROR = TConstruct.makeTranslation("gui", "error");
 
@@ -43,7 +40,7 @@ public BaseTabbedScreen(CONTAINER container, Inventory playerInventory, Componen
   protected void init() {
     super.init();
 
-    this.tabsScreen = addRenderableWidget(new TinkerTabsWidget(this));
+    this.tabsScreen = addExtraArea(addRenderableWidget(new TinkerTabsWidget(this)));
   }
 
   @Nullable
@@ -92,17 +89,4 @@ protected void addChestSideInventory(Inventory inventory) {
       this.addModule(new SideInventoryScreen<>(this, sideInventoryContainer, inventory, sideInventoryName, sideInventoryContainer.getSlotCount(), sideInventoryContainer.getColumns()));
     }
   }
-
-  @Override
-  public List<Rect2i> getModuleAreas() {
-    List<Rect2i> areas = super.getModuleAreas();
-    areas.add(tabsScreen.getArea());
-    return areas;
-  }
-
-  @Override
-  protected boolean hasClickedOutside(double mouseX, double mouseY, int guiLeft, int guiTop, int mouseButton) {
-    return super.hasClickedOutside(mouseX, mouseY, guiLeft, guiTop, mouseButton)
-      && !tabsScreen.isMouseOver(mouseX, mouseY);
-  }
 }

src/main/java/slimeknights/tconstruct/tables/client/inventory/ExtendedContainerScreen.java

@@ -0,0 +1,58 @@
+package slimeknights.tconstruct.tables.client.inventory;
+
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.renderer.Rect2i;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Inventory;
+import org.apache.commons.compress.utils.Lists;
+import slimeknights.mantle.client.screen.MultiModuleScreen;
+import slimeknights.mantle.inventory.MultiModuleContainerMenu;
+import slimeknights.tconstruct.tables.client.inventory.widget.ExtraAreaWidget;
+
+import java.util.List;
+
+/**
+ * A helper class that handles custom widget interfaces.
+ * This class could potentially be relocated to mantle.
+ * @author kirderf1
+ */
+public abstract class ExtendedContainerScreen<CONTAINER extends MultiModuleContainerMenu<?>> extends MultiModuleScreen<CONTAINER> {
+
+  private final List<ExtraAreaWidget> extraAreas = Lists.newArrayList();
+
+  public ExtendedContainerScreen(CONTAINER container, Inventory playerInventory, Component title) {
+    super(container, playerInventory, title);
+  }
+
+  protected <T extends ExtraAreaWidget> T addExtraArea(T widget) {
+    this.extraAreas.add(widget);
+    return widget;
+  }
+
+  @Override
+  protected void removeWidget(GuiEventListener widget) {
+    if(widget instanceof ExtraAreaWidget)
+      this.extraAreas.remove(widget);
+
+    super.removeWidget(widget);
+  }
+
+  @Override
+  protected void clearWidgets() {
+    super.clearWidgets();
+    this.extraAreas.clear();
+  }
+
+  @Override
+  public List<Rect2i> getModuleAreas() {
+    List<Rect2i> areas = super.getModuleAreas();
+    this.extraAreas.forEach(widget -> areas.add(widget.getArea()));
+    return areas;
+  }
+
+  @Override
+  protected boolean hasClickedOutside(double mouseX, double mouseY, int fuiLeft, int guiTop, int mouseButton) {
+    return super.hasClickedOutside(mouseX, mouseY, fuiLeft, guiTop, mouseButton)
+      && this.extraAreas.stream().noneMatch(widget -> widget.isInArea(mouseX, mouseY));
+  }
+}

src/main/java/slimeknights/tconstruct/tables/client/inventory/ModifierWorktableScreen.java

@@ -2,9 +2,10 @@
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.util.Mth;
@@ -23,7 +24,7 @@
 import slimeknights.tconstruct.library.recipe.worktable.IModifierWorktableRecipe;
 import slimeknights.tconstruct.library.tools.nbt.ToolStack;
 import slimeknights.tconstruct.tables.block.entity.table.ModifierWorktableBlockEntity;
-import slimeknights.tconstruct.tables.client.inventory.module.InfoPanelScreen;
+import slimeknights.tconstruct.tables.client.inventory.widget.InfoPanelWidget;
 import slimeknights.tconstruct.tables.menu.ModifierWorktableContainerMenu;
 import slimeknights.tconstruct.tools.item.ModifierCrystalItem;
 
@@ -42,8 +43,8 @@ public class ModifierWorktableScreen extends BaseTabbedScreen<ModifierWorktableB
   };
 
   /** Side panels, for tools and modifiers */
-  protected InfoPanelScreen tinkerInfo;
-  protected InfoPanelScreen modifierInfo;
+  protected InfoPanelWidget tinkerInfo;
+  protected InfoPanelWidget modifierInfo;
 
   /** Current scrollbar position */
   private float sliderProgress = 0.0F;
@@ -60,18 +61,16 @@ public class ModifierWorktableScreen extends BaseTabbedScreen<ModifierWorktableB
   public ModifierWorktableScreen(ModifierWorktableContainerMenu container, Inventory playerInventory, Component title) {
     super(container, playerInventory, title);
 
-    this.tinkerInfo = new InfoPanelScreen(this, container, playerInventory, title);
-    this.tinkerInfo.setTextScale(8/9f);
-    this.addModule(this.tinkerInfo);
-
-    this.modifierInfo = new InfoPanelScreen(this, container, playerInventory, title);
-    this.modifierInfo.setTextScale(7/9f);
-    this.addModule(this.modifierInfo);
+    addChestSideInventory(playerInventory);
+  }
 
-    this.tinkerInfo.yOffset = 0;
-    this.modifierInfo.yOffset = this.tinkerInfo.imageHeight + 4;
+  @Override
+  protected void init() {
+    super.init();
 
-    addChestSideInventory(playerInventory);
+    final int panelLeft = this.cornerX + this.realWidth;
+    this.tinkerInfo = addExtraArea(addRenderableWidget(new InfoPanelWidget(this, InfoPanelWidget.Style.PLAIN, panelLeft, this.cornerY, 8/9f)));
+    this.modifierInfo = addExtraArea(addRenderableWidget(new InfoPanelWidget(this, InfoPanelWidget.Style.PLAIN, panelLeft, this.cornerY + InfoPanelWidget.DEFAULT_HEIGHT + 4, 7/9f)));
   }
 
   @Override
@@ -135,6 +134,8 @@ protected void renderTooltip(PoseStack matrixStack, int mouseX, int mouseY) {
         }
       }
     }
+    this.tinkerInfo.renderTooltip(matrixStack, mouseX, mouseY);
+    this.modifierInfo.renderTooltip(matrixStack, mouseX, mouseY);
   }
 
   /** Draw backgrounds for all modifiers */
@@ -201,16 +202,16 @@ public void updateDisplay() {
       ItemStack resultStack = getMenu().getOutputSlot().getItem();
       TinkerStationScreen.updateToolPanel(tinkerInfo, result, resultStack);
 
-      this.modifierInfo.setCaption(TextComponent.EMPTY);
-      this.modifierInfo.setText(TextComponent.EMPTY);
+      this.modifierInfo.setCaptions();
+      this.modifierInfo.setText();
       if (result.hasTag(TinkerTags.Items.MODIFIABLE)) {
         TinkerStationScreen.updateModifierPanel(modifierInfo, result);
       } else {
         // modifier crystals can show their modifier, along with anything else with a modifier there
         ModifierId modifierId = ModifierCrystalItem.getModifier(resultStack);
         if (modifierId != null) {
           Modifier modifier = ModifierManager.getValue(modifierId);
-          modifierInfo.setCaption(TConstruct.makeTranslation("gui", "tinker_station.modifiers"));
+          modifierInfo.setCaptions(TConstruct.makeTranslation("gui", "tinker_station.modifiers").withStyle(ChatFormatting.UNDERLINE));
           modifierInfo.setText(Collections.singletonList(modifier.getDisplayName()), Collections.singletonList(modifier.getDescription()));
         }
       }
@@ -223,10 +224,6 @@ public void updateDisplay() {
   @Override
   public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
     this.clickedOnScrollBar = false;
-    if (this.tinkerInfo.handleMouseClicked(mouseX, mouseY, mouseButton)
-        || this.modifierInfo.handleMouseClicked(mouseX, mouseY, mouseButton)) {
-      return false;
-    }
 
     if (tile != null && !tile.getCurrentButtons().isEmpty()) {
       // handle button click
@@ -252,11 +249,6 @@ public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
 
   @Override
   public boolean mouseDragged(double mouseX, double mouseY, int clickedMouseButton, double timeSinceLastClick, double unknown) {
-    if (this.tinkerInfo.handleMouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick)
-        || this.modifierInfo.handleMouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick)) {
-      return false;
-    }
-
     if (this.clickedOnScrollBar && this.canScroll()) {
       int i = this.cornerY + 14;
       int j = i + 54;
@@ -271,10 +263,6 @@ public boolean mouseDragged(double mouseX, double mouseY, int clickedMouseButton
 
   @Override
   public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
-    if (this.tinkerInfo.handleMouseScrolled(mouseX, mouseY, delta)
-        || this.modifierInfo.handleMouseScrolled(mouseX, mouseY, delta)) {
-      return false;
-    }
     if (super.mouseScrolled(mouseX, mouseY, delta)) {
       return true;
     }
@@ -292,7 +280,7 @@ public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
   public boolean mouseReleased(double mouseX, double mouseY, int state) {
     if (this.tinkerInfo.handleMouseReleased(mouseX, mouseY, state)
         || this.modifierInfo.handleMouseReleased(mouseX, mouseY, state)) {
-      return false;
+      return true;
     }
     return super.mouseReleased(mouseX, mouseY, state);
   }
@@ -302,18 +290,18 @@ public boolean mouseReleased(double mouseX, double mouseY, int state) {
 
   @Override
   public void error(Component message) {
-    this.tinkerInfo.setCaption(COMPONENT_ERROR);
+    this.tinkerInfo.setCaptions(COMPONENT_ERROR.copy().withStyle(ChatFormatting.UNDERLINE));
     this.tinkerInfo.setText(message);
-    this.modifierInfo.setCaption(TextComponent.EMPTY);
-    this.modifierInfo.setText(TextComponent.EMPTY);
+    this.modifierInfo.setCaptions();
+    this.modifierInfo.setText();
   }
 
   @Override
   public void warning(Component message) {
-    this.tinkerInfo.setCaption(COMPONENT_WARNING);
+    this.tinkerInfo.setCaptions(COMPONENT_WARNING.copy().withStyle(ChatFormatting.UNDERLINE));
     this.tinkerInfo.setText(message);
-    this.modifierInfo.setCaption(TextComponent.EMPTY);
-    this.modifierInfo.setText(TextComponent.EMPTY);
+    this.modifierInfo.setCaptions();
+    this.modifierInfo.setText();
   }
 
   private Component getInfoTitle() {
@@ -328,10 +316,10 @@ private Component getInfoTitle() {
 
   /** Displays a message with the default title */
   public void message(Component message) {
-    this.tinkerInfo.setCaption(getInfoTitle());
+    this.tinkerInfo.setCaptions(getInfoTitle().copy().withStyle(ChatFormatting.UNDERLINE));
     this.tinkerInfo.setText(message);
-    this.modifierInfo.setCaption(TextComponent.EMPTY);
-    this.modifierInfo.setText(TextComponent.EMPTY);
+    this.modifierInfo.setCaptions();
+    this.modifierInfo.setText();
   }
 
   @Override
@@ -367,4 +355,15 @@ private boolean canScroll() {
   private int getHiddenRows() {
     return (this.getPartRecipeCount() + 4 - 1) / 4 - 3;
   }
+
+  @Override
+  public void resize(Minecraft mc, int width, int height) {
+    var tinkerData = tinkerInfo.getData();
+    var modifierData = modifierInfo.getData();
+
+    super.resize(mc, width, height);
+
+    tinkerInfo.setData(tinkerData);
+    modifierInfo.setData(modifierData);
+  }
 }