Reduce amount of AW via Accessor mixins (#5592)

* Reduce amount of AW via Accessor mixins

- Some AW were long unused, others have become public

* Properly prefix Accessor mixins with mod id

* Delete unused Accessors

* Properly prefix Invoker mixins with mod id

Author: Big-Iron-Cheems

src/main/java/meteordevelopment/meteorclient/commands/commands/SaveMapCommand.java

@@ -72,7 +72,7 @@ private void saveMap(int scale) throws CommandSyntaxException {
         if (path == null) throw OOPS.create();
 
         MapTextureManagerAccessor textureManager = (MapTextureManagerAccessor) mc.gameRenderer.getClient().getMapTextureManager();
-        MapTextureManager.MapTexture texture = textureManager.invokeGetMapTexture(map.get(DataComponentTypes.MAP_ID), state);
+        MapTextureManager.MapTexture texture = textureManager.meteor$invokeGetMapTexture(map.get(DataComponentTypes.MAP_ID), state);
         if (texture.texture.getImage() == null) throw OOPS.create();
 
         try {

src/main/java/meteordevelopment/meteorclient/commands/commands/SayCommand.java

@@ -39,8 +39,8 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
                     Instant instant = Instant.now();
                     long l = NetworkEncryptionUtils.SecureRandomUtil.nextLong();
                     ClientPlayNetworkHandler handler = mc.getNetworkHandler();
-                    LastSeenMessagesCollector.LastSeenMessages lastSeenMessages = ((ClientPlayNetworkHandlerAccessor) handler).getLastSeenMessagesCollector().collect();
-                    MessageSignatureData messageSignatureData = ((ClientPlayNetworkHandlerAccessor) handler).getMessagePacker().pack(new MessageBody(message, instant, l, lastSeenMessages.lastSeen()));
+                    LastSeenMessagesCollector.LastSeenMessages lastSeenMessages = ((ClientPlayNetworkHandlerAccessor) handler).meteor$getLastSeenMessagesCollector().collect();
+                    MessageSignatureData messageSignatureData = ((ClientPlayNetworkHandlerAccessor) handler).meteor$getMessagePacker().pack(new MessageBody(message, instant, l, lastSeenMessages.lastSeen()));
                     handler.sendPacket(new ChatMessageC2SPacket(message, instant, l, messageSignatureData, lastSeenMessages.update()));
                 }
             }

src/main/java/meteordevelopment/meteorclient/commands/commands/ServerCommand.java

@@ -206,8 +206,8 @@ private void onReadPacket(PacketEvent.Receive event) {
             // This gets the root node of the command tree. From there, all of its children have to be of type
             // LiteralCommandNode, so we don't need to worry about checking or casting and can just grab the name
             packet.getCommandTree(
-                CommandRegistryAccess.of(handler.getCombinedDynamicRegistries(), handler.getEnabledFeatures()),
-                ClientPlayNetworkHandlerAccessor.getCommandNodeFactory()
+                CommandRegistryAccess.of(handler.meteor$getCombinedDynamicRegistries(), handler.meteor$getEnabledFeatures()),
+                ClientPlayNetworkHandlerAccessor.meteor$getCommandNodeFactory()
             ).getChildren().forEach(node -> {
                 String[] split = node.getName().split(":");
                 if (split.length > 1) {

src/main/java/meteordevelopment/meteorclient/gui/screens/settings/BlockListSettingScreen.java

@@ -54,7 +54,7 @@ protected Block getAdditionalValue(Block value) {
         String path = Registries.BLOCK.getId(value).getPath();
         if (!path.endsWith("_banner")) return null;
 
-        ((IdentifierAccessor) (Object) ID).setPath(path.substring(0, path.length() - 6) + "wall_banner");
+        ((IdentifierAccessor) (Object) ID).meteor$setPath(path.substring(0, path.length() - 6) + "wall_banner");
         return Registries.BLOCK.get(ID);
     }
 }

src/main/java/meteordevelopment/meteorclient/mixin/AbstractBlockAccessor.java

@@ -12,5 +12,5 @@
 @Mixin(AbstractBlock.class)
 public interface AbstractBlockAccessor {
     @Accessor("collidable")
-    boolean isCollidable();
+    boolean meteor$isCollidable();
 }

src/main/java/meteordevelopment/meteorclient/mixin/AbstractClientPlayerEntityAccessor.java

@@ -0,0 +1,17 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.mixin;
+
+import net.minecraft.client.network.AbstractClientPlayerEntity;
+import net.minecraft.client.network.PlayerListEntry;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(AbstractClientPlayerEntity.class)
+public interface AbstractClientPlayerEntityAccessor {
+    @Accessor("playerListEntry")
+    void meteor$setPlayerListEntry(PlayerListEntry entry);
+}

src/main/java/meteordevelopment/meteorclient/mixin/AbstractSignEditScreenAccessor.java

@@ -13,5 +13,5 @@
 @Mixin(AbstractSignEditScreen.class)
 public interface AbstractSignEditScreenAccessor {
     @Accessor("blockEntity")
-    SignBlockEntity getSign();
+    SignBlockEntity meteor$getSign();
 }

src/main/java/meteordevelopment/meteorclient/mixin/BlockHitResultAccessor.java

@@ -15,5 +15,5 @@
 public interface BlockHitResultAccessor {
     @Mutable
     @Accessor("side")
-    void setSide(Direction direction);
+    void meteor$setSide(Direction direction);
 }

src/main/java/meteordevelopment/meteorclient/mixin/ChatHudAccessor.java

@@ -15,8 +15,8 @@
 @Mixin(ChatHud.class)
 public interface ChatHudAccessor {
     @Accessor("visibleMessages")
-    List<ChatHudLine.Visible> getVisibleMessages();
+    List<ChatHudLine.Visible> meteor$getVisibleMessages();
 
     @Accessor("messages")
-    List<ChatHudLine> getMessages();
+    List<ChatHudLine> meteor$getMessages();
 }

src/main/java/meteordevelopment/meteorclient/mixin/ClientChunkManagerAccessor.java

@@ -12,5 +12,5 @@
 @Mixin(ClientChunkManager.class)
 public interface ClientChunkManagerAccessor {
     @Accessor("chunks")
-    ClientChunkManager.ClientChunkMap getChunks();
+    ClientChunkManager.ClientChunkMap meteor$getChunks();
 }