From 048a943daa8d18566faf4851350549f6f7e9966d Mon Sep 17 00:00:00 2001 From: parzivail Date: Thu, 24 Oct 2024 19:10:53 -0400 Subject: [PATCH] reorganize mixins --- .../GalaxiesEntityLeftClickClientManager.java | 6 +++--- ...va => Accessor$ClientPlayerInteractionManager.java} | 2 +- ...wContextAccessor.java => Accessor$DrawContext.java} | 2 +- ...AbstractClientPlayerEntity$GalaxiesAttributes.java} | 2 +- ...in.java => Mixin$ItemStack$GalaxiesAttributes.java} | 2 +- ...> Mixin$MinecraftClient$LeftClickInputSupport.java} | 2 +- .../src/client/java/dev/pswg/rendering/Drawables.java | 4 ++-- .../src/client/resources/pswg.client.mixins.json | 10 +++++----- .../pswg_core/src/main/java/dev/pswg/mixin/.gitkeep | 0 ...n.java => Mixin$LivingEntity$LeftClickSupport.java} | 2 +- ...java => Mixin$PlayerEntity$GalaxiesAttributes.java} | 2 +- projects/pswg_core/src/main/resources/pswg.mixins.json | 4 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) rename projects/pswg_core/src/client/java/dev/pswg/mixin/client/{ClientPlayerInteractionManagerAccessor.java => Accessor$ClientPlayerInteractionManager.java} (83%) rename projects/pswg_core/src/client/java/dev/pswg/mixin/client/{DrawContextAccessor.java => Accessor$DrawContext.java} (90%) rename projects/pswg_core/src/client/java/dev/pswg/mixin/client/{AbstractClientPlayerEntityMixin.java => Mixin$AbstractClientPlayerEntity$GalaxiesAttributes.java} (93%) rename projects/pswg_core/src/client/java/dev/pswg/mixin/client/{ItemStackMixin.java => Mixin$ItemStack$GalaxiesAttributes.java} (96%) rename projects/pswg_core/src/client/java/dev/pswg/mixin/client/{MinecraftClientMixin.java => Mixin$MinecraftClient$LeftClickInputSupport.java} (89%) delete mode 100644 projects/pswg_core/src/main/java/dev/pswg/mixin/.gitkeep rename projects/pswg_core/src/main/java/dev/pswg/mixin/{LivingEntityMixin.java => Mixin$LivingEntity$LeftClickSupport.java} (98%) rename projects/pswg_core/src/main/java/dev/pswg/mixin/{PlayerEntityMixin.java => Mixin$PlayerEntity$GalaxiesAttributes.java} (94%) diff --git a/projects/pswg_core/src/client/java/dev/pswg/interaction/GalaxiesEntityLeftClickClientManager.java b/projects/pswg_core/src/client/java/dev/pswg/interaction/GalaxiesEntityLeftClickClientManager.java index a1650a129..c6677afee 100644 --- a/projects/pswg_core/src/client/java/dev/pswg/interaction/GalaxiesEntityLeftClickClientManager.java +++ b/projects/pswg_core/src/client/java/dev/pswg/interaction/GalaxiesEntityLeftClickClientManager.java @@ -1,7 +1,7 @@ package dev.pswg.interaction; import dev.pswg.item.ILeftClickUsable; -import dev.pswg.mixin.client.ClientPlayerInteractionManagerAccessor; +import dev.pswg.mixin.client.Accessor$ClientPlayerInteractionManager; import dev.pswg.networking.GalaxiesPlayerActionC2SPacket; import dev.pswg.networking.PlayerInteractItemLeftC2SPacket; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; @@ -89,7 +89,7 @@ public static void handleInputEvents(MinecraftClient client) */ private static void stopUsingItemLeft(ClientPlayerInteractionManager interactionManager, ClientPlayerEntity player) { - ((ClientPlayerInteractionManagerAccessor)interactionManager).invokeSyncSelectedSlot(); + ((Accessor$ClientPlayerInteractionManager)interactionManager).invokeSyncSelectedSlot(); ClientPlayNetworking.send(new GalaxiesPlayerActionC2SPacket(PlayerAction.RELEASE_USE_LEFT_ITEM)); @@ -147,7 +147,7 @@ private static ActionResult interactItemLeft(MinecraftClient client, ClientPlaye } else { - ((ClientPlayerInteractionManagerAccessor)interactionManager).invokeSyncSelectedSlot(); + ((Accessor$ClientPlayerInteractionManager)interactionManager).invokeSyncSelectedSlot(); var packet = new PlayerInteractItemLeftC2SPacket(hand, player.getYaw(), player.getPitch()); diff --git a/projects/pswg_core/src/client/java/dev/pswg/mixin/client/ClientPlayerInteractionManagerAccessor.java b/projects/pswg_core/src/client/java/dev/pswg/mixin/client/Accessor$ClientPlayerInteractionManager.java similarity index 83% rename from projects/pswg_core/src/client/java/dev/pswg/mixin/client/ClientPlayerInteractionManagerAccessor.java rename to projects/pswg_core/src/client/java/dev/pswg/mixin/client/Accessor$ClientPlayerInteractionManager.java index c0abb7309..c98414bb9 100644 --- a/projects/pswg_core/src/client/java/dev/pswg/mixin/client/ClientPlayerInteractionManagerAccessor.java +++ b/projects/pswg_core/src/client/java/dev/pswg/mixin/client/Accessor$ClientPlayerInteractionManager.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(ClientPlayerInteractionManager.class) -public interface ClientPlayerInteractionManagerAccessor +public interface Accessor$ClientPlayerInteractionManager { @Invoker void invokeSyncSelectedSlot(); diff --git a/projects/pswg_core/src/client/java/dev/pswg/mixin/client/DrawContextAccessor.java b/projects/pswg_core/src/client/java/dev/pswg/mixin/client/Accessor$DrawContext.java similarity index 90% rename from projects/pswg_core/src/client/java/dev/pswg/mixin/client/DrawContextAccessor.java rename to projects/pswg_core/src/client/java/dev/pswg/mixin/client/Accessor$DrawContext.java index 19679a358..ef036a2a6 100644 --- a/projects/pswg_core/src/client/java/dev/pswg/mixin/client/DrawContextAccessor.java +++ b/projects/pswg_core/src/client/java/dev/pswg/mixin/client/Accessor$DrawContext.java @@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(DrawContext.class) -public interface DrawContextAccessor +public interface Accessor$DrawContext { @Accessor("vertexConsumers") VertexConsumerProvider.Immediate getVertexConsumers(); diff --git a/projects/pswg_core/src/client/java/dev/pswg/mixin/client/AbstractClientPlayerEntityMixin.java b/projects/pswg_core/src/client/java/dev/pswg/mixin/client/Mixin$AbstractClientPlayerEntity$GalaxiesAttributes.java similarity index 93% rename from projects/pswg_core/src/client/java/dev/pswg/mixin/client/AbstractClientPlayerEntityMixin.java rename to projects/pswg_core/src/client/java/dev/pswg/mixin/client/Mixin$AbstractClientPlayerEntity$GalaxiesAttributes.java index a01c422bd..b93e761a6 100644 --- a/projects/pswg_core/src/client/java/dev/pswg/mixin/client/AbstractClientPlayerEntityMixin.java +++ b/projects/pswg_core/src/client/java/dev/pswg/mixin/client/Mixin$AbstractClientPlayerEntity$GalaxiesAttributes.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.ModifyArg; @Mixin(AbstractClientPlayerEntity.class) -public abstract class AbstractClientPlayerEntityMixin +public abstract class Mixin$AbstractClientPlayerEntity$GalaxiesAttributes { /** * Append our field of view changes to the client player's field of view calculations diff --git a/projects/pswg_core/src/client/java/dev/pswg/mixin/client/ItemStackMixin.java b/projects/pswg_core/src/client/java/dev/pswg/mixin/client/Mixin$ItemStack$GalaxiesAttributes.java similarity index 96% rename from projects/pswg_core/src/client/java/dev/pswg/mixin/client/ItemStackMixin.java rename to projects/pswg_core/src/client/java/dev/pswg/mixin/client/Mixin$ItemStack$GalaxiesAttributes.java index 21d65ef5e..6d56462d9 100644 --- a/projects/pswg_core/src/client/java/dev/pswg/mixin/client/ItemStackMixin.java +++ b/projects/pswg_core/src/client/java/dev/pswg/mixin/client/Mixin$ItemStack$GalaxiesAttributes.java @@ -16,7 +16,7 @@ import java.util.function.Consumer; @Mixin(ItemStack.class) -public abstract class ItemStackMixin +public abstract class Mixin$ItemStack$GalaxiesAttributes { @Inject(method = "appendAttributeModifierTooltip(Ljava/util/function/Consumer;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/registry/entry/RegistryEntry;Lnet/minecraft/entity/attribute/EntityAttributeModifier;)V", at = @At("HEAD"), cancellable = true) public void appendAttributeModifierTooltip(Consumer textConsumer, PlayerEntity player, RegistryEntry attribute, EntityAttributeModifier modifier, CallbackInfo ci) diff --git a/projects/pswg_core/src/client/java/dev/pswg/mixin/client/MinecraftClientMixin.java b/projects/pswg_core/src/client/java/dev/pswg/mixin/client/Mixin$MinecraftClient$LeftClickInputSupport.java similarity index 89% rename from projects/pswg_core/src/client/java/dev/pswg/mixin/client/MinecraftClientMixin.java rename to projects/pswg_core/src/client/java/dev/pswg/mixin/client/Mixin$MinecraftClient$LeftClickInputSupport.java index 2c4beb7ea..d0921515c 100644 --- a/projects/pswg_core/src/client/java/dev/pswg/mixin/client/MinecraftClientMixin.java +++ b/projects/pswg_core/src/client/java/dev/pswg/mixin/client/Mixin$MinecraftClient$LeftClickInputSupport.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(MinecraftClient.class) -public abstract class MinecraftClientMixin +public abstract class Mixin$MinecraftClient$LeftClickInputSupport { @Inject(method = "handleInputEvents()V", at = @At("HEAD")) public void handleInputEvents(CallbackInfo ci) diff --git a/projects/pswg_core/src/client/java/dev/pswg/rendering/Drawables.java b/projects/pswg_core/src/client/java/dev/pswg/rendering/Drawables.java index f06ccf072..629d0adb8 100644 --- a/projects/pswg_core/src/client/java/dev/pswg/rendering/Drawables.java +++ b/projects/pswg_core/src/client/java/dev/pswg/rendering/Drawables.java @@ -1,6 +1,6 @@ package dev.pswg.rendering; -import dev.pswg.mixin.client.DrawContextAccessor; +import dev.pswg.mixin.client.Accessor$DrawContext; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; @@ -24,7 +24,7 @@ public final class Drawables */ public static VertexConsumerProvider.Immediate getVertexConsumers(DrawContext context) { - return ((DrawContextAccessor)context).getVertexConsumers(); + return ((Accessor$DrawContext)context).getVertexConsumers(); } /** diff --git a/projects/pswg_core/src/client/resources/pswg.client.mixins.json b/projects/pswg_core/src/client/resources/pswg.client.mixins.json index 774278080..a54226500 100644 --- a/projects/pswg_core/src/client/resources/pswg.client.mixins.json +++ b/projects/pswg_core/src/client/resources/pswg.client.mixins.json @@ -3,11 +3,11 @@ "package": "dev.pswg.mixin.client", "compatibilityLevel": "JAVA_21", "client": [ - "AbstractClientPlayerEntityMixin", - "ClientPlayerInteractionManagerAccessor", - "DrawContextAccessor", - "ItemStackMixin", - "MinecraftClientMixin" + "Accessor$ClientPlayerInteractionManager", + "Accessor$DrawContext", + "Mixin$AbstractClientPlayerEntity$GalaxiesAttributes", + "Mixin$ItemStack$GalaxiesAttributes", + "Mixin$MinecraftClient$LeftClickInputSupport" ], "injectors": { "defaultRequire": 1 diff --git a/projects/pswg_core/src/main/java/dev/pswg/mixin/.gitkeep b/projects/pswg_core/src/main/java/dev/pswg/mixin/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/projects/pswg_core/src/main/java/dev/pswg/mixin/LivingEntityMixin.java b/projects/pswg_core/src/main/java/dev/pswg/mixin/Mixin$LivingEntity$LeftClickSupport.java similarity index 98% rename from projects/pswg_core/src/main/java/dev/pswg/mixin/LivingEntityMixin.java rename to projects/pswg_core/src/main/java/dev/pswg/mixin/Mixin$LivingEntity$LeftClickSupport.java index 8bf9d5482..3de1c0a83 100644 --- a/projects/pswg_core/src/main/java/dev/pswg/mixin/LivingEntityMixin.java +++ b/projects/pswg_core/src/main/java/dev/pswg/mixin/Mixin$LivingEntity$LeftClickSupport.java @@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(LivingEntity.class) -public abstract class LivingEntityMixin implements ILeftClickingEntity +public abstract class Mixin$LivingEntity$LeftClickSupport implements ILeftClickingEntity { @Unique private int itemLeftUseTimeLeft; diff --git a/projects/pswg_core/src/main/java/dev/pswg/mixin/PlayerEntityMixin.java b/projects/pswg_core/src/main/java/dev/pswg/mixin/Mixin$PlayerEntity$GalaxiesAttributes.java similarity index 94% rename from projects/pswg_core/src/main/java/dev/pswg/mixin/PlayerEntityMixin.java rename to projects/pswg_core/src/main/java/dev/pswg/mixin/Mixin$PlayerEntity$GalaxiesAttributes.java index 7d16266bb..701010edb 100644 --- a/projects/pswg_core/src/main/java/dev/pswg/mixin/PlayerEntityMixin.java +++ b/projects/pswg_core/src/main/java/dev/pswg/mixin/Mixin$PlayerEntity$GalaxiesAttributes.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(PlayerEntity.class) -public class PlayerEntityMixin +public class Mixin$PlayerEntity$GalaxiesAttributes { /** * Appends our custom attributes to the player's attribute builder diff --git a/projects/pswg_core/src/main/resources/pswg.mixins.json b/projects/pswg_core/src/main/resources/pswg.mixins.json index 64370f1e1..8575e9547 100644 --- a/projects/pswg_core/src/main/resources/pswg.mixins.json +++ b/projects/pswg_core/src/main/resources/pswg.mixins.json @@ -3,8 +3,8 @@ "package": "dev.pswg.mixin", "compatibilityLevel": "JAVA_21", "mixins": [ - "LivingEntityMixin", - "PlayerEntityMixin" + "Mixin$LivingEntity$LeftClickSupport", + "Mixin$PlayerEntity$GalaxiesAttributes" ], "injectors": { "defaultRequire": 1