diff options
4 files changed, 0 insertions, 111 deletions
diff --git a/src/main/java/gregtech/mixin/Mixin.java b/src/main/java/gregtech/mixin/Mixin.java index 2fb3e55350..8ead56bf44 100644 --- a/src/main/java/gregtech/mixin/Mixin.java +++ b/src/main/java/gregtech/mixin/Mixin.java @@ -1,7 +1,5 @@ package gregtech.mixin; -import static gregtech.mixin.TargetedMod.EXTRA_UTILITIES; -import static gregtech.mixin.TargetedMod.THAUMCRAFT; import static gregtech.mixin.TargetedMod.VANILLA; import java.util.ArrayList; @@ -47,26 +45,6 @@ public enum Mixin { .addTargetedMod(VANILLA) .setApplyIf(() -> true) .setPhase(Phase.EARLY) - .setSide(Side.BOTH)), - // Extra utilities - RemoveLastMilleniumRain(new Builder("Remove rain from the Last Millenium (Extra Utilities)") - .addMixinClasses("xu.WorldProviderEndOfTimeMixin") - .addTargetedMod(EXTRA_UTILITIES) - .setApplyIf(() -> ConfigHandler.enabledPatches[0]) - .setPhase(Phase.LATE) - .setSide(Side.BOTH)), - RemoveLastMilleniumCreatures(new Builder("Remove creatures from the Last Millenium (Extra Utilities)") - .addMixinClasses("xu.ChunkProviderEndOfTimeMixin") - .addTargetedMod(EXTRA_UTILITIES) - .setApplyIf(() -> ConfigHandler.enabledPatches[1]) - .setPhase(Phase.LATE) - .setSide(Side.BOTH)), - // Thaumcraft - PatchWandPedestalVisDuplication(new Builder("Fix wand pedestal vis duplication (Thaumcraft)") - .addMixinClasses("thaumcraft.TileWandPedestalMixin") - .addTargetedMod(THAUMCRAFT) - .setApplyIf(() -> ConfigHandler.enabledPatches[2]) - .setPhase(Phase.LATE) .setSide(Side.BOTH)); public static final Logger LOGGER = LogManager.getLogger("GregTech-Mixin"); 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; - } -} |