diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/RenderBackend.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/RenderBackend.java index 2f77d3172..ed8a75b49 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/RenderBackend.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/backend/RenderBackend.java @@ -8,6 +8,8 @@ import java.nio.DoubleBuffer; import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.nio.ShortBuffer; +import java.util.Collections; +import java.util.List; /** * Abstract rendering backend. @@ -25,6 +27,14 @@ public abstract class RenderBackend { /** Higher priority backends are preferred. */ public int getPriority() { return 0; } + public boolean supportsFileDrop() { return false; } + + public void startFileDrop() {} + + public void stopFileDrop() {} + + public List pollDroppedFiles() { return Collections.emptyList(); } + public abstract int getMinGLSLVersion(); public abstract void flush(); diff --git a/lwjgl3-backend/src/main/java/com/gtnewhorizons/angelica/lwjgl3/Lwjgl3GLRenderBackend.java b/lwjgl3-backend/src/main/java/com/gtnewhorizons/angelica/lwjgl3/Lwjgl3GLRenderBackend.java index b7af780e6..a7e19c67d 100644 --- a/lwjgl3-backend/src/main/java/com/gtnewhorizons/angelica/lwjgl3/Lwjgl3GLRenderBackend.java +++ b/lwjgl3-backend/src/main/java/com/gtnewhorizons/angelica/lwjgl3/Lwjgl3GLRenderBackend.java @@ -23,6 +23,9 @@ import org.lwjgl.opengl.GL44C; import org.lwjgl.opengl.GL45C; import org.lwjgl.opengl.GLCapabilities; import org.lwjgl.opengl.GLDebugMessageCallback; +import org.lwjgl.sdl.SDL_DropEvent; +import org.lwjgl.sdl.SDL_EventFilter; +import org.lwjgl.sdl.SDLEvents; import org.lwjgl.system.MemoryStack; import java.nio.ByteBuffer; @@ -31,6 +34,10 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.nio.charset.StandardCharsets; import java.nio.ShortBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.ConcurrentLinkedQueue; /** * LWJGL3 GL implementation of {@link RenderBackend}. @@ -43,6 +50,10 @@ public final class Lwjgl3GLRenderBackend extends RenderBackend { private GLDebugMessageCallback debugCallback; private boolean debugOutputActive; + private SDL_EventFilter dropEventFilter; + private final ConcurrentLinkedQueue droppedFiles = new ConcurrentLinkedQueue<>(); + private volatile boolean watchingDrops; + @Override public void init() { caps = GL.getCapabilities(); @@ -50,7 +61,49 @@ public final class Lwjgl3GLRenderBackend extends RenderBackend { @Override public void shutdown() { - // no-op + stopFileDrop(); + } + + @Override + public boolean supportsFileDrop() { + return true; + } + + @Override + public void startFileDrop() { + if (watchingDrops) return; + dropEventFilter = SDL_EventFilter.create((userData, eventPtr) -> { + if (SDL_DropEvent.ntype(eventPtr) == SDLEvents.SDL_EVENT_DROP_FILE) { + final String path = SDL_DropEvent.ndataString(eventPtr); + if (path != null && !path.isEmpty()) { + droppedFiles.add(path); + } + } + return true; + }); + SDLEvents.SDL_AddEventWatch(dropEventFilter, 0L); + watchingDrops = true; + } + + @Override + public void stopFileDrop() { + if (!watchingDrops) return; + SDLEvents.SDL_RemoveEventWatch(dropEventFilter, 0L); + dropEventFilter.free(); + dropEventFilter = null; + droppedFiles.clear(); + watchingDrops = false; + } + + @Override + public List pollDroppedFiles() { + if (droppedFiles.isEmpty()) return Collections.emptyList(); + final List out = new ArrayList<>(); + String p; + while ((p = droppedFiles.poll()) != null) { + out.add(p); + } + return out; } @Override diff --git a/src/main/java/net/coderbot/iris/Iris.java b/src/main/java/net/coderbot/iris/Iris.java index 8a23d3ac1..16a8b6073 100644 --- a/src/main/java/net/coderbot/iris/Iris.java +++ b/src/main/java/net/coderbot/iris/Iris.java @@ -72,7 +72,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; import java.util.stream.Stream; -import java.util.zip.ZipError; import java.util.zip.ZipException; public class Iris { @@ -458,6 +457,33 @@ public class Iris { } } + /** + * Toggles shader debug mode. When enabled, patched shader sources are dumped to disk (see + * {@link net.coderbot.iris.pipeline.PatchedShaderPrinter}) and logging is more verbose. + */ + public static void setDebug(boolean enable) { + try { + irisConfig.setDebugEnabled(enable); + irisConfig.save(); + reload(); + } catch (IOException e) { + logger.error("Failed to " + (enable ? "enable" : "disable") + " debug mode", e); + } + logger.info("Debug functionality is " + (enable ? "enabled, logging will be more verbose!" : "disabled.")); + } + + /** + * Toggles whether unrecognized shader packs may load, exposing the {@code ALLOWS_UNKNOWN_SHADERS} macro. + */ + public static void setAllowUnknownShaders(boolean allow) { + try { + irisConfig.setUnknown(allow); + reload(); + } catch (IOException e) { + logger.error("Failed to " + (allow ? "allow" : "disallow") + " unknown shaders", e); + } + } + public static void loadShaderpack() { if (irisConfig == null) { if (!initialized) { @@ -678,8 +704,7 @@ public class Iris { try (Stream stream = Files.walk(root)) { return stream.filter(Files::isDirectory).anyMatch(path -> path.endsWith("shaders")); } - } catch (ZipError zipError) { - // Java 8 seems to throw a ZipError instead of a subclass of IOException + } catch (ZipException e) { Iris.logger.warn("The ZIP at " + pack + " is corrupt"); } catch (IOException ignored) { // ignored, not a valid shader pack. diff --git a/src/main/java/net/coderbot/iris/config/IrisConfig.java b/src/main/java/net/coderbot/iris/config/IrisConfig.java index 47a1de440..0ee513aa2 100644 --- a/src/main/java/net/coderbot/iris/config/IrisConfig.java +++ b/src/main/java/net/coderbot/iris/config/IrisConfig.java @@ -38,6 +38,8 @@ public class IrisConfig { */ private boolean enableDebugOptions; + private boolean allowUnknownShaders; + private final Path propertiesPath; public IrisConfig(Path propertiesPath) { @@ -45,6 +47,7 @@ public class IrisConfig { enableShaders = true; disableUpdateMessage = false; enableDebugOptions = false; + allowUnknownShaders = false; this.propertiesPath = propertiesPath; } @@ -113,6 +116,25 @@ public class IrisConfig { return enableDebugOptions; } + /** + * Sets whether debug features are enabled. + */ + public void setDebugEnabled(boolean enabled) { + this.enableDebugOptions = enabled; + } + + public boolean shouldAllowUnknownShaders() { + return allowUnknownShaders; + } + + /** + * Sets whether unrecognized shader packs may load. + */ + public void setUnknown(boolean allow) throws IOException { + this.allowUnknownShaders = allow; + save(); + } + /** * loads the config file and then populates the string, int, and boolean entries with the parsed entries * @@ -132,6 +154,7 @@ public class IrisConfig { shaderPackName = properties.getProperty("shaderPack"); enableShaders = !"false".equals(properties.getProperty("enableShaders")); enableDebugOptions = "true".equals(properties.getProperty("enableDebugOptions")); + allowUnknownShaders = "true".equals(properties.getProperty("allowUnknownShaders")); disableUpdateMessage = "true".equals(properties.getProperty("disableUpdateMessage")); // TODO: GUI try { @@ -159,6 +182,7 @@ public class IrisConfig { properties.setProperty("shaderPack", getShaderPackName().orElse("")); properties.setProperty("enableShaders", enableShaders ? "true" : "false"); properties.setProperty("enableDebugOptions", enableDebugOptions ? "true" : "false"); + properties.setProperty("allowUnknownShaders", allowUnknownShaders ? "true" : "false"); properties.setProperty("disableUpdateMessage", disableUpdateMessage ? "true" : "false"); properties.setProperty("maxShadowRenderDistance", String.valueOf(IrisVideoSettings.shadowDistance)); // NB: This uses ISO-8859-1 with unicode escapes as the encoding diff --git a/src/main/java/net/coderbot/iris/gl/shader/StandardMacros.java b/src/main/java/net/coderbot/iris/gl/shader/StandardMacros.java index 181dabdf6..2e7221d0e 100644 --- a/src/main/java/net/coderbot/iris/gl/shader/StandardMacros.java +++ b/src/main/java/net/coderbot/iris/gl/shader/StandardMacros.java @@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableList; import com.gtnewhorizons.angelica.Tags; import com.gtnewhorizons.angelica.config.AngelicaConfig; import cpw.mods.fml.common.Loader; +import net.coderbot.iris.Iris; import net.coderbot.iris.compat.dh.DHCompat; import net.coderbot.iris.parsing.BiomeCategories; import net.coderbot.iris.pipeline.HandRenderer; @@ -91,6 +92,10 @@ public class StandardMacros { define(standardDefines, "DISTANT_HORIZONS"); } + if (Iris.getIrisConfig().shouldAllowUnknownShaders()) { + define(standardDefines, "ALLOWS_UNKNOWN_SHADERS"); + } + define(standardDefines, "DH_BLOCK_UNKNOWN", String.valueOf(0)); define(standardDefines, "DH_BLOCK_LEAVES", String.valueOf(1)); define(standardDefines, "DH_BLOCK_STONE", String.valueOf(2)); diff --git a/src/main/java/net/coderbot/iris/gui/GuiUtil.java b/src/main/java/net/coderbot/iris/gui/GuiUtil.java index b7c5024be..e113d1201 100644 --- a/src/main/java/net/coderbot/iris/gui/GuiUtil.java +++ b/src/main/java/net/coderbot/iris/gui/GuiUtil.java @@ -4,10 +4,13 @@ import com.gtnewhorizons.angelica.glsm.GLStateManager; import cpw.mods.fml.client.config.GuiUtils; import lombok.Getter; import net.minecraft.client.Minecraft; +import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; +import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.resources.I18n; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; /** * Class serving as abstraction and @@ -111,6 +114,32 @@ public final class GuiUtil { font.drawStringWithShadow(text, x + 4, y + 4, 0xFFFFFF); } + public static void drawScrollingText(FontRenderer font, String text, int centerX, int minX, int maxX, int minY, int maxY, int color) { + final int textWidth = font.getStringWidth(text); + final int boxWidth = maxX - minX; + final int textY = ((minY + maxY) - font.FONT_HEIGHT) / 2 + 1; + + if (textWidth > boxWidth) { + final int overflow = textWidth - boxWidth; + final double time = System.currentTimeMillis() / 1000.0; + final double period = Math.max(overflow * 0.5, 3.0); + final double t = (Math.sin((Math.PI / 2.0) * Math.cos((Math.PI * 2.0) * time / period)) / 2.0) + 0.5; + final int scroll = (int) (t * overflow); + + final Minecraft mc = client(); + final int scale = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight).getScaleFactor(); + GLStateManager.glEnable(GL11.GL_SCISSOR_TEST); + GLStateManager.glScissor(minX * scale, mc.displayHeight - (maxY * scale), boxWidth * scale, (maxY - minY) * scale); + font.drawStringWithShadow(text, minX - scroll, textY, color); + GLStateManager.glDisable(GL11.GL_SCISSOR_TEST); + } else { + int textX = centerX - (textWidth / 2); + textX = Math.min(textX, maxX - textWidth); + textX = Math.max(textX, minX); + font.drawStringWithShadow(text, textX, textY, color); + } + } + /** * Shorten a text to a specific length, adding an ellipsis (...) * to the end if shortened. @@ -140,13 +169,25 @@ public final class GuiUtil { * @return the translated text if found, otherwise the default provided */ public static String translateOrDefault(String defaultText, String translationDesc, Object ... format) { - final String translated = I18n.format(translationDesc, format); + final String translated = format.length == 0 + ? translateLenient(translationDesc) + : I18n.format(translationDesc, format); if(!translated.equals(translationDesc)) { return translated; } return defaultText; } + private static final String FORMAT_ERROR_PREFIX = "Format error: "; + + /** + * Nasty dirty hack, but it works. + */ + public static String translateLenient(String key) { + final String translated = I18n.format(key); + return translated.startsWith(FORMAT_ERROR_PREFIX) ? translated.substring(FORMAT_ERROR_PREFIX.length()) : translated; + } + /** * Plays the {@code UI_BUTTON_CLICK} sound event as a * master sound effect. @@ -155,7 +196,7 @@ public final class GuiUtil { * or other action. */ public static void playButtonClickSound() { -// client().getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1)); + client().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); } /** diff --git a/src/main/java/net/coderbot/iris/gui/element/IrisElementRow.java b/src/main/java/net/coderbot/iris/gui/element/IrisElementRow.java index 18d543b7c..5cfae2073 100644 --- a/src/main/java/net/coderbot/iris/gui/element/IrisElementRow.java +++ b/src/main/java/net/coderbot/iris/gui/element/IrisElementRow.java @@ -21,7 +21,9 @@ public class IrisElementRow { private final int spacing; private int x; private int y; - private int width; + + @Getter + private int width; private int height; public IrisElementRow(int spacing) { diff --git a/src/main/java/net/coderbot/iris/gui/element/IrisGuiSlot.java b/src/main/java/net/coderbot/iris/gui/element/IrisGuiSlot.java index fd73c38f1..1a955253b 100644 --- a/src/main/java/net/coderbot/iris/gui/element/IrisGuiSlot.java +++ b/src/main/java/net/coderbot/iris/gui/element/IrisGuiSlot.java @@ -19,7 +19,7 @@ public abstract class IrisGuiSlot extends GuiSlot { super(mc, width, height, top, bottom, slotHeight); // Set Center Vertically to false this.field_148163_i = false; - + this.headerPadding = 2; } @Override @@ -37,11 +37,15 @@ public abstract class IrisGuiSlot extends GuiSlot { } @Override - protected void drawSelectionBox(int x, int y, int mouseX, int mouseY) { - final int oldPadding = this.headerPadding; - this.headerPadding = 2; - super.drawSelectionBox(x, y, mouseX, mouseY); - this.headerPadding = oldPadding; + public int func_148124_c/*getSlotIndexFromScreenCoords*/(int x, int y) { + final int left = this.left + this.width / 2 - this.getListWidth() / 2 + hitLeftInset() + hitXShift(); + final int right = this.left + this.width / 2 + this.getListWidth() / 2 - hitRightInset() + hitXShift(); + final int relativeY = y - this.top + (int) this.amountScrolled - hitYOffset(); + final int index = relativeY / this.slotHeight; + if (y <= this.top || y >= this.bottom) { + return -1; + } + return x < this.getScrollBarX() && x >= left && x <= right && index >= 0 && relativeY >= 0 && index < this.getSize() ? index : -1; } @Override @@ -53,6 +57,23 @@ public abstract class IrisGuiSlot extends GuiSlot { return false; } + protected int hitYOffset() { + return 4; + } + + protected int hitRightInset() { + return 0; + } + + protected int hitLeftInset() { + return 0; + } + + protected int hitXShift() { + return 0; + } + + public boolean mouseClicked(int mouseX, int mouseY, int mouseButton) { if (!this.func_148125_i/*enabled*/()) { return false; @@ -60,15 +81,15 @@ public abstract class IrisGuiSlot extends GuiSlot { final int size = this.getSize(); final int scrollBarX = this.getScrollBarX(); final int rightEdge = scrollBarX + 6; - final int elementLeft = this.width / 2 - this.getListWidth() / 2; - final int elementRight = this.width / 2 + this.getListWidth() / 2; - final int relativeY = mouseY - this.top - this.headerPadding + (int) this.amountScrolled - 4; + final int elementLeft = this.width / 2 - this.getListWidth() / 2 + hitLeftInset() + hitXShift(); + final int elementRight = this.width / 2 + this.getListWidth() / 2 - hitRightInset() + hitXShift(); + final int relativeY = mouseY - this.top + (int) this.amountScrolled - hitYOffset(); boolean handled = false; final boolean leftMouseDown = Mouse.isButtonDown(0); final boolean rightMouseDown = Mouse.isButtonDown(1); if (mouseX <= this.left || mouseX >= this.right || mouseY <= this.top || mouseY >= this.bottom) { - return handled; + return false; } if (leftMouseDown && mouseX >= scrollBarX && mouseX <= rightEdge) { scrolling = true; diff --git a/src/main/java/net/coderbot/iris/gui/element/ShaderPackOptionList.java b/src/main/java/net/coderbot/iris/gui/element/ShaderPackOptionList.java index 3578a0ab5..b1460f80a 100644 --- a/src/main/java/net/coderbot/iris/gui/element/ShaderPackOptionList.java +++ b/src/main/java/net/coderbot/iris/gui/element/ShaderPackOptionList.java @@ -25,7 +25,7 @@ public class ShaderPackOptionList extends IrisGuiSlot { private final List entries = new ArrayList<>(); public ShaderPackOptionList(ShaderPackScreen screen, NavigationController navigation, ShaderPack pack, Minecraft client, int width, int height, int top, int bottom, int left, int right) { - super(client, width, height, top, bottom, 20); + super(client, width, height, top, bottom, 24); this.navigation = navigation; this.screen = screen; @@ -72,7 +72,7 @@ public class ShaderPackOptionList extends IrisGuiSlot { } } - if (row.size() > 0) { + if (!row.isEmpty()) { while (row.size() < columns) { row.add(AbstractElementWidget.EMPTY); } @@ -93,7 +93,12 @@ public class ShaderPackOptionList extends IrisGuiSlot { } @Override public boolean mouseReleased( int mouseX, int mouseY, int button) { - final int relativeY = mouseY - this.top - this.headerPadding + (int) this.amountScrolled - 4; + this.scrolling = false; + if (mouseY <= this.top || mouseY >= this.bottom) { + return false; + } + + final int relativeY = mouseY - this.top + (int) this.amountScrolled - hitYOffset(); final int index = relativeY / this.slotHeight; if (index < 0 || index >= this.entries.size()) @@ -113,11 +118,31 @@ public class ShaderPackOptionList extends IrisGuiSlot { // noop } + @Override + protected int hitYOffset() { + return 3; + } + + @Override + protected int hitRightInset() { + return 4; + } + + @Override + protected int hitLeftInset() { + return -1; + } + + @Override + protected int hitXShift() { + return 2; + } + @Override protected void drawSlot(int index, int x, int y, int i1, Tessellator tessellator, int mouseX, int mouseY) { final BaseEntry entry = this.entries.get(index); final boolean isMouseOver = this.func_148124_c/*getSlotIndexFromScreenCoords*/(mouseX, mouseY) == index; - entry.drawEntry(screen, index, x - 2, y + 4, this.getListWidth(), this.slotHeight, tessellator, mouseX, mouseY, isMouseOver); + entry.drawEntry(screen, index, x, y - 2, this.getListWidth(), this.slotHeight, tessellator, mouseX, mouseY, isMouseOver); } diff --git a/src/main/java/net/coderbot/iris/gui/element/ShaderPackSelectionList.java b/src/main/java/net/coderbot/iris/gui/element/ShaderPackSelectionList.java index 8810e716d..31e169570 100644 --- a/src/main/java/net/coderbot/iris/gui/element/ShaderPackSelectionList.java +++ b/src/main/java/net/coderbot/iris/gui/element/ShaderPackSelectionList.java @@ -4,13 +4,23 @@ import lombok.Getter; import lombok.Setter; import net.coderbot.iris.Iris; import net.coderbot.iris.gui.element.shaderselection.BaseEntry; +import net.coderbot.iris.gui.element.shaderselection.DownloadEntry; import net.coderbot.iris.gui.element.shaderselection.LabelEntry; import net.coderbot.iris.gui.element.shaderselection.ShaderPackEntry; import net.coderbot.iris.gui.element.shaderselection.TopButtonRowEntry; import net.coderbot.iris.gui.screen.ShaderPackScreen; +import com.gtnewhorizons.angelica.glsm.backend.BackendManager; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.resources.I18n; +import net.minecraft.util.EnumChatFormatting; +import java.io.IOException; +import java.nio.file.FileSystems; +import java.nio.file.StandardWatchEventKinds; +import java.nio.file.WatchEvent; +import java.nio.file.WatchKey; +import java.nio.file.WatchService; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -31,15 +41,70 @@ public class ShaderPackSelectionList extends IrisGuiSlot { private final List entries = new ArrayList<>(); + private final WatchService watcher; + private final WatchKey key; + private boolean keyValid; + public ShaderPackSelectionList(ShaderPackScreen screen, Minecraft client, int width, int height, int top, int bottom, int left, int right) { super(client, width, height, top, bottom, 20); this.screen = screen; this.topButtonRow = new TopButtonRowEntry(this, Iris.getIrisConfig().areShadersEnabled()); + WatchService watcher1; + WatchKey key1; + try { + watcher1 = FileSystems.getDefault().newWatchService(); + key1 = Iris.getShaderpacksDirectory().register(watcher1, + StandardWatchEventKinds.ENTRY_CREATE, + StandardWatchEventKinds.ENTRY_MODIFY, + StandardWatchEventKinds.ENTRY_DELETE); + keyValid = true; + } catch (IOException e) { + Iris.logger.error("Couldn't register shaderpacks directory file watcher!", e); + watcher1 = null; + key1 = null; + keyValid = false; + } + this.watcher = watcher1; + this.key = key1; + refresh(); } + // Poll for new shaderpacks + public void poll() { + if (!keyValid) { + return; + } + boolean changed = false; + for (WatchEvent event : key.pollEvents()) { + if (event.kind() == StandardWatchEventKinds.OVERFLOW) { + continue; + } + changed = true; + } + if (changed) { + refresh(); + } + keyValid = key.reset(); + } + + public void close() throws IOException { + if (key != null) { + key.cancel(); + } + if (watcher != null) { + watcher.close(); + } + } + + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + poll(); + super.drawScreen(mouseX, mouseY, partialTicks); + } + public void refresh() { this.entries.clear(); @@ -68,8 +133,13 @@ public class ShaderPackSelectionList extends IrisGuiSlot { this.entries.add(topButtonRow); + // Download something man + if (names.isEmpty()) { + this.entries.add(new DownloadEntry(this, "Download Shaders", "https://modrinth.com/shaders")); + } + // Only allow the enable/disable shaders button if the user has added a shader pack. Otherwise, the button will be disabled. - topButtonRow.allowEnableShadersButton = names.size() > 0; + topButtonRow.allowEnableShadersButton = !names.isEmpty(); int index = 0; @@ -78,6 +148,11 @@ public class ShaderPackSelectionList extends IrisGuiSlot { addPackEntry(index, name); } + // Try not to gaslight users in case they swap back and forth from lwjgl2 and lwjgl3 + final String footerKey = BackendManager.RENDER_BACKEND.supportsFileDrop() + ? "pack.iris.list.label" + : "pack.iris.list.label.lwjgl2"; + addLabelEntries(EnumChatFormatting.GRAY.toString() + EnumChatFormatting.ITALIC + I18n.format(footerKey)); } public void addPackEntry(int index, String name) { @@ -128,6 +203,8 @@ public class ShaderPackSelectionList extends IrisGuiSlot { return true; } else if( entry instanceof TopButtonRowEntry topButtonRowEntry) { return topButtonRowEntry.mouseClicked(mouseX, mouseY, 0); + } else if (entry instanceof DownloadEntry downloadEntry) { + return downloadEntry.click(this.screen); } return false; } @@ -152,7 +229,7 @@ public class ShaderPackSelectionList extends IrisGuiSlot { protected void drawSlot(int index, int x, int y, int i1, Tessellator tessellator, int mouseX, int mouseY) { final BaseEntry entry = this.entries.get(index); final boolean isMouseOver = this.func_148124_c/*getSlotIndexFromScreenCoords*/(mouseX, mouseY) == index; - entry.drawEntry(screen, index, x - 2, y + 4, this.getListWidth(), tessellator, mouseX, mouseY, isMouseOver); + entry.drawEntry(screen, index, x, y + 4, this.getListWidth(), tessellator, mouseX, mouseY, isMouseOver); } } diff --git a/src/main/java/net/coderbot/iris/gui/element/shaderoptions/ElementRowEntry.java b/src/main/java/net/coderbot/iris/gui/element/shaderoptions/ElementRowEntry.java index 3b0749353..180ad2095 100644 --- a/src/main/java/net/coderbot/iris/gui/element/shaderoptions/ElementRowEntry.java +++ b/src/main/java/net/coderbot/iris/gui/element/shaderoptions/ElementRowEntry.java @@ -14,6 +14,7 @@ public class ElementRowEntry extends BaseEntry { private int cachedWidth; private int cachedPosX; + private float cachedSingleWidth; public ElementRowEntry(NavigationController navigation, List> widgets) { super(navigation); @@ -32,25 +33,43 @@ public class ElementRowEntry extends BaseEntry { // Width of a single widget final float singleWidgetWidth = (float) totalWidthWithoutMargins / widgets.size(); + this.cachedSingleWidth = singleWidgetWidth; for (int i = 0; i < widgets.size(); i++) { final AbstractElementWidget widget = widgets.get(i); final boolean widgetHovered = isMouseOver && (getHoveredWidget(mouseX) == i); - widget.drawScreen(x + (int) ((singleWidgetWidth + 2) * i), y, (int) singleWidgetWidth, slotHeight + 2, mouseX, mouseY, 0, widgetHovered); + widget.drawScreen(x + (int) ((singleWidgetWidth + 2) * i), y, (int) singleWidgetWidth, slotHeight - 2, mouseX, mouseY, 0, widgetHovered); screen.setElementHoveredStatus(widget, widgetHovered); } } public int getHoveredWidget(int mouseX) { - final float positionAcrossWidget = ((float) MathHelper.clamp_int(mouseX - cachedPosX, 0, cachedWidth)) / cachedWidth; + + final float CONTENT_ANCHOR_OFFSET = 2f; + final float rel = (mouseX - cachedPosX) + CONTENT_ANCHOR_OFFSET; + final float clamped = Math.clamp(rel, 0f, cachedWidth); + final float positionAcrossWidget = clamped / cachedWidth; return MathHelper.clamp_int((int) Math.floor(widgets.size() * positionAcrossWidget), 0, widgets.size() - 1); } + private int widgetAt(int mouseX) { + final int i = getHoveredWidget(mouseX); + final int widgetX = this.cachedPosX + (int) ((this.cachedSingleWidth + 2) * i); + if (mouseX < widgetX || mouseX >= widgetX + (int) this.cachedSingleWidth) { + return -1; + } + return i; + } + @Override public boolean mouseClicked(int mouseX, int mouseY, int button) { - return this.widgets.get(getHoveredWidget(mouseX)).mouseClicked(mouseX, mouseY, button); + final int i = widgetAt(mouseX); + if (i < 0) { + return false; + } + return this.widgets.get(i).mouseClicked(mouseX, mouseY, button); } @Override diff --git a/src/main/java/net/coderbot/iris/gui/element/shaderoptions/HeaderEntry.java b/src/main/java/net/coderbot/iris/gui/element/shaderoptions/HeaderEntry.java index 5290eaefa..6769d0f3b 100644 --- a/src/main/java/net/coderbot/iris/gui/element/shaderoptions/HeaderEntry.java +++ b/src/main/java/net/coderbot/iris/gui/element/shaderoptions/HeaderEntry.java @@ -7,6 +7,7 @@ import net.coderbot.iris.gui.element.IrisElementRow; import net.coderbot.iris.gui.screen.ShaderPackScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.resources.I18n; @@ -60,13 +61,12 @@ public class HeaderEntry extends BaseEntry { @Override public void drawEntry(ShaderPackScreen screen, int index, int x, int y, int slotWidth, int slotHeight, Tessellator tessellator, int mouseX, int mouseY, boolean isMouseOver) { - // Draw dividing line - // fill(x - 3, (y + slotHeight) - 2, x + slotWidth, (y + slotHeight) - 1, 0x66BEBEBE); + Gui.drawRect(x - 3, (y + slotHeight) - 3, x + slotWidth, (y + slotHeight) - 2, 0x66BEBEBE); final int tickDelta = 0; final FontRenderer font = Minecraft.getMinecraft().fontRenderer; - // Draw header text - this.screen.drawCenteredString(font, text, x + (int) (slotWidth * 0.5), y + 5, 0xFFFFFF); + GuiUtil.drawScrollingText(font, text, x + (int) (slotWidth * 0.5), x + 5, + ((x + slotWidth) - 10) - this.utilityButtons.getWidth(), y + 5, y + 15, 0xFFFFFF); GuiUtil.bindIrisWidgetsTexture(); diff --git a/src/main/java/net/coderbot/iris/gui/element/shaderselection/DownloadEntry.java b/src/main/java/net/coderbot/iris/gui/element/shaderselection/DownloadEntry.java new file mode 100644 index 000000000..3b32ebc10 --- /dev/null +++ b/src/main/java/net/coderbot/iris/gui/element/shaderselection/DownloadEntry.java @@ -0,0 +1,33 @@ +package net.coderbot.iris.gui.element.shaderselection; + +import net.coderbot.iris.gui.GuiUtil; +import net.coderbot.iris.gui.element.ShaderPackSelectionList; +import net.coderbot.iris.gui.screen.ShaderPackScreen; +import net.minecraft.client.renderer.Tessellator; + +/** + * Show a download button when no shaderpacks exist in the shaderpacks folder. + */ +public class DownloadEntry extends BaseEntry { + private final String label; + private final String url; + + public DownloadEntry(ShaderPackSelectionList list, String label, String url) { + super(list); + this.label = label; + this.url = url; + } + + public boolean click(ShaderPackScreen screen) { + GuiUtil.playButtonClickSound(); + screen.openLinkConfirm(url); + return true; + } + + @Override + public void drawEntry(ShaderPackScreen screen, int index, int x, int y, int listWidth, Tessellator tessellator, int mouseX, int mouseY, boolean isMouseOver) { + GuiUtil.bindIrisWidgetsTexture(); + GuiUtil.drawButton(x - 2, y - 5, listWidth, 18, isMouseOver, false); + screen.drawCenteredString(label, (x + listWidth / 2) - 2, y, 0xFFFFFF); + } +} diff --git a/src/main/java/net/coderbot/iris/gui/element/shaderselection/LabelEntry.java b/src/main/java/net/coderbot/iris/gui/element/shaderselection/LabelEntry.java index a94acf858..465e7f636 100644 --- a/src/main/java/net/coderbot/iris/gui/element/shaderselection/LabelEntry.java +++ b/src/main/java/net/coderbot/iris/gui/element/shaderselection/LabelEntry.java @@ -14,6 +14,6 @@ public class LabelEntry extends BaseEntry { @Override public void drawEntry(ShaderPackScreen screen, int index, int x, int y, int listWidth, Tessellator tessellator, int mouseX, int mouseY, boolean isMouseOver) { - screen.drawCenteredString(label, x, y, 0xFFFFFF); + screen.drawCenteredString(label, (x + listWidth / 2) - 2, y, 0xFFFFFF); } } diff --git a/src/main/java/net/coderbot/iris/gui/element/shaderselection/ShaderPackEntry.java b/src/main/java/net/coderbot/iris/gui/element/shaderselection/ShaderPackEntry.java index 5218eb7c6..fcd04c566 100644 --- a/src/main/java/net/coderbot/iris/gui/element/shaderselection/ShaderPackEntry.java +++ b/src/main/java/net/coderbot/iris/gui/element/shaderselection/ShaderPackEntry.java @@ -1,6 +1,7 @@ package net.coderbot.iris.gui.element.shaderselection; import lombok.Getter; +import net.coderbot.iris.gui.GuiUtil; import net.coderbot.iris.gui.element.ShaderPackSelectionList; import net.coderbot.iris.gui.screen.ShaderPackScreen; import net.minecraft.client.gui.FontRenderer; @@ -37,6 +38,8 @@ public class ShaderPackEntry extends BaseEntry { } if(isMouseOver) { + GuiUtil.bindIrisWidgetsTexture(); + GuiUtil.drawButton(x - 2, y - 6, listWidth, 20, true, false); name = EnumChatFormatting.BOLD + name; } diff --git a/src/main/java/net/coderbot/iris/gui/element/shaderselection/TopButtonRowEntry.java b/src/main/java/net/coderbot/iris/gui/element/shaderselection/TopButtonRowEntry.java index 6e293caf5..8e7faed96 100644 --- a/src/main/java/net/coderbot/iris/gui/element/shaderselection/TopButtonRowEntry.java +++ b/src/main/java/net/coderbot/iris/gui/element/shaderselection/TopButtonRowEntry.java @@ -13,12 +13,10 @@ public class TopButtonRowEntry extends BaseEntry { private static final String NONE_PRESENT_LABEL = I18n.format("options.iris.shaders.nonePresent"); //.withStyle(ChatFormatting.GRAY); private static final String SHADERS_DISABLED_LABEL = I18n.format("options.iris.shaders.disabled"); private static final String SHADERS_ENABLED_LABEL = I18n.format("options.iris.shaders.enabled"); - private static final int REFRESH_BUTTON_WIDTH = 18; private final ShaderPackSelectionList shaderPackSelectionList; private final IrisElementRow buttons = new IrisElementRow(); private final EnableShadersButtonElement enableDisableButton; - private final IrisElementRow.Element refreshPacksButton; public boolean allowEnableShadersButton = true; public boolean shadersEnabled; @@ -38,15 +36,7 @@ public class TopButtonRowEntry extends BaseEntry { return false; }); - this.refreshPacksButton = new IrisElementRow.IconButtonElement( - GuiUtil.Icon.REFRESH, - button -> { - this.shaderPackSelectionList.refresh(); - - GuiUtil.playButtonClickSound(); - return true; - }); - this.buttons.add(this.enableDisableButton, 0).add(this.refreshPacksButton, REFRESH_BUTTON_WIDTH); + this.buttons.add(this.enableDisableButton, 0); } public void setShadersEnabled(boolean shadersEnabled) { @@ -57,7 +47,7 @@ public class TopButtonRowEntry extends BaseEntry { @Override public void drawEntry(ShaderPackScreen screen, int index, int x, int y, int listWidth, Tessellator tessellator, int mouseX, int mouseY, boolean isMouseOver) { - this.buttons.setWidth(this.enableDisableButton, (listWidth - 1) - REFRESH_BUTTON_WIDTH); + this.buttons.setWidth(this.enableDisableButton, listWidth); this.enableDisableButton.centerX = x + (int)(listWidth * 0.5); this.buttons.drawScreen(x - 2, y - 3, 18, mouseX, mouseY, 0, isMouseOver); diff --git a/src/main/java/net/coderbot/iris/gui/element/widget/BaseOptionElementWidget.java b/src/main/java/net/coderbot/iris/gui/element/widget/BaseOptionElementWidget.java index eed322d0c..e90b9f0be 100644 --- a/src/main/java/net/coderbot/iris/gui/element/widget/BaseOptionElementWidget.java +++ b/src/main/java/net/coderbot/iris/gui/element/widget/BaseOptionElementWidget.java @@ -90,9 +90,9 @@ public abstract class BaseOptionElementWidget exten FontRenderer font = Minecraft.getMinecraft().fontRenderer; // Draw the label - font.drawStringWithShadow(this.trimmedLabel, x + 6, y + 7, 0xFFFFFF); + font.drawStringWithShadow(this.trimmedLabel, x + 6, y + 7, this.isValueModified() ? 0xFFC94A : 0xFFFFFF); // Draw the value label - font.drawStringWithShadow(this.valueLabel, (x + (width - 2)) - (int)(this.valueSectionWidth * 0.5) - (int)(font.getStringWidth(this.valueLabel) * 0.5), y + 7, 0xFFFFFF); + font.drawStringWithShadow(this.valueLabel, (x + (width - 2)) - (int)(this.valueSectionWidth * 0.5) - (int)(font.getStringWidth(this.valueLabel) * 0.5), y + 7, getValueColor()); } protected final void renderOptionWithValue(int x, int y, int width, int height, boolean hovered) { @@ -119,17 +119,15 @@ public abstract class BaseOptionElementWidget exten } protected final String createTrimmedLabel() { - String label = GuiUtil.shortenText(Minecraft.getMinecraft().fontRenderer, this.label, this.maxLabelWidth); - - if (this.isValueModified()) { - label = label + " (*)"; //.withStyle(style -> style.withColor(TextColor.fromRgb(0xffc94a))); - } - - return label; + return GuiUtil.shortenText(Minecraft.getMinecraft().fontRenderer, this.label, this.maxLabelWidth); } protected abstract String createValueLabel(); + protected int getValueColor() { + return 0xFFFFFF; + } + public abstract boolean applyNextValue(); public abstract boolean applyPreviousValue(); @@ -147,7 +145,13 @@ public abstract class BaseOptionElementWidget exten @Override public Optional getCommentBody() { - return Optional.ofNullable(getCommentKey()).map(I18n::format); + final String key = getCommentKey(); + if (key == null) { + return Optional.empty(); + } + final String translated = GuiUtil.translateLenient(key); + // Don't show comment boxes without a translation, otherwise you get something like option.{commentname}.comment + return translated.equals(key) ? Optional.empty() : Optional.of(translated); } @Override diff --git a/src/main/java/net/coderbot/iris/gui/element/widget/BooleanElementWidget.java b/src/main/java/net/coderbot/iris/gui/element/widget/BooleanElementWidget.java index 27bf9e6f6..9388e7bdb 100644 --- a/src/main/java/net/coderbot/iris/gui/element/widget/BooleanElementWidget.java +++ b/src/main/java/net/coderbot/iris/gui/element/widget/BooleanElementWidget.java @@ -70,6 +70,14 @@ public class BooleanElementWidget extends BaseOptionElementWidget { - private static final String ARROW = new String(">"); - private final String targetScreenId; private final String label; @@ -39,7 +36,7 @@ public class LinkElementWidget extends CommentedElementWidget maxLabelWidth) { this.isLabelTrimmed = true; @@ -51,8 +48,7 @@ public class LinkElementWidget extends CommentedElementWidget getCommentBody() { final String translation = "screen." + this.targetScreenId + ".comment"; - final String translated = I18n.format(translation); - return Optional.ofNullable(!translated.equals(translation) ? I18n.format(translation) : null); + final String translated = GuiUtil.translateLenient(translation); + return Optional.ofNullable(!translated.equals(translation) ? translated : null); } } diff --git a/src/main/java/net/coderbot/iris/gui/element/widget/OptionMenuConstructor.java b/src/main/java/net/coderbot/iris/gui/element/widget/OptionMenuConstructor.java index 380c5b593..5b655ec55 100644 --- a/src/main/java/net/coderbot/iris/gui/element/widget/OptionMenuConstructor.java +++ b/src/main/java/net/coderbot/iris/gui/element/widget/OptionMenuConstructor.java @@ -1,6 +1,7 @@ package net.coderbot.iris.gui.element.widget; import net.coderbot.iris.Iris; +import net.minecraft.util.EnumChatFormatting; import net.coderbot.iris.gui.GuiUtil; import net.coderbot.iris.gui.NavigationController; import net.coderbot.iris.gui.element.ShaderPackOptionList; @@ -64,7 +65,7 @@ public final class OptionMenuConstructor { static { registerScreen(OptionMenuMainElementScreen.class, screen -> - new ElementWidgetScreenData(Iris.getCurrentPackName() + (Iris.isFallback() ? " (fallback)" : ""), false)); + new ElementWidgetScreenData(EnumChatFormatting.BOLD + Iris.getCurrentPackName() + (Iris.isFallback() ? " (fallback)" : ""), false)); registerScreen(OptionMenuSubElementScreen.class, screen -> new ElementWidgetScreenData(GuiUtil.translateOrDefault(new String(screen.screenId), "screen." + screen.screenId), true)); diff --git a/src/main/java/net/coderbot/iris/gui/element/widget/ProfileElementWidget.java b/src/main/java/net/coderbot/iris/gui/element/widget/ProfileElementWidget.java index d3cc7a651..21217528f 100644 --- a/src/main/java/net/coderbot/iris/gui/element/widget/ProfileElementWidget.java +++ b/src/main/java/net/coderbot/iris/gui/element/widget/ProfileElementWidget.java @@ -59,6 +59,11 @@ public class ProfileElementWidget extends BaseOptionElementWidget getCommentTitle() { return Optional.of(PROFILE_LABEL); diff --git a/src/main/java/net/coderbot/iris/gui/element/widget/SliderElementWidget.java b/src/main/java/net/coderbot/iris/gui/element/widget/SliderElementWidget.java index e174d3388..e264b76aa 100644 --- a/src/main/java/net/coderbot/iris/gui/element/widget/SliderElementWidget.java +++ b/src/main/java/net/coderbot/iris/gui/element/widget/SliderElementWidget.java @@ -108,7 +108,7 @@ public class SliderElementWidget extends StringElementWidget { @Override public boolean mouseReleased(double mx, double my, int button) { - if (button == 0) { + if (button == 0 && this.mouseDown) { this.onReleased(); return true; diff --git a/src/main/java/net/coderbot/iris/gui/element/widget/StringElementWidget.java b/src/main/java/net/coderbot/iris/gui/element/widget/StringElementWidget.java index a1de6088f..61d98c419 100644 --- a/src/main/java/net/coderbot/iris/gui/element/widget/StringElementWidget.java +++ b/src/main/java/net/coderbot/iris/gui/element/widget/StringElementWidget.java @@ -60,6 +60,11 @@ public class StringElementWidget extends BaseOptionElementWidget TOP_LAYER_RENDER_QUEUE = new HashSet<>(); - private static final String SELECT_TITLE = I18n.format("pack.iris.select.title"); - private static final String CONFIGURE_TITLE = I18n.format("pack.iris.configure.title"); + private static final String SELECT_TITLE = EnumChatFormatting.GRAY.toString() + EnumChatFormatting.ITALIC + I18n.format("pack.iris.select.title"); + private static final String CONFIGURE_TITLE = EnumChatFormatting.GRAY.toString() + EnumChatFormatting.ITALIC + I18n.format("pack.iris.configure.title"); private static final int COMMENT_PANEL_WIDTH = 314; private final GuiScreen parent; @@ -72,7 +84,6 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable { private boolean guiHidden = false; private boolean dirty = false; - private float guiButtonHoverTimer = 0.0f; public ShaderPackScreen(GuiScreen parent) { this.title = I18n.format("options.iris.shaderPackSelection.title"); @@ -102,6 +113,8 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable { this.initGui(); } + handleDroppedFiles(); + if (this.mc.theWorld == null) { super.drawDefaultBackground(); } else if (!this.guiHidden) { @@ -122,11 +135,7 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable { hoveredElementCommentTimer = 0; } - final float previousHoverTimer = this.guiButtonHoverTimer; super.drawScreen(mouseX, mouseY, delta); - if (previousHoverTimer == this.guiButtonHoverTimer) { - this.guiButtonHoverTimer = 0.0f; - } if (!this.guiHidden) { drawCenteredString(this.fontRendererObj, this.title, (int) (this.width * 0.5), 8, 0xFFFFFF); @@ -143,12 +152,9 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable { // Draw the comment panel if (this.isDisplayingComment()) { - // Determine panel height and position final int panelHeight = Math.max(50, 18 + (this.hoveredElementCommentBody.size() * 10)); - int x = mouseX + 5; - if (x + 314 >= (this.width - 4)) x = this.width - (318); - int y = mouseY + 8; - if (y + panelHeight >= (this.height - 4)) y = this.height - (panelHeight + 4); + final int x = (int) (0.5 * this.width) - 157; + final int y = this.height - (panelHeight + 4); // Draw panel GuiUtil.drawPanel(x, y, COMMENT_PANEL_WIDTH, panelHeight); // Draw text @@ -181,10 +187,21 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable { @Override public void initGui() { super.initGui(); + + BackendManager.RENDER_BACKEND.startFileDrop(); + final int bottomCenter = this.width / 2 - 50; final int topCenter = this.width / 2 - 76; final boolean inWorld = this.mc.theWorld != null; + if (this.shaderPackList != null) { + try { + this.shaderPackList.close(); + } catch (IOException e) { + Iris.logger.error("Failed to close previous shaderpack selection watcher!", e); + } + } + this.shaderPackList = new ShaderPackSelectionList(this, this.mc, this.width, this.height, 32, this.height - 58, 0, this.width); if (Iris.getCurrentPack().isPresent() && this.navigation != null) { @@ -339,12 +356,30 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable { public void refreshScreenSwitchButton() { if (this.screenSwitchButton != null) { this.screenSwitchButton.displayString = optionMenuOpen ? I18n.format("options.iris.shaderPackList") : I18n.format("options.iris.shaderPackSettings"); - this.screenSwitchButton.enabled = optionMenuOpen || shaderPackList.getTopButtonRow().shadersEnabled; + // Disable the settings switch when shaders are off or the selected pack exposes no options + this.screenSwitchButton.enabled = optionMenuOpen || (shaderPackList.getTopButtonRow().shadersEnabled + && Iris.getCurrentPack().map(p -> !p.getMenuContainer().mainScreen.elements.isEmpty()).orElse(true)); } } @Override protected void keyTyped(char typedChar, int keyCode) { + if (GuiScreen.isCtrlKeyDown() && keyCode == Keyboard.KEY_D) { + this.mc.displayGuiScreen(new GuiYesNo((result, id) -> { + Iris.setDebug(result); + this.mc.displayGuiScreen(this); + }, "Shader debug mode toggle", + "Debug mode helps investigate problems and shows shader errors. Would you like to enable it?", 0)); + return; + } + if (GuiScreen.isCtrlKeyDown() && keyCode == Keyboard.KEY_G) { + this.mc.displayGuiScreen(new GuiYesNo((result, id) -> { + Iris.setAllowUnknownShaders(result); + this.mc.displayGuiScreen(this); + }, "Unknown shader toggle", + "This allows unknown shaders to load in.", 0)); + return; + } if (keyCode == Keyboard.KEY_ESCAPE) { if (this.guiHidden) { this.guiHidden = false; @@ -359,6 +394,21 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable { return; } } + if (keyCode == Keyboard.KEY_F1 && this.mc.theWorld != null) { + this.guiHidden = !this.guiHidden; + this.initGui(); + return; + } + if (keyCode == Keyboard.KEY_TAB) { + final boolean canOpenOptions = shaderPackList.getTopButtonRow().shadersEnabled + && Iris.getCurrentPack().map(p -> !p.getMenuContainer().mainScreen.elements.isEmpty()).orElse(false); + if (this.optionMenuOpen || canOpenOptions) { + this.optionMenuOpen = !this.optionMenuOpen; + this.applyChanges(); + this.initGui(); + } + return; + } super.keyTyped(typedChar, keyCode); } @@ -367,6 +417,84 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable { this.notificationDialogTimer = 100; } + private void handleDroppedFiles() { + final List dropped = BackendManager.RENDER_BACKEND.pollDroppedFiles(); + if (dropped.isEmpty()) { + return; + } + final List paths = dropped.stream().map(Paths::get).collect(Collectors.toList()); + if (this.optionMenuOpen) { + onOptionMenuFilesDrop(paths); + } else { + onPackListFilesDrop(paths); + } + } + + public void onPackListFilesDrop(List paths) { + final List packs = paths.stream().filter(Iris::isValidShaderpack).toList(); + + for (Path pack : packs) { + final String fileName = pack.getFileName().toString(); + try { + Iris.getShaderpacksDirectoryManager().copyPackIntoDirectory(fileName, pack); + } catch (FileAlreadyExistsException e) { + displayNotification(I18n.format("options.iris.shaderPackSelection.copyErrorAlreadyExists", fileName)); + this.shaderPackList.refresh(); + return; + } catch (IOException e) { + Iris.logger.warn("Error copying dragged shader pack", e); + displayNotification(I18n.format("options.iris.shaderPackSelection.copyError", fileName)); + this.shaderPackList.refresh(); + return; + } + } + + // After copying, refresh the list so the new packs show up + this.shaderPackList.refresh(); + + if (packs.isEmpty()) { + if (paths.size() == 1) { + displayNotification(I18n.format("options.iris.shaderPackSelection.failedAddSingle", paths.getFirst().getFileName().toString())); + } else { + displayNotification(I18n.format("options.iris.shaderPackSelection.failedAdd")); + } + } else if (packs.size() == 1) { + final String packName = packs.getFirst().getFileName().toString(); + displayNotification(I18n.format("options.iris.shaderPackSelection.addedPack", packName)); + // Select the freshly-added pack, since the user probably wants to use it + this.shaderPackList.select(packName); + } else { + displayNotification(I18n.format("options.iris.shaderPackSelection.addedPacks", packs.size())); + } + } + + public void onOptionMenuFilesDrop(List paths) { + // Only one settings file should be imported at a time + if (paths.size() != 1) { + displayNotification(I18n.format("options.iris.shaderPackOptions.tooManyFiles")); + return; + } + importPackOptions(paths.getFirst()); + } + + public void importPackOptions(Path settingFile) { + try (InputStream in = Files.newInputStream(settingFile)) { + final Properties properties = new Properties(); + properties.load(in); + + Iris.queueShaderPackOptionsFromProperties(properties); + + displayNotification(I18n.format("options.iris.shaderPackOptions.importedSettings", settingFile.getFileName().toString())); + + if (this.navigation != null) { + this.navigation.refresh(); + } + } catch (Exception e) { + Iris.logger.error("Error importing shader settings file \"" + settingFile + "\"", e); + displayNotification(I18n.format("options.iris.shaderPackOptions.failedImport", settingFile.getFileName().toString())); + } + } + public void onClose() { if (!dropChanges) { applyChanges(); @@ -377,6 +505,19 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable { this.mc.displayGuiScreen(parent); } + @Override + public void onGuiClosed() { + BackendManager.RENDER_BACKEND.stopFileDrop(); + + if (this.shaderPackList != null) { + try { + this.shaderPackList.close(); + } catch (IOException e) { + Iris.logger.error("Failed to safely close shaderpack selection!", e); + } + } + } + private void dropChangesAndClose() { dropChanges = true; onClose(); @@ -419,8 +560,29 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable { CompletableFuture.runAsync(() -> openUri(Iris.getShaderpacksDirectoryManager().getDirectoryUri())); } + public void openLinkConfirm(String url) { + this.mc.displayGuiScreen(new GuiConfirmOpenLink((result, id) -> { + if (result) { + try { + openUri(new URI(url)); + } catch (URISyntaxException e) { + Iris.logger.error("Invalid shader download URL: " + url, e); + } + } + this.mc.displayGuiScreen(this); + }, url, 0, true) { + @Override + public void initGui() { + super.initGui(); + for (int i = 0; i < this.buttonList.size(); i++) { + this.buttonList.get(i).xPosition = this.width / 2 - 155 + i * 105; + } + } + }); + } + private void openUri(URI uri) { - switch (net.minecraft.util.Util.getOSType()) { + switch (Util.getOSType()) { case OSX -> { try { Runtime.getRuntime().exec(new String[] { "/usr/bin/open", uri.toString() }); @@ -452,7 +614,7 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable { try { final Class aClass = Class.forName("java.awt.Desktop"); - final Object getDesktop = aClass.getMethod("getDesktop").invoke((Object) null); + final Object getDesktop = aClass.getMethod("getDesktop").invoke(null); aClass.getMethod("browse", URI.class).invoke(getDesktop, uri); } catch (Exception e) { e.printStackTrace(); @@ -475,17 +637,17 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable { this.hoveredElementCommentTitle = ((CommentedElementWidget) widget).getCommentTitle(); Optional commentBody = ((CommentedElementWidget) widget).getCommentBody(); - if (!commentBody.isPresent()) { + if (commentBody.isEmpty()) { this.hoveredElementCommentBody.clear(); } else { String rawCommentBody = commentBody.get(); - // Strip any trailing "."s + // Strip any trailing periods if (rawCommentBody.endsWith(".")) { rawCommentBody = rawCommentBody.substring(0, rawCommentBody.length() - 1); } // Split comment body into lines by separator ". " - List splitByPeriods = Arrays.stream(rawCommentBody.split("\\. [ ]*")).map(String::new).collect(Collectors.toList()); + List splitByPeriods = Arrays.stream(rawCommentBody.split("\\. +")).toList(); // Line wrap this.hoveredElementCommentBody = new ArrayList<>(); for (String text : splitByPeriods) { diff --git a/src/main/java/net/coderbot/iris/shaderpack/LanguageMap.java b/src/main/java/net/coderbot/iris/shaderpack/LanguageMap.java index efedaafe1..83924835d 100644 --- a/src/main/java/net/coderbot/iris/shaderpack/LanguageMap.java +++ b/src/main/java/net/coderbot/iris/shaderpack/LanguageMap.java @@ -10,6 +10,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Collections; import java.util.HashMap; +import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.Set; @@ -33,7 +34,7 @@ public class LanguageMap { stream.filter(path -> !Files.isDirectory(path)).forEach(path -> { // Also note that OptiFine uses a property scheme for loading language entries to keep parity with other // OptiFine features - final String currentFileName = path.getFileName().toString(); + final String currentFileName = path.getFileName().toString().toLowerCase(Locale.ROOT); if (!currentFileName.endsWith(".lang")) { // This file lacks a .lang file extension and should be ignored. diff --git a/src/main/resources/assets/angelica/lang/en_US.lang b/src/main/resources/assets/angelica/lang/en_US.lang index 869cbbf07..11174b36d 100644 --- a/src/main/resources/assets/angelica/lang/en_US.lang +++ b/src/main/resources/assets/angelica/lang/en_US.lang @@ -214,6 +214,8 @@ options.angelica.threadedChunkBuilding.tooltip=If enabled, chunk meshing will be pack.iris.select.title=Select pack.iris.configure.title=Configure +pack.iris.list.label=+ Drag and Drop Shader Packs to add +pack.iris.list.label.lwjgl2=Install lwjgl3ify to drag and drop Shader Packs label.iris.true=On label.iris.false=Off diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinLocale.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinLocale.java index 1e99482bc..7b1dc74c0 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinLocale.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinLocale.java @@ -78,7 +78,9 @@ public class MixinLocale { languageCodes.clear(); // Reverse order due to how minecraft has English and then the primary language in the language definitions list - new LinkedList<>(definitions).descendingIterator().forEachRemaining(languageCodes::add); + new LinkedList<>(definitions).descendingIterator() + // FQN here because due to clashing + .forEachRemaining(code -> languageCodes.add(code.toLowerCase(java.util.Locale.ROOT))); } @Inject(method = "checkUnicode", at = @At("HEAD"), cancellable = true)