From 51b411765f7f840c95077c8ac3ba9c75f1275722 Mon Sep 17 00:00:00 2001
From: Jason Mitchell <mitchej@gmail.com>
Date: Mon, 24 Jun 2024 10:39:53 -0700
Subject: Move some mixins to hodgepodge (#2633)

* Move some mixins to hodgepodge
---
 .../late/thaumcraft/TileWandPedestalMixin.java     | 43 ----------------------
 .../late/xu/ChunkProviderEndOfTimeMixin.java       | 28 --------------
 .../late/xu/WorldProviderEndOfTimeMixin.java       | 18 ---------
 3 files changed, 89 deletions(-)
 delete mode 100644 src/main/java/gregtech/mixin/mixins/late/thaumcraft/TileWandPedestalMixin.java
 delete mode 100644 src/main/java/gregtech/mixin/mixins/late/xu/ChunkProviderEndOfTimeMixin.java
 delete mode 100644 src/main/java/gregtech/mixin/mixins/late/xu/WorldProviderEndOfTimeMixin.java

(limited to 'src/main/java/gregtech/mixin/mixins')

diff --git a/src/main/java/gregtech/mixin/mixins/late/thaumcraft/TileWandPedestalMixin.java b/src/main/java/gregtech/mixin/mixins/late/thaumcraft/TileWandPedestalMixin.java
deleted file mode 100644
index bfc79731e4..0000000000
--- a/src/main/java/gregtech/mixin/mixins/late/thaumcraft/TileWandPedestalMixin.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package gregtech.mixin.mixins.late.thaumcraft;
-
-import net.minecraft.inventory.ISidedInventory;
-import net.minecraft.item.ItemStack;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
-
-import thaumcraft.api.TileThaumcraft;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.IAspectContainer;
-import thaumcraft.common.items.baubles.ItemAmuletVis;
-import thaumcraft.common.items.wands.ItemWandCasting;
-import thaumcraft.common.tiles.TileWandPedestal;
-
-@Mixin(TileWandPedestal.class)
-public abstract class TileWandPedestalMixin extends TileThaumcraft implements ISidedInventory, IAspectContainer {
-
-    @WrapWithCondition(
-        method = "updateEntity",
-        at = @At(
-            value = "INVOKE",
-            target = "Lthaumcraft/common/items/wands/ItemWandCasting;addVis(Lnet/minecraft/item/ItemStack;Lthaumcraft/api/aspects/Aspect;IZ)I",
-            remap = false))
-    boolean gregtech$checkWandServerWorld(ItemWandCasting instance, ItemStack is, Aspect aspect, int amount,
-        boolean doit) {
-        return !this.worldObj.isRemote;
-    }
-
-    @WrapWithCondition(
-        method = "updateEntity",
-        at = @At(
-            value = "INVOKE",
-            target = "Lthaumcraft/common/items/baubles/ItemAmuletVis;addVis(Lnet/minecraft/item/ItemStack;Lthaumcraft/api/aspects/Aspect;IZ)I",
-            remap = false))
-    boolean gregtech$checkAmuletServerWorld(ItemAmuletVis instance, ItemStack is, Aspect aspect, int amount,
-        boolean doit) {
-        return !this.worldObj.isRemote;
-    }
-
-}
diff --git a/src/main/java/gregtech/mixin/mixins/late/xu/ChunkProviderEndOfTimeMixin.java b/src/main/java/gregtech/mixin/mixins/late/xu/ChunkProviderEndOfTimeMixin.java
deleted file mode 100644
index 2565e309f2..0000000000
--- a/src/main/java/gregtech/mixin/mixins/late/xu/ChunkProviderEndOfTimeMixin.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package gregtech.mixin.mixins.late.xu;
-
-import java.util.Collections;
-import java.util.List;
-
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.chunk.IChunkProvider;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-
-import com.rwtema.extrautils.worldgen.endoftime.ChunkProviderEndOfTime;
-
-@Mixin(ChunkProviderEndOfTime.class)
-@SuppressWarnings("unused")
-public abstract class ChunkProviderEndOfTimeMixin implements IChunkProvider {
-
-    /**
-     * @author bart
-     * @reason Disable creature spawning in the Last Millenium entirely
-     */
-    @Overwrite
-    public List<BiomeGenBase.SpawnListEntry> getPossibleCreatures(EnumCreatureType p_73155_1_, int p_73155_2_,
-        int p_73155_3_, int p_73155_4_) {
-        return Collections.emptyList();
-    }
-}
diff --git a/src/main/java/gregtech/mixin/mixins/late/xu/WorldProviderEndOfTimeMixin.java b/src/main/java/gregtech/mixin/mixins/late/xu/WorldProviderEndOfTimeMixin.java
deleted file mode 100644
index 3a063dc283..0000000000
--- a/src/main/java/gregtech/mixin/mixins/late/xu/WorldProviderEndOfTimeMixin.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package gregtech.mixin.mixins.late.xu;
-
-import net.minecraft.world.WorldProvider;
-import net.minecraft.world.chunk.Chunk;
-
-import org.spongepowered.asm.mixin.Mixin;
-
-import com.rwtema.extrautils.worldgen.endoftime.WorldProviderEndOfTime;
-
-@Mixin(WorldProviderEndOfTime.class)
-@SuppressWarnings("unused")
-public abstract class WorldProviderEndOfTimeMixin extends WorldProvider {
-
-    @Override
-    public boolean canDoRainSnowIce(Chunk chunk) {
-        return false;
-    }
-}
-- 
cgit