From b820a8af28679e9239d4a4833b5ef0d4d9d941c8 Mon Sep 17 00:00:00 2001
From: FalsePattern <30945458+FalsePattern@users.noreply.github.com>
Date: Fri, 1 Jul 2022 11:27:14 +0200
Subject: [PATCH] deobfuscate dependencies

---
 dependencies.gradle                           | 31 +++++++------------
 .../ubc/BiomeUndergroundDecoratorMixin.java   |  6 ++--
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 14329d6..93a8438 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,3 +1,10 @@
+def deobfMaven(mavenDep) {
+    String[] parts = mavenDep.split(":")
+    parts[0] = parts[0].replace('.', '/')
+    //If this is down, replace with https://cursemaven.com/
+    return deobf("https://cursemaven.falsepattern.com/" + parts[0] + "/" + parts[1] + "/" + parts[2] + "/" + parts[1] + "-" + parts[2] + ".jar")
+}
+
 dependencies {
     compileOnly("org.projectlombok:lombok:1.18.22") {
         transitive = false
@@ -6,23 +13,9 @@ dependencies {
 
     compile("com.falsepattern:falsepatternlib-mc1.7.10:0.8.2:dev")
 
-    compileOnly("curse.maven:undergroundbiomesconstructs-72744:2304497") {
-        transitive = false
-    }
-
-    compileOnly("curse.maven:more-fun-quicksand-mod-321960:2717318") {
-        transitive = false
-    }
-
-    compileOnly("curse.maven:worldedit-225608:2309699") {
-        transitive = false
-    }
-
-    compileOnly("curse.maven:cofh-lib-220333:2388747") {
-        transitive = false
-    }
-
-    compileOnly("curse.maven:dragonapi-235591:3574508") {
-        transitive = false
-    }
+    compileOnly(deobfMaven("curse.maven:undergroundbiomesconstructs-72744:2304497")) // 0.8-beta49
+    compileOnly(deobfMaven("curse.maven:more-fun-quicksand-mod-321960:2717318")) // 1.0.8.8-fixed
+    compileOnly(deobfMaven("curse.maven:worldedit-225608:2309699")) // 6.1.1
+    compileOnly("curse.maven:cofh-lib-220333:2388748") // 1.2.1-185-dev
+    compileOnly(deobfMaven("curse.maven:dragonapi-235591:3574508")) // V31b
 }
diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ubc/BiomeUndergroundDecoratorMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ubc/BiomeUndergroundDecoratorMixin.java
index 950e502..3ba983c 100644
--- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ubc/BiomeUndergroundDecoratorMixin.java
+++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ubc/BiomeUndergroundDecoratorMixin.java
@@ -16,7 +16,7 @@ public abstract class BiomeUndergroundDecoratorMixin {
 
     @Redirect(method = {"replaceChunkOres(IILnet/minecraft/world/World;)V", "replaceChunkOres(Lnet/minecraft/world/chunk/IChunkProvider;II)V"},
               at = @At(value = "INVOKE",
-                       target = "Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;func_76658_g()[B"),
+                       target = "Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;getBlockLSBArray()[B"),
               require = 2)
     private byte[] returnMSBasLSB(ExtendedBlockStorage instance) {
         if (ebs == null) ebs = new ThreadLocal<>();
@@ -27,7 +27,7 @@ public abstract class BiomeUndergroundDecoratorMixin {
 
     @Redirect(method = {"replaceChunkOres(IILnet/minecraft/world/World;)V", "replaceChunkOres(Lnet/minecraft/world/chunk/IChunkProvider;II)V"},
               at = @At(value = "INVOKE",
-                       target = "Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;func_76660_i()Lnet/minecraft/world/chunk/NibbleArray;"),
+                       target = "Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;getBlockMSBArray()Lnet/minecraft/world/chunk/NibbleArray;"),
               require = 4)
     private NibbleArray returnFakeArray(ExtendedBlockStorage instance) {
         return fakeArray == null ? (fakeArray = new NibbleArray(4096, 4)) : fakeArray;
@@ -35,7 +35,7 @@ public abstract class BiomeUndergroundDecoratorMixin {
 
     @Redirect(method = {"replaceChunkOres(IILnet/minecraft/world/World;)V", "replaceChunkOres(Lnet/minecraft/world/chunk/IChunkProvider;II)V"},
               at = @At(value = "INVOKE",
-                       target = "Lnet/minecraft/world/chunk/NibbleArray;func_76582_a(III)I"),
+                       target = "Lnet/minecraft/world/chunk/NibbleArray;get(III)I"),
               require = 2)
     private int returnRestOfID(NibbleArray instance, int x, int y, int z) {
         return ebs.get().getLSB()[y << 8 | z << 4 | x] & 0xFFFF;