straightforward 26.2 update

Author: noramibu

gradle.properties

@@ -7,10 +7,10 @@ mod.version=build-11
 maven_group=me.noramibu
 archives_base_name=nora-tweaks
 
-# 26.1.x dependency versions
-minecraft_version=26.1.2
+# 26.2 dependency versions
+minecraft_version=26.2
 loader_version=0.19.3
-fabric_api_version=0.153.0+26.1.2
-meteor_version=26.1.2
+fabric_api_version=0.152.1+26.2
+meteor_version=26.2
 baritone_version=26.1
 xpple_cubiomes_version=0.0.0-2026.6.29.1782739186+b12a5325c8a195fa99711ed2052a4fc9cac077a8

meteor-addon-list.json

@@ -1,5 +1,5 @@
 {
-  "supported_versions": ["1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11", "26.1", "26.1.1", "26.1.2"],
+  "supported_versions": ["1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11", "26.1", "26.1.1", "26.1.2", "26.2"],
   "description": "QoL and utility modules & tweaks for Meteor Client.",
   "tags": [
     "PvP",

src/main/java/me/noramibu/tweaks/gui/screens/CategoryManagerScreen.java

@@ -58,10 +58,10 @@ private void buildCategoriesTable() {
             categoriesTable.add(theme.label(category.name)).expandX();
 
             WButton manageButton = categoriesTable.add(theme.button("Manage")).widget();
-            manageButton.action = () -> Minecraft.getInstance().setScreen(new ManageCategoryModulesScreen(theme, category));
+            manageButton.action = () -> Minecraft.getInstance().setScreenAndShow(new ManageCategoryModulesScreen(theme, category));
 
             WButton renameButton = categoriesTable.add(theme.button("Rename")).widget();
-            renameButton.action = () -> Minecraft.getInstance().setScreen(new RenameCategoryScreen(theme, category));
+            renameButton.action = () -> Minecraft.getInstance().setScreenAndShow(new RenameCategoryScreen(theme, category));
 
             WButton activateButton = categoriesTable.add(theme.button("Activate All")).widget();
             activateButton.action = () -> {

src/main/java/me/noramibu/tweaks/gui/screens/HotkeysScreen.java

@@ -34,7 +34,7 @@ public void reload() {
             edit.action = () -> {
                 EditHotkeyScreen screen = new EditHotkeyScreen(theme, module, hotkey);
                 screen.parent = this;
-                mc.setScreen(screen);
+                mc.setScreenAndShow(screen);
             };
             table.add(edit);
 

src/main/java/me/noramibu/tweaks/gui/screens/KeywordsScreen.java

@@ -21,7 +21,7 @@ public KeywordsScreen(GuiTheme theme) {
     public void initWidgets() {
         // Add button
         WButton addButton = add(theme.button("Add")).expandX().widget();
-        addButton.action = () -> minecraft.setScreen(new EditKeywordScreen(theme, null, keyword -> {
+        addButton.action = () -> minecraft.setScreenAndShow(new EditKeywordScreen(theme, null, keyword -> {
             if (!module.keywords.contains(keyword)) {
                 module.keywords.add(keyword);
             }
@@ -40,7 +40,7 @@ private void refresh() {
             table.add(theme.label(keyword.name));
 
             WButton editButton = table.add(theme.button("Edit")).widget();
-            editButton.action = () -> minecraft.setScreen(new EditKeywordScreen(theme, keyword, k -> refresh()));
+            editButton.action = () -> minecraft.setScreenAndShow(new EditKeywordScreen(theme, keyword, k -> refresh()));
 
             WButton deleteButton = table.add(theme.button("Remove")).widget();
             deleteButton.action = () -> {

src/main/java/me/noramibu/tweaks/gui/screens/ManageCategoryModulesScreen.java

@@ -129,7 +129,7 @@ private void onCategoriesChanged(CustomCategoriesChangedEvent event) {
             // If the name changed, reopen the screen with the new title
             if (!this.getTitle().getString().equals("Manage Category - " + category.name)) {
                 this.onClose();
-                Minecraft.getInstance().setScreen(new ManageCategoryModulesScreen(theme, category));
+                Minecraft.getInstance().setScreenAndShow(new ManageCategoryModulesScreen(theme, category));
                 return;
             }
 

src/main/java/me/noramibu/tweaks/mixin/LocatorBarMixin.java

@@ -8,7 +8,7 @@
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
-import net.minecraft.client.gui.contextualbar.LocatorBarRenderer;
+import net.minecraft.client.gui.contextualbar.LocatorBar;
 import net.minecraft.client.multiplayer.PlayerInfo;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.client.resources.WaypointStyle;
@@ -31,7 +31,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(LocatorBarRenderer.class)
+@Mixin(LocatorBar.class)
 public abstract class LocatorBarMixin {
     @Shadow @Final private Minecraft minecraft;
 
@@ -74,7 +74,7 @@ private void renderBarReturn(GuiGraphicsExtractor context, DeltaTracker tickCoun
     @Unique
     private void renderOverlays(GuiGraphicsExtractor context, int cx, int cy) {
         if (module.showDirections.get()) {
-            float yaw = Mth.wrapDegrees(minecraft.gameRenderer.getMainCamera().yRot());
+            float yaw = Mth.wrapDegrees(minecraft.gameRenderer.mainCamera().yRot());
             int centerX = cx + 91;
             drawDirection(context, "S", 0, yaw, centerX, cy);
             drawDirection(context, "W", 90, yaw, centerX, cy);
@@ -107,11 +107,11 @@ private void renderMeteorWaypoints(GuiGraphicsExtractor context, int centerX, in
         if (!module.displayWaypoints.get()) return;
 
         //? if >=1.21.11 {
-        Vec3 cameraPos = minecraft.gameRenderer.getMainCamera().position();
+        Vec3 cameraPos = minecraft.gameRenderer.mainCamera().position();
         //?} else
         /*Vec3d cameraPos = client.gameRenderer.getCamera().getPos();
         */
-        float playerYaw = Mth.wrapDegrees(minecraft.gameRenderer.getMainCamera().yRot());
+        float playerYaw = Mth.wrapDegrees(minecraft.gameRenderer.mainCamera().yRot());
         boolean showData = (module.displayWaypointName.get() || module.displayWaypointDistance.get()) 
             && (!module.displayWaypointOnlyOnTab.get() || minecraft.options.keyPlayerList.isDown());
 
@@ -163,7 +163,7 @@ private void renderTrackedPlayerWaypoints(GuiGraphicsExtractor context, DeltaTra
         minecraft.player.connection.getWaypointManager().forEachWaypoint(cameraEntity, waypoint -> {
             if (waypoint.id().left().map(uuid -> uuid.equals(cameraEntity.getUUID())).orElse(false)) return;
 
-            double angle = waypoint.yawAngleToCamera(level, minecraft.gameRenderer.getMainCamera(), partialTickSupplier);
+            double angle = waypoint.yawAngleToCamera(level, minecraft.gameRenderer.mainCamera(), partialTickSupplier);
             if (angle <= -60.0 || angle > 60.0) return;
 
             int dotPosition = Mth.floor(angle * 173.0 / 2.0 / 60.0);
@@ -179,7 +179,7 @@ private void renderTrackedPlayerWaypointData(GuiGraphicsExtractor context, Track
         if (entry == null) return;
 
         double dist = Math.sqrt(waypoint.distanceSquared(minecraft.getCameraEntity()));
-        WaypointStyle style = minecraft.getWaypointStyles().get(waypoint.icon().style);
+        WaypointStyle style = minecraft.gui.hud.getWaypointStyles().get(waypoint.icon().style);
         float styleDistance =
             Double.isFinite(dist) ? (float) Math.min(dist, Float.MAX_VALUE) : Float.POSITIVE_INFINITY;
         float scale = Mth.lerp(getProgress(styleDistance, style.nearDistance(), style.farDistance()), 0.5f, 1.0f);

src/main/java/me/noramibu/tweaks/mixin/SingleModuleScreenMixin.java

@@ -27,7 +27,7 @@ private void onInitWidgets(CallbackInfo ci) {
         add(theme.horizontalSeparator()).expandX();
         WButton addToCategoryButton = add(theme.button("Add to Custom Category")).expandX().widget();
         addToCategoryButton.action = () -> {
-            Minecraft.getInstance().setScreen(new AddToCategoryScreen(theme, module));
+            Minecraft.getInstance().setScreenAndShow(new AddToCategoryScreen(theme, module));
         };
     }
 }

src/main/java/me/noramibu/tweaks/modules/AutoTrapPlus.java

@@ -301,7 +301,7 @@ private void add(BlockPos blockPos) {
     }
 
     private boolean isOutOfRange(BlockPos blockPos) {
-        Vec3 pos = blockPos.getCenter();
+        Vec3 pos = Vec3.atCenterOf(blockPos);
         if (!PlayerUtils.isWithin(pos, placeRange.get())) return true;
 
         ClipContext raycastContext = new ClipContext(mc.player.getEyePosition(), pos, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, mc.player);

src/main/java/me/noramibu/tweaks/modules/CategoryManagerModule.java

@@ -12,7 +12,7 @@ public CategoryManagerModule() {
 
     @Override
     public void onActivate() {
-        mc.setScreen(new CategoryManagerScreen(GuiThemes.get()));
+        mc.setScreenAndShow(new CategoryManagerScreen(GuiThemes.get()));
         toggle();
     }
 }