From 3f4a29a391927f228a237731bfdbc8ee3e7b7da7 Mon Sep 17 00:00:00 2001
From: FalsePattern <30945458+FalsePattern@users.noreply.github.com>
Date: Tue, 27 Dec 2022 21:22:47 +0100
Subject: [PATCH] get rid of these two, already patched by the universal
 tweaker

---
 .../ChunkProviderCavePlanetMixin.java         | 46 -------------------
 .../arocketry/ChunkProviderPlanetMixin.java   | 26 -----------
 .../endlessids/mixin/plugin/Mixin.java        |  2 -
 3 files changed, 74 deletions(-)
 delete mode 100644 src/main/java/com/falsepattern/endlessids/mixin/mixins/common/arocketry/ChunkProviderCavePlanetMixin.java
 delete mode 100644 src/main/java/com/falsepattern/endlessids/mixin/mixins/common/arocketry/ChunkProviderPlanetMixin.java

diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/arocketry/ChunkProviderCavePlanetMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/arocketry/ChunkProviderCavePlanetMixin.java
deleted file mode 100644
index 480daac..0000000
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/arocketry/ChunkProviderCavePlanetMixin.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.falsepattern.endlessids.mixin.mixins.common.arocketry;
-
-import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper;
-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.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
-import zmaster587.advancedRocketry.world.ChunkProviderCavePlanet;
-import zmaster587.advancedRocketry.world.ChunkProviderPlanet;
-
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.chunk.Chunk;
-
-@Mixin(value = ChunkProviderCavePlanet.class,
-       remap = false)
-public abstract class ChunkProviderCavePlanetMixin {
-    private BiomeGenBase[] bgb;
-
-    @Inject(method = "provideChunk",
-            at = @At(value = "INVOKE",
-                     target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B",
-                     shift = At.Shift.BEFORE,
-                     remap = true),
-            remap = true,
-            locals = LocalCapture.CAPTURE_FAILHARD,
-            require = 1)
-    private void setBiomesTweaked1(int p_73154_1_, int p_73154_2_, CallbackInfoReturnable<Chunk> cir, ChunkProviderPlanet.BlockMetacoupling ablock, BiomeGenBase[] abiomegenbase, Chunk chunk) {
-        bgb = abiomegenbase;
-    }
-
-    @Redirect(method = "provideChunk",
-              at = @At(value = "INVOKE",
-                       target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B",
-                       remap = true),
-              remap = true,
-              require = 1)
-    private byte[] setBiomesTweaked2(Chunk chunk) {
-        try {
-            return BiomePatchHelper.getBiomeArrayTweaked(chunk, bgb);
-        } finally {
-            bgb = null;
-        }
-    }
-}
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/arocketry/ChunkProviderPlanetMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/arocketry/ChunkProviderPlanetMixin.java
deleted file mode 100644
index 52f9f37..0000000
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/arocketry/ChunkProviderPlanetMixin.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.falsepattern.endlessids.mixin.mixins.common.arocketry;
-
-import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-import zmaster587.advancedRocketry.world.ChunkProviderPlanet;
-
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.chunk.Chunk;
-
-@Mixin(value = ChunkProviderPlanet.class,
-       remap = false)
-public abstract class ChunkProviderPlanetMixin {
-    @Shadow
-    private BiomeGenBase[] biomesForGeneration;
-    @Redirect(method = "provideChunk",
-              at = @At(value = "INVOKE",
-                       target = "Lnet/minecraft/world/chunk/Chunk;getBiomeArray()[B",
-                       remap = true),
-              remap = true)
-    private byte[] setBiomesTweaked(Chunk chunk) {
-        return BiomePatchHelper.getBiomeArrayTweaked(chunk, biomesForGeneration);
-    }
-}
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java
index d346cb1..bf9881d 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java
@@ -59,8 +59,6 @@ public enum Mixin implements IMixin {
     //endregion AbyssalCraft->common
     //region AdvancedRocketry->common
     AdvancedRocketryMixin(Side.COMMON, require(TargetedMod.AROCKETRY), "arocketry.AdvancedRocketryMixin"),
-    ARocketryChunkProviderCavePlanetMixin(Side.COMMON, require(TargetedMod.AROCKETRY), "arocketry.ChunkProviderCavePlanetMixin"),
-    ARocketryChunkProviderPlanetMixin(Side.COMMON, require(TargetedMod.AROCKETRY), "arocketry.ChunkProviderPlanetMixin"),
     ARocketryChunkProviderSpaceMixin(Side.COMMON, require(TargetedMod.AROCKETRY), "arocketry.ChunkProviderSpaceMixin"),
     //endregion AdvancedRocketry->common
     //region ATG->common