diff --git a/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/src/generated/resources/assets/anvilcraft/lang/en_ud.json index e5d918538..4cd799dfa 100644 --- a/src/generated/resources/assets/anvilcraft/lang/en_ud.json +++ b/src/generated/resources/assets/anvilcraft/lang/en_ud.json @@ -1034,9 +1034,11 @@ "screen.anvilcraft.resonator.pickaxe": "ǝxɐʞɔᴉԀ", "screen.anvilcraft.resonator.shovel": "ꞁǝʌoɥS", "screen.anvilcraft.resonator.title": "ǝpoɯ ǝʇɐuosǝɹ ɥɔʇᴉʍS", - "screen.anvilcraft.royal_grindstone.remove_curse_count": "%2$s / %1$s :sǝsɹnɔ pǝʌoɯǝᴚ", - "screen.anvilcraft.royal_grindstone.remove_repair_cost": "%2$s / %1$s :ʇsoɔ ɹᴉɐdǝɹ pǝʌoɯǝᴚ", + "screen.anvilcraft.royal_grindstone.curse_count": "%2$s / %1$s :sǝsɹnƆ", + "screen.anvilcraft.royal_grindstone.gold_cost": "%1$s :ʇsoɔ pꞁo⅁", + "screen.anvilcraft.royal_grindstone.repair_cost": "%2$s / %1$s :ʇsoɔ ɹᴉɐdǝᴚ", "screen.anvilcraft.royal_grindstone.title": "ʇsoɔ ɹᴉɐdǝɹ puɐ ǝsɹnɔ ǝʌoɯǝᴚ", + "screen.anvilcraft.royal_grindstone.will_remove": ":ǝʌoɯǝɹ ꞁꞁᴉM", "screen.anvilcraft.royal_steel_upgrade_smithing_template": "ǝpɐɹᵷd∩ ꞁǝǝʇS ꞁɐʎoᴚ", "screen.anvilcraft.slot.disable.tooltip": "ɹǝʇꞁᴉɟ ʇǝs oʇ sʞɔᴉꞁɔ ɯǝʇᴉ ǝs∩", "screen.anvilcraft.smithing_template.ember_metal_upgrade_smithing_template.additions_slot_description": "ʞɔoꞁᗺ ꞁɐʇǝW ɹǝqɯƎ ɹo ʇoᵷuI ꞁɐʇǝW ɹǝqɯƎ ǝɥʇ ʇnԀ", diff --git a/src/generated/resources/assets/anvilcraft/lang/en_us.json b/src/generated/resources/assets/anvilcraft/lang/en_us.json index 29c213ecd..e74a86816 100644 --- a/src/generated/resources/assets/anvilcraft/lang/en_us.json +++ b/src/generated/resources/assets/anvilcraft/lang/en_us.json @@ -1034,9 +1034,11 @@ "screen.anvilcraft.resonator.pickaxe": "Pickaxe", "screen.anvilcraft.resonator.shovel": "Shovel", "screen.anvilcraft.resonator.title": "Switch resonate mode", - "screen.anvilcraft.royal_grindstone.remove_curse_count": "Removed curses: %1$s / %2$s", - "screen.anvilcraft.royal_grindstone.remove_repair_cost": "Removed repair cost: %1$s / %2$s", + "screen.anvilcraft.royal_grindstone.curse_count": "Curses: %1$s / %2$s", + "screen.anvilcraft.royal_grindstone.gold_cost": "Gold cost: %1$s", + "screen.anvilcraft.royal_grindstone.repair_cost": "Repair cost: %1$s / %2$s", "screen.anvilcraft.royal_grindstone.title": "Remove curse and repair cost", + "screen.anvilcraft.royal_grindstone.will_remove": "Will remove:", "screen.anvilcraft.royal_steel_upgrade_smithing_template": "Royal Steel Upgrade", "screen.anvilcraft.slot.disable.tooltip": "Use item clicks to set filter", "screen.anvilcraft.smithing_template.ember_metal_upgrade_smithing_template.additions_slot_description": "Put the Ember Metal Ingot or Ember Metal Block", diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/ActiveSilencerScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/ActiveSilencerScreen.java index 82d99a753..7698ab51c 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/ActiveSilencerScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/ActiveSilencerScreen.java @@ -188,7 +188,8 @@ public ActiveSilencerScreen(ActiveSilencerMenu menu, Inventory playerInventory, @Override protected void init() { super.init(); - + this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; int buttonTop = topPos + 35; for (int l = 0; l < 8; ++l) { this.addRenderableWidget(new SilencerButton( @@ -245,30 +246,30 @@ protected void init() { private boolean mouseInLeft(double mouseX, double mouseY, int leftPos, int topPos) { return mouseX >= leftPos + START_LEFT_X - && mouseX <= leftPos + SCROLL_BAR_START_LEFT_X + SCROLL_BAR_WIDTH - && mouseY >= topPos + SCROLL_BAR_TOP_POS_Y - && mouseY <= topPos + SCROLL_BAR_TOP_POS_Y + SCROLL_BAR_HEIGHT; + && mouseX <= leftPos + SCROLL_BAR_START_LEFT_X + SCROLL_BAR_WIDTH + && mouseY >= topPos + SCROLL_BAR_TOP_POS_Y + && mouseY <= topPos + SCROLL_BAR_TOP_POS_Y + SCROLL_BAR_HEIGHT; } private boolean mouseInRight(double mouseX, double mouseY, int leftPos, int topPos) { return mouseX >= leftPos + START_RIGHT_X - && mouseX <= leftPos + SCROLL_BAR_START_RIGHT_X + SCROLL_BAR_WIDTH - && mouseY >= topPos + SCROLL_BAR_TOP_POS_Y - && mouseY <= topPos + SCROLL_BAR_TOP_POS_Y + SCROLL_BAR_HEIGHT; + && mouseX <= leftPos + SCROLL_BAR_START_RIGHT_X + SCROLL_BAR_WIDTH + && mouseY >= topPos + SCROLL_BAR_TOP_POS_Y + && mouseY <= topPos + SCROLL_BAR_TOP_POS_Y + SCROLL_BAR_HEIGHT; } private boolean mouseInLeftSlider(double mouseX, double mouseY, int leftPos, int topPos) { return mouseX >= leftPos + SCROLL_BAR_START_LEFT_X - && mouseX <= leftPos + SCROLL_BAR_START_LEFT_X + SCROLL_BAR_WIDTH - && mouseY >= topPos + SCROLL_BAR_TOP_POS_Y - && mouseY <= topPos + SCROLL_BAR_TOP_POS_Y + SCROLL_BAR_HEIGHT; + && mouseX <= leftPos + SCROLL_BAR_START_LEFT_X + SCROLL_BAR_WIDTH + && mouseY >= topPos + SCROLL_BAR_TOP_POS_Y + && mouseY <= topPos + SCROLL_BAR_TOP_POS_Y + SCROLL_BAR_HEIGHT; } private boolean mouseInRightSlider(double mouseX, double mouseY, int leftPos, int topPos) { return mouseX >= leftPos + SCROLL_BAR_START_RIGHT_X - && mouseX <= leftPos + SCROLL_BAR_START_RIGHT_X + SCROLL_BAR_WIDTH - && mouseY >= topPos + SCROLL_BAR_TOP_POS_Y - && mouseY <= topPos + SCROLL_BAR_TOP_POS_Y + SCROLL_BAR_HEIGHT; + && mouseX <= leftPos + SCROLL_BAR_START_RIGHT_X + SCROLL_BAR_WIDTH + && mouseY >= topPos + SCROLL_BAR_TOP_POS_Y + && mouseY <= topPos + SCROLL_BAR_TOP_POS_Y + SCROLL_BAR_HEIGHT; } @Override diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/AdvancedComparatorScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/AdvancedComparatorScreen.java index 423295c15..deb96f9e8 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/AdvancedComparatorScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/AdvancedComparatorScreen.java @@ -64,6 +64,8 @@ public void onClose() { protected void init() { super.init(); this.clearWidgets(); + this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; SwitchableButton compareMode = new SwitchableButton( this.leftPos + 8, this.topPos + 24, diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/BaseMachineScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/BaseMachineScreen.java index 142cc601c..b7678b45b 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/BaseMachineScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/BaseMachineScreen.java @@ -57,7 +57,7 @@ public BaseMachineScreen(T menu, Inventory inventory, Component title, int outpu protected void init() { super.init(); this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; - this.titleLabelY = 2; + this.titleLabelY = 3; this.directionButton = directionButtonSupplier.apply(this.leftPos, this.topPos); this.addRenderableWidget(directionButton); } diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EmberAnvilScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EmberAnvilScreen.java index 0bdee6c07..8568e40e0 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EmberAnvilScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EmberAnvilScreen.java @@ -37,6 +37,7 @@ public EmberAnvilScreen(EmberAnvilMenu menu, Inventory playerInventory, Componen protected void init() { super.init(); this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; } @Override @@ -96,7 +97,7 @@ private void onNameChanged(String name) { @Override protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { - super.renderLabels(guiGraphics, mouseX, mouseY); + guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); int i = this.menu.getCost(); if (this.menu.result.noCostInRenaming && this.menu.result.onlyRenaming || i > 0) { Component component; diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EmberGrindstoneScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EmberGrindstoneScreen.java index c6feb5351..3c444ead8 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EmberGrindstoneScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EmberGrindstoneScreen.java @@ -67,6 +67,7 @@ protected void containerTick() { protected void init() { super.init(); this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; } @Override @@ -124,7 +125,7 @@ protected void renderEnchantmentSelectingArea(GuiGraphics guiGraphics, int mouse @Override protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { - super.renderLabels(guiGraphics, mouseX, mouseY); + guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); int cost = this.menu.getCost(); if (cost <= 0) return; diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EmberSmithingScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EmberSmithingScreen.java index 9b64626b4..e448d5ba6 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EmberSmithingScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EmberSmithingScreen.java @@ -67,10 +67,16 @@ public EmberSmithingScreen(EmberSmithingMenu menu, Inventory inventory, Componen super(menu, inventory, title, BACKGROUND); } + @Override + protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { + guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); + } + @Override protected void init() { super.init(); this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; } @Override diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EnergyWeaponMakeScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EnergyWeaponMakeScreen.java index 57c6eb81c..2672be180 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EnergyWeaponMakeScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/EnergyWeaponMakeScreen.java @@ -61,12 +61,17 @@ protected void containerTick() { super.containerTick(); } + @Override + protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { + guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); + } + @Override protected void init() { super.init(); this.imageHeight = 175; this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; - this.inventoryLabelY = 72; + this.titleLabelY = 3; this.addRenderableWidget(new TexturedButton( this.leftPos + 152, diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FilterScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FilterScreen.java index e839870da..e5b54a9c0 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FilterScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FilterScreen.java @@ -35,10 +35,15 @@ public FilterScreen(FilterMenu menu, Inventory playerInventory, Component title) super(menu, playerInventory, title); } + @Override + protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { + guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); + } + @Override protected void init() { super.init(); - + this.titleLabelY = 3; FilterContainer container = this.getMenu().getContainer(); this.addRenderableWidget(new SwitchableButton( diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FrostAnvilScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FrostAnvilScreen.java index 095257166..a3d8f61e7 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FrostAnvilScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FrostAnvilScreen.java @@ -37,6 +37,7 @@ public FrostAnvilScreen(FrostAnvilMenu menu, Inventory playerInventory, Componen protected void init() { super.init(); this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; } @Override @@ -91,7 +92,14 @@ private void onNameChanged(String name) { @Override protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { - super.renderLabels(guiGraphics, mouseX, mouseY); + guiGraphics.drawString( + this.font, + this.title, + this.titleLabelX, + this.titleLabelY, + 4210752, + false + ); int i = this.menu.getCost(); if (this.menu.result.noCostInRenaming && this.menu.result.onlyRenaming || i > 0) { Component component; diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FrostGrindstoneScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FrostGrindstoneScreen.java index a8afb3b41..332269ebc 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FrostGrindstoneScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FrostGrindstoneScreen.java @@ -57,10 +57,16 @@ protected void containerTick() { super.containerTick(); } + @Override + protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { + guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); + } + @Override protected void init() { super.init(); this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; } @Override diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FrostSmithingScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FrostSmithingScreen.java index 542144d2f..f5ff922b1 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FrostSmithingScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/FrostSmithingScreen.java @@ -80,11 +80,16 @@ public FrostSmithingScreen(FrostSmithingMenu menu, Inventory playerInventory, Co super(menu, playerInventory, title, BACKGROUND); } + @Override + protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { + guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); + } + @Override protected void init() { super.init(); this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; - + this.titleLabelY = 3; this.left = this.addRenderableWidget(new TexturedButton( this.leftPos + 102, this.topPos + 32, diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/ItemCollectorScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/ItemCollectorScreen.java index 7f4902c3d..e24199b70 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/ItemCollectorScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/ItemCollectorScreen.java @@ -46,9 +46,15 @@ public ItemCollectorScreen(ItemCollectorMenu menu, Inventory inventory, Componen this.minecraft = Minecraft.getInstance(); } + @Override + protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { + guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); + } + @Override protected void init() { super.init(); + this.titleLabelY = 3; this.enableFilterButton = this.enableFilterButtonSupplier.apply(this.leftPos, this.topPos); this.addRenderableWidget(this.enableFilterButton); if (this.minecraft == null) return; diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/ItemDetectorScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/ItemDetectorScreen.java index 0db4e651c..65d149f9d 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/ItemDetectorScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/ItemDetectorScreen.java @@ -45,6 +45,11 @@ public ItemDetectorScreen(ItemDetectorMenu menu, Inventory playerInventory, Comp this.minecraft = Minecraft.getInstance(); } + @Override + protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { + guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); + } + @Override protected void renderBg(GuiGraphics guiGraphics, float partialTick, int mouseX, int mouseY) { int i = (this.width - this.imageWidth) / 2; @@ -55,6 +60,8 @@ protected void renderBg(GuiGraphics guiGraphics, float partialTick, int mouseX, @Override protected void init() { super.init(); + this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; // filter mode this.cycleFilterModeButton = new CycleFilterModeButton( leftPos + 75, diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/JewelCraftingScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/JewelCraftingScreen.java index 5ca6d5720..13db88391 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/JewelCraftingScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/JewelCraftingScreen.java @@ -16,12 +16,24 @@ import org.lwjgl.glfw.GLFW; public class JewelCraftingScreen extends AbstractContainerScreen { - private static final ResourceLocation BACKGROUND = SharedTextures.bg("crafting", "jewel_crafting"); + private static final ResourceLocation BACKGROUND = SharedTextures.bg("crafting", "jewelcrafting_table"); public JewelCraftingScreen(JewelCraftingMenu menu, Inventory playerInventory, Component title) { super(menu, playerInventory, title); } + @Override + protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { + guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); + } + + @Override + protected void init() { + super.init(); + this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; + } + @Override protected void renderBg(GuiGraphics guiGraphics, float partialTick, int mouseX, int mouseY) { int i = (this.width - this.imageWidth) / 2; diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/PulseGeneratorScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/PulseGeneratorScreen.java index 4f4fb75be..17b1ad63b 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/PulseGeneratorScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/PulseGeneratorScreen.java @@ -61,6 +61,8 @@ public void onClose() { protected void init() { super.init(); this.clearWidgets(); + this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; final SwitchableButton startMode = new SwitchableButton( this.leftPos + 28, this.topPos + 25, diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/RoyalAnvilScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/RoyalAnvilScreen.java index ddb59ca23..140334ea6 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/RoyalAnvilScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/RoyalAnvilScreen.java @@ -37,6 +37,7 @@ public RoyalAnvilScreen(RoyalAnvilMenu menu, Inventory playerInventory, Componen protected void init() { super.init(); this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; } @Override @@ -91,7 +92,7 @@ private void onNameChanged(String name) { @Override protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { - super.renderLabels(guiGraphics, mouseX, mouseY); + guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); int i = this.menu.getCost(); if (this.menu.result.noCostInRenaming && this.menu.result.onlyRenaming || i > 0) { Component component; diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/RoyalGrindstoneScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/RoyalGrindstoneScreen.java index 7a4cc2d95..a4a2c6d4c 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/RoyalGrindstoneScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/RoyalGrindstoneScreen.java @@ -27,17 +27,64 @@ public RoyalGrindstoneScreen( super(menu, playerInventory, Component.translatable("screen.anvilcraft.royal_grindstone.title")); } + @Override + protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { + guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); + if (this.menu.getSlot(2).hasItem()) { + Component removedText = Component.translatable( + "screen.anvilcraft.royal_grindstone.will_remove", + this.menu.removedCurseCount, this.menu.totalCurseCount + ); + drawLabel( + 63, + 11, + removedText, + guiGraphics + ); + Component removedRepairCostText = Component.translatable( + "screen.anvilcraft.royal_grindstone.repair_cost", + this.menu.removedRepairCost, this.menu.totalRepairCost + ); + drawLabel( + 63, + 22, + removedRepairCostText, + guiGraphics + ); + Component removedCurseCountText = Component.translatable( + "screen.anvilcraft.royal_grindstone.curse_count", + this.menu.removedCurseCount, this.menu.totalCurseCount + ); + drawLabel( + 63, + 33, + removedCurseCountText, + guiGraphics + ); + Component usedGoldText = Component.translatable( + "screen.anvilcraft.royal_grindstone.gold_cost", + this.menu.usedGold + ); + drawLabel( + 63, + 44, + usedGoldText, + guiGraphics + ); + } + } + @Override protected void init() { super.init(); this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; } @Override public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { super.render(guiGraphics, mouseX, mouseY, partialTick); this.renderTooltip(guiGraphics, mouseX, mouseY); - this.renderLabels(guiGraphics); } protected void renderBg(GuiGraphics g, float partialTick, int mouseX, int mouseY) { @@ -79,8 +126,8 @@ protected void renderBg(GuiGraphics g, float partialTick, int mouseX, int mouseY displayRepair = repair.getDefaultInstance(); } - if (!displayRepair.isEmpty()) renderMaskedItem(g, displayRepair, i + 89, j + 22); - if (!displayResult.isEmpty()) renderMaskedItem(g, displayResult, i + 89, j + 47); + if (!displayRepair.isEmpty()) renderMaskedItem(g, displayRepair, i + 35, j + 21); + if (!displayResult.isEmpty()) renderMaskedItem(g, displayResult, i + 35, j + 45); } private void renderMaskedItem(GuiGraphics g, ItemStack stack, int x, int y) { @@ -109,39 +156,14 @@ private Map.Entry getCurrentRec ); } - protected void renderLabels(GuiGraphics guiGraphics) { - if (this.menu.getSlot(2).hasItem()) { - Component usedGoldText = Component.literal("" + this.menu.usedGold); - Component removedCurseCountText = Component.translatable( - "screen.anvilcraft.royal_grindstone.remove_curse_count", - this.menu.removedCurseCount, this.menu.totalCurseCount); - Component removedRepairCostText = Component.translatable( - "screen.anvilcraft.royal_grindstone.remove_repair_cost", - this.menu.removedRepairCost, this.menu.totalRepairCost); - drawLabel( - (int) (92 + 4.5 - (this.font.width(usedGoldText) / 2f)), - 38, - usedGoldText, - guiGraphics); - drawLabel( - 170 - this.font.width(removedCurseCountText), - 13, - removedCurseCountText, - guiGraphics); - drawLabel( - 170 - this.font.width(removedRepairCostText), - 58, - removedRepairCostText, - guiGraphics); - } - } - private void drawLabel(int x, int y, Component component, GuiGraphics guiGraphics) { - int i = (this.width - this.imageWidth - 2) / 2; - int j = (this.height - this.imageHeight + 23) / 2; - x += i; - y += j; - guiGraphics.drawString(this.font, component, x + 2, y - 10, 8453920); + guiGraphics.drawString( + this.font, + component, + x + 2, + y + 2, + 8453920 + ); } @Override diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/RoyalSmithingScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/RoyalSmithingScreen.java index 8d013707b..8a854f319 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/RoyalSmithingScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/RoyalSmithingScreen.java @@ -54,10 +54,16 @@ public RoyalSmithingScreen(RoyalSmithingMenu menu, Inventory playerInventory, Co super(menu, playerInventory, title, SMITHING_LOCATION); } + @Override + protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { + guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); + } + @Override protected void init() { super.init(); this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; } @Override diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/SliderScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/SliderScreen.java index f762e936d..b8498c0a7 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/SliderScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/SliderScreen.java @@ -33,6 +33,7 @@ public SliderScreen(SliderMenu menu, Inventory inventory, Component title) { protected void init() { super.init(); this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; int offsetX = (this.width - this.imageWidth) / 2; int offsetY = (this.height - this.imageHeight) / 2; this.value = new EditBox(this.font, offsetX + 50, offsetY + 47, 76, 8, Component.literal("value")); diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/TeslaTowerScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/TeslaTowerScreen.java index 42e8101fa..6143d4cf3 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/TeslaTowerScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/TeslaTowerScreen.java @@ -184,7 +184,8 @@ public TeslaTowerScreen(TeslaTowerMenu menu, Inventory playerInventory, Componen @Override protected void init() { super.init(); - + this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; int buttonTop = topPos + 35; for (int l = 0; l < 8; ++l) { TeslaTowerButton button = new TeslaTowerButton( diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/TranscendenceAnvilScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/TranscendenceAnvilScreen.java index 258c33cd7..158b99680 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/TranscendenceAnvilScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/TranscendenceAnvilScreen.java @@ -37,6 +37,7 @@ public TranscendenceAnvilScreen(TranscendenceAnvilMenu menu, Inventory playerInv protected void init() { super.init(); this.titleLabelX = (this.imageWidth - this.font.width(this.title)) / 2; + this.titleLabelY = 3; } @Override @@ -96,7 +97,7 @@ private void onNameChanged(String name) { @Override protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { - super.renderLabels(guiGraphics, mouseX, mouseY); + guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false); int i = this.menu.getCost(); if (this.menu.result.noCostInRenaming && this.menu.result.onlyRenaming || i > 0) { Component component; diff --git a/src/main/java/dev/dubhe/anvilcraft/data/lang/ScreenLang.java b/src/main/java/dev/dubhe/anvilcraft/data/lang/ScreenLang.java index e6224ccd2..3595470f9 100644 --- a/src/main/java/dev/dubhe/anvilcraft/data/lang/ScreenLang.java +++ b/src/main/java/dev/dubhe/anvilcraft/data/lang/ScreenLang.java @@ -40,8 +40,10 @@ public static void init(RegistrumLangProvider provider) { provider.add("screen.anvilcraft.filter.scroll_to_change", "Scroll mouse to change count"); provider.add("screen.anvilcraft.filter.shift_to_scroll_faster", "Hold Shift to scroll faster"); provider.add("screen.anvilcraft.slot.disable.tooltip", "Use item clicks to set filter"); - provider.add("screen.anvilcraft.royal_grindstone.remove_curse_count", "Removed curses: %1$s / %2$s"); - provider.add("screen.anvilcraft.royal_grindstone.remove_repair_cost", "Removed repair cost: %1$s / %2$s"); + provider.add("screen.anvilcraft.royal_grindstone.will_remove", "Will remove:"); + provider.add("screen.anvilcraft.royal_grindstone.curse_count", "Curses: %1$s / %2$s"); + provider.add("screen.anvilcraft.royal_grindstone.repair_cost", "Repair cost: %1$s / %2$s"); + provider.add("screen.anvilcraft.royal_grindstone.gold_cost", "Gold cost: %1$s"); provider.add("screen.anvilcraft.royal_grindstone.title", "Remove curse and repair cost"); provider.add("screen.anvilcraft.ember_grindstone.title", "Extract enchantment"); provider.add("screen.anvilcraft.ember_grindstone.cost", "Exp. Cost: %d"); diff --git a/src/main/java/dev/dubhe/anvilcraft/inventory/RoyalGrindstoneMenu.java b/src/main/java/dev/dubhe/anvilcraft/inventory/RoyalGrindstoneMenu.java index 8cd6302d4..ff729ffa2 100644 --- a/src/main/java/dev/dubhe/anvilcraft/inventory/RoyalGrindstoneMenu.java +++ b/src/main/java/dev/dubhe/anvilcraft/inventory/RoyalGrindstoneMenu.java @@ -73,7 +73,8 @@ public RoyalGrindstoneMenu( MenuType type, int containerId, Inventory playerInventory, - ContainerLevelAccess access) { + ContainerLevelAccess access + ) { super(type, containerId); this.repairToolSlots = new SimpleContainer(1) { public void setChanged() { @@ -99,17 +100,17 @@ public void setChanged() { } }; this.access = access; - this.addSlot(new Slot(this.repairToolSlots, 0, 25, 34) { + this.addSlot(new Slot(this.repairToolSlots, 0, 15, 33) { public boolean mayPlace(ItemStack stack) { return stack.isDamageableItem() || stack.is(Items.ENCHANTED_BOOK) || stack.isEnchanted(); } }); - this.addSlot(new Slot(this.repairMaterialSlots, 0, 89, 22) { + this.addSlot(new Slot(this.repairMaterialSlots, 0, 35, 21) { public boolean mayPlace(ItemStack stack) { return isRepairMaterial(stack); } }); - this.addSlot(new Slot(this.resultToolSlots, 2, 145, 34) { + this.addSlot(new Slot(this.resultToolSlots, 2, 152, 51) { public boolean mayPlace(ItemStack stack) { return false; } @@ -123,7 +124,7 @@ public void onTake(Player player, ItemStack stack) { repairToolSlots.setItem(0, ItemStack.EMPTY); } }); - this.addSlot(new Slot(this.resultMaterialSlots, 2, 89, 47) { + this.addSlot(new Slot(this.resultMaterialSlots, 2, 35, 45) { public boolean mayPlace(ItemStack stack) { return false; } @@ -161,8 +162,8 @@ private ItemStack createResult() { this.totalRepairCost = repairCost; ItemStack result = repairTool.copy(); DataComponentType enchantmentComponent = result.is(Items.ENCHANTED_BOOK) - ? DataComponents.STORED_ENCHANTMENTS - : DataComponents.ENCHANTMENTS; + ? DataComponents.STORED_ENCHANTMENTS + : DataComponents.ENCHANTMENTS; ItemEnchantments enchantments = result.get(enchantmentComponent); ItemEnchantments.Mutable mutEnch = null; if (enchantments != null) { @@ -272,7 +273,9 @@ public boolean stillValid(Player player) { public void slotsChanged(Container container) { super.slotsChanged(container); if (container.equals(this.repairMaterialSlots) - || container.equals(this.repairToolSlots)) resultToolSlots.setItem(2, createResult()); + || container.equals(this.repairToolSlots)) { + resultToolSlots.setItem(2, createResult()); + } } /**