mirror of
https://github.com/GTNewHorizons/CodeChickenCore.git
synced 2026-11-17 02:55:10 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7ae8b15810 | ||
|
|
08f3e4d42a |
No files matched your search
@@ -1,4 +1,5 @@
|
|||||||
// Add your dependencies here
|
// Add your dependencies here
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
shadowImplementation("com.github.GTNewHorizons:GTNHLib:0.11.5")
|
||||||
}
|
}
|
||||||
+1
-1
@@ -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.
|
||||||
|
|||||||
@@ -2,16 +2,12 @@ package codechicken.core;
|
|||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.GuiScreen;
|
import net.minecraft.client.gui.GuiScreen;
|
||||||
import net.minecraft.client.resources.IReloadableResourceManager;
|
|
||||||
import net.minecraft.client.resources.IResourceManager;
|
|
||||||
import net.minecraft.client.resources.IResourceManagerReloadListener;
|
|
||||||
import net.minecraft.network.NetworkManager;
|
import net.minecraft.network.NetworkManager;
|
||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
import net.minecraft.util.EnumChatFormatting;
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
import codechicken.core.internal.CCCEventHandler;
|
import codechicken.core.internal.CCCEventHandler;
|
||||||
import codechicken.lib.colour.LocalizedColours;
|
|
||||||
import cpw.mods.fml.common.FMLCommonHandler;
|
import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
import cpw.mods.fml.common.ModContainer;
|
import cpw.mods.fml.common.ModContainer;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
@@ -69,16 +65,4 @@ public class ClientUtils extends CommonUtils {
|
|||||||
.replace("Supporters:", EnumChatFormatting.AQUA + "Supporters:");
|
.replace("Supporters:", EnumChatFormatting.AQUA + "Supporters:");
|
||||||
GuiModListScroll.register(mod);
|
GuiModListScroll.register(mod);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
public static void registerLocalizedColourReloadListener() {
|
|
||||||
((IReloadableResourceManager) mc().getResourceManager())
|
|
||||||
.registerReloadListener(new IResourceManagerReloadListener() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResourceManagerReload(IResourceManager resourceManager) {
|
|
||||||
LocalizedColours.reloadLocalizedColours();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -36,7 +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.LocalizedColours;
|
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;
|
||||||
@@ -149,11 +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, LocalizedColours.MOD_DESCRIPTION_TEXT);
|
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
|
GuiDraw.fontRenderer
|
||||||
.drawSplitString(description, x1, y1draw, x2 - x1, LocalizedColours.MOD_DESCRIPTION_TEXT);
|
.drawSplitString(description, x1, y1draw, x2 - x1, ColorUtils.modDescriptionText.getColor());
|
||||||
}
|
}
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
|
|
||||||
|
|||||||
@@ -65,8 +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");
|
||||||
ClientUtils.registerLocalizedColourReloadListener();
|
|
||||||
|
|
||||||
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,7 +6,7 @@ import net.minecraft.util.ResourceLocation;
|
|||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
import codechicken.lib.colour.LocalizedColours;
|
import codechicken.lib.colour.ColorUtils;
|
||||||
|
|
||||||
public class GuiCCButton extends GuiWidget {
|
public class GuiCCButton extends GuiWidget {
|
||||||
|
|
||||||
@@ -75,8 +75,9 @@ public class GuiCCButton extends GuiWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public int getTextColour(int mousex, int mousey) {
|
public int getTextColour(int mousex, int mousey) {
|
||||||
return !isEnabled ? LocalizedColours.BUTTON_TEXT_DISABLED
|
return !isEnabled ? ColorUtils.buttonTextDisabled.getColor()
|
||||||
: pointInside(mousex, mousey) ? LocalizedColours.BUTTON_TEXT_HOVER : LocalizedColours.BUTTON_TEXT;
|
: pointInside(mousex, mousey) ? ColorUtils.buttonTextHover.getColor()
|
||||||
|
: ColorUtils.buttonText.getColor();
|
||||||
}
|
}
|
||||||
|
|
||||||
public GuiCCButton setActionCommand(String string) {
|
public GuiCCButton setActionCommand(String string) {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import net.minecraft.util.ChatAllowedCharacters;
|
|||||||
|
|
||||||
import org.lwjgl.input.Keyboard;
|
import org.lwjgl.input.Keyboard;
|
||||||
|
|
||||||
import codechicken.lib.colour.LocalizedColours;
|
import codechicken.lib.colour.ColorUtils;
|
||||||
|
|
||||||
public class GuiCCTextField extends GuiWidget {
|
public class GuiCCTextField extends GuiWidget {
|
||||||
|
|
||||||
@@ -122,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, LocalizedColours.TEXT_FIELD_BORDER);
|
drawRect(x - 1, y - 1, x + width + 1, y + height + 1, ColorUtils.textFieldBorder.getColor());
|
||||||
drawRect(x, y, x + width, y + height, LocalizedColours.TEXT_FIELD_BACKGROUND);
|
drawRect(x, y, x + width, y + height, ColorUtils.textFieldBackground.getColor());
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getDrawText() {
|
public String getDrawText() {
|
||||||
@@ -137,7 +137,7 @@ public class GuiCCTextField extends GuiWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public int getTextColour() {
|
public int getTextColour() {
|
||||||
return isEnabled ? LocalizedColours.TEXT_FIELD_TEXT : LocalizedColours.TEXT_FIELD_TEXT_DISABLED;
|
return isEnabled ? ColorUtils.textFieldText.getColor() : ColorUtils.textFieldTextDisabled.getColor();
|
||||||
}
|
}
|
||||||
|
|
||||||
public GuiCCTextField setMaxStringLength(int i) {
|
public GuiCCTextField setMaxStringLength(int i) {
|
||||||
|
|||||||
@@ -3,7 +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.LocalizedColours;
|
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;
|
||||||
|
|
||||||
@@ -185,29 +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, LocalizedColours.SCROLL_PANE_BACKGROUND);
|
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, LocalizedColours.SCROLL_PANE_OVERLAY_TOP);
|
drawRect(x, y - 1, x + width, y, ColorUtils.scrollPaneOverlayTop.getColor());
|
||||||
drawRect(x, y + height, x + width, y + height + 1, LocalizedColours.SCROLL_PANE_OVERLAY_BOTTOM);
|
drawRect(x, y + height, x + width, y + height + 1, ColorUtils.scrollPaneOverlayBottom.getColor());
|
||||||
drawRect(x - 1, y - 1, x, y + height + 1, LocalizedColours.SCROLL_PANE_OVERLAY_LEFT);
|
drawRect(x - 1, y - 1, x, y + height + 1, ColorUtils.scrollPaneOverlayLeft.getColor());
|
||||||
drawRect(x + width, y - 1, x + width + 1, y + height + 1, LocalizedColours.SCROLL_PANE_OVERLAY_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, LocalizedColours.SCROLLBAR_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, LocalizedColours.SCROLLBAR_TOP_LEFT);
|
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, LocalizedColours.SCROLLBAR_BOTTOM_RIGHT);
|
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, LocalizedColours.SCROLLBAR_FILL);
|
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)
|
if (algn != 0)
|
||||||
drawRect(algn > 0 ? r.x + r.width : r.x - 1, y, r.x, y + height, LocalizedColours.SCROLLBAR_GUIDE);
|
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
|
||||||
|
}
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
package codechicken.lib.colour;
|
|
||||||
|
|
||||||
import net.minecraft.util.StatCollector;
|
|
||||||
|
|
||||||
public final class LocalizedColours {
|
|
||||||
|
|
||||||
private static final String KEY_PREFIX = "codechickencore.color.";
|
|
||||||
|
|
||||||
public static int BUTTON_TEXT_DISABLED = 0xFFA0A0A0;
|
|
||||||
public static int BUTTON_TEXT_HOVER = 0xFFFFFFA0;
|
|
||||||
public static int BUTTON_TEXT = 0xFFE0E0E0;
|
|
||||||
public static int TEXT_FIELD_BORDER = 0xFFA0A0A0;
|
|
||||||
public static int TEXT_FIELD_BACKGROUND = 0xFF000000;
|
|
||||||
public static int TEXT_FIELD_TEXT = 0xE0E0E0;
|
|
||||||
public static int TEXT_FIELD_TEXT_DISABLED = 0x707070;
|
|
||||||
public static int SCROLL_PANE_BACKGROUND = 0xFF000000;
|
|
||||||
public static int SCROLL_PANE_OVERLAY_TOP = 0xFFA0A0A0;
|
|
||||||
public static int SCROLL_PANE_OVERLAY_BOTTOM = 0xFFA0A0A0;
|
|
||||||
public static int SCROLL_PANE_OVERLAY_LEFT = 0xFFA0A0A0;
|
|
||||||
public static int SCROLL_PANE_OVERLAY_RIGHT = 0xFFA0A0A0;
|
|
||||||
public static int SCROLLBAR_CORNERS = 0xFF8B8B8B;
|
|
||||||
public static int SCROLLBAR_TOP_LEFT = 0xFFF0F0F0;
|
|
||||||
public static int SCROLLBAR_BOTTOM_RIGHT = 0xFF555555;
|
|
||||||
public static int SCROLLBAR_FILL = 0xFFC6C6C6;
|
|
||||||
public static int SCROLLBAR_GUIDE = 0xFF808080;
|
|
||||||
public static int TOOLTIP_BG_START = 0xF0100010;
|
|
||||||
public static int TOOLTIP_BG_END = 0xF0100010;
|
|
||||||
public static int TOOLTIP_BORDER_START = 0x505000FF;
|
|
||||||
public static int TOOLTIP_BORDER_END = 0x5028007F;
|
|
||||||
public static int TOOLTIP_TEXT = 0xFFFFFFFF;
|
|
||||||
public static int ITEM_QUANTITY_TEXT = 0xFFFFFF;
|
|
||||||
public static int MOD_DESCRIPTION_TEXT = 0xDDDDDD;
|
|
||||||
|
|
||||||
private LocalizedColours() {}
|
|
||||||
|
|
||||||
public static void reloadLocalizedColours() {
|
|
||||||
BUTTON_TEXT_DISABLED = getLocalizedColor("buttonTextDisabled", BUTTON_TEXT_DISABLED);
|
|
||||||
BUTTON_TEXT_HOVER = getLocalizedColor("buttonTextHover", BUTTON_TEXT_HOVER);
|
|
||||||
BUTTON_TEXT = getLocalizedColor("buttonText", BUTTON_TEXT);
|
|
||||||
TEXT_FIELD_BORDER = getLocalizedColor("textFieldBorder", TEXT_FIELD_BORDER);
|
|
||||||
TEXT_FIELD_BACKGROUND = getLocalizedColor("textFieldBackground", TEXT_FIELD_BACKGROUND);
|
|
||||||
TEXT_FIELD_TEXT = getLocalizedColor("textFieldText", TEXT_FIELD_TEXT);
|
|
||||||
TEXT_FIELD_TEXT_DISABLED = getLocalizedColor("textFieldTextDisabled", TEXT_FIELD_TEXT_DISABLED);
|
|
||||||
SCROLL_PANE_BACKGROUND = getLocalizedColor("background", SCROLL_PANE_BACKGROUND);
|
|
||||||
SCROLL_PANE_OVERLAY_TOP = getLocalizedColor("overlayTop", SCROLL_PANE_OVERLAY_TOP);
|
|
||||||
SCROLL_PANE_OVERLAY_BOTTOM = getLocalizedColor("overlayBottom", SCROLL_PANE_OVERLAY_BOTTOM);
|
|
||||||
SCROLL_PANE_OVERLAY_LEFT = getLocalizedColor("overlayLeft", SCROLL_PANE_OVERLAY_LEFT);
|
|
||||||
SCROLL_PANE_OVERLAY_RIGHT = getLocalizedColor("overlayRight", SCROLL_PANE_OVERLAY_RIGHT);
|
|
||||||
SCROLLBAR_CORNERS = getLocalizedColor("scrollbarCorners", SCROLLBAR_CORNERS);
|
|
||||||
SCROLLBAR_TOP_LEFT = getLocalizedColor("scrollbarTopLeft", SCROLLBAR_TOP_LEFT);
|
|
||||||
SCROLLBAR_BOTTOM_RIGHT = getLocalizedColor("scrollbarBottomRight", SCROLLBAR_BOTTOM_RIGHT);
|
|
||||||
SCROLLBAR_FILL = getLocalizedColor("scrollbarFill", SCROLLBAR_FILL);
|
|
||||||
SCROLLBAR_GUIDE = getLocalizedColor("scrollbarGuide", SCROLLBAR_GUIDE);
|
|
||||||
TOOLTIP_BG_START = getLocalizedColor("tooltipBgStart", TOOLTIP_BG_START);
|
|
||||||
TOOLTIP_BG_END = getLocalizedColor("tooltipBgEnd", TOOLTIP_BG_END);
|
|
||||||
TOOLTIP_BORDER_START = getLocalizedColor("tooltipBorderStart", TOOLTIP_BORDER_START);
|
|
||||||
TOOLTIP_BORDER_END = getLocalizedColor("tooltipBorderEnd", TOOLTIP_BORDER_END);
|
|
||||||
TOOLTIP_TEXT = getLocalizedColor("tooltipText", TOOLTIP_TEXT);
|
|
||||||
ITEM_QUANTITY_TEXT = getLocalizedColor("itemQuantityText", ITEM_QUANTITY_TEXT);
|
|
||||||
MOD_DESCRIPTION_TEXT = getLocalizedColor("modDescriptionText", MOD_DESCRIPTION_TEXT);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resolve a optional localized ARGB color from lang files. Expected value format: AARRGGBB (for example FF555555).
|
|
||||||
*/
|
|
||||||
private static int getLocalizedColor(String key, int defaultColor) {
|
|
||||||
String fullKey = KEY_PREFIX + key;
|
|
||||||
if (!StatCollector.canTranslate(fullKey)) {
|
|
||||||
return defaultColor;
|
|
||||||
}
|
|
||||||
|
|
||||||
String raw = StatCollector.translateToLocal(fullKey);
|
|
||||||
String hex = raw.trim();
|
|
||||||
if (hex.startsWith("0x") || hex.startsWith("0X")) {
|
|
||||||
hex = hex.substring(2);
|
|
||||||
} else if (hex.startsWith("#")) {
|
|
||||||
hex = hex.substring(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
return (int) Long.parseLong(hex, 16);
|
|
||||||
} catch (NumberFormatException ignored) {
|
|
||||||
return defaultColor;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -18,7 +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.LocalizedColours;
|
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;
|
||||||
|
|
||||||
@@ -168,10 +168,10 @@ public class GuiDraw {
|
|||||||
x,
|
x,
|
||||||
y,
|
y,
|
||||||
list,
|
list,
|
||||||
LocalizedColours.TOOLTIP_BG_START,
|
ColorUtils.tooltipBgStart.getColor(),
|
||||||
LocalizedColours.TOOLTIP_BG_END,
|
ColorUtils.tooltipBgEnd.getColor(),
|
||||||
LocalizedColours.TOOLTIP_BORDER_START,
|
ColorUtils.tooltipBorderStart.getColor(),
|
||||||
LocalizedColours.TOOLTIP_BORDER_END);
|
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,
|
||||||
@@ -210,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, LocalizedColours.TOOLTIP_TEXT);
|
font.drawStringWithShadow(s, x, y, ColorUtils.tooltipText.getColor());
|
||||||
y += s.endsWith(TOOLTIP_LINESPACE) ? 12 : 10;
|
y += s.endsWith(TOOLTIP_LINESPACE) ? 12 : 10;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -229,10 +229,10 @@ public class GuiDraw {
|
|||||||
y,
|
y,
|
||||||
w,
|
w,
|
||||||
h,
|
h,
|
||||||
LocalizedColours.TOOLTIP_BG_START,
|
ColorUtils.tooltipBgStart.getColor(),
|
||||||
LocalizedColours.TOOLTIP_BG_END,
|
ColorUtils.tooltipBgEnd.getColor(),
|
||||||
LocalizedColours.TOOLTIP_BORDER_START,
|
ColorUtils.tooltipBorderStart.getColor(),
|
||||||
LocalizedColours.TOOLTIP_BORDER_END);
|
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,7 +6,7 @@ import net.minecraft.item.ItemStack;
|
|||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
import codechicken.lib.colour.LocalizedColours;
|
import codechicken.lib.colour.ColorUtils;
|
||||||
|
|
||||||
public class FontUtils {
|
public class FontUtils {
|
||||||
|
|
||||||
@@ -55,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, LocalizedColours.ITEM_QUANTITY_TEXT);
|
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);
|
||||||
|
|||||||
@@ -1,26 +1 @@
|
|||||||
codechickencore.update=Version %s of %s is available
|
codechickencore.update=Version %s of %s is available
|
||||||
|
|
||||||
codechickencore.color.buttonTextDisabled=FFA0A0A0
|
|
||||||
codechickencore.color.buttonTextHover=FFFFFFA0
|
|
||||||
codechickencore.color.buttonText=FFE0E0E0
|
|
||||||
codechickencore.color.textFieldBorder=FFA0A0A0
|
|
||||||
codechickencore.color.textFieldBackground=FF000000
|
|
||||||
codechickencore.color.textFieldText=E0E0E0
|
|
||||||
codechickencore.color.textFieldTextDisabled=707070
|
|
||||||
codechickencore.color.background=FF000000
|
|
||||||
codechickencore.color.overlayTop=FFA0A0A0
|
|
||||||
codechickencore.color.overlayBottom=FFA0A0A0
|
|
||||||
codechickencore.color.overlayLeft=FFA0A0A0
|
|
||||||
codechickencore.color.overlayRight=FFA0A0A0
|
|
||||||
codechickencore.color.scrollbarCorners=FF8B8B8B
|
|
||||||
codechickencore.color.scrollbarTopLeft=FFF0F0F0
|
|
||||||
codechickencore.color.scrollbarBottomRight=FF555555
|
|
||||||
codechickencore.color.scrollbarFill=FFC6C6C6
|
|
||||||
codechickencore.color.scrollbarGuide=FF808080
|
|
||||||
codechickencore.color.tooltipBgStart=F0100010
|
|
||||||
codechickencore.color.tooltipBgEnd=F0100010
|
|
||||||
codechickencore.color.tooltipBorderStart=505000FF
|
|
||||||
codechickencore.color.tooltipBorderEnd=5028007F
|
|
||||||
codechickencore.color.tooltipText=FFFFFFFF
|
|
||||||
codechickencore.color.itemQuantityText=FFFFFF
|
|
||||||
codechickencore.color.modDescriptionText=DDDDDD
|
|
||||||
Reference in new issue
Block a user