From 57b98c8ea74c4749a6c5c39ca2faa9729afb3f95 Mon Sep 17 00:00:00 2001 From: CausingCoalition <174841009+CausingCoalition@users.noreply.github.com> Date: Sat, 18 Jul 2026 21:25:39 -0400 Subject: [PATCH] Update to Minecraft 26.2 --- gradle.properties | 15 +++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../win/baruna/blockmeter/BlockMeterClient.java | 6 +++--- .../win/baruna/blockmeter/gui/EditBoxGui.java | 6 +++--- .../win/baruna/blockmeter/gui/OptionsGui.java | 8 ++++---- .../win/baruna/blockmeter/gui/SelectBoxGui.java | 4 ++-- src/main/resources/fabric.mod.json | 2 +- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/gradle.properties b/gradle.properties index 64e0647..c8a7378 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,12 +2,11 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true org.gradle.configuration-cache=false -mod_version = 20 -loom_version=1.16-SNAPSHOT - -minecraft_version=26.1 -loader_version=0.19.2 -fabric_api_version=0.146.1+26.1.2 -modmenu_version=18.0.0-alpha.8 -cloth_config_version=26.1.154 +mod_version = 21 +loom_version=1.17-SNAPSHOT +minecraft_version=26.2 +loader_version=0.19.3 +fabric_api_version=0.155.2+26.2 +modmenu_version=20.0.1 +cloth_config_version=26.2.155 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c61a118..a351597 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/win/baruna/blockmeter/BlockMeterClient.java b/src/main/java/win/baruna/blockmeter/BlockMeterClient.java index e0562b8..b8b3793 100644 --- a/src/main/java/win/baruna/blockmeter/BlockMeterClient.java +++ b/src/main/java/win/baruna/blockmeter/BlockMeterClient.java @@ -236,7 +236,7 @@ public void onInitializeClient() { } if (keyBindingMenu.consumeClick() && active) { - Minecraft.getInstance().setScreen(this.quickMenu); + Minecraft.getInstance().gui.setScreen(this.quickMenu); } if (keyBindingMeasure.consumeClick()) { @@ -317,7 +317,7 @@ private Optional raycastBlock() { public void editBox(ClientMeasureBox box, BlockPos block) { this.editBoxGui.setBox(box); this.editBoxGui.setBlock(block); - Minecraft.getInstance().setScreen(this.editBoxGui); + Minecraft.getInstance().gui.setScreen(this.editBoxGui); } /** @@ -338,7 +338,7 @@ private void onBlockMeterClick(final BlockPos block) { default: this.selectBoxGui.setBoxes(boxes); this.selectBoxGui.setBlock(block); - Minecraft.getInstance().setScreen(this.selectBoxGui); + Minecraft.getInstance().gui.setScreen(this.selectBoxGui); break; } } else { diff --git a/src/main/java/win/baruna/blockmeter/gui/EditBoxGui.java b/src/main/java/win/baruna/blockmeter/gui/EditBoxGui.java index 91798de..43d13f3 100644 --- a/src/main/java/win/baruna/blockmeter/gui/EditBoxGui.java +++ b/src/main/java/win/baruna/blockmeter/gui/EditBoxGui.java @@ -36,16 +36,16 @@ protected void init() { addButton.accept(new Button.Builder(Component.translatable("blockmeter.moveCorner"), button -> { box.loosenCorner(block); - Minecraft.getInstance().setScreen(null); + Minecraft.getInstance().gui.setScreen(null); })); addButton.accept(new Button.Builder(Component.translatable("blockmeter.restrictMining", Component.translatable(box.miningRestriction.translation)), button -> { box.miningRestriction = box.miningRestriction.next(); - Minecraft.getInstance().setScreen(null); + Minecraft.getInstance().gui.setScreen(null); })); addButton.accept(new Button.Builder(Component.translatable("gui.cancel"), - button -> Minecraft.getInstance().setScreen(null))); + button -> Minecraft.getInstance().gui.setScreen(null))); } @Override diff --git a/src/main/java/win/baruna/blockmeter/gui/OptionsGui.java b/src/main/java/win/baruna/blockmeter/gui/OptionsGui.java index 9f34be9..e587bfa 100644 --- a/src/main/java/win/baruna/blockmeter/gui/OptionsGui.java +++ b/src/main/java/win/baruna/blockmeter/gui/OptionsGui.java @@ -44,7 +44,7 @@ protected void init() { final ClientMeasureBox currentBox = BlockMeterClient.getInstance().getCurrentBox(); if (currentBox != null) currentBox.setColor(DyeColor.byId(colorIndex)); - Minecraft.getInstance().setScreen(null); + Minecraft.getInstance().gui.setScreen(null); })); } } @@ -53,7 +53,7 @@ protected void init() { Component.translatable("blockmeter.keepColor", Component.translatable(config.incrementColor ? "options.off" : "options.on")), button -> { config.incrementColor = !config.incrementColor; - Minecraft.getInstance().setScreen(null); + Minecraft.getInstance().gui.setScreen(null); // Todo find a way to increment to a new Color if a box was created while // incrementColor was disabled BlockMeterClient.getConfigManager().save(); @@ -66,7 +66,7 @@ protected void init() { Component.translatable(config.innerDiagonal ? "options.on" : "options.off")), button -> { System.err.println("IDK WHAT YOU ARE DOING"); config.innerDiagonal = !config.innerDiagonal; - Minecraft.getInstance().setScreen(null); + Minecraft.getInstance().gui.setScreen(null); BlockMeterClient.getConfigManager().save(); }) .pos(this.width / 2 - BUTTONWIDTH / 2, this.height / 2 + 32) @@ -77,7 +77,7 @@ protected void init() { Component.translatable(config.showOtherUsersBoxes ? "options.on" : "options.off")), button -> { System.err.println("IDK WHAT YOU ARE DOING"); config.showOtherUsersBoxes = !config.showOtherUsersBoxes; - Minecraft.getInstance().setScreen(null); + Minecraft.getInstance().gui.setScreen(null); BlockMeterClient.getConfigManager().save(); }) .pos(this.width / 2 - BUTTONWIDTH / 2, this.height / 2 + 54) diff --git a/src/main/java/win/baruna/blockmeter/gui/SelectBoxGui.java b/src/main/java/win/baruna/blockmeter/gui/SelectBoxGui.java index 2efceab..ae64785 100644 --- a/src/main/java/win/baruna/blockmeter/gui/SelectBoxGui.java +++ b/src/main/java/win/baruna/blockmeter/gui/SelectBoxGui.java @@ -39,13 +39,13 @@ protected void init() { this.height / 2 - uiHeight / 2 + i * (BUTTONHEIGHT + PADDING), BUTTONWIDTH, BUTTONHEIGHT, text, Color.ofOpaque(box.getColor()), false, true, button -> { BlockMeterClient.getInstance().editBox(box, block); - Minecraft.getInstance().setScreen(null); + Minecraft.getInstance().gui.setScreen(null); })); } this.addRenderableWidget(new Button.Builder(Component.translatable("gui.cancel"), - button -> Minecraft.getInstance().setScreen(null)) + button -> Minecraft.getInstance().gui.setScreen(null)) .pos(this.width / 2 - BUTTONWIDTH / 2, this.height / 2 - uiHeight / 2 + boxes.length * (BUTTONHEIGHT + PADDING) + PADDING) .size(BUTTONWIDTH, BUTTONHEIGHT) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 931fff0..d1f611e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -19,7 +19,7 @@ "depends": { "fabricloader": ">=0.19.2", "fabric-api": "*", - "minecraft": ">=26.1 <=26.1.2" + "minecraft": ">=26.2" }, "recommends": { "modmenu": "*"