Rename mixin class to match Mojang mappings

james58899 · james58899 · commit 5b37c046655c · 2025-11-18T13:03:26.000+08:00
diff --git a/src/main/java/one/oktw/galaxy/mixin/event/MixinPlayerAction_ServerGamePacketListener.java b/src/main/java/one/oktw/galaxy/mixin/event/MixinPlayerAction_ServerGamePacketListener.java
@@ -31,7 +31,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public abstract class MixinPlayerAction_NetworkHandler {
+public abstract class MixinPlayerAction_ServerGamePacketListener {
     @Shadow
     public ServerPlayer player;
 
diff --git a/src/main/java/one/oktw/galaxy/mixin/event/MixinPlayerChat_EmoteCommands.java b/src/main/java/one/oktw/galaxy/mixin/event/MixinPlayerChat_EmoteCommands.java
@@ -32,7 +32,7 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(EmoteCommands.class)
-public class MixinPlayerChat_MeCommand {
+public class MixinPlayerChat_EmoteCommands {
     @Redirect(method = "method_43645", at = @At(
         value = "INVOKE",
         target = "Lnet/minecraft/server/players/PlayerList;broadcastChatMessage(Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/network/chat/ChatType$Bound;)V",
diff --git a/src/main/java/one/oktw/galaxy/mixin/event/MixinPlayerChat_ServerGamePacketListener.java b/src/main/java/one/oktw/galaxy/mixin/event/MixinPlayerChat_ServerGamePacketListener.java
@@ -36,11 +36,11 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public abstract class MixinPlayerChat_NetworkHandler extends ServerCommonPacketListenerImpl {
+public abstract class MixinPlayerChat_ServerGamePacketListener extends ServerCommonPacketListenerImpl {
     @Shadow
     public ServerPlayer player;
 
-    public MixinPlayerChat_NetworkHandler(MinecraftServer server, Connection connection, CommonListenerCookie clientData) {
+    public MixinPlayerChat_ServerGamePacketListener(MinecraftServer server, Connection connection, CommonListenerCookie clientData) {
         super(server, connection, clientData);
     }
 
diff --git a/src/main/java/one/oktw/galaxy/mixin/event/MixinPlayerInput_ServerGamePacketListener.java b/src/main/java/one/oktw/galaxy/mixin/event/MixinPlayerInput_ServerGamePacketListener.java
@@ -32,7 +32,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public class MixinPlayerInput_NetworkHandler {
+public class MixinPlayerInput_ServerGamePacketListener {
     @Shadow
     public ServerPlayer player;
 
diff --git a/src/main/java/one/oktw/galaxy/mixin/event/MixinPlayerInteractBlock_ServerGamePacketListener.java b/src/main/java/one/oktw/galaxy/mixin/event/MixinPlayerInteractBlock_ServerGamePacketListener.java
@@ -40,11 +40,11 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public abstract class MixinPlayerInteractBlock_NetworkHandler extends ServerCommonPacketListenerImpl {
+public abstract class MixinPlayerInteractBlock_ServerGamePacketListener extends ServerCommonPacketListenerImpl {
     @Shadow
     public ServerPlayer player;
 
-    public MixinPlayerInteractBlock_NetworkHandler(MinecraftServer server, Connection connection, CommonListenerCookie clientData) {
+    public MixinPlayerInteractBlock_ServerGamePacketListener(MinecraftServer server, Connection connection, CommonListenerCookie clientData) {
         super(server, connection, clientData);
     }
 
diff --git a/src/main/java/one/oktw/galaxy/mixin/event/MixinPlayerInteractItem_ServerGamePacketListener.java b/src/main/java/one/oktw/galaxy/mixin/event/MixinPlayerInteractItem_ServerGamePacketListener.java
@@ -37,11 +37,11 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public abstract class MixinPlayerInteractItem_NetworkHandler extends ServerCommonPacketListenerImpl {
+public abstract class MixinPlayerInteractItem_ServerGamePacketListener extends ServerCommonPacketListenerImpl {
     @Shadow
     public ServerPlayer player;
 
-    public MixinPlayerInteractItem_NetworkHandler(MinecraftServer server, Connection connection, CommonListenerCookie clientData) {
+    public MixinPlayerInteractItem_ServerGamePacketListener(MinecraftServer server, Connection connection, CommonListenerCookie clientData) {
         super(server, connection, clientData);
     }
 
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/MixinAsyncChunk_IOWorker.java b/src/main/java/one/oktw/galaxy/mixin/tweak/MixinAsyncChunk_IOWorker.java
@@ -46,7 +46,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 @Mixin(IOWorker.class)
-public abstract class MixinAsyncChunk_StorageIoWorker {
+public abstract class MixinAsyncChunk_IOWorker {
     @Unique
     private final AtomicBoolean writeLock = new AtomicBoolean(false);
 
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/MixinAsyncChunk_RegionFileStorage.java b/src/main/java/one/oktw/galaxy/mixin/tweak/MixinAsyncChunk_RegionFileStorage.java
@@ -35,7 +35,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 @Mixin(RegionFileStorage.class)
-public abstract class MixinAsyncChunk_RegionBasedStorage {
+public abstract class MixinAsyncChunk_RegionFileStorage {
     @Unique
     private final ReentrantLock lock = new ReentrantLock();
 
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/MixinAsyncChunk_ServerGamePacketListener.java b/src/main/java/one/oktw/galaxy/mixin/tweak/MixinAsyncChunk_ServerGamePacketListener.java
@@ -36,7 +36,7 @@
 import java.util.Set;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public abstract class MixinAsyncChunk_ServerPlayNetworkHandler {
+public abstract class MixinAsyncChunk_ServerGamePacketListener {
     @Shadow
     public ServerPlayer player;
 
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/MixinCustomBlockEntity_ClientboundLevelChunkPacketData.java b/src/main/java/one/oktw/galaxy/mixin/tweak/MixinCustomBlockEntity_ClientboundLevelChunkPacketData.java
@@ -31,7 +31,7 @@
 import java.util.stream.Collectors;
 
 @Mixin(ClientboundLevelChunkPacketData.class)
-public class MixinCustomBlockEntity_ChunkData {
+public class MixinCustomBlockEntity_ClientboundLevelChunkPacketData {
     @Redirect(method = "<init>(Lnet/minecraft/world/level/chunk/LevelChunk;)V", at = @At(value = "INVOKE", target = "Ljava/util/Map;entrySet()Ljava/util/Set;"))
     private Set<Map.Entry<BlockPos, BlockEntity>> removeCustomBlock(Map<BlockPos, BlockEntity> instance) {
         return instance.entrySet().stream().filter(e -> !(e.getValue() instanceof CustomBlockEntity)).collect(Collectors.toSet());
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/MixinCustomBlockEntity_StructureTemplate.java b/src/main/java/one/oktw/galaxy/mixin/tweak/MixinCustomBlockEntity_StructureTemplate.java
@@ -41,7 +41,7 @@
 import java.util.List;
 
 @Mixin(StructureTemplate.class)
-public class MixinCustomBlockEntity_Structure {
+public class MixinCustomBlockEntity_StructureTemplate {
     @Inject(method = "placeInWorld",
         at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/ServerLevelAccessor;setBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Z", ordinal = 1), locals = LocalCapture.CAPTURE_FAILSOFT)
     private void hackPlace(ServerLevelAccessor world, BlockPos pos, BlockPos pivot, StructurePlaceSettings placementData, RandomSource random, int flags, CallbackInfoReturnable<Boolean> cir, List<StructureTemplate.StructureBlockInfo> list, BoundingBox blockBox, List<BlockPos> list2, List<BlockPos> list3, List<Pair<BlockPos, CompoundTag>> list4, int i, int j, int k, int l, int m, int n, List<StructureTemplate.StructureBlockInfo> list5, ProblemReporter.ScopedCollector logging, Iterator<StructureTemplate.StructureBlockInfo> var20, StructureTemplate.StructureBlockInfo structureBlockInfo, BlockPos blockPos, FluidState fluidState, BlockState blockState) {
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/MixinGUI_ServerGamePacketListener.java b/src/main/java/one/oktw/galaxy/mixin/tweak/MixinGUI_ServerGamePacketListener.java
@@ -29,7 +29,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public class MixinGUI_ServerPlayNetworkHandler {
+public class MixinGUI_ServerGamePacketListener {
     @Shadow
     public ServerPlayer player;
 
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/MixinGlobalDataPack_ServerPacksSource.java b/src/main/java/one/oktw/galaxy/mixin/tweak/MixinGlobalDataPack_ServerPacksSource.java
@@ -26,7 +26,7 @@
 import java.nio.file.Path;
 
 @Mixin(ServerPacksSource.class)
-public class MixinGlobalDataPack_VanillaDataPackProvider {
+public class MixinGlobalDataPack_ServerPacksSource {
     @ModifyArg(method = "createPackRepository(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;)Lnet/minecraft/server/packs/repository/PackRepository;", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/packs/repository/ServerPacksSource;createPackRepository(Ljava/nio/file/Path;Lnet/minecraft/world/level/validation/DirectoryValidator;)Lnet/minecraft/server/packs/repository/PackRepository;"), index = 0)
     private static Path moveDataPackPath(Path dataPacksPath) {
         return Path.of("datapacks");
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/MixinMapExistingChunk_MapItem.java b/src/main/java/one/oktw/galaxy/mixin/tweak/MixinMapExistingChunk_MapItem.java
@@ -31,7 +31,7 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(MapItem.class)
-public abstract class MixinMapExistingChunk_FilledMapItem {
+public abstract class MixinMapExistingChunk_MapItem {
     @Redirect(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getChunk(II)Lnet/minecraft/world/level/chunk/LevelChunk;"))
     private LevelChunk getExistingChunk(Level world, int x, int z) {
         ServerLevel serverWorld = (ServerLevel) world;
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/MixinOptimizeArmorStand_ArmorStand.java b/src/main/java/one/oktw/galaxy/mixin/tweak/MixinOptimizeArmorStand_ArmorStand.java
@@ -26,7 +26,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ArmorStand.class)
-public abstract class MixinOptimizeArmorStand_ArmorStandEntity {
+public abstract class MixinOptimizeArmorStand_ArmorStand {
     @Shadow
     public abstract boolean isMarker();
 
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/MixinRCON_GenericThread.java b/src/main/java/one/oktw/galaxy/mixin/tweak/MixinRCON_GenericThread.java
@@ -26,7 +26,7 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(GenericThread.class)
-public class MixinRCON_RconBase {
+public class MixinRCON_GenericThread {
     @Unique
     boolean isLocal = false;
 
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/MixinRCON_RconClient.java b/src/main/java/one/oktw/galaxy/mixin/tweak/MixinRCON_RconClient.java
@@ -30,7 +30,7 @@
 import java.net.Socket;
 
 @Mixin(RconClient.class)
-public class MixinRCON_RconClient extends MixinRCON_RconBase {
+public class MixinRCON_RconClient extends MixinRCON_GenericThread {
     @Inject(method = "<init>", at = @At("RETURN"))
     private void checkLocal(ServerInterface server, String password, Socket socket, CallbackInfo ci) {
         if (socket.getInetAddress().isLoopbackAddress()) isLocal = true;
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/MixinThrownCountdown_Projectile.java b/src/main/java/one/oktw/galaxy/mixin/tweak/MixinThrownCountdown_Projectile.java
@@ -29,11 +29,11 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(Projectile.class)
-public abstract class MixinThrownCountdown_ProjectileEntity extends Entity {
+public abstract class MixinThrownCountdown_Projectile extends Entity {
     @Unique
     int maxAge = 0;
 
-    public MixinThrownCountdown_ProjectileEntity(EntityType<?> type, Level world) {
+    public MixinThrownCountdown_Projectile(EntityType<?> type, Level world) {
         super(type, world);
     }
 
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/MixinThrownCountdown_ThrowableProjectile.java b/src/main/java/one/oktw/galaxy/mixin/tweak/MixinThrownCountdown_ThrowableProjectile.java
@@ -33,7 +33,7 @@
 import java.util.function.Predicate;
 
 @Mixin(ThrowableProjectile.class)
-public class MixinThrownCountdown_ThrownEntity {
+public class MixinThrownCountdown_ThrowableProjectile {
     @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/projectile/ProjectileUtil;getHitResultOnMoveVector(Lnet/minecraft/world/entity/Entity;Ljava/util/function/Predicate;)Lnet/minecraft/world/phys/HitResult;"))
     private HitResult addWaterHit(Entity entity, Predicate<Entity> predicate) {
         HitResult hit = ProjectileUtil.getHitResultOnMoveVector(entity, predicate);
diff --git a/src/main/java/one/oktw/galaxy/mixin/tweak/SignStyle_ServerGamePacketListener.java b/src/main/java/one/oktw/galaxy/mixin/tweak/SignStyle_ServerGamePacketListener.java
@@ -29,7 +29,7 @@
 import java.util.stream.Stream;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public class SignStyle_NetworkHandler {
+public class SignStyle_ServerGamePacketListener {
     @Unique
     private static final Pattern styles = Pattern.compile("&(?=[a-f0-9k-or])");
 
diff --git a/src/main/java/org/spongepowered/common/mixin/realtime/entity/ExperienceOrbMixin_RealTime.java b/src/main/java/org/spongepowered/common/mixin/realtime/entity/ExperienceOrbMixin_RealTime.java
@@ -51,7 +51,7 @@
 import org.spongepowered.common.bridge.RealTimeTrackingBridge;
 
 @Mixin(ExperienceOrb.class)
-public abstract class ExperienceOrbEntityMixin_RealTime extends EntityMixin_RealTime {
+public abstract class ExperienceOrbMixin_RealTime extends EntityMixin_RealTime {
     @Shadow
     private int age;
 
diff --git a/src/main/java/org/spongepowered/common/mixin/realtime/entity/mob/CreeperMixin_RealTime.java b/src/main/java/org/spongepowered/common/mixin/realtime/entity/mob/CreeperMixin_RealTime.java
@@ -53,7 +53,7 @@
 import org.spongepowered.common.bridge.RealTimeTrackingBridge;
 
 @Mixin(Creeper.class)
-public abstract class CreeperEntityMixin_RealTime {
+public abstract class CreeperMixin_RealTime {
     @Unique
     private boolean delay;
 
diff --git a/src/main/java/org/spongepowered/common/mixin/realtime/entity/mob/MobMixin_RealTime.java b/src/main/java/org/spongepowered/common/mixin/realtime/entity/mob/MobMixin_RealTime.java
@@ -51,7 +51,7 @@
 import org.spongepowered.common.mixin.realtime.entity.LivingEntityMixin_RealTime;
 
 @Mixin(Mob.class)
-public abstract class MobEntityMixin_RealTime extends LivingEntityMixin_RealTime {
+public abstract class MobMixin_RealTime extends LivingEntityMixin_RealTime {
     @Redirect(
         method = "serverAiStep",
         at = @At(
diff --git a/src/main/java/org/spongepowered/common/mixin/realtime/entity/mob/ZombieVillagerMixin_RealTime.java b/src/main/java/org/spongepowered/common/mixin/realtime/entity/mob/ZombieVillagerMixin_RealTime.java
@@ -51,7 +51,7 @@
 import org.spongepowered.common.mixin.realtime.entity.LivingEntityMixin_RealTime;
 
 @Mixin(ZombieVillager.class)
-public abstract class ZombieVillagerEntityMixin_RealTime extends LivingEntityMixin_RealTime {
+public abstract class ZombieVillagerMixin_RealTime extends LivingEntityMixin_RealTime {
     @Shadow
     protected abstract int getConversionProgress();
 
diff --git a/src/main/java/org/spongepowered/common/mixin/realtime/entity/passive/AgeableMobMixin_RealTime.java b/src/main/java/org/spongepowered/common/mixin/realtime/entity/passive/AgeableMobMixin_RealTime.java
@@ -51,7 +51,7 @@
 import org.spongepowered.common.mixin.realtime.entity.EntityMixin_RealTime;
 
 @Mixin(AgeableMob.class)
-public abstract class PassiveEntityMixin_RealTime extends EntityMixin_RealTime {
+public abstract class AgeableMobMixin_RealTime extends EntityMixin_RealTime {
     @Shadow
     public abstract void setAge(int int_1);
 
diff --git a/src/main/java/org/spongepowered/common/mixin/realtime/entity/player/ItemCooldownsMixin_RealTime.java b/src/main/java/org/spongepowered/common/mixin/realtime/entity/player/ItemCooldownsMixin_RealTime.java
@@ -51,7 +51,7 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(ItemCooldowns.class)
-public abstract class ItemCooldownManagerMixin_RealTime {
+public abstract class ItemCooldownsMixin_RealTime {
     @Unique
     private long lastTickNanos = System.nanoTime();
 
diff --git a/src/main/java/org/spongepowered/common/mixin/realtime/entity/player/PlayerMixin_RealTime.java b/src/main/java/org/spongepowered/common/mixin/realtime/entity/player/PlayerMixin_RealTime.java
@@ -53,7 +53,7 @@
 import org.spongepowered.common.mixin.realtime.entity.LivingEntityMixin_RealTime;
 
 @Mixin(Player.class)
-public abstract class PlayerEntityMixin_RealTime extends LivingEntityMixin_RealTime {
+public abstract class PlayerMixin_RealTime extends LivingEntityMixin_RealTime {
     @Shadow
     public int takeXpDelay;
     @Shadow
diff --git a/src/main/java/org/spongepowered/common/mixin/realtime/server/network/ServerGamePacketListenerMixin_RealTime.java b/src/main/java/org/spongepowered/common/mixin/realtime/server/network/ServerGamePacketListenerMixin_RealTime.java
@@ -56,11 +56,11 @@
 import org.spongepowered.common.bridge.RealTimeTrackingBridge;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public abstract class ServerPlayNetworkHandlerMixin_RealTime extends ServerCommonPacketListenerImpl {
+public abstract class ServerGamePacketListenerMixin_RealTime extends ServerCommonPacketListenerImpl {
     @Shadow
     public ServerPlayer player;
 
-    public ServerPlayNetworkHandlerMixin_RealTime(MinecraftServer server, Connection connection, CommonListenerCookie clientData) {
+    public ServerGamePacketListenerMixin_RealTime(MinecraftServer server, Connection connection, CommonListenerCookie clientData) {
         super(server, connection, clientData);
     }
 
diff --git a/src/main/java/org/spongepowered/common/mixin/realtime/server/network/ServerPlayerGameModeMixin_RealTime.java b/src/main/java/org/spongepowered/common/mixin/realtime/server/network/ServerPlayerGameModeMixin_RealTime.java
@@ -52,7 +52,7 @@
 import org.spongepowered.common.bridge.RealTimeTrackingBridge;
 
 @Mixin(ServerPlayerGameMode.class)
-public abstract class ServerPlayerInteractionManagerMixin_RealTime {
+public abstract class ServerPlayerGameModeMixin_RealTime {
     @Shadow
     protected ServerLevel level;
 
diff --git a/src/main/java/org/spongepowered/common/mixin/realtime/world/ServerLevelMixin_RealTime.java b/src/main/java/org/spongepowered/common/mixin/realtime/world/ServerLevelMixin_RealTime.java
@@ -62,12 +62,12 @@
 import org.spongepowered.common.bridge.RealTimeTrackingBridge;
 
 @Mixin(ServerLevel.class)
-public abstract class WorldMixin_RealTime extends Level implements RealTimeTrackingBridge {
+public abstract class ServerLevelMixin_RealTime extends Level implements RealTimeTrackingBridge {
     @Shadow
     @Final
     private ServerLevelData serverLevelData;
 
-    protected WorldMixin_RealTime(WritableLevelData properties, ResourceKey<Level> registryRef, RegistryAccess registryManager, Holder<DimensionType> dimensionEntry, boolean isClient, boolean debugWorld, long seed, int maxChainedNeighborUpdates) {
+    protected ServerLevelMixin_RealTime(WritableLevelData properties, ResourceKey<Level> registryRef, RegistryAccess registryManager, Holder<DimensionType> dimensionEntry, boolean isClient, boolean debugWorld, long seed, int maxChainedNeighborUpdates) {
         super(properties, registryRef, registryManager, dimensionEntry, isClient, debugWorld, seed, maxChainedNeighborUpdates);
     }
 
diff --git a/src/main/java/org/spongepowered/common/mixin/realtime/world/dimension/PortalProcessorMixin_RealTime.java b/src/main/java/org/spongepowered/common/mixin/realtime/world/dimension/PortalProcessorMixin_RealTime.java
@@ -30,7 +30,7 @@
 import org.spongepowered.common.bridge.RealTimeTrackingBridge;
 
 @Mixin(PortalProcessor.class)
-public abstract class PortalManagerMixin_RealTime {
+public abstract class PortalProcessorMixin_RealTime {
     @Shadow
     private int portalTime;
 
diff --git a/src/main/resources/galaxy.mixin.json b/src/main/resources/galaxy.mixin.json
@@ -3,13 +3,13 @@
   "package": "one.oktw.galaxy.mixin.event",
   "compatibilityLevel": "JAVA_21",
   "mixins": [
-    "MixinPlayerAction_NetworkHandler",
-    "MixinPlayerChat_MeCommand",
-    "MixinPlayerChat_NetworkHandler",
+    "MixinPlayerAction_ServerGamePacketListener",
+    "MixinPlayerChat_EmoteCommands",
     "MixinPlayerChat_SayCommand",
-    "MixinPlayerInput_NetworkHandler",
-    "MixinPlayerInteractBlock_NetworkHandler",
-    "MixinPlayerInteractItem_NetworkHandler",
+    "MixinPlayerChat_ServerGamePacketListener",
+    "MixinPlayerInput_ServerGamePacketListener",
+    "MixinPlayerInteractBlock_ServerGamePacketListener",
+    "MixinPlayerInteractItem_ServerGamePacketListener",
     "MixinPlayerUseItemOnBlock_ItemStack"
   ],
   "client": [],
diff --git a/src/main/resources/sponge.realtime.mixin.json b/src/main/resources/sponge.realtime.mixin.json
@@ -8,20 +8,20 @@
     "blockentity.AbstractFurnaceBlockEntityMixin_RealTime",
     "blockentity.BrewingStandBlockEntityMixin_RealTime",
     "entity.EntityMixin_RealTime",
-    "entity.ExperienceOrbEntityMixin_RealTime",
+    "entity.ExperienceOrbMixin_RealTime",
     "entity.ItemEntityMixin_RealTime",
     "entity.LivingEntityMixin_RealTime",
-    "entity.mob.CreeperEntityMixin_RealTime",
-    "entity.mob.MobEntityMixin_RealTime",
-    "entity.mob.ZombieVillagerEntityMixin_RealTime",
-    "entity.passive.PassiveEntityMixin_RealTime",
-    "entity.player.ItemCooldownManagerMixin_RealTime",
-    "entity.player.PlayerEntityMixin_RealTime",
+    "entity.mob.CreeperMixin_RealTime",
+    "entity.mob.MobMixin_RealTime",
+    "entity.mob.ZombieVillagerMixin_RealTime",
+    "entity.passive.AgeableMobMixin_RealTime",
+    "entity.player.ItemCooldownsMixin_RealTime",
+    "entity.player.PlayerMixin_RealTime",
     "server.MinecraftServerMixin_RealTime",
-    "server.network.ServerPlayerInteractionManagerMixin_RealTime",
-    "server.network.ServerPlayNetworkHandlerMixin_RealTime",
-    "world.WorldMixin_RealTime",
-    "world.dimension.PortalManagerMixin_RealTime"
+    "server.network.ServerGamePacketListenerMixin_RealTime",
+    "server.network.ServerPlayerGameModeMixin_RealTime",
+    "world.ServerLevelMixin_RealTime",
+    "world.dimension.PortalProcessorMixin_RealTime"
   ],
   "server": [
   ],
diff --git a/src/main/resources/tweak.mixin.json b/src/main/resources/tweak.mixin.json
