Improve UI title rendering

Rearth · Rearth · commit 283613372c29 · 2024-04-04T22:20:08.000+02:00
diff --git a/src/main/java/rearth/oritech/block/entity/machines/generators/BasicGeneratorEntity.java b/src/main/java/rearth/oritech/block/entity/machines/generators/BasicGeneratorEntity.java
@@ -2,11 +2,7 @@
 
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.AbstractFurnaceBlockEntity;
-import net.minecraft.block.entity.FurnaceBlockEntity;
-import net.minecraft.inventory.Inventories;
 import net.minecraft.item.Item;
-import net.minecraft.item.Items;
-import net.minecraft.recipe.RecipeType;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3i;
@@ -17,7 +13,6 @@
 import rearth.oritech.init.recipes.RecipeContent;
 import rearth.oritech.util.InventorySlotAssignment;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -57,7 +52,7 @@ public InventorySlotAssignment getSlots() {
     @Override
     public List<GuiSlot> getGuiSlots() {
         return List.of(
-          new GuiSlot(0, 80, 11));
+          new GuiSlot(0, 80, 21));
     }
     
     @Override
diff --git a/src/main/java/rearth/oritech/block/entity/machines/generators/TestGeneratorEntity.java b/src/main/java/rearth/oritech/block/entity/machines/generators/TestGeneratorEntity.java
@@ -1,7 +1,6 @@
 package rearth.oritech.block.entity.machines.generators;
 
 import net.minecraft.block.BlockState;
-import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3i;
@@ -33,7 +32,7 @@ public InventorySlotAssignment getSlots() {
     @Override
     public List<GuiSlot> getGuiSlots() {
         return List.of(
-          new GuiSlot(0, 75, 11),
+          new GuiSlot(0, 75, 21),
           new GuiSlot(1, 75, 59));
     }
     
diff --git a/src/main/java/rearth/oritech/block/entity/machines/interaction/DestroyerBlockEntity.java b/src/main/java/rearth/oritech/block/entity/machines/interaction/DestroyerBlockEntity.java
@@ -89,9 +89,9 @@ public BlockState getMachineHead() {
     @Override
     public List<ScreenProvider.GuiSlot> getGuiSlots() {
         return List.of(
-          new GuiSlot(0, 50, 11),
-          new GuiSlot(1, 70, 11),
-          new GuiSlot(2, 90, 11));
+          new GuiSlot(0, 50, 21),
+          new GuiSlot(1, 70, 21),
+          new GuiSlot(2, 90, 21));
     }
     
     @Override
diff --git a/src/main/java/rearth/oritech/block/entity/machines/processing/AssemblerBlockEntity.java b/src/main/java/rearth/oritech/block/entity/machines/processing/AssemblerBlockEntity.java
@@ -1,7 +1,6 @@
 package rearth.oritech.block.entity.machines.processing;
 
 import net.minecraft.block.BlockState;
-import net.minecraft.inventory.Inventory;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3i;
@@ -11,9 +10,7 @@
 import rearth.oritech.init.recipes.OritechRecipeType;
 import rearth.oritech.init.recipes.RecipeContent;
 import rearth.oritech.util.InventorySlotAssignment;
-import team.reborn.energy.api.EnergyStorage;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class AssemblerBlockEntity extends MultiblockMachineEntity {
@@ -35,8 +32,8 @@ public InventorySlotAssignment getSlots() {
     @Override
     public List<GuiSlot> getGuiSlots() {
         return List.of(
-          new GuiSlot(0, 70, 11),
-          new GuiSlot(1, 90, 11),
+          new GuiSlot(0, 70, 21),
+          new GuiSlot(1, 90, 21),
           new GuiSlot(2, 80, 59));
     }
     
diff --git a/src/main/java/rearth/oritech/block/entity/machines/processing/AtomicForgeBlockEntity.java b/src/main/java/rearth/oritech/block/entity/machines/processing/AtomicForgeBlockEntity.java
@@ -33,8 +33,8 @@ public InventorySlotAssignment getSlots() {
     @Override
     public List<GuiSlot> getGuiSlots() {
         return List.of(
-          new GuiSlot(0, 70, 11),
-          new GuiSlot(1, 90, 11),
+          new GuiSlot(0, 70, 21),
+          new GuiSlot(1, 90, 21),
           new GuiSlot(2, 80, 59));
     }
     
diff --git a/src/main/java/rearth/oritech/block/entity/machines/processing/CentrifugeBlockEntity.java b/src/main/java/rearth/oritech/block/entity/machines/processing/CentrifugeBlockEntity.java
@@ -136,7 +136,7 @@ public InventorySlotAssignment getSlots() {
     @Override
     public List<GuiSlot> getGuiSlots() {
         return List.of(
-          new GuiSlot(0, 80, 11),
+          new GuiSlot(0, 80, 21),
           new GuiSlot(1, 60, 59),
           new GuiSlot(2, 80, 59),
           new GuiSlot(3, 100, 59));
diff --git a/src/main/java/rearth/oritech/block/entity/machines/processing/FoundryBlockEntity.java b/src/main/java/rearth/oritech/block/entity/machines/processing/FoundryBlockEntity.java
@@ -32,8 +32,8 @@ public InventorySlotAssignment getSlots() {
     @Override
     public List<GuiSlot> getGuiSlots() {
         return List.of(
-          new GuiSlot(0, 70, 11),
-          new GuiSlot(1, 90, 11),
+          new GuiSlot(0, 70, 21),
+          new GuiSlot(1, 90, 21),
           new GuiSlot(2, 80, 59));
     }
     
diff --git a/src/main/java/rearth/oritech/block/entity/machines/processing/FragmentForgeBlockEntity.java b/src/main/java/rearth/oritech/block/entity/machines/processing/FragmentForgeBlockEntity.java
@@ -86,10 +86,10 @@ public InventorySlotAssignment getSlots() {
     @Override
     public List<GuiSlot> getGuiSlots() {
         return List.of(
-          new GuiSlot(0, 80, 11),
-          new GuiSlot(1, 100, 11),
-          new GuiSlot(2, 120, 11),
-          new GuiSlot(3, 140, 11),
+          new GuiSlot(0, 80, 21),
+          new GuiSlot(1, 100, 21),
+          new GuiSlot(2, 120, 21),
+          new GuiSlot(3, 140, 21),
           new GuiSlot(4, 80, 59),
           new GuiSlot(5, 100, 59));
     }
diff --git a/src/main/java/rearth/oritech/block/entity/machines/processing/PoweredFurnaceBlockEntity.java b/src/main/java/rearth/oritech/block/entity/machines/processing/PoweredFurnaceBlockEntity.java
@@ -1,7 +1,6 @@
 package rearth.oritech.block.entity.machines.processing;
 
 import net.minecraft.block.BlockState;
-import net.minecraft.inventory.SimpleInventory;
 import net.minecraft.recipe.RecipeType;
 import net.minecraft.recipe.SmeltingRecipe;
 import net.minecraft.screen.ScreenHandlerType;
@@ -17,7 +16,6 @@
 import rearth.oritech.init.recipes.OritechRecipeType;
 import rearth.oritech.init.recipes.RecipeContent;
 import rearth.oritech.util.InventorySlotAssignment;
-import rearth.oritech.util.ScreenProvider;
 
 import java.util.List;
 import java.util.Objects;
@@ -130,7 +128,7 @@ public boolean inputOptionsEnabled() {
     @Override
     public List<GuiSlot> getGuiSlots() {
         return List.of(
-          new GuiSlot(0, 80, 11),
+          new GuiSlot(0, 80, 21),
           new GuiSlot(1, 80, 59));
     }
     
diff --git a/src/main/java/rearth/oritech/block/entity/machines/processing/PulverizerBlockEntity.java b/src/main/java/rearth/oritech/block/entity/machines/processing/PulverizerBlockEntity.java
@@ -34,7 +34,7 @@ public InventorySlotAssignment getSlots() {
     @Override
     public List<GuiSlot> getGuiSlots() {
         return List.of(
-          new GuiSlot(0, 80, 11),
+          new GuiSlot(0, 80, 21),
           new GuiSlot(1, 70, 59),
           new GuiSlot(2, 90, 59));
     }
diff --git a/src/main/java/rearth/oritech/client/ui/BasicMachineScreen.java b/src/main/java/rearth/oritech/client/ui/BasicMachineScreen.java
@@ -175,6 +175,8 @@ private FlowLayout buildOverlay() {
     
     public void fillOverlay(FlowLayout overlay) {
         
+        addTitle(overlay);
+        
         if (handler.fluidProvider != null) {
             addFluidBar(overlay);
             updateFluidBar();
@@ -195,6 +197,16 @@ public void fillOverlay(FlowLayout overlay) {
         }
     }
     
+    private void addTitle(FlowLayout overlay) {
+        var blockTitle = handler.machineBlock.getBlock().getName();
+        var label = Components.label(blockTitle);
+        label.color(new Color(64 / 255f, 64 / 255f, 64 / 255f));
+        label.sizing(Sizing.fixed(176), Sizing.content(2));
+        label.horizontalTextAlignment(HorizontalAlignment.CENTER);
+        label.zIndex(1);
+        overlay.child(label.positioning(Positioning.relative(50, 2)));
+    }
+    
     protected void updateFluidBar() {
         
         var container = handler.fluidProvider.getForDirectFluidAccess();
diff --git a/src/main/java/rearth/oritech/client/ui/InventoryProxyScreen.java b/src/main/java/rearth/oritech/client/ui/InventoryProxyScreen.java
@@ -1,18 +1,14 @@
 package rearth.oritech.client.ui;
 
 import io.wispforest.owo.ui.base.BaseOwoHandledScreen;
-import io.wispforest.owo.ui.component.BoxComponent;
 import io.wispforest.owo.ui.component.ButtonComponent;
 import io.wispforest.owo.ui.component.Components;
-import io.wispforest.owo.ui.component.TextureComponent;
 import io.wispforest.owo.ui.container.Containers;
 import io.wispforest.owo.ui.container.FlowLayout;
 import io.wispforest.owo.ui.core.*;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.NotNull;
-import rearth.oritech.Oritech;
 import rearth.oritech.network.NetworkContent;
 
 import java.util.ArrayList;
@@ -60,6 +56,18 @@ protected void build(FlowLayout rootComponent) {
             var button = buttons.get(i);
             button.active = i != handler.selectedSlot;
         }
+        
+        addTitle(overlay);
+    }
+    
+    private void addTitle(FlowLayout overlay) {
+        var blockTitle = handler.addonEntity.getCachedState().getBlock().getName();
+        var label = Components.label(blockTitle);
+        label.color(new Color(64 / 255f, 64 / 255f, 64 / 255f));
+        label.sizing(Sizing.fixed(176), Sizing.content(2));
+        label.horizontalTextAlignment(HorizontalAlignment.CENTER);
+        label.zIndex(1);
+        overlay.child(label.positioning(Positioning.relative(50, 2)));
     }
     
     private void setActiveSlot(int slot) {
diff --git a/src/main/java/rearth/oritech/client/ui/ItemFilterScreen.java b/src/main/java/rearth/oritech/client/ui/ItemFilterScreen.java
@@ -123,6 +123,8 @@ protected void build(FlowLayout rootComponent) {
         var title = Components.label(Text.of("Item Filter")).color(new Color(45 / 255f, 45 / 255f, 46 / 255f));
         overlay.child(title.positioning(Positioning.absolute(60, 7)));
         
+        addTitle(overlay);
+        
         rootComponent.child(
           overlay.positioning(Positioning.relative(50, 50))
         ).child(
@@ -133,6 +135,17 @@ protected void build(FlowLayout rootComponent) {
         updateItemFilters();
     }
     
+    
+    private void addTitle(FlowLayout overlay) {
+        var blockTitle = handler.blockEntity.getCachedState().getBlock().getName();
+        var label = Components.label(blockTitle);
+        label.color(new Color(64 / 255f, 64 / 255f, 64 / 255f));
+        label.sizing(Sizing.fixed(176), Sizing.content(2));
+        label.horizontalTextAlignment(HorizontalAlignment.CENTER);
+        label.zIndex(1);
+        overlay.child(label.positioning(Positioning.relative(50, 2)));
+    }
+    
     private void sendUpdateToServer() {
         NetworkContent.UI_CHANNEL.clientHandle().send(new NetworkContent.ItemFilterSyncPacket(handler.blockPos, handler.blockEntity.getFilterSettings()));
     }
diff --git a/src/main/java/rearth/oritech/util/ScreenProvider.java b/src/main/java/rearth/oritech/util/ScreenProvider.java
@@ -54,7 +54,7 @@ default ArrowConfiguration getIndicatorConfiguration() {
         return new ArrowConfiguration(
                 new Identifier(Oritech.MOD_ID, "textures/gui/modular/arrow_empty.png"),
                 new Identifier(Oritech.MOD_ID, "textures/gui/modular/arrow_full.png"),
-                84, 30, 7, 26, false);
+                84, 37, 7, 16, false);
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public InventorySlotAssignment getSlots() {`
`34`	`34`	`@Override`
`35`	`35`	`public List<GuiSlot> getGuiSlots() {`
`36`	`36`	`return List.of(`
`37`		`- new GuiSlot(0, 80, 11),`
	`37`	`+ new GuiSlot(0, 80, 21),`
`38`	`38`	`new GuiSlot(1, 70, 59),`
`39`	`39`	`new GuiSlot(2, 90, 59));`
`40`	`40`	`}`