Compare commits

..
4 Commits
16 changed files with 113 additions and 39 deletions

No files matched your search

+1
View File
@@ -1,4 +1,5 @@
// Add your dependencies here // Add your dependencies here
dependencies { dependencies {
shadowImplementation("com.github.GTNewHorizons:GTNHLib:0.11.5")
} }
+1 -1
View File
@@ -133,7 +133,7 @@ forceEnableMixins = false
# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your # If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your
# responsibility to check the license and request permission for distribution if required. # responsibility to check the license and request permission for distribution if required.
usesShadowedDependencies = false usesShadowedDependencies = true
# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access # If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access
# their own classes, making the minimization unreliable. # their own classes, making the minimization unreliable.
+10 -10
View File
@@ -1,12 +1,12 @@
#This file is generated by updateDaemonJvm #This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/46949723aaa20c7b64d7ecfed7207034/redirect toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d4fd992c9557644e637ebe98263e0ae7/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/f636c800fdb3f9ae33f019dfa048ba72/redirect toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/59a9771cad43219260d9aac9a8ec4d6a/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1e91f45234d88a64dafb961c93ddc75a/redirect toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a4c09dd2e2d7079373d30e524bbc2829/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/552c7bffe0370c66410a51c55985b511/redirect toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
toolchainVersion=25 toolchainVersion=25
Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
Vendored
+1 -1
View File
@@ -57,7 +57,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
+1 -1
View File
@@ -17,7 +17,7 @@ pluginManagement {
} }
plugins { plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.21' id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24'
} }
@@ -36,6 +36,7 @@ import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import codechicken.core.launch.CodeChickenCorePlugin; import codechicken.core.launch.CodeChickenCorePlugin;
import codechicken.lib.colour.ColorUtils;
import codechicken.lib.gui.GuiDraw; import codechicken.lib.gui.GuiDraw;
import codechicken.lib.vec.Rectangle4i; import codechicken.lib.vec.Rectangle4i;
import cpw.mods.fml.client.GuiModList; import cpw.mods.fml.client.GuiModList;
@@ -148,10 +149,12 @@ public class GuiModListScroll {
double dy = scroll % (height + 20); double dy = scroll % (height + 20);
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glTranslated(0, -dy, 0); GL11.glTranslated(0, -dy, 0);
GuiDraw.fontRenderer.drawSplitString(description, x1, y1draw, x2 - x1, 0xDDDDDD); GuiDraw.fontRenderer
.drawSplitString(description, x1, y1draw, x2 - x1, ColorUtils.modDescriptionText.getColor());
if (needsScroll) { if (needsScroll) {
GL11.glTranslated(0, height + 20, 0); GL11.glTranslated(0, height + 20, 0);
GuiDraw.fontRenderer.drawSplitString(description, x1, y1draw, x2 - x1, 0xDDDDDD); GuiDraw.fontRenderer
.drawSplitString(description, x1, y1draw, x2 - x1, ColorUtils.modDescriptionText.getColor());
} }
GL11.glPopMatrix(); GL11.glPopMatrix();
@@ -65,7 +65,6 @@ public class CodeChickenCoreModContainer extends DummyModContainer {
public void init(FMLInitializationEvent event) { public void init(FMLInitializationEvent event) {
if (event.getSide().isClient()) { if (event.getSide().isClient()) {
ClientUtils.enhanceSupportersList("CodeChickenCore"); ClientUtils.enhanceSupportersList("CodeChickenCore");
FMLCommonHandler.instance().bus().register(new CCCEventHandler()); FMLCommonHandler.instance().bus().register(new CCCEventHandler());
MinecraftForge.EVENT_BUS.register(new CCCEventHandler()); MinecraftForge.EVENT_BUS.register(new CCCEventHandler());
} }
@@ -6,6 +6,8 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import codechicken.lib.colour.ColorUtils;
public class GuiCCButton extends GuiWidget { public class GuiCCButton extends GuiWidget {
public String text; public String text;
@@ -73,7 +75,9 @@ public class GuiCCButton extends GuiWidget {
} }
public int getTextColour(int mousex, int mousey) { public int getTextColour(int mousex, int mousey) {
return !isEnabled ? 0xFFA0A0A0 : pointInside(mousex, mousey) ? 0xFFFFFFA0 : 0xFFE0E0E0; return !isEnabled ? ColorUtils.buttonTextDisabled.getColor()
: pointInside(mousex, mousey) ? ColorUtils.buttonTextHover.getColor()
: ColorUtils.buttonText.getColor();
} }
public GuiCCButton setActionCommand(String string) { public GuiCCButton setActionCommand(String string) {
@@ -5,6 +5,8 @@ import net.minecraft.util.ChatAllowedCharacters;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import codechicken.lib.colour.ColorUtils;
public class GuiCCTextField extends GuiWidget { public class GuiCCTextField extends GuiWidget {
private String text; private String text;
@@ -120,8 +122,8 @@ public class GuiCCTextField extends GuiWidget {
} }
public void drawBackground() { public void drawBackground() {
drawRect(x - 1, y - 1, x + width + 1, y + height + 1, 0xffa0a0a0); drawRect(x - 1, y - 1, x + width + 1, y + height + 1, ColorUtils.textFieldBorder.getColor());
drawRect(x, y, x + width, y + height, 0xff000000); drawRect(x, y, x + width, y + height, ColorUtils.textFieldBackground.getColor());
} }
public String getDrawText() { public String getDrawText() {
@@ -135,7 +137,7 @@ public class GuiCCTextField extends GuiWidget {
} }
public int getTextColour() { public int getTextColour() {
return isEnabled ? 0xe0e0e0 : 0x707070; return isEnabled ? ColorUtils.textFieldText.getColor() : ColorUtils.textFieldTextDisabled.getColor();
} }
public GuiCCTextField setMaxStringLength(int i) { public GuiCCTextField setMaxStringLength(int i) {
@@ -3,6 +3,7 @@ package codechicken.core.gui;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Rectangle; import java.awt.Rectangle;
import codechicken.lib.colour.ColorUtils;
import codechicken.lib.math.MathHelper; import codechicken.lib.math.MathHelper;
import codechicken.lib.vec.Rectangle4i; import codechicken.lib.vec.Rectangle4i;
@@ -184,28 +185,29 @@ public abstract class GuiScrollPane extends GuiWidget {
} }
public void drawBackground(float frame) { public void drawBackground(float frame) {
drawRect(x, y, x + width, y + height, 0xff000000); drawRect(x, y, x + width, y + height, ColorUtils.scrollPaneBackground.getColor());
} }
public abstract void drawContent(int mx, int my, float frame); public abstract void drawContent(int mx, int my, float frame);
public void drawOverlay(float frame) { public void drawOverlay(float frame) {
// outlines // outlines
drawRect(x, y - 1, x + width, y, 0xffa0a0a0); // top drawRect(x, y - 1, x + width, y, ColorUtils.scrollPaneOverlayTop.getColor());
drawRect(x, y + height, x + width, y + height + 1, 0xffa0a0a0); // bottom drawRect(x, y + height, x + width, y + height + 1, ColorUtils.scrollPaneOverlayBottom.getColor());
drawRect(x - 1, y - 1, x, y + height + 1, 0xffa0a0a0); // left drawRect(x - 1, y - 1, x, y + height + 1, ColorUtils.scrollPaneOverlayLeft.getColor());
drawRect(x + width, y - 1, x + width + 1, y + height + 1, 0xffa0a0a0); // right drawRect(x + width, y - 1, x + width + 1, y + height + 1, ColorUtils.scrollPaneOverlayRight.getColor());
} }
public void drawScrollbar(float frame) { public void drawScrollbar(float frame) {
Rectangle r = scrollbarBounds(); Rectangle r = scrollbarBounds();
drawRect(r.x, r.y, r.x + r.width, r.y + r.height, 0xFF8B8B8B); // corners drawRect(r.x, r.y, r.x + r.width, r.y + r.height, ColorUtils.scrollbarCorners.getColor());
drawRect(r.x, r.y, r.x + r.width - 1, r.y + r.height - 1, 0xFFF0F0F0); // topleft up drawRect(r.x, r.y, r.x + r.width - 1, r.y + r.height - 1, ColorUtils.scrollbarTopLeft.getColor());
drawRect(r.x + 1, r.y + 1, r.x + r.width, r.y + r.height, 0xFF555555); // bottom right down drawRect(r.x + 1, r.y + 1, r.x + r.width, r.y + r.height, ColorUtils.scrollbarBottomRight.getColor());
drawRect(r.x + 1, r.y + 1, r.x + r.width - 1, r.y + r.height - 1, 0xFFC6C6C6); // scrollbar drawRect(r.x + 1, r.y + 1, r.x + r.width - 1, r.y + r.height - 1, ColorUtils.scrollbarFill.getColor());
int algn = scrollbarGuideAlignment(); int algn = scrollbarGuideAlignment();
if (algn != 0) drawRect(algn > 0 ? r.x + r.width : r.x - 1, y, r.x, y + height, 0xFF808080); // lineguide if (algn != 0)
drawRect(algn > 0 ? r.x + r.width : r.x - 1, y, r.x, y + height, ColorUtils.scrollbarGuide.getColor());
} }
} }
@@ -2,6 +2,7 @@ package codechicken.lib.asm;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import net.minecraft.launchwrapper.IClassTransformer; import net.minecraft.launchwrapper.IClassTransformer;
import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.Launch;
@@ -107,6 +108,7 @@ public class ClassHeirachyManager implements IClassTransformer {
private static class ClassInfo { private static class ClassInfo {
public static final ClassInfo OBJECT = new ClassInfo(); public static final ClassInfo OBJECT = new ClassInfo();
private static final Map<String, String> STRING_POOL = new ConcurrentHashMap<>(256);
public final String superclass; public final String superclass;
public final String[] interfaces; public final String[] interfaces;
@@ -125,7 +127,7 @@ public class ClassHeirachyManager implements IClassTransformer {
superclass = "java.lang.Object"; superclass = "java.lang.Object";
parent = OBJECT; parent = OBJECT;
} else { } else {
superclass = toKey(superName); superclass = pool(toKey(superName));
} }
if (interfaces == null || interfaces.length == 0) { if (interfaces == null || interfaces.length == 0) {
@@ -133,7 +135,7 @@ public class ClassHeirachyManager implements IClassTransformer {
} else { } else {
this.interfaces = new String[interfaces.length]; this.interfaces = new String[interfaces.length];
for (int i = 0; i < interfaces.length; i++) { for (int i = 0; i < interfaces.length; i++) {
this.interfaces[i] = toKey(interfaces[i]); this.interfaces[i] = pool(toKey(interfaces[i]));
} }
} }
} }
@@ -148,7 +150,7 @@ public class ClassHeirachyManager implements IClassTransformer {
this.superclass = "java.lang.Object"; this.superclass = "java.lang.Object";
this.parent = OBJECT; this.parent = OBJECT;
} else { } else {
this.superclass = toKey(superclass.getName()); this.superclass = pool(toKey(superclass.getName()));
} }
} }
final Class<?>[] interfaces = aclass.getInterfaces(); final Class<?>[] interfaces = aclass.getInterfaces();
@@ -157,7 +159,7 @@ public class ClassHeirachyManager implements IClassTransformer {
} else { } else {
this.interfaces = new String[interfaces.length]; this.interfaces = new String[interfaces.length];
for (int i = 0; i < interfaces.length; i++) { for (int i = 0; i < interfaces.length; i++) {
this.interfaces[i] = toKey(interfaces[i].getName()); this.interfaces[i] = pool(toKey(interfaces[i].getName()));
} }
} }
} }
@@ -172,5 +174,9 @@ public class ClassHeirachyManager implements IClassTransformer {
this.parent = parentInfo; this.parent = parentInfo;
return parentInfo.hasSuper(superclass); return parentInfo.hasSuper(superclass);
} }
private static String pool(String s) {
return STRING_POOL.computeIfAbsent(s, Function.identity());
}
} }
} }
@@ -0,0 +1,38 @@
package codechicken.lib.colour;
import com.gtnewhorizon.gtnhlib.color.ColorResource;
public class ColorUtils {
private static final ColorResource.Factory color = new ColorResource.Factory("codechickencore");
public static final ColorResource
// spotless:off
textFieldText = color.rgb("textFieldText", "0xE0E0E0"),
textFieldTextDisabled = color.rgb("textFieldTextDisabled", "0x707070"),
itemQuantityText = color.rgb("itemQuantityText", "0xFFFFFF"),
modDescriptionText = color.rgb("modDescriptionText", "0xDDDDDD"),
buttonTextDisabled = color.argb("buttonTextDisabled", "0xFFA0A0A0"),
buttonTextHover = color.argb("buttonTextHover", "0xFFFFFFA0"),
buttonText = color.argb("buttonText", "0xFFE0E0E0"),
textFieldBorder = color.argb("textFieldBorder", "0xFFA0A0A0"),
textFieldBackground = color.argb("textFieldBackground", "0xFF000000"),
scrollPaneBackground = color.argb("background", "0xFF000000"),
scrollPaneOverlayTop = color.argb("overlayTop", "0xFFA0A0A0"),
scrollPaneOverlayBottom = color.argb("overlayBottom", "0xFFA0A0A0"),
scrollPaneOverlayLeft = color.argb("overlayLeft", "0xFFA0A0A0"),
scrollPaneOverlayRight = color.argb("overlayRight", "0xFFA0A0A0"),
scrollbarCorners = color.argb("scrollbarCorners", "0xFF8B8B8B"),
scrollbarTopLeft = color.argb("scrollbarTopLeft", "0xFFF0F0F0"),
scrollbarBottomRight = color.argb("scrollbarBottomRight", "0xFF555555"),
scrollbarFill = color.argb("scrollbarFill", "0xFFC6C6C6"),
scrollbarGuide = color.argb("scrollbarGuide", "0xFF808080"),
tooltipBgStart = color.argb("tooltipBgStart", "0xF0100010"),
tooltipBgEnd = color.argb("tooltipBgEnd", "0xF0100010"),
tooltipBorderStart = color.argb("tooltipBorderStart", "0x505000FF"),
tooltipBorderEnd = color.argb("tooltipBorderEnd", "0x5028007F"),
tooltipText = color.argb("tooltipText", "0xFFFFFFFF");
// spotless:on
}
+20 -3
View File
@@ -18,6 +18,7 @@ import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL12;
import codechicken.lib.colour.ColorUtils;
import codechicken.lib.math.MathHelper; import codechicken.lib.math.MathHelper;
import codechicken.lib.render.CCRenderState; import codechicken.lib.render.CCRenderState;
@@ -162,7 +163,15 @@ public class GuiDraw {
} }
public static void drawMultilineTip(FontRenderer font, int x, int y, List<String> list) { public static void drawMultilineTip(FontRenderer font, int x, int y, List<String> list) {
drawMultilineTip(font, x, y, list, 0xf0100010, 0xf0100010, 0x505000ff, 0x5028007F); drawMultilineTip(
font,
x,
y,
list,
ColorUtils.tooltipBgStart.getColor(),
ColorUtils.tooltipBgEnd.getColor(),
ColorUtils.tooltipBorderStart.getColor(),
ColorUtils.tooltipBorderEnd.getColor());
} }
public static void drawMultilineTip(FontRenderer font, int x, int y, List<String> list, int bgStart, int bgEnd, public static void drawMultilineTip(FontRenderer font, int x, int y, List<String> list, int bgStart, int bgEnd,
@@ -201,7 +210,7 @@ public class GuiDraw {
line.draw(x, y); line.draw(x, y);
y += line.getSize().height; y += line.getSize().height;
} else { } else {
font.drawStringWithShadow(s, x, y, -1); font.drawStringWithShadow(s, x, y, ColorUtils.tooltipText.getColor());
y += s.endsWith(TOOLTIP_LINESPACE) ? 12 : 10; y += s.endsWith(TOOLTIP_LINESPACE) ? 12 : 10;
} }
} }
@@ -215,7 +224,15 @@ public class GuiDraw {
} }
public static void drawTooltipBox(int x, int y, int w, int h) { public static void drawTooltipBox(int x, int y, int w, int h) {
drawTooltipBox(x, y, w, h, 0xf0100010, 0xf0100010, 0x505000ff, 0x5028007F); drawTooltipBox(
x,
y,
w,
h,
ColorUtils.tooltipBgStart.getColor(),
ColorUtils.tooltipBgEnd.getColor(),
ColorUtils.tooltipBorderStart.getColor(),
ColorUtils.tooltipBorderEnd.getColor());
} }
public static void drawTooltipBox(int x, int y, int w, int h, int bgStart, int bgEnd, int borderStart, public static void drawTooltipBox(int x, int y, int w, int h, int bgStart, int bgEnd, int borderStart,
@@ -6,6 +6,8 @@ import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import codechicken.lib.colour.ColorUtils;
public class FontUtils { public class FontUtils {
public static FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; public static FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
@@ -53,7 +55,7 @@ public class FontUtils {
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glTranslated(x + 16 - swidth, y + 16 - sheight, 0); GL11.glTranslated(x + 16 - swidth, y + 16 - sheight, 0);
GL11.glScaled(scale, scale, 1); GL11.glScaled(scale, scale, 1);
fontRenderer.drawStringWithShadow(quantity, 0, 0, 0xFFFFFF); fontRenderer.drawStringWithShadow(quantity, 0, 0, ColorUtils.itemQuantityText.getColor());
GL11.glPopMatrix(); GL11.glPopMatrix();
GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_DEPTH_TEST); GL11.glEnable(GL11.GL_DEPTH_TEST);