From feef5a4e3a79f56f4c836ab96c5335e8c39461ea Mon Sep 17 00:00:00 2001
From: Johann Bernhardt <johann.bernhardt@tum.de>
Date: Sat, 18 Dec 2021 11:40:56 +0100
Subject: [PATCH] Resolved lombok issue

---
 addon.gradle                                  |  4 ++
 dependencies.gradle                           |  2 +-
 gradle.properties                             |  4 +-
 repositories.gradle                           |  4 --
 src/main/java/team/chisel/ctmlib/CTMLib.java  |  2 +-
 .../team/chisel/ctmlib/TextureSubmap.java     | 48 ++++++++++++++++++-
 6 files changed, 54 insertions(+), 10 deletions(-)
 create mode 100644 addon.gradle

diff --git a/addon.gradle b/addon.gradle
new file mode 100644
index 00000000..001c682b
--- /dev/null
+++ b/addon.gradle
@@ -0,0 +1,4 @@
+
+compileJava {
+    options.encoding = "UTF-8"
+}
diff --git a/dependencies.gradle b/dependencies.gradle
index 66afde2c..cef4285e 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -3,7 +3,7 @@
 dependencies {
     compile("com.github.GTNewHorizons:NotEnoughItems:master-SNAPSHOT:dev")
 
-    compile("team.chisel.ctmlib:CTMLib:MC1.7.10-1.4.1.5")
+    compile("org.projectlombok:lombok:1.16.4")
 
     compileOnly("com.github.GTNewHorizons:waila:master-SNAPSHOT:dev") {
         transitive = false
diff --git a/gradle.properties b/gradle.properties
index 0ec135e1..3bb5c436 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ modName = Chisel
 # This is a case-sensitive string to identify your mod. Convention is to use lower case.
 modId = chisel
 
-modGroup = team.chisel
+modGroup = com.cricketcraft.chisel
 
 # WHY is there no version field?
 # The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
@@ -35,7 +35,7 @@ gradleTokenGroupName =
 # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can
 # leave this property empty.
 # Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
-apiPackage =
+apiPackage = api
 
 # Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/
 # Example value: mymodid_at.cfg
diff --git a/repositories.gradle b/repositories.gradle
index 9d2d0031..f717fc3a 100644
--- a/repositories.gradle
+++ b/repositories.gradle
@@ -1,10 +1,6 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
-    maven {
-        name 'Chisel Repo'
-        url "http://maven.tterrag.com/"
-    }
     maven {
         url "https://cursemaven.com"
     }
diff --git a/src/main/java/team/chisel/ctmlib/CTMLib.java b/src/main/java/team/chisel/ctmlib/CTMLib.java
index 5ec1ec37..96c270d6 100644
--- a/src/main/java/team/chisel/ctmlib/CTMLib.java
+++ b/src/main/java/team/chisel/ctmlib/CTMLib.java
@@ -4,7 +4,7 @@ import cpw.mods.fml.common.ModAPIManager;
 
 public class CTMLib {
 	
-	public static final String VERSION = "GRADLETOKEN_VERSION";
+	public static final String VERSION = "1.4.1";
 
 	private static boolean chiselPresent, chiselInitialized;
 
diff --git a/src/main/java/team/chisel/ctmlib/TextureSubmap.java b/src/main/java/team/chisel/ctmlib/TextureSubmap.java
index a2a43473..09af61a5 100644
--- a/src/main/java/team/chisel/ctmlib/TextureSubmap.java
+++ b/src/main/java/team/chisel/ctmlib/TextureSubmap.java
@@ -4,7 +4,6 @@ import java.util.List;
 
 import org.apache.commons.lang3.ArrayUtils;
 
-import lombok.experimental.Delegate;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.MinecraftForge;
@@ -27,7 +26,7 @@ public class TextureSubmap implements IIcon, ISubmap {
 	}
 
 	private int width, height;
-	@Delegate
+
 	private IIcon baseIcon;
 
 	protected IIcon[][] icons;
@@ -111,6 +110,51 @@ public class TextureSubmap implements IIcon, ISubmap {
 		}
 	}
 
+	@Override
+	public int getIconWidth() {
+		return baseIcon.getIconWidth();
+	}
+
+	@Override
+	public int getIconHeight() {
+		return baseIcon.getIconHeight();
+	}
+
+	@Override
+	public float getMinU() {
+		return baseIcon.getMinU();
+	}
+
+	@Override
+	public float getMaxU() {
+		return baseIcon.getMaxU();
+	}
+
+	@Override
+	public float getInterpolatedU(double p_94214_1_) {
+		return baseIcon.getInterpolatedU(p_94214_1_);
+	}
+
+	@Override
+	public float getMinV() {
+		return baseIcon.getMinV();
+	}
+
+	@Override
+	public float getMaxV() {
+		return baseIcon.getMaxV();
+	}
+
+	@Override
+	public float getInterpolatedV(double p_94207_1_) {
+		return baseIcon.getInterpolatedV(p_94207_1_);
+	}
+
+	@Override
+	public String getIconName() {
+		return baseIcon.getIconName();
+	}
+
 	private class TextureVirtual implements IIcon {
 
 		private int width, height;