From e03d0be437076b6b962ca9fff5241bc6773a140c Mon Sep 17 00:00:00 2001
From: alongstringofnumbers <sjensen793@gmail.com>
Date: Mon, 4 Dec 2023 15:55:11 -0700
Subject: [PATCH] Rebase fixes

---
 addon.gradle                                    |  7 +++++--
 dependencies.gradle                             | 17 -----------------
 .../mixins/minecraft/RenderChunkMixin.java      |  3 +--
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/addon.gradle b/addon.gradle
index 4c6342bed07..5c26f20ab1d 100644
--- a/addon.gradle
+++ b/addon.gradle
@@ -1,15 +1,18 @@
 
 minecraft {
-    // Include the dep string version for addons to use
     injectedTags.put('DEP_VERSION_STRING', "required-after:gregtech@[${modVersion},);")
 }
 
 configurations {
-    compileClassPath {
+    implementation {
         // exclude GNU trove, FastUtil is superior and still updated
         exclude group: "net.sf.trove4j", module: "trove4j"
         // exclude javax.annotation from findbugs, jetbrains annotations are superior
         exclude group: "com.google.code.findbugs", module: "jsr305"
+        // exclude scala as we don't use it for anything and causes import confusion
+        exclude group: "org.scala-lang"
+        exclude group: "org.scala-lang.modules"
+        exclude group: "org.scala-lang.plugins"
     }
 }
 
diff --git a/dependencies.gradle b/dependencies.gradle
index a39119d1411..ee005344a2e 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -58,20 +58,3 @@ dependencies {
     // runtimeOnly rfg.deobf("curse.maven:gendustry-70492:2516215") // Gendustry 1.6.5.8
     // runtimeOnly rfg.deobf("curse.maven:bdlib-70496:2518031") // BdLib 1.14.3.12
 }
-
-minecraft {
-    injectedTags.put('DEP_VERSION_STRING', "required-after:gregtech@[${modVersion},);")
-}
-
-configurations {
-    implementation {
-        // exclude GNU trove, FastUtil is superior and still updated
-        exclude group: "net.sf.trove4j", module: "trove4j"
-        // exclude javax.annotation from findbugs, jetbrains annotations are superior
-        exclude group: "com.google.code.findbugs", module: "jsr305"
-        // exclude scala as we don't use it for anything and causes import confusion
-        exclude group: "org.scala-lang"
-        exclude group: "org.scala-lang.modules"
-        exclude group: "org.scala-lang.plugins"
-    }
-}
diff --git a/src/main/java/gregtech/mixins/minecraft/RenderChunkMixin.java b/src/main/java/gregtech/mixins/minecraft/RenderChunkMixin.java
index 75c6c494663..1977c49eeb0 100644
--- a/src/main/java/gregtech/mixins/minecraft/RenderChunkMixin.java
+++ b/src/main/java/gregtech/mixins/minecraft/RenderChunkMixin.java
@@ -7,11 +7,10 @@
 import net.minecraft.tileentity.TileEntity;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-import javax.annotation.Nullable;
-
 // TODO, error in log
 @Mixin(RenderChunk.class)
 public class RenderChunkMixin {