Resolved lombok issue

This commit is contained in:
Johann Bernhardt committed 2021-12-18 11:40:56 +01:00
1 parent d05e019479
commit feef5a4e3a
6 files changed
+54 -10

No files matched your search

+4
View File
@@ -0,0 +1,4 @@
compileJava {
options.encoding = "UTF-8"
}
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
-4
View File
@@ -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"
}
+1 -1
View File
@@ -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;
@@ -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;