refactor: move from accessor to access transformer

GTNewHorizons · Sep 1, 2024 · eb80e93 · eb80e93
1 parent ae15db4
commit eb80e93
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java b/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java
@@ -846,9 +846,6 @@ public enum Mixins {
             .setApplyIf(() -> FixesConfig.fixCandycraftBlockSugarNPE).addTargetedMod(TargetedMod.CANDYCRAFT)),
 
     // Morpheus
-    FIX_NOT_WAKING_PLAYERS_ACCESSOR(new Builder("WorldServer Accessor for Morpheus waking fix")
-            .addMixinClasses("minecraft.WorldServerAccessor").setPhase(Phase.EARLY).setSide(Side.SERVER)
-            .setApplyIf(() -> FixesConfig.fixMorpheusWaking).addTargetedMod(TargetedMod.VANILLA)),
     FIX_NOT_WAKING_PLAYERS(new Builder("Fix players not being woken properly when not everyone is sleeping")
             .addMixinClasses("morpheus.MixinMorpheusWakePlayers").setPhase(Phase.LATE).setSide(Side.SERVER)
             .setApplyIf(() -> FixesConfig.fixMorpheusWaking).addTargetedMod(TargetedMod.MORPHEUS));

diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/WorldServerAccessor.java b/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/WorldServerAccessor.java
diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/morpheus/MixinMorpheusWakePlayers.java b/src/main/java/com/mitchej123/hodgepodge/mixins/late/morpheus/MixinMorpheusWakePlayers.java
@@ -1,15 +1,14 @@
 package com.mitchej123.hodgepodge.mixins.late.morpheus;
 
 import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
 import net.quetzi.morpheus.SleepChecker;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import com.mitchej123.hodgepodge.mixins.early.minecraft.WorldServerAccessor;
-
 @Mixin(value = SleepChecker.class, remap = false)
 public class MixinMorpheusWakePlayers {
 
@@ -21,8 +20,8 @@ public class MixinMorpheusWakePlayers {
                     shift = At.Shift.BEFORE),
             cancellable = true)
     public void hodgepodge$fixWakePlayers(World world, CallbackInfo c) {
-        if (!(world instanceof WorldServerAccessor worldServer)) return;
-        worldServer.hodgepodge$wakeAllPlayers();
+        if (!(world instanceof WorldServer worldServer)) return;
+        worldServer.wakeAllPlayers();
         c.cancel();
     }
 }
diff --git a/src/main/resources/META-INF/hodgepodge_at.cfg b/src/main/resources/META-INF/hodgepodge_at.cfg
@@ -19,3 +19,4 @@ public net.minecraft.client.resources.AbstractResourcePack field_110597_b # reso
 public net.minecraft.client.resources.FallbackResourceManager field_110540_a # resourcePacks
 public net.minecraft.client.resources.FileResourcePack field_110600_d # resourcePackZipFile
 public net.minecraft.client.resources.SimpleReloadableResourceManager field_110548_a # domainResourceManagers
+public net.minecraft.world.WorldServer func_73053_d()V # wakeAllPlayers()