The UNDO action.

Author: jaimii

src/main/java/com/solarrabbit/largeraids/versioned/nms/CraftRaidWrapper.java

@@ -7,17 +7,14 @@
 import com.solarrabbit.largeraids.nms.AbstractCraftRaidWrapper;
 import com.solarrabbit.largeraids.nms.AbstractRaidWrapper;
 
-import net.minecraft.server.level.ServerLevel;
-
 import org.bukkit.Raid;
 import org.bukkit.craftbukkit.CraftRaid;
 
 public class CraftRaidWrapper extends AbstractCraftRaidWrapper {
-    private static MethodHandle raidHandle;
-    private static MethodHandle levelHandle;
+    private static MethodHandle handle;
 
     public CraftRaidWrapper(AbstractRaidWrapper nmsRaid) {
-        super(new CraftRaid(((RaidWrapper) nmsRaid).raid, ((RaidWrapper) nmsRaid).server));
+        super(new CraftRaid(((RaidWrapper) nmsRaid).raid));
     }
 
     public CraftRaidWrapper(Raid raid) {
@@ -27,26 +24,18 @@ public CraftRaidWrapper(Raid raid) {
     @Override
     public RaidWrapper getHandle() {
         net.minecraft.world.entity.raid.Raid nmsRaid;
-        net.minecraft.world.level.Level nmsLevel;
         try {
-            if (raidHandle == null) {
+            if (handle == null) {
                 Field field = CraftRaid.class.getDeclaredField("handle");
                 field.setAccessible(true);
-                raidHandle = MethodHandles.lookup().unreflectGetter(field);
-            }
-            if (levelHandle == null) {
-                Field field = CraftRaid.class.getDeclaredField("level");
-                field.setAccessible(true);
-                levelHandle = MethodHandles.lookup().unreflectGetter(field);
+                handle = MethodHandles.lookup().unreflectGetter(field);
             }
-            nmsRaid = (net.minecraft.world.entity.raid.Raid) raidHandle.invokeExact((CraftRaid) raid);
-            nmsLevel = (net.minecraft.world.level.Level) levelHandle.invokeExact((CraftRaid) raid);
+            nmsRaid = (net.minecraft.world.entity.raid.Raid) handle.invokeExact((CraftRaid) raid);
         } catch (Throwable e) {
             e.printStackTrace();
             nmsRaid = null;
-            nmsLevel = null;
         }
-        return new RaidWrapper(nmsRaid, (ServerLevel) nmsLevel);
+        return new RaidWrapper(nmsRaid);
     }
 
 }

src/main/java/com/solarrabbit/largeraids/versioned/nms/ProfessionWrapper.java

@@ -5,12 +5,10 @@
 import com.solarrabbit.largeraids.nms.AbstractPoiTypeWrapper;
 import com.solarrabbit.largeraids.nms.AbstractProfessionWrapper;
 
-import net.minecraft.core.Holder;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.entity.npc.VillagerProfession;
 
 public class ProfessionWrapper implements AbstractProfessionWrapper {
-    public static final ProfessionWrapper MASON = new ProfessionWrapper(BuiltInRegistries.VILLAGER_PROFESSION.getOrThrow(VillagerProfession.MASON).value());
+    public static final ProfessionWrapper MASON = new ProfessionWrapper(VillagerProfession.MASON);
     final VillagerProfession profession;
 
     ProfessionWrapper(VillagerProfession profession) {

src/main/java/com/solarrabbit/largeraids/versioned/nms/RaidWrapper.java

@@ -11,16 +11,13 @@
 
 import org.apache.commons.lang3.reflect.FieldUtils;
 
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.raid.Raid;
 
 public class RaidWrapper implements AbstractRaidWrapper {
     final Raid raid;
-    final ServerLevel server;
 
-    RaidWrapper(Raid raid, ServerLevel server) {
+    RaidWrapper(Raid raid) {
         this.raid = raid;
-        this.server = server;
     }
 
     @Override
@@ -74,18 +71,18 @@ public void setGroupsSpawned(int groupsSpawned) {
     @Override
     public void joinRaid(int i, AbstractRaiderWrapper raider, @Nullable AbstractBlockPositionWrapper blockPosition,
             boolean flag) {
-        raid.joinRaid(server, i, ((RaiderWrapper) raider).raider,
+        raid.joinRaid(i, ((RaiderWrapper) raider).raider,
                 blockPosition == null ? null : ((BlockPositionWrapper) blockPosition).blockPos, flag);
     }
 
     @Override
     public boolean addWaveMob(int wave, AbstractRaiderWrapper raider, boolean flag) {
-        return this.raid.addWaveMob(server, wave, ((RaiderWrapper) raider).raider, flag);
+        return this.raid.addWaveMob(wave, ((RaiderWrapper) raider).raider, flag);
     }
 
     @Override
     public void removeFromRaid(AbstractRaiderWrapper raider, boolean flag) {
-        this.raid.removeFromRaid(server, ((RaiderWrapper) raider).raider, flag);
+        this.raid.removeFromRaid(((RaiderWrapper) raider).raider, flag);
     }
 
     @Override

src/main/java/com/solarrabbit/largeraids/versioned/nms/RaiderWrapper.java

@@ -2,7 +2,6 @@
 
 import com.solarrabbit.largeraids.nms.AbstractRaiderWrapper;
 
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal;
 import net.minecraft.world.entity.raid.Raider;
@@ -16,7 +15,7 @@ public class RaiderWrapper implements AbstractRaiderWrapper {
 
     @Override
     public RaidWrapper getCurrentRaid() {
-        return new RaidWrapper(raider.getCurrentRaid(), (ServerLevel) raider.level());
+        return new RaidWrapper(raider.getCurrentRaid());
     }
 
     @Override

src/main/java/com/solarrabbit/largeraids/versioned/nms/RaidsWrapper.java

@@ -15,7 +15,7 @@ public class RaidsWrapper implements AbstractRaidsWrapper {
     @Override
     public RaidWrapper createOrExtendRaid(AbstractPlayerEntityWrapper player) {
         return new RaidWrapper(this.raids.createOrExtendRaid(((PlayerEntityWrapper) player).player,
-            ((PlayerEntityWrapper) player).player.blockPosition()), ((PlayerEntityWrapper) player).player.serverLevel());
+                ((PlayerEntityWrapper) player).player.blockPosition()));
     }
 
     @Override

src/main/java/com/solarrabbit/largeraids/versioned/nms/WorldServerWrapper.java

@@ -14,7 +14,7 @@ public class WorldServerWrapper implements AbstractWorldServerWrapper {
 
     @Override
     public RaidWrapper getRaidAt(AbstractBlockPositionWrapper blockPos) {
-        return new RaidWrapper(this.server.getRaidAt(((BlockPositionWrapper) blockPos).blockPos), this.server);
+        return new RaidWrapper(this.server.getRaidAt(((BlockPositionWrapper) blockPos).blockPos));
     }
 
     @Override