reorganize mixins

Parzivail-Modding-Team · Oct 24, 2024 · 048a943 · 048a943
1 parent 0f4dee2
commit 048a943
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 19 deletions.
diff --git a/.../pswg_core/src/client/java/dev/pswg/interaction/GalaxiesEntityLeftClickClientManager.java b/.../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/...ientPlayerInteractionManagerAccessor.java → ...essor$ClientPlayerInteractionManager.java b/...ientPlayerInteractionManagerAccessor.java → ...essor$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/...swg/mixin/client/DrawContextAccessor.java → ...wg/mixin/client/Accessor$DrawContext.java b/...swg/mixin/client/DrawContextAccessor.java → ...wg/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/...ient/AbstractClientPlayerEntityMixin.java → ...lientPlayerEntity$GalaxiesAttributes.java b/...ient/AbstractClientPlayerEntityMixin.java → ...lientPlayerEntity$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/...dev/pswg/mixin/client/ItemStackMixin.java → ...t/Mixin$ItemStack$GalaxiesAttributes.java b/...dev/pswg/mixin/client/ItemStackMixin.java → ...t/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<Text> textConsumer, PlayerEntity player, RegistryEntry<EntityAttribute> attribute, EntityAttributeModifier modifier, CallbackInfo ci)

diff --git a/...wg/mixin/client/MinecraftClientMixin.java → ...inecraftClient$LeftClickInputSupport.java b/...wg/mixin/client/MinecraftClientMixin.java → ...inecraftClient$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
@@ -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
@@ -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
diff --git a/...ava/dev/pswg/mixin/LivingEntityMixin.java → .../Mixin$LivingEntity$LeftClickSupport.java b/...ava/dev/pswg/mixin/LivingEntityMixin.java → .../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/...ava/dev/pswg/mixin/PlayerEntityMixin.java → ...ixin$PlayerEntity$GalaxiesAttributes.java b/...ava/dev/pswg/mixin/PlayerEntityMixin.java → ...ixin$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
@@ -3,8 +3,8 @@
 	"package": "dev.pswg.mixin",
 	"compatibilityLevel": "JAVA_21",
 	"mixins": [
-		"LivingEntityMixin",
-		"PlayerEntityMixin"
+		"Mixin$LivingEntity$LeftClickSupport",
+		"Mixin$PlayerEntity$GalaxiesAttributes"
 	],
 	"injectors": {
 		"defaultRequire": 1