Merge branch '1.21.8' into 1.21.10

Author: rfresh2

common/src/main/java/xaeroplus/mixin/client/AccessorRightClickOption.java

@@ -1,11 +1,11 @@
 package xaeroplus.mixin.client;
 
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
 import xaero.map.gui.dropdown.rightclick.RightClickOption;
 
 @Mixin(value = RightClickOption.class, remap = false)
 public interface AccessorRightClickOption {
-    @Accessor
-    String getName();
+    @Invoker("getName")
+    String invokeGetName();
 }

common/src/main/java/xaeroplus/mixin/client/MixinGuiMap.java

@@ -1008,11 +1008,11 @@ public void onAction(final Screen screen) {
         });
 
         if (Settings.REGISTRY.disableWaypointSharing.get()) {
-            options.removeIf(option -> ((AccessorRightClickOption) option).getName().equals("gui.xaero_right_click_map_share_location"));
+            options.removeIf(option -> ((AccessorRightClickOption) option).invokeGetName().equals("gui.xaero_right_click_map_share_location"));
         }
 
         if (Settings.REGISTRY.disableTeleportation.get()) {
-            options.removeIf(option -> ((AccessorRightClickOption) option).getName().equals("gui.xaero_wm_right_click_map_teleport_not_allowed"));
+            options.removeIf(option -> ((AccessorRightClickOption) option).invokeGetName().equals("gui.xaero_wm_right_click_map_teleport_not_allowed"));
         }
     }
 

common/src/main/java/xaeroplus/mixin/client/MixinWaypointReader.java

@@ -78,11 +78,11 @@ public void onAction(Screen screen) {
         }
 
         if (Settings.REGISTRY.disableWaypointSharing.get()) {
-            options.removeIf(option -> ((AccessorRightClickOption) option).getName().equals("gui.xaero_right_click_waypoint_share"));
+            options.removeIf(option -> ((AccessorRightClickOption) option).invokeGetName().equals("gui.xaero_right_click_waypoint_share"));
         }
 
         if (Settings.REGISTRY.disableTeleportation.get()) {
-            options.removeIf(option -> ((AccessorRightClickOption) option).getName().equals("gui.xaero_right_click_waypoint_teleport"));
+            options.removeIf(option -> ((AccessorRightClickOption) option).invokeGetName().equals("gui.xaero_right_click_waypoint_teleport"));
         }
     }
 }

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.parallel=false
 enabled_platforms=fabric,neoforge
 loom.ignoreDependencyLoomVersionValidation=true
 
-mod_version=2.34.3
+mod_version=2.34.4
 
 minecraft_version=1.21.10