remove this due to gamerule already impl this

3 files changed, 0 insertions, 48 deletions

diff --git a/src/main/java/com/keuin/ohmyvanillamc/mixin/DisablePhantomSpawning.java b/src/main/java/com/keuin/ohmyvanillamc/mixin/DisablePhantomSpawning.java
deleted file mode 100644
index d14fc3e..0000000
--- a/src/main/java/com/keuin/ohmyvanillamc/mixin/DisablePhantomSpawning.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.keuin.ohmyvanillamc.mixin;
-
-import com.keuin.ohmyvanillamc.OhMyVanillaMinecraft;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.world.gen.PhantomSpawner;
-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.CallbackInfoReturnable;
-
-@Mixin(PhantomSpawner.class)
-public class DisablePhantomSpawning {
-    /**
-     * Disable phantom spawning
-     * @author trueKeuin
-     */
-    @Inject(method = "spawn", at = @At("HEAD"), cancellable = true)
-    public void spawn(ServerWorld serverWorld, boolean spawnMonsters, boolean spawnAnimals, CallbackInfoReturnable<Integer> cir) {
-        if (OhMyVanillaMinecraft.getConfiguration().isDisablePhantomSpawning())
-            cir.setReturnValue(0);
-    }
-}
diff --git a/src/main/java/com/keuin/ohmyvanillamc/mixin/DisableWanderingTraderSpawning.java b/src/main/java/com/keuin/ohmyvanillamc/mixin/DisableWanderingTraderSpawning.java
deleted file mode 100644
index 3af7941..0000000
--- a/src/main/java/com/keuin/ohmyvanillamc/mixin/DisableWanderingTraderSpawning.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.keuin.ohmyvanillamc.mixin;
-
-import com.keuin.ohmyvanillamc.OhMyVanillaMinecraft;
-import net.minecraft.world.WanderingTraderManager;
-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.CallbackInfoReturnable;
-
-@Mixin(WanderingTraderManager.class)
-public class DisableWanderingTraderSpawning {
-    /**
-     * Disable ticking
-     *
-     * @author trueKeuin
-     */
-    @Inject(method = "spawn", at = @At("HEAD"), cancellable = true)
-    public void tick(CallbackInfoReturnable<Integer> ci) {
-        if (OhMyVanillaMinecraft.getConfiguration().isDisableWanderingTraderSpawning()) {
-            ci.setReturnValue(0);
-            ci.cancel();
-        }
-    }
-}
diff --git a/src/main/resources/ohmyvanillamc.mixins.json b/src/main/resources/ohmyvanillamc.mixins.json
index 24537c7..3a5d935 100644
--- a/src/main/resources/ohmyvanillamc.mixins.json
+++ b/src/main/resources/ohmyvanillamc.mixins.json
@@ -6,8 +6,6 @@
   "mixins": [
     "DisableEntityTrackerEntrySpamming",
     "DisableFishSchooling",
-    "DisablePhantomSpawning",
-    "DisableWanderingTraderSpawning",
     "ReintroduceLlamaItemDuping",
     "Mc113809SugarCaneBlockMixin",
     "Mc113809CactusBlockMixin",