From a727a659f3c5eb474ea04829c170779654ded8ea Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Sun, 6 Feb 2022 22:29:22 +0800 Subject: [PATCH 001/112] change: Fix scrollbar for longer pages --- .../client/gui/SodiumVideoOptionsScreen.java | 2 +- .../gui/frame/OptionPageScrollFrame.java | 4 +- .../frame/components/ScrollBarComponent.java | 48 ++++++++++++------- .../client/gui/frame/tab/Tab.java | 4 ++ 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index 079f7bc..18ec442 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -110,7 +110,7 @@ public BasicFrame.Builder parentBasicFrameBuilder(Dim2i parentBasicFrameDim, Dim .addChild(dim -> this.hideDonateButton) .addChild(parentDim -> TabFrame.createBuilder() .setDimension(tabFrameDim) - .addTabs(tabs -> this.pages.forEach(page -> tabs.add(dim -> new Tab.Builder<>().from(page, dim)))) + .addTabs(tabs -> this.pages.forEach(page -> tabs.add(dim -> Tab.createBuilder().from(page, dim)))) .build() ); } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java index c615e52..2ed867d 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java @@ -43,9 +43,7 @@ public void setupFrame() { OptionGroup lastGroup = this.page.getGroups().get(this.page.getGroups().size() - 1); for (OptionGroup group : this.page.getGroups()) { - for (int i = 0; i < group.getOptions().size(); i++) { - y += 18; - } + y += group.getOptions().size() * 18; if (group != lastGroup) { y += 4; } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java index 181dd4a..0fa78bf 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java @@ -15,6 +15,7 @@ public class ScrollBarComponent extends AbstractWidget { private final int maxScrollBarOffset; private final Runnable onSetOffset; private int offset = 0; + private boolean isDragging; private Dim2i scrollThumb = null; private int scrollThumbClickOffset = -1; @@ -57,22 +58,37 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { public boolean mouseClicked(double mouseX, double mouseY, int button) { if (this.dim.containsCursor(mouseX, mouseY)) { if (this.scrollThumb.containsCursor(mouseX, mouseY)) { - this.scrollThumbClickOffset = this.mode == Mode.VERTICAL ? (int) mouseY - this.scrollThumb.y() : (int) mouseX - this.scrollThumb.x(); - }else{ - int value = this.mode == Mode.VERTICAL ? (int) mouseY - this.dim.y(): (int) mouseX - this.dim.x(); + if (this.mode == Mode.VERTICAL) { + this.scrollThumbClickOffset = (int) (mouseY - (this.scrollThumb.y() + this.scrollThumb.height() / 2)); + } else { + this.scrollThumbClickOffset = (int) (mouseX - (this.scrollThumb.x() + this.scrollThumb.width() / 2)); + } + this.isDragging = true; + } else { + int value; + if (this.mode == Mode.VERTICAL) { + value = (int) ((mouseY - this.dim.y() - (this.scrollThumb.height() / 2)) / (this.dim.height() - this.scrollThumb.height()) * this.maxScrollBarOffset); + } else { + value = (int) ((mouseX - this.dim.x() - (this.scrollThumb.width() / 2)) / (this.dim.width() - this.scrollThumb.width()) * this.maxScrollBarOffset); + } this.setOffset(value); + this.isDragging = false; } return true; - } else { - this.scrollThumbClickOffset = -1; } + this.isDragging = false; return false; } @Override public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - if (this.scrollThumbClickOffset > -1) { - int value = this.mode == Mode.VERTICAL ? (int) mouseY - this.scrollThumbClickOffset : (int) mouseX - this.scrollThumbClickOffset; + if (this.isDragging) { + int value; + if (this.mode == Mode.VERTICAL) { + value = (int) ((mouseY - this.scrollThumbClickOffset - this.dim.y() - (this.scrollThumb.height() / 2)) / (this.dim.height() - this.scrollThumb.height()) * this.maxScrollBarOffset); + } else { + value = (int) ((mouseX - this.scrollThumbClickOffset - this.dim.x() - (this.scrollThumb.width() / 2)) / (this.dim.width() - this.scrollThumb.width()) * this.maxScrollBarOffset); + } this.setOffset(value); return true; } @@ -91,19 +107,14 @@ public boolean mouseScrolled(double mouseX, double mouseY, double amount) { return false; } - private void setOffset(int value) { - this.offset = MathHelper.clamp(value, 0, this.maxScrollBarOffset); - this.updateThumbPosition(); - this.onSetOffset.run(); - } - public int getOffset() { return this.offset; } - public enum Mode { - HORIZONTAL, - VERTICAL + private void setOffset(int value) { + this.offset = MathHelper.clamp(value, 0, this.maxScrollBarOffset); + this.updateThumbPosition(); + this.onSetOffset.run(); } protected void drawRectOutline(double x, double y, double w, double h, int color) { @@ -119,4 +130,9 @@ protected void drawRectOutline(double x, double y, double w, double h, int color addQuad(vertices, w - 1, y, w, h, a, r, g, b); }); } + + public enum Mode { + HORIZONTAL, + VERTICAL + } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java index 57d1257..c9c9dc3 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java @@ -17,6 +17,10 @@ public T getFrame() { return this.frame; } + public static Tab.Builder createBuilder() { + return new Tab.Builder<>(); + } + public static class Builder { private Text text = null; private T frame = null; From 178e1cd8ea785e6786f9cb2c1deb9e97d8d51c1d Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 7 Feb 2022 12:38:52 +0800 Subject: [PATCH 002/112] change: Code cleanup --- .../client/gui/SodiumVideoOptionsScreen.java | 4 +--- .../client/gui/frame/AbstractFrame.java | 9 +++------ .../client/gui/frame/BasicFrame.java | 10 +++++----- .../gui/frame/OptionPageScrollFrame.java | 18 +++++++----------- .../client/gui/frame/tab/Tab.java | 8 ++++---- .../client/gui/frame/tab/TabFrame.java | 18 ++++++++---------- 6 files changed, 28 insertions(+), 39 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index 18ec442..9fd44ec 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -33,11 +33,9 @@ public class SodiumVideoOptionsScreen extends Screen { - private AbstractFrame frame; - private final Screen prevScreen; private final List pages = new ArrayList<>(); - + private AbstractFrame frame; private FlatButtonWidget applyButton, closeButton, undoButton; private FlatButtonWidget donateButton, hideDonateButton; private boolean hasPendingChanges; diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java index bd99c7c..ea0f6a3 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java @@ -16,15 +16,12 @@ public abstract class AbstractFrame extends AbstractWidget implements ParentElement { protected final Dim2i dim; - - protected boolean renderOutline = false; - - private Element focused; - private boolean dragging; - protected final List children = new ArrayList<>(); protected final List drawable = new ArrayList<>(); protected final List> controlElements = new ArrayList<>(); + protected boolean renderOutline = false; + private Element focused; + private boolean dragging; public AbstractFrame(Dim2i dim) { this.dim = dim; diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java index c3d02f9..c96d216 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java @@ -23,6 +23,10 @@ public BasicFrame(Dim2i dim, List> functions, bo this.buildFrame(); } + public static Builder createBuilder() { + return new Builder(); + } + @Override public void buildFrame() { this.children.clear(); @@ -39,14 +43,10 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { super.render(matrices, mouseX, mouseY, delta); } - public static Builder createBuilder() { - return new Builder(); - } - public static class Builder { + private final List> functions = new ArrayList<>(); private boolean renderOutline = false; private Dim2i dim = null; - private final List> functions = new ArrayList<>(); public Builder setDimension(Dim2i dim) { this.dim = dim; diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java index 2ed867d..fdeb66a 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java @@ -19,11 +19,9 @@ import java.util.List; public class OptionPageScrollFrame extends AbstractFrame { + protected final OptionPage page; private boolean canScroll; private ScrollBarComponent scrollBar = null; - - protected final OptionPage page; - private long lastTime = 0; private ControlElement lastHoveredElement = null; @@ -34,6 +32,10 @@ public OptionPageScrollFrame(Dim2i dim, boolean renderOutline, OptionPage page) this.buildFrame(); } + public static Builder createBuilder() { + return new Builder(); + } + public void setupFrame() { this.children.clear(); this.drawable.clear(); @@ -139,7 +141,7 @@ private void renderOptionTooltip(MatrixStack matrixStack, int mouseX, int mouseY boxY -= boxHeight + dim.height(); } - if (boxY < 0){ + if (boxY < 0) { boxY = dim.getLimitY(); } @@ -190,17 +192,11 @@ public boolean mouseScrolled(double mouseX, double mouseY, double amount) { return true; } if (this.canScroll) { - if (this.scrollBar.mouseScrolled(mouseX, mouseY, amount)) { - return true; - } + return this.scrollBar.mouseScrolled(mouseX, mouseY, amount); } return false; } - public static Builder createBuilder() { - return new Builder(); - } - public static class Builder { private Dim2i dim; private boolean renderOutline; diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java index c9c9dc3..0c718db 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java @@ -8,6 +8,10 @@ public record Tab(Text text, T frame) implements TabOption { + public static Tab.Builder createBuilder() { + return new Tab.Builder<>(); + } + public Text getText() { return text; } @@ -17,10 +21,6 @@ public T getFrame() { return this.frame; } - public static Tab.Builder createBuilder() { - return new Tab.Builder<>(); - } - public static class Builder { private Text text = null; private T frame = null; diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index 8b36fc1..380f44a 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -15,14 +15,12 @@ public class TabFrame extends AbstractFrame { - private ScrollBarComponent tabSectionScrollBar = null; private final boolean tabSectionCanScroll; - private final Dim2i tabSection; private final Dim2i frameSection; - - private Tab selectedTab; private final List> tabs = new ArrayList<>(); + private ScrollBarComponent tabSectionScrollBar = null; + private Tab selectedTab; public TabFrame(Dim2i dim, List>> functions) { super(dim); @@ -44,6 +42,10 @@ public TabFrame(Dim2i dim, List>> functions, boolean rend this.renderOutline = renderOutline; } + public static Builder createBuilder() { + return new Builder(); + } + public void setTab(Tab tab) { this.selectedTab = tab; @@ -76,8 +78,8 @@ public void buildFrame() { @Override public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { this.applyScissor(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height(), () -> { - for (AbstractWidget widget: this.children) { - if (widget != this.selectedTab.getFrame()){ + for (AbstractWidget widget : this.children) { + if (widget != this.selectedTab.getFrame()) { widget.render(matrices, mouseX, mouseY, delta); } } @@ -159,10 +161,6 @@ private void rebuildTabFrame() { } } - public static Builder createBuilder() { - return new Builder(); - } - public static class Builder { private final List>> functions = new ArrayList<>(); private boolean renderOutline = false; From 18b5262158319018658206d66bf8970ed986dbb6 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Fri, 18 Feb 2022 13:27:45 +0800 Subject: [PATCH 003/112] change: Fix broken viewport on macOS Resolves #4 --- .../reeses_sodium_options/client/gui/frame/AbstractFrame.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java index ea0f6a3..7a127dc 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java @@ -69,7 +69,7 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { public void applyScissor(int x, int y, int width, int height, Runnable action) { double scale = MinecraftClient.getInstance().getWindow().getScaleFactor(); - RenderSystem.enableScissor((int) (x * scale), (int) (MinecraftClient.getInstance().getWindow().getHeight() - (y + height) * scale), + RenderSystem.enableScissor((int) (x * scale), (int) (MinecraftClient.getInstance().getWindow().getFramebufferHeight() - (y + height) * scale), (int) (width * scale), (int) (height * scale)); action.run(); RenderSystem.disableScissor(); From eb854d4785731a60e0feb33c5644ac38861f8727 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 2 Mar 2022 17:29:40 +0800 Subject: [PATCH 004/112] change: Remove jitpack --- build.gradle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index e4360eb..c162eb4 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,6 @@ version = project.mod_version group = project.maven_group repositories { - maven { url 'https://jitpack.io' } maven { name = "Modrinth" url = "https://api.modrinth.com/maven" @@ -35,9 +34,7 @@ dependencies { implementation "org.joml:joml:1.10.2" modImplementation "maven.modrinth:iris:${project.iris_version}" - modRuntime("com.github.astei:lazydfu:0.1.2") { - exclude(module: "fabric-loader") - } + modRuntimeOnly "maven.modrinth:lazydfu:0.1.2" } processResources { From 394cf0646c9b7d57fdaea0ef82b50cc20f49f8e8 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 2 Mar 2022 17:30:50 +0800 Subject: [PATCH 005/112] change: Bump for release --- build.gradle | 2 +- gradle.properties | 14 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../client/gui/SodiumVideoOptionsScreen.java | 4 ++-- src/main/resources/fabric.mod.json | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index c162eb4..f4feed8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ import com.modrinth.minotaur.TaskModrinthUpload plugins { - id 'fabric-loom' version '0.10-SNAPSHOT' + id 'fabric-loom' version '0.11-SNAPSHOT' id 'maven-publish' id "com.modrinth.minotaur" version "1.2.1" } diff --git a/gradle.properties b/gradle.properties index 6e19d09..c1ffb3d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,17 +2,17 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.18.1 - yarn_mappings=1.18.1+build.22 - loader_version=0.12.12 + minecraft_version=1.18.2 + yarn_mappings=1.18.2+build.1 + loader_version=0.13.3 # Mod Properties - mod_version=1.4.0 + mod_version=1.4.1 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options # Dependency - sodium_version=mc1.18.1-0.4.0-alpha6 - iris_version=1.18.x-v1.2.0 + sodium_version=mc1.18.2-0.4.1 + iris_version=1.18.x-v1.2.1 #Fabric api - fabric_version=0.46.2+1.18 + fabric_version=0.47.8+1.18.2 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e589..41dfb87 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index 9fd44ec..a197b9c 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -72,7 +72,7 @@ protected BasicFrame.Builder parentFrameBuilder() { this.undoButton = new FlatButtonWidget(undoButtonDim, new TranslatableText("sodium.options.buttons.undo"), this::undoChanges); this.applyButton = new FlatButtonWidget(applyButtonDim, new TranslatableText("sodium.options.buttons.apply"), this::applyChanges); - this.closeButton = new FlatButtonWidget(closeButtonDim, new TranslatableText("gui.done"), this::onClose); + this.closeButton = new FlatButtonWidget(closeButtonDim, new TranslatableText("gui.done"), this::close); this.donateButton = new FlatButtonWidget(donateButtonDim, new TranslatableText("sodium.options.buttons.donate"), this::openDonationPage); this.hideDonateButton = new FlatButtonWidget(hideDonateButtonDim, new LiteralText("x"), this::hideDonationButton); @@ -225,7 +225,7 @@ public boolean shouldCloseOnEsc() { } @Override - public void onClose() { + public void close() { this.client.setScreen(this.prevScreen); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c6549f9..0e65dc7 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,8 +24,8 @@ } }, "depends": { - "minecraft": "1.18.x", - "fabricloader": ">=0.12.5", + "minecraft": "1.18.2", + "fabricloader": ">=0.13", "sodium": "*" }, "breaks": { @@ -33,6 +33,6 @@ "sodium-extra": "<0.3.7" }, "recommends": { - "sodium-extra": ">=0.3.7" + "sodium-extra": ">=0.4.0" } } From 07b049a81672670b1dc1219cb05a4c3d85783d97 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 7 Mar 2022 16:00:25 +0800 Subject: [PATCH 006/112] change: Use `publish-minecraft-mods` actions for Modrinth & CurseForge releases --- .github/workflows/publish.yml | 24 +++++++++++++++--------- build.gradle | 21 +-------------------- 2 files changed, 16 insertions(+), 29 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1b4e179..8835101 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,13 +21,19 @@ jobs: run: ./gradlew build env: BUILD_RELEASE: ${{ github.event.prerelease == false }} - - name: Publish to Modrinth - env: - MODRINTH_API: ${{ secrets.MODRINTH_API }} - CHANGELOG: ${{ github.event.release.body }} - run: ./gradlew publishModrinth - - name: Upload assets to GitHub - uses: AButler/upload-release-assets@v2.0 + - name: Publish to Modrinth & CurseForge + uses: Kir-Antipov/mc-publish@v2.1 with: - files: 'build/libs/*;LICENSE.txt' - repo-token: ${{ secrets.GITHUB_TOKEN }} + modrinth-id: Bh37bMuy + modrinth-token: ${{ secrets.MODRINTH_TOKEN }} + + curseforge-id: 511319 + curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} + + github-token: ${{ secrets.GITHUB_TOKEN }} + + version-type: release + + loaders: fabric + + version-resolver: latest \ No newline at end of file diff --git a/build.gradle b/build.gradle index f4feed8..dc0f9e2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,6 @@ -import com.modrinth.minotaur.TaskModrinthUpload - plugins { id 'fabric-loom' version '0.11-SNAPSHOT' id 'maven-publish' - id "com.modrinth.minotaur" version "1.2.1" } sourceCompatibility = JavaVersion.VERSION_17 @@ -83,20 +80,4 @@ publishing { // uncomment to publish to the local maven // mavenLocal() } -} - -task publishModrinth (type: TaskModrinthUpload){ // Make sure it runs after build! - onlyIf { - System.getenv("MODRINTH_API") // Only attempt to run this task if the MODRINTH variable is set, otherwise SKIP it - } - - token = System.getenv("MODRINTH_API") // An environment property called MODRINTH that is your token, set via Gradle CLI, GitHub Actions, Idea Run Configuration, or other - projectId = 'Bh37bMuy' - versionName = "Reese's Sodium Options ${project.mod_version} for Minecraft ${project.minecraft_version}" - versionNumber = "mc${project.minecraft_version}-${project.mod_version}" // Will fail if Modrinth has this version already - changelog = System.getenv("CHANGELOG") - // On fabric, use 'remapJar' instead of 'jar' - uploadFile = remapJar // This is the java jar task. If it can't find the jar, try 'jar.outputs.getFiles().asPath' in place of 'jar' - addGameVersion("${project.minecraft_version}") // Call this multiple times to add multiple game versions. There are tools that can help you generate the list of versions - addLoader('fabric') -} +} \ No newline at end of file From ca2b0ffcfdfa0d2b4ce588c20971994d19e0e1a1 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 7 Mar 2022 16:10:49 +0800 Subject: [PATCH 007/112] change: Read page list from Sodium's config screen --- .../client/gui/SodiumVideoOptionsScreen.java | 16 +++------ .../gui/frame/OptionPageScrollFrame.java | 14 ++++---- .../mixin/sodium/MixinOptionsScreen.java | 27 --------------- .../mixin/sodium/MixinSodiumOptionsGUI.java | 33 +++++++++++++++++++ .../reeses-sodium-options.mixins.json | 2 +- 5 files changed, 47 insertions(+), 45 deletions(-) delete mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinOptionsScreen.java create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index a197b9c..e60d1af 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -5,7 +5,6 @@ import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab.Tab; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab.TabFrame; import me.jellysquid.mods.sodium.client.SodiumClientMod; -import me.jellysquid.mods.sodium.client.gui.SodiumGameOptionPages; import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions; import me.jellysquid.mods.sodium.client.gui.options.Option; import me.jellysquid.mods.sodium.client.gui.options.OptionFlag; @@ -40,15 +39,10 @@ public class SodiumVideoOptionsScreen extends Screen { private FlatButtonWidget donateButton, hideDonateButton; private boolean hasPendingChanges; - public SodiumVideoOptionsScreen(Screen prev) { + public SodiumVideoOptionsScreen(Screen prev, List pages) { super(new LiteralText("Reese's Sodium Menu")); - this.prevScreen = prev; - - this.pages.add(SodiumGameOptionPages.general()); - this.pages.add(SodiumGameOptionPages.quality()); - this.pages.add(SodiumGameOptionPages.performance()); - this.pages.add(SodiumGameOptionPages.advanced()); + this.pages.addAll(pages); } @Override @@ -60,8 +54,8 @@ protected void init() { protected BasicFrame.Builder parentFrameBuilder() { BasicFrame.Builder basicFrameBuilder; - Dim2i basicFrameDim = new Dim2i(0, 0, this.client.getWindow().getScaledWidth(), this.client.getWindow().getScaledHeight()); - Dim2i tabFrameDim = new Dim2i(basicFrameDim.width() / 4 / 2, basicFrameDim.height() / 4 / 2, basicFrameDim.width() / 4 * 3, basicFrameDim.height() / 4 * 3); + Dim2i basicFrameDim = new Dim2i(0, 0, this.width, this.height); + Dim2i tabFrameDim = new Dim2i(basicFrameDim.width() / 20 / 2, basicFrameDim.height() / 4 / 2, basicFrameDim.width() - (basicFrameDim.width() / 20), basicFrameDim.height() / 4 * 3); Dim2i undoButtonDim = new Dim2i(tabFrameDim.getLimitX() - 203, tabFrameDim.getLimitY() + 5, 65, 20); Dim2i applyButtonDim = new Dim2i(tabFrameDim.getLimitX() - 134, tabFrameDim.getLimitY() + 5, 65, 20); @@ -108,7 +102,7 @@ public BasicFrame.Builder parentBasicFrameBuilder(Dim2i parentBasicFrameDim, Dim .addChild(dim -> this.hideDonateButton) .addChild(parentDim -> TabFrame.createBuilder() .setDimension(tabFrameDim) - .addTabs(tabs -> this.pages.forEach(page -> tabs.add(dim -> Tab.createBuilder().from(page, dim)))) + .addTabs(tabs -> this.pages.stream().filter(page -> !page.getGroups().isEmpty()).forEach(page -> tabs.add(dim -> Tab.createBuilder().from(page, dim)))) .build() ); } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java index fdeb66a..bbc4ddb 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java @@ -42,12 +42,14 @@ public void setupFrame() { this.controlElements.clear(); int y = 0; - OptionGroup lastGroup = this.page.getGroups().get(this.page.getGroups().size() - 1); - - for (OptionGroup group : this.page.getGroups()) { - y += group.getOptions().size() * 18; - if (group != lastGroup) { - y += 4; + if (!this.page.getGroups().isEmpty()) { + OptionGroup lastGroup = this.page.getGroups().get(this.page.getGroups().size() - 1); + + for (OptionGroup group : this.page.getGroups()) { + y += group.getOptions().size() * 18; + if (group != lastGroup) { + y += 4; + } } } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinOptionsScreen.java deleted file mode 100644 index 303cccf..0000000 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinOptionsScreen.java +++ /dev/null @@ -1,27 +0,0 @@ -package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; - -import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.option.OptionsScreen; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.text.Text; -import org.spongepowered.asm.mixin.Dynamic; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(value = OptionsScreen.class, priority = 999) -public class MixinOptionsScreen extends Screen { - protected MixinOptionsScreen(Text title) { - super(title); - } - - @Dynamic - @Inject(method = "method_19828(Lnet/minecraft/client/gui/widget/ButtonWidget;)V", at = @At("HEAD"), cancellable = true) - private void open(ButtonWidget widget, CallbackInfo ci) { - this.client.setScreen(new SodiumVideoOptionsScreen(this)); - - ci.cancel(); - } -} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java new file mode 100644 index 0000000..18d497e --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java @@ -0,0 +1,33 @@ +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; +import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; +import me.jellysquid.mods.sodium.client.gui.options.OptionPage; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.List; + +@Mixin(SodiumOptionsGUI.class) +public abstract class MixinSodiumOptionsGUI extends Screen{ + + @Shadow @Final private List pages; + + @Shadow @Final private Screen prevScreen; + + protected MixinSodiumOptionsGUI(Text title) { + super(title); + } + + @Inject(method = "init", at = @At("TAIL")) + public void postInit(CallbackInfo ci){ + this.client.setScreen(new SodiumVideoOptionsScreen(this.prevScreen, this.pages)); + } +} diff --git a/src/main/resources/reeses-sodium-options.mixins.json b/src/main/resources/reeses-sodium-options.mixins.json index 138f093..4af0a4e 100644 --- a/src/main/resources/reeses-sodium-options.mixins.json +++ b/src/main/resources/reeses-sodium-options.mixins.json @@ -5,7 +5,7 @@ "compatibilityLevel": "JAVA_17", "client": [ "sodium.MixinControlElement", - "sodium.MixinOptionsScreen", + "sodium.MixinSodiumOptionsGUI", "sodium.MixinSliderControl" ], "injectors": { From a15eee057b211818862659b48a1e7e6041aa38d7 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 9 Mar 2022 13:06:20 +0800 Subject: [PATCH 008/112] change: Fix tab list not being able to drag outside of scroll area --- .../client/gui/frame/tab/TabFrame.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index 380f44a..c52a6fe 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -95,7 +95,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) { if (this.dim.containsCursor(mouseX, mouseY) && super.mouseClicked(mouseX, mouseY, button)) { return true; } - if (this.tabSectionCanScroll && this.tabSection.containsCursor(mouseX, mouseY)) { + if (this.tabSectionCanScroll) { return this.tabSectionScrollBar.mouseClicked(mouseX, mouseY, button); } return false; @@ -106,7 +106,7 @@ public boolean mouseDragged(double mouseX, double mouseY, int button, double del if (super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { return true; } - if (this.tabSectionCanScroll && this.tabSection.containsCursor(mouseX, mouseY)) { + if (this.tabSectionCanScroll) { return this.tabSectionScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY); } return false; @@ -117,7 +117,7 @@ public boolean mouseReleased(double mouseX, double mouseY, int button) { if (super.mouseReleased(mouseX, mouseY, button)) { return true; } - if (this.tabSectionCanScroll && this.tabSection.containsCursor(mouseX, mouseY)) { + if (this.tabSectionCanScroll) { return this.tabSectionScrollBar.mouseReleased(mouseX, mouseY, button); } return false; @@ -128,7 +128,7 @@ public boolean mouseScrolled(double mouseX, double mouseY, double amount) { if (super.mouseScrolled(mouseX, mouseY, amount)) { return true; } - if (this.tabSectionCanScroll && this.tabSection.containsCursor(mouseX, mouseY)) { + if (this.tabSectionCanScroll) { return this.tabSectionScrollBar.mouseScrolled(mouseX, mouseY, amount); } return false; From 0c989051cfaac833d40665e68d07e1a645dcfe10 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 9 Mar 2022 13:07:19 +0800 Subject: [PATCH 009/112] refactor: Clean up & formatting --- .../frame/components/ScrollBarComponent.java | 17 ++++++----------- .../client/gui/frame/tab/Tab.java | 18 +++++++++--------- .../client/gui/frame/tab/TabFrame.java | 2 +- .../mixin/sodium/MixinSodiumOptionsGUI.java | 15 +++++++++------ 4 files changed, 25 insertions(+), 27 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java index 0fa78bf..f3e680f 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java @@ -18,12 +18,12 @@ public class ScrollBarComponent extends AbstractWidget { private boolean isDragging; private Dim2i scrollThumb = null; - private int scrollThumbClickOffset = -1; + private int scrollThumbClickOffset; private Dim2i extendedScrollArea = null; - public ScrollBarComponent(Dim2i scrollBarArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset) { - this.dim = scrollBarArea; + public ScrollBarComponent(Dim2i trackArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset) { + this.dim = trackArea; this.mode = mode; this.frameLength = frameLength; this.viewPortLength = viewPortLength; @@ -31,14 +31,9 @@ public ScrollBarComponent(Dim2i scrollBarArea, Mode mode, int frameLength, int v this.maxScrollBarOffset = this.frameLength - this.viewPortLength; } - public ScrollBarComponent(Dim2i scrollBarArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset, Dim2i extendedScrollArea) { - this.dim = scrollBarArea; - this.mode = mode; - this.frameLength = frameLength; - this.viewPortLength = viewPortLength; - this.extendedScrollArea = extendedScrollArea; - this.onSetOffset = onSetOffset; - this.maxScrollBarOffset = this.frameLength - this.viewPortLength; + public ScrollBarComponent(Dim2i scrollBarArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset, Dim2i extendedTrackArea) { + this(scrollBarArea, mode, frameLength, viewPortLength, onSetOffset); + this.extendedScrollArea = extendedTrackArea; } public void updateThumbPosition() { diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java index 0c718db..b1e0f5f 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java @@ -6,14 +6,14 @@ import me.jellysquid.mods.sodium.client.util.Dim2i; import net.minecraft.text.Text; -public record Tab(Text text, T frame) implements TabOption { +public record Tab(Text title, T frame) implements TabOption { public static Tab.Builder createBuilder() { return new Tab.Builder<>(); } - public Text getText() { - return text; + public Text getTitle() { + return title; } @Override @@ -22,11 +22,11 @@ public T getFrame() { } public static class Builder { - private Text text = null; + private Text title = null; private T frame = null; - public Builder setText(Text text) { - this.text = text; + public Builder setTitle(Text title) { + this.title = title; return this; } @@ -36,12 +36,12 @@ public Builder setFrame(T frame) { } public Tab build() { - return new Tab(this.text, this.frame); + return new Tab(this.title, this.frame); } public Tab from(OptionPage page, Dim2i dim) { - this.text = page.getName(); - return new Tab<>(this.text, OptionPageScrollFrame.createBuilder().setDimension(dim).setOptionPage(page).build()); + this.title = page.getName(); + return new Tab<>(this.title, OptionPageScrollFrame.createBuilder().setDimension(dim).setOptionPage(page).build()); } } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index c52a6fe..461a21d 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -144,7 +144,7 @@ private void rebuildTabs() { int height = 18; Dim2i tabDim = new Dim2i(x, y, width, height); - FlatButtonWidget button = new FlatButtonWidget(tabDim, tab.getText(), () -> this.setTab(tab)); + FlatButtonWidget button = new FlatButtonWidget(tabDim, tab.getTitle(), () -> this.setTab(tab)); button.setSelected(this.selectedTab == tab); this.children.add(button); diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java index 18d497e..9cbba12 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java @@ -3,7 +3,6 @@ import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; import me.jellysquid.mods.sodium.client.gui.options.OptionPage; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Final; @@ -16,18 +15,22 @@ import java.util.List; @Mixin(SodiumOptionsGUI.class) -public abstract class MixinSodiumOptionsGUI extends Screen{ +public abstract class MixinSodiumOptionsGUI extends Screen { - @Shadow @Final private List pages; + @Shadow + @Final + private List pages; - @Shadow @Final private Screen prevScreen; + @Shadow + @Final + private Screen prevScreen; protected MixinSodiumOptionsGUI(Text title) { super(title); - } + } @Inject(method = "init", at = @At("TAIL")) - public void postInit(CallbackInfo ci){ + public void postInit(CallbackInfo ci) { this.client.setScreen(new SodiumVideoOptionsScreen(this.prevScreen, this.pages)); } } From d0eaec69ccb57c5875490c2ce411b58478be69e0 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 9 Mar 2022 13:10:41 +0800 Subject: [PATCH 010/112] change: Bump for release --- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 59821 bytes gradlew | 10 +++++----- src/main/resources/fabric.mod.json | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index c1ffb3d..2f835b6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.18.2+build.1 loader_version=0.13.3 # Mod Properties - mod_version=1.4.1 + mod_version=1.4.2 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options @@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1G iris_version=1.18.x-v1.2.1 #Fabric api - fabric_version=0.47.8+1.18.2 + fabric_version=0.47.10+1.18.2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 GIT binary patch delta 8958 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 diff --git a/gradlew b/gradlew index c53aefa..1b6c787 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 0e65dc7..35cbafa 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,15 +24,15 @@ } }, "depends": { - "minecraft": "1.18.2", + "minecraft": ">=1.18", "fabricloader": ">=0.13", "sodium": "*" }, "breaks": { "iris": "<1.1.4", - "sodium-extra": "<0.3.7" + "sodium-extra": "<0.4.1" }, "recommends": { - "sodium-extra": ">=0.4.0" + "sodium-extra": ">=0.4.2" } } From 1087306db497a42680da53f171e39651a45cc109 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 9 Mar 2022 13:47:33 +0800 Subject: [PATCH 011/112] change: Add dependencies manually to publish task --- .github/workflows/publish.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8835101..974e868 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -36,4 +36,8 @@ jobs: loaders: fabric - version-resolver: latest \ No newline at end of file + version-resolver: latest + dependencies: | + sodium | depends | * + sodium-extra | recommends | * + iris | recommends | * \ No newline at end of file From 6be37eb418b2ee0ddb3bb78547b0bfcdaceb4630 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 16 Mar 2022 23:46:23 +0800 Subject: [PATCH 012/112] change: Mix directly into SliderControlElement --- .../client/gui/SliderControlElement.java | 150 ------------------ .../mixin/sodium/MixinSliderControl.java | 42 ----- .../sodium/MixinSliderControlElement.java | 79 +++++++++ .../reeses-sodium-options.mixins.json | 4 +- 4 files changed, 81 insertions(+), 194 deletions(-) delete mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SliderControlElement.java delete mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControl.java create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SliderControlElement.java deleted file mode 100644 index 1a4a480..0000000 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SliderControlElement.java +++ /dev/null @@ -1,150 +0,0 @@ -package me.flashyreese.mods.reeses_sodium_options.client.gui; - -import me.jellysquid.mods.sodium.client.gui.options.Option; -import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; -import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.util.math.Rect2i; -import net.minecraft.util.math.MathHelper; - -public class SliderControlElement extends ControlElement { - private static final int THUMB_WIDTH = 2, TRACK_HEIGHT = 1; - - private final Rect2i sliderBounds; - private final ControlValueFormatter formatter; - - private final int min; - private final int max; - private final int range; - private final int interval; - - private double thumbPosition; - - public SliderControlElement(Option option, Dim2i dim, int min, int max, int interval, ControlValueFormatter formatter) { - super(option, dim); - - this.min = min; - this.max = max; - this.range = max - min; - this.interval = interval; - this.thumbPosition = this.getThumbPositionForValue(option.getValue()); - this.formatter = formatter; - - this.sliderBounds = new Rect2i(dim.getLimitX() - 96, dim.getCenterY() - 5, 90, 10); - } - - @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, float delta) { - super.render(matrixStack, mouseX, mouseY, delta); - - if (this.option.isAvailable() && this.hovered) { - this.renderSlider(matrixStack); - } else { - this.renderStandaloneValue(matrixStack); - } - } - - private void renderStandaloneValue(MatrixStack matrixStack) { - int sliderX = this.sliderBounds.getX(); - int sliderY = this.sliderBounds.getY(); - int sliderWidth = this.sliderBounds.getWidth(); - int sliderHeight = this.sliderBounds.getHeight(); - - String label = this.formatter.format(this.option.getValue()); - int labelWidth = this.font.getWidth(label); - - this.drawString(matrixStack, label, sliderX + sliderWidth - labelWidth, sliderY + (sliderHeight / 2) - 4, 0xFFFFFFFF); - } - - private void renderSlider(MatrixStack matrixStack) { - int sliderX = this.sliderBounds.getX(); - int sliderY = this.sliderBounds.getY(); - int sliderWidth = this.sliderBounds.getWidth(); - int sliderHeight = this.sliderBounds.getHeight(); - - this.thumbPosition = this.getThumbPositionForValue(option.getValue()); - - double thumbOffset = MathHelper.clamp((double) (this.getIntValue() - this.min) / this.range * sliderWidth, 0, sliderWidth); - - double thumbX = sliderX + thumbOffset - THUMB_WIDTH; - double trackY = sliderY + (sliderHeight / 2D) - ((double) TRACK_HEIGHT / 2); - - this.drawRect(thumbX, sliderY, thumbX + (THUMB_WIDTH * 2), sliderY + sliderHeight, 0xFFFFFFFF); - this.drawRect(sliderX, trackY, sliderX + sliderWidth, trackY + TRACK_HEIGHT, 0xFFFFFFFF); - - String label = String.valueOf(this.getIntValue()); - - int labelWidth = this.font.getWidth(label); - - this.drawString(matrixStack, label, sliderX - labelWidth - 6, sliderY + (sliderHeight / 2) - 4, 0xFFFFFFFF); - } - - public int getIntValue() { - return this.min + (this.interval * (int) Math.round(this.getSnappedThumbPosition() / this.interval)); - } - - public double getSnappedThumbPosition() { - return this.thumbPosition / (1.0D / this.range); - } - - public double getThumbPositionForValue(int value) { - return (value - this.min) * (1.0D / this.range); - } - - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (this.option.isAvailable() && button == 0 && this.sliderBounds.contains((int) mouseX, (int) mouseY)) { - this.setValueFromMouse(mouseX); - - return true; - } - - return false; - } - - private void setValueFromMouse(double d) { - this.setValue((d - (double) (this.sliderBounds.getX() + 4)) / (double) (this.sliderBounds.getWidth() - 8)); - } - - private void setValueFromMouseScroll(double amount) { - if (this.option.getValue() + this.interval * (int) amount <= this.max && this.option.getValue() + this.interval * (int) amount >= this.min) { - this.option.setValue(this.option.getValue() + this.interval * (int) amount); - this.thumbPosition = this.getThumbPositionForValue(this.option.getValue()); - } - } - - - private void setValue(double d) { - this.thumbPosition = MathHelper.clamp(d, 0.0D, 1.0D); - - int value = this.getIntValue(); - - if (this.option.getValue() != value) { - this.option.setValue(value); - } - } - - @Override - public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - if (this.option.isAvailable() && button == 0) { - this.setValueFromMouse(mouseX); - - return true; - } - - return false; - } - - @Override - public boolean mouseScrolled(double mouseX, double mouseY, double amount) { - if (this.option.isAvailable() && this.sliderBounds.contains((int) mouseX, (int) mouseY) && Screen.hasShiftDown()) { - this.setValueFromMouseScroll(amount); - - return true; - } - - return false; - } -} \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControl.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControl.java deleted file mode 100644 index 212ed31..0000000 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControl.java +++ /dev/null @@ -1,42 +0,0 @@ -package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; - -import me.flashyreese.mods.reeses_sodium_options.client.gui.SliderControlElement; -import me.jellysquid.mods.sodium.client.gui.options.Option; -import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; -import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter; -import me.jellysquid.mods.sodium.client.gui.options.control.SliderControl; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(SliderControl.class) -public class MixinSliderControl { - @Shadow - @Final - private Option option; - - @Shadow - @Final - private int max; - - @Shadow - @Final - private int min; - - @Shadow - @Final - private int interval; - - @Shadow - @Final - private ControlValueFormatter mode; - - @Inject(method = "createElement", at = @At(value = "RETURN"), cancellable = true, remap = false) - public void createElement(Dim2i dim, CallbackInfoReturnable> cir) { - cir.setReturnValue(new SliderControlElement(this.option, dim, this.min, this.max, this.interval, this.mode)); - } -} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java new file mode 100644 index 0000000..59b9643 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -0,0 +1,79 @@ +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.jellysquid.mods.sodium.client.gui.options.Option; +import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; +import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.util.math.Rect2i; +import net.minecraft.util.math.MathHelper; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button") +public abstract class MixinSliderControlElement extends ControlElement { + + @Shadow + @Final + private int interval; + + @Shadow + private double thumbPosition; + + @Shadow + @Final + private int min; + + private int max; + + @Shadow + @Final + private Rect2i sliderBounds; + + public MixinSliderControlElement(Option option, Dim2i dim) { + super(option, dim); + } + + @Shadow + public abstract double getThumbPositionForValue(int value); + + @Shadow + public abstract int getIntValue(); + + @Inject(method = "", at = @At(value = "TAIL")) + public void postInit(Option option, Dim2i dim, int min, int max, int interval, ControlValueFormatter formatter, CallbackInfo ci) { + this.max = max; + } + + private void setValueFromMouseScroll(double amount) { + if (this.option.getValue() + this.interval * (int) amount <= this.max && this.option.getValue() + this.interval * (int) amount >= this.min) { + this.option.setValue(this.option.getValue() + this.interval * (int) amount); + this.thumbPosition = this.getThumbPositionForValue(this.option.getValue()); + } + } + + private void setValue(double d) { + this.thumbPosition = MathHelper.clamp(d, 0.0D, 1.0D); + + int value = this.getIntValue(); + + if (this.option.getValue() != value) { + this.option.setValue(value); + } + } + + @Override + public boolean mouseScrolled(double mouseX, double mouseY, double amount) { + if (this.option.isAvailable() && this.sliderBounds.contains((int) mouseX, (int) mouseY) && Screen.hasShiftDown()) { + this.setValueFromMouseScroll(amount); + + return true; + } + + return false; + } +} \ No newline at end of file diff --git a/src/main/resources/reeses-sodium-options.mixins.json b/src/main/resources/reeses-sodium-options.mixins.json index 4af0a4e..fd8f774 100644 --- a/src/main/resources/reeses-sodium-options.mixins.json +++ b/src/main/resources/reeses-sodium-options.mixins.json @@ -5,8 +5,8 @@ "compatibilityLevel": "JAVA_17", "client": [ "sodium.MixinControlElement", - "sodium.MixinSodiumOptionsGUI", - "sodium.MixinSliderControl" + "sodium.MixinSliderControlElement", + "sodium.MixinSodiumOptionsGUI" ], "injectors": { "defaultRequire": 1 From ea3c458e43178023a6e1d4fa578cafc6e411da7d Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Fri, 18 Mar 2022 09:53:25 +0800 Subject: [PATCH 013/112] refactor: Clean up framework --- .../client/gui/SodiumVideoOptionsScreen.java | 2 + .../client/gui/frame/AbstractFrame.java | 19 +--------- .../client/gui/frame/BasicFrame.java | 37 +++++-------------- .../gui/frame/OptionPageScrollFrame.java | 13 ++++--- .../client/gui/frame/tab/Tab.java | 7 ++-- .../client/gui/frame/tab/TabFrame.java | 32 ++++------------ 6 files changed, 32 insertions(+), 78 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index e60d1af..19eac31 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -95,6 +95,7 @@ protected BasicFrame.Builder parentFrameBuilder() { public BasicFrame.Builder parentBasicFrameBuilder(Dim2i parentBasicFrameDim, Dim2i tabFrameDim) { return BasicFrame.createBuilder() .setDimension(parentBasicFrameDim) + .shouldRenderOutline(false) .addChild(dim -> this.undoButton) .addChild(dim -> this.applyButton) .addChild(dim -> this.closeButton) @@ -102,6 +103,7 @@ public BasicFrame.Builder parentBasicFrameBuilder(Dim2i parentBasicFrameDim, Dim .addChild(dim -> this.hideDonateButton) .addChild(parentDim -> TabFrame.createBuilder() .setDimension(tabFrameDim) + .shouldRenderOutline(false) .addTabs(tabs -> this.pages.stream().filter(page -> !page.getGroups().isEmpty()).forEach(page -> tabs.add(dim -> Tab.createBuilder().from(page, dim)))) .build() ); diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java index 7a127dc..42232d5 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java @@ -19,27 +19,12 @@ public abstract class AbstractFrame extends AbstractWidget implements ParentElem protected final List children = new ArrayList<>(); protected final List drawable = new ArrayList<>(); protected final List> controlElements = new ArrayList<>(); - protected boolean renderOutline = false; + protected boolean renderOutline; private Element focused; private boolean dragging; - public AbstractFrame(Dim2i dim) { - this.dim = dim; - } - - public AbstractFrame(Dim2i dim, List children) { - this(dim); - this.children.addAll(children); - } - public AbstractFrame(Dim2i dim, boolean renderOutline) { - this(dim); - this.renderOutline = renderOutline; - } - - public AbstractFrame(Dim2i dim, List children, boolean renderOutline) { - this(dim); - this.children.addAll(children); + this.dim = dim; this.renderOutline = renderOutline; } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java index c96d216..e000b73 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java @@ -3,6 +3,7 @@ import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; import net.minecraft.client.util.math.MatrixStack; +import org.apache.commons.lang3.Validate; import java.util.ArrayList; import java.util.List; @@ -12,12 +13,7 @@ public class BasicFrame extends AbstractFrame { protected List> functions; - public BasicFrame(Dim2i dim, boolean renderOutline) { - super(dim, renderOutline); - this.buildFrame(); - } - - public BasicFrame(Dim2i dim, List> functions, boolean renderOutline) { + public BasicFrame(Dim2i dim, boolean renderOutline, List> functions) { super(dim, renderOutline); this.functions = functions; this.buildFrame(); @@ -45,16 +41,16 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { public static class Builder { private final List> functions = new ArrayList<>(); - private boolean renderOutline = false; - private Dim2i dim = null; + private Dim2i dim; + private boolean renderOutline; public Builder setDimension(Dim2i dim) { this.dim = dim; return this; } - public Builder shouldRenderOutline(boolean state) { - this.renderOutline = state; + public Builder shouldRenderOutline(boolean renderOutline) { + this.renderOutline = renderOutline; return this; } @@ -63,25 +59,10 @@ public Builder addChild(Function function) { return this; } - public Builder addChildren(List> functions) { - this.functions.addAll(functions); - return this; - } - - public boolean isRenderOutline() { - return renderOutline; - } - - public Dim2i getDim() { - return dim; - } - - public List> getFunctions() { - return functions; - } - public BasicFrame build() { - return new BasicFrame(this.dim, this.functions, this.renderOutline); + Validate.notNull(this.dim, "Dimension must be specified"); + + return new BasicFrame(this.dim, this.renderOutline, this.functions); } } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java index bbc4ddb..0ac1833 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java @@ -14,6 +14,7 @@ import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; import net.minecraft.util.Language; +import org.apache.commons.lang3.Validate; import java.util.ArrayList; import java.util.List; @@ -104,14 +105,14 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { if (this.lastTime == 0) { this.lastTime = System.currentTimeMillis(); } - this.renderOptionTooltip(matrices, mouseX, mouseY, hoveredElement); + this.renderOptionTooltip(matrices, hoveredElement); } else { this.lastTime = 0; this.lastHoveredElement = hoveredElement; } } - private void renderOptionTooltip(MatrixStack matrixStack, int mouseX, int mouseY, ControlElement element) { + private void renderOptionTooltip(MatrixStack matrixStack, ControlElement element) { if (this.lastTime + 500 > System.currentTimeMillis()) return; Dim2i dim = element.getDimensions(); @@ -209,9 +210,9 @@ public Builder setDimension(Dim2i dim) { return this; } - public Builder shouldRenderOutline(boolean state) { - this.renderOutline = state; - return this; + public Builder shouldRenderOutline(boolean renderOutline) { + this.renderOutline = renderOutline; + return this; } public Builder setOptionPage(OptionPage page) { @@ -220,6 +221,8 @@ public Builder setOptionPage(OptionPage page) { } public OptionPageScrollFrame build() { + Validate.notNull(this.dim, "Dimension must be specified"); + return new OptionPageScrollFrame(this.dim, this.renderOutline, this.page); } } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java index b1e0f5f..62ef021 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java @@ -22,8 +22,8 @@ public T getFrame() { } public static class Builder { - private Text title = null; - private T frame = null; + private Text title; + private T frame; public Builder setTitle(Text title) { this.title = title; @@ -40,8 +40,7 @@ public Tab build() { } public Tab from(OptionPage page, Dim2i dim) { - this.title = page.getName(); - return new Tab<>(this.title, OptionPageScrollFrame.createBuilder().setDimension(dim).setOptionPage(page).build()); + return new Tab<>(page.getName(), OptionPageScrollFrame.createBuilder().setDimension(dim).shouldRenderOutline(false).setOptionPage(page).build()); } } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index 461a21d..6106867 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -22,8 +22,8 @@ public class TabFrame extends AbstractFrame { private ScrollBarComponent tabSectionScrollBar = null; private Tab selectedTab; - public TabFrame(Dim2i dim, List>> functions) { - super(dim); + public TabFrame(Dim2i dim, boolean renderOutline, List>> functions) { + super(dim, renderOutline); this.tabSection = new Dim2i(this.dim.x(), this.dim.y(), (int) (this.dim.width() * 0.35D), this.dim.height()); this.frameSection = new Dim2i(this.tabSection.getLimitX(), this.dim.y(), this.dim.width() - this.tabSection.width(), this.dim.height()); functions.forEach(function -> this.tabs.add(function.apply(this.frameSection))); @@ -37,11 +37,6 @@ public TabFrame(Dim2i dim, List>> functions) { this.buildFrame(); } - public TabFrame(Dim2i dim, List>> functions, boolean renderOutline) { - this(dim, functions); - this.renderOutline = renderOutline; - } - public static Builder createBuilder() { return new Builder(); } @@ -59,7 +54,7 @@ public void buildFrame() { this.controlElements.clear(); if (this.selectedTab == null) { - if (this.tabs != null && !this.tabs.isEmpty()) { + if (!this.tabs.isEmpty()) { // Just use the first tab for now this.selectedTab = this.tabs.get(0); } @@ -135,7 +130,6 @@ public boolean mouseScrolled(double mouseX, double mouseY, double amount) { } private void rebuildTabs() { - if (this.tabs == null) return; int offsetY = 0; for (Tab tab : this.tabs) { int x = this.tabSection.x(); @@ -163,26 +157,16 @@ private void rebuildTabFrame() { public static class Builder { private final List>> functions = new ArrayList<>(); - private boolean renderOutline = false; - private Dim2i dim = null; + private Dim2i dim; + private boolean renderOutline; public Builder setDimension(Dim2i dim) { this.dim = dim; return this; } - public Builder shouldRenderOutline(boolean state) { - this.renderOutline = state; - return this; - } - - public Builder addTab(Function> function) { - this.functions.add(function); - return this; - } - - public Builder addTabs(List>> functions) { - this.functions.addAll(functions); + public Builder shouldRenderOutline(boolean renderOutline) { + this.renderOutline = renderOutline; return this; } @@ -194,7 +178,7 @@ public Builder addTabs(Consumer>>> tabs) { public TabFrame build() { Validate.notNull(this.dim, "Dimension must be specified"); - return new TabFrame(this.dim, this.functions, this.renderOutline); + return new TabFrame(this.dim, this.renderOutline, this.functions); } } } \ No newline at end of file From 0b42633a5d18c1866a084d9b0fd88b7d377dfce3 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Fri, 18 Mar 2022 09:56:10 +0800 Subject: [PATCH 014/112] change: Recommend Iris when publishing --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 974e868..1af8890 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -40,4 +40,5 @@ jobs: dependencies: | sodium | depends | * sodium-extra | recommends | * + irisshaders | recommends | * iris | recommends | * \ No newline at end of file From 95365619815a28bc19767fbad644578069928418 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Sat, 14 May 2022 05:45:28 +0800 Subject: [PATCH 015/112] Initial port to 22w19a --- build.gradle | 7 +++-- gradle.properties | 8 ++--- jitpack.yml | 5 ++-- .../client/gui/SodiumVideoOptionsScreen.java | 29 +++++++++---------- .../gui/frame/OptionPageScrollFrame.java | 4 +-- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index dc0f9e2..dd017c4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.11-SNAPSHOT' + id 'fabric-loom' version '0.12-SNAPSHOT' id 'maven-publish' } @@ -18,6 +18,7 @@ repositories { includeGroup "maven.modrinth" } } + maven { url 'https://jitpack.io' } } dependencies { @@ -27,9 +28,9 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "maven.modrinth:sodium:${project.sodium_version}" + modImplementation "com.github.FlashyReese:sodium-fabric:36da09d9ad"//"maven.modrinth:sodium:${project.sodium_version}" implementation "org.joml:joml:1.10.2" - modImplementation "maven.modrinth:iris:${project.iris_version}" + //modImplementation "maven.modrinth:iris:${project.iris_version}" modRuntimeOnly "maven.modrinth:lazydfu:0.1.2" } diff --git a/gradle.properties b/gradle.properties index 2f835b6..605b2a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.18.2 - yarn_mappings=1.18.2+build.1 - loader_version=0.13.3 + minecraft_version=22w19a + yarn_mappings=22w19a+build.1 + loader_version=0.14.5 # Mod Properties mod_version=1.4.2 maven_group=me.flashyreese.mods @@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1G iris_version=1.18.x-v1.2.1 #Fabric api - fabric_version=0.47.10+1.18.2 + fabric_version=0.52.2+1.19 diff --git a/jitpack.yml b/jitpack.yml index f5aaa71..1e41e00 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,3 +1,2 @@ -before_install: - - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh - - source install-jdk.sh --feature 16 \ No newline at end of file +jdk: + - openjdk17 \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index 19eac31..a2417d8 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -12,14 +12,13 @@ import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage; import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.fabricmc.loader.api.FabricLoader; -import net.irisshaders.iris.api.v0.IrisApi; +/*import net.fabricmc.loader.api.FabricLoader; +import net.irisshaders.iris.api.v0.IrisApi;*/ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.option.VideoOptionsScreen; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.LiteralText; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.Text; import net.minecraft.util.Util; import org.lwjgl.glfw.GLFW; @@ -40,7 +39,7 @@ public class SodiumVideoOptionsScreen extends Screen { private boolean hasPendingChanges; public SodiumVideoOptionsScreen(Screen prev, List pages) { - super(new LiteralText("Reese's Sodium Menu")); + super(Text.literal("Reese's Sodium Menu")); this.prevScreen = prev; this.pages.addAll(pages); } @@ -64,12 +63,12 @@ protected BasicFrame.Builder parentFrameBuilder() { Dim2i donateButtonDim = new Dim2i(tabFrameDim.getLimitX() - 122, tabFrameDim.y() - 26, 100, 20); Dim2i hideDonateButtonDim = new Dim2i(tabFrameDim.getLimitX() - 20, tabFrameDim.y() - 26, 20, 20); - this.undoButton = new FlatButtonWidget(undoButtonDim, new TranslatableText("sodium.options.buttons.undo"), this::undoChanges); - this.applyButton = new FlatButtonWidget(applyButtonDim, new TranslatableText("sodium.options.buttons.apply"), this::applyChanges); - this.closeButton = new FlatButtonWidget(closeButtonDim, new TranslatableText("gui.done"), this::close); + this.undoButton = new FlatButtonWidget(undoButtonDim, Text.translatable("sodium.options.buttons.undo"), this::undoChanges); + this.applyButton = new FlatButtonWidget(applyButtonDim, Text.translatable("sodium.options.buttons.apply"), this::applyChanges); + this.closeButton = new FlatButtonWidget(closeButtonDim, Text.translatable("gui.done"), this::close); - this.donateButton = new FlatButtonWidget(donateButtonDim, new TranslatableText("sodium.options.buttons.donate"), this::openDonationPage); - this.hideDonateButton = new FlatButtonWidget(hideDonateButtonDim, new LiteralText("x"), this::hideDonationButton); + this.donateButton = new FlatButtonWidget(donateButtonDim, Text.translatable("sodium.options.buttons.donate"), this::openDonationPage); + this.hideDonateButton = new FlatButtonWidget(hideDonateButtonDim, Text.literal("x"), this::hideDonationButton); if (SodiumClientMod.options().notifications.hideDonationButton) { this.setDonationButtonVisibility(false); @@ -77,17 +76,17 @@ protected BasicFrame.Builder parentFrameBuilder() { basicFrameBuilder = this.parentBasicFrameBuilder(basicFrameDim, tabFrameDim); - if (FabricLoader.getInstance().isModLoaded("iris")) { - int size = this.client.textRenderer.getWidth(new TranslatableText(IrisApi.getInstance().getMainScreenLanguageKey())); + /*if (FabricLoader.getInstance().isModLoaded("iris")) { + int size = this.client.textRenderer.getWidth(Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey())); Dim2i shaderPackButtonDim; if (!SodiumClientMod.options().notifications.hideDonationButton) { shaderPackButtonDim = new Dim2i(tabFrameDim.getLimitX() - 134 - size, tabFrameDim.y() - 26, 10 + size, 20); } else { shaderPackButtonDim = new Dim2i(tabFrameDim.getLimitX() - size - 10, tabFrameDim.y() - 26, 10 + size, 20); } - FlatButtonWidget shaderPackButton = new FlatButtonWidget(shaderPackButtonDim, new TranslatableText(IrisApi.getInstance().getMainScreenLanguageKey()), () -> this.client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(this))); + FlatButtonWidget shaderPackButton = new FlatButtonWidget(shaderPackButtonDim, Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey()), () -> this.client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(this))); basicFrameBuilder.addChild(dim -> shaderPackButton); - } + }*/ return basicFrameBuilder; } @@ -190,7 +189,7 @@ private void applyChanges() { } if (flags.contains(OptionFlag.REQUIRES_ASSET_RELOAD)) { - client.setMipmapLevels(client.options.mipmapLevels); + client.setMipmapLevels(client.options.getMipmapLevels().getValue()); client.reloadResourcesConcurrently(); } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java index 0ac1833..76c8491 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java @@ -11,7 +11,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.OrderedText; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Language; import org.apache.commons.lang3.Validate; @@ -132,7 +132,7 @@ private void renderOptionTooltip(MatrixStack matrixStack, ControlElement elem OptionImpact impact = option.getImpact(); if (impact != null) { - tooltip.add(Language.getInstance().reorder(new TranslatableText("sodium.options.performance_impact_string", impact.getLocalizedName()).formatted(Formatting.GRAY))); + tooltip.add(Language.getInstance().reorder(Text.translatable("sodium.options.performance_impact_string", impact.getLocalizedName()).formatted(Formatting.GRAY))); } int boxHeight = (tooltip.size() * 12) + boxPadding; From 191327f4180879bae999e0a15f9927ce6051faae Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 16 May 2022 17:22:27 +0800 Subject: [PATCH 016/112] new: Add Maven Publication Task --- .github/workflows/publish.yml | 4 +- .github/workflows/pull-request.yml | 26 ++++++++++++ .github/workflows/{gradle.yml => push.yml} | 7 +++- build.gradle | 47 ++++++++++++++++++++-- 4 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/pull-request.yml rename .github/workflows/{gradle.yml => push.yml} (68%) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1af8890..3537e49 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,8 +18,10 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Upload assets to releases - run: ./gradlew build + run: ./gradlew build publishAllPublicationsToFlashyReeseReleasesRepository env: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} BUILD_RELEASE: ${{ github.event.prerelease == false }} - name: Publish to Modrinth & CurseForge uses: Kir-Antipov/mc-publish@v2.1 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml new file mode 100644 index 0000000..7ce3e26 --- /dev/null +++ b/.github/workflows/pull-request.yml @@ -0,0 +1,26 @@ +name: Java CI with Gradle + +on: [ pull_request ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build + env: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + - name: Upload build artifacts + uses: actions/upload-artifact@v1 + with: + name: build-artifacts + path: build/libs diff --git a/.github/workflows/gradle.yml b/.github/workflows/push.yml similarity index 68% rename from .github/workflows/gradle.yml rename to .github/workflows/push.yml index 998a16b..7a9ff96 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/push.yml @@ -1,6 +1,6 @@ name: Java CI with Gradle -on: [ push, pull_request ] +on: [ push ] jobs: build: @@ -15,7 +15,10 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew build + run: ./gradlew build publishAllPublicationsToFlashyReeseSnapshotsRepository + env: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - name: Upload build artifacts uses: actions/upload-artifact@v1 with: diff --git a/build.gradle b/build.gradle index dd017c4..3affeb1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,15 @@ plugins { + id 'org.ajoberstar.grgit' version '5.0.0' id 'fabric-loom' version '0.12-SNAPSHOT' id 'maven-publish' + id 'signing' } sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 -archivesBaseName = "${project.archives_base_name}-mc${project.minecraft_version}" -version = project.mod_version +archivesBaseName = project.archives_base_name +version = "${project.mod_version}-mc${project.minecraft_version}+${getVersionMetadata()}" group = project.maven_group repositories { @@ -79,6 +81,45 @@ publishing { // select the repositories you want to publish to repositories { // uncomment to publish to the local maven - // mavenLocal() + maven { + name = "FlashyReeseReleases" + url = "https://maven.flashyreese.me/releases" + credentials { + username = System.getenv("MAVEN_USERNAME") + password = System.getenv("MAVEN_PASSWORD") + } + } + maven { + name = "FlashyReeseSnapshots" + url = "https://maven.flashyreese.me/snapshots" + credentials { + username = System.getenv("MAVEN_USERNAME") + password = System.getenv("MAVEN_PASSWORD") + } + } + } +} + +def getVersionMetadata() { + def build_id = System.getenv("GITHUB_RUN_NUMBER") + + // CI builds only + if (build_id != null) { + return "build.${build_id}" } + + if (grgit != null) { + def head = grgit.head() + def id = head.abbreviatedId + + // Flag the build if the build tree is not clean + if (!grgit.status().clean) { + id += "-dirty" + } + + return "rev.${id}" + } + + // No tracking information could be found about the build + return "unknown" } \ No newline at end of file From 8f4eae475d7eb86a20e64237ef1bf3dfc52fd947 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 16 May 2022 19:03:10 +0800 Subject: [PATCH 017/112] new: Add Maven Publication Task --- .github/workflows/publish.yml | 4 +- .github/workflows/pull-request.yml | 26 ++++++++++++ .github/workflows/{gradle.yml => push.yml} | 7 +++- build.gradle | 47 ++++++++++++++++++++-- 4 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/pull-request.yml rename .github/workflows/{gradle.yml => push.yml} (68%) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1af8890..3537e49 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,8 +18,10 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Upload assets to releases - run: ./gradlew build + run: ./gradlew build publishAllPublicationsToFlashyReeseReleasesRepository env: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} BUILD_RELEASE: ${{ github.event.prerelease == false }} - name: Publish to Modrinth & CurseForge uses: Kir-Antipov/mc-publish@v2.1 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml new file mode 100644 index 0000000..7ce3e26 --- /dev/null +++ b/.github/workflows/pull-request.yml @@ -0,0 +1,26 @@ +name: Java CI with Gradle + +on: [ pull_request ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build + env: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + - name: Upload build artifacts + uses: actions/upload-artifact@v1 + with: + name: build-artifacts + path: build/libs diff --git a/.github/workflows/gradle.yml b/.github/workflows/push.yml similarity index 68% rename from .github/workflows/gradle.yml rename to .github/workflows/push.yml index 998a16b..7a9ff96 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/push.yml @@ -1,6 +1,6 @@ name: Java CI with Gradle -on: [ push, pull_request ] +on: [ push ] jobs: build: @@ -15,7 +15,10 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew build + run: ./gradlew build publishAllPublicationsToFlashyReeseSnapshotsRepository + env: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - name: Upload build artifacts uses: actions/upload-artifact@v1 with: diff --git a/build.gradle b/build.gradle index dc0f9e2..e3319b3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,15 @@ plugins { + id 'org.ajoberstar.grgit' version '5.0.0' id 'fabric-loom' version '0.11-SNAPSHOT' id 'maven-publish' + id 'signing' } sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 -archivesBaseName = "${project.archives_base_name}-mc${project.minecraft_version}" -version = project.mod_version +archivesBaseName = project.archives_base_name +version = "${project.mod_version}-mc${project.minecraft_version}+${getVersionMetadata()}" group = project.maven_group repositories { @@ -78,6 +80,45 @@ publishing { // select the repositories you want to publish to repositories { // uncomment to publish to the local maven - // mavenLocal() + maven { + name = "FlashyReeseReleases" + url = "https://maven.flashyreese.me/releases" + credentials { + username = System.getenv("MAVEN_USERNAME") + password = System.getenv("MAVEN_PASSWORD") + } + } + maven { + name = "FlashyReeseSnapshots" + url = "https://maven.flashyreese.me/snapshots" + credentials { + username = System.getenv("MAVEN_USERNAME") + password = System.getenv("MAVEN_PASSWORD") + } + } + } +} + +def getVersionMetadata() { + def build_id = System.getenv("GITHUB_RUN_NUMBER") + + // CI builds only + if (build_id != null) { + return "build.${build_id}" } + + if (grgit != null) { + def head = grgit.head() + def id = head.abbreviatedId + + // Flag the build if the build tree is not clean + if (!grgit.status().clean) { + id += "-dirty" + } + + return "rev.${id}" + } + + // No tracking information could be found about the build + return "unknown" } \ No newline at end of file From 29c5598bff133071e884820e4089ec5c50f2d105 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 16 May 2022 19:57:55 +0800 Subject: [PATCH 018/112] change: Move Minecraft version to build label --- .github/workflows/pull-request.yml | 3 --- build.gradle | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 7ce3e26..393fa13 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -16,9 +16,6 @@ jobs: run: chmod +x gradlew - name: Build with Gradle run: ./gradlew build - env: - MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - name: Upload build artifacts uses: actions/upload-artifact@v1 with: diff --git a/build.gradle b/build.gradle index 3affeb1..1a30995 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 archivesBaseName = project.archives_base_name -version = "${project.mod_version}-mc${project.minecraft_version}+${getVersionMetadata()}" +version = "${project.mod_version}+${getVersionMetadata()}" group = project.maven_group repositories { @@ -105,7 +105,7 @@ def getVersionMetadata() { // CI builds only if (build_id != null) { - return "build.${build_id}" + return "${project.minecraft_version}-build.${build_id}" } if (grgit != null) { @@ -117,9 +117,9 @@ def getVersionMetadata() { id += "-dirty" } - return "rev.${id}" + return "${project.minecraft_version}-rev.${id}" } // No tracking information could be found about the build - return "unknown" + return "${project.minecraft_version}-unknown" } \ No newline at end of file From 41d0de337d35c384800eb67fccf802d517fe8197 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 16 May 2022 19:57:55 +0800 Subject: [PATCH 019/112] change: Move Minecraft version to build label --- .github/workflows/pull-request.yml | 3 --- build.gradle | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 7ce3e26..393fa13 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -16,9 +16,6 @@ jobs: run: chmod +x gradlew - name: Build with Gradle run: ./gradlew build - env: - MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - name: Upload build artifacts uses: actions/upload-artifact@v1 with: diff --git a/build.gradle b/build.gradle index e3319b3..0f601a5 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 archivesBaseName = project.archives_base_name -version = "${project.mod_version}-mc${project.minecraft_version}+${getVersionMetadata()}" +version = "${project.mod_version}+${getVersionMetadata()}" group = project.maven_group repositories { @@ -104,7 +104,7 @@ def getVersionMetadata() { // CI builds only if (build_id != null) { - return "build.${build_id}" + return "${project.minecraft_version}-build.${build_id}" } if (grgit != null) { @@ -116,9 +116,9 @@ def getVersionMetadata() { id += "-dirty" } - return "rev.${id}" + return "${project.minecraft_version}-rev.${id}" } // No tracking information could be found about the build - return "unknown" + return "${project.minecraft_version}-unknown" } \ No newline at end of file From 3ba7deb5d6ee61f0c514cd08f41c8fd6ad8c4547 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 16 May 2022 21:15:44 +0800 Subject: [PATCH 020/112] change: Fix build label again --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 1a30995..1f043d0 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 archivesBaseName = project.archives_base_name -version = "${project.mod_version}+${getVersionMetadata()}" +version = "${project.mod_version}+mc${project.minecraft_version}-${getVersionMetadata()}" group = project.maven_group repositories { @@ -105,7 +105,7 @@ def getVersionMetadata() { // CI builds only if (build_id != null) { - return "${project.minecraft_version}-build.${build_id}" + return "build.${build_id}" } if (grgit != null) { @@ -117,9 +117,9 @@ def getVersionMetadata() { id += "-dirty" } - return "${project.minecraft_version}-rev.${id}" + return "rev.${id}" } // No tracking information could be found about the build - return "${project.minecraft_version}-unknown" + return "unknown" } \ No newline at end of file From 53c3845085fbd5e2f22858da7fbb33cb56d21b50 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 16 May 2022 21:15:44 +0800 Subject: [PATCH 021/112] change: Fix build label again --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 0f601a5..db17e2d 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 archivesBaseName = project.archives_base_name -version = "${project.mod_version}+${getVersionMetadata()}" +version = "${project.mod_version}+mc${project.minecraft_version}-${getVersionMetadata()}" group = project.maven_group repositories { @@ -104,7 +104,7 @@ def getVersionMetadata() { // CI builds only if (build_id != null) { - return "${project.minecraft_version}-build.${build_id}" + return "build.${build_id}" } if (grgit != null) { @@ -116,9 +116,9 @@ def getVersionMetadata() { id += "-dirty" } - return "${project.minecraft_version}-rev.${id}" + return "rev.${id}" } // No tracking information could be found about the build - return "${project.minecraft_version}-unknown" + return "unknown" } \ No newline at end of file From ab0a6f57d1a9603e1abeaacfc7b74a0ae6540a15 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 26 May 2022 06:29:52 +0800 Subject: [PATCH 022/112] new: Allow reversible cycling options --- .../sodium/MixinCyclingControlElement.java | 36 +++++++++++++++++++ .../sodium/MixinSliderControlElement.java | 13 ------- .../reeses-sodium-options.mixins.json | 1 + 3 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java new file mode 100644 index 0000000..34ebb53 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java @@ -0,0 +1,36 @@ +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.jellysquid.mods.sodium.client.gui.options.Option; +import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement") +public abstract class MixinCyclingControlElement> extends ControlElement { + + @Shadow + private int currentIndex; + + @Shadow + @Final + private T[] allowedValues; + + public MixinCyclingControlElement(Option option, Dim2i dim) { + super(option, dim); + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (this.option.isAvailable() && this.dim.containsCursor(mouseX, mouseY) && (button == 0 || button == 1)) { + this.currentIndex = Math.floorMod(this.option.getValue().ordinal() + (button == 0 ? 1 : -1), this.allowedValues.length); + this.option.setValue(this.allowedValues[this.currentIndex]); + this.playClickSound(); + + return true; + } + + return false; + } +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java index 59b9643..78b63b7 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -6,7 +6,6 @@ import me.jellysquid.mods.sodium.client.util.Dim2i; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.Rect2i; -import net.minecraft.util.math.MathHelper; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -41,8 +40,6 @@ public MixinSliderControlElement(Option option, Dim2i dim) { @Shadow public abstract double getThumbPositionForValue(int value); - @Shadow - public abstract int getIntValue(); @Inject(method = "", at = @At(value = "TAIL")) public void postInit(Option option, Dim2i dim, int min, int max, int interval, ControlValueFormatter formatter, CallbackInfo ci) { @@ -56,16 +53,6 @@ private void setValueFromMouseScroll(double amount) { } } - private void setValue(double d) { - this.thumbPosition = MathHelper.clamp(d, 0.0D, 1.0D); - - int value = this.getIntValue(); - - if (this.option.getValue() != value) { - this.option.setValue(value); - } - } - @Override public boolean mouseScrolled(double mouseX, double mouseY, double amount) { if (this.option.isAvailable() && this.sliderBounds.contains((int) mouseX, (int) mouseY) && Screen.hasShiftDown()) { diff --git a/src/main/resources/reeses-sodium-options.mixins.json b/src/main/resources/reeses-sodium-options.mixins.json index fd8f774..abf47df 100644 --- a/src/main/resources/reeses-sodium-options.mixins.json +++ b/src/main/resources/reeses-sodium-options.mixins.json @@ -5,6 +5,7 @@ "compatibilityLevel": "JAVA_17", "client": [ "sodium.MixinControlElement", + "sodium.MixinCyclingControlElement", "sodium.MixinSliderControlElement", "sodium.MixinSodiumOptionsGUI" ], From ad41958020afd5eba0da9155fb92e9ef3e773896 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 26 May 2022 06:29:52 +0800 Subject: [PATCH 023/112] new: Allow reversible cycling options --- .../sodium/MixinCyclingControlElement.java | 36 +++++++++++++++++++ .../sodium/MixinSliderControlElement.java | 13 ------- .../reeses-sodium-options.mixins.json | 1 + 3 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java new file mode 100644 index 0000000..34ebb53 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java @@ -0,0 +1,36 @@ +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.jellysquid.mods.sodium.client.gui.options.Option; +import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement") +public abstract class MixinCyclingControlElement> extends ControlElement { + + @Shadow + private int currentIndex; + + @Shadow + @Final + private T[] allowedValues; + + public MixinCyclingControlElement(Option option, Dim2i dim) { + super(option, dim); + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (this.option.isAvailable() && this.dim.containsCursor(mouseX, mouseY) && (button == 0 || button == 1)) { + this.currentIndex = Math.floorMod(this.option.getValue().ordinal() + (button == 0 ? 1 : -1), this.allowedValues.length); + this.option.setValue(this.allowedValues[this.currentIndex]); + this.playClickSound(); + + return true; + } + + return false; + } +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java index 59b9643..78b63b7 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -6,7 +6,6 @@ import me.jellysquid.mods.sodium.client.util.Dim2i; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.Rect2i; -import net.minecraft.util.math.MathHelper; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -41,8 +40,6 @@ public MixinSliderControlElement(Option option, Dim2i dim) { @Shadow public abstract double getThumbPositionForValue(int value); - @Shadow - public abstract int getIntValue(); @Inject(method = "", at = @At(value = "TAIL")) public void postInit(Option option, Dim2i dim, int min, int max, int interval, ControlValueFormatter formatter, CallbackInfo ci) { @@ -56,16 +53,6 @@ private void setValueFromMouseScroll(double amount) { } } - private void setValue(double d) { - this.thumbPosition = MathHelper.clamp(d, 0.0D, 1.0D); - - int value = this.getIntValue(); - - if (this.option.getValue() != value) { - this.option.setValue(value); - } - } - @Override public boolean mouseScrolled(double mouseX, double mouseY, double amount) { if (this.option.isAvailable() && this.sliderBounds.contains((int) mouseX, (int) mouseY) && Screen.hasShiftDown()) { diff --git a/src/main/resources/reeses-sodium-options.mixins.json b/src/main/resources/reeses-sodium-options.mixins.json index fd8f774..abf47df 100644 --- a/src/main/resources/reeses-sodium-options.mixins.json +++ b/src/main/resources/reeses-sodium-options.mixins.json @@ -5,6 +5,7 @@ "compatibilityLevel": "JAVA_17", "client": [ "sodium.MixinControlElement", + "sodium.MixinCyclingControlElement", "sodium.MixinSliderControlElement", "sodium.MixinSodiumOptionsGUI" ], From 7be7d1eb98aa1f528acf977109add1dc62ffb1fa Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 26 May 2022 06:53:54 +0800 Subject: [PATCH 024/112] change: Remove snapshot publishing --- .../{pull-request.yml => gradle.yml} | 2 +- .github/workflows/push.yml | 26 ------------------- 2 files changed, 1 insertion(+), 27 deletions(-) rename .github/workflows/{pull-request.yml => gradle.yml} (95%) delete mode 100644 .github/workflows/push.yml diff --git a/.github/workflows/pull-request.yml b/.github/workflows/gradle.yml similarity index 95% rename from .github/workflows/pull-request.yml rename to .github/workflows/gradle.yml index 393fa13..631a649 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/gradle.yml @@ -1,6 +1,6 @@ name: Java CI with Gradle -on: [ pull_request ] +on: [ pull_request, push ] jobs: build: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml deleted file mode 100644 index 7a9ff96..0000000 --- a/.github/workflows/push.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Java CI with Gradle - -on: [ push ] - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew build publishAllPublicationsToFlashyReeseSnapshotsRepository - env: - MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - - name: Upload build artifacts - uses: actions/upload-artifact@v1 - with: - name: build-artifacts - path: build/libs From 915f9692982c8b07d8079591238cff90f7598e6e Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 26 May 2022 06:53:54 +0800 Subject: [PATCH 025/112] change: Remove snapshot publishing --- .../{pull-request.yml => gradle.yml} | 2 +- .github/workflows/push.yml | 26 ------------------- 2 files changed, 1 insertion(+), 27 deletions(-) rename .github/workflows/{pull-request.yml => gradle.yml} (95%) delete mode 100644 .github/workflows/push.yml diff --git a/.github/workflows/pull-request.yml b/.github/workflows/gradle.yml similarity index 95% rename from .github/workflows/pull-request.yml rename to .github/workflows/gradle.yml index 393fa13..631a649 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/gradle.yml @@ -1,6 +1,6 @@ name: Java CI with Gradle -on: [ pull_request ] +on: [ pull_request, push ] jobs: build: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml deleted file mode 100644 index 7a9ff96..0000000 --- a/.github/workflows/push.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Java CI with Gradle - -on: [ push ] - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew build publishAllPublicationsToFlashyReeseSnapshotsRepository - env: - MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - - name: Upload build artifacts - uses: actions/upload-artifact@v1 - with: - name: build-artifacts - path: build/libs From 37bb80be495597485198b1c49dae02204be066f9 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Fri, 27 May 2022 07:08:29 +0800 Subject: [PATCH 026/112] change: Update fabric.mod.json --- src/main/resources/fabric.mod.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 35cbafa..bf2d2ae 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -8,7 +8,9 @@ "FlashyReese" ], "contact": { - "repo": "https://github.com/FlashyReese/reeses-sodium-options" + "homepage": "https://github.com/FlashyReese/reeses-sodium-options", + "issues": "https://github.com/FlashyReese/reeses-sodium-options/issues", + "sources": "https://github.com/FlashyReese/reeses-sodium-options.git" }, "icon": "assets/reeses-sodium-options/icon.png", "license": "MIT", @@ -25,7 +27,6 @@ }, "depends": { "minecraft": ">=1.18", - "fabricloader": ">=0.13", "sodium": "*" }, "breaks": { From bcd766e0e69514b6ccba0cbbddbc969702857d9d Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Fri, 27 May 2022 07:08:29 +0800 Subject: [PATCH 027/112] change: Update fabric.mod.json --- src/main/resources/fabric.mod.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 35cbafa..bf2d2ae 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -8,7 +8,9 @@ "FlashyReese" ], "contact": { - "repo": "https://github.com/FlashyReese/reeses-sodium-options" + "homepage": "https://github.com/FlashyReese/reeses-sodium-options", + "issues": "https://github.com/FlashyReese/reeses-sodium-options/issues", + "sources": "https://github.com/FlashyReese/reeses-sodium-options.git" }, "icon": "assets/reeses-sodium-options/icon.png", "license": "MIT", @@ -25,7 +27,6 @@ }, "depends": { "minecraft": ">=1.18", - "fabricloader": ">=0.13", "sodium": "*" }, "breaks": { From 54ae228793190308f8fceb3490cbb97e19bff845 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Fri, 27 May 2022 14:56:30 +0800 Subject: [PATCH 028/112] change: Fix build script --- build.gradle | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 1f043d0..2b511ce 100644 --- a/build.gradle +++ b/build.gradle @@ -45,36 +45,27 @@ processResources { } } -// ensure that the encoding is set to UTF-8, no matter what the system default is -// this fixes some edge cases with special characters not displaying correctly -// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" +tasks.withType(JavaCompile).configureEach { + it.options.release = 17 } -// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task -// if it is present. -// If you remove this task, sources will not be generated. -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = "sources" - from sourceSets.main.allSource +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() } jar { from "LICENSE.txt" } + // configure the maven publication publishing { publications { mavenJava(MavenPublication) { - // add all the jars that should be included when publishing to maven - artifact(remapJar) { - builtBy remapJar - } - artifact(sourcesJar) { - builtBy remapSourcesJar - } + from components.java } } From 660e63e7114c4b61775e8d1e8dfc19de43610215 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Fri, 27 May 2022 14:56:30 +0800 Subject: [PATCH 029/112] change: Fix build script --- build.gradle | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index db17e2d..3f6d470 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ plugins { id 'signing' } -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 +sourceCompatibility = JavaVersion.VERSION_16 +targetCompatibility = JavaVersion.VERSION_16 archivesBaseName = project.archives_base_name version = "${project.mod_version}+mc${project.minecraft_version}-${getVersionMetadata()}" @@ -44,36 +44,27 @@ processResources { } } -// ensure that the encoding is set to UTF-8, no matter what the system default is -// this fixes some edge cases with special characters not displaying correctly -// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" +tasks.withType(JavaCompile).configureEach { + it.options.release = 17 } -// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task -// if it is present. -// If you remove this task, sources will not be generated. -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = "sources" - from sourceSets.main.allSource +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() } jar { from "LICENSE.txt" } + // configure the maven publication publishing { publications { mavenJava(MavenPublication) { - // add all the jars that should be included when publishing to maven - artifact(remapJar) { - builtBy remapJar - } - artifact(sourcesJar) { - builtBy remapSourcesJar - } + from components.java } } From 9727110e0caabbf8a26d69807ce7025febb23de2 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Fri, 27 May 2022 15:02:19 +0800 Subject: [PATCH 030/112] change: Bump gradle wrapper --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..aa991fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From aa6fbb866fc55e741b928b3c60b9d19f3d9f8a29 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Fri, 27 May 2022 15:03:17 +0800 Subject: [PATCH 031/112] change: Bump gradle wrapper --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..aa991fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From bb21d8e95b7db3103cd46758685ade8534f68a61 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 6 Jun 2022 11:46:26 +0800 Subject: [PATCH 032/112] change: Bump Minecraft version --- build.gradle | 9 +++++++-- gradle.properties | 10 +++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 2b511ce..3234442 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,12 @@ repositories { includeGroup "maven.modrinth" } } - maven { url 'https://jitpack.io' } + maven { + url "https://maven.flashyreese.me/releases" + } + maven { + url "https://maven.flashyreese.me/snapshots" + } } dependencies { @@ -30,7 +35,7 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "com.github.FlashyReese:sodium-fabric:36da09d9ad"//"maven.modrinth:sodium:${project.sodium_version}" + modImplementation "me.jellysquid.mods:sodium-fabric:${project.sodium_version}" implementation "org.joml:joml:1.10.2" //modImplementation "maven.modrinth:iris:${project.iris_version}" diff --git a/gradle.properties b/gradle.properties index 605b2a8..294137d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,17 +2,17 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=22w19a - yarn_mappings=22w19a+build.1 - loader_version=0.14.5 + minecraft_version=1.19-rc2 + yarn_mappings=1.19-rc2+build.1 + loader_version=0.14.6 # Mod Properties mod_version=1.4.2 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options # Dependency - sodium_version=mc1.18.2-0.4.1 + sodium_version=0.4.2-beta.1+build.176 iris_version=1.18.x-v1.2.1 #Fabric api - fabric_version=0.52.2+1.19 + fabric_version=0.55.1+1.19 From 76d52bca08f6f571f5fb3e7c96676a3de9cf3645 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 8 Jun 2022 00:45:21 +0800 Subject: [PATCH 033/112] change: Update to 1.19 --- build.gradle | 3 +-- gradle.properties | 8 ++++---- .../client/gui/SodiumVideoOptionsScreen.java | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 3234442..ef18db0 100644 --- a/build.gradle +++ b/build.gradle @@ -36,8 +36,7 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "me.jellysquid.mods:sodium-fabric:${project.sodium_version}" - implementation "org.joml:joml:1.10.2" - //modImplementation "maven.modrinth:iris:${project.iris_version}" + modImplementation "net.coderbot.iris_mc1_19-rc2:iris:${project.iris_version}" modRuntimeOnly "maven.modrinth:lazydfu:0.1.2" } diff --git a/gradle.properties b/gradle.properties index 294137d..b5dae4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.19-rc2 - yarn_mappings=1.19-rc2+build.1 + minecraft_version=1.19 + yarn_mappings=1.19+build.1 loader_version=0.14.6 # Mod Properties mod_version=1.4.2 @@ -11,8 +11,8 @@ org.gradle.jvmargs=-Xmx1G archives_base_name=reeses_sodium_options # Dependency - sodium_version=0.4.2-beta.1+build.176 - iris_version=1.18.x-v1.2.1 + sodium_version=0.4.2-beta.1+rev.0cb72af + iris_version=1.2.5-e7e6d615-dirty #Fabric api fabric_version=0.55.1+1.19 diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index a2417d8..a8bd59c 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -12,8 +12,8 @@ import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage; import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; -/*import net.fabricmc.loader.api.FabricLoader; -import net.irisshaders.iris.api.v0.IrisApi;*/ +import net.fabricmc.loader.api.FabricLoader; +import net.irisshaders.iris.api.v0.IrisApi; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.option.VideoOptionsScreen; @@ -76,7 +76,7 @@ protected BasicFrame.Builder parentFrameBuilder() { basicFrameBuilder = this.parentBasicFrameBuilder(basicFrameDim, tabFrameDim); - /*if (FabricLoader.getInstance().isModLoaded("iris")) { + if (FabricLoader.getInstance().isModLoaded("iris")) { int size = this.client.textRenderer.getWidth(Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey())); Dim2i shaderPackButtonDim; if (!SodiumClientMod.options().notifications.hideDonationButton) { @@ -86,7 +86,7 @@ protected BasicFrame.Builder parentFrameBuilder() { } FlatButtonWidget shaderPackButton = new FlatButtonWidget(shaderPackButtonDim, Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey()), () -> this.client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(this))); basicFrameBuilder.addChild(dim -> shaderPackButton); - }*/ + } return basicFrameBuilder; } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index bf2d2ae..31466a5 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,7 +26,7 @@ } }, "depends": { - "minecraft": ">=1.18", + "minecraft": ">=1.19", "sodium": "*" }, "breaks": { From 10d88d6e2a63396f4103891f41ddefda9235f91b Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 8 Jun 2022 01:02:55 +0800 Subject: [PATCH 034/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b5dae4c..5a3eed2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.19+build.1 loader_version=0.14.6 # Mod Properties - mod_version=1.4.2 + mod_version=1.4.3 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From e654ff396fe873f6547a696ff3048a0748548dad Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 8 Jun 2022 01:02:55 +0800 Subject: [PATCH 035/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2f835b6..67a1d8b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.18.2+build.1 loader_version=0.13.3 # Mod Properties - mod_version=1.4.2 + mod_version=1.4.3 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From 26542efce82d3d1026d443073bf7aa8a25bf3df6 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 8 Jun 2022 15:17:08 +0800 Subject: [PATCH 036/112] change: Bump dependencies --- build.gradle | 2 +- gradle.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index ef18db0..432ba86 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "me.jellysquid.mods:sodium-fabric:${project.sodium_version}" - modImplementation "net.coderbot.iris_mc1_19-rc2:iris:${project.iris_version}" + modImplementation "net.coderbot.iris_mc1_19:iris:${project.iris_version}" modRuntimeOnly "maven.modrinth:lazydfu:0.1.2" } diff --git a/gradle.properties b/gradle.properties index 5a3eed2..155533f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,8 +11,8 @@ org.gradle.jvmargs=-Xmx1G archives_base_name=reeses_sodium_options # Dependency - sodium_version=0.4.2-beta.1+rev.0cb72af - iris_version=1.2.5-e7e6d615-dirty + sodium_version=0.4.2+build.181 + iris_version=1.2.5-build.3-467a0118 #Fabric api fabric_version=0.55.1+1.19 From 27b97ce3662d7804bdd7689e39cf6de880e8ab7b Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 29 Jun 2022 23:59:48 +0800 Subject: [PATCH 037/112] change: Clean up --- .github/workflows/gradle.yml | 46 +-- .github/workflows/publish.yml | 90 +++--- .gitignore | 236 ++++++++-------- LICENSE.txt | 42 +-- README.md | 60 ++-- jitpack.yml | 3 - settings.gradle | 16 +- .../client/gui/SodiumVideoOptionsScreen.java | 2 +- .../client/gui/frame/AbstractFrame.java | 214 +++++++------- .../client/gui/frame/BasicFrame.java | 134 ++++----- .../gui/frame/OptionPageScrollFrame.java | 4 +- .../frame/components/ScrollBarComponent.java | 264 +++++++++--------- .../client/gui/frame/tab/Tab.java | 91 +++--- .../client/gui/frame/tab/TabFrame.java | 17 +- .../client/gui/frame/tab/TabOption.java | 7 - .../mixin/sodium/MixinControlElement.java | 56 ++-- .../sodium/MixinCyclingControlElement.java | 72 ++--- .../sodium/MixinSliderControlElement.java | 129 +++++---- .../mixin/sodium/MixinSodiumOptionsGUI.java | 72 ++--- 19 files changed, 774 insertions(+), 781 deletions(-) delete mode 100644 jitpack.yml delete mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabOption.java diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 631a649..aabde41 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,23 +1,23 @@ -name: Java CI with Gradle - -on: [ pull_request, push ] - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew build - - name: Upload build artifacts - uses: actions/upload-artifact@v1 - with: - name: build-artifacts - path: build/libs +name: Java CI with Gradle + +on: [ pull_request, push ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build + - name: Upload build artifacts + uses: actions/upload-artifact@v1 + with: + name: build-artifacts + path: build/libs diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3537e49..8f4da30 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,46 +1,46 @@ -name: Publish Release - -on: - release: - types: - - published - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v2 - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Upload assets to releases - run: ./gradlew build publishAllPublicationsToFlashyReeseReleasesRepository - env: - MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - BUILD_RELEASE: ${{ github.event.prerelease == false }} - - name: Publish to Modrinth & CurseForge - uses: Kir-Antipov/mc-publish@v2.1 - with: - modrinth-id: Bh37bMuy - modrinth-token: ${{ secrets.MODRINTH_TOKEN }} - - curseforge-id: 511319 - curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} - - github-token: ${{ secrets.GITHUB_TOKEN }} - - version-type: release - - loaders: fabric - - version-resolver: latest - dependencies: | - sodium | depends | * - sodium-extra | recommends | * - irisshaders | recommends | * +name: Publish Release + +on: + release: + types: + - published + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Upload assets to releases + run: ./gradlew build publishAllPublicationsToFlashyReeseReleasesRepository + env: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + BUILD_RELEASE: ${{ github.event.prerelease == false }} + - name: Publish to Modrinth & CurseForge + uses: Kir-Antipov/mc-publish@v2.1 + with: + modrinth-id: Bh37bMuy + modrinth-token: ${{ secrets.MODRINTH_TOKEN }} + + curseforge-id: 511319 + curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} + + github-token: ${{ secrets.GITHUB_TOKEN }} + + version-type: release + + loaders: fabric + + version-resolver: latest + dependencies: | + sodium | depends | * + sodium-extra | recommends | * + irisshaders | recommends | * iris | recommends | * \ No newline at end of file diff --git a/.gitignore b/.gitignore index 3c37caf..8f9956c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,118 +1,118 @@ -# User-specific stuff -.idea/ - -*.iml -*.ipr -*.iws - -# IntelliJ -out/ -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# Windows thumbnail cache files -Thumbs.db -Thumbs.db:encryptable -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -.gradle -build/ - -# Ignore Gradle GUI config -gradle-app.setting - -# Cache of project -.gradletasknamecache - -**/build/ - -# Common working directory -run/ - -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# IntelliJ +out/ +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Cache of project +.gradletasknamecache + +**/build/ + +# Common working directory +run/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar diff --git a/LICENSE.txt b/LICENSE.txt index 4ccecdb..e02faf1 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,21 +1,21 @@ -The MIT License (MIT) - -Copyright (c) 2021 FlashyReese - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +The MIT License (MIT) + +Copyright (c) 2021 FlashyReese + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README.md b/README.md index d3da359..c724920 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,30 @@ -# Reese's Sodium Options -![Java 17](https://img.shields.io/badge/language-Java%2017-9b599a.svg?style=flat-square) -[![Project License](https://img.shields.io/github/license/FlashyReese/reeses-sodium-options?style=flat-square)](LICENSE.txt) -![Environment: Client](https://img.shields.io/badge/environment-client-1976d2?style=flat-square) -![Mod loader: Fabric](https://img.shields.io/badge/modloader-Fabric-1976d2?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAFHGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDIgNzkuMTYwOTI0LCAyMDE3LzA3LzEzLTAxOjA2OjM5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDE4LTEyLTE2VDE2OjU0OjE3LTA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHN0RXZ0OndoZW49IjIwMTgtMTItMTZUMTY6NTQ6MTctMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChXaW5kb3dzKSIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4/HiGMAAAAtUlEQVRYw+XXrQqAMBQF4D2P2eBL+QIG8RnEJFaNBjEum+0+zMQLtwwv+wV3ZzhhMDgfJ0wUSinxZUQWgKos1JP/AbD4OneIDyQPwCFniA+EJ4CaXm4TxAXCC0BNHgLhAdAnx9hC8PwGSRtAFVMQjF7cNTWED8B1cgwW20yfJgAvrssAsZ1cB3g/xckAxr6FmCDU5N6f488BrpCQ4rQBJkiMYh4ACmLzwOQF0CExinkCsvw7vgGikl+OotaKRwAAAABJRU5ErkJggg==) -![Version](https://img.shields.io/github/v/tag/FlashyReese/reeses-sodium-options?label=version&style=flat-square) -[![CurseForge](http://cf.way2muchnoise.eu/title/511319.svg)](https://www.curseforge.com/minecraft/mc-mods/reeses-sodium-options) -[![Support Server](https://img.shields.io/discord/748363294749753484.svg?color=7289da&label=FlashyReese&logo=discord&style=flat-square)](https://discord.gg/TBGGM9VzH9) - -Reese's Edition of Sodium Options - -## Building from source - -#### Prerequisites - -- Java 17 or above - -#### Compiling - -Navigate to the directory you've cloned this repository and launch a build with Gradle using `gradlew build` (Windows) -or `./gradlew build` (macOS/Linux). If you are not using the Gradle wrapper, simply replace `gradlew` with `gradle` -or the path to it. - -The initial setup may take a few minutes. After Gradle has finished building everything, you can find the resulting -artifacts in `build/libs`. - -## License - -Reese's Sodium Options is license under MIT, a free and open-source license. For more information, please see the -[license file](LICENSE.txt). +# Reese's Sodium Options +![Java 17](https://img.shields.io/badge/language-Java%2017-9b599a.svg?style=flat-square) +[![Project License](https://img.shields.io/github/license/FlashyReese/reeses-sodium-options?style=flat-square)](LICENSE.txt) +![Environment: Client](https://img.shields.io/badge/environment-client-1976d2?style=flat-square) +![Mod loader: Fabric](https://img.shields.io/badge/modloader-Fabric-1976d2?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAFHGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDIgNzkuMTYwOTI0LCAyMDE3LzA3LzEzLTAxOjA2OjM5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDE4LTEyLTE2VDE2OjU0OjE3LTA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHN0RXZ0OndoZW49IjIwMTgtMTItMTZUMTY6NTQ6MTctMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChXaW5kb3dzKSIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4/HiGMAAAAtUlEQVRYw+XXrQqAMBQF4D2P2eBL+QIG8RnEJFaNBjEum+0+zMQLtwwv+wV3ZzhhMDgfJ0wUSinxZUQWgKos1JP/AbD4OneIDyQPwCFniA+EJ4CaXm4TxAXCC0BNHgLhAdAnx9hC8PwGSRtAFVMQjF7cNTWED8B1cgwW20yfJgAvrssAsZ1cB3g/xckAxr6FmCDU5N6f488BrpCQ4rQBJkiMYh4ACmLzwOQF0CExinkCsvw7vgGikl+OotaKRwAAAABJRU5ErkJggg==) +![Version](https://img.shields.io/github/v/tag/FlashyReese/reeses-sodium-options?label=version&style=flat-square) +[![CurseForge](http://cf.way2muchnoise.eu/title/511319.svg)](https://www.curseforge.com/minecraft/mc-mods/reeses-sodium-options) +[![Support Server](https://img.shields.io/discord/748363294749753484.svg?color=7289da&label=FlashyReese&logo=discord&style=flat-square)](https://discord.gg/TBGGM9VzH9) + +Reese's Edition of Sodium Options + +## Building from source + +#### Prerequisites + +- Java 17 or above + +#### Compiling + +Navigate to the directory you've cloned this repository and launch a build with Gradle using `gradlew build` (Windows) +or `./gradlew build` (macOS/Linux). If you are not using the Gradle wrapper, simply replace `gradlew` with `gradle` +or the path to it. + +The initial setup may take a few minutes. After Gradle has finished building everything, you can find the resulting +artifacts in `build/libs`. + +## License + +Reese's Sodium Options is license under MIT, a free and open-source license. For more information, please see the +[license file](LICENSE.txt). diff --git a/jitpack.yml b/jitpack.yml deleted file mode 100644 index f5aaa71..0000000 --- a/jitpack.yml +++ /dev/null @@ -1,3 +0,0 @@ -before_install: - - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh - - source install-jdk.sh --feature 16 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 2875cde..c4bb92c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,9 @@ -pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - gradlePluginPortal() - } +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index 19eac31..3c7eb7d 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -104,7 +104,7 @@ public BasicFrame.Builder parentBasicFrameBuilder(Dim2i parentBasicFrameDim, Dim .addChild(parentDim -> TabFrame.createBuilder() .setDimension(tabFrameDim) .shouldRenderOutline(false) - .addTabs(tabs -> this.pages.stream().filter(page -> !page.getGroups().isEmpty()).forEach(page -> tabs.add(dim -> Tab.createBuilder().from(page, dim)))) + .addTabs(tabs -> this.pages.stream().filter(page -> !page.getGroups().isEmpty()).forEach(page -> tabs.add(Tab.createBuilder().from(page)))) .build() ); } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java index 42232d5..faed6a4 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java @@ -1,107 +1,107 @@ -package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; - -import com.mojang.blaze3d.systems.RenderSystem; -import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; -import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.Element; -import net.minecraft.client.gui.ParentElement; -import net.minecraft.client.util.math.MatrixStack; -import org.jetbrains.annotations.Nullable; - -import java.util.ArrayList; -import java.util.List; - -public abstract class AbstractFrame extends AbstractWidget implements ParentElement { - protected final Dim2i dim; - protected final List children = new ArrayList<>(); - protected final List drawable = new ArrayList<>(); - protected final List> controlElements = new ArrayList<>(); - protected boolean renderOutline; - private Element focused; - private boolean dragging; - - public AbstractFrame(Dim2i dim, boolean renderOutline) { - this.dim = dim; - this.renderOutline = renderOutline; - } - - public void buildFrame() { - for (Element element : this.children) { - if (element instanceof AbstractFrame) { - this.controlElements.addAll(((AbstractFrame) element).controlElements); - } - if (element instanceof ControlElement) { - this.controlElements.add((ControlElement) element); - } - if (element instanceof Drawable) { - this.drawable.add((Drawable) element); - } - } - } - - @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - if (this.renderOutline) { - this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); - } - for (Drawable drawable : this.drawable) { - drawable.render(matrices, mouseX, mouseY, delta); - } - } - - public void applyScissor(int x, int y, int width, int height, Runnable action) { - double scale = MinecraftClient.getInstance().getWindow().getScaleFactor(); - RenderSystem.enableScissor((int) (x * scale), (int) (MinecraftClient.getInstance().getWindow().getFramebufferHeight() - (y + height) * scale), - (int) (width * scale), (int) (height * scale)); - action.run(); - RenderSystem.disableScissor(); - } - - protected void drawRectOutline(double x, double y, double w, double h, int color) { - final float a = (float) (color >> 24 & 255) / 255.0F; - final float r = (float) (color >> 16 & 255) / 255.0F; - final float g = (float) (color >> 8 & 255) / 255.0F; - final float b = (float) (color & 255) / 255.0F; - - this.drawQuads(vertices -> { - addQuad(vertices, x, y, w, y + 1, a, r, g, b); - addQuad(vertices, x, h - 1, w, h, a, r, g, b); - addQuad(vertices, x, y, x + 1, h, a, r, g, b); - addQuad(vertices, w - 1, y, w, h, a, r, g, b); - }); - } - - @Override - public boolean isDragging() { - return this.dragging; - } - - @Override - public void setDragging(boolean dragging) { - this.dragging = dragging; - } - - @Nullable - @Override - public Element getFocused() { - return this.focused; - } - - @Override - public void setFocused(@Nullable Element focused) { - this.focused = focused; - } - - @Override - public List children() { - return this.children; - } - - @Override - public boolean isMouseOver(double mouseX, double mouseY) { - return this.dim.containsCursor(mouseX, mouseY); - } -} +package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; + +import com.mojang.blaze3d.systems.RenderSystem; +import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; +import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.ParentElement; +import net.minecraft.client.util.math.MatrixStack; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; + +public abstract class AbstractFrame extends AbstractWidget implements ParentElement { + protected final Dim2i dim; + protected final List children = new ArrayList<>(); + protected final List drawable = new ArrayList<>(); + protected final List> controlElements = new ArrayList<>(); + protected boolean renderOutline; + private Element focused; + private boolean dragging; + + public AbstractFrame(Dim2i dim, boolean renderOutline) { + this.dim = dim; + this.renderOutline = renderOutline; + } + + public void buildFrame() { + for (Element element : this.children) { + if (element instanceof AbstractFrame) { + this.controlElements.addAll(((AbstractFrame) element).controlElements); + } + if (element instanceof ControlElement) { + this.controlElements.add((ControlElement) element); + } + if (element instanceof Drawable) { + this.drawable.add((Drawable) element); + } + } + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + if (this.renderOutline) { + this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); + } + for (Drawable drawable : this.drawable) { + drawable.render(matrices, mouseX, mouseY, delta); + } + } + + public void applyScissor(int x, int y, int width, int height, Runnable action) { + double scale = MinecraftClient.getInstance().getWindow().getScaleFactor(); + RenderSystem.enableScissor((int) (x * scale), (int) (MinecraftClient.getInstance().getWindow().getFramebufferHeight() - (y + height) * scale), + (int) (width * scale), (int) (height * scale)); + action.run(); + RenderSystem.disableScissor(); + } + + protected void drawRectOutline(double x, double y, double w, double h, int color) { + final float a = (float) (color >> 24 & 255) / 255.0F; + final float r = (float) (color >> 16 & 255) / 255.0F; + final float g = (float) (color >> 8 & 255) / 255.0F; + final float b = (float) (color & 255) / 255.0F; + + this.drawQuads(vertices -> { + addQuad(vertices, x, y, w, y + 1, a, r, g, b); + addQuad(vertices, x, h - 1, w, h, a, r, g, b); + addQuad(vertices, x, y, x + 1, h, a, r, g, b); + addQuad(vertices, w - 1, y, w, h, a, r, g, b); + }); + } + + @Override + public boolean isDragging() { + return this.dragging; + } + + @Override + public void setDragging(boolean dragging) { + this.dragging = dragging; + } + + @Nullable + @Override + public Element getFocused() { + return this.focused; + } + + @Override + public void setFocused(@Nullable Element focused) { + this.focused = focused; + } + + @Override + public List children() { + return this.children; + } + + @Override + public boolean isMouseOver(double mouseX, double mouseY) { + return this.dim.containsCursor(mouseX, mouseY); + } +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java index e000b73..b08cca2 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java @@ -1,68 +1,68 @@ -package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; - -import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.util.math.MatrixStack; -import org.apache.commons.lang3.Validate; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Function; - -public class BasicFrame extends AbstractFrame { - - protected List> functions; - - public BasicFrame(Dim2i dim, boolean renderOutline, List> functions) { - super(dim, renderOutline); - this.functions = functions; - this.buildFrame(); - } - - public static Builder createBuilder() { - return new Builder(); - } - - @Override - public void buildFrame() { - this.children.clear(); - this.drawable.clear(); - this.controlElements.clear(); - - this.functions.forEach(function -> this.children.add(function.apply(dim))); - - super.buildFrame(); - } - - @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - super.render(matrices, mouseX, mouseY, delta); - } - - public static class Builder { - private final List> functions = new ArrayList<>(); - private Dim2i dim; - private boolean renderOutline; - - public Builder setDimension(Dim2i dim) { - this.dim = dim; - return this; - } - - public Builder shouldRenderOutline(boolean renderOutline) { - this.renderOutline = renderOutline; - return this; - } - - public Builder addChild(Function function) { - this.functions.add(function); - return this; - } - - public BasicFrame build() { - Validate.notNull(this.dim, "Dimension must be specified"); - - return new BasicFrame(this.dim, this.renderOutline, this.functions); - } - } +package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; + +import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.util.math.MatrixStack; +import org.apache.commons.lang3.Validate; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; + +public class BasicFrame extends AbstractFrame { + + protected List> functions; + + public BasicFrame(Dim2i dim, boolean renderOutline, List> functions) { + super(dim, renderOutline); + this.functions = functions; + this.buildFrame(); + } + + public static Builder createBuilder() { + return new Builder(); + } + + @Override + public void buildFrame() { + this.children.clear(); + this.drawable.clear(); + this.controlElements.clear(); + + this.functions.forEach(function -> this.children.add(function.apply(dim))); + + super.buildFrame(); + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + super.render(matrices, mouseX, mouseY, delta); + } + + public static class Builder { + private final List> functions = new ArrayList<>(); + private Dim2i dim; + private boolean renderOutline; + + public Builder setDimension(Dim2i dim) { + this.dim = dim; + return this; + } + + public Builder shouldRenderOutline(boolean renderOutline) { + this.renderOutline = renderOutline; + return this; + } + + public Builder addChild(Function function) { + this.functions.add(function); + return this; + } + + public BasicFrame build() { + Validate.notNull(this.dim, "Dimension must be specified"); + + return new BasicFrame(this.dim, this.renderOutline, this.functions); + } + } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java index 0ac1833..dc9e7dc 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java @@ -97,7 +97,9 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { .filter(ControlElement::isHovered) .findFirst() .orElse(null); + matrices.push(); this.applyScissor(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height(), () -> super.render(matrices, mouseX, mouseY, delta)); + matrices.pop(); if (this.canScroll) { this.scrollBar.render(matrices, mouseX, mouseY, delta); } @@ -212,7 +214,7 @@ public Builder setDimension(Dim2i dim) { public Builder shouldRenderOutline(boolean renderOutline) { this.renderOutline = renderOutline; - return this; + return this; } public Builder setOptionPage(OptionPage page) { diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java index f3e680f..b710d70 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java @@ -1,133 +1,133 @@ -package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components; - -import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.math.MathHelper; - -public class ScrollBarComponent extends AbstractWidget { - - protected final Dim2i dim; - - private final Mode mode; - private final int frameLength; - private final int viewPortLength; - private final int maxScrollBarOffset; - private final Runnable onSetOffset; - private int offset = 0; - private boolean isDragging; - - private Dim2i scrollThumb = null; - private int scrollThumbClickOffset; - - private Dim2i extendedScrollArea = null; - - public ScrollBarComponent(Dim2i trackArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset) { - this.dim = trackArea; - this.mode = mode; - this.frameLength = frameLength; - this.viewPortLength = viewPortLength; - this.onSetOffset = onSetOffset; - this.maxScrollBarOffset = this.frameLength - this.viewPortLength; - } - - public ScrollBarComponent(Dim2i scrollBarArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset, Dim2i extendedTrackArea) { - this(scrollBarArea, mode, frameLength, viewPortLength, onSetOffset); - this.extendedScrollArea = extendedTrackArea; - } - - public void updateThumbPosition() { - int scrollThumbLength = (this.viewPortLength * (this.mode == Mode.VERTICAL ? this.dim.height() : this.dim.width() - 6)) / this.frameLength; - int maximumScrollThumbOffset = this.viewPortLength - scrollThumbLength; - int scrollThumbOffset = this.offset * maximumScrollThumbOffset / this.maxScrollBarOffset; - this.scrollThumb = new Dim2i(this.dim.x() + 2 + (this.mode == Mode.HORIZONTAL ? scrollThumbOffset : 0), this.dim.y() + 2 + (this.mode == Mode.VERTICAL ? scrollThumbOffset : 0), (this.mode == Mode.VERTICAL ? this.dim.width() : scrollThumbLength) - 4, (this.mode == Mode.VERTICAL ? scrollThumbLength : this.dim.height()) - 4); - } - - @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); - this.drawRect(this.scrollThumb.x(), this.scrollThumb.y(), this.scrollThumb.getLimitX(), this.scrollThumb.getLimitY(), 0xFFAAAAAA); - } - - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (this.dim.containsCursor(mouseX, mouseY)) { - if (this.scrollThumb.containsCursor(mouseX, mouseY)) { - if (this.mode == Mode.VERTICAL) { - this.scrollThumbClickOffset = (int) (mouseY - (this.scrollThumb.y() + this.scrollThumb.height() / 2)); - } else { - this.scrollThumbClickOffset = (int) (mouseX - (this.scrollThumb.x() + this.scrollThumb.width() / 2)); - } - this.isDragging = true; - } else { - int value; - if (this.mode == Mode.VERTICAL) { - value = (int) ((mouseY - this.dim.y() - (this.scrollThumb.height() / 2)) / (this.dim.height() - this.scrollThumb.height()) * this.maxScrollBarOffset); - } else { - value = (int) ((mouseX - this.dim.x() - (this.scrollThumb.width() / 2)) / (this.dim.width() - this.scrollThumb.width()) * this.maxScrollBarOffset); - } - this.setOffset(value); - this.isDragging = false; - } - return true; - } - this.isDragging = false; - return false; - } - - @Override - public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - if (this.isDragging) { - int value; - if (this.mode == Mode.VERTICAL) { - value = (int) ((mouseY - this.scrollThumbClickOffset - this.dim.y() - (this.scrollThumb.height() / 2)) / (this.dim.height() - this.scrollThumb.height()) * this.maxScrollBarOffset); - } else { - value = (int) ((mouseX - this.scrollThumbClickOffset - this.dim.x() - (this.scrollThumb.width() / 2)) / (this.dim.width() - this.scrollThumb.width()) * this.maxScrollBarOffset); - } - this.setOffset(value); - return true; - } - return false; - } - - @Override - public boolean mouseScrolled(double mouseX, double mouseY, double amount) { - if (this.dim.containsCursor(mouseX, mouseY) || this.extendedScrollArea != null && this.extendedScrollArea.containsCursor(mouseX, mouseY)) { - if (this.offset <= this.maxScrollBarOffset && this.offset >= 0) { - int value = (int) (this.offset - amount * 6); - this.setOffset(value); - return true; - } - } - return false; - } - - public int getOffset() { - return this.offset; - } - - private void setOffset(int value) { - this.offset = MathHelper.clamp(value, 0, this.maxScrollBarOffset); - this.updateThumbPosition(); - this.onSetOffset.run(); - } - - protected void drawRectOutline(double x, double y, double w, double h, int color) { - final float a = (float) (color >> 24 & 255) / 255.0F; - final float r = (float) (color >> 16 & 255) / 255.0F; - final float g = (float) (color >> 8 & 255) / 255.0F; - final float b = (float) (color & 255) / 255.0F; - - this.drawQuads(vertices -> { - addQuad(vertices, x, y, w, y + 1, a, r, g, b); - addQuad(vertices, x, h - 1, w, h, a, r, g, b); - addQuad(vertices, x, y, x + 1, h, a, r, g, b); - addQuad(vertices, w - 1, y, w, h, a, r, g, b); - }); - } - - public enum Mode { - HORIZONTAL, - VERTICAL - } +package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components; + +import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.math.MathHelper; + +public class ScrollBarComponent extends AbstractWidget { + + protected final Dim2i dim; + + private final Mode mode; + private final int frameLength; + private final int viewPortLength; + private final int maxScrollBarOffset; + private final Runnable onSetOffset; + private int offset = 0; + private boolean isDragging; + + private Dim2i scrollThumb = null; + private int scrollThumbClickOffset; + + private Dim2i extendedScrollArea = null; + + public ScrollBarComponent(Dim2i trackArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset) { + this.dim = trackArea; + this.mode = mode; + this.frameLength = frameLength; + this.viewPortLength = viewPortLength; + this.onSetOffset = onSetOffset; + this.maxScrollBarOffset = this.frameLength - this.viewPortLength; + } + + public ScrollBarComponent(Dim2i scrollBarArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset, Dim2i extendedTrackArea) { + this(scrollBarArea, mode, frameLength, viewPortLength, onSetOffset); + this.extendedScrollArea = extendedTrackArea; + } + + public void updateThumbPosition() { + int scrollThumbLength = (this.viewPortLength * (this.mode == Mode.VERTICAL ? this.dim.height() : this.dim.width() - 6)) / this.frameLength; + int maximumScrollThumbOffset = this.viewPortLength - scrollThumbLength; + int scrollThumbOffset = this.offset * maximumScrollThumbOffset / this.maxScrollBarOffset; + this.scrollThumb = new Dim2i(this.dim.x() + 2 + (this.mode == Mode.HORIZONTAL ? scrollThumbOffset : 0), this.dim.y() + 2 + (this.mode == Mode.VERTICAL ? scrollThumbOffset : 0), (this.mode == Mode.VERTICAL ? this.dim.width() : scrollThumbLength) - 4, (this.mode == Mode.VERTICAL ? scrollThumbLength : this.dim.height()) - 4); + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); + this.drawRect(this.scrollThumb.x(), this.scrollThumb.y(), this.scrollThumb.getLimitX(), this.scrollThumb.getLimitY(), 0xFFAAAAAA); + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (this.dim.containsCursor(mouseX, mouseY)) { + if (this.scrollThumb.containsCursor(mouseX, mouseY)) { + if (this.mode == Mode.VERTICAL) { + this.scrollThumbClickOffset = (int) (mouseY - (this.scrollThumb.y() + this.scrollThumb.height() / 2)); + } else { + this.scrollThumbClickOffset = (int) (mouseX - (this.scrollThumb.x() + this.scrollThumb.width() / 2)); + } + this.isDragging = true; + } else { + int value; + if (this.mode == Mode.VERTICAL) { + value = (int) ((mouseY - this.dim.y() - (this.scrollThumb.height() / 2)) / (this.dim.height() - this.scrollThumb.height()) * this.maxScrollBarOffset); + } else { + value = (int) ((mouseX - this.dim.x() - (this.scrollThumb.width() / 2)) / (this.dim.width() - this.scrollThumb.width()) * this.maxScrollBarOffset); + } + this.setOffset(value); + this.isDragging = false; + } + return true; + } + this.isDragging = false; + return false; + } + + @Override + public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { + if (this.isDragging) { + int value; + if (this.mode == Mode.VERTICAL) { + value = (int) ((mouseY - this.scrollThumbClickOffset - this.dim.y() - (this.scrollThumb.height() / 2)) / (this.dim.height() - this.scrollThumb.height()) * this.maxScrollBarOffset); + } else { + value = (int) ((mouseX - this.scrollThumbClickOffset - this.dim.x() - (this.scrollThumb.width() / 2)) / (this.dim.width() - this.scrollThumb.width()) * this.maxScrollBarOffset); + } + this.setOffset(value); + return true; + } + return false; + } + + @Override + public boolean mouseScrolled(double mouseX, double mouseY, double amount) { + if (this.dim.containsCursor(mouseX, mouseY) || this.extendedScrollArea != null && this.extendedScrollArea.containsCursor(mouseX, mouseY)) { + if (this.offset <= this.maxScrollBarOffset && this.offset >= 0) { + int value = (int) (this.offset - amount * 6); + this.setOffset(value); + return true; + } + } + return false; + } + + public int getOffset() { + return this.offset; + } + + private void setOffset(int value) { + this.offset = MathHelper.clamp(value, 0, this.maxScrollBarOffset); + this.updateThumbPosition(); + this.onSetOffset.run(); + } + + protected void drawRectOutline(double x, double y, double w, double h, int color) { + final float a = (float) (color >> 24 & 255) / 255.0F; + final float r = (float) (color >> 16 & 255) / 255.0F; + final float g = (float) (color >> 8 & 255) / 255.0F; + final float b = (float) (color & 255) / 255.0F; + + this.drawQuads(vertices -> { + addQuad(vertices, x, y, w, y + 1, a, r, g, b); + addQuad(vertices, x, h - 1, w, h, a, r, g, b); + addQuad(vertices, x, y, x + 1, h, a, r, g, b); + addQuad(vertices, w - 1, y, w, h, a, r, g, b); + }); + } + + public enum Mode { + HORIZONTAL, + VERTICAL + } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java index 62ef021..684a062 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java @@ -1,46 +1,47 @@ -package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab; - -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame; -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.OptionPageScrollFrame; -import me.jellysquid.mods.sodium.client.gui.options.OptionPage; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.text.Text; - -public record Tab(Text title, T frame) implements TabOption { - - public static Tab.Builder createBuilder() { - return new Tab.Builder<>(); - } - - public Text getTitle() { - return title; - } - - @Override - public T getFrame() { - return this.frame; - } - - public static class Builder { - private Text title; - private T frame; - - public Builder setTitle(Text title) { - this.title = title; - return this; - } - - public Builder setFrame(T frame) { - this.frame = frame; - return this; - } - - public Tab build() { - return new Tab(this.title, this.frame); - } - - public Tab from(OptionPage page, Dim2i dim) { - return new Tab<>(page.getName(), OptionPageScrollFrame.createBuilder().setDimension(dim).shouldRenderOutline(false).setOptionPage(page).build()); - } - } +package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame; +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.OptionPageScrollFrame; +import me.jellysquid.mods.sodium.client.gui.options.OptionPage; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.text.Text; + +import java.util.function.Function; + +public record Tab(Text title, Function frameFunction) { + + public static Tab.Builder createBuilder() { + return new Tab.Builder<>(); + } + + public Text getTitle() { + return title; + } + + public Function getFrameFunction() { + return this.frameFunction; + } + + public static class Builder { + private Text title; + private Function frameFunction; + + public Builder setTitle(Text title) { + this.title = title; + return this; + } + + public Builder setFrameFunction(Function frameFunction) { + this.frameFunction = frameFunction; + return this; + } + + public Tab build() { + return new Tab(this.title, this.frameFunction); + } + + public Tab from(OptionPage page) { + return new Tab<>(page.getName(), dim2i -> OptionPageScrollFrame.createBuilder().setDimension(dim2i).setOptionPage(page).build()); + } + } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index 6106867..eed12fe 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -11,7 +11,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import java.util.function.Function; public class TabFrame extends AbstractFrame { @@ -21,12 +20,13 @@ public class TabFrame extends AbstractFrame { private final List> tabs = new ArrayList<>(); private ScrollBarComponent tabSectionScrollBar = null; private Tab selectedTab; + private AbstractFrame selectedFrame; - public TabFrame(Dim2i dim, boolean renderOutline, List>> functions) { + public TabFrame(Dim2i dim, boolean renderOutline, List> functions) { super(dim, renderOutline); this.tabSection = new Dim2i(this.dim.x(), this.dim.y(), (int) (this.dim.width() * 0.35D), this.dim.height()); this.frameSection = new Dim2i(this.tabSection.getLimitX(), this.dim.y(), this.dim.width() - this.tabSection.width(), this.dim.height()); - functions.forEach(function -> this.tabs.add(function.apply(this.frameSection))); + this.tabs.addAll(functions); int tabSectionY = this.tabs.size() * 18; this.tabSectionCanScroll = tabSectionY > this.tabSection.height(); @@ -74,12 +74,12 @@ public void buildFrame() { public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { this.applyScissor(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height(), () -> { for (AbstractWidget widget : this.children) { - if (widget != this.selectedTab.getFrame()) { + if (widget != this.selectedFrame) { widget.render(matrices, mouseX, mouseY, delta); } } }); - this.selectedTab.getFrame().render(matrices, mouseX, mouseY, delta); + this.selectedFrame.render(matrices, mouseX, mouseY, delta); if (this.tabSectionCanScroll) { this.tabSectionScrollBar.render(matrices, mouseX, mouseY, delta); } @@ -148,15 +148,16 @@ private void rebuildTabs() { private void rebuildTabFrame() { if (this.selectedTab == null) return; - AbstractFrame frame = this.selectedTab.getFrame(); + AbstractFrame frame = this.selectedTab.getFrameFunction().apply(this.frameSection); if (frame != null) { + this.selectedFrame = frame; frame.buildFrame(); this.children.add(frame); } } public static class Builder { - private final List>> functions = new ArrayList<>(); + private final List> functions = new ArrayList<>(); private Dim2i dim; private boolean renderOutline; @@ -170,7 +171,7 @@ public Builder shouldRenderOutline(boolean renderOutline) { return this; } - public Builder addTabs(Consumer>>> tabs) { + public Builder addTabs(Consumer>> tabs) { tabs.accept(this.functions); return this; } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabOption.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabOption.java deleted file mode 100644 index 33fd038..0000000 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabOption.java +++ /dev/null @@ -1,7 +0,0 @@ -package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab; - -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame; - -public interface TabOption { - T getFrame(); -} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java index e9bb046..0638c0f 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java @@ -1,28 +1,28 @@ -package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; - -import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; -import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(ControlElement.class) -public abstract class MixinControlElement extends AbstractWidget { - - @Shadow - @Final - protected Dim2i dim; - - @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/util/Dim2i;containsCursor(DD)Z")) - public boolean render(Dim2i dim2i, double x, double y) { - return this.isMouseOver(x, y); - } - - @Override - public boolean isMouseOver(double mouseX, double mouseY) { - return this.dim.containsCursor(mouseX, mouseY); - } -} +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; +import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(ControlElement.class) +public abstract class MixinControlElement extends AbstractWidget { + + @Shadow + @Final + protected Dim2i dim; + + @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/util/Dim2i;containsCursor(DD)Z")) + public boolean render(Dim2i dim2i, double x, double y) { + return this.isMouseOver(x, y); + } + + @Override + public boolean isMouseOver(double mouseX, double mouseY) { + return this.dim.containsCursor(mouseX, mouseY); + } +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java index 34ebb53..1396d24 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java @@ -1,36 +1,36 @@ -package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; - -import me.jellysquid.mods.sodium.client.gui.options.Option; -import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement") -public abstract class MixinCyclingControlElement> extends ControlElement { - - @Shadow - private int currentIndex; - - @Shadow - @Final - private T[] allowedValues; - - public MixinCyclingControlElement(Option option, Dim2i dim) { - super(option, dim); - } - - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (this.option.isAvailable() && this.dim.containsCursor(mouseX, mouseY) && (button == 0 || button == 1)) { - this.currentIndex = Math.floorMod(this.option.getValue().ordinal() + (button == 0 ? 1 : -1), this.allowedValues.length); - this.option.setValue(this.allowedValues[this.currentIndex]); - this.playClickSound(); - - return true; - } - - return false; - } -} +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.jellysquid.mods.sodium.client.gui.options.Option; +import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement") +public abstract class MixinCyclingControlElement> extends ControlElement { + + @Shadow + private int currentIndex; + + @Shadow + @Final + private T[] allowedValues; + + public MixinCyclingControlElement(Option option, Dim2i dim) { + super(option, dim); + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (this.option.isAvailable() && this.dim.containsCursor(mouseX, mouseY) && (button == 0 || button == 1)) { + this.currentIndex = Math.floorMod(this.option.getValue().ordinal() + (button == 0 ? 1 : -1), this.allowedValues.length); + this.option.setValue(this.allowedValues[this.currentIndex]); + this.playClickSound(); + + return true; + } + + return false; + } +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java index 78b63b7..e7ec1f8 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -1,66 +1,65 @@ -package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; - -import me.jellysquid.mods.sodium.client.gui.options.Option; -import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; -import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.util.math.Rect2i; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button") -public abstract class MixinSliderControlElement extends ControlElement { - - @Shadow - @Final - private int interval; - - @Shadow - private double thumbPosition; - - @Shadow - @Final - private int min; - - private int max; - - @Shadow - @Final - private Rect2i sliderBounds; - - public MixinSliderControlElement(Option option, Dim2i dim) { - super(option, dim); - } - - @Shadow - public abstract double getThumbPositionForValue(int value); - - - @Inject(method = "", at = @At(value = "TAIL")) - public void postInit(Option option, Dim2i dim, int min, int max, int interval, ControlValueFormatter formatter, CallbackInfo ci) { - this.max = max; - } - - private void setValueFromMouseScroll(double amount) { - if (this.option.getValue() + this.interval * (int) amount <= this.max && this.option.getValue() + this.interval * (int) amount >= this.min) { - this.option.setValue(this.option.getValue() + this.interval * (int) amount); - this.thumbPosition = this.getThumbPositionForValue(this.option.getValue()); - } - } - - @Override - public boolean mouseScrolled(double mouseX, double mouseY, double amount) { - if (this.option.isAvailable() && this.sliderBounds.contains((int) mouseX, (int) mouseY) && Screen.hasShiftDown()) { - this.setValueFromMouseScroll(amount); - - return true; - } - - return false; - } +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.jellysquid.mods.sodium.client.gui.options.Option; +import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; +import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.util.math.Rect2i; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button") +public abstract class MixinSliderControlElement extends ControlElement { + + @Shadow + @Final + private int interval; + + @Shadow + private double thumbPosition; + + @Shadow + @Final + private int min; + + private int max; + + @Shadow + @Final + private Rect2i sliderBounds; + + public MixinSliderControlElement(Option option, Dim2i dim) { + super(option, dim); + } + + @Shadow + public abstract double getThumbPositionForValue(int value); + + @Inject(method = "", at = @At(value = "TAIL")) + public void postInit(Option option, Dim2i dim, int min, int max, int interval, ControlValueFormatter formatter, CallbackInfo ci) { + this.max = max; + } + + private void setValueFromMouseScroll(double amount) { + if (this.option.getValue() + this.interval * (int) amount <= this.max && this.option.getValue() + this.interval * (int) amount >= this.min) { + this.option.setValue(this.option.getValue() + this.interval * (int) amount); + this.thumbPosition = this.getThumbPositionForValue(this.option.getValue()); + } + } + + @Override + public boolean mouseScrolled(double mouseX, double mouseY, double amount) { + if (this.option.isAvailable() && this.sliderBounds.contains((int) mouseX, (int) mouseY) && Screen.hasShiftDown()) { + this.setValueFromMouseScroll(amount); + + return true; + } + + return false; + } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java index 9cbba12..2b99aa5 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java @@ -1,36 +1,36 @@ -package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; - -import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; -import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; -import me.jellysquid.mods.sodium.client.gui.options.OptionPage; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.Text; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import java.util.List; - -@Mixin(SodiumOptionsGUI.class) -public abstract class MixinSodiumOptionsGUI extends Screen { - - @Shadow - @Final - private List pages; - - @Shadow - @Final - private Screen prevScreen; - - protected MixinSodiumOptionsGUI(Text title) { - super(title); - } - - @Inject(method = "init", at = @At("TAIL")) - public void postInit(CallbackInfo ci) { - this.client.setScreen(new SodiumVideoOptionsScreen(this.prevScreen, this.pages)); - } -} +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; +import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; +import me.jellysquid.mods.sodium.client.gui.options.OptionPage; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.List; + +@Mixin(SodiumOptionsGUI.class) +public abstract class MixinSodiumOptionsGUI extends Screen { + + @Shadow + @Final + private List pages; + + @Shadow + @Final + private Screen prevScreen; + + protected MixinSodiumOptionsGUI(Text title) { + super(title); + } + + @Inject(method = "init", at = @At("TAIL")) + public void postInit(CallbackInfo ci) { + this.client.setScreen(new SodiumVideoOptionsScreen(this.prevScreen, this.pages)); + } +} From 55e3b5e1bcfda11008768e97d643d9394006ff34 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 29 Jun 2022 23:57:24 +0800 Subject: [PATCH 038/112] change: Clean up --- .gitignore | 236 ++++----- LICENSE.txt | 42 +- README.md | 60 +-- gradle/wrapper/gradle-wrapper.properties | 10 +- jitpack.yml | 2 - settings.gradle | 16 +- .../client/gui/SodiumVideoOptionsScreen.java | 452 ++++++++--------- .../client/gui/frame/AbstractFrame.java | 214 ++++---- .../client/gui/frame/BasicFrame.java | 134 ++--- .../gui/frame/OptionPageScrollFrame.java | 458 +++++++++--------- .../frame/components/ScrollBarComponent.java | 264 +++++----- .../client/gui/frame/tab/Tab.java | 91 ++-- .../client/gui/frame/tab/TabFrame.java | 17 +- .../client/gui/frame/tab/TabOption.java | 7 - .../mixin/sodium/MixinControlElement.java | 56 +-- .../sodium/MixinCyclingControlElement.java | 72 +-- .../sodium/MixinSliderControlElement.java | 129 +++-- .../mixin/sodium/MixinSodiumOptionsGUI.java | 72 +-- src/main/resources/fabric.mod.json | 78 +-- 19 files changed, 1202 insertions(+), 1208 deletions(-) delete mode 100644 jitpack.yml delete mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabOption.java diff --git a/.gitignore b/.gitignore index 3c37caf..8f9956c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,118 +1,118 @@ -# User-specific stuff -.idea/ - -*.iml -*.ipr -*.iws - -# IntelliJ -out/ -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# Windows thumbnail cache files -Thumbs.db -Thumbs.db:encryptable -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -.gradle -build/ - -# Ignore Gradle GUI config -gradle-app.setting - -# Cache of project -.gradletasknamecache - -**/build/ - -# Common working directory -run/ - -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# IntelliJ +out/ +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Cache of project +.gradletasknamecache + +**/build/ + +# Common working directory +run/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar diff --git a/LICENSE.txt b/LICENSE.txt index 4ccecdb..e02faf1 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,21 +1,21 @@ -The MIT License (MIT) - -Copyright (c) 2021 FlashyReese - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +The MIT License (MIT) + +Copyright (c) 2021 FlashyReese + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README.md b/README.md index d3da359..c724920 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,30 @@ -# Reese's Sodium Options -![Java 17](https://img.shields.io/badge/language-Java%2017-9b599a.svg?style=flat-square) -[![Project License](https://img.shields.io/github/license/FlashyReese/reeses-sodium-options?style=flat-square)](LICENSE.txt) -![Environment: Client](https://img.shields.io/badge/environment-client-1976d2?style=flat-square) -![Mod loader: Fabric](https://img.shields.io/badge/modloader-Fabric-1976d2?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAFHGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDIgNzkuMTYwOTI0LCAyMDE3LzA3LzEzLTAxOjA2OjM5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDE4LTEyLTE2VDE2OjU0OjE3LTA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHN0RXZ0OndoZW49IjIwMTgtMTItMTZUMTY6NTQ6MTctMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChXaW5kb3dzKSIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4/HiGMAAAAtUlEQVRYw+XXrQqAMBQF4D2P2eBL+QIG8RnEJFaNBjEum+0+zMQLtwwv+wV3ZzhhMDgfJ0wUSinxZUQWgKos1JP/AbD4OneIDyQPwCFniA+EJ4CaXm4TxAXCC0BNHgLhAdAnx9hC8PwGSRtAFVMQjF7cNTWED8B1cgwW20yfJgAvrssAsZ1cB3g/xckAxr6FmCDU5N6f488BrpCQ4rQBJkiMYh4ACmLzwOQF0CExinkCsvw7vgGikl+OotaKRwAAAABJRU5ErkJggg==) -![Version](https://img.shields.io/github/v/tag/FlashyReese/reeses-sodium-options?label=version&style=flat-square) -[![CurseForge](http://cf.way2muchnoise.eu/title/511319.svg)](https://www.curseforge.com/minecraft/mc-mods/reeses-sodium-options) -[![Support Server](https://img.shields.io/discord/748363294749753484.svg?color=7289da&label=FlashyReese&logo=discord&style=flat-square)](https://discord.gg/TBGGM9VzH9) - -Reese's Edition of Sodium Options - -## Building from source - -#### Prerequisites - -- Java 17 or above - -#### Compiling - -Navigate to the directory you've cloned this repository and launch a build with Gradle using `gradlew build` (Windows) -or `./gradlew build` (macOS/Linux). If you are not using the Gradle wrapper, simply replace `gradlew` with `gradle` -or the path to it. - -The initial setup may take a few minutes. After Gradle has finished building everything, you can find the resulting -artifacts in `build/libs`. - -## License - -Reese's Sodium Options is license under MIT, a free and open-source license. For more information, please see the -[license file](LICENSE.txt). +# Reese's Sodium Options +![Java 17](https://img.shields.io/badge/language-Java%2017-9b599a.svg?style=flat-square) +[![Project License](https://img.shields.io/github/license/FlashyReese/reeses-sodium-options?style=flat-square)](LICENSE.txt) +![Environment: Client](https://img.shields.io/badge/environment-client-1976d2?style=flat-square) +![Mod loader: Fabric](https://img.shields.io/badge/modloader-Fabric-1976d2?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAFHGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDIgNzkuMTYwOTI0LCAyMDE3LzA3LzEzLTAxOjA2OjM5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDE4LTEyLTE2VDE2OjU0OjE3LTA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHN0RXZ0OndoZW49IjIwMTgtMTItMTZUMTY6NTQ6MTctMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChXaW5kb3dzKSIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4/HiGMAAAAtUlEQVRYw+XXrQqAMBQF4D2P2eBL+QIG8RnEJFaNBjEum+0+zMQLtwwv+wV3ZzhhMDgfJ0wUSinxZUQWgKos1JP/AbD4OneIDyQPwCFniA+EJ4CaXm4TxAXCC0BNHgLhAdAnx9hC8PwGSRtAFVMQjF7cNTWED8B1cgwW20yfJgAvrssAsZ1cB3g/xckAxr6FmCDU5N6f488BrpCQ4rQBJkiMYh4ACmLzwOQF0CExinkCsvw7vgGikl+OotaKRwAAAABJRU5ErkJggg==) +![Version](https://img.shields.io/github/v/tag/FlashyReese/reeses-sodium-options?label=version&style=flat-square) +[![CurseForge](http://cf.way2muchnoise.eu/title/511319.svg)](https://www.curseforge.com/minecraft/mc-mods/reeses-sodium-options) +[![Support Server](https://img.shields.io/discord/748363294749753484.svg?color=7289da&label=FlashyReese&logo=discord&style=flat-square)](https://discord.gg/TBGGM9VzH9) + +Reese's Edition of Sodium Options + +## Building from source + +#### Prerequisites + +- Java 17 or above + +#### Compiling + +Navigate to the directory you've cloned this repository and launch a build with Gradle using `gradlew build` (Windows) +or `./gradlew build` (macOS/Linux). If you are not using the Gradle wrapper, simply replace `gradlew` with `gradle` +or the path to it. + +The initial setup may take a few minutes. After Gradle has finished building everything, you can find the resulting +artifacts in `build/libs`. + +## License + +Reese's Sodium Options is license under MIT, a free and open-source license. For more information, please see the +[license file](LICENSE.txt). diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fc..5ec4b8e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/jitpack.yml b/jitpack.yml deleted file mode 100644 index 1e41e00..0000000 --- a/jitpack.yml +++ /dev/null @@ -1,2 +0,0 @@ -jdk: - - openjdk17 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 2875cde..c4bb92c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,9 @@ -pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - gradlePluginPortal() - } +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index a8bd59c..50e9939 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -1,226 +1,226 @@ -package me.flashyreese.mods.reeses_sodium_options.client.gui; - -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame; -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.BasicFrame; -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab.Tab; -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab.TabFrame; -import me.jellysquid.mods.sodium.client.SodiumClientMod; -import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions; -import me.jellysquid.mods.sodium.client.gui.options.Option; -import me.jellysquid.mods.sodium.client.gui.options.OptionFlag; -import me.jellysquid.mods.sodium.client.gui.options.OptionPage; -import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage; -import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.fabricmc.loader.api.FabricLoader; -import net.irisshaders.iris.api.v0.IrisApi; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.option.VideoOptionsScreen; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.Text; -import net.minecraft.util.Util; -import org.lwjgl.glfw.GLFW; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Stream; - -public class SodiumVideoOptionsScreen extends Screen { - - private final Screen prevScreen; - private final List pages = new ArrayList<>(); - private AbstractFrame frame; - private FlatButtonWidget applyButton, closeButton, undoButton; - private FlatButtonWidget donateButton, hideDonateButton; - private boolean hasPendingChanges; - - public SodiumVideoOptionsScreen(Screen prev, List pages) { - super(Text.literal("Reese's Sodium Menu")); - this.prevScreen = prev; - this.pages.addAll(pages); - } - - @Override - protected void init() { - this.frame = this.parentFrameBuilder().build(); - this.addDrawableChild(this.frame); - } - - protected BasicFrame.Builder parentFrameBuilder() { - BasicFrame.Builder basicFrameBuilder; - - Dim2i basicFrameDim = new Dim2i(0, 0, this.width, this.height); - Dim2i tabFrameDim = new Dim2i(basicFrameDim.width() / 20 / 2, basicFrameDim.height() / 4 / 2, basicFrameDim.width() - (basicFrameDim.width() / 20), basicFrameDim.height() / 4 * 3); - - Dim2i undoButtonDim = new Dim2i(tabFrameDim.getLimitX() - 203, tabFrameDim.getLimitY() + 5, 65, 20); - Dim2i applyButtonDim = new Dim2i(tabFrameDim.getLimitX() - 134, tabFrameDim.getLimitY() + 5, 65, 20); - Dim2i closeButtonDim = new Dim2i(tabFrameDim.getLimitX() - 65, tabFrameDim.getLimitY() + 5, 65, 20); - - Dim2i donateButtonDim = new Dim2i(tabFrameDim.getLimitX() - 122, tabFrameDim.y() - 26, 100, 20); - Dim2i hideDonateButtonDim = new Dim2i(tabFrameDim.getLimitX() - 20, tabFrameDim.y() - 26, 20, 20); - - this.undoButton = new FlatButtonWidget(undoButtonDim, Text.translatable("sodium.options.buttons.undo"), this::undoChanges); - this.applyButton = new FlatButtonWidget(applyButtonDim, Text.translatable("sodium.options.buttons.apply"), this::applyChanges); - this.closeButton = new FlatButtonWidget(closeButtonDim, Text.translatable("gui.done"), this::close); - - this.donateButton = new FlatButtonWidget(donateButtonDim, Text.translatable("sodium.options.buttons.donate"), this::openDonationPage); - this.hideDonateButton = new FlatButtonWidget(hideDonateButtonDim, Text.literal("x"), this::hideDonationButton); - - if (SodiumClientMod.options().notifications.hideDonationButton) { - this.setDonationButtonVisibility(false); - } - - basicFrameBuilder = this.parentBasicFrameBuilder(basicFrameDim, tabFrameDim); - - if (FabricLoader.getInstance().isModLoaded("iris")) { - int size = this.client.textRenderer.getWidth(Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey())); - Dim2i shaderPackButtonDim; - if (!SodiumClientMod.options().notifications.hideDonationButton) { - shaderPackButtonDim = new Dim2i(tabFrameDim.getLimitX() - 134 - size, tabFrameDim.y() - 26, 10 + size, 20); - } else { - shaderPackButtonDim = new Dim2i(tabFrameDim.getLimitX() - size - 10, tabFrameDim.y() - 26, 10 + size, 20); - } - FlatButtonWidget shaderPackButton = new FlatButtonWidget(shaderPackButtonDim, Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey()), () -> this.client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(this))); - basicFrameBuilder.addChild(dim -> shaderPackButton); - } - - return basicFrameBuilder; - } - - public BasicFrame.Builder parentBasicFrameBuilder(Dim2i parentBasicFrameDim, Dim2i tabFrameDim) { - return BasicFrame.createBuilder() - .setDimension(parentBasicFrameDim) - .shouldRenderOutline(false) - .addChild(dim -> this.undoButton) - .addChild(dim -> this.applyButton) - .addChild(dim -> this.closeButton) - .addChild(dim -> this.donateButton) - .addChild(dim -> this.hideDonateButton) - .addChild(parentDim -> TabFrame.createBuilder() - .setDimension(tabFrameDim) - .shouldRenderOutline(false) - .addTabs(tabs -> this.pages.stream().filter(page -> !page.getGroups().isEmpty()).forEach(page -> tabs.add(dim -> Tab.createBuilder().from(page, dim)))) - .build() - ); - } - - @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - super.renderBackground(matrices); - this.updateControls(); - this.frame.render(matrices, mouseX, mouseY, delta); - } - - private void updateControls() { - boolean hasChanges = this.getAllOptions() - .anyMatch(Option::hasChanged); - - for (OptionPage page : this.pages) { - for (Option option : page.getOptions()) { - if (option.hasChanged()) { - hasChanges = true; - } - } - } - - this.applyButton.setEnabled(hasChanges); - this.undoButton.setVisible(hasChanges); - this.closeButton.setEnabled(!hasChanges); - - this.hasPendingChanges = hasChanges; - } - - private void setDonationButtonVisibility(boolean value) { - this.donateButton.setVisible(value); - this.hideDonateButton.setVisible(value); - } - - private void hideDonationButton() { - SodiumGameOptions options = SodiumClientMod.options(); - options.notifications.hideDonationButton = true; - - try { - options.writeChanges(); - } catch (IOException e) { - throw new RuntimeException("Failed to save configuration", e); - } - - this.setDonationButtonVisibility(false); - - // Hackalicious! Rebuild UI - this.remove(this.frame); - this.frame = this.parentFrameBuilder().build(); - this.addDrawableChild(this.frame); - } - - private void openDonationPage() { - Util.getOperatingSystem() - .open("https://caffeinemc.net/donate"); - } - - private Stream> getAllOptions() { - return this.pages.stream() - .flatMap(s -> s.getOptions().stream()); - } - - private void applyChanges() { - final HashSet> dirtyStorages = new HashSet<>(); - final EnumSet flags = EnumSet.noneOf(OptionFlag.class); - - this.getAllOptions().forEach((option -> { - if (!option.hasChanged()) { - return; - } - - option.applyChanges(); - - flags.addAll(option.getFlags()); - dirtyStorages.add(option.getStorage()); - })); - - MinecraftClient client = MinecraftClient.getInstance(); - - if (flags.contains(OptionFlag.REQUIRES_RENDERER_RELOAD)) { - client.worldRenderer.reload(); - } - - if (flags.contains(OptionFlag.REQUIRES_ASSET_RELOAD)) { - client.setMipmapLevels(client.options.getMipmapLevels().getValue()); - client.reloadResourcesConcurrently(); - } - - for (OptionStorage storage : dirtyStorages) { - storage.save(); - } - } - - private void undoChanges() { - this.getAllOptions() - .forEach(Option::reset); - } - - @Override - public boolean keyPressed(int keyCode, int scanCode, int modifiers) { - if (keyCode == GLFW.GLFW_KEY_P && (modifiers & GLFW.GLFW_MOD_SHIFT) != 0) { - MinecraftClient.getInstance().setScreen(new VideoOptionsScreen(this.prevScreen, MinecraftClient.getInstance().options)); - - return true; - } - - return super.keyPressed(keyCode, scanCode, modifiers); - } - - @Override - public boolean shouldCloseOnEsc() { - return !this.hasPendingChanges; - } - - @Override - public void close() { - this.client.setScreen(this.prevScreen); - } -} +package me.flashyreese.mods.reeses_sodium_options.client.gui; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame; +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.BasicFrame; +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab.Tab; +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab.TabFrame; +import me.jellysquid.mods.sodium.client.SodiumClientMod; +import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions; +import me.jellysquid.mods.sodium.client.gui.options.Option; +import me.jellysquid.mods.sodium.client.gui.options.OptionFlag; +import me.jellysquid.mods.sodium.client.gui.options.OptionPage; +import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage; +import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.fabricmc.loader.api.FabricLoader; +import net.irisshaders.iris.api.v0.IrisApi; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.option.VideoOptionsScreen; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; +import net.minecraft.util.Util; +import org.lwjgl.glfw.GLFW; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; +import java.util.stream.Stream; + +public class SodiumVideoOptionsScreen extends Screen { + + private final Screen prevScreen; + private final List pages = new ArrayList<>(); + private AbstractFrame frame; + private FlatButtonWidget applyButton, closeButton, undoButton; + private FlatButtonWidget donateButton, hideDonateButton; + private boolean hasPendingChanges; + + public SodiumVideoOptionsScreen(Screen prev, List pages) { + super(Text.literal("Reese's Sodium Menu")); + this.prevScreen = prev; + this.pages.addAll(pages); + } + + @Override + protected void init() { + this.frame = this.parentFrameBuilder().build(); + this.addDrawableChild(this.frame); + } + + protected BasicFrame.Builder parentFrameBuilder() { + BasicFrame.Builder basicFrameBuilder; + + Dim2i basicFrameDim = new Dim2i(0, 0, this.width, this.height); + Dim2i tabFrameDim = new Dim2i(basicFrameDim.width() / 20 / 2, basicFrameDim.height() / 4 / 2, basicFrameDim.width() - (basicFrameDim.width() / 20), basicFrameDim.height() / 4 * 3); + + Dim2i undoButtonDim = new Dim2i(tabFrameDim.getLimitX() - 203, tabFrameDim.getLimitY() + 5, 65, 20); + Dim2i applyButtonDim = new Dim2i(tabFrameDim.getLimitX() - 134, tabFrameDim.getLimitY() + 5, 65, 20); + Dim2i closeButtonDim = new Dim2i(tabFrameDim.getLimitX() - 65, tabFrameDim.getLimitY() + 5, 65, 20); + + Dim2i donateButtonDim = new Dim2i(tabFrameDim.getLimitX() - 122, tabFrameDim.y() - 26, 100, 20); + Dim2i hideDonateButtonDim = new Dim2i(tabFrameDim.getLimitX() - 20, tabFrameDim.y() - 26, 20, 20); + + this.undoButton = new FlatButtonWidget(undoButtonDim, Text.translatable("sodium.options.buttons.undo"), this::undoChanges); + this.applyButton = new FlatButtonWidget(applyButtonDim, Text.translatable("sodium.options.buttons.apply"), this::applyChanges); + this.closeButton = new FlatButtonWidget(closeButtonDim, Text.translatable("gui.done"), this::close); + + this.donateButton = new FlatButtonWidget(donateButtonDim, Text.translatable("sodium.options.buttons.donate"), this::openDonationPage); + this.hideDonateButton = new FlatButtonWidget(hideDonateButtonDim, Text.literal("x"), this::hideDonationButton); + + if (SodiumClientMod.options().notifications.hideDonationButton) { + this.setDonationButtonVisibility(false); + } + + basicFrameBuilder = this.parentBasicFrameBuilder(basicFrameDim, tabFrameDim); + + if (FabricLoader.getInstance().isModLoaded("iris")) { + int size = this.client.textRenderer.getWidth(Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey())); + Dim2i shaderPackButtonDim; + if (!SodiumClientMod.options().notifications.hideDonationButton) { + shaderPackButtonDim = new Dim2i(tabFrameDim.getLimitX() - 134 - size, tabFrameDim.y() - 26, 10 + size, 20); + } else { + shaderPackButtonDim = new Dim2i(tabFrameDim.getLimitX() - size - 10, tabFrameDim.y() - 26, 10 + size, 20); + } + FlatButtonWidget shaderPackButton = new FlatButtonWidget(shaderPackButtonDim, Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey()), () -> this.client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(this))); + basicFrameBuilder.addChild(dim -> shaderPackButton); + } + + return basicFrameBuilder; + } + + public BasicFrame.Builder parentBasicFrameBuilder(Dim2i parentBasicFrameDim, Dim2i tabFrameDim) { + return BasicFrame.createBuilder() + .setDimension(parentBasicFrameDim) + .shouldRenderOutline(false) + .addChild(dim -> this.undoButton) + .addChild(dim -> this.applyButton) + .addChild(dim -> this.closeButton) + .addChild(dim -> this.donateButton) + .addChild(dim -> this.hideDonateButton) + .addChild(parentDim -> TabFrame.createBuilder() + .setDimension(tabFrameDim) + .shouldRenderOutline(false) + .addTabs(tabs -> this.pages.stream().filter(page -> !page.getGroups().isEmpty()).forEach(page -> tabs.add(Tab.createBuilder().from(page)))) + .build() + ); + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + super.renderBackground(matrices); + this.updateControls(); + this.frame.render(matrices, mouseX, mouseY, delta); + } + + private void updateControls() { + boolean hasChanges = this.getAllOptions() + .anyMatch(Option::hasChanged); + + for (OptionPage page : this.pages) { + for (Option option : page.getOptions()) { + if (option.hasChanged()) { + hasChanges = true; + } + } + } + + this.applyButton.setEnabled(hasChanges); + this.undoButton.setVisible(hasChanges); + this.closeButton.setEnabled(!hasChanges); + + this.hasPendingChanges = hasChanges; + } + + private void setDonationButtonVisibility(boolean value) { + this.donateButton.setVisible(value); + this.hideDonateButton.setVisible(value); + } + + private void hideDonationButton() { + SodiumGameOptions options = SodiumClientMod.options(); + options.notifications.hideDonationButton = true; + + try { + options.writeChanges(); + } catch (IOException e) { + throw new RuntimeException("Failed to save configuration", e); + } + + this.setDonationButtonVisibility(false); + + // Hackalicious! Rebuild UI + this.remove(this.frame); + this.frame = this.parentFrameBuilder().build(); + this.addDrawableChild(this.frame); + } + + private void openDonationPage() { + Util.getOperatingSystem() + .open("https://caffeinemc.net/donate"); + } + + private Stream> getAllOptions() { + return this.pages.stream() + .flatMap(s -> s.getOptions().stream()); + } + + private void applyChanges() { + final HashSet> dirtyStorages = new HashSet<>(); + final EnumSet flags = EnumSet.noneOf(OptionFlag.class); + + this.getAllOptions().forEach((option -> { + if (!option.hasChanged()) { + return; + } + + option.applyChanges(); + + flags.addAll(option.getFlags()); + dirtyStorages.add(option.getStorage()); + })); + + MinecraftClient client = MinecraftClient.getInstance(); + + if (flags.contains(OptionFlag.REQUIRES_RENDERER_RELOAD)) { + client.worldRenderer.reload(); + } + + if (flags.contains(OptionFlag.REQUIRES_ASSET_RELOAD)) { + client.setMipmapLevels(client.options.getMipmapLevels().getValue()); + client.reloadResourcesConcurrently(); + } + + for (OptionStorage storage : dirtyStorages) { + storage.save(); + } + } + + private void undoChanges() { + this.getAllOptions() + .forEach(Option::reset); + } + + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + if (keyCode == GLFW.GLFW_KEY_P && (modifiers & GLFW.GLFW_MOD_SHIFT) != 0) { + MinecraftClient.getInstance().setScreen(new VideoOptionsScreen(this.prevScreen, MinecraftClient.getInstance().options)); + + return true; + } + + return super.keyPressed(keyCode, scanCode, modifiers); + } + + @Override + public boolean shouldCloseOnEsc() { + return !this.hasPendingChanges; + } + + @Override + public void close() { + this.client.setScreen(this.prevScreen); + } +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java index 42232d5..faed6a4 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java @@ -1,107 +1,107 @@ -package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; - -import com.mojang.blaze3d.systems.RenderSystem; -import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; -import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.Drawable; -import net.minecraft.client.gui.Element; -import net.minecraft.client.gui.ParentElement; -import net.minecraft.client.util.math.MatrixStack; -import org.jetbrains.annotations.Nullable; - -import java.util.ArrayList; -import java.util.List; - -public abstract class AbstractFrame extends AbstractWidget implements ParentElement { - protected final Dim2i dim; - protected final List children = new ArrayList<>(); - protected final List drawable = new ArrayList<>(); - protected final List> controlElements = new ArrayList<>(); - protected boolean renderOutline; - private Element focused; - private boolean dragging; - - public AbstractFrame(Dim2i dim, boolean renderOutline) { - this.dim = dim; - this.renderOutline = renderOutline; - } - - public void buildFrame() { - for (Element element : this.children) { - if (element instanceof AbstractFrame) { - this.controlElements.addAll(((AbstractFrame) element).controlElements); - } - if (element instanceof ControlElement) { - this.controlElements.add((ControlElement) element); - } - if (element instanceof Drawable) { - this.drawable.add((Drawable) element); - } - } - } - - @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - if (this.renderOutline) { - this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); - } - for (Drawable drawable : this.drawable) { - drawable.render(matrices, mouseX, mouseY, delta); - } - } - - public void applyScissor(int x, int y, int width, int height, Runnable action) { - double scale = MinecraftClient.getInstance().getWindow().getScaleFactor(); - RenderSystem.enableScissor((int) (x * scale), (int) (MinecraftClient.getInstance().getWindow().getFramebufferHeight() - (y + height) * scale), - (int) (width * scale), (int) (height * scale)); - action.run(); - RenderSystem.disableScissor(); - } - - protected void drawRectOutline(double x, double y, double w, double h, int color) { - final float a = (float) (color >> 24 & 255) / 255.0F; - final float r = (float) (color >> 16 & 255) / 255.0F; - final float g = (float) (color >> 8 & 255) / 255.0F; - final float b = (float) (color & 255) / 255.0F; - - this.drawQuads(vertices -> { - addQuad(vertices, x, y, w, y + 1, a, r, g, b); - addQuad(vertices, x, h - 1, w, h, a, r, g, b); - addQuad(vertices, x, y, x + 1, h, a, r, g, b); - addQuad(vertices, w - 1, y, w, h, a, r, g, b); - }); - } - - @Override - public boolean isDragging() { - return this.dragging; - } - - @Override - public void setDragging(boolean dragging) { - this.dragging = dragging; - } - - @Nullable - @Override - public Element getFocused() { - return this.focused; - } - - @Override - public void setFocused(@Nullable Element focused) { - this.focused = focused; - } - - @Override - public List children() { - return this.children; - } - - @Override - public boolean isMouseOver(double mouseX, double mouseY) { - return this.dim.containsCursor(mouseX, mouseY); - } -} +package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; + +import com.mojang.blaze3d.systems.RenderSystem; +import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; +import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.ParentElement; +import net.minecraft.client.util.math.MatrixStack; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; + +public abstract class AbstractFrame extends AbstractWidget implements ParentElement { + protected final Dim2i dim; + protected final List children = new ArrayList<>(); + protected final List drawable = new ArrayList<>(); + protected final List> controlElements = new ArrayList<>(); + protected boolean renderOutline; + private Element focused; + private boolean dragging; + + public AbstractFrame(Dim2i dim, boolean renderOutline) { + this.dim = dim; + this.renderOutline = renderOutline; + } + + public void buildFrame() { + for (Element element : this.children) { + if (element instanceof AbstractFrame) { + this.controlElements.addAll(((AbstractFrame) element).controlElements); + } + if (element instanceof ControlElement) { + this.controlElements.add((ControlElement) element); + } + if (element instanceof Drawable) { + this.drawable.add((Drawable) element); + } + } + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + if (this.renderOutline) { + this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); + } + for (Drawable drawable : this.drawable) { + drawable.render(matrices, mouseX, mouseY, delta); + } + } + + public void applyScissor(int x, int y, int width, int height, Runnable action) { + double scale = MinecraftClient.getInstance().getWindow().getScaleFactor(); + RenderSystem.enableScissor((int) (x * scale), (int) (MinecraftClient.getInstance().getWindow().getFramebufferHeight() - (y + height) * scale), + (int) (width * scale), (int) (height * scale)); + action.run(); + RenderSystem.disableScissor(); + } + + protected void drawRectOutline(double x, double y, double w, double h, int color) { + final float a = (float) (color >> 24 & 255) / 255.0F; + final float r = (float) (color >> 16 & 255) / 255.0F; + final float g = (float) (color >> 8 & 255) / 255.0F; + final float b = (float) (color & 255) / 255.0F; + + this.drawQuads(vertices -> { + addQuad(vertices, x, y, w, y + 1, a, r, g, b); + addQuad(vertices, x, h - 1, w, h, a, r, g, b); + addQuad(vertices, x, y, x + 1, h, a, r, g, b); + addQuad(vertices, w - 1, y, w, h, a, r, g, b); + }); + } + + @Override + public boolean isDragging() { + return this.dragging; + } + + @Override + public void setDragging(boolean dragging) { + this.dragging = dragging; + } + + @Nullable + @Override + public Element getFocused() { + return this.focused; + } + + @Override + public void setFocused(@Nullable Element focused) { + this.focused = focused; + } + + @Override + public List children() { + return this.children; + } + + @Override + public boolean isMouseOver(double mouseX, double mouseY) { + return this.dim.containsCursor(mouseX, mouseY); + } +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java index e000b73..b08cca2 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java @@ -1,68 +1,68 @@ -package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; - -import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.util.math.MatrixStack; -import org.apache.commons.lang3.Validate; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Function; - -public class BasicFrame extends AbstractFrame { - - protected List> functions; - - public BasicFrame(Dim2i dim, boolean renderOutline, List> functions) { - super(dim, renderOutline); - this.functions = functions; - this.buildFrame(); - } - - public static Builder createBuilder() { - return new Builder(); - } - - @Override - public void buildFrame() { - this.children.clear(); - this.drawable.clear(); - this.controlElements.clear(); - - this.functions.forEach(function -> this.children.add(function.apply(dim))); - - super.buildFrame(); - } - - @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - super.render(matrices, mouseX, mouseY, delta); - } - - public static class Builder { - private final List> functions = new ArrayList<>(); - private Dim2i dim; - private boolean renderOutline; - - public Builder setDimension(Dim2i dim) { - this.dim = dim; - return this; - } - - public Builder shouldRenderOutline(boolean renderOutline) { - this.renderOutline = renderOutline; - return this; - } - - public Builder addChild(Function function) { - this.functions.add(function); - return this; - } - - public BasicFrame build() { - Validate.notNull(this.dim, "Dimension must be specified"); - - return new BasicFrame(this.dim, this.renderOutline, this.functions); - } - } +package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; + +import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.util.math.MatrixStack; +import org.apache.commons.lang3.Validate; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; + +public class BasicFrame extends AbstractFrame { + + protected List> functions; + + public BasicFrame(Dim2i dim, boolean renderOutline, List> functions) { + super(dim, renderOutline); + this.functions = functions; + this.buildFrame(); + } + + public static Builder createBuilder() { + return new Builder(); + } + + @Override + public void buildFrame() { + this.children.clear(); + this.drawable.clear(); + this.controlElements.clear(); + + this.functions.forEach(function -> this.children.add(function.apply(dim))); + + super.buildFrame(); + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + super.render(matrices, mouseX, mouseY, delta); + } + + public static class Builder { + private final List> functions = new ArrayList<>(); + private Dim2i dim; + private boolean renderOutline; + + public Builder setDimension(Dim2i dim) { + this.dim = dim; + return this; + } + + public Builder shouldRenderOutline(boolean renderOutline) { + this.renderOutline = renderOutline; + return this; + } + + public Builder addChild(Function function) { + this.functions.add(function); + return this; + } + + public BasicFrame build() { + Validate.notNull(this.dim, "Dimension must be specified"); + + return new BasicFrame(this.dim, this.renderOutline, this.functions); + } + } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java index 76c8491..c3027a2 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java @@ -1,229 +1,231 @@ -package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; - -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components.ScrollBarComponent; -import me.jellysquid.mods.sodium.client.gui.options.Option; -import me.jellysquid.mods.sodium.client.gui.options.OptionGroup; -import me.jellysquid.mods.sodium.client.gui.options.OptionImpact; -import me.jellysquid.mods.sodium.client.gui.options.OptionPage; -import me.jellysquid.mods.sodium.client.gui.options.control.Control; -import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.OrderedText; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; -import net.minecraft.util.Language; -import org.apache.commons.lang3.Validate; - -import java.util.ArrayList; -import java.util.List; - -public class OptionPageScrollFrame extends AbstractFrame { - protected final OptionPage page; - private boolean canScroll; - private ScrollBarComponent scrollBar = null; - private long lastTime = 0; - private ControlElement lastHoveredElement = null; - - public OptionPageScrollFrame(Dim2i dim, boolean renderOutline, OptionPage page) { - super(dim, renderOutline); - this.page = page; - this.setupFrame(); - this.buildFrame(); - } - - public static Builder createBuilder() { - return new Builder(); - } - - public void setupFrame() { - this.children.clear(); - this.drawable.clear(); - this.controlElements.clear(); - - int y = 0; - if (!this.page.getGroups().isEmpty()) { - OptionGroup lastGroup = this.page.getGroups().get(this.page.getGroups().size() - 1); - - for (OptionGroup group : this.page.getGroups()) { - y += group.getOptions().size() * 18; - if (group != lastGroup) { - y += 4; - } - } - } - - this.canScroll = this.dim.height() < y; - if (this.canScroll) { - this.scrollBar = new ScrollBarComponent(new Dim2i(this.dim.getLimitX() - 10, this.dim.y(), 10, this.dim.height()), ScrollBarComponent.Mode.VERTICAL, y, this.dim.height(), this::buildFrame, this.dim); - } - } - - @Override - public void buildFrame() { - if (this.page == null) return; - - this.children.clear(); - this.drawable.clear(); - this.controlElements.clear(); - - int y = 0; - for (OptionGroup group : this.page.getGroups()) { - // Add each option's control element - for (Option option : group.getOptions()) { - Control control = option.getControl(); - ControlElement element = control.createElement(new Dim2i(this.dim.x(), this.dim.y() + y - (this.canScroll ? this.scrollBar.getOffset() : 0), this.dim.width() - (this.canScroll ? 11 : 0), 18)); - this.children.add(element); - - // Move down to the next option - y += 18; - } - - // Add padding beneath each option group - y += 4; - } - - if (this.canScroll) { - this.scrollBar.updateThumbPosition(); - } - - super.buildFrame(); - } - - @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - ControlElement hoveredElement = this.controlElements.stream() - .filter(ControlElement::isHovered) - .findFirst() - .orElse(null); - this.applyScissor(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height(), () -> super.render(matrices, mouseX, mouseY, delta)); - if (this.canScroll) { - this.scrollBar.render(matrices, mouseX, mouseY, delta); - } - if (this.dim.containsCursor(mouseX, mouseY) && hoveredElement != null && this.lastHoveredElement == hoveredElement) { - if (this.lastTime == 0) { - this.lastTime = System.currentTimeMillis(); - } - this.renderOptionTooltip(matrices, hoveredElement); - } else { - this.lastTime = 0; - this.lastHoveredElement = hoveredElement; - } - } - - private void renderOptionTooltip(MatrixStack matrixStack, ControlElement element) { - if (this.lastTime + 500 > System.currentTimeMillis()) return; - - Dim2i dim = element.getDimensions(); - - int textPadding = 3; - int boxPadding = 3; - - int boxWidth = dim.width(); - - //Offset based on mouse position, width and height of content and width and height of the window - int boxY = dim.getLimitY(); - int boxX = dim.x(); - - Option option = element.getOption(); - List tooltip = new ArrayList<>(MinecraftClient.getInstance().textRenderer.wrapLines(option.getTooltip(), boxWidth - (textPadding * 2))); - - OptionImpact impact = option.getImpact(); - - if (impact != null) { - tooltip.add(Language.getInstance().reorder(Text.translatable("sodium.options.performance_impact_string", impact.getLocalizedName()).formatted(Formatting.GRAY))); - } - - int boxHeight = (tooltip.size() * 12) + boxPadding; - int boxYLimit = boxY + boxHeight; - int boxYCutoff = this.dim.getLimitY(); - - // If the box is going to be cutoff on the Y-axis, move it back up the difference - if (boxYLimit > boxYCutoff) { - boxY -= boxHeight + dim.height(); - } - - if (boxY < 0) { - boxY = dim.getLimitY(); - } - - this.drawRect(boxX, boxY, boxX + boxWidth, boxY + boxHeight, 0xE0000000); - this.drawRectOutline(boxX, boxY, boxX + boxWidth, boxY + boxHeight, 0xFF94E4D3); - - for (int i = 0; i < tooltip.size(); i++) { - MinecraftClient.getInstance().textRenderer.draw(matrixStack, tooltip.get(i), boxX + textPadding, boxY + textPadding + (i * 12), 0xFFFFFFFF); - } - } - - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (super.mouseClicked(mouseX, mouseY, button)) { - return true; - } - if (this.canScroll) { - return this.scrollBar.mouseClicked(mouseX, mouseY, button); - } - return false; - } - - @Override - public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - if (super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { - return true; - } - if (this.canScroll) { - return this.scrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY); - } - return false; - } - - @Override - public boolean mouseReleased(double mouseX, double mouseY, int button) { - if (super.mouseReleased(mouseX, mouseY, button)) { - return true; - } - if (this.canScroll) { - return this.scrollBar.mouseReleased(mouseX, mouseY, button); - } - return false; - } - - @Override - public boolean mouseScrolled(double mouseX, double mouseY, double amount) { - if (super.mouseScrolled(mouseX, mouseY, amount)) { - return true; - } - if (this.canScroll) { - return this.scrollBar.mouseScrolled(mouseX, mouseY, amount); - } - return false; - } - - public static class Builder { - private Dim2i dim; - private boolean renderOutline; - private OptionPage page; - - public Builder setDimension(Dim2i dim) { - this.dim = dim; - return this; - } - - public Builder shouldRenderOutline(boolean renderOutline) { - this.renderOutline = renderOutline; - return this; - } - - public Builder setOptionPage(OptionPage page) { - this.page = page; - return this; - } - - public OptionPageScrollFrame build() { - Validate.notNull(this.dim, "Dimension must be specified"); - - return new OptionPageScrollFrame(this.dim, this.renderOutline, this.page); - } - } +package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components.ScrollBarComponent; +import me.jellysquid.mods.sodium.client.gui.options.Option; +import me.jellysquid.mods.sodium.client.gui.options.OptionGroup; +import me.jellysquid.mods.sodium.client.gui.options.OptionImpact; +import me.jellysquid.mods.sodium.client.gui.options.OptionPage; +import me.jellysquid.mods.sodium.client.gui.options.control.Control; +import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.OrderedText; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.util.Language; +import org.apache.commons.lang3.Validate; + +import java.util.ArrayList; +import java.util.List; + +public class OptionPageScrollFrame extends AbstractFrame { + protected final OptionPage page; + private boolean canScroll; + private ScrollBarComponent scrollBar = null; + private long lastTime = 0; + private ControlElement lastHoveredElement = null; + + public OptionPageScrollFrame(Dim2i dim, boolean renderOutline, OptionPage page) { + super(dim, renderOutline); + this.page = page; + this.setupFrame(); + this.buildFrame(); + } + + public static Builder createBuilder() { + return new Builder(); + } + + public void setupFrame() { + this.children.clear(); + this.drawable.clear(); + this.controlElements.clear(); + + int y = 0; + if (!this.page.getGroups().isEmpty()) { + OptionGroup lastGroup = this.page.getGroups().get(this.page.getGroups().size() - 1); + + for (OptionGroup group : this.page.getGroups()) { + y += group.getOptions().size() * 18; + if (group != lastGroup) { + y += 4; + } + } + } + + this.canScroll = this.dim.height() < y; + if (this.canScroll) { + this.scrollBar = new ScrollBarComponent(new Dim2i(this.dim.getLimitX() - 10, this.dim.y(), 10, this.dim.height()), ScrollBarComponent.Mode.VERTICAL, y, this.dim.height(), this::buildFrame, this.dim); + } + } + + @Override + public void buildFrame() { + if (this.page == null) return; + + this.children.clear(); + this.drawable.clear(); + this.controlElements.clear(); + + int y = 0; + for (OptionGroup group : this.page.getGroups()) { + // Add each option's control element + for (Option option : group.getOptions()) { + Control control = option.getControl(); + ControlElement element = control.createElement(new Dim2i(this.dim.x(), this.dim.y() + y - (this.canScroll ? this.scrollBar.getOffset() : 0), this.dim.width() - (this.canScroll ? 11 : 0), 18)); + this.children.add(element); + + // Move down to the next option + y += 18; + } + + // Add padding beneath each option group + y += 4; + } + + if (this.canScroll) { + this.scrollBar.updateThumbPosition(); + } + + super.buildFrame(); + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + ControlElement hoveredElement = this.controlElements.stream() + .filter(ControlElement::isHovered) + .findFirst() + .orElse(null); + matrices.push(); + this.applyScissor(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height(), () -> super.render(matrices, mouseX, mouseY, delta)); + matrices.pop(); + if (this.canScroll) { + this.scrollBar.render(matrices, mouseX, mouseY, delta); + } + if (this.dim.containsCursor(mouseX, mouseY) && hoveredElement != null && this.lastHoveredElement == hoveredElement) { + if (this.lastTime == 0) { + this.lastTime = System.currentTimeMillis(); + } + this.renderOptionTooltip(matrices, hoveredElement); + } else { + this.lastTime = 0; + this.lastHoveredElement = hoveredElement; + } + } + + private void renderOptionTooltip(MatrixStack matrixStack, ControlElement element) { + if (this.lastTime + 500 > System.currentTimeMillis()) return; + + Dim2i dim = element.getDimensions(); + + int textPadding = 3; + int boxPadding = 3; + + int boxWidth = dim.width(); + + //Offset based on mouse position, width and height of content and width and height of the window + int boxY = dim.getLimitY(); + int boxX = dim.x(); + + Option option = element.getOption(); + List tooltip = new ArrayList<>(MinecraftClient.getInstance().textRenderer.wrapLines(option.getTooltip(), boxWidth - (textPadding * 2))); + + OptionImpact impact = option.getImpact(); + + if (impact != null) { + tooltip.add(Language.getInstance().reorder(Text.translatable("sodium.options.performance_impact_string", impact.getLocalizedName()).formatted(Formatting.GRAY))); + } + + int boxHeight = (tooltip.size() * 12) + boxPadding; + int boxYLimit = boxY + boxHeight; + int boxYCutoff = this.dim.getLimitY(); + + // If the box is going to be cutoff on the Y-axis, move it back up the difference + if (boxYLimit > boxYCutoff) { + boxY -= boxHeight + dim.height(); + } + + if (boxY < 0) { + boxY = dim.getLimitY(); + } + + this.drawRect(boxX, boxY, boxX + boxWidth, boxY + boxHeight, 0xE0000000); + this.drawRectOutline(boxX, boxY, boxX + boxWidth, boxY + boxHeight, 0xFF94E4D3); + + for (int i = 0; i < tooltip.size(); i++) { + MinecraftClient.getInstance().textRenderer.draw(matrixStack, tooltip.get(i), boxX + textPadding, boxY + textPadding + (i * 12), 0xFFFFFFFF); + } + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (super.mouseClicked(mouseX, mouseY, button)) { + return true; + } + if (this.canScroll) { + return this.scrollBar.mouseClicked(mouseX, mouseY, button); + } + return false; + } + + @Override + public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { + if (super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { + return true; + } + if (this.canScroll) { + return this.scrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY); + } + return false; + } + + @Override + public boolean mouseReleased(double mouseX, double mouseY, int button) { + if (super.mouseReleased(mouseX, mouseY, button)) { + return true; + } + if (this.canScroll) { + return this.scrollBar.mouseReleased(mouseX, mouseY, button); + } + return false; + } + + @Override + public boolean mouseScrolled(double mouseX, double mouseY, double amount) { + if (super.mouseScrolled(mouseX, mouseY, amount)) { + return true; + } + if (this.canScroll) { + return this.scrollBar.mouseScrolled(mouseX, mouseY, amount); + } + return false; + } + + public static class Builder { + private Dim2i dim; + private boolean renderOutline; + private OptionPage page; + + public Builder setDimension(Dim2i dim) { + this.dim = dim; + return this; + } + + public Builder shouldRenderOutline(boolean renderOutline) { + this.renderOutline = renderOutline; + return this; + } + + public Builder setOptionPage(OptionPage page) { + this.page = page; + return this; + } + + public OptionPageScrollFrame build() { + Validate.notNull(this.dim, "Dimension must be specified"); + + return new OptionPageScrollFrame(this.dim, this.renderOutline, this.page); + } + } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java index f3e680f..b710d70 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java @@ -1,133 +1,133 @@ -package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components; - -import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.math.MathHelper; - -public class ScrollBarComponent extends AbstractWidget { - - protected final Dim2i dim; - - private final Mode mode; - private final int frameLength; - private final int viewPortLength; - private final int maxScrollBarOffset; - private final Runnable onSetOffset; - private int offset = 0; - private boolean isDragging; - - private Dim2i scrollThumb = null; - private int scrollThumbClickOffset; - - private Dim2i extendedScrollArea = null; - - public ScrollBarComponent(Dim2i trackArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset) { - this.dim = trackArea; - this.mode = mode; - this.frameLength = frameLength; - this.viewPortLength = viewPortLength; - this.onSetOffset = onSetOffset; - this.maxScrollBarOffset = this.frameLength - this.viewPortLength; - } - - public ScrollBarComponent(Dim2i scrollBarArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset, Dim2i extendedTrackArea) { - this(scrollBarArea, mode, frameLength, viewPortLength, onSetOffset); - this.extendedScrollArea = extendedTrackArea; - } - - public void updateThumbPosition() { - int scrollThumbLength = (this.viewPortLength * (this.mode == Mode.VERTICAL ? this.dim.height() : this.dim.width() - 6)) / this.frameLength; - int maximumScrollThumbOffset = this.viewPortLength - scrollThumbLength; - int scrollThumbOffset = this.offset * maximumScrollThumbOffset / this.maxScrollBarOffset; - this.scrollThumb = new Dim2i(this.dim.x() + 2 + (this.mode == Mode.HORIZONTAL ? scrollThumbOffset : 0), this.dim.y() + 2 + (this.mode == Mode.VERTICAL ? scrollThumbOffset : 0), (this.mode == Mode.VERTICAL ? this.dim.width() : scrollThumbLength) - 4, (this.mode == Mode.VERTICAL ? scrollThumbLength : this.dim.height()) - 4); - } - - @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); - this.drawRect(this.scrollThumb.x(), this.scrollThumb.y(), this.scrollThumb.getLimitX(), this.scrollThumb.getLimitY(), 0xFFAAAAAA); - } - - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (this.dim.containsCursor(mouseX, mouseY)) { - if (this.scrollThumb.containsCursor(mouseX, mouseY)) { - if (this.mode == Mode.VERTICAL) { - this.scrollThumbClickOffset = (int) (mouseY - (this.scrollThumb.y() + this.scrollThumb.height() / 2)); - } else { - this.scrollThumbClickOffset = (int) (mouseX - (this.scrollThumb.x() + this.scrollThumb.width() / 2)); - } - this.isDragging = true; - } else { - int value; - if (this.mode == Mode.VERTICAL) { - value = (int) ((mouseY - this.dim.y() - (this.scrollThumb.height() / 2)) / (this.dim.height() - this.scrollThumb.height()) * this.maxScrollBarOffset); - } else { - value = (int) ((mouseX - this.dim.x() - (this.scrollThumb.width() / 2)) / (this.dim.width() - this.scrollThumb.width()) * this.maxScrollBarOffset); - } - this.setOffset(value); - this.isDragging = false; - } - return true; - } - this.isDragging = false; - return false; - } - - @Override - public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - if (this.isDragging) { - int value; - if (this.mode == Mode.VERTICAL) { - value = (int) ((mouseY - this.scrollThumbClickOffset - this.dim.y() - (this.scrollThumb.height() / 2)) / (this.dim.height() - this.scrollThumb.height()) * this.maxScrollBarOffset); - } else { - value = (int) ((mouseX - this.scrollThumbClickOffset - this.dim.x() - (this.scrollThumb.width() / 2)) / (this.dim.width() - this.scrollThumb.width()) * this.maxScrollBarOffset); - } - this.setOffset(value); - return true; - } - return false; - } - - @Override - public boolean mouseScrolled(double mouseX, double mouseY, double amount) { - if (this.dim.containsCursor(mouseX, mouseY) || this.extendedScrollArea != null && this.extendedScrollArea.containsCursor(mouseX, mouseY)) { - if (this.offset <= this.maxScrollBarOffset && this.offset >= 0) { - int value = (int) (this.offset - amount * 6); - this.setOffset(value); - return true; - } - } - return false; - } - - public int getOffset() { - return this.offset; - } - - private void setOffset(int value) { - this.offset = MathHelper.clamp(value, 0, this.maxScrollBarOffset); - this.updateThumbPosition(); - this.onSetOffset.run(); - } - - protected void drawRectOutline(double x, double y, double w, double h, int color) { - final float a = (float) (color >> 24 & 255) / 255.0F; - final float r = (float) (color >> 16 & 255) / 255.0F; - final float g = (float) (color >> 8 & 255) / 255.0F; - final float b = (float) (color & 255) / 255.0F; - - this.drawQuads(vertices -> { - addQuad(vertices, x, y, w, y + 1, a, r, g, b); - addQuad(vertices, x, h - 1, w, h, a, r, g, b); - addQuad(vertices, x, y, x + 1, h, a, r, g, b); - addQuad(vertices, w - 1, y, w, h, a, r, g, b); - }); - } - - public enum Mode { - HORIZONTAL, - VERTICAL - } +package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components; + +import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.math.MathHelper; + +public class ScrollBarComponent extends AbstractWidget { + + protected final Dim2i dim; + + private final Mode mode; + private final int frameLength; + private final int viewPortLength; + private final int maxScrollBarOffset; + private final Runnable onSetOffset; + private int offset = 0; + private boolean isDragging; + + private Dim2i scrollThumb = null; + private int scrollThumbClickOffset; + + private Dim2i extendedScrollArea = null; + + public ScrollBarComponent(Dim2i trackArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset) { + this.dim = trackArea; + this.mode = mode; + this.frameLength = frameLength; + this.viewPortLength = viewPortLength; + this.onSetOffset = onSetOffset; + this.maxScrollBarOffset = this.frameLength - this.viewPortLength; + } + + public ScrollBarComponent(Dim2i scrollBarArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset, Dim2i extendedTrackArea) { + this(scrollBarArea, mode, frameLength, viewPortLength, onSetOffset); + this.extendedScrollArea = extendedTrackArea; + } + + public void updateThumbPosition() { + int scrollThumbLength = (this.viewPortLength * (this.mode == Mode.VERTICAL ? this.dim.height() : this.dim.width() - 6)) / this.frameLength; + int maximumScrollThumbOffset = this.viewPortLength - scrollThumbLength; + int scrollThumbOffset = this.offset * maximumScrollThumbOffset / this.maxScrollBarOffset; + this.scrollThumb = new Dim2i(this.dim.x() + 2 + (this.mode == Mode.HORIZONTAL ? scrollThumbOffset : 0), this.dim.y() + 2 + (this.mode == Mode.VERTICAL ? scrollThumbOffset : 0), (this.mode == Mode.VERTICAL ? this.dim.width() : scrollThumbLength) - 4, (this.mode == Mode.VERTICAL ? scrollThumbLength : this.dim.height()) - 4); + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); + this.drawRect(this.scrollThumb.x(), this.scrollThumb.y(), this.scrollThumb.getLimitX(), this.scrollThumb.getLimitY(), 0xFFAAAAAA); + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (this.dim.containsCursor(mouseX, mouseY)) { + if (this.scrollThumb.containsCursor(mouseX, mouseY)) { + if (this.mode == Mode.VERTICAL) { + this.scrollThumbClickOffset = (int) (mouseY - (this.scrollThumb.y() + this.scrollThumb.height() / 2)); + } else { + this.scrollThumbClickOffset = (int) (mouseX - (this.scrollThumb.x() + this.scrollThumb.width() / 2)); + } + this.isDragging = true; + } else { + int value; + if (this.mode == Mode.VERTICAL) { + value = (int) ((mouseY - this.dim.y() - (this.scrollThumb.height() / 2)) / (this.dim.height() - this.scrollThumb.height()) * this.maxScrollBarOffset); + } else { + value = (int) ((mouseX - this.dim.x() - (this.scrollThumb.width() / 2)) / (this.dim.width() - this.scrollThumb.width()) * this.maxScrollBarOffset); + } + this.setOffset(value); + this.isDragging = false; + } + return true; + } + this.isDragging = false; + return false; + } + + @Override + public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { + if (this.isDragging) { + int value; + if (this.mode == Mode.VERTICAL) { + value = (int) ((mouseY - this.scrollThumbClickOffset - this.dim.y() - (this.scrollThumb.height() / 2)) / (this.dim.height() - this.scrollThumb.height()) * this.maxScrollBarOffset); + } else { + value = (int) ((mouseX - this.scrollThumbClickOffset - this.dim.x() - (this.scrollThumb.width() / 2)) / (this.dim.width() - this.scrollThumb.width()) * this.maxScrollBarOffset); + } + this.setOffset(value); + return true; + } + return false; + } + + @Override + public boolean mouseScrolled(double mouseX, double mouseY, double amount) { + if (this.dim.containsCursor(mouseX, mouseY) || this.extendedScrollArea != null && this.extendedScrollArea.containsCursor(mouseX, mouseY)) { + if (this.offset <= this.maxScrollBarOffset && this.offset >= 0) { + int value = (int) (this.offset - amount * 6); + this.setOffset(value); + return true; + } + } + return false; + } + + public int getOffset() { + return this.offset; + } + + private void setOffset(int value) { + this.offset = MathHelper.clamp(value, 0, this.maxScrollBarOffset); + this.updateThumbPosition(); + this.onSetOffset.run(); + } + + protected void drawRectOutline(double x, double y, double w, double h, int color) { + final float a = (float) (color >> 24 & 255) / 255.0F; + final float r = (float) (color >> 16 & 255) / 255.0F; + final float g = (float) (color >> 8 & 255) / 255.0F; + final float b = (float) (color & 255) / 255.0F; + + this.drawQuads(vertices -> { + addQuad(vertices, x, y, w, y + 1, a, r, g, b); + addQuad(vertices, x, h - 1, w, h, a, r, g, b); + addQuad(vertices, x, y, x + 1, h, a, r, g, b); + addQuad(vertices, w - 1, y, w, h, a, r, g, b); + }); + } + + public enum Mode { + HORIZONTAL, + VERTICAL + } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java index 62ef021..684a062 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java @@ -1,46 +1,47 @@ -package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab; - -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame; -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.OptionPageScrollFrame; -import me.jellysquid.mods.sodium.client.gui.options.OptionPage; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.text.Text; - -public record Tab(Text title, T frame) implements TabOption { - - public static Tab.Builder createBuilder() { - return new Tab.Builder<>(); - } - - public Text getTitle() { - return title; - } - - @Override - public T getFrame() { - return this.frame; - } - - public static class Builder { - private Text title; - private T frame; - - public Builder setTitle(Text title) { - this.title = title; - return this; - } - - public Builder setFrame(T frame) { - this.frame = frame; - return this; - } - - public Tab build() { - return new Tab(this.title, this.frame); - } - - public Tab from(OptionPage page, Dim2i dim) { - return new Tab<>(page.getName(), OptionPageScrollFrame.createBuilder().setDimension(dim).shouldRenderOutline(false).setOptionPage(page).build()); - } - } +package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame; +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.OptionPageScrollFrame; +import me.jellysquid.mods.sodium.client.gui.options.OptionPage; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.text.Text; + +import java.util.function.Function; + +public record Tab(Text title, Function frameFunction) { + + public static Tab.Builder createBuilder() { + return new Tab.Builder<>(); + } + + public Text getTitle() { + return title; + } + + public Function getFrameFunction() { + return this.frameFunction; + } + + public static class Builder { + private Text title; + private Function frameFunction; + + public Builder setTitle(Text title) { + this.title = title; + return this; + } + + public Builder setFrameFunction(Function frameFunction) { + this.frameFunction = frameFunction; + return this; + } + + public Tab build() { + return new Tab(this.title, this.frameFunction); + } + + public Tab from(OptionPage page) { + return new Tab<>(page.getName(), dim2i -> OptionPageScrollFrame.createBuilder().setDimension(dim2i).setOptionPage(page).build()); + } + } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index 6106867..eed12fe 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -11,7 +11,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import java.util.function.Function; public class TabFrame extends AbstractFrame { @@ -21,12 +20,13 @@ public class TabFrame extends AbstractFrame { private final List> tabs = new ArrayList<>(); private ScrollBarComponent tabSectionScrollBar = null; private Tab selectedTab; + private AbstractFrame selectedFrame; - public TabFrame(Dim2i dim, boolean renderOutline, List>> functions) { + public TabFrame(Dim2i dim, boolean renderOutline, List> functions) { super(dim, renderOutline); this.tabSection = new Dim2i(this.dim.x(), this.dim.y(), (int) (this.dim.width() * 0.35D), this.dim.height()); this.frameSection = new Dim2i(this.tabSection.getLimitX(), this.dim.y(), this.dim.width() - this.tabSection.width(), this.dim.height()); - functions.forEach(function -> this.tabs.add(function.apply(this.frameSection))); + this.tabs.addAll(functions); int tabSectionY = this.tabs.size() * 18; this.tabSectionCanScroll = tabSectionY > this.tabSection.height(); @@ -74,12 +74,12 @@ public void buildFrame() { public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { this.applyScissor(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height(), () -> { for (AbstractWidget widget : this.children) { - if (widget != this.selectedTab.getFrame()) { + if (widget != this.selectedFrame) { widget.render(matrices, mouseX, mouseY, delta); } } }); - this.selectedTab.getFrame().render(matrices, mouseX, mouseY, delta); + this.selectedFrame.render(matrices, mouseX, mouseY, delta); if (this.tabSectionCanScroll) { this.tabSectionScrollBar.render(matrices, mouseX, mouseY, delta); } @@ -148,15 +148,16 @@ private void rebuildTabs() { private void rebuildTabFrame() { if (this.selectedTab == null) return; - AbstractFrame frame = this.selectedTab.getFrame(); + AbstractFrame frame = this.selectedTab.getFrameFunction().apply(this.frameSection); if (frame != null) { + this.selectedFrame = frame; frame.buildFrame(); this.children.add(frame); } } public static class Builder { - private final List>> functions = new ArrayList<>(); + private final List> functions = new ArrayList<>(); private Dim2i dim; private boolean renderOutline; @@ -170,7 +171,7 @@ public Builder shouldRenderOutline(boolean renderOutline) { return this; } - public Builder addTabs(Consumer>>> tabs) { + public Builder addTabs(Consumer>> tabs) { tabs.accept(this.functions); return this; } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabOption.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabOption.java deleted file mode 100644 index 33fd038..0000000 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabOption.java +++ /dev/null @@ -1,7 +0,0 @@ -package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab; - -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame; - -public interface TabOption { - T getFrame(); -} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java index e9bb046..0638c0f 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java @@ -1,28 +1,28 @@ -package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; - -import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; -import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(ControlElement.class) -public abstract class MixinControlElement extends AbstractWidget { - - @Shadow - @Final - protected Dim2i dim; - - @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/util/Dim2i;containsCursor(DD)Z")) - public boolean render(Dim2i dim2i, double x, double y) { - return this.isMouseOver(x, y); - } - - @Override - public boolean isMouseOver(double mouseX, double mouseY) { - return this.dim.containsCursor(mouseX, mouseY); - } -} +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; +import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(ControlElement.class) +public abstract class MixinControlElement extends AbstractWidget { + + @Shadow + @Final + protected Dim2i dim; + + @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/util/Dim2i;containsCursor(DD)Z")) + public boolean render(Dim2i dim2i, double x, double y) { + return this.isMouseOver(x, y); + } + + @Override + public boolean isMouseOver(double mouseX, double mouseY) { + return this.dim.containsCursor(mouseX, mouseY); + } +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java index 34ebb53..1396d24 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java @@ -1,36 +1,36 @@ -package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; - -import me.jellysquid.mods.sodium.client.gui.options.Option; -import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement") -public abstract class MixinCyclingControlElement> extends ControlElement { - - @Shadow - private int currentIndex; - - @Shadow - @Final - private T[] allowedValues; - - public MixinCyclingControlElement(Option option, Dim2i dim) { - super(option, dim); - } - - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (this.option.isAvailable() && this.dim.containsCursor(mouseX, mouseY) && (button == 0 || button == 1)) { - this.currentIndex = Math.floorMod(this.option.getValue().ordinal() + (button == 0 ? 1 : -1), this.allowedValues.length); - this.option.setValue(this.allowedValues[this.currentIndex]); - this.playClickSound(); - - return true; - } - - return false; - } -} +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.jellysquid.mods.sodium.client.gui.options.Option; +import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement") +public abstract class MixinCyclingControlElement> extends ControlElement { + + @Shadow + private int currentIndex; + + @Shadow + @Final + private T[] allowedValues; + + public MixinCyclingControlElement(Option option, Dim2i dim) { + super(option, dim); + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (this.option.isAvailable() && this.dim.containsCursor(mouseX, mouseY) && (button == 0 || button == 1)) { + this.currentIndex = Math.floorMod(this.option.getValue().ordinal() + (button == 0 ? 1 : -1), this.allowedValues.length); + this.option.setValue(this.allowedValues[this.currentIndex]); + this.playClickSound(); + + return true; + } + + return false; + } +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java index 78b63b7..e7ec1f8 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -1,66 +1,65 @@ -package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; - -import me.jellysquid.mods.sodium.client.gui.options.Option; -import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; -import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter; -import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.util.math.Rect2i; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button") -public abstract class MixinSliderControlElement extends ControlElement { - - @Shadow - @Final - private int interval; - - @Shadow - private double thumbPosition; - - @Shadow - @Final - private int min; - - private int max; - - @Shadow - @Final - private Rect2i sliderBounds; - - public MixinSliderControlElement(Option option, Dim2i dim) { - super(option, dim); - } - - @Shadow - public abstract double getThumbPositionForValue(int value); - - - @Inject(method = "", at = @At(value = "TAIL")) - public void postInit(Option option, Dim2i dim, int min, int max, int interval, ControlValueFormatter formatter, CallbackInfo ci) { - this.max = max; - } - - private void setValueFromMouseScroll(double amount) { - if (this.option.getValue() + this.interval * (int) amount <= this.max && this.option.getValue() + this.interval * (int) amount >= this.min) { - this.option.setValue(this.option.getValue() + this.interval * (int) amount); - this.thumbPosition = this.getThumbPositionForValue(this.option.getValue()); - } - } - - @Override - public boolean mouseScrolled(double mouseX, double mouseY, double amount) { - if (this.option.isAvailable() && this.sliderBounds.contains((int) mouseX, (int) mouseY) && Screen.hasShiftDown()) { - this.setValueFromMouseScroll(amount); - - return true; - } - - return false; - } +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.jellysquid.mods.sodium.client.gui.options.Option; +import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; +import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.util.math.Rect2i; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button") +public abstract class MixinSliderControlElement extends ControlElement { + + @Shadow + @Final + private int interval; + + @Shadow + private double thumbPosition; + + @Shadow + @Final + private int min; + + private int max; + + @Shadow + @Final + private Rect2i sliderBounds; + + public MixinSliderControlElement(Option option, Dim2i dim) { + super(option, dim); + } + + @Shadow + public abstract double getThumbPositionForValue(int value); + + @Inject(method = "", at = @At(value = "TAIL")) + public void postInit(Option option, Dim2i dim, int min, int max, int interval, ControlValueFormatter formatter, CallbackInfo ci) { + this.max = max; + } + + private void setValueFromMouseScroll(double amount) { + if (this.option.getValue() + this.interval * (int) amount <= this.max && this.option.getValue() + this.interval * (int) amount >= this.min) { + this.option.setValue(this.option.getValue() + this.interval * (int) amount); + this.thumbPosition = this.getThumbPositionForValue(this.option.getValue()); + } + } + + @Override + public boolean mouseScrolled(double mouseX, double mouseY, double amount) { + if (this.option.isAvailable() && this.sliderBounds.contains((int) mouseX, (int) mouseY) && Screen.hasShiftDown()) { + this.setValueFromMouseScroll(amount); + + return true; + } + + return false; + } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java index 9cbba12..2b99aa5 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java @@ -1,36 +1,36 @@ -package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; - -import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; -import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; -import me.jellysquid.mods.sodium.client.gui.options.OptionPage; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.Text; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import java.util.List; - -@Mixin(SodiumOptionsGUI.class) -public abstract class MixinSodiumOptionsGUI extends Screen { - - @Shadow - @Final - private List pages; - - @Shadow - @Final - private Screen prevScreen; - - protected MixinSodiumOptionsGUI(Text title) { - super(title); - } - - @Inject(method = "init", at = @At("TAIL")) - public void postInit(CallbackInfo ci) { - this.client.setScreen(new SodiumVideoOptionsScreen(this.prevScreen, this.pages)); - } -} +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; +import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; +import me.jellysquid.mods.sodium.client.gui.options.OptionPage; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.List; + +@Mixin(SodiumOptionsGUI.class) +public abstract class MixinSodiumOptionsGUI extends Screen { + + @Shadow + @Final + private List pages; + + @Shadow + @Final + private Screen prevScreen; + + protected MixinSodiumOptionsGUI(Text title) { + super(title); + } + + @Inject(method = "init", at = @At("TAIL")) + public void postInit(CallbackInfo ci) { + this.client.setScreen(new SodiumVideoOptionsScreen(this.prevScreen, this.pages)); + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 31466a5..ffff704 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,39 +1,39 @@ -{ - "schemaVersion": 1, - "id": "reeses-sodium-options", - "version": "${version}", - "name": "Reese's Sodium Options", - "description": "Replaces Sodium's Options Screen", - "authors": [ - "FlashyReese" - ], - "contact": { - "homepage": "https://github.com/FlashyReese/reeses-sodium-options", - "issues": "https://github.com/FlashyReese/reeses-sodium-options/issues", - "sources": "https://github.com/FlashyReese/reeses-sodium-options.git" - }, - "icon": "assets/reeses-sodium-options/icon.png", - "license": "MIT", - "environment": "client", - "mixins": [ - "reeses-sodium-options.mixins.json" - ], - "custom": { - "modmenu": { - "parent": { - "id": "sodium" - } - } - }, - "depends": { - "minecraft": ">=1.19", - "sodium": "*" - }, - "breaks": { - "iris": "<1.1.4", - "sodium-extra": "<0.4.1" - }, - "recommends": { - "sodium-extra": ">=0.4.2" - } -} +{ + "schemaVersion": 1, + "id": "reeses-sodium-options", + "version": "${version}", + "name": "Reese's Sodium Options", + "description": "Replaces Sodium's Options Screen", + "authors": [ + "FlashyReese" + ], + "contact": { + "homepage": "https://github.com/FlashyReese/reeses-sodium-options", + "issues": "https://github.com/FlashyReese/reeses-sodium-options/issues", + "sources": "https://github.com/FlashyReese/reeses-sodium-options.git" + }, + "icon": "assets/reeses-sodium-options/icon.png", + "license": "MIT", + "environment": "client", + "mixins": [ + "reeses-sodium-options.mixins.json" + ], + "custom": { + "modmenu": { + "parent": { + "id": "sodium" + } + } + }, + "depends": { + "minecraft": ">=1.19", + "sodium": "*" + }, + "breaks": { + "iris": "<1.1.4", + "sodium-extra": "<0.4.1" + }, + "recommends": { + "sodium-extra": ">=0.4.2" + } +} From cc8d3e2af6da779de5cb4596cd05681b33183feb Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 30 Jun 2022 00:17:01 +0800 Subject: [PATCH 039/112] new: Dynamic scale left align tabs --- .../client/gui/FlatButtonWidgetExtended.java | 7 +++ .../client/gui/frame/tab/TabFrame.java | 12 +++-- .../mixin/sodium/MixinFlatButtonWidget.java | 53 +++++++++++++++++++ .../reeses-sodium-options.mixins.json | 1 + 4 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/FlatButtonWidgetExtended.java create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/FlatButtonWidgetExtended.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/FlatButtonWidgetExtended.java new file mode 100644 index 0000000..1a930c2 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/FlatButtonWidgetExtended.java @@ -0,0 +1,7 @@ +package me.flashyreese.mods.reeses_sodium_options.client.gui; + +public interface FlatButtonWidgetExtended { + boolean isLeftAligned(); + + void setLeftAligned(boolean leftAligned); +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index eed12fe..0fb7db4 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -1,5 +1,6 @@ package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab; +import me.flashyreese.mods.reeses_sodium_options.client.gui.FlatButtonWidgetExtended; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components.ScrollBarComponent; import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; @@ -10,6 +11,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.function.Consumer; public class TabFrame extends AbstractFrame { @@ -22,11 +24,14 @@ public class TabFrame extends AbstractFrame { private Tab selectedTab; private AbstractFrame selectedFrame; - public TabFrame(Dim2i dim, boolean renderOutline, List> functions) { + public TabFrame(Dim2i dim, boolean renderOutline, List> tabs) { super(dim, renderOutline); - this.tabSection = new Dim2i(this.dim.x(), this.dim.y(), (int) (this.dim.width() * 0.35D), this.dim.height()); + + Optional result = tabs.stream().map(tab -> this.getStringWidth(tab.title().getString())).max(Integer::compareTo); + + this.tabSection = new Dim2i(this.dim.x(), this.dim.y(), result.map(integer -> (int) (integer * 2.5)).orElseGet(() -> (int) (this.dim.width() * 0.35D)), this.dim.height()); this.frameSection = new Dim2i(this.tabSection.getLimitX(), this.dim.y(), this.dim.width() - this.tabSection.width(), this.dim.height()); - this.tabs.addAll(functions); + this.tabs.addAll(tabs); int tabSectionY = this.tabs.size() * 18; this.tabSectionCanScroll = tabSectionY > this.tabSection.height(); @@ -140,6 +145,7 @@ private void rebuildTabs() { FlatButtonWidget button = new FlatButtonWidget(tabDim, tab.getTitle(), () -> this.setTab(tab)); button.setSelected(this.selectedTab == tab); + ((FlatButtonWidgetExtended) button).setLeftAligned(true); this.children.add(button); offsetY += 18; diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java new file mode 100644 index 0000000..e852e66 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java @@ -0,0 +1,53 @@ +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.FlatButtonWidgetExtended; +import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; +import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(FlatButtonWidget.class) +public abstract class MixinFlatButtonWidget extends AbstractWidget implements FlatButtonWidgetExtended { + + @Shadow + @Final + private Dim2i dim; + + @Unique + private boolean leftAligned; + + @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/gui/widgets/FlatButtonWidget;drawString(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/text/Text;III)V")) + public void redirectDrawString(FlatButtonWidget instance, MatrixStack matrixStack, Text text, int x, int y, int color) { + if (this.leftAligned) { + this.drawString(matrixStack, text, this.dim.x() + 10, y, color); + } else { + this.drawString(matrixStack, text, x, y, color); + } + } + + @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/gui/widgets/FlatButtonWidget;drawRect(DDDDI)V", ordinal = 1)) + public void redirectDrawRect(FlatButtonWidget instance, double x1, double y1, double x2, double y2, int color) { + if (this.leftAligned) { + this.drawRect(x1, this.dim.y(), x1 + 1, y2, color); + } else { + this.drawRect(x1, y1, x2, y2, color); + } + } + + @Override + public boolean isLeftAligned() { + return this.leftAligned; + } + + @Override + public void setLeftAligned(boolean leftAligned) { + this.leftAligned = leftAligned; + } +} diff --git a/src/main/resources/reeses-sodium-options.mixins.json b/src/main/resources/reeses-sodium-options.mixins.json index abf47df..e917e5b 100644 --- a/src/main/resources/reeses-sodium-options.mixins.json +++ b/src/main/resources/reeses-sodium-options.mixins.json @@ -6,6 +6,7 @@ "client": [ "sodium.MixinControlElement", "sodium.MixinCyclingControlElement", + "sodium.MixinFlatButtonWidget", "sodium.MixinSliderControlElement", "sodium.MixinSodiumOptionsGUI" ], From 5bf9eadad3384bd2b9db5fb49b8677613b159227 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 30 Jun 2022 00:17:01 +0800 Subject: [PATCH 040/112] new: Dynamic scale left align tabs --- .../client/gui/FlatButtonWidgetExtended.java | 7 +++ .../client/gui/frame/tab/TabFrame.java | 12 +++-- .../mixin/sodium/MixinFlatButtonWidget.java | 53 +++++++++++++++++++ .../reeses-sodium-options.mixins.json | 1 + 4 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/FlatButtonWidgetExtended.java create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/FlatButtonWidgetExtended.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/FlatButtonWidgetExtended.java new file mode 100644 index 0000000..1a930c2 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/FlatButtonWidgetExtended.java @@ -0,0 +1,7 @@ +package me.flashyreese.mods.reeses_sodium_options.client.gui; + +public interface FlatButtonWidgetExtended { + boolean isLeftAligned(); + + void setLeftAligned(boolean leftAligned); +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index eed12fe..0fb7db4 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -1,5 +1,6 @@ package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab; +import me.flashyreese.mods.reeses_sodium_options.client.gui.FlatButtonWidgetExtended; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components.ScrollBarComponent; import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; @@ -10,6 +11,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.function.Consumer; public class TabFrame extends AbstractFrame { @@ -22,11 +24,14 @@ public class TabFrame extends AbstractFrame { private Tab selectedTab; private AbstractFrame selectedFrame; - public TabFrame(Dim2i dim, boolean renderOutline, List> functions) { + public TabFrame(Dim2i dim, boolean renderOutline, List> tabs) { super(dim, renderOutline); - this.tabSection = new Dim2i(this.dim.x(), this.dim.y(), (int) (this.dim.width() * 0.35D), this.dim.height()); + + Optional result = tabs.stream().map(tab -> this.getStringWidth(tab.title().getString())).max(Integer::compareTo); + + this.tabSection = new Dim2i(this.dim.x(), this.dim.y(), result.map(integer -> (int) (integer * 2.5)).orElseGet(() -> (int) (this.dim.width() * 0.35D)), this.dim.height()); this.frameSection = new Dim2i(this.tabSection.getLimitX(), this.dim.y(), this.dim.width() - this.tabSection.width(), this.dim.height()); - this.tabs.addAll(functions); + this.tabs.addAll(tabs); int tabSectionY = this.tabs.size() * 18; this.tabSectionCanScroll = tabSectionY > this.tabSection.height(); @@ -140,6 +145,7 @@ private void rebuildTabs() { FlatButtonWidget button = new FlatButtonWidget(tabDim, tab.getTitle(), () -> this.setTab(tab)); button.setSelected(this.selectedTab == tab); + ((FlatButtonWidgetExtended) button).setLeftAligned(true); this.children.add(button); offsetY += 18; diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java new file mode 100644 index 0000000..e852e66 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java @@ -0,0 +1,53 @@ +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.FlatButtonWidgetExtended; +import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; +import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(FlatButtonWidget.class) +public abstract class MixinFlatButtonWidget extends AbstractWidget implements FlatButtonWidgetExtended { + + @Shadow + @Final + private Dim2i dim; + + @Unique + private boolean leftAligned; + + @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/gui/widgets/FlatButtonWidget;drawString(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/text/Text;III)V")) + public void redirectDrawString(FlatButtonWidget instance, MatrixStack matrixStack, Text text, int x, int y, int color) { + if (this.leftAligned) { + this.drawString(matrixStack, text, this.dim.x() + 10, y, color); + } else { + this.drawString(matrixStack, text, x, y, color); + } + } + + @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/gui/widgets/FlatButtonWidget;drawRect(DDDDI)V", ordinal = 1)) + public void redirectDrawRect(FlatButtonWidget instance, double x1, double y1, double x2, double y2, int color) { + if (this.leftAligned) { + this.drawRect(x1, this.dim.y(), x1 + 1, y2, color); + } else { + this.drawRect(x1, y1, x2, y2, color); + } + } + + @Override + public boolean isLeftAligned() { + return this.leftAligned; + } + + @Override + public void setLeftAligned(boolean leftAligned) { + this.leftAligned = leftAligned; + } +} diff --git a/src/main/resources/reeses-sodium-options.mixins.json b/src/main/resources/reeses-sodium-options.mixins.json index abf47df..e917e5b 100644 --- a/src/main/resources/reeses-sodium-options.mixins.json +++ b/src/main/resources/reeses-sodium-options.mixins.json @@ -6,6 +6,7 @@ "client": [ "sodium.MixinControlElement", "sodium.MixinCyclingControlElement", + "sodium.MixinFlatButtonWidget", "sodium.MixinSliderControlElement", "sodium.MixinSodiumOptionsGUI" ], From e619eab074a4cfdbd5a8b17f70929643be23bcf9 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 21 Jul 2022 19:25:44 +0800 Subject: [PATCH 041/112] change: Bump gradle wrapper --- gradle/wrapper/gradle-wrapper.properties | 10 +- gradlew.bat | 178 +++++++++++------------ 2 files changed, 94 insertions(+), 94 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5ec4b8e..8049c68 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew.bat b/gradlew.bat index 107acd3..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,89 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From b553e28895f6a6fdd80bf227ec4822a277f3e1a3 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 21 Jul 2022 19:25:57 +0800 Subject: [PATCH 042/112] change: Bump gradle wrapper --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 178 +++++++++++------------ 2 files changed, 90 insertions(+), 90 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fc..8049c68 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew.bat b/gradlew.bat index 107acd3..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,89 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 51e7dccb5c2f04b26822b4ffbd7221c6d71be928 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 21 Jul 2022 19:29:14 +0800 Subject: [PATCH 043/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 67a1d8b..7a790de 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.18.2+build.1 loader_version=0.13.3 # Mod Properties - mod_version=1.4.3 + mod_version=1.4.4 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From 1478094faaa97c980020692a809fae5cefae4bde Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 21 Jul 2022 19:29:14 +0800 Subject: [PATCH 044/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 155533f..bccbda7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.19+build.1 loader_version=0.14.6 # Mod Properties - mod_version=1.4.3 + mod_version=1.4.4 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From a4ea55d158b539a7e0e9281a43d92052882bb523 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 27 Jul 2022 21:16:13 +0800 Subject: [PATCH 045/112] new: Cache last menu position --- .../client/gui/Dim2iExtended.java | 15 ++ .../client/gui/SodiumVideoOptionsScreen.java | 17 +- ...eScrollFrame.java => OptionPageFrame.java} | 82 +----- .../client/gui/frame/ScrollableFrame.java | 241 ++++++++++++++++++ .../frame/components/ScrollBarComponent.java | 12 +- .../client/gui/frame/tab/Tab.java | 8 +- .../client/gui/frame/tab/TabFrame.java | 44 +++- .../mixin/sodium/MixinDim2i.java | 63 +++++ .../reeses-sodium-options.mixins.json | 1 + 9 files changed, 394 insertions(+), 89 deletions(-) create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/Dim2iExtended.java rename src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/{OptionPageScrollFrame.java => OptionPageFrame.java} (64%) create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/Dim2iExtended.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/Dim2iExtended.java new file mode 100644 index 0000000..03fe236 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/Dim2iExtended.java @@ -0,0 +1,15 @@ +package me.flashyreese.mods.reeses_sodium_options.client.gui; + +import me.jellysquid.mods.sodium.client.util.Dim2i; + +public interface Dim2iExtended { + void setX(int x); + + void setY(int y); + + void setWidth(int width); + + void setHeight(int height); + + boolean canFitDimension(Dim2i anotherDim); +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index 50e9939..c71dd7b 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -23,14 +23,16 @@ import org.lwjgl.glfw.GLFW; import java.io.IOException; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.HashSet; -import java.util.List; +import java.util.*; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Stream; public class SodiumVideoOptionsScreen extends Screen { + private static final AtomicReference tabFrameSelectedTab = new AtomicReference<>(null); + private static final AtomicReference tabFrameScrollBarOffset = new AtomicReference<>(0); + private static final AtomicReference optionPageScrollBarOffset = new AtomicReference<>(0); + private final Screen prevScreen; private final List pages = new ArrayList<>(); private AbstractFrame frame; @@ -103,7 +105,12 @@ public BasicFrame.Builder parentBasicFrameBuilder(Dim2i parentBasicFrameDim, Dim .addChild(parentDim -> TabFrame.createBuilder() .setDimension(tabFrameDim) .shouldRenderOutline(false) - .addTabs(tabs -> this.pages.stream().filter(page -> !page.getGroups().isEmpty()).forEach(page -> tabs.add(Tab.createBuilder().from(page)))) + .setTabSectionScrollBarOffset(tabFrameScrollBarOffset) + .setTabSectionSelectedTab(tabFrameSelectedTab) + .addTabs(tabs -> this.pages.stream().filter(page -> !page.getGroups().isEmpty()).forEach(page -> tabs.add(Tab.createBuilder().from(page, optionPageScrollBarOffset)))) + .onSetTab(() -> { + optionPageScrollBarOffset.set(0); + }) .build() ); } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java similarity index 64% rename from src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java rename to src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java index c3027a2..f9a67b6 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java @@ -1,6 +1,6 @@ package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components.ScrollBarComponent; +import me.flashyreese.mods.reeses_sodium_options.client.gui.Dim2iExtended; import me.jellysquid.mods.sodium.client.gui.options.Option; import me.jellysquid.mods.sodium.client.gui.options.OptionGroup; import me.jellysquid.mods.sodium.client.gui.options.OptionImpact; @@ -19,24 +19,18 @@ import java.util.ArrayList; import java.util.List; -public class OptionPageScrollFrame extends AbstractFrame { +public class OptionPageFrame extends AbstractFrame { protected final OptionPage page; - private boolean canScroll; - private ScrollBarComponent scrollBar = null; private long lastTime = 0; private ControlElement lastHoveredElement = null; - - public OptionPageScrollFrame(Dim2i dim, boolean renderOutline, OptionPage page) { + + public OptionPageFrame(Dim2i dim, boolean renderOutline, OptionPage page) { super(dim, renderOutline); this.page = page; this.setupFrame(); this.buildFrame(); } - public static Builder createBuilder() { - return new Builder(); - } - public void setupFrame() { this.children.clear(); this.drawable.clear(); @@ -54,10 +48,7 @@ public void setupFrame() { } } - this.canScroll = this.dim.height() < y; - if (this.canScroll) { - this.scrollBar = new ScrollBarComponent(new Dim2i(this.dim.getLimitX() - 10, this.dim.y(), 10, this.dim.height()), ScrollBarComponent.Mode.VERTICAL, y, this.dim.height(), this::buildFrame, this.dim); - } + ((Dim2iExtended) ((Object) this.dim)).setHeight(y); } @Override @@ -73,7 +64,7 @@ public void buildFrame() { // Add each option's control element for (Option option : group.getOptions()) { Control control = option.getControl(); - ControlElement element = control.createElement(new Dim2i(this.dim.x(), this.dim.y() + y - (this.canScroll ? this.scrollBar.getOffset() : 0), this.dim.width() - (this.canScroll ? 11 : 0), 18)); + ControlElement element = control.createElement(new Dim2i(this.dim.x(), this.dim.y() + y, this.dim.width(), 18)); this.children.add(element); // Move down to the next option @@ -84,10 +75,6 @@ public void buildFrame() { y += 4; } - if (this.canScroll) { - this.scrollBar.updateThumbPosition(); - } - super.buildFrame(); } @@ -97,12 +84,7 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { .filter(ControlElement::isHovered) .findFirst() .orElse(null); - matrices.push(); - this.applyScissor(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height(), () -> super.render(matrices, mouseX, mouseY, delta)); - matrices.pop(); - if (this.canScroll) { - this.scrollBar.render(matrices, mouseX, mouseY, delta); - } + super.render(matrices, mouseX, mouseY, delta); if (this.dim.containsCursor(mouseX, mouseY) && hoveredElement != null && this.lastHoveredElement == hoveredElement) { if (this.lastTime == 0) { this.lastTime = System.currentTimeMillis(); @@ -158,50 +140,6 @@ private void renderOptionTooltip(MatrixStack matrixStack, ControlElement elem } } - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (super.mouseClicked(mouseX, mouseY, button)) { - return true; - } - if (this.canScroll) { - return this.scrollBar.mouseClicked(mouseX, mouseY, button); - } - return false; - } - - @Override - public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - if (super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { - return true; - } - if (this.canScroll) { - return this.scrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY); - } - return false; - } - - @Override - public boolean mouseReleased(double mouseX, double mouseY, int button) { - if (super.mouseReleased(mouseX, mouseY, button)) { - return true; - } - if (this.canScroll) { - return this.scrollBar.mouseReleased(mouseX, mouseY, button); - } - return false; - } - - @Override - public boolean mouseScrolled(double mouseX, double mouseY, double amount) { - if (super.mouseScrolled(mouseX, mouseY, amount)) { - return true; - } - if (this.canScroll) { - return this.scrollBar.mouseScrolled(mouseX, mouseY, amount); - } - return false; - } - public static class Builder { private Dim2i dim; private boolean renderOutline; @@ -222,10 +160,10 @@ public Builder setOptionPage(OptionPage page) { return this; } - public OptionPageScrollFrame build() { + public OptionPageFrame build() { Validate.notNull(this.dim, "Dimension must be specified"); - return new OptionPageScrollFrame(this.dim, this.renderOutline, this.page); + return new OptionPageFrame(this.dim, this.renderOutline, this.page); } } -} \ No newline at end of file +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java new file mode 100644 index 0000000..0339303 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java @@ -0,0 +1,241 @@ +package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.Dim2iExtended; +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components.ScrollBarComponent; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.util.math.MatrixStack; +import org.lwjgl.opengl.GL11; + +import java.util.concurrent.atomic.AtomicReference; + +public class ScrollableFrame extends AbstractFrame { + + protected final Dim2i frameOrigin; + protected final AbstractFrame frame; + + private boolean canScrollHorizontal; + private boolean canScrollVertical; + private Dim2i viewPortDimension = null; + private ScrollBarComponent verticalScrollBar = null; + private ScrollBarComponent horizontalScrollBar = null; + + public ScrollableFrame(Dim2i dim, AbstractFrame frame, boolean renderOutline, AtomicReference verticalScrollBarOffset, AtomicReference horizontalScrollBarOffset) { + super(dim, renderOutline); + this.frame = frame; + this.frameOrigin = new Dim2i(frame.dim.x(), frame.dim.y(), 0, 0); + this.setupFrame(verticalScrollBarOffset, horizontalScrollBarOffset); + this.buildFrame(); + } + + public static Builder createBuilder() { + return new Builder(); + } + + public void setupFrame(AtomicReference verticalScrollBarOffset, AtomicReference horizontalScrollBarOffset) { + int maxWidth = 0; + int maxHeight = 0; + if (!((Dim2iExtended) ((Object) this.dim)).canFitDimension(this.frame.dim)) { + if (this.dim.getLimitX() < this.frame.dim.getLimitX()) { + int value = this.frame.dim.x() - this.dim.x() + this.frame.dim.width(); + if (maxWidth < value) { + maxWidth = value; + } + } + if (this.dim.getLimitY() < this.frame.dim.getLimitY()) { + int value = this.frame.dim.y() - this.dim.y() + this.frame.dim.height(); + if (maxHeight < value) { + maxHeight = value; + } + } + } + + if (maxWidth > 0) { + this.canScrollHorizontal = true; + } + if (maxHeight > 0) { + this.canScrollVertical = true; + } + + if (this.canScrollHorizontal && this.canScrollVertical) { + this.viewPortDimension = new Dim2i(this.dim.x(), this.dim.y(), this.dim.width() - 11, this.dim.height() - 11); + } else if (this.canScrollHorizontal) { + this.viewPortDimension = new Dim2i(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height() - 11); + ((Dim2iExtended) ((Object) this.frame.dim)).setHeight(this.frame.dim.height() - 11); // fixme: don't mutate rather + } else if (this.canScrollVertical) { + this.viewPortDimension = new Dim2i(this.dim.x(), this.dim.y(), this.dim.width() - 11, this.dim.height()); + ((Dim2iExtended) ((Object) this.frame.dim)).setWidth(this.frame.dim.width() - 11); // fixme: don't mutate rather + } + + if (this.canScrollHorizontal) { + this.horizontalScrollBar = new ScrollBarComponent(new Dim2i(this.viewPortDimension.x(), this.viewPortDimension.getLimitY() + 1, this.viewPortDimension.width(), 10), ScrollBarComponent.Mode.HORIZONTAL, this.frame.dim.width(), this.viewPortDimension.width(), offset -> { + this.buildFrame(); + horizontalScrollBarOffset.set(offset); + }); + this.horizontalScrollBar.setOffset(horizontalScrollBarOffset.get()); + } + if (this.canScrollVertical) { + this.verticalScrollBar = new ScrollBarComponent(new Dim2i(this.viewPortDimension.getLimitX() + 1, this.viewPortDimension.y(), 10, this.viewPortDimension.height()), ScrollBarComponent.Mode.VERTICAL, this.frame.dim.height(), this.viewPortDimension.height(), offset -> { + this.buildFrame(); + verticalScrollBarOffset.set(offset); + }, this.viewPortDimension); + this.verticalScrollBar.setOffset(verticalScrollBarOffset.get()); + } + } + + @Override + public void buildFrame() { + this.children.clear(); + this.drawable.clear(); + this.controlElements.clear(); + + if (this.canScrollHorizontal) { + this.horizontalScrollBar.updateThumbPosition(); + } + + if (this.canScrollVertical) { + this.verticalScrollBar.updateThumbPosition(); + } + + if (this.canScrollHorizontal) { + ((Dim2iExtended) ((Object) this.frame.dim)).setX(this.frameOrigin.x() - this.horizontalScrollBar.getOffset()); + } + + if (this.canScrollVertical) { + ((Dim2iExtended) ((Object) this.frame.dim)).setY(this.frameOrigin.y() - this.verticalScrollBar.getOffset()); + } + + this.frame.buildFrame(); + this.children.add(this.frame); + super.buildFrame(); + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + if (this.canScrollHorizontal || this.canScrollVertical) { + if (this.renderOutline) { + this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); + } + int scale = (int) MinecraftClient.getInstance().getWindow().getScaleFactor(); + GL11.glScissor(this.viewPortDimension.x() * scale, MinecraftClient.getInstance().getWindow().getHeight() - this.viewPortDimension.getLimitY() * scale, this.viewPortDimension.width() * scale, this.viewPortDimension.height() * scale); + GL11.glEnable(GL11.GL_SCISSOR_TEST); + super.render(matrices, mouseX, mouseY, delta); + GL11.glDisable(GL11.GL_SCISSOR_TEST); + } else { + super.render(matrices, mouseX, mouseY, delta); + } + + if (this.canScrollHorizontal) { + this.horizontalScrollBar.render(matrices, mouseX, mouseY, delta); + } + + if (this.canScrollVertical) { + this.verticalScrollBar.render(matrices, mouseX, mouseY, delta); + } + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (super.mouseClicked(mouseX, mouseY, button)) { + return true; + } + if (this.canScrollHorizontal) { + if (this.horizontalScrollBar.mouseClicked(mouseX, mouseY, button)) { + return true; + } + } + if (this.canScrollVertical) { + return this.verticalScrollBar.mouseClicked(mouseX, mouseY, button); + } + return false; + } + + @Override + public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { + if (super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { + return true; + } + if (this.canScrollHorizontal) { + if (this.horizontalScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { + this.horizontalScrollBar.mouseReleased(mouseX, mouseY, button); + return true; + } + } + if (this.canScrollVertical) { + if (this.verticalScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { + this.verticalScrollBar.mouseReleased(mouseX, mouseY, button); + return true; + } + } + return false; + } + + @Override + public boolean mouseReleased(double mouseX, double mouseY, int button) { + if (super.mouseReleased(mouseX, mouseY, button)) { + return true; + } + if (this.canScrollHorizontal) { + if (this.horizontalScrollBar.mouseReleased(mouseX, mouseY, button)) { + return true; + } + } + if (this.canScrollVertical) { + return this.verticalScrollBar.mouseReleased(mouseX, mouseY, button); + } + return false; + } + + @Override + public boolean mouseScrolled(double mouseX, double mouseY, double amount) { + if (super.mouseScrolled(mouseX, mouseY, amount)) { + return true; + } + if (this.canScrollHorizontal) { + if (this.horizontalScrollBar.mouseScrolled(mouseX, mouseY, amount)) { + return true; + } + } + if (this.canScrollVertical) { + return this.verticalScrollBar.mouseScrolled(mouseX, mouseY, amount); + } + return false; + } + + public static class Builder { + private boolean renderOutline = false; + private Dim2i dim = null; + private AbstractFrame frame = null; + private AtomicReference verticalScrollBarOffset = new AtomicReference<>(0); + private AtomicReference horizontalScrollBarOffset = new AtomicReference<>(0); + + public Builder setDimension(Dim2i dim) { + this.dim = dim; + return this; + } + + public Builder shouldRenderOutline(boolean state) { + this.renderOutline = state; + return this; + } + + public Builder setVerticalScrollBarOffset(AtomicReference verticalScrollBarOffset) { + this.verticalScrollBarOffset = verticalScrollBarOffset; + return this; + } + + public Builder setHorizontalScrollBarOffset(AtomicReference horizontalScrollBarOffset) { + this.horizontalScrollBarOffset = horizontalScrollBarOffset; + return this; + } + + public Builder setFrame(AbstractFrame frame) { + this.frame = frame; + return this; + } + + public ScrollableFrame build() { + return new ScrollableFrame(this.dim, this.frame, this.renderOutline, this.verticalScrollBarOffset, this.horizontalScrollBarOffset); + } + } +} \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java index b710d70..ad1326b 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java @@ -5,6 +5,8 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.MathHelper; +import java.util.function.Consumer; + public class ScrollBarComponent extends AbstractWidget { protected final Dim2i dim; @@ -13,7 +15,7 @@ public class ScrollBarComponent extends AbstractWidget { private final int frameLength; private final int viewPortLength; private final int maxScrollBarOffset; - private final Runnable onSetOffset; + private final Consumer onSetOffset; private int offset = 0; private boolean isDragging; @@ -22,7 +24,7 @@ public class ScrollBarComponent extends AbstractWidget { private Dim2i extendedScrollArea = null; - public ScrollBarComponent(Dim2i trackArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset) { + public ScrollBarComponent(Dim2i trackArea, Mode mode, int frameLength, int viewPortLength, Consumer onSetOffset) { this.dim = trackArea; this.mode = mode; this.frameLength = frameLength; @@ -31,7 +33,7 @@ public ScrollBarComponent(Dim2i trackArea, Mode mode, int frameLength, int viewP this.maxScrollBarOffset = this.frameLength - this.viewPortLength; } - public ScrollBarComponent(Dim2i scrollBarArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset, Dim2i extendedTrackArea) { + public ScrollBarComponent(Dim2i scrollBarArea, Mode mode, int frameLength, int viewPortLength, Consumer onSetOffset, Dim2i extendedTrackArea) { this(scrollBarArea, mode, frameLength, viewPortLength, onSetOffset); this.extendedScrollArea = extendedTrackArea; } @@ -106,10 +108,10 @@ public int getOffset() { return this.offset; } - private void setOffset(int value) { + public void setOffset(int value) { this.offset = MathHelper.clamp(value, 0, this.maxScrollBarOffset); this.updateThumbPosition(); - this.onSetOffset.run(); + this.onSetOffset.accept(this.offset); } protected void drawRectOutline(double x, double y, double w, double h, int color) { diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java index 684a062..761d6ce 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java @@ -1,11 +1,13 @@ package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame; -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.OptionPageScrollFrame; +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.OptionPageFrame; +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.ScrollableFrame; import me.jellysquid.mods.sodium.client.gui.options.OptionPage; import me.jellysquid.mods.sodium.client.util.Dim2i; import net.minecraft.text.Text; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; public record Tab(Text title, Function frameFunction) { @@ -40,8 +42,8 @@ public Tab build() { return new Tab(this.title, this.frameFunction); } - public Tab from(OptionPage page) { - return new Tab<>(page.getName(), dim2i -> OptionPageScrollFrame.createBuilder().setDimension(dim2i).setOptionPage(page).build()); + public Tab from(OptionPage page, AtomicReference verticalScrollBarOffset) { + return new Tab<>(page.getName(), dim2i -> ScrollableFrame.createBuilder().setDimension(dim2i).setFrame(new OptionPageFrame(new Dim2i(dim2i.x(), dim2i.y(), dim2i.width(), dim2i.height()), false, page)).setVerticalScrollBarOffset(verticalScrollBarOffset).build()); } } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index 0fb7db4..ebcf9c6 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -7,11 +7,13 @@ import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; import org.apache.commons.lang3.Validate; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; public class TabFrame extends AbstractFrame { @@ -23,8 +25,10 @@ public class TabFrame extends AbstractFrame { private ScrollBarComponent tabSectionScrollBar = null; private Tab selectedTab; private AbstractFrame selectedFrame; + private final Runnable onSetTab; + private final AtomicReference tabSectionSelectedTab; - public TabFrame(Dim2i dim, boolean renderOutline, List> tabs) { + public TabFrame(Dim2i dim, boolean renderOutline, List> tabs, Runnable onSetTab, AtomicReference tabSectionSelectedTab, AtomicReference tabSectionScrollBarOffset) { super(dim, renderOutline); Optional result = tabs.stream().map(tab -> this.getStringWidth(tab.title().getString())).max(Integer::compareTo); @@ -33,10 +37,21 @@ public TabFrame(Dim2i dim, boolean renderOutline, List> tabs) { this.frameSection = new Dim2i(this.tabSection.getLimitX(), this.dim.y(), this.dim.width() - this.tabSection.width(), this.dim.height()); this.tabs.addAll(tabs); + this.onSetTab = onSetTab; + int tabSectionY = this.tabs.size() * 18; this.tabSectionCanScroll = tabSectionY > this.tabSection.height(); if (this.tabSectionCanScroll) { - this.tabSectionScrollBar = new ScrollBarComponent(new Dim2i(this.tabSection.getLimitX() - 11, this.tabSection.y(), 10, this.tabSection.height()), ScrollBarComponent.Mode.VERTICAL, tabSectionY, this.dim.height(), this::buildFrame, this.dim); + this.tabSectionScrollBar = new ScrollBarComponent(new Dim2i(this.tabSection.getLimitX() - 11, this.tabSection.y(), 10, this.tabSection.height()), ScrollBarComponent.Mode.VERTICAL, tabSectionY, this.dim.height(), offset -> { + this.buildFrame(); + tabSectionScrollBarOffset.set(offset); + }, this.dim); + this.tabSectionScrollBar.setOffset(tabSectionScrollBarOffset.get()); + } + this.tabSectionSelectedTab = tabSectionSelectedTab; + + if (this.tabSectionSelectedTab.get() != null) { + this.selectedTab = this.tabs.stream().filter(tab -> tab.getTitle().getString().equals(this.tabSectionSelectedTab.get().getString())).findAny().get(); } this.buildFrame(); @@ -48,7 +63,10 @@ public static Builder createBuilder() { public void setTab(Tab tab) { this.selectedTab = tab; - + this.tabSectionSelectedTab.set(this.selectedTab.getTitle()); + if (this.onSetTab != null) { + this.onSetTab.run(); + } this.buildFrame(); } @@ -166,6 +184,9 @@ public static class Builder { private final List> functions = new ArrayList<>(); private Dim2i dim; private boolean renderOutline; + private Runnable onSetTab; + private AtomicReference tabSectionSelectedTab = new AtomicReference<>(null); + private AtomicReference tabSectionScrollBarOffset = new AtomicReference<>(0); public Builder setDimension(Dim2i dim) { this.dim = dim; @@ -182,10 +203,25 @@ public Builder addTabs(Consumer>> tabs) { return this; } + public Builder onSetTab(Runnable onSetTab) { + this.onSetTab = onSetTab; + return this; + } + + public Builder setTabSectionSelectedTab(AtomicReference tabSectionSelectedTab) { + this.tabSectionSelectedTab = tabSectionSelectedTab; + return this; + } + + public Builder setTabSectionScrollBarOffset(AtomicReference tabSectionScrollBarOffset) { + this.tabSectionScrollBarOffset = tabSectionScrollBarOffset; + return this; + } + public TabFrame build() { Validate.notNull(this.dim, "Dimension must be specified"); - return new TabFrame(this.dim, this.renderOutline, this.functions); + return new TabFrame(this.dim, this.renderOutline, this.functions, this.onSetTab, this.tabSectionSelectedTab, this.tabSectionScrollBarOffset); } } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java new file mode 100644 index 0000000..1802742 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java @@ -0,0 +1,63 @@ +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.Dim2iExtended; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(Dim2i.class) +public abstract class MixinDim2i implements Dim2iExtended { + + @Shadow + @Final + @Mutable + private int x; + + @Shadow + @Final + @Mutable + private int y; + + @Shadow + @Final + @Mutable + private int width; + + @Shadow + @Final + @Mutable + private int height; + + @Shadow + public abstract int getLimitX(); + + @Shadow + public abstract int getLimitY(); + + @Override + public void setX(int x) { + this.x = x; + } + + @Override + public void setY(int y) { + this.y = y; + } + + @Override + public void setWidth(int width) { + this.width = width; + } + + @Override + public void setHeight(int height) { + this.height = height; + } + + @Override + public boolean canFitDimension(Dim2i anotherDim) { + return this.x <= anotherDim.x() && this.y <= anotherDim.y() && this.getLimitX() >= anotherDim.getLimitX() && this.getLimitY() >= anotherDim.getLimitY(); + } +} diff --git a/src/main/resources/reeses-sodium-options.mixins.json b/src/main/resources/reeses-sodium-options.mixins.json index e917e5b..a2a2cfa 100644 --- a/src/main/resources/reeses-sodium-options.mixins.json +++ b/src/main/resources/reeses-sodium-options.mixins.json @@ -6,6 +6,7 @@ "client": [ "sodium.MixinControlElement", "sodium.MixinCyclingControlElement", + "sodium.MixinDim2i", "sodium.MixinFlatButtonWidget", "sodium.MixinSliderControlElement", "sodium.MixinSodiumOptionsGUI" From e38e858f99dda008710ad12b9d7200c7e6099c37 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 27 Jul 2022 21:23:02 +0800 Subject: [PATCH 046/112] new: Cache last menu position --- .../client/gui/Dim2iExtended.java | 15 ++ .../client/gui/SodiumVideoOptionsScreen.java | 13 +- ...eScrollFrame.java => OptionPageFrame.java} | 80 +----- .../client/gui/frame/ScrollableFrame.java | 241 ++++++++++++++++++ .../frame/components/ScrollBarComponent.java | 12 +- .../client/gui/frame/tab/Tab.java | 8 +- .../client/gui/frame/tab/TabFrame.java | 44 +++- .../mixin/sodium/MixinDim2i.java | 63 +++++ .../reeses-sodium-options.mixins.json | 1 + 9 files changed, 393 insertions(+), 84 deletions(-) create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/Dim2iExtended.java rename src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/{OptionPageScrollFrame.java => OptionPageFrame.java} (66%) create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/Dim2iExtended.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/Dim2iExtended.java new file mode 100644 index 0000000..03fe236 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/Dim2iExtended.java @@ -0,0 +1,15 @@ +package me.flashyreese.mods.reeses_sodium_options.client.gui; + +import me.jellysquid.mods.sodium.client.util.Dim2i; + +public interface Dim2iExtended { + void setX(int x); + + void setY(int y); + + void setWidth(int width); + + void setHeight(int height); + + boolean canFitDimension(Dim2i anotherDim); +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index 3c7eb7d..32c3d4a 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -19,6 +19,7 @@ import net.minecraft.client.gui.screen.option.VideoOptionsScreen; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.Util; import org.lwjgl.glfw.GLFW; @@ -28,10 +29,15 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.List; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Stream; public class SodiumVideoOptionsScreen extends Screen { + private static final AtomicReference tabFrameSelectedTab = new AtomicReference<>(null); + private static final AtomicReference tabFrameScrollBarOffset = new AtomicReference<>(0); + private static final AtomicReference optionPageScrollBarOffset = new AtomicReference<>(0); + private final Screen prevScreen; private final List pages = new ArrayList<>(); private AbstractFrame frame; @@ -104,7 +110,12 @@ public BasicFrame.Builder parentBasicFrameBuilder(Dim2i parentBasicFrameDim, Dim .addChild(parentDim -> TabFrame.createBuilder() .setDimension(tabFrameDim) .shouldRenderOutline(false) - .addTabs(tabs -> this.pages.stream().filter(page -> !page.getGroups().isEmpty()).forEach(page -> tabs.add(Tab.createBuilder().from(page)))) + .setTabSectionScrollBarOffset(tabFrameScrollBarOffset) + .setTabSectionSelectedTab(tabFrameSelectedTab) + .addTabs(tabs -> this.pages.stream().filter(page -> !page.getGroups().isEmpty()).forEach(page -> tabs.add(Tab.createBuilder().from(page, optionPageScrollBarOffset)))) + .onSetTab(() -> { + optionPageScrollBarOffset.set(0); + }) .build() ); } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java similarity index 66% rename from src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java rename to src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java index dc9e7dc..1790c5b 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageScrollFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java @@ -1,6 +1,6 @@ package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components.ScrollBarComponent; +import me.flashyreese.mods.reeses_sodium_options.client.gui.Dim2iExtended; import me.jellysquid.mods.sodium.client.gui.options.Option; import me.jellysquid.mods.sodium.client.gui.options.OptionGroup; import me.jellysquid.mods.sodium.client.gui.options.OptionImpact; @@ -19,24 +19,18 @@ import java.util.ArrayList; import java.util.List; -public class OptionPageScrollFrame extends AbstractFrame { +public class OptionPageFrame extends AbstractFrame { protected final OptionPage page; - private boolean canScroll; - private ScrollBarComponent scrollBar = null; private long lastTime = 0; private ControlElement lastHoveredElement = null; - public OptionPageScrollFrame(Dim2i dim, boolean renderOutline, OptionPage page) { + public OptionPageFrame(Dim2i dim, boolean renderOutline, OptionPage page) { super(dim, renderOutline); this.page = page; this.setupFrame(); this.buildFrame(); } - public static Builder createBuilder() { - return new Builder(); - } - public void setupFrame() { this.children.clear(); this.drawable.clear(); @@ -54,10 +48,7 @@ public void setupFrame() { } } - this.canScroll = this.dim.height() < y; - if (this.canScroll) { - this.scrollBar = new ScrollBarComponent(new Dim2i(this.dim.getLimitX() - 10, this.dim.y(), 10, this.dim.height()), ScrollBarComponent.Mode.VERTICAL, y, this.dim.height(), this::buildFrame, this.dim); - } + ((Dim2iExtended) ((Object) this.dim)).setHeight(y); } @Override @@ -73,7 +64,7 @@ public void buildFrame() { // Add each option's control element for (Option option : group.getOptions()) { Control control = option.getControl(); - ControlElement element = control.createElement(new Dim2i(this.dim.x(), this.dim.y() + y - (this.canScroll ? this.scrollBar.getOffset() : 0), this.dim.width() - (this.canScroll ? 11 : 0), 18)); + ControlElement element = control.createElement(new Dim2i(this.dim.x(), this.dim.y() + y, this.dim.width(), 18)); this.children.add(element); // Move down to the next option @@ -84,10 +75,6 @@ public void buildFrame() { y += 4; } - if (this.canScroll) { - this.scrollBar.updateThumbPosition(); - } - super.buildFrame(); } @@ -97,12 +84,7 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { .filter(ControlElement::isHovered) .findFirst() .orElse(null); - matrices.push(); - this.applyScissor(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height(), () -> super.render(matrices, mouseX, mouseY, delta)); - matrices.pop(); - if (this.canScroll) { - this.scrollBar.render(matrices, mouseX, mouseY, delta); - } + super.render(matrices, mouseX, mouseY, delta); if (this.dim.containsCursor(mouseX, mouseY) && hoveredElement != null && this.lastHoveredElement == hoveredElement) { if (this.lastTime == 0) { this.lastTime = System.currentTimeMillis(); @@ -158,50 +140,6 @@ private void renderOptionTooltip(MatrixStack matrixStack, ControlElement elem } } - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (super.mouseClicked(mouseX, mouseY, button)) { - return true; - } - if (this.canScroll) { - return this.scrollBar.mouseClicked(mouseX, mouseY, button); - } - return false; - } - - @Override - public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - if (super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { - return true; - } - if (this.canScroll) { - return this.scrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY); - } - return false; - } - - @Override - public boolean mouseReleased(double mouseX, double mouseY, int button) { - if (super.mouseReleased(mouseX, mouseY, button)) { - return true; - } - if (this.canScroll) { - return this.scrollBar.mouseReleased(mouseX, mouseY, button); - } - return false; - } - - @Override - public boolean mouseScrolled(double mouseX, double mouseY, double amount) { - if (super.mouseScrolled(mouseX, mouseY, amount)) { - return true; - } - if (this.canScroll) { - return this.scrollBar.mouseScrolled(mouseX, mouseY, amount); - } - return false; - } - public static class Builder { private Dim2i dim; private boolean renderOutline; @@ -222,10 +160,10 @@ public Builder setOptionPage(OptionPage page) { return this; } - public OptionPageScrollFrame build() { + public OptionPageFrame build() { Validate.notNull(this.dim, "Dimension must be specified"); - return new OptionPageScrollFrame(this.dim, this.renderOutline, this.page); + return new OptionPageFrame(this.dim, this.renderOutline, this.page); } } -} \ No newline at end of file +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java new file mode 100644 index 0000000..0339303 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java @@ -0,0 +1,241 @@ +package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.Dim2iExtended; +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components.ScrollBarComponent; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.util.math.MatrixStack; +import org.lwjgl.opengl.GL11; + +import java.util.concurrent.atomic.AtomicReference; + +public class ScrollableFrame extends AbstractFrame { + + protected final Dim2i frameOrigin; + protected final AbstractFrame frame; + + private boolean canScrollHorizontal; + private boolean canScrollVertical; + private Dim2i viewPortDimension = null; + private ScrollBarComponent verticalScrollBar = null; + private ScrollBarComponent horizontalScrollBar = null; + + public ScrollableFrame(Dim2i dim, AbstractFrame frame, boolean renderOutline, AtomicReference verticalScrollBarOffset, AtomicReference horizontalScrollBarOffset) { + super(dim, renderOutline); + this.frame = frame; + this.frameOrigin = new Dim2i(frame.dim.x(), frame.dim.y(), 0, 0); + this.setupFrame(verticalScrollBarOffset, horizontalScrollBarOffset); + this.buildFrame(); + } + + public static Builder createBuilder() { + return new Builder(); + } + + public void setupFrame(AtomicReference verticalScrollBarOffset, AtomicReference horizontalScrollBarOffset) { + int maxWidth = 0; + int maxHeight = 0; + if (!((Dim2iExtended) ((Object) this.dim)).canFitDimension(this.frame.dim)) { + if (this.dim.getLimitX() < this.frame.dim.getLimitX()) { + int value = this.frame.dim.x() - this.dim.x() + this.frame.dim.width(); + if (maxWidth < value) { + maxWidth = value; + } + } + if (this.dim.getLimitY() < this.frame.dim.getLimitY()) { + int value = this.frame.dim.y() - this.dim.y() + this.frame.dim.height(); + if (maxHeight < value) { + maxHeight = value; + } + } + } + + if (maxWidth > 0) { + this.canScrollHorizontal = true; + } + if (maxHeight > 0) { + this.canScrollVertical = true; + } + + if (this.canScrollHorizontal && this.canScrollVertical) { + this.viewPortDimension = new Dim2i(this.dim.x(), this.dim.y(), this.dim.width() - 11, this.dim.height() - 11); + } else if (this.canScrollHorizontal) { + this.viewPortDimension = new Dim2i(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height() - 11); + ((Dim2iExtended) ((Object) this.frame.dim)).setHeight(this.frame.dim.height() - 11); // fixme: don't mutate rather + } else if (this.canScrollVertical) { + this.viewPortDimension = new Dim2i(this.dim.x(), this.dim.y(), this.dim.width() - 11, this.dim.height()); + ((Dim2iExtended) ((Object) this.frame.dim)).setWidth(this.frame.dim.width() - 11); // fixme: don't mutate rather + } + + if (this.canScrollHorizontal) { + this.horizontalScrollBar = new ScrollBarComponent(new Dim2i(this.viewPortDimension.x(), this.viewPortDimension.getLimitY() + 1, this.viewPortDimension.width(), 10), ScrollBarComponent.Mode.HORIZONTAL, this.frame.dim.width(), this.viewPortDimension.width(), offset -> { + this.buildFrame(); + horizontalScrollBarOffset.set(offset); + }); + this.horizontalScrollBar.setOffset(horizontalScrollBarOffset.get()); + } + if (this.canScrollVertical) { + this.verticalScrollBar = new ScrollBarComponent(new Dim2i(this.viewPortDimension.getLimitX() + 1, this.viewPortDimension.y(), 10, this.viewPortDimension.height()), ScrollBarComponent.Mode.VERTICAL, this.frame.dim.height(), this.viewPortDimension.height(), offset -> { + this.buildFrame(); + verticalScrollBarOffset.set(offset); + }, this.viewPortDimension); + this.verticalScrollBar.setOffset(verticalScrollBarOffset.get()); + } + } + + @Override + public void buildFrame() { + this.children.clear(); + this.drawable.clear(); + this.controlElements.clear(); + + if (this.canScrollHorizontal) { + this.horizontalScrollBar.updateThumbPosition(); + } + + if (this.canScrollVertical) { + this.verticalScrollBar.updateThumbPosition(); + } + + if (this.canScrollHorizontal) { + ((Dim2iExtended) ((Object) this.frame.dim)).setX(this.frameOrigin.x() - this.horizontalScrollBar.getOffset()); + } + + if (this.canScrollVertical) { + ((Dim2iExtended) ((Object) this.frame.dim)).setY(this.frameOrigin.y() - this.verticalScrollBar.getOffset()); + } + + this.frame.buildFrame(); + this.children.add(this.frame); + super.buildFrame(); + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + if (this.canScrollHorizontal || this.canScrollVertical) { + if (this.renderOutline) { + this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); + } + int scale = (int) MinecraftClient.getInstance().getWindow().getScaleFactor(); + GL11.glScissor(this.viewPortDimension.x() * scale, MinecraftClient.getInstance().getWindow().getHeight() - this.viewPortDimension.getLimitY() * scale, this.viewPortDimension.width() * scale, this.viewPortDimension.height() * scale); + GL11.glEnable(GL11.GL_SCISSOR_TEST); + super.render(matrices, mouseX, mouseY, delta); + GL11.glDisable(GL11.GL_SCISSOR_TEST); + } else { + super.render(matrices, mouseX, mouseY, delta); + } + + if (this.canScrollHorizontal) { + this.horizontalScrollBar.render(matrices, mouseX, mouseY, delta); + } + + if (this.canScrollVertical) { + this.verticalScrollBar.render(matrices, mouseX, mouseY, delta); + } + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (super.mouseClicked(mouseX, mouseY, button)) { + return true; + } + if (this.canScrollHorizontal) { + if (this.horizontalScrollBar.mouseClicked(mouseX, mouseY, button)) { + return true; + } + } + if (this.canScrollVertical) { + return this.verticalScrollBar.mouseClicked(mouseX, mouseY, button); + } + return false; + } + + @Override + public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { + if (super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { + return true; + } + if (this.canScrollHorizontal) { + if (this.horizontalScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { + this.horizontalScrollBar.mouseReleased(mouseX, mouseY, button); + return true; + } + } + if (this.canScrollVertical) { + if (this.verticalScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { + this.verticalScrollBar.mouseReleased(mouseX, mouseY, button); + return true; + } + } + return false; + } + + @Override + public boolean mouseReleased(double mouseX, double mouseY, int button) { + if (super.mouseReleased(mouseX, mouseY, button)) { + return true; + } + if (this.canScrollHorizontal) { + if (this.horizontalScrollBar.mouseReleased(mouseX, mouseY, button)) { + return true; + } + } + if (this.canScrollVertical) { + return this.verticalScrollBar.mouseReleased(mouseX, mouseY, button); + } + return false; + } + + @Override + public boolean mouseScrolled(double mouseX, double mouseY, double amount) { + if (super.mouseScrolled(mouseX, mouseY, amount)) { + return true; + } + if (this.canScrollHorizontal) { + if (this.horizontalScrollBar.mouseScrolled(mouseX, mouseY, amount)) { + return true; + } + } + if (this.canScrollVertical) { + return this.verticalScrollBar.mouseScrolled(mouseX, mouseY, amount); + } + return false; + } + + public static class Builder { + private boolean renderOutline = false; + private Dim2i dim = null; + private AbstractFrame frame = null; + private AtomicReference verticalScrollBarOffset = new AtomicReference<>(0); + private AtomicReference horizontalScrollBarOffset = new AtomicReference<>(0); + + public Builder setDimension(Dim2i dim) { + this.dim = dim; + return this; + } + + public Builder shouldRenderOutline(boolean state) { + this.renderOutline = state; + return this; + } + + public Builder setVerticalScrollBarOffset(AtomicReference verticalScrollBarOffset) { + this.verticalScrollBarOffset = verticalScrollBarOffset; + return this; + } + + public Builder setHorizontalScrollBarOffset(AtomicReference horizontalScrollBarOffset) { + this.horizontalScrollBarOffset = horizontalScrollBarOffset; + return this; + } + + public Builder setFrame(AbstractFrame frame) { + this.frame = frame; + return this; + } + + public ScrollableFrame build() { + return new ScrollableFrame(this.dim, this.frame, this.renderOutline, this.verticalScrollBarOffset, this.horizontalScrollBarOffset); + } + } +} \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java index b710d70..ad1326b 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java @@ -5,6 +5,8 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.MathHelper; +import java.util.function.Consumer; + public class ScrollBarComponent extends AbstractWidget { protected final Dim2i dim; @@ -13,7 +15,7 @@ public class ScrollBarComponent extends AbstractWidget { private final int frameLength; private final int viewPortLength; private final int maxScrollBarOffset; - private final Runnable onSetOffset; + private final Consumer onSetOffset; private int offset = 0; private boolean isDragging; @@ -22,7 +24,7 @@ public class ScrollBarComponent extends AbstractWidget { private Dim2i extendedScrollArea = null; - public ScrollBarComponent(Dim2i trackArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset) { + public ScrollBarComponent(Dim2i trackArea, Mode mode, int frameLength, int viewPortLength, Consumer onSetOffset) { this.dim = trackArea; this.mode = mode; this.frameLength = frameLength; @@ -31,7 +33,7 @@ public ScrollBarComponent(Dim2i trackArea, Mode mode, int frameLength, int viewP this.maxScrollBarOffset = this.frameLength - this.viewPortLength; } - public ScrollBarComponent(Dim2i scrollBarArea, Mode mode, int frameLength, int viewPortLength, Runnable onSetOffset, Dim2i extendedTrackArea) { + public ScrollBarComponent(Dim2i scrollBarArea, Mode mode, int frameLength, int viewPortLength, Consumer onSetOffset, Dim2i extendedTrackArea) { this(scrollBarArea, mode, frameLength, viewPortLength, onSetOffset); this.extendedScrollArea = extendedTrackArea; } @@ -106,10 +108,10 @@ public int getOffset() { return this.offset; } - private void setOffset(int value) { + public void setOffset(int value) { this.offset = MathHelper.clamp(value, 0, this.maxScrollBarOffset); this.updateThumbPosition(); - this.onSetOffset.run(); + this.onSetOffset.accept(this.offset); } protected void drawRectOutline(double x, double y, double w, double h, int color) { diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java index 684a062..761d6ce 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java @@ -1,11 +1,13 @@ package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame; -import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.OptionPageScrollFrame; +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.OptionPageFrame; +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.ScrollableFrame; import me.jellysquid.mods.sodium.client.gui.options.OptionPage; import me.jellysquid.mods.sodium.client.util.Dim2i; import net.minecraft.text.Text; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; public record Tab(Text title, Function frameFunction) { @@ -40,8 +42,8 @@ public Tab build() { return new Tab(this.title, this.frameFunction); } - public Tab from(OptionPage page) { - return new Tab<>(page.getName(), dim2i -> OptionPageScrollFrame.createBuilder().setDimension(dim2i).setOptionPage(page).build()); + public Tab from(OptionPage page, AtomicReference verticalScrollBarOffset) { + return new Tab<>(page.getName(), dim2i -> ScrollableFrame.createBuilder().setDimension(dim2i).setFrame(new OptionPageFrame(new Dim2i(dim2i.x(), dim2i.y(), dim2i.width(), dim2i.height()), false, page)).setVerticalScrollBarOffset(verticalScrollBarOffset).build()); } } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index 0fb7db4..ebcf9c6 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -7,11 +7,13 @@ import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; import org.apache.commons.lang3.Validate; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; public class TabFrame extends AbstractFrame { @@ -23,8 +25,10 @@ public class TabFrame extends AbstractFrame { private ScrollBarComponent tabSectionScrollBar = null; private Tab selectedTab; private AbstractFrame selectedFrame; + private final Runnable onSetTab; + private final AtomicReference tabSectionSelectedTab; - public TabFrame(Dim2i dim, boolean renderOutline, List> tabs) { + public TabFrame(Dim2i dim, boolean renderOutline, List> tabs, Runnable onSetTab, AtomicReference tabSectionSelectedTab, AtomicReference tabSectionScrollBarOffset) { super(dim, renderOutline); Optional result = tabs.stream().map(tab -> this.getStringWidth(tab.title().getString())).max(Integer::compareTo); @@ -33,10 +37,21 @@ public TabFrame(Dim2i dim, boolean renderOutline, List> tabs) { this.frameSection = new Dim2i(this.tabSection.getLimitX(), this.dim.y(), this.dim.width() - this.tabSection.width(), this.dim.height()); this.tabs.addAll(tabs); + this.onSetTab = onSetTab; + int tabSectionY = this.tabs.size() * 18; this.tabSectionCanScroll = tabSectionY > this.tabSection.height(); if (this.tabSectionCanScroll) { - this.tabSectionScrollBar = new ScrollBarComponent(new Dim2i(this.tabSection.getLimitX() - 11, this.tabSection.y(), 10, this.tabSection.height()), ScrollBarComponent.Mode.VERTICAL, tabSectionY, this.dim.height(), this::buildFrame, this.dim); + this.tabSectionScrollBar = new ScrollBarComponent(new Dim2i(this.tabSection.getLimitX() - 11, this.tabSection.y(), 10, this.tabSection.height()), ScrollBarComponent.Mode.VERTICAL, tabSectionY, this.dim.height(), offset -> { + this.buildFrame(); + tabSectionScrollBarOffset.set(offset); + }, this.dim); + this.tabSectionScrollBar.setOffset(tabSectionScrollBarOffset.get()); + } + this.tabSectionSelectedTab = tabSectionSelectedTab; + + if (this.tabSectionSelectedTab.get() != null) { + this.selectedTab = this.tabs.stream().filter(tab -> tab.getTitle().getString().equals(this.tabSectionSelectedTab.get().getString())).findAny().get(); } this.buildFrame(); @@ -48,7 +63,10 @@ public static Builder createBuilder() { public void setTab(Tab tab) { this.selectedTab = tab; - + this.tabSectionSelectedTab.set(this.selectedTab.getTitle()); + if (this.onSetTab != null) { + this.onSetTab.run(); + } this.buildFrame(); } @@ -166,6 +184,9 @@ public static class Builder { private final List> functions = new ArrayList<>(); private Dim2i dim; private boolean renderOutline; + private Runnable onSetTab; + private AtomicReference tabSectionSelectedTab = new AtomicReference<>(null); + private AtomicReference tabSectionScrollBarOffset = new AtomicReference<>(0); public Builder setDimension(Dim2i dim) { this.dim = dim; @@ -182,10 +203,25 @@ public Builder addTabs(Consumer>> tabs) { return this; } + public Builder onSetTab(Runnable onSetTab) { + this.onSetTab = onSetTab; + return this; + } + + public Builder setTabSectionSelectedTab(AtomicReference tabSectionSelectedTab) { + this.tabSectionSelectedTab = tabSectionSelectedTab; + return this; + } + + public Builder setTabSectionScrollBarOffset(AtomicReference tabSectionScrollBarOffset) { + this.tabSectionScrollBarOffset = tabSectionScrollBarOffset; + return this; + } + public TabFrame build() { Validate.notNull(this.dim, "Dimension must be specified"); - return new TabFrame(this.dim, this.renderOutline, this.functions); + return new TabFrame(this.dim, this.renderOutline, this.functions, this.onSetTab, this.tabSectionSelectedTab, this.tabSectionScrollBarOffset); } } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java new file mode 100644 index 0000000..1802742 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java @@ -0,0 +1,63 @@ +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.Dim2iExtended; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(Dim2i.class) +public abstract class MixinDim2i implements Dim2iExtended { + + @Shadow + @Final + @Mutable + private int x; + + @Shadow + @Final + @Mutable + private int y; + + @Shadow + @Final + @Mutable + private int width; + + @Shadow + @Final + @Mutable + private int height; + + @Shadow + public abstract int getLimitX(); + + @Shadow + public abstract int getLimitY(); + + @Override + public void setX(int x) { + this.x = x; + } + + @Override + public void setY(int y) { + this.y = y; + } + + @Override + public void setWidth(int width) { + this.width = width; + } + + @Override + public void setHeight(int height) { + this.height = height; + } + + @Override + public boolean canFitDimension(Dim2i anotherDim) { + return this.x <= anotherDim.x() && this.y <= anotherDim.y() && this.getLimitX() >= anotherDim.getLimitX() && this.getLimitY() >= anotherDim.getLimitY(); + } +} diff --git a/src/main/resources/reeses-sodium-options.mixins.json b/src/main/resources/reeses-sodium-options.mixins.json index e917e5b..a2a2cfa 100644 --- a/src/main/resources/reeses-sodium-options.mixins.json +++ b/src/main/resources/reeses-sodium-options.mixins.json @@ -6,6 +6,7 @@ "client": [ "sodium.MixinControlElement", "sodium.MixinCyclingControlElement", + "sodium.MixinDim2i", "sodium.MixinFlatButtonWidget", "sodium.MixinSliderControlElement", "sodium.MixinSodiumOptionsGUI" From bb6a413d497974d78c2fefcdcdd02ed287be3051 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 27 Jul 2022 21:34:07 +0800 Subject: [PATCH 047/112] change: Bump loom --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3f6d470..4d1f3fb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'org.ajoberstar.grgit' version '5.0.0' - id 'fabric-loom' version '0.11-SNAPSHOT' + id 'fabric-loom' version '0.12-SNAPSHOT' id 'maven-publish' id 'signing' } From ee68aadbd75ecb0a7328fe4e038e916f150e7bb5 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 3 Aug 2022 11:55:23 +0800 Subject: [PATCH 048/112] change: Dynamic scaling tab with text length & scroll bar fixes --- .../client/gui/frame/OptionPageFrame.java | 4 +- .../client/gui/frame/ScrollableFrame.java | 56 ++----------------- .../frame/components/ScrollBarComponent.java | 8 +++ .../client/gui/frame/tab/TabFrame.java | 41 +++----------- 4 files changed, 23 insertions(+), 86 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java index f9a67b6..6e1961a 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java @@ -23,9 +23,11 @@ public class OptionPageFrame extends AbstractFrame { protected final OptionPage page; private long lastTime = 0; private ControlElement lastHoveredElement = null; + private final int lastDimLimitY; public OptionPageFrame(Dim2i dim, boolean renderOutline, OptionPage page) { super(dim, renderOutline); + this.lastDimLimitY = dim.getLimitY(); this.page = page; this.setupFrame(); this.buildFrame(); @@ -121,7 +123,7 @@ private void renderOptionTooltip(MatrixStack matrixStack, ControlElement elem int boxHeight = (tooltip.size() * 12) + boxPadding; int boxYLimit = boxY + boxHeight; - int boxYCutoff = this.dim.getLimitY(); + int boxYCutoff = this.lastDimLimitY;//this.dim.getLimitY(); // If the box is going to be cutoff on the Y-axis, move it back up the difference if (boxYLimit > boxYCutoff) { diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java index 0339303..ea49a08 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java @@ -136,70 +136,22 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (super.mouseClicked(mouseX, mouseY, button)) { - return true; - } - if (this.canScrollHorizontal) { - if (this.horizontalScrollBar.mouseClicked(mouseX, mouseY, button)) { - return true; - } - } - if (this.canScrollVertical) { - return this.verticalScrollBar.mouseClicked(mouseX, mouseY, button); - } - return false; + return super.mouseClicked(mouseX, mouseY, button) || (this.canScrollHorizontal && this.horizontalScrollBar.mouseClicked(mouseX, mouseY, button)) || (this.canScrollVertical && this.verticalScrollBar.mouseClicked(mouseX, mouseY, button)); } @Override public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - if (super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { - return true; - } - if (this.canScrollHorizontal) { - if (this.horizontalScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { - this.horizontalScrollBar.mouseReleased(mouseX, mouseY, button); - return true; - } - } - if (this.canScrollVertical) { - if (this.verticalScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { - this.verticalScrollBar.mouseReleased(mouseX, mouseY, button); - return true; - } - } - return false; + return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY) || (this.canScrollHorizontal && this.horizontalScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) || (this.canScrollVertical && this.verticalScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)); } @Override public boolean mouseReleased(double mouseX, double mouseY, int button) { - if (super.mouseReleased(mouseX, mouseY, button)) { - return true; - } - if (this.canScrollHorizontal) { - if (this.horizontalScrollBar.mouseReleased(mouseX, mouseY, button)) { - return true; - } - } - if (this.canScrollVertical) { - return this.verticalScrollBar.mouseReleased(mouseX, mouseY, button); - } - return false; + return super.mouseReleased(mouseX, mouseY, button) || (this.canScrollHorizontal && this.horizontalScrollBar.mouseReleased(mouseX, mouseY, button)) || (this.canScrollVertical && this.verticalScrollBar.mouseReleased(mouseX, mouseY, button)); } @Override public boolean mouseScrolled(double mouseX, double mouseY, double amount) { - if (super.mouseScrolled(mouseX, mouseY, amount)) { - return true; - } - if (this.canScrollHorizontal) { - if (this.horizontalScrollBar.mouseScrolled(mouseX, mouseY, amount)) { - return true; - } - } - if (this.canScrollVertical) { - return this.verticalScrollBar.mouseScrolled(mouseX, mouseY, amount); - } - return false; + return super.mouseScrolled(mouseX, mouseY, amount) || (this.canScrollHorizontal && this.horizontalScrollBar.mouseScrolled(mouseX, mouseY, amount)) || (this.canScrollVertical && this.verticalScrollBar.mouseScrolled(mouseX, mouseY, amount)); } public static class Builder { diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java index ad1326b..3cbfc19 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java @@ -77,6 +77,14 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) { return false; } + @Override + public boolean mouseReleased(double mouseX, double mouseY, int button) { + if (button == 0) { + this.isDragging = false; + } + return false; + } + @Override public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { if (this.isDragging) { diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index ebcf9c6..9efdca2 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -30,17 +30,16 @@ public class TabFrame extends AbstractFrame { public TabFrame(Dim2i dim, boolean renderOutline, List> tabs, Runnable onSetTab, AtomicReference tabSectionSelectedTab, AtomicReference tabSectionScrollBarOffset) { super(dim, renderOutline); + this.tabs.addAll(tabs); + int tabSectionY = this.tabs.size() * 18; + this.tabSectionCanScroll = tabSectionY > this.dim.height(); Optional result = tabs.stream().map(tab -> this.getStringWidth(tab.title().getString())).max(Integer::compareTo); - this.tabSection = new Dim2i(this.dim.x(), this.dim.y(), result.map(integer -> (int) (integer * 2.5)).orElseGet(() -> (int) (this.dim.width() * 0.35D)), this.dim.height()); + this.tabSection = new Dim2i(this.dim.x(), this.dim.y(), result.map(integer -> integer + (this.tabSectionCanScroll ? 32 : 24)).orElseGet(() -> (int) (this.dim.width() * 0.35D)), this.dim.height()); this.frameSection = new Dim2i(this.tabSection.getLimitX(), this.dim.y(), this.dim.width() - this.tabSection.width(), this.dim.height()); - this.tabs.addAll(tabs); this.onSetTab = onSetTab; - - int tabSectionY = this.tabs.size() * 18; - this.tabSectionCanScroll = tabSectionY > this.tabSection.height(); if (this.tabSectionCanScroll) { this.tabSectionScrollBar = new ScrollBarComponent(new Dim2i(this.tabSection.getLimitX() - 11, this.tabSection.y(), 10, this.tabSection.height()), ScrollBarComponent.Mode.VERTICAL, tabSectionY, this.dim.height(), offset -> { this.buildFrame(); @@ -110,46 +109,22 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (this.dim.containsCursor(mouseX, mouseY) && super.mouseClicked(mouseX, mouseY, button)) { - return true; - } - if (this.tabSectionCanScroll) { - return this.tabSectionScrollBar.mouseClicked(mouseX, mouseY, button); - } - return false; + return (this.dim.containsCursor(mouseX, mouseY) && super.mouseClicked(mouseX, mouseY, button)) || (this.tabSectionCanScroll && this.tabSectionScrollBar.mouseClicked(mouseX, mouseY, button)); } @Override public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - if (super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { - return true; - } - if (this.tabSectionCanScroll) { - return this.tabSectionScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY); - } - return false; + return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY) || (this.tabSectionCanScroll && this.tabSectionScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)); } @Override public boolean mouseReleased(double mouseX, double mouseY, int button) { - if (super.mouseReleased(mouseX, mouseY, button)) { - return true; - } - if (this.tabSectionCanScroll) { - return this.tabSectionScrollBar.mouseReleased(mouseX, mouseY, button); - } - return false; + return super.mouseReleased(mouseX, mouseY, button) || (this.tabSectionCanScroll && this.tabSectionScrollBar.mouseReleased(mouseX, mouseY, button)); } @Override public boolean mouseScrolled(double mouseX, double mouseY, double amount) { - if (super.mouseScrolled(mouseX, mouseY, amount)) { - return true; - } - if (this.tabSectionCanScroll) { - return this.tabSectionScrollBar.mouseScrolled(mouseX, mouseY, amount); - } - return false; + return super.mouseScrolled(mouseX, mouseY, amount) || (this.tabSectionCanScroll && this.tabSectionScrollBar.mouseScrolled(mouseX, mouseY, amount)); } private void rebuildTabs() { From cb9dc21e5fd3eeabde0ed806061e4f0de743b8bc Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 3 Aug 2022 12:20:23 +0800 Subject: [PATCH 049/112] change: Dynamic scaling tab with text length & scroll bar fixes --- .../client/gui/frame/OptionPageFrame.java | 6 +- .../client/gui/frame/ScrollableFrame.java | 56 ++----------------- .../frame/components/ScrollBarComponent.java | 8 +++ .../client/gui/frame/tab/TabFrame.java | 41 +++----------- 4 files changed, 24 insertions(+), 87 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java index 1790c5b..02c5b9b 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java @@ -23,9 +23,11 @@ public class OptionPageFrame extends AbstractFrame { protected final OptionPage page; private long lastTime = 0; private ControlElement lastHoveredElement = null; - + private final int lastDimLimitY; + public OptionPageFrame(Dim2i dim, boolean renderOutline, OptionPage page) { super(dim, renderOutline); + this.lastDimLimitY = dim.getLimitY(); this.page = page; this.setupFrame(); this.buildFrame(); @@ -121,7 +123,7 @@ private void renderOptionTooltip(MatrixStack matrixStack, ControlElement elem int boxHeight = (tooltip.size() * 12) + boxPadding; int boxYLimit = boxY + boxHeight; - int boxYCutoff = this.dim.getLimitY(); + int boxYCutoff = this.lastDimLimitY;//this.dim.getLimitY(); // If the box is going to be cutoff on the Y-axis, move it back up the difference if (boxYLimit > boxYCutoff) { diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java index 0339303..ea49a08 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java @@ -136,70 +136,22 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (super.mouseClicked(mouseX, mouseY, button)) { - return true; - } - if (this.canScrollHorizontal) { - if (this.horizontalScrollBar.mouseClicked(mouseX, mouseY, button)) { - return true; - } - } - if (this.canScrollVertical) { - return this.verticalScrollBar.mouseClicked(mouseX, mouseY, button); - } - return false; + return super.mouseClicked(mouseX, mouseY, button) || (this.canScrollHorizontal && this.horizontalScrollBar.mouseClicked(mouseX, mouseY, button)) || (this.canScrollVertical && this.verticalScrollBar.mouseClicked(mouseX, mouseY, button)); } @Override public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - if (super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { - return true; - } - if (this.canScrollHorizontal) { - if (this.horizontalScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { - this.horizontalScrollBar.mouseReleased(mouseX, mouseY, button); - return true; - } - } - if (this.canScrollVertical) { - if (this.verticalScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { - this.verticalScrollBar.mouseReleased(mouseX, mouseY, button); - return true; - } - } - return false; + return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY) || (this.canScrollHorizontal && this.horizontalScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) || (this.canScrollVertical && this.verticalScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)); } @Override public boolean mouseReleased(double mouseX, double mouseY, int button) { - if (super.mouseReleased(mouseX, mouseY, button)) { - return true; - } - if (this.canScrollHorizontal) { - if (this.horizontalScrollBar.mouseReleased(mouseX, mouseY, button)) { - return true; - } - } - if (this.canScrollVertical) { - return this.verticalScrollBar.mouseReleased(mouseX, mouseY, button); - } - return false; + return super.mouseReleased(mouseX, mouseY, button) || (this.canScrollHorizontal && this.horizontalScrollBar.mouseReleased(mouseX, mouseY, button)) || (this.canScrollVertical && this.verticalScrollBar.mouseReleased(mouseX, mouseY, button)); } @Override public boolean mouseScrolled(double mouseX, double mouseY, double amount) { - if (super.mouseScrolled(mouseX, mouseY, amount)) { - return true; - } - if (this.canScrollHorizontal) { - if (this.horizontalScrollBar.mouseScrolled(mouseX, mouseY, amount)) { - return true; - } - } - if (this.canScrollVertical) { - return this.verticalScrollBar.mouseScrolled(mouseX, mouseY, amount); - } - return false; + return super.mouseScrolled(mouseX, mouseY, amount) || (this.canScrollHorizontal && this.horizontalScrollBar.mouseScrolled(mouseX, mouseY, amount)) || (this.canScrollVertical && this.verticalScrollBar.mouseScrolled(mouseX, mouseY, amount)); } public static class Builder { diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java index ad1326b..3cbfc19 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java @@ -77,6 +77,14 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) { return false; } + @Override + public boolean mouseReleased(double mouseX, double mouseY, int button) { + if (button == 0) { + this.isDragging = false; + } + return false; + } + @Override public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { if (this.isDragging) { diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index ebcf9c6..9efdca2 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -30,17 +30,16 @@ public class TabFrame extends AbstractFrame { public TabFrame(Dim2i dim, boolean renderOutline, List> tabs, Runnable onSetTab, AtomicReference tabSectionSelectedTab, AtomicReference tabSectionScrollBarOffset) { super(dim, renderOutline); + this.tabs.addAll(tabs); + int tabSectionY = this.tabs.size() * 18; + this.tabSectionCanScroll = tabSectionY > this.dim.height(); Optional result = tabs.stream().map(tab -> this.getStringWidth(tab.title().getString())).max(Integer::compareTo); - this.tabSection = new Dim2i(this.dim.x(), this.dim.y(), result.map(integer -> (int) (integer * 2.5)).orElseGet(() -> (int) (this.dim.width() * 0.35D)), this.dim.height()); + this.tabSection = new Dim2i(this.dim.x(), this.dim.y(), result.map(integer -> integer + (this.tabSectionCanScroll ? 32 : 24)).orElseGet(() -> (int) (this.dim.width() * 0.35D)), this.dim.height()); this.frameSection = new Dim2i(this.tabSection.getLimitX(), this.dim.y(), this.dim.width() - this.tabSection.width(), this.dim.height()); - this.tabs.addAll(tabs); this.onSetTab = onSetTab; - - int tabSectionY = this.tabs.size() * 18; - this.tabSectionCanScroll = tabSectionY > this.tabSection.height(); if (this.tabSectionCanScroll) { this.tabSectionScrollBar = new ScrollBarComponent(new Dim2i(this.tabSection.getLimitX() - 11, this.tabSection.y(), 10, this.tabSection.height()), ScrollBarComponent.Mode.VERTICAL, tabSectionY, this.dim.height(), offset -> { this.buildFrame(); @@ -110,46 +109,22 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (this.dim.containsCursor(mouseX, mouseY) && super.mouseClicked(mouseX, mouseY, button)) { - return true; - } - if (this.tabSectionCanScroll) { - return this.tabSectionScrollBar.mouseClicked(mouseX, mouseY, button); - } - return false; + return (this.dim.containsCursor(mouseX, mouseY) && super.mouseClicked(mouseX, mouseY, button)) || (this.tabSectionCanScroll && this.tabSectionScrollBar.mouseClicked(mouseX, mouseY, button)); } @Override public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - if (super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) { - return true; - } - if (this.tabSectionCanScroll) { - return this.tabSectionScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY); - } - return false; + return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY) || (this.tabSectionCanScroll && this.tabSectionScrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)); } @Override public boolean mouseReleased(double mouseX, double mouseY, int button) { - if (super.mouseReleased(mouseX, mouseY, button)) { - return true; - } - if (this.tabSectionCanScroll) { - return this.tabSectionScrollBar.mouseReleased(mouseX, mouseY, button); - } - return false; + return super.mouseReleased(mouseX, mouseY, button) || (this.tabSectionCanScroll && this.tabSectionScrollBar.mouseReleased(mouseX, mouseY, button)); } @Override public boolean mouseScrolled(double mouseX, double mouseY, double amount) { - if (super.mouseScrolled(mouseX, mouseY, amount)) { - return true; - } - if (this.tabSectionCanScroll) { - return this.tabSectionScrollBar.mouseScrolled(mouseX, mouseY, amount); - } - return false; + return super.mouseScrolled(mouseX, mouseY, amount) || (this.tabSectionCanScroll && this.tabSectionScrollBar.mouseScrolled(mouseX, mouseY, amount)); } private void rebuildTabs() { From 95f28e8d409eac262a18283a58f28d5112c97496 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 8 Aug 2022 20:45:24 +0800 Subject: [PATCH 050/112] change: Bump for release --- gradle.properties | 10 +++++----- .../client/gui/SodiumVideoOptionsScreen.java | 5 ++++- .../client/gui/frame/OptionPageFrame.java | 4 ++-- .../client/gui/frame/tab/TabFrame.java | 4 ++-- .../mixin/sodium/MixinSliderControlElement.java | 2 ++ 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index bccbda7..ecacceb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,11 +2,11 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.19 - yarn_mappings=1.19+build.1 - loader_version=0.14.6 + minecraft_version=1.19.2 + yarn_mappings=1.19.2+build.1 + loader_version=0.14.9 # Mod Properties - mod_version=1.4.4 + mod_version=1.4.5 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options @@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1G iris_version=1.2.5-build.3-467a0118 #Fabric api - fabric_version=0.55.1+1.19 + fabric_version=0.58.6+1.19.2 diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index c71dd7b..e047b6b 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -23,7 +23,10 @@ import org.lwjgl.glfw.GLFW; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Stream; diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java index 6e1961a..2fdc1f8 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java @@ -21,10 +21,10 @@ public class OptionPageFrame extends AbstractFrame { protected final OptionPage page; + private final int lastDimLimitY; private long lastTime = 0; private ControlElement lastHoveredElement = null; - private final int lastDimLimitY; - + public OptionPageFrame(Dim2i dim, boolean renderOutline, OptionPage page) { super(dim, renderOutline); this.lastDimLimitY = dim.getLimitY(); diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index 9efdca2..21e032e 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -22,11 +22,11 @@ public class TabFrame extends AbstractFrame { private final Dim2i tabSection; private final Dim2i frameSection; private final List> tabs = new ArrayList<>(); + private final Runnable onSetTab; + private final AtomicReference tabSectionSelectedTab; private ScrollBarComponent tabSectionScrollBar = null; private Tab selectedTab; private AbstractFrame selectedFrame; - private final Runnable onSetTab; - private final AtomicReference tabSectionSelectedTab; public TabFrame(Dim2i dim, boolean renderOutline, List> tabs, Runnable onSetTab, AtomicReference tabSectionSelectedTab, AtomicReference tabSectionScrollBarOffset) { super(dim, renderOutline); diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java index e7ec1f8..e4641eb 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -9,6 +9,7 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -27,6 +28,7 @@ public abstract class MixinSliderControlElement extends ControlElement @Final private int min; + @Unique private int max; @Shadow From bc6078fb7f8b3aaee3a0b6f680b2936530aa94a4 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 8 Aug 2022 20:46:28 +0800 Subject: [PATCH 051/112] change: Bump for release --- gradle.properties | 8 ++++---- .../client/gui/frame/OptionPageFrame.java | 4 ++-- .../client/gui/frame/tab/TabFrame.java | 4 ++-- .../mixin/sodium/MixinSliderControlElement.java | 2 ++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7a790de..7e0b86e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html minecraft_version=1.18.2 - yarn_mappings=1.18.2+build.1 - loader_version=0.13.3 + yarn_mappings=1.18.2+build.4 + loader_version=0.14.9 # Mod Properties - mod_version=1.4.4 + mod_version=1.4.5 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options @@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1G iris_version=1.18.x-v1.2.1 #Fabric api - fabric_version=0.47.10+1.18.2 + fabric_version=0.58.0+1.18.2 diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java index 02c5b9b..4d3e14e 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java @@ -21,10 +21,10 @@ public class OptionPageFrame extends AbstractFrame { protected final OptionPage page; + private final int lastDimLimitY; private long lastTime = 0; private ControlElement lastHoveredElement = null; - private final int lastDimLimitY; - + public OptionPageFrame(Dim2i dim, boolean renderOutline, OptionPage page) { super(dim, renderOutline); this.lastDimLimitY = dim.getLimitY(); diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index 9efdca2..21e032e 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -22,11 +22,11 @@ public class TabFrame extends AbstractFrame { private final Dim2i tabSection; private final Dim2i frameSection; private final List> tabs = new ArrayList<>(); + private final Runnable onSetTab; + private final AtomicReference tabSectionSelectedTab; private ScrollBarComponent tabSectionScrollBar = null; private Tab selectedTab; private AbstractFrame selectedFrame; - private final Runnable onSetTab; - private final AtomicReference tabSectionSelectedTab; public TabFrame(Dim2i dim, boolean renderOutline, List> tabs, Runnable onSetTab, AtomicReference tabSectionSelectedTab, AtomicReference tabSectionScrollBarOffset) { super(dim, renderOutline); diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java index e7ec1f8..e4641eb 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -9,6 +9,7 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -27,6 +28,7 @@ public abstract class MixinSliderControlElement extends ControlElement @Final private int min; + @Unique private int max; @Shadow From 95a15a1cf7efd1319eed16b66d5021b311e6618a Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 8 Aug 2022 20:48:49 +0800 Subject: [PATCH 052/112] change: Bump gradle wrapper --- gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 6 ++++++ gradlew.bat | 14 ++++++++------ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a4d4fb3f96a785543079b8df6723c946b..249e5832f090a2944b7473328c07c9755baa3196 100644 GIT binary patch delta 10197 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c68..ae04661 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..a69d9cb 100644 --- a/gradlew +++ b/gradlew @@ -205,6 +205,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..53a6b23 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal From f133dbddc172920dd7b7182712c997c181b0dd50 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 8 Aug 2022 20:48:49 +0800 Subject: [PATCH 053/112] change: Bump gradle wrapper --- gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 6 ++++++ gradlew.bat | 14 ++++++++------ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a4d4fb3f96a785543079b8df6723c946b..249e5832f090a2944b7473328c07c9755baa3196 100644 GIT binary patch delta 10197 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c68..ae04661 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..a69d9cb 100644 --- a/gradlew +++ b/gradlew @@ -205,6 +205,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..53a6b23 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal From 7ac89321156d78484e4291dff3fd558ef0768e9a Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Fri, 12 Aug 2022 23:23:54 +0800 Subject: [PATCH 054/112] change: use render system scissor old stashed code forgot to use vanilla's system --- .../client/gui/frame/ScrollableFrame.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java index ea49a08..a25741b 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java @@ -3,9 +3,7 @@ import me.flashyreese.mods.reeses_sodium_options.client.gui.Dim2iExtended; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components.ScrollBarComponent; import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.util.math.MatrixStack; -import org.lwjgl.opengl.GL11; import java.util.concurrent.atomic.AtomicReference; @@ -116,11 +114,7 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { if (this.renderOutline) { this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); } - int scale = (int) MinecraftClient.getInstance().getWindow().getScaleFactor(); - GL11.glScissor(this.viewPortDimension.x() * scale, MinecraftClient.getInstance().getWindow().getHeight() - this.viewPortDimension.getLimitY() * scale, this.viewPortDimension.width() * scale, this.viewPortDimension.height() * scale); - GL11.glEnable(GL11.GL_SCISSOR_TEST); - super.render(matrices, mouseX, mouseY, delta); - GL11.glDisable(GL11.GL_SCISSOR_TEST); + this.applyScissor(this.viewPortDimension.x(), this.viewPortDimension.y(), this.viewPortDimension.width(), this.viewPortDimension.height(), () -> super.render(matrices, mouseX, mouseY, delta)); } else { super.render(matrices, mouseX, mouseY, delta); } From 972dd5c0d361110ad9b53022e3947c0876d5bddb Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Fri, 12 Aug 2022 23:23:54 +0800 Subject: [PATCH 055/112] change: use render system scissor old stashed code forgot to use vanilla's system --- .../client/gui/frame/ScrollableFrame.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java index ea49a08..a25741b 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java @@ -3,9 +3,7 @@ import me.flashyreese.mods.reeses_sodium_options.client.gui.Dim2iExtended; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components.ScrollBarComponent; import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.util.math.MatrixStack; -import org.lwjgl.opengl.GL11; import java.util.concurrent.atomic.AtomicReference; @@ -116,11 +114,7 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { if (this.renderOutline) { this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); } - int scale = (int) MinecraftClient.getInstance().getWindow().getScaleFactor(); - GL11.glScissor(this.viewPortDimension.x() * scale, MinecraftClient.getInstance().getWindow().getHeight() - this.viewPortDimension.getLimitY() * scale, this.viewPortDimension.width() * scale, this.viewPortDimension.height() * scale); - GL11.glEnable(GL11.GL_SCISSOR_TEST); - super.render(matrices, mouseX, mouseY, delta); - GL11.glDisable(GL11.GL_SCISSOR_TEST); + this.applyScissor(this.viewPortDimension.x(), this.viewPortDimension.y(), this.viewPortDimension.width(), this.viewPortDimension.height(), () -> super.render(matrices, mouseX, mouseY, delta)); } else { super.render(matrices, mouseX, mouseY, delta); } From fe732b9dc710330768e66036f0fcd5bdf3dd4136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karen/=E3=81=82=E3=81=91=E3=81=BF?= Date: Sat, 13 Aug 2022 10:52:31 +0900 Subject: [PATCH 056/112] gradlew: Add erroneously missing executable bit to the Gradle wrapper for macOS and Linux. (#41) --- gradlew | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From 32753171f3670989c76be635b386faa7f91d52a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karen/=E3=81=82=E3=81=91=E3=81=BF?= Date: Sat, 13 Aug 2022 10:52:40 +0900 Subject: [PATCH 057/112] gradlew: Add erroneously missing executable bit to the Gradle wrapper for macOS and Linux. (#42) --- gradlew | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From cac080bab8d3e40b117152222cdd068824d648d1 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Sat, 13 Aug 2022 16:12:59 +0800 Subject: [PATCH 058/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7e0b86e..492af27 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.18.2+build.4 loader_version=0.14.9 # Mod Properties - mod_version=1.4.5 + mod_version=1.4.6 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From 4ee5cafefa9f819f1eba3dba37f592c2c24277f6 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Sat, 13 Aug 2022 16:12:59 +0800 Subject: [PATCH 059/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ecacceb..9c66c2c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.19.2+build.1 loader_version=0.14.9 # Mod Properties - mod_version=1.4.5 + mod_version=1.4.6 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From f9bacfdcb300643e8b1f99bdd19524fa9018d917 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 22 Aug 2022 08:11:26 +0800 Subject: [PATCH 060/112] change: Add explicit version lock for target version of minecraft --- src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index bf2d2ae..f260350 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,7 +26,7 @@ } }, "depends": { - "minecraft": ">=1.18", + "minecraft": "1.18.x", "sodium": "*" }, "breaks": { From fdef0b6d4f648b6636d353d77097a9743308a886 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 22 Aug 2022 08:12:40 +0800 Subject: [PATCH 061/112] change: Add explicit version lock for target version of minecraft --- src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ffff704..383eb68 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,7 +26,7 @@ } }, "depends": { - "minecraft": ">=1.19", + "minecraft": "1.19.x", "sodium": "*" }, "breaks": { From bc9c3d6f4f731f4345c3b2f6ac898123f4675887 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 22 Aug 2022 08:18:08 +0800 Subject: [PATCH 062/112] change: Use self hosted actions runner --- .github/workflows/publish.yml | 90 +++++++++++++++---------------- .github/workflows/self-hosted.yml | 23 ++++++++ 2 files changed, 68 insertions(+), 45 deletions(-) create mode 100644 .github/workflows/self-hosted.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8f4da30..0d40d65 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,46 +1,46 @@ -name: Publish Release - -on: - release: - types: - - published - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v2 - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Upload assets to releases - run: ./gradlew build publishAllPublicationsToFlashyReeseReleasesRepository - env: - MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - BUILD_RELEASE: ${{ github.event.prerelease == false }} - - name: Publish to Modrinth & CurseForge - uses: Kir-Antipov/mc-publish@v2.1 - with: - modrinth-id: Bh37bMuy - modrinth-token: ${{ secrets.MODRINTH_TOKEN }} - - curseforge-id: 511319 - curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} - - github-token: ${{ secrets.GITHUB_TOKEN }} - - version-type: release - - loaders: fabric - - version-resolver: latest - dependencies: | - sodium | depends | * - sodium-extra | recommends | * - irisshaders | recommends | * +name: Publish Release + +on: + release: + types: + - published + +jobs: + build: + runs-on: self-hosted + steps: + - name: Checkout sources + uses: actions/checkout@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Upload assets to releases + run: ./gradlew build publishAllPublicationsToFlashyReeseReleasesRepository + env: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + BUILD_RELEASE: ${{ github.event.prerelease == false }} + - name: Publish to Modrinth & CurseForge + uses: Kir-Antipov/mc-publish@v2.1 + with: + modrinth-id: Bh37bMuy + modrinth-token: ${{ secrets.MODRINTH_TOKEN }} + + curseforge-id: 511319 + curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} + + github-token: ${{ secrets.GITHUB_TOKEN }} + + version-type: release + + loaders: fabric + + version-resolver: latest + dependencies: | + sodium | depends | * + sodium-extra | recommends | * + irisshaders | recommends | * iris | recommends | * \ No newline at end of file diff --git a/.github/workflows/self-hosted.yml b/.github/workflows/self-hosted.yml new file mode 100644 index 0000000..5d1cc68 --- /dev/null +++ b/.github/workflows/self-hosted.yml @@ -0,0 +1,23 @@ +name: Self-Hosted runner CI with Gradle + +on: [ push ] + +jobs: + build: + runs-on: self-hosted + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build + - name: Upload build artifacts + uses: actions/upload-artifact@v1 + with: + name: build-artifacts + path: build/libs \ No newline at end of file From 67eae2ffe6e43a1a98cb811c232b31d0bed5a9b0 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 22 Aug 2022 08:17:58 +0800 Subject: [PATCH 063/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 492af27..f6af69c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.18.2+build.4 loader_version=0.14.9 # Mod Properties - mod_version=1.4.6 + mod_version=1.4.7 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From 5172a13ea09b1d42ddce712671e83aa21653a11a Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 22 Aug 2022 08:18:31 +0800 Subject: [PATCH 064/112] change: Use self hosted actions runner --- .github/workflows/publish.yml | 2 +- .github/workflows/self-hosted.yml | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/self-hosted.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3537e49..0d40d65 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: self-hosted steps: - name: Checkout sources uses: actions/checkout@v2 diff --git a/.github/workflows/self-hosted.yml b/.github/workflows/self-hosted.yml new file mode 100644 index 0000000..5d1cc68 --- /dev/null +++ b/.github/workflows/self-hosted.yml @@ -0,0 +1,23 @@ +name: Self-Hosted runner CI with Gradle + +on: [ push ] + +jobs: + build: + runs-on: self-hosted + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build + - name: Upload build artifacts + uses: actions/upload-artifact@v1 + with: + name: build-artifacts + path: build/libs \ No newline at end of file From c283ce3dbe327efbfbb9e24304bb167b405d9d84 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 22 Aug 2022 08:17:58 +0800 Subject: [PATCH 065/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9c66c2c..7b89fb4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.19.2+build.1 loader_version=0.14.9 # Mod Properties - mod_version=1.4.6 + mod_version=1.4.7 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From d3ffe66671c48c65cb4a8dcc7034a1c824288ce1 Mon Sep 17 00:00:00 2001 From: Kichura <68134602+Kichura@users.noreply.github.com> Date: Sat, 22 Oct 2022 20:51:26 +0200 Subject: [PATCH 066/112] Upstream GitHub Actions and other things. (#48) * Upstream GitHub Actions and other things. * Revert iris upstream as maven does not have 1.4. * Undo sodium version as it is incompatible with iris 1.2.5. --- .github/workflows/gradle.yml | 11 ++++++----- .github/workflows/publish.yml | 9 +++++---- .github/workflows/self-hosted.yml | 9 +++++---- build.gradle | 4 ++-- gradle.properties | 6 +++--- gradlew | 18 ++++++++++-------- gradlew.bat | 5 +++-- 7 files changed, 34 insertions(+), 28 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 631a649..cd8165c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -4,20 +4,21 @@ on: [ pull_request, push ] jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: 'temurin' java-version: 17 - - name: Grant execute permission for gradlew + - name: Grant execute permission for Gradlew run: chmod +x gradlew - name: Build with Gradle run: ./gradlew build - name: Upload build artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: name: build-artifacts path: build/libs diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0d40d65..ce601ef 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,12 +10,13 @@ jobs: runs-on: self-hosted steps: - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: 'temurin' java-version: 17 - - name: Grant execute permission for gradlew + - name: Grant execute permission for Gradlew run: chmod +x gradlew - name: Upload assets to releases run: ./gradlew build publishAllPublicationsToFlashyReeseReleasesRepository @@ -24,7 +25,7 @@ jobs: MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} BUILD_RELEASE: ${{ github.event.prerelease == false }} - name: Publish to Modrinth & CurseForge - uses: Kir-Antipov/mc-publish@v2.1 + uses: Kir-Antipov/mc-publish@v3.2 with: modrinth-id: Bh37bMuy modrinth-token: ${{ secrets.MODRINTH_TOKEN }} diff --git a/.github/workflows/self-hosted.yml b/.github/workflows/self-hosted.yml index 5d1cc68..9258d35 100644 --- a/.github/workflows/self-hosted.yml +++ b/.github/workflows/self-hosted.yml @@ -7,17 +7,18 @@ jobs: runs-on: self-hosted steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: 'temurin' java-version: 17 - - name: Grant execute permission for gradlew + - name: Grant execute permission for Gradlew run: chmod +x gradlew - name: Build with Gradle run: ./gradlew build - name: Upload build artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: name: build-artifacts path: build/libs \ No newline at end of file diff --git a/build.gradle b/build.gradle index 432ba86..d34aea1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'org.ajoberstar.grgit' version '5.0.0' - id 'fabric-loom' version '0.12-SNAPSHOT' + id 'fabric-loom' version '1.0-SNAPSHOT' id 'maven-publish' id 'signing' } @@ -38,7 +38,7 @@ dependencies { modImplementation "me.jellysquid.mods:sodium-fabric:${project.sodium_version}" modImplementation "net.coderbot.iris_mc1_19:iris:${project.iris_version}" - modRuntimeOnly "maven.modrinth:lazydfu:0.1.2" + modRuntimeOnly "maven.modrinth:lazydfu:0.1.3" } processResources { diff --git a/gradle.properties b/gradle.properties index 7b89fb4..babe395 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html minecraft_version=1.19.2 - yarn_mappings=1.19.2+build.1 - loader_version=0.14.9 + yarn_mappings=1.19.2+build.28 + loader_version=0.14.10 # Mod Properties mod_version=1.4.7 maven_group=me.flashyreese.mods @@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1G iris_version=1.2.5-build.3-467a0118 #Fabric api - fabric_version=0.58.6+1.19.2 + fabric_version=0.64.0+1.19.2 diff --git a/gradlew b/gradlew index a69d9cb..2772ff8 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,13 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -127,14 +127,12 @@ if [ -n "$JAVA_HOME" ] ; then fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi @@ -143,12 +141,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -237,4 +239,4 @@ eval "set -- $( tr '\n' ' ' )" '"$@"' -exec "$JAVACMD" "$@" +exec "$JAVACMD" "$@" \ No newline at end of file diff --git a/gradlew.bat b/gradlew.bat index 53a6b23..5b73dbb 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -33,7 +34,7 @@ set APP_HOME=%DIRNAME% for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" +set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -88,4 +89,4 @@ exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal -:omega +:omega \ No newline at end of file From ded22beb3d751c43bd5b2f4063640b17455d7a8b Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Sun, 23 Oct 2022 02:52:18 +0800 Subject: [PATCH 067/112] Upstream GitHub Actions and other things. (#48) * Upstream GitHub Actions and other things. * Revert iris upstream as maven does not have 1.4. * Undo sodium version as it is incompatible with iris 1.2.5. --- .github/workflows/gradle.yml | 47 ++++++++++++++++--------------- .github/workflows/publish.yml | 9 +++--- .github/workflows/self-hosted.yml | 9 +++--- build.gradle | 2 +- gradlew | 18 ++++++------ gradlew.bat | 5 ++-- 6 files changed, 48 insertions(+), 42 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index aabde41..cd8165c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,23 +1,24 @@ -name: Java CI with Gradle - -on: [ pull_request, push ] - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew build - - name: Upload build artifacts - uses: actions/upload-artifact@v1 - with: - name: build-artifacts - path: build/libs +name: Java CI with Gradle + +on: [ pull_request, push ] + +jobs: + build: + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 17 + - name: Grant execute permission for Gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build + - name: Upload build artifacts + uses: actions/upload-artifact@v3 + with: + name: build-artifacts + path: build/libs diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0d40d65..ce601ef 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,12 +10,13 @@ jobs: runs-on: self-hosted steps: - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: 'temurin' java-version: 17 - - name: Grant execute permission for gradlew + - name: Grant execute permission for Gradlew run: chmod +x gradlew - name: Upload assets to releases run: ./gradlew build publishAllPublicationsToFlashyReeseReleasesRepository @@ -24,7 +25,7 @@ jobs: MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} BUILD_RELEASE: ${{ github.event.prerelease == false }} - name: Publish to Modrinth & CurseForge - uses: Kir-Antipov/mc-publish@v2.1 + uses: Kir-Antipov/mc-publish@v3.2 with: modrinth-id: Bh37bMuy modrinth-token: ${{ secrets.MODRINTH_TOKEN }} diff --git a/.github/workflows/self-hosted.yml b/.github/workflows/self-hosted.yml index 5d1cc68..9258d35 100644 --- a/.github/workflows/self-hosted.yml +++ b/.github/workflows/self-hosted.yml @@ -7,17 +7,18 @@ jobs: runs-on: self-hosted steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: 'temurin' java-version: 17 - - name: Grant execute permission for gradlew + - name: Grant execute permission for Gradlew run: chmod +x gradlew - name: Build with Gradle run: ./gradlew build - name: Upload build artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: name: build-artifacts path: build/libs \ No newline at end of file diff --git a/build.gradle b/build.gradle index 4d1f3fb..2534ed5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'org.ajoberstar.grgit' version '5.0.0' - id 'fabric-loom' version '0.12-SNAPSHOT' + id 'fabric-loom' version '1.0-SNAPSHOT' id 'maven-publish' id 'signing' } diff --git a/gradlew b/gradlew index a69d9cb..2772ff8 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,13 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -127,14 +127,12 @@ if [ -n "$JAVA_HOME" ] ; then fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi @@ -143,12 +141,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -237,4 +239,4 @@ eval "set -- $( tr '\n' ' ' )" '"$@"' -exec "$JAVACMD" "$@" +exec "$JAVACMD" "$@" \ No newline at end of file diff --git a/gradlew.bat b/gradlew.bat index 53a6b23..5b73dbb 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -33,7 +34,7 @@ set APP_HOME=%DIRNAME% for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" +set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -88,4 +89,4 @@ exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal -:omega +:omega \ No newline at end of file From d1dd49e61375aaa970d28fd411b6a8b53cf2a52e Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 20:47:11 +0800 Subject: [PATCH 068/112] change: Force 16:9 ratio center on wide resolutions This patch should help users that use ultrawide monitors, it centers the options screen at the 16:9 ratio compared to their actual resolution. --- .../client/gui/SodiumVideoOptionsScreen.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index e047b6b..b55443f 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -58,8 +58,14 @@ protected void init() { protected BasicFrame.Builder parentFrameBuilder() { BasicFrame.Builder basicFrameBuilder; - Dim2i basicFrameDim = new Dim2i(0, 0, this.width, this.height); - Dim2i tabFrameDim = new Dim2i(basicFrameDim.width() / 20 / 2, basicFrameDim.height() / 4 / 2, basicFrameDim.width() - (basicFrameDim.width() / 20), basicFrameDim.height() / 4 * 3); + // Calculates if resolution exceeds 16:9 ratio, force 16:9 + int newWidth = this.width; + if ((float) this.width / (float) this.height > 1.77777777778) { + newWidth = (int) (this.height * 1.77777777778); + } + + Dim2i basicFrameDim = new Dim2i((this.width - newWidth) / 2, 0, newWidth, this.height); + Dim2i tabFrameDim = new Dim2i(basicFrameDim.x() + basicFrameDim.width() / 20 / 2, basicFrameDim.y() + basicFrameDim.height() / 4 / 2, basicFrameDim.width() - (basicFrameDim.width() / 20), basicFrameDim.height() / 4 * 3); Dim2i undoButtonDim = new Dim2i(tabFrameDim.getLimitX() - 203, tabFrameDim.getLimitY() + 5, 65, 20); Dim2i applyButtonDim = new Dim2i(tabFrameDim.getLimitX() - 134, tabFrameDim.getLimitY() + 5, 65, 20); From b8a68c7fbdb0d3d355409a43eb5e37deb6984563 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 20:48:22 +0800 Subject: [PATCH 069/112] change: Force 16:9 ratio center on wide resolutions This patch should help users that use ultrawide monitors, it centers the options screen at the 16:9 ratio compared to their actual resolution. --- .../client/gui/SodiumVideoOptionsScreen.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index 32c3d4a..4cb2c29 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -60,8 +60,14 @@ protected void init() { protected BasicFrame.Builder parentFrameBuilder() { BasicFrame.Builder basicFrameBuilder; - Dim2i basicFrameDim = new Dim2i(0, 0, this.width, this.height); - Dim2i tabFrameDim = new Dim2i(basicFrameDim.width() / 20 / 2, basicFrameDim.height() / 4 / 2, basicFrameDim.width() - (basicFrameDim.width() / 20), basicFrameDim.height() / 4 * 3); + // Calculates if resolution exceeds 16:9 ratio, force 16:9 + int newWidth = this.width; + if ((float) this.width / (float) this.height > 1.77777777778) { + newWidth = (int) (this.height * 1.77777777778); + } + + Dim2i basicFrameDim = new Dim2i((this.width - newWidth) / 2, 0, newWidth, this.height); + Dim2i tabFrameDim = new Dim2i(basicFrameDim.x() + basicFrameDim.width() / 20 / 2, basicFrameDim.y() + basicFrameDim.height() / 4 / 2, basicFrameDim.width() - (basicFrameDim.width() / 20), basicFrameDim.height() / 4 * 3); Dim2i undoButtonDim = new Dim2i(tabFrameDim.getLimitX() - 203, tabFrameDim.getLimitY() + 5, 65, 20); Dim2i applyButtonDim = new Dim2i(tabFrameDim.getLimitX() - 134, tabFrameDim.getLimitY() + 5, 65, 20); From 58cd7e7d002cfa7653e26375bcba8d6c80b95cc1 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 20:54:38 +0800 Subject: [PATCH 070/112] change: Bump gradle wrapper and dependencies --- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 18 ++++++++---------- gradlew.bat | 5 ++--- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index babe395..43dfd0b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://modmuss50.me/fabric.html minecraft_version=1.19.2 yarn_mappings=1.19.2+build.28 - loader_version=0.14.10 + loader_version=0.14.11 # Mod Properties mod_version=1.4.7 maven_group=me.flashyreese.mods @@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1G iris_version=1.2.5-build.3-467a0118 #Fabric api - fabric_version=0.64.0+1.19.2 + fabric_version=0.68.0+1.19.2 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..070cb70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2772ff8..a69d9cb 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,13 @@ do esac done -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -127,12 +127,14 @@ if [ -n "$JAVA_HOME" ] ; then fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi @@ -141,16 +143,12 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -239,4 +237,4 @@ eval "set -- $( tr '\n' ' ' )" '"$@"' -exec "$JAVACMD" "$@" \ No newline at end of file +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 5b73dbb..53a6b23 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,7 +26,6 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -34,7 +33,7 @@ set APP_HOME=%DIRNAME% for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -89,4 +88,4 @@ exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal -:omega \ No newline at end of file +:omega From 8e56d0ce7b4f6b93d4353628955b5e361a2d3af1 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 20:58:08 +0800 Subject: [PATCH 071/112] change: Bump gradle wrapper and dependencies --- gradle.properties | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 18 ++++++++---------- gradlew.bat | 5 ++--- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index f6af69c..02512be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://modmuss50.me/fabric.html minecraft_version=1.18.2 yarn_mappings=1.18.2+build.4 - loader_version=0.14.9 + loader_version=0.14.11 # Mod Properties mod_version=1.4.7 maven_group=me.flashyreese.mods @@ -12,7 +12,7 @@ org.gradle.jvmargs=-Xmx1G # Dependency sodium_version=mc1.18.2-0.4.1 - iris_version=1.18.x-v1.2.1 + iris_version=1.18.x-v1.4.3 #Fabric api - fabric_version=0.58.0+1.18.2 + fabric_version=0.67.0+1.18.2 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..070cb70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2772ff8..a69d9cb 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,13 @@ do esac done -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -127,12 +127,14 @@ if [ -n "$JAVA_HOME" ] ; then fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi @@ -141,16 +143,12 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -239,4 +237,4 @@ eval "set -- $( tr '\n' ' ' )" '"$@"' -exec "$JAVACMD" "$@" \ No newline at end of file +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 5b73dbb..53a6b23 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,7 +26,6 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -34,7 +33,7 @@ set APP_HOME=%DIRNAME% for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -89,4 +88,4 @@ exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal -:omega \ No newline at end of file +:omega From e8ada937bd159b7e784c3d316f45bd5c527ec0d0 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 21:19:57 +0800 Subject: [PATCH 072/112] change: Don't remap sodium classes --- .../mixin/sodium/MixinControlElement.java | 2 +- .../sodium/MixinCyclingControlElement.java | 2 +- .../mixin/sodium/MixinDim2i.java | 2 +- .../mixin/sodium/MixinFlatButtonWidget.java | 2 +- .../sodium/MixinSliderControlElement.java | 2 +- .../mixin/sodium/MixinSodiumOptionsGUI.java | 72 +++++++++---------- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java index 0638c0f..4470f55 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -@Mixin(ControlElement.class) +@Mixin(value = ControlElement.class, remap = false) public abstract class MixinControlElement extends AbstractWidget { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java index 1396d24..737ff3c 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement") +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement", remap = false) public abstract class MixinCyclingControlElement> extends ControlElement { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java index 1802742..001f38e 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.Shadow; -@Mixin(Dim2i.class) +@Mixin(value = Dim2i.class, remap = false) public abstract class MixinDim2i implements Dim2iExtended { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java index e852e66..f2562cf 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -@Mixin(FlatButtonWidget.class) +@Mixin(value = FlatButtonWidget.class, remap = false) public abstract class MixinFlatButtonWidget extends AbstractWidget implements FlatButtonWidgetExtended { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java index e4641eb..5a9d686 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button") +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button", remap = false) public abstract class MixinSliderControlElement extends ControlElement { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java index 2b99aa5..8d5315c 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java @@ -1,36 +1,36 @@ -package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; - -import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; -import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; -import me.jellysquid.mods.sodium.client.gui.options.OptionPage; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.Text; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import java.util.List; - -@Mixin(SodiumOptionsGUI.class) -public abstract class MixinSodiumOptionsGUI extends Screen { - - @Shadow - @Final - private List pages; - - @Shadow - @Final - private Screen prevScreen; - - protected MixinSodiumOptionsGUI(Text title) { - super(title); - } - - @Inject(method = "init", at = @At("TAIL")) - public void postInit(CallbackInfo ci) { - this.client.setScreen(new SodiumVideoOptionsScreen(this.prevScreen, this.pages)); - } -} +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; +import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; +import me.jellysquid.mods.sodium.client.gui.options.OptionPage; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.List; + +@Mixin(value = SodiumOptionsGUI.class, remap = false) +public abstract class MixinSodiumOptionsGUI extends Screen { + + @Shadow + @Final + private List pages; + + @Shadow + @Final + private Screen prevScreen; + + protected MixinSodiumOptionsGUI(Text title) { + super(title); + } + + @Inject(method = "init", at = @At("TAIL")) + public void postInit(CallbackInfo ci) { + this.client.setScreen(new SodiumVideoOptionsScreen(this.prevScreen, this.pages)); + } +} From e1fe38817748dba7f661eb666b9e5dd948e8f531 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 21:19:57 +0800 Subject: [PATCH 073/112] change: Don't remap sodium classes --- .../mixin/sodium/MixinControlElement.java | 2 +- .../sodium/MixinCyclingControlElement.java | 2 +- .../mixin/sodium/MixinDim2i.java | 2 +- .../mixin/sodium/MixinFlatButtonWidget.java | 2 +- .../sodium/MixinSliderControlElement.java | 2 +- .../mixin/sodium/MixinSodiumOptionsGUI.java | 72 +++++++++---------- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java index 0638c0f..4470f55 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -@Mixin(ControlElement.class) +@Mixin(value = ControlElement.class, remap = false) public abstract class MixinControlElement extends AbstractWidget { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java index 1396d24..737ff3c 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement") +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement", remap = false) public abstract class MixinCyclingControlElement> extends ControlElement { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java index 1802742..001f38e 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.Shadow; -@Mixin(Dim2i.class) +@Mixin(value = Dim2i.class, remap = false) public abstract class MixinDim2i implements Dim2iExtended { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java index e852e66..f2562cf 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -@Mixin(FlatButtonWidget.class) +@Mixin(value = FlatButtonWidget.class, remap = false) public abstract class MixinFlatButtonWidget extends AbstractWidget implements FlatButtonWidgetExtended { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java index e4641eb..5a9d686 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button") +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button", remap = false) public abstract class MixinSliderControlElement extends ControlElement { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java index 2b99aa5..8d5315c 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java @@ -1,36 +1,36 @@ -package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; - -import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; -import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; -import me.jellysquid.mods.sodium.client.gui.options.OptionPage; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.Text; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import java.util.List; - -@Mixin(SodiumOptionsGUI.class) -public abstract class MixinSodiumOptionsGUI extends Screen { - - @Shadow - @Final - private List pages; - - @Shadow - @Final - private Screen prevScreen; - - protected MixinSodiumOptionsGUI(Text title) { - super(title); - } - - @Inject(method = "init", at = @At("TAIL")) - public void postInit(CallbackInfo ci) { - this.client.setScreen(new SodiumVideoOptionsScreen(this.prevScreen, this.pages)); - } -} +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; +import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; +import me.jellysquid.mods.sodium.client.gui.options.OptionPage; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.List; + +@Mixin(value = SodiumOptionsGUI.class, remap = false) +public abstract class MixinSodiumOptionsGUI extends Screen { + + @Shadow + @Final + private List pages; + + @Shadow + @Final + private Screen prevScreen; + + protected MixinSodiumOptionsGUI(Text title) { + super(title); + } + + @Inject(method = "init", at = @At("TAIL")) + public void postInit(CallbackInfo ci) { + this.client.setScreen(new SodiumVideoOptionsScreen(this.prevScreen, this.pages)); + } +} From a8b99e01c86e036ec661ea6f2ecf2e0d7bbe3405 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 21:29:26 +0800 Subject: [PATCH 074/112] change: Use Modrinth maven for 1.19.2 --- build.gradle | 5 +++-- gradle.properties | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index d34aea1..291ac74 100644 --- a/build.gradle +++ b/build.gradle @@ -35,8 +35,9 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "me.jellysquid.mods:sodium-fabric:${project.sodium_version}" - modImplementation "net.coderbot.iris_mc1_19:iris:${project.iris_version}" + modImplementation "maven.modrinth:sodium:${project.sodium_version}" + implementation "org.joml:joml:1.10.2" + modImplementation "maven.modrinth:iris:${project.iris_version}" modRuntimeOnly "maven.modrinth:lazydfu:0.1.3" } diff --git a/gradle.properties b/gradle.properties index 43dfd0b..45fb1fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,8 +11,8 @@ org.gradle.jvmargs=-Xmx1G archives_base_name=reeses_sodium_options # Dependency - sodium_version=0.4.2+build.181 - iris_version=1.2.5-build.3-467a0118 + sodium_version=mc1.19.2-0.4.4 + iris_version=1.19.2-v1.4.3 #Fabric api fabric_version=0.68.0+1.19.2 From a777567355ffda7154abdd6bea794650c70d39d8 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 21:29:54 +0800 Subject: [PATCH 075/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 45fb1fb..d9f22c8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.19.2+build.28 loader_version=0.14.11 # Mod Properties - mod_version=1.4.7 + mod_version=1.4.8 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From e6cafe890edb60ea290eb84e43f623180824ffec Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 21:29:54 +0800 Subject: [PATCH 076/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 02512be..398a636 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.18.2+build.4 loader_version=0.14.11 # Mod Properties - mod_version=1.4.7 + mod_version=1.4.8 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From 2920b834d1ffef603ad5d7624828e332b802e3f1 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 21:42:08 +0800 Subject: [PATCH 077/112] change: Initial port to 1.19.3-pre3 --- build.gradle | 5 ++--- gradle.properties | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 291ac74..6947860 100644 --- a/build.gradle +++ b/build.gradle @@ -35,9 +35,8 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "maven.modrinth:sodium:${project.sodium_version}" - implementation "org.joml:joml:1.10.2" - modImplementation "maven.modrinth:iris:${project.iris_version}" + modImplementation "me.jellysquid.mods:sodium-fabric:${project.sodium_version}" + modImplementation "net.coderbot.iris_mc1_19_3-pre3:iris:${project.iris_version}" modRuntimeOnly "maven.modrinth:lazydfu:0.1.3" } diff --git a/gradle.properties b/gradle.properties index d9f22c8..25c5f32 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.19.2 - yarn_mappings=1.19.2+build.28 + minecraft_version=1.19.3-pre3 + yarn_mappings=1.19.3-pre3+build.3 loader_version=0.14.11 # Mod Properties mod_version=1.4.8 @@ -11,8 +11,8 @@ org.gradle.jvmargs=-Xmx1G archives_base_name=reeses_sodium_options # Dependency - sodium_version=mc1.19.2-0.4.4 - iris_version=1.19.2-v1.4.3 + sodium_version=0.4.5+build.203 + iris_version=1.4.3-build.4-6494a8b5 #Fabric api - fabric_version=0.68.0+1.19.2 + fabric_version=0.68.0+1.19.3 From 3ef05d847a95b391dfe59ed9e8dce5f2190dfb45 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 21:42:08 +0800 Subject: [PATCH 078/112] Revert "change: Initial port to 1.19.3-pre3" This reverts commit 2920b834d1ffef603ad5d7624828e332b802e3f1. --- build.gradle | 5 +++-- gradle.properties | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 6947860..291ac74 100644 --- a/build.gradle +++ b/build.gradle @@ -35,8 +35,9 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "me.jellysquid.mods:sodium-fabric:${project.sodium_version}" - modImplementation "net.coderbot.iris_mc1_19_3-pre3:iris:${project.iris_version}" + modImplementation "maven.modrinth:sodium:${project.sodium_version}" + implementation "org.joml:joml:1.10.2" + modImplementation "maven.modrinth:iris:${project.iris_version}" modRuntimeOnly "maven.modrinth:lazydfu:0.1.3" } diff --git a/gradle.properties b/gradle.properties index 25c5f32..d9f22c8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.19.3-pre3 - yarn_mappings=1.19.3-pre3+build.3 + minecraft_version=1.19.2 + yarn_mappings=1.19.2+build.28 loader_version=0.14.11 # Mod Properties mod_version=1.4.8 @@ -11,8 +11,8 @@ org.gradle.jvmargs=-Xmx1G archives_base_name=reeses_sodium_options # Dependency - sodium_version=0.4.5+build.203 - iris_version=1.4.3-build.4-6494a8b5 + sodium_version=mc1.19.2-0.4.4 + iris_version=1.19.2-v1.4.3 #Fabric api - fabric_version=0.68.0+1.19.3 + fabric_version=0.68.0+1.19.2 From efd7a5c9ff2bde98245e03f305657c56b30936c7 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 21:19:57 +0800 Subject: [PATCH 079/112] Revert "change: Don't remap sodium classes" This reverts commit e1fe38817748dba7f661eb666b9e5dd948e8f531. --- .../mixin/sodium/MixinControlElement.java | 2 +- .../sodium/MixinCyclingControlElement.java | 2 +- .../mixin/sodium/MixinDim2i.java | 2 +- .../mixin/sodium/MixinFlatButtonWidget.java | 2 +- .../sodium/MixinSliderControlElement.java | 2 +- .../mixin/sodium/MixinSodiumOptionsGUI.java | 72 +++++++++---------- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java index 4470f55..0638c0f 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -@Mixin(value = ControlElement.class, remap = false) +@Mixin(ControlElement.class) public abstract class MixinControlElement extends AbstractWidget { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java index 737ff3c..1396d24 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement", remap = false) +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement") public abstract class MixinCyclingControlElement> extends ControlElement { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java index 001f38e..1802742 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.Shadow; -@Mixin(value = Dim2i.class, remap = false) +@Mixin(Dim2i.class) public abstract class MixinDim2i implements Dim2iExtended { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java index f2562cf..e852e66 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -@Mixin(value = FlatButtonWidget.class, remap = false) +@Mixin(FlatButtonWidget.class) public abstract class MixinFlatButtonWidget extends AbstractWidget implements FlatButtonWidgetExtended { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java index 5a9d686..e4641eb 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button", remap = false) +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button") public abstract class MixinSliderControlElement extends ControlElement { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java index 8d5315c..2b99aa5 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java @@ -1,36 +1,36 @@ -package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; - -import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; -import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; -import me.jellysquid.mods.sodium.client.gui.options.OptionPage; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.Text; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import java.util.List; - -@Mixin(value = SodiumOptionsGUI.class, remap = false) -public abstract class MixinSodiumOptionsGUI extends Screen { - - @Shadow - @Final - private List pages; - - @Shadow - @Final - private Screen prevScreen; - - protected MixinSodiumOptionsGUI(Text title) { - super(title); - } - - @Inject(method = "init", at = @At("TAIL")) - public void postInit(CallbackInfo ci) { - this.client.setScreen(new SodiumVideoOptionsScreen(this.prevScreen, this.pages)); - } -} +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; +import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; +import me.jellysquid.mods.sodium.client.gui.options.OptionPage; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.List; + +@Mixin(SodiumOptionsGUI.class) +public abstract class MixinSodiumOptionsGUI extends Screen { + + @Shadow + @Final + private List pages; + + @Shadow + @Final + private Screen prevScreen; + + protected MixinSodiumOptionsGUI(Text title) { + super(title); + } + + @Inject(method = "init", at = @At("TAIL")) + public void postInit(CallbackInfo ci) { + this.client.setScreen(new SodiumVideoOptionsScreen(this.prevScreen, this.pages)); + } +} From 6f53dca8ebd64b525abb65a45c5380a84ae6a069 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 21:19:57 +0800 Subject: [PATCH 080/112] Revert "change: Don't remap sodium classes" This reverts commit e8ada937bd159b7e784c3d316f45bd5c527ec0d0. --- .../mixin/sodium/MixinControlElement.java | 2 +- .../sodium/MixinCyclingControlElement.java | 2 +- .../mixin/sodium/MixinDim2i.java | 2 +- .../mixin/sodium/MixinFlatButtonWidget.java | 2 +- .../sodium/MixinSliderControlElement.java | 2 +- .../mixin/sodium/MixinSodiumOptionsGUI.java | 72 +++++++++---------- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java index 4470f55..0638c0f 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -@Mixin(value = ControlElement.class, remap = false) +@Mixin(ControlElement.class) public abstract class MixinControlElement extends AbstractWidget { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java index 737ff3c..1396d24 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinCyclingControlElement.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement", remap = false) +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.CyclingControl$CyclingControlElement") public abstract class MixinCyclingControlElement> extends ControlElement { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java index 001f38e..1802742 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.Shadow; -@Mixin(value = Dim2i.class, remap = false) +@Mixin(Dim2i.class) public abstract class MixinDim2i implements Dim2iExtended { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java index f2562cf..e852e66 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -@Mixin(value = FlatButtonWidget.class, remap = false) +@Mixin(FlatButtonWidget.class) public abstract class MixinFlatButtonWidget extends AbstractWidget implements FlatButtonWidgetExtended { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java index 5a9d686..e4641eb 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button", remap = false) +@Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button") public abstract class MixinSliderControlElement extends ControlElement { @Shadow diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java index 8d5315c..2b99aa5 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSodiumOptionsGUI.java @@ -1,36 +1,36 @@ -package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; - -import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; -import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; -import me.jellysquid.mods.sodium.client.gui.options.OptionPage; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.Text; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import java.util.List; - -@Mixin(value = SodiumOptionsGUI.class, remap = false) -public abstract class MixinSodiumOptionsGUI extends Screen { - - @Shadow - @Final - private List pages; - - @Shadow - @Final - private Screen prevScreen; - - protected MixinSodiumOptionsGUI(Text title) { - super(title); - } - - @Inject(method = "init", at = @At("TAIL")) - public void postInit(CallbackInfo ci) { - this.client.setScreen(new SodiumVideoOptionsScreen(this.prevScreen, this.pages)); - } -} +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; +import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI; +import me.jellysquid.mods.sodium.client.gui.options.OptionPage; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.List; + +@Mixin(SodiumOptionsGUI.class) +public abstract class MixinSodiumOptionsGUI extends Screen { + + @Shadow + @Final + private List pages; + + @Shadow + @Final + private Screen prevScreen; + + protected MixinSodiumOptionsGUI(Text title) { + super(title); + } + + @Inject(method = "init", at = @At("TAIL")) + public void postInit(CallbackInfo ci) { + this.client.setScreen(new SodiumVideoOptionsScreen(this.prevScreen, this.pages)); + } +} From 3506c43c2ed79730a063b40a0dfa70c98d52c719 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 22:29:55 +0800 Subject: [PATCH 081/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 398a636..486191d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.18.2+build.4 loader_version=0.14.11 # Mod Properties - mod_version=1.4.8 + mod_version=1.4.9 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From e9f5de46582e6412916dcd8c379a676c8d655119 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 1 Dec 2022 22:29:55 +0800 Subject: [PATCH 082/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d9f22c8..4a40084 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.19.2+build.28 loader_version=0.14.11 # Mod Properties - mod_version=1.4.8 + mod_version=1.4.9 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From 965aadb9a1748d8930d5d50d7cb90d4f020a32b7 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Sat, 14 Jan 2023 09:09:26 +0800 Subject: [PATCH 083/112] change: Donation button auto adjust to text width --- .../client/gui/SodiumVideoOptionsScreen.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index b55443f..ea76733 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -71,14 +71,17 @@ protected BasicFrame.Builder parentFrameBuilder() { Dim2i applyButtonDim = new Dim2i(tabFrameDim.getLimitX() - 134, tabFrameDim.getLimitY() + 5, 65, 20); Dim2i closeButtonDim = new Dim2i(tabFrameDim.getLimitX() - 65, tabFrameDim.getLimitY() + 5, 65, 20); - Dim2i donateButtonDim = new Dim2i(tabFrameDim.getLimitX() - 122, tabFrameDim.y() - 26, 100, 20); + Text donationText = Text.translatable("sodium.options.buttons.donate"); + int donationTextWidth = this.client.textRenderer.getWidth(donationText); + + Dim2i donateButtonDim = new Dim2i(tabFrameDim.getLimitX() - 32 - donationTextWidth, tabFrameDim.y() - 26, 10 + donationTextWidth, 20); Dim2i hideDonateButtonDim = new Dim2i(tabFrameDim.getLimitX() - 20, tabFrameDim.y() - 26, 20, 20); this.undoButton = new FlatButtonWidget(undoButtonDim, Text.translatable("sodium.options.buttons.undo"), this::undoChanges); this.applyButton = new FlatButtonWidget(applyButtonDim, Text.translatable("sodium.options.buttons.apply"), this::applyChanges); this.closeButton = new FlatButtonWidget(closeButtonDim, Text.translatable("gui.done"), this::close); - this.donateButton = new FlatButtonWidget(donateButtonDim, Text.translatable("sodium.options.buttons.donate"), this::openDonationPage); + this.donateButton = new FlatButtonWidget(donateButtonDim, donationText, this::openDonationPage); this.hideDonateButton = new FlatButtonWidget(hideDonateButtonDim, Text.literal("x"), this::hideDonationButton); if (SodiumClientMod.options().notifications.hideDonationButton) { @@ -91,7 +94,7 @@ protected BasicFrame.Builder parentFrameBuilder() { int size = this.client.textRenderer.getWidth(Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey())); Dim2i shaderPackButtonDim; if (!SodiumClientMod.options().notifications.hideDonationButton) { - shaderPackButtonDim = new Dim2i(tabFrameDim.getLimitX() - 134 - size, tabFrameDim.y() - 26, 10 + size, 20); + shaderPackButtonDim = new Dim2i(donateButtonDim.x() - 12 - size, tabFrameDim.y() - 26, 10 + size, 20); } else { shaderPackButtonDim = new Dim2i(tabFrameDim.getLimitX() - size - 10, tabFrameDim.y() - 26, 10 + size, 20); } From 72695c3016b10ac012b457e60faa3ac2a25e687d Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Sat, 14 Jan 2023 09:10:51 +0800 Subject: [PATCH 084/112] change: Donation button auto adjust to text width --- .../client/gui/SodiumVideoOptionsScreen.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index 4cb2c29..f252a8b 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -73,14 +73,17 @@ protected BasicFrame.Builder parentFrameBuilder() { Dim2i applyButtonDim = new Dim2i(tabFrameDim.getLimitX() - 134, tabFrameDim.getLimitY() + 5, 65, 20); Dim2i closeButtonDim = new Dim2i(tabFrameDim.getLimitX() - 65, tabFrameDim.getLimitY() + 5, 65, 20); - Dim2i donateButtonDim = new Dim2i(tabFrameDim.getLimitX() - 122, tabFrameDim.y() - 26, 100, 20); + Text donationText = new TranslatableText("sodium.options.buttons.donate"); + int donationTextWidth = this.client.textRenderer.getWidth(donationText); + + Dim2i donateButtonDim = new Dim2i(tabFrameDim.getLimitX() - 32 - donationTextWidth, tabFrameDim.y() - 26, 10 + donationTextWidth, 20); Dim2i hideDonateButtonDim = new Dim2i(tabFrameDim.getLimitX() - 20, tabFrameDim.y() - 26, 20, 20); this.undoButton = new FlatButtonWidget(undoButtonDim, new TranslatableText("sodium.options.buttons.undo"), this::undoChanges); this.applyButton = new FlatButtonWidget(applyButtonDim, new TranslatableText("sodium.options.buttons.apply"), this::applyChanges); this.closeButton = new FlatButtonWidget(closeButtonDim, new TranslatableText("gui.done"), this::close); - this.donateButton = new FlatButtonWidget(donateButtonDim, new TranslatableText("sodium.options.buttons.donate"), this::openDonationPage); + this.donateButton = new FlatButtonWidget(donateButtonDim, donationText, this::openDonationPage); this.hideDonateButton = new FlatButtonWidget(hideDonateButtonDim, new LiteralText("x"), this::hideDonationButton); if (SodiumClientMod.options().notifications.hideDonationButton) { @@ -93,7 +96,7 @@ protected BasicFrame.Builder parentFrameBuilder() { int size = this.client.textRenderer.getWidth(new TranslatableText(IrisApi.getInstance().getMainScreenLanguageKey())); Dim2i shaderPackButtonDim; if (!SodiumClientMod.options().notifications.hideDonationButton) { - shaderPackButtonDim = new Dim2i(tabFrameDim.getLimitX() - 134 - size, tabFrameDim.y() - 26, 10 + size, 20); + shaderPackButtonDim = new Dim2i(donateButtonDim.x() - 12 - size, tabFrameDim.y() - 26, 10 + size, 20); } else { shaderPackButtonDim = new Dim2i(tabFrameDim.getLimitX() - size - 10, tabFrameDim.y() - 26, 10 + size, 20); } From f9791e7d4f9e60071268da9bfd65158e05069618 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 20 Feb 2023 03:52:58 +0800 Subject: [PATCH 085/112] change: Bump to 1.19.3 --- build.gradle | 2 +- gradle.properties | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 291ac74..4163747 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'org.ajoberstar.grgit' version '5.0.0' - id 'fabric-loom' version '1.0-SNAPSHOT' + id 'fabric-loom' version '1.1-SNAPSHOT' id 'maven-publish' id 'signing' } diff --git a/gradle.properties b/gradle.properties index 4a40084..3158990 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,17 +2,17 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.19.2 - yarn_mappings=1.19.2+build.28 - loader_version=0.14.11 + minecraft_version=1.19.3 + yarn_mappings=1.19.3+build.5 + loader_version=0.14.14 # Mod Properties mod_version=1.4.9 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options # Dependency - sodium_version=mc1.19.2-0.4.4 - iris_version=1.19.2-v1.4.3 + sodium_version=mc1.19.3-0.4.9 + iris_version=1.5.2+1.19.3 #Fabric api - fabric_version=0.68.0+1.19.2 + fabric_version=0.74.0+1.19.3 From 46ce62919a04c022ca76596a3bb3ce08a62991d5 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 20 Feb 2023 04:03:03 +0800 Subject: [PATCH 086/112] change: Bump dependencies --- build.gradle | 2 +- gradle.properties | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 2534ed5..fab1260 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'org.ajoberstar.grgit' version '5.0.0' - id 'fabric-loom' version '1.0-SNAPSHOT' + id 'fabric-loom' version '1.1-SNAPSHOT' id 'maven-publish' id 'signing' } diff --git a/gradle.properties b/gradle.properties index 486191d..b131f74 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://modmuss50.me/fabric.html minecraft_version=1.18.2 yarn_mappings=1.18.2+build.4 - loader_version=0.14.11 + loader_version=0.14.14 # Mod Properties mod_version=1.4.9 maven_group=me.flashyreese.mods @@ -12,7 +12,7 @@ org.gradle.jvmargs=-Xmx1G # Dependency sodium_version=mc1.18.2-0.4.1 - iris_version=1.18.x-v1.4.3 + iris_version=1.5.2+1.18.2 #Fabric api - fabric_version=0.67.0+1.18.2 + fabric_version=0.67.1+1.18.2 From 10dbb0b740572612826c2b16d2a805725a450216 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 20 Feb 2023 04:07:34 +0800 Subject: [PATCH 087/112] change: Bump gradle wrapper --- gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 61574 bytes gradle/wrapper/gradle-wrapper.properties | 3 ++- gradlew | 12 ++++++++---- gradlew.bat | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f090a2944b7473328c07c9755baa3196..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644 GIT binary patch delta 36524 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%0DGK?7GHTj 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 VwlMN}`%er%aGR6olj~j${vQ;P=LY}) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb70..fc10b60 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index 53a6b23..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% From bf754185005d7f62f4122832131a7e6a2df1c9b5 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 20 Feb 2023 04:07:34 +0800 Subject: [PATCH 088/112] change: Bump gradle wrapper --- gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 61574 bytes gradle/wrapper/gradle-wrapper.properties | 3 ++- gradlew | 12 ++++++++---- gradlew.bat | 1 + 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f090a2944b7473328c07c9755baa3196..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644 GIT binary patch delta 36524 zcmZ6yQ*&aJ*i+pKn$=zKxk7ICNNX(G9gnUwow3iT2Ov?s|4Q$^qH|&1~>6K_f6Q@z)!W6o~05E1}7HS1}Bv=ef%?3Rc##Sb1)XzucCDxr#(Nfxotv ze%V_W`66|_=BK{+dN$WOZ#V$@kI(=7e7*Y3BMEum`h#%BJi{7P9=hz5ij2k_KbUm( zhz-iBt4RTzAPma)PhcHhjxYjxR6q^N4p+V6h&tZxbs!p4m8noJ?|i)9ATc@)IUzb~ zw2p)KDi7toTFgE%JA2d_9aWv7{xD{EzTGPb{V6+C=+O-u@I~*@9Q;(P9sE>h-v@&g ztSnY;?gI0q;XWPTrOm!4!5|uwJYJVPNluyu5}^SCc1ns-U#GrGqZ1B#qCcJbqoMAc zF$xB#F!(F?RcUqZtueR`*#i7DQ2CF?hhYV&goK!o`U?+H{F-15he}`xQ!)+H>0!QM z`)D&7s@{0}iVkz$(t{mqBKP?~W4b@KcuDglktFy&<2_z)F8Q~73;QcP`+pO=L}4yjlzNuLzuvnVAO``skBd=rV%VWQTd0x6_%ddY*G(AJt06`GHq zJVxl`G*RiYAeT=`Cf(SUN$kUEju!>SqwEd8RWUIk$|8A& zAvW|Uo<=TWC~u}V?SNFv`Fq9OeF_VpfyXHPIIay@Pu5J6$$pg{;xE9D7CROVYV>5c zv^IYXPo_Z4)bg5h?JSUX!K`q_u{>F%FzrG>*!Db_^7*7(F@f%i34Ps`JBAH6{s=ygSr^CVO)voP`v=SO z7v;4cFM_D>iVl{&X*N7pe4_^YKV%`5J774`5!DC}g;D@50h?VA!;fU1?Hf%%`N8R1 zSg@hZ8%Dq^eYV1!g8;`6vCSJoK+V1Q6N8ImtfE3iXs!s~B>js)sLHB9w$r+6Q>Oh#Ig&awvm%OBLg!7alaf}9Cuf;M4%Ig9 zx4K}IQfPr&u?k8xWp!wI4{CP#GTs#qR0b+G{&+=vL}I{b-Pha43^%8=K3997~* z>A|oxYE%Vo4~DiOih`87u|{8!Ql5|9Y+(ZY2nRP+oLdGErjV&YeVKw>A$JyPPAL+C zA36S!dNVf z;xJ)YR;^VPE1?`h-5>{~gwY2pY8RqhrsiIBmJ}n3G@Zs!!fD6y&KWPq&i8HEm*ZAx`G} zjq2CD5U==ID^we8k?=geue4Y>_+%u3$-TzVS6QMlb4NoS%_V>;E2hQ)+1Q@v(reC5 zLeK*f%%{PNO-mtrBVl|-!WaiKAkZv-?wnOwmZ=Tv57k=4PX=C?=I4V*THRFRE8a_{ zb>5YwDf4o>>$o{XYlLN{PZ^Ff?0FJl4>A9C-q9A$$&44l122Qsc|6Fd6aTam{=JO3 zBFfFe9seUPSUeyXQc*RA>2{WoKIYVltA&@5spdIW;rzOOqoQo`CN;~UNgU{{m9^c1 zTrN|8w_7+Nws4}Z-4eS9WMpF3h<@81a)oK9njh;-TB74vR;u{vE?>6FDG7<%GVXFL zUR9l{z*eEND6pp)+hpNT$VVM^Pw*S;#NrbCmH{dhBm?%6D|k)0C@Z9H>T|kby1^)# zOPmJ8Hq`8waoEK(9}IfP_q4yr(s?ME+T%UV-ikxW!XFb^6w02t30j$n_VSwevg;{9 zx0OXK_uGBFej=gbG>G^pEv^`I8&_a@t9>Nr;#r?XNKquD&Ho|`)qK6C^-7SCdo=S& z)vUi;m5*qIePEIbL=wJ|WCBNY;zCm2F-+@N2i{I^uR9UVZm$o`I|@<&2}w)C`h)vV zW{)yGJ3?GCZNtFe53Kb#uzrC7v-{JygKZUiXDV5mR z5la_vAFOvoh#yn)B`$^ZN*Dxp5Uo~_k8G9skn2)Tb>Kw#Vgxi`bti)^(z--X9F~oR zZ6=^_x@mDT~=h_@GGVcgBtLzssB1|Xy(xc(lUYJ#_ zgwc&ajE%^cCYW7d;xAxi{#LN*1}s>{K79MZrq!tYMpRA{T!#^tgXP=J5FvkbZ@gx~ ztq-E&c$`|KX8GS2a_voZHf=y8C{6~f~`DpC- zjQfrt2OGi-WGx}Y4>vM`8<4frU*!bq*NJ*Tyn0cqk=zpDdYth-PJIfz5>pLF@qnai zzj2FEhuOa-7$JR=U!L{UWWJBA%~SW-6Nh&3;<}iQO)DvOI&VKi1L8rmICePWqoY^F z-dC8X8~1T}=C9m&yb1kZzbKd2;29_Pm*Cs=y{Z06QZDlT7Poci>1@hFa%t0<`1()UTxcQ}e`fAh6K`<5C_SG`dw$IqzwEYNKvIH3VWlhz z_#^(T53W}jeWF#WIhj^U7AdIB~3feC--5iUiiT4Qyu81 z;Xa^8#~M@p%6B`LCKWWTa7I+35BLP=EOa&Gp2pbTWw5HOIjrx;2J(KI$$HT|w8}R-8fbp9sot&LiLs7ILlyZc8 zWbss7=*Ah|X$LEt1O|T?ABkIn-0NN`I8+ipfoBZcW>(WiaASG_khBtKM{hfkm5VBS zy0Q`4*G6HRRa#9G)10Ik3$C3|nQbFzmU-dA`LjKQY8icnx?2OE40%z852{OJH=?mbvwr9 zhlx0RDo^D;p*xKx?yT(`s7wj7BHA~rHF2yxnL<1PcU7FM57;?g^ z&CyPh9W4KvZ;T8w;AuNMn|nQ-xJ~CvVT7gAPAGi7w8udw_LOp+p4eZiI`JEC@Mq9F z#dA2AM_};CnL=y0#tZALdB(P~Rz*KqGqjwec%Fy?K(PGoO0tfskWw-aGhd7$ zTi~x1G>4h5q>ek=tIoT(VBQxrq)&#`_0UHC(j*ZO%%}%C)|EzTWEpvYDqCYXLexR9 zlww1ESB+IiO}=oq)8WZj%cY_FTQcEJ`JdABa=_S;O|kLhX*|5|D>0c{12DoC?K95f ztNxm(sTU6cWWd$tv`5X(=x?yAo)IYQ3G*2+o#|EfXko6erF;M4Pc;G0)pUDY)t`H9 z76Z8V9HqbWA@!`BelAT&ErrGTz7}%M*605PEY@3{gv+`yEhr{=EVp_tU%`b54Pn4a zz8nN7`eNx=*`f1t#^7>7G07IEnbnn&`RWZ}4Cp8W_DFDs-5)GU`bw}uBmOQfKmi2@ z(cWWmvHFTUNInRH!0y_ZtuI9Eh@O3+64wy-_2DF~E@KF3abM`0gC%|kHi@&hP_#B$ zLN{Z?$V_;+h?%2zEC{2ITyWOup*w*K?~vpwB(DX1i6oY+F)??;nyHpzaPLIt6G$4; z6>iAsB+&&NN0;ObWVOL+-^ZwD?nHgY>0k>0I3iA7o)f# zN&aX$lM@r_Iu|nSdPjoF{#QD9M6>|JSNPLxX^T2!jCKjS5mwNaO+SmBfOY z;6ZdwfzhO6Vs|9u81f4e%7*mU%8K>A7QWO0;QcX7W@|NSUVl)_>7VEf#&N6E~ zn9Wv88@Suo9P+M_G2(f+JFf#Q^GV#7QQ`qH#$N1y{A*_t^`5H1=V^u?Ec|EF6W+6B z(@Q8ChIUyq;+I5CmjEa1*v%d5{WHyhcHSjQuwzQq?;^BmfV#okq3v8bp7dBdk z54B+%D3=JWd-2w$)puXxZyZH>-$O-?tbSIlGc{em9xHN!44iaCr}6uZ^FpN7IvNh8 zbp!%4xR9np`>AOEd1e2_y}xW#v@@h3wYc?WiwL6Q>fxPQA81V^J)XtGs|Z&er6w~M z!1Ph~85TMG>R&ixNUnevc(w>fgb%+X#Wds6Yl+wH29aE%;RuDeZz5dEt%#p&2VK1n zKkqgl&*_YwnO%9`0<6MVP=O3{02EcR7PvvZPbL2KMuoRsU|Y%zw38qeOL#!YFp#_~+rtNJVl>lJSh_*B0A6n3XkE5po z9RpE_h=pnmDJFX*n6wmsWJ9GLu2=L8y!_R;;Aa2Jl|)I}Qff&`Fy@iOhop8>Y2{F} zbVk3rNMi$XX(q1JrgcIhC08@d5Zc>wLUL3wYm}hzS^!5d&Mec$Sp^$DUS1lD1>KAt z|Efof3nJ4^k(WKL_t-u8ud4L(t>q#9ECj?v#W~W#2zTt>|MCh&*H8Wh1_I&^2Li&M zq9j0`(zk~P7}dB`+15b*j%VPGr$;@4MBQ5AT>-y?0Fxfr2nC1kM2D(y7qMN+p-0yo zOlND}ImY;a_K$HZCrD=P{byToyC7*@;Y$v6wL!c*DfeH#$QS6|3)pJe68d>R#{zNn zB0r*Es<6^ZWeH`M)Cdoyz`@Z&Fu_^pu8*089j{gbbd!jV@s7`eI5_X5J3|poVGlq` zDo9}G;CsjW!hgN2O9=1|GpE;RpQvrBc+&dF)L>V&>9kd6^YIL?+*WDmcQlvwnq`Lf z&N$gF>3+E*NcJojXXI^}B(B-;@ebpVY}l#EcDWles7s;Ft+KZ@m+6FWaD^oYPBXVw z3sq|aKIDh1x5Ff=tW$(LO|!e&G?Xvh^H!GfiA(emluL!LmD=EV@|u|8S7w6ibUePJ z>{sOC6L27R+b&}e?VH;KvV3a;O3G=gwG}YzrkSTV6(&=;o)EV~2OD(Eh4mu@K0G)i z3#44IZhqN6+Hb2h#3R8YwJW7LesDA9=n)75u#46_ZmSh@6Q-4oHvGxFPY8x;Q+)d@ z*-SDqhVeyPGkoD)iq;z0r*M)IhY5I>gMA@RS&EIYPq}Z{$Q4Jbfd76EVhSF-sR^TO z!=o?>V(^bx!pG$26J~Z>Tvu&Uu+0;>m+pg(fmbu(97^(OHBH4;J8WIfv-f5}VP#VS z$Y$}SHKdphDUHlbdIVW!k$L6T{LY)|H}MT=l$22kIl>|46FK9dt$?3Fjk2RA-~AX7 z1|Xe`n)%h~e-O_qLpoFXJ$%gmocq`v0%hRw1k_6nh|+3pvJDy}m)V|xjL&!Z6?%pU z+m)r2*pWjEl!etAYxdzWb0{mGc;#$>rE%)b z@Rnj78P;$lrzY!XCa0&x+8a^YF*G|Q|C}bGeczz(5m_gq08wJHIH`WqHH?A}!~_3{ zQEvMXmL<*nThl^pL58nbHgQ1n9cYmN{C8J^6AKS%?~>1DCt70Q2Vp0;E@`GF%Tzkc zSUt&LJ=wHI6@#8_%=2s=j^4VBd1-h_)3 zeozYua!|{x(qk#z;tavf28rj_5Oen-cYG%;R6I}Hz$yMXeg^)_$OUUXx1r^qrl!DG zYXkAXKBMrVM-rJwAo<5J{NW1XJhW;Nh*&`nFV-Z;Vd({KSkMxV#cn|bXJ z50GtvFE##sqGhV#lv2s6?^yeBShlhR%XaPIo)iXOue}jwZ;Zq#dgDn8H?74Y+$Z?C z2Y5mCC66>dp%sVMecUzCirWq99Ea(TDwClZxtEB~4N-2JmlH#>Z2jOcaNaw4tn?P->BBGNHxUHez7>C@TZNT5Z zHerlG0a4~06L%>tn!~$s^L5`~{ueLZ5?`$46nHvwKxM0V9VQ(k{A40xDVw{+Qt)RV zQ)T2Df)cp0nv!lUFt3D=i~k!V|7dUjpz?K2ZiynO)$d{2*YT$N^CQ{t=luZ>WcE!> zg25p}If9RTho%G@PZp;5zBwv`n+e9iO=6dx1V^|4Ty%`oE=f7O&QC^s!4MJ+lMG>^ za!mgpz*^SHT+M_zm;{H#E~SaU^Kn*y)nTAF*2@t5mF+l)bte+a+goaA*zXJ4P)H|y z{4OwbJnIPtMp4E~=64gM-Y{#o{x)+8YCg$C7Yy=;9hdyBgRFIY2_L9DL3*B@%$5#m z8P}+)glf*}UPD$C;_yntx}9VPmSSnY9`Thd09nfoR;3`kar*FRfS)`+as*t2l*USWgmaZ!qFubr1DegTGZspyYMgic{inI0dSt+rJR z((jjMrdq^?VSZ8FCO;0NW@>O_b67gDHP%W*^O?J z91NQ7ZFODMSvHj3cvT#6RJUF7x=-BJFQ^6<&mOd15Z&M!?b+3Tg!UcgldD9tOAt5K z3X>MlE-a=sj;K&}sSng48jQ7sp|&u3;@e>V4Cuf(!s@9lZ0Cg^DKWmki%>$<85tOG zU;e{%zHU~KREBUg?FbcseK{lmK-`*S1p9j_4hF=F$y)NB;HsHwuf_A0Zhy395eU7o8^A zi2t7Ch|KVprUn03N0T2XshT!g$HTErcQBBG=TWaHkYtaI2CJY7ajI%yr&9 zVC^zJ3WW03bjwGNx{l}#+D&Ml_uI4PQhV}qZPXOP7ffSv(O;hX{Ff1|HoA~v)V!4y{CdALyi2YPjrRVmRYilRv z5PSkj*Z_8Fa*sCqGN?7YTnkr9=i9X`qcw7nqz#{bj?B7NiV9fWF+%~Rb1X@MuS^Mw zC)d#K{(-9!?xStM2K5x%x~ogWxgIK>s5r_RT1jU_lxdTtIEFWvi4eJSAiGec&HXQ( z5t7!J1b#SL|8s4)u147PWQUq_e33!5Z#f$Ja&az)(Htl`Z0@Ez)0d74BzNHHfH|<-8q*ZMf?%eJzoGS!0S6Y zSU7y^1+;V$Je9F027>1eN#_tz+2t}Y^N zYfi9}J!N^SU1CYoNBDbD39@84xLroY@0f%%c^(5CE+}!b5-Mt3oXe2nBdyicgGIL+rzTTKv`}Pp%fG1f^s?sgNH8=Q}s4Z>0ZCZ8ZYF z4og8nK%OA~zZMJX01uFtrmwhcgg*XbiMP9kfkPYFASbp7*Bk^5ZBzV)dL)JhPwDkM zkgdHeKw)orJcj4^)a^wQC2|->G=OBzuc-SskRrrf+H-E%HQ==Ex}d*504#GbIUXIB zcZs@Oo0i61MG}&0bu%@2N?MMJMRXyTVb8@3wF5eY3G6-1NdT~{{~YFs8f&SNebdaq zKmP>XqCQ@iaamuvY2m%xJ~gdSLSj~DBhB`NCj_c}NbSjB{r(E`_-+6a#vx*|S>-GU zHsw^dxxu`e)q1HbH==rLFap?cebKumnTo=iJQ zJD1#=o>0%Y@&jP?^)Q5bTV!pzrf=FoHq2c_59pq@my{D4AW8VU*7LVp;LF-qESV;L zClRfyQ6CcD$sd84K@e@p_ALH%j(Pz@Em@QFyY`AG&(|!(cG8!oV#ejr`y(LolX}Iu zL$)G)8^y4sUAYCWprzVR?`#OJ%NU)9U^B!OGSj>Ly;<)<(nNh`?z*GvJ|ZBKfZ`0 z=q_yGHWPp~R+J+{{@APVwmp8`=%N!L7AT^l^oaM|JrCFu7J#@frf=z(vGq2>sQ^@u zk=^d#gDf}ME!~9PaLfw44~rsG!)T7h8~dY^VcZQa+ueWPGG$mWXB|H2$$0BT(QAIu|=DJXPQDNes3Q>-|Mh=Ih zy{WR)QmhL5rQbBYPBa+e7)8Vo;_aKrg`}izmN>#ATuSDu!QUFA zsgM|Kv@W(S}Ag^6e8)9pQc@JLj_2ZIkO=8)#ARm#mU=NncWbmd-SbO;ad=y|k`shy3b z*8o0@EJo3b$#zSgmnlT7KAp)U!qI2M`hiC@Gp0)pNGHYMe1$MBNE}Hd{Sv^`wI7>MzNwgVv1ZzL zttmyv!=TKuPH$b>r7$lgP5?vho;#Ks4+zLzaz-1b{p-Fn6dWy1Agg7O2{&VQ5@s3A zAqzC9QokRD59!@ex#k>xy61kq6h~O$lb;lB;Q|chv&wzR+N zgXdIo%?q1Y$TzsdCo+n$^NODN7yd}cAv+rkG|u-(wTp?zUSUxaA-W3dwqikdrokwz) z68)Gn$Nwc1zB$F9`#(af|C3v;|2$bo7fU8f7h^NK6h&@xi2m`)g4mW$?l@5JEc*VV z6d67@Fl2w6mO;MYUl2U>R996gQUX$d>$D>)TNGq*arz}f21yh^uvIM!3u$H{_CH5! zrjt9L^&J8UqEV_lLn&}nc|Q=MDei6t=vL_>X-i8B%f5FDi)|qQ;2V-T!qOi*uqq{U zElET6#2cb>Z_6p_vw44&mN!;T&~ubi&p`XGepCNAfa0-T zC84V@VN^R6%z({m=$%iXrbiggxvMiBpww~ktD&=9-JPK3kPCOGCJNQj8+l9k#!QeS zv3h$Ej>@j<-zBW0Qr`5tNQVRfYK_$3>nWUzf&c*tCpl@aYwa%b;JNeTX10OevcxY7 zqnLgKU-X9G8~&?Dr)`*7GryqhN#;9v`D_c=_xBcD{j-cLop~pSnM?&7HggX6gb++ftBq$idM1|>5t+68sWf{ixREbMkZesmpjJsAFPQ#2+8Uek z$BPbu3cQuNDQq+^M}&ZuSHjxUgxOjF<^%4 z*8lc$CgA<$n=DYg_DsrHB7zYM0Ro|gS8ZnUq$u3GQ+{owv9RdB$wG%d-;R+I>?i?b z+r_mu{IL6WTYftdz?0#pbHkmQP31LvXcMK6;mAP+;q^L@q}v~TD}Ni>f7@QYcbM!T zX5kShHv3X1U=>B!2*si9=AEJCBt~GIH7DL4^+gHj+q}tk0F_?Q-=z{JY%77nkw>$F zG}6ROaL_)3t$jX=ZtFG{Q=LZfNjNb2LK=m9l|7iaB++N|S$vAr1 z_gf3JpIB|?dptfQ{sOZGlhyj~D;T#hjaNh0X5(o&7)87^t@@Hteh{0DOM{tCu$l#& z&NhA&V4VR}nzZP{7i(5bGB17<7bu+RJ1}k}=ffSg%=+213Oy@Aj1vv2U>U>8tRhKM z=*e<21)u6SSb{CC&We%#6X@duqLWGJ>O)Ls`uM98``34g11;D}*7>c3+^c|Os&;t}`(BWMD zfbyr~$j%{6%DZ`kR-}s~p?0#&-5a}b?6tDqwtqY%ep0ypSRIB54G@|0J5E#LkxQk# z_&xE=d(U}q?*Rh7L7f8AM5{qdGpC<&t~9YI!%j2G@nUPoLPSiWHjCVP{JAe?cBjQ zTqI=R{nv5c@|R)8Oi3cTL{&6%XdTgDP4CNYT}q2f5|Xf_hID#;83kd+v0RRyNKYn} zyPahwd=4ncDORLvatBc~KzT+jiiD{tzd3d*T(f7ayS;J&I1X!xaL2~POrw2ST=Pr5 zu*c}fb@)0P6jv))kNl38C7gmnWGmlL@{PWOVYt9se*cS0w#@W=N+dY#V08ci=Zmg9 z+${f#Qfs5)hOPxC;q{(J{Kx4HF)2QMzlVtXz0-O&h2$VxtT;ROvZ13nN{IG>Asv{% zHuDqgZ{R2(X*hkO+!HYHHWvRYrvN9fl-1?x6b)oseZY)@dQ6O>9Y#8*23~%bzN~Nf zpHGMdS-G|%F^v3Gnlsc$s4Wl=ZEu+J6y~*Ih2tpmHfO56JXKjldm$BxDvW6ZH>JrU zdRo}=^466lAq6!qY_@nQ}5ETUEoF;`>7b8W910_Z17!r`D?QNvC z+WF%@IkPi43n4;0Ks`M{x*0-^GK7oCAp?pFK1`~RoMSe@jAlV8vQruCUNyQ_7wk?` zSKe*|!4ar@VSA}!ThlIB*Qa5){pu&HS!a)-{lWL2@o1486ZK_!!}FSZ>vyUPIOX#+ z5d3~J24Op?!f!oNytub~egnkB`}h?eh!QyX6&^LbNuA#9vH#N_7IL|#6kIDhLL=be zEg3Cwmw{A(cm{&T zPg>XIWX24$Mj_#^k2I91C@h;b$8WNVr&MLjEwgAUtSeJ2W0)6Fit}PF!K&1j=*+6g zL{XOUrqhNyPLemIF4C&hThR8fie9^fYg$yl$m!1|YgcPlO>TB-(X{lkN~X}R=GA!Q zou<9ZJV6*}SN_4WRsqzRGI&p$;9DxDFTlyPw6Q9rlo@E3tMN&Wo4eFs{1=RCUij$V z`8)kmh0fhTTiEyvRl90B%q2(Moh$jg7{NeQiy> ze!H{zbG7<3BcK}XE&V_1kFfGA7D^ODxn*@nqlp!{LhYb47zIUlV^m+7kZh^a7L1^D zvI?m^9PECMnnN$0hi^Ur0b-~QgEORanrv|`dd;ek$4rAgEEof3HyvuYoZ)H*;+TgO z8CJY~4YDI^7RD7O)m&2h2K`-4e-I$1zcZ*K>Cd7~sSxEXc{d7-;f z5Ykr56Nkie%=z4_LIA}H>c81e$%ey=2hjqzTxoO0MDe!J&PE@EmX49jQJJg?HNw;B zHRHr)3do7CGDa3lPAZ4LAnpT)spnk8(ZiFz$|F$1m*A@!qCPug>Isp|MPI24i>jp~ z((9EQ9W#Rz)0AYT&ZWOWKBNtdNYYm2QytK$o-_|W5j7Abr&73(MG+Ar4K!Ij=nKu# z;SNkveY?Oc!I|Vta2{rb@c50#p_byn|_tu>Pv}6YDydl|}X#4oZW2 zvq)Y@8iG5@6c3?uu4vdLSBq23P&qUSvtGcu_qgH*?KfaT)@QueLx6apA97FI7sXP=foe zmrEu7;%Z=yTTGUsHsjR(wU54xNPI$hLFZUOwh=uhZ&rLammOQ?w*)}?Ah#%&K~OZc zl#Owj1OCEeXt!ALV7LgJ=MVbCo}<%92WX$wCS~Ins}%5+sb*C{WoOT5*2%sgjya;~ z|A#;k?j~J9qB)Tku1BGX=MrZ}<%Z4}i$OvCHv_3vtH_NZoK zjJljjt(~Yh%aI@gFnM*e*@_*N190p^@w5?SjRMb66N_^3EZ#Yoh<8FM>Yx$+mTbp$ zjQQS7(rs2j^54CJXdkH|$1&$wPOGDvm^@1o1pl9~!5&B+I=U-f_M-M&r3zfp2%TH%Ib3lz-^t)+Z9E+>W1Bt1`B}rZ$hZ3{0n|nZKM9O z$?_1+y}fB2$zEzE$zC#46=0E_4x7-VXY5}<+d!g2+Kg$gvU-Xm-A9DBZz+bZ*zDTx z$Wfb93))oLQf;wKi5JBJ%$yq}m42lacy`bC9PjFg*}pCnqn@dv{k9WiwCC07;6n#e zJ499v3YGQ^WyYY=x*s`q*;@R_ai1NKNA}<6=F8IvJArr{-YbdY#{l1K{(4l$7^7We zo~>}l=+L8IJ`BhgR&b$J3hW!ljy5F`+4NA06g$&4oC-`oGb@e5aw-1dSDL}GOnUuy z)z1W)8W9t(7w%OCn_~#0;^F)xic6It5)3h);vuLAKFS4b)G;Z$n-R&{b6h@yGxGo> zT-cq0W7~n+qN10;1OS+*c>H$(GoKq4hGG% zL&XJG$PDQ6K^BD#s_MsnlGPE+$W^B`&a+Z+4;`*nyKil99^E(wW?t>#V_xYWHLl2} zIV`uiR-__g+<&m#Z*4E|wjKY1R2mCm%k2ayMSDw`Rz_KA!3P$uIbB`dl`3&A zmT@gMT@ZpAxBys8zRtgoH+ebSaVA)maP?G1=G4x^Nw3mV0?qehWL35vMI~p$y0hGL z6@vHf-50P~uoe6yY&*D)Ekmi06LF!Jqz9#7kMvWexYMbAn{}`{3ZBsd6$5jBCujDp z<0N?b*1%T<-_Nxh`lKtla|FFqs7RZMtjHAwZ0Ck&s{x`#^S?36BNQN1JU^0f&TRoC z$}c)LW7)-n$CmAg&n(96AycC4!4_*D(~HvXyLW>HORuI0;ny$f9h{!Ud0=X0x%{l6NH$ z?lttWn}DQL521;-r~Kf$N_YPo)7H>3gI@Ivt}GnR=8W~Nn7_PE_3{sRNn`R~bs`g1 zoTh`7o4H*TRp7VBp=%>&t&Cd*Ny~@;{C)P;62d^dipuJYUV3-Dh<#a&AIxtrmX42( zYEH-8F3|^nY-=yw(?^d!hTojNxr~A!n$Ao+2mq*kZ&>Zm+BDC*sul=~!LUtWiokIB zxc(dNwyk&5o;>WRt)Q-Wj;fvuvJO&DLPe%mt@t!Oq^VsoIN0iTh%fh#`-{Ha?a8gf zj^yA3`=_NEONO0Z?}YVP*dL{T}v|A&cE7$_0G=g;1s*WDQuRcq>cJ?z=8b5&i<)=3ELSW%Kff zs=my9Q%8?aMxZeDq=RBHg*&HnIeQ_}X@oh=f#?C^HSg?1dwLn#wu(o^uANrRZD;H; zYbOec$#wJB(u?w22{gV+zb~pv|Ag!q$N@^|6n+FV5-X=lR$jajjeRh$1tjht$URz1 zhw)(ksAr2;QBXH9T#A$6V4PsR7K)){JQb?79o6&*IwDPZknNqySIa6pwcs)~xN81I zKc-GmzZ$i(8RaU==$Dx{tD@4nph-V*=W{Ln97*VEN^F+u0!F<%$l=K`ikIp#<^Yt} z{rx1gk>;rVccPIo6hD=xPQ$PxVwl6Cl;YI6iLf3!aevhsyXXZovK#TOv0|*T+^ii5 z+YO`u(SO3@ybv-DG)w)E;@+ULoj_+<;mc#iW8{9Y!99vE`HdAK=Utac&Eq1uy!TLgOS-C1E90Am)B{Tiw z$>$Er{s{snLEaO5@u&zqxE@v;p6D&?u@40t{#VNA&7SZael};kGEwnHgD4V5RNM@g z(EL~B=A8&?pPPW-fTja0Oi6SVtI_(3ME!qWLg-uK2afWhBn(C2PAmUyu^2h?Y402i z9P03g5$1#etGdUUo?#skjQ|$*()ybRGMXM`-2?jjThnTcPV==7sg$k{GxYdF+S*zz z%dtBo(R9!7SW6Utq|wFpsKMSAH-x{WB|Cz62A8!p8!kHz1tM=9I=M&xqQG zz17xBW7t?Q?C%@4YC`p*za(>hOrK&ELyDQu{5ACOg9noZS1SGh{-FcLy_W;nf$N`N zGYxdIzy7mL3K@Kw65DmvPH0@&;T{y&jP^AsaYENi}q|A z3}l}5V?z_VvpHf%CkpN@IK`czOuLPY=yBUf8Q3b9$X|kEiYROV$`T8T7ZjFPvKhbK zDYxzz99JRNzsx0f1Y>IrIQq9o+W(TsB(ZtN@4*)DMGr3?4~Jt|37IBI|7oQknQI3X zAWs`45xiCHga9;8+W{|!Yy>tic?%SNq=3EX@z2Mk!P0dKG0NCHNz0*F-a z`7K?6d*D4ri*=>wyQyQt{_t=t95*gB1|tdTg45fR{KmKD|3ZuM$QlkX{-tUkq@3Qd z-6X|jEyZa@tuxB}qrdlJdc0{8``%3M$xl8$9pUzkFa$Ww{Jocp9>;5~oNC8o`3GK& zy7_X8YoQDCO1TU_a%#Q+rC?Rr`r)W8CdpEe=>uMYDx6^46V_1DthgX`6CnF*E+%bY z=GYih(DizXEVFDuQRPQY&dc2p;Pwo7L{I2r3;QV8IEPg1McP{PchEUDf} zbtSAoBMPt?&Q@{fG_3a7gzHl58O7e(h_F6^rKgU=a&(^WpgH3U%`tpj3CMVRA-uol z(hA)(VF{4@`k@PREUQJ_8w6CcMW4Pm06{fw^*>aMH%#ik6lD{{j~nT}Vw=wZ(;Ct& zi1nt}RmOGrVHP++5;Z@eE*lkdw~?>AJL_Yg!~p*adS_s1`_oT1B26S zt&1-4twO45pMl<5B9T;SLH9Q?E>dBXcy@5k-{YQ5K!A`=YMYMlLOYc(+LdC<@@UIZ zxq%vI<;6P)=W4nRb7nxQ9KGzXsOjWs_3V-2*V+r}?dAZA7{7f*>^PxEw|6+WS0wAs zen2zj2cFKIr`~Ai`YU|OR4%DQw8uM=|g2B{;1Ho`mx@??e)rX!p$MSlA70pKVcvZ@|fYLpEV~s7G z>#?88yv{ekJpeJL<-?FY7wf10XpS{B4}jy{uc)7esm&J1)ZYt5LI_{)0BkN8Nc}ep zg%SYD0Cub3?KXLY*-dYntrghE|}%?RY5i3yVcPFlheiJUMLIr=Xp=U-^siywr8MF^JAEwl2uQ$VIfuDFPisd}4W2ZxY$C`2`tBTA~ zG2P62@*~(9gYmO6#Ya<1TG#3rQd0BwVyNP@Ayt7B(h%z<@N>Iz;|2VkT8T3`anW@3 z03^F>TCLS9Y*sY)#=BX5!LYD9Z;z4QSOL2^Zw~0e;OutRfp)Xu83Yz~srLh8rR}fp z=#yHH{&=!mHgDg!b;9K@Ux99VmQ*K2Xn%gV6YWHHw(<_uA&($p}$2U2TIs7y+ zM7X5Yk#^wpDE4kQZmN3&VC{!nno7wD2`bEeAwS;W6>$oUt#~E57Imre?b54{c$`tHdB6GMC`IZWLL(%j20Bh zW@}9_@4EsYT$u1Q3ZPWkvYxUX{6AcsV{;{1w60^@wv!dJW7}rOw!LE8wrwXJr(>&Q z+xFe(e7mP=RLy@dYSfEoS{pC8KXH4kGf zd``z`=z(*mSdLiXj&Y{>&akI{IMzo@tD>a^<(r*Ssf6Nz;ZsaLra9mcD`MN8$2`!w zj#+BZCrV}b_c=qEqt7{oF$>wI5*0B0kP{DNQ5_-V9dZ<9u;vm!(L2I_#p*nprX%tU z!{;Gb7IuVBg7pdB2!{X!ZgHqp5+?drImJ(UE6~P2|C?+`E9th5QSv!}?=L}=tvcFMQuyE`=pek1zbRxBAFdgqqB#0~EkA_CpTe0`e$i(eyMD!C!D0SjSaixQMIl zQ>-Dj?K($9qMGwhRqIt28n$`*FH_6v*JjZRnIMxz-qVe_KzSGY5Ph0$(^e$r-hLD4T4m@eV#69bG7_fQ>o`!yu97p=$)>fb; z&!>)wS*Fj!ag#iKWRWiC735;`@XxXFT)nniSe~^1r0v?bQ6_Fokmx~(-O5D{7$d>R z#Us$PxL8^}t1rpnJ@#E}+O?`@a4wB;n{#!lX6WlOwo}C3TgP%?N=BT*FrxR=JR(g$ zJn3EhTI~xj_mVxhFImqt22JE`CI;B~Pb~*cFE>{uL*2mnfeKb_aYO6sDC{Khp%ba`v>+M4WqY2KK4@w{=P~Tzx42!1yHniJT#~*CHF5|TVC_n_ z&;r3b9d!f0;?+iQ8rT1N>MM-D(HQrU-WWU9=w|>nbeG#luD0;ayPj`4=&7Ik$Z{Z3~ z!oob~d$cMHx9;vjAfJ{XC6R@pzkLW4q1ak{?IimWUVBKithq`vKQD14&60gGKCCale{X}Ft0By269l*P6r zuTm0E33lN!&zezRh=5l@mQP_RAR5sr^}&4j;(eFAj2@K*7>|(4IdGb4yB%g88|TKZ z^M@nOtS|f?{!z}s#}S=w{R0`LbVP{k5xhlw?;F>N1tIByWsnp`Bg)hb4sZR>Y12=3 z!#Anh?EEZFm==f$1I@Zw1Y6-%6aE;!l&t#!4vB-%4AfB{X;!sT(jBKx*-5qZn|89Z zK%Is6JLf#w>eauBET9VUE&>aD*^+~!ilaiM?p&mM&kqY3D1*5QUGBbUOI)=eY1dMv zJ=ybPA_VaWPE1+MDhiYq4$DfAeVIv!IP-*#v53?V-c^a) zG6p$+O#_1{V`nNcS`{^%iBn8Oi4fO$#Q7x-$tp2dRs-etYmui-mt@P{hh?ldJJP!? z`!i88d>h`9rIRd6=^pZVuo5}3zUbAX>~uzA4C%servKlplCW0(Ta+B&Eey1CQ5DDV zf2Mk*YRAVjE>){hi_9poOCsx=BU4gQV)kovP|^v!npW_>^LFUzYHx;MKo!BEj7Xy9Xg-A6>kWs*$)aMAWh^_0Fnx;eR|2;L0ZjLl*+F1Moh4?D&8h6H6jJQ+OxgwJV51#)zSmqvRnQ5 zz~62JXPCCiwK9W;yo9-%7Xka%OtQeVDK5SGr51}$q@i)OE>BHgfOFiV%SZ5E(VC*q zYujoHFnnF^qs^WhZG}uBRIs4{4xGP&Tbtr=RJ?=4?;IaVA9Yzp!}H z9QDT#L{7Y?)r=m^ucWOjUuJh*FSmqL?!<1x{iOcP?l7BCorp91#(gUNGIQf@1)d1lXx(RAI zhm*TFNYgXZn_A}FPfh;WMHE%oCs8d+1emobQCt@YTjxcWoK81LeXY~+9)^+UOmeCk z)#LMg9G1`jWr;WZrrR$Gwve9&X+lKpB~*OkxAEnRpO&^BwsOm&TDeQBlvTv^nuju5 zyB8jH2{_Xtz=1n}8hD4nhhZvyxynbGz%2iKM-8|$N`wX8O-Toi=&@x087+joKHd4@ zsx+@?mPB(R?mMWCIeejm^dhs63ARzdm}jsA(O)QqT|m}QRWm-(Hzh#M1)wVV%1iJL zg(a=;b~-ZkGDk#mk1~G*z!7zGrRGL-8}=VILi|%;0knSAjJX1jZXYa@^cU6K|NAIP zkrpm_?r8?!`$D^>c>@hwX{b1l4f&cY;wwU&Q2vPM9oGB`Uj2&haf>bY84LFfn>4P} zUwt~VVTwui2oj$uGt#`OH>|MYjm8`R#n z{C%^u?$@fW&NV}iCuMF`&DU3gT0TNA(vM@&mV$M7yWD^p3 zN996Z8he29k4NFCg+9PbnZ$<&>5-W0fbtK7!ePTkfP37tvtUFQiW$|1%XoEZO`#0Q z2^XjxY40!DruxCn-p%m|j1RfInIaROco}Cf&3zhkkBHj&Rt=WZ_VkNJdliOb-H{>p z4n>c+XW~q#1M6<*boFS%=vdUE3ndU*iM+EFUvAM1=)%}A49e~^iF9Tr^(nqF(J^n~ z49*I<-WXCZ`1EG0hYOd%nsoM{LT8_q$a&QSBz;#S3YCwj?)0mjn_saa@O3c^sMqwF z!ZcWHQHCT~S|SVe5eVTt=z64&T=nI)wG<+4e2@}Gp9#uWEM+p-{L1PUC zM9N-bN73qWRRpT*YCLuK_D+uRgFcwsV}^odrD$A zI~cJDK#5qb8UPL(A_=P(=)Z0U`Aq`WLGuPhE^-isi?g-0`OZ?4kK^MyAsY+mxqt5G z-B14#h=^(sGv*CF8}cd}Xwl*_z1KEt!uP`_(wPBT8=FmK<+VOOk}fZ4Gj*{W-MSmu zygps+?d@%?tx#Fn|0(KF86C^QEgcz^1&!sUz|u||p8_`(gR(h#GELI8FrjSjfNCc zYJ9BHx9555<@$3ttNMYtIMa?NQe?V&_luijx2?!gBJ8tg}l4R@z5x73q4 zfZVtX0lZOzVV%@yTg!w5oMcYuMfGrD!RFwqChHhY`G22|vNLn!6a7VRi4gD!@Ae2K zT6A|%SwkYp{k$!ki4db&5nZ!Hg{8dj)h57Z<$r$9=s?;uzmx54DcKt)m0_ow(XjO@ z{}vbrW9)Fk2;8-9>tkzX!IEOW7lMb$gf~wwZgu2{whBB$YvW7BQSPQZQDy~)5Wh@8*P!VrB-YNi~zFb27ia7UtoAd`4C|JS~iU%&Qw1UMjN zC(CRqwMFj@{DT5Q%Z!g{RpCq?CpzVQqdKjxHQ1xa=u_EKr1ec5)TH;7hvWIn?hs@&K~48_$RK3+ zdu{2({Eh&7HD%B{)|+9CYaV^V1<$`JDFoj0UB!kwzCp*vlO(9kJe-Iv4aj7J^fJER zTEQS`H@RGhfs9w?M)S`;LliZ`Qvu3g2?r)nr?wT^cRJy(wBCr0MDqtRFHm$E%-!6g zMLRw$2+YPDN~0`{Vm}H&to@Nr&fF{~L0>m}Ghn>Vj81s`EIQnE@l@Jse`#}N0!!DL zkzs?x4I;fLH-LS+=E9Vl88}Td=@l&5&xyb1KaYf^1>c=cC+$#bcr7(`-gQsjD7Tws zxszZy^8Sv(2%nbY|4UVV<}>Y_l1lTjrKy;Y5${ej*V%OT0+D~Ec3-9;X zs?8%af6+X@s}jQO+NREG?W&1rhl(x1!Yfpt@?JLkH~UV_9l*DG6qvuakx_O+bAq=s z({A;t{jPMtJAA3|O@KE~J3M!)@g5`5KHrMBrNC_Vh4B|&pimlm=+i4!K-R<3m20bD zzS$Ki+QfH%hnUo)1S~{GWomug`!{WD(v+ zuvqIy(f7nrv3AgZ=8rf6?es-84@=OK6qbY0wJ-G zL(2?kPhb zZ{|(D3#69jUn8s@S7FY>F%&HMCc-%c24`6k2TkwB}T>7a66k$Rk>2x3dp&D-EP;6vCr%iE>GKFx;(izH3Le$SQsp0A%5 zm-Se9<@jb?{00JSx_;^KuDtmei!?oLZDoJ59(**b_6Y`2ZP$kvK4#2^Lk;B5oCirY zRlPg?{iEPr_J_ES2=O`sJ_qloEFsXBDQ+Z4sZubH45vc)72Y|~@)oVTzXL$U?w#*n zclYx8f%j*|f#eOo&_;}Am3`vA@XpB}-9L>H4kiQkO%r&~{%W@YWSeD_%B5+F67d*j z?Utu*W~cd#8x`Co76I~a0hZ}GzEOX;;hDT#z2m$G4zcHYIefxJIe3HizO!1pDziPE z*|lfM&rHZW`dhSY#7rpieqo!w>m&7!e)!(++5So5!vv0pL0Wxlkw z;_!rN(U5yR9=>CNO_J%S#)QEl@X^i< z$-v~-byW{BRXav4GT1VHt3jrFK9-@DZunt&iHnR->YIe?0!h%8oHlN&$VawG{+?<< zoY3lysffn`42Anr(od87p_%kBvtEl~1Jq51oU>0Cs?E%&n0t{t#)ExsgW$H{YuO*? z(`4X_deFhMU*%36&*Y&?o78sAOZl$&98gl@b9zEa>Ul`Eht&~4&@b1AzPD7{!Ati$ zwXVr7)>u0Sv&p#{4{|Qcx56H> zF?_X1-NV9Zi{jD!EQY!op(nLS=XU(DmJtXhf;wDL&4dvd`O>zAaBzN(?%law3sn1p z_#_Z!M+Gw0@Qk>REY&5+l&ECBG20Y4{6#618u0a_FxP38r-^@-!(PFvJl*UdjdBDn z11S4BYW3AgDE#Gc`TX_x<1XiTCER)+z?$_X z7n&6Ev$hKOggBsrg&CpBUpqPE1~%I*WKQW)@&B^`ZW5)SBHYAX27S#;6vo)8c5BcH z!iREPvmG%-xk%IahqAZVSke7KH%Rm!>V_tpH`>bSS4Y|tT-m!g!=Ni9VbK>Rx}WE8 z1ss1w(!|#dy?b|&w)Q0+&&lInD4O`WjJ{*tN3GHw8{8SD?rdB!ZRgxa1F<=81)1({ z2JvQ>m?i8VI<$}9MmtE)MyKN(H%%Ec)=3jmP)K#QS&7qL0o;%>!jhlVO3 z&jsJtdo5DnGgt&A^6{Y8a8ne9+lmC2B)oq7mWC?KoKbd`r)Uj|vMQx$o%)qPrk?b_ zW1Nh}Mw*Y_&LN|blw(R7 zFqMcuihIjBcSQDyLEoxd@%w52JEp%6+H?S#HPt_I1T@F@jW@935OmoG zE^SH~5V5=!n&E+yvOEFgM<8j%Fift}(j53d3V%1r9NT`}I%2p0$%QVx!#G2{NyO0x+|GF&XFcta601En$nx7I1 zQqAX}hG!*oND@sdrvXZQ=WU5MOE7QtKbgX45%?B?waqj`sNjDd- zUTH|{!iKvo{j~L-X=^?Us9D+2O!SG>$w%in^7zGGy+BMpnFr)#L4Zc0>7HJeEGS(u z(RiPD!>0L<(^-m_3%r!)MMdobk+T+6rOX^H>@PRjP^E3Fvx;U$0pz%a=(m-W6LZ}U zX2QnW7lPQm!-pgsRh$Rxq+tS|LfE_T9hZ*a3%%5EE8!rlmCi9s zC%T&Q39zQ(krY&I&{y3pYWA%5nHIL{j;9dmcaU{*@}l1i1fbF-HD&(6I+spEHr?l5 z6XUR+=CRY)I%wupKQI4-`6@A*Z2p1C5}Q+EOD4Yb@LB`10Ghl=YqM}RO`lWgijdXcY?-_PlpTe z5*pPp$8~kOI0r-}EJwDCeZBX!`~Vja_Xl`%VEZe$l0N#Q`pQFV5Kk9_nkJD}iNtEl z0C^Kr-ATPgZ(oeg!%ExcVXg|I_d=BoM=ZHAT`5PDZJr04Ur3RdN~zCSJui+P?cOm? zZ_4uvSbO6q9^3ohA?X&NT{--uRs)j1^n_QP0Q$3&rxFIzTz7O`nX?jRXhg1DeB#5) z(GfV1DF?0?JQ|Qk@MriD8NQBaWeKv2Q%Q{4hBkh-u_vne>zF%J~@`u;J25*=?$ zdhu8F1#*^Vel)g8@`n!4w}b9O5MZ9mGr6l(IoOWq9%{A1u0kLk75}< z&VTouJCQe<1WILdAsGA2MManwFz@+UBd8q0t~Z?>7i9wlMSc4rIngyRBL7^uYc7hA zBHUFVhg$Uoyx@ss=>vt^E5y7o;$7KRvv{t|CpAnB&qk`W5$c_mfC9N(b79uh8{1b@ z`%f{Lmb-*Z{$${zz}Myib@*kI7yMEizc6;Irq>h1)$KEnLBTf!E}{B15VVoV)p+aT z76}rh#zlkeIT-ez_6b@mR`!5_WT}T{kciOQ8yX_<@OT6_PmxrmJyWnWqxT>-Aho3b*pIl1(z(06k|pbILiK8h1e<%dkjsXB~8Vf{m4 z;ClZn{kzSkl4$w-j^Qx`(3BIce`g>_bgmJy8*cgJ=8Ty6LZs*o(tJ?TUi$1Et5WlE zPm1hE>IZ@-G>o3sf#8sEAr@8W4+aYgQTPkDDhUV$hNQpvpEmwC*qRWQY}4A92_0DZ zmPs>)&dZ8l5)X-zicS159QB4{Zwz=3=NVHv+vF*NB9 z1yz|msvE4PVio9vx4?D z{ZQdbB!aR@k>T3)149tjYac!k9CIDV$2WZDZLI0o-b>X4G9HSuePIX}6fDMrw_{k4w^WTJKctikHje-7u zn7gF^^f9vkrII_IBPZA9zyVn%O~I^a3h^!RY1?E;v_(46klc%M2I=TV%+aGbx1n_|{GwNit$QzspH)ZRKc+9Ky0a-Mj~~W; z9=1QW{@mQWZ0CL4h$4e)g#u@U;Tecj_=E}U`TnGM7>o{0dU4MT*|8>hhQ`?UB!zFB>>~9<{V@O>aC9U~Une3IWIR5R z_5_;sDvxI0ns0l_QeF?}X5QNM`1(*9drDI7dr~8llWtCKyo`HdZv%?+Yo+%2`Fb=5 zKSVr%FvKu>!KA)Y5&sPD zuJbS|=5`k){vruC`iTofuv9tp)kTGFd-$o@dfQ&XgVVImF;1#Xx#`I3vul#F$qWYb z%LOU(SbQDVH4RnT>9}Wa7hO`?yKvd%M<7B)^-9gvI0d9NpIMkS zRT00KAyowFDZ=SlDLo`s`r?978R0T>hJCU9`HXoWFBuyu7Ifhz-OU9hFUQuonGfWr zokmWPK)otgYn@!v?`Dtcubl8K1%*k2j$mrp>~SkW z=^_So$+T1|P2fC#QyVCNlVUHq?y@pBngYPoosbeTuE5F>N&Y)$kL=WDpkyH~cO!1J zMU8RHS*10ceS^H7l>?Ax-ySAEq;fFak>8M}foyYCs-;Rmzg$T;k1$Bi^ZQD=+=cv~ zbPGjC8@KD2%G>R7`kXxj(wO;v?YYy^+8h$cQIphb3NS8{p_AkYO+3 z@r-QEvcg|3shClf+$g=3b_M|nrQ|lu+E$yX&=MQ;_k3cF{6!0wx6Dg;;-oBc9EN>k zD#NH0R)&||qCZOZwIv9erOFWBUabK&8^iW^&#Oat0LxZ=F3cTrBau=&v4cK^>5k@gj#zWtyXj%YL_X!h>bYx@JNuVPpBwJE56w;HXl zZ1;k@d>8+2?a%T+rZv`KSlm|ckXJH62?JJAR z7ldHyEgPiZ7!yX$7!&3vTs-Y7hkx;Id(DrB6cEMyABU(*M((X7YWt-L#i`S$!5}fl zC#oXNEBbfMF4HSLYC0$tY1Q-u&Ykz7^Eumbt#?%(T*Y>yC7L`~p}oAkt~tH*7e4Q& z$EWB(at2C8c9em~sOw`1CvA#}IOF9Z2~%FBmb4G8IYeC!Dm&P!zH#Jna-NO;Qd{(7 zATVoYNg}*h`Jn02H$^WRu1L+psWjwYMr~!BZZ{afjMr|Rh^JQYjck*m8ZE0?)~vqw zSAykMDOKwNT}~IGR-3e435!bEmBPlvKn{**+>sru9y;ynv+RdQX`cNo_%uiQyM~gY zkNXTcZ~J38fc(I+Tg@T>ta#K|CyTKv73iu?Y3>J!+07C?lcTyZWvw|?(w33jJN{5- zynWxvFsqw231<32Aj^xVe zS{qBm^{P2re~|C%4rPHF|F>PqE#D4Gqy(PQqW(YSb36aV+ngr7;Z^rsa`1CFOVGl|5mBdB0*q*?%XBXPjPm^A~cwh}`D~ z?6gO&d^<6m>+l5?;>v6BSph|=1uthK(GEITC3RddQQ6I%I8e=$ZwLj#N5a1>8ivCg zc9PxY9k%zK80_2>^XcdCV4!Dqbplas_v^F62wKZCbfyb7Wbkyg+t5R?jVp_p=87)rAsVG;p?@}0DhfjF2KY=ur_sDRN5Z@ zBoczZ8+*l`4CNsWF7`5M9V-hSSKJz^0xO62%BvUldB37t{XX4Ba8~4nB7(_iRUV7C zZ;UVO848`?$wGFpL>#F1+QXS!7Eecu#h!577tuSg z6^-(>A_N+VK1MVMP=Fhb(cBTDWU#U9m4gz0I*3`Ekeu#d_-kiPg!qv3`67kym=Gc@ z4AmeEJ6{D5GT9l)0Nt?D)UZ!J6$_sfK%VCX&4dy{lH3oNgOFQ2La|}=(_+;?BPZhJ zbklwJ?_h@!#;1t8lY{2DbWMd63lRBe~A zUI018Hx{L;2 zP!4pmu_b}ynHxga0}8?m18nj=$kLnve9s^Ie^-H@{|7@7h%5N$^Is(t_dm!303><- zFJ^N8IbO0tDI&&}NbSz6da0ByoGx4z$_S2h1eJKQLn#puSq70^es*d-_l4(XJ#*_n zK*J}P(truL6NXuaq7uz`1IeN|p&1V&u2eyhN#=m1r|%dhlWusBQB&9Kj?1K#Hhvs^ z-dw2ubqArME!@rtqD~^LMn}(jgSFkP6{lq?QJpdKZ;mfckF6(uBjSn{+8(#`kG@;n zm3xcjQ0qycjaDG+MetaBT!=+z$|gzdx#dMIAswr_Th_kYiKDKk!&_UmUaRf(O6SR6 zzMcwVclitdu{K&Gt?B%0$DH%Ka)m`JL6Z#Jpcu<41@jFbBz1!FpuJbOJ)Z8kHKT}Q z_!}IRR?c>0&Nt&Qj;h!jwPEdQD`+lYT-#aWIWB5Cq~_MoaCWl~Jf%0pW3b z-Ku(nGC90fjj`rXh7Cc(Xf)$}yt?d+VM=r=6)FS@`OQ&6LV5%jY**8LDEo=q2-2;W zXLFz5Yj$C0KPF35%Za62bizyq5V&Un=D1ejqYy`jNUkEZx`7gG{jZU)SoHqE-`bUo zsxgy5URx|pOM9qlM|Bp2^+Otw#8?sx1ynFD)OACtwIT+Y1B}#snwfkd`ZNWUuZ1Dg z3J5J&JYAt6fN_#GTqdGv#wb8&nj)t%)0R_2(EHvf6Pta)r*dD@@=u{net~%WnTTt@ zjak199mId#cZ9@4m$bZo{wloNngnd}jm87j!n|hi9Gq)eq)1}J2NY6a=#-LWMACKc?Fn0eJgkvFVwzHPJSCda^P{jTCuDdIo7gYl<=sY)}+_Q3T%^*<8y46+?f*t zH^<~z8%7i-y{g&sZx`Wx(?%_9eB=1?F3Q=~ZWpcXS2{)%Z9?Cz?VlQHnd}xq*zI2y zC9dbVFHaskv)NGv?a~q}@_}vlro>|<@v`XmF4Xxq2O;^%wnr{e?a?y4zMGVO?J%x^ zqr6{Bq#9Sdib%!nZ>kG=6?f%d7)P_OZ)Dq)iWU>+(HwnZ2ea?AwD@Sgm6u&|?0uVx zHxW#~O1#4B=U!!E>x~yKjHM?d#H@c!rP-Zxm{VDkNw8W`WrERLYXUVKYIYoFqPj*A zFD}v?HkI1j_Hx{o@ika5m+~!ax#-9xYI>XIWkO7@)a8b3_C=V??O4fZ7soW&yvXmK z-Ps1%D+Tf_>unWrYEhe=B?nJ0+0j#f@%V`N7WrAJ=nVTZJE zu||VpNVe*I9}B7xo>6jqrpD3elbe=GMt4c$PzD=N*o1C^{TEqP{ol-`R~MW*V!kQ% zn+%OSPE%}dn?Wye?nKP0-xm5TJ80J_9&2daEWBpADhIPefDBt{al>tbKt)<2snTIu zZ=8K+!iMD>YoHCf*0G)b%;7n6H#1R~!v@As4^5D1lst)5TM3#`b+OnbI8 ze2bnPSnwdjYL}M91Q_*VgiH&E$IwTZ8S_za4*+yAgj5BfnG{is4=6UmO(6JZKUR5SgyC~B8+P%s38NFVIE@Q6rfXPzmilun?o|)VM7f+` zBdcF#M3FbOR$Q@j4_G#;NQenj3gRkK>d0ZD3{BN3G>@?AF2^t#o1j%e<=&-KcS+6# zm6Eq30rjfpO$--s?Bj7Y=s=H~<(V?^04ns*QVD^CIxlO0hb~rThyP*JH%;Os3o-J4%j@DjkQ* zLeNu35%fvejsqOEvSa^M)%+~Sb>V1HspK+y1Fw_zI1{Y*=POV}KhLx<6ibQ~4s47T z9GzXb!%Psmx}s#;glavT22gg7+Otqq7wiTH1hgtBRnI*GQ#>D9U4?Q(U=8Ef&r_)N z0=gyY`$sC*AdM`2lT31sy!%Z?Ys5TOU?=+5bRrov=-JL8B#s+Yvyd!I7ej~T!?yqB z0G*_hL^v2o@bg96In$!D)){V8(7HmoIrS38vkt=Hk`(G)a-;#YyjiDcdB0a)e+l(c zZm;JipJkXo>r!!n|Drb)#WeSzW$q%|2m4c~$7Z)uqb+w8Cuw%9_w^&^?xo*ck_nj3 z@uxkG#F&A0mw=OGT>nKcYT1XP=j~}ze zn><9CpZC;te(7Psr&pm%h}d%@$tGvUmk74-*flv?d+qOAVh6;i))(ag1T^!K6{7w~ue z!|EGUtV7CwfxW&=hxs>+K1hz!@B+U!ly3QxjW>KHQcY2c$WirWOqv|mZz>>sCYc8( zb%Zcz*FDj9+sw}1&G{$)chro>?Mq@q&LmDOu;2mtO(FN?UjNt5^ovxp;t5fo@QHzU z;@Re6YR|x?3ORQ%4G;Mm9#`^!7H|`;Xumbak->7ftC1n_fQOOC(Y%4vPXoHvvjLG> zc8D~=@;n6U(W)GDu&xX|!V_A-YIzVVtZDOu0=ci9mBwRhz zFqbia8@GeR7L*&w&8f2`d^!*4v5n9uA^pY1j~onD8Uz=Xti(&Y5Vt=jP7-gF6G4=5qf>o$TuBF<{bDQW z0b?DoR%bxUoO?s<1AS5!>{}@}*5I}_zrca*l2lfIwAeWp8$3sC3 ztEe~-=&EHrxI++EdY}cv7fZKqiMa;iYSBl>2Oym1mZ4f5e0y;F2GSZMs^!hUS$x*a z2x9lgyVN0Mf+2;s^Orv`y{3ztYA$?w2dJ!1D4*;^h;JGzMmFu3ry}jIu)6VTR`}{ypXCA07t@KT>O#Gs%@vd7>me@^RA7eN=#Q>CzXb-L%&MZzWdOV}12D8!Qm# z!NxL)Cak9k8f)TR!7r3e|{Z$-S|MS9FN8DrR3$qkh}! z<`ucgSNcmAQP!FnVJ+dIMQmR>##46@b&ruT(WY`9yt%YXg3x?K^J#|)6Kj>n_;2)0 zm3y_Qk*;Ud)nT%?iqrJm(>i>`eX-3+%cjK$o3rJfDbTKEad5T1T|O7#9NrqHu~rmt zN#ozS^(SDrA zsv(RB8@C1~R?f8Zekms{TPVD5IM3Z5td7{^#dnE0>oo=gjzot0pc|W2-CS6Sq_xY2 zKMDYyz&m62bzH&UjDIx#Y3dY%4v<=hB-68UFkV`UdO2n=$ z#L&BUcq-2)V8}*ybjF?kFjFJjt1T<@KGe!$-^(q=N1LgKCHaX=4v=|7;o~<0rzSEhRMu+*`oOKW z5?SX<;N?sF@l6-Kc}=7kTvS>_d~#^UkwD#!5W!16`VLA}O#fomaSk+2EKlne)J(XWzpHxYn7?p-1nR=c# zTBjb)7n*)FYNEN|o3!YkmYQ&hI$^e|!bc*!!0>rekNz!DNYZ#$6A^S^LvoH_P$Rlp7@a zv#OyyvAiwaMX5Am9pv?V@u_5A0mA!KU|3&r8 zpROC7?dY#2mr0fJZOR46^c1;}+FVaQ9q~Ysb}-iX@Fj05!hZBw3NZdz=k&|W(w7ht zbW%mADXI^t)}f#^V80V&k3;4+rO}GH9b8#W9#VgsSAjF*maJdH`dPzgJo81_2Xj6B zJ?M*!zA#+fIE5N^f$!-N9dpW~a%ubr zd_d2GxJYsVk4Ts)vAZiCi+n{SDW=MO5zSQ=ui$AD&S~!p9(aku@VF^KE&Dp%D0f|I?$O6l|8FC5g+$-iz8m9mo|L&C8{W5`2ds*u}tmk?Njg-NH$ zuYOT^Z6+X4k3hP4;z6TETdvNR=lR#Nrl9yIl_xy=)8Zrf?T?DGarFi;1Ez}5*}eDF z*k0GJ++IymAM%H#tFlzTmafY98Ox-XcLSY8SwvFPht`ItUu$z4q86N?zTuX>LiAb= zlK=f#yCxc&orpOyjF0y`XPSLU#kcRfrbv8KNQJvbMg)Z051D(nq^I#O+N~k_rE3^b z7d~@V=<*_xEmBf5X;pk)FMi%&)Db#b=!dc5kMQgRc5;-gb;nNfstPyH)^Ix8@L!5{ zlF1VP3$6U7zVU~d<_qiWn#c2qxq?4l>5EY05pwrj9OV5a;9Pd1I5*(JJPX!(wjzNZ ztk+_oHW*koHw&sj%v}q8^&1R8`YYHU@|{TOdBLH70I};=UY@EUkS01XT#dOHO5)we zAg~vu^3FrMVKr&i1H#u2m-wJuqWB1}w_x5H(JExSxDp4Qq{9U}k>OtiWp+5U@H6vL zBilZ%XL1Ifs^Mk%ad$;&xX#5S+!T>@H@Oek$1*TUQ21Cg<@w+eVAbh%`sIUJ;&s28 z&b|j-P)*TP#fmBIGS^y9D=0=;SE@SUw34e=<)|rOh7_X)eQ7I@l7#=2=zL~?Q_zyY-NH*)p__8 zXl=T?l&$Mk;T~zeH{2`IHP5}e<7FBv*>4~b*qco{T4Fe{QmTwndm8vgt**DfC7CYj^x4(3e#4BnUZyCm>k zsypku(lIZ7|KRtdLkDg0(`D|@fP#}ehZPFpUFrPB%_3QBQU4Pv^DH7{W{U;8ceoPy zV~^F5{ZZp<93x z9h#!%4@8_||RJ`FEIb~EFW}a)A)E--&5iii? z%}-rwtJHPYM=>hb??##Q1)hIGlDOZ+-FDeHJ%>og3OCN~H?Z~H=Cn>dYeGTf&^G!HJ;=j{ObHef}gi_Ld zJJ5hmjNqRtez^0*hgfd>{R0Zxyw&rJ0*4)#u8s9yzg-C?d25;-n4+(`D1;FQ>!(sUC3!(_REC? zbP^_^zyPg9hK;2vAV8PR6|A__<*1qLq6$Eq8l4S6miweXq5?a-nHN^HdIY!f_-o@u zp>Y<5g14Q{Vq)T-cj+<(iSIn49(9+qkL2C3?9iuc1&4aE89IqL*f&6a^^zfQ!1XvI zfXQM>34_t9t82$vL;XRil9PbsK+TGPzDy#&S3cjbOdEm~NI6t9>84uAq4u_*#>l9q z>VI>bQwUr-2dEYXydv#&S)X**ktfYGV57CIm05Omhc}Jl(!cnjYr1cFV7GftkGncB z&Hn2ZS{d3RwD9IFW43<+gepDlSxb;sKMd4%92<=IMHrjqXOhMtmgBT~)AzY1_Q_Nj zw@j(JDHekRvv=jqG7SP@l9|N~)7YfFU*pUw<#ReCAH21<$J61cB~wM-4wnZuf?!x8 z&@&FDqPxuKW1#{Qs|nwITE(P<^g=KYP1JZt=8t1#dyQx~P)ChKLSV$ir527yem+}C z&!-)ct4_`<5j}3Z5e_5){UC0`%OIs5&V!TEOyxa5zGJiDegY_wdbk620d=Q*!#?^i z2(l5VjooD9Z%&w*U%NHIDy}RGVS6`mlYp4y-LVW1;yhH5ADCa|jvjb^77b)wd5-wz zEa)Y94>QRui~kZH!G|4I!~88=%0&5G0eO<-nmHrap#K1XR^grjSe|Z|icAjz75nrP zACVIcUvi7-|NNp!+-;Hwr2EQhS0&}q%-04`%he-MLZ%u)DE3(ue zxb}WfOasYLv|TI5YXcSpqy`fNgeG}+nlPF93JI91>1BvY--xvJTv2LSv#U(gM20pcy6m*!qT-REi98kj;igw`RKd( zC~Lj(W4oNOhm!qSdy9MN+v(nUxk~==dUOJzzjMH4O1xV@F(@m5V@h|b4a{J?WriGBkzCCt>v1AD;OO~ud zS+hiL*0B>p#vMeuS<-!EH+B=*GRP8IgoH@h#@K0WF;|rG%kOEr_vJO6f6jBx^PclP zbLRXpXXg8SK7qpH#M2sM(~zwCG;wtNyn?vMWGJEWiqBj0IAtfzk9VBXz_y~AHU6~9 zecjKYtN>+acdRx@uVVO?`NcJ&LhT1VM{@&HtRG3?=|2^Z60B~K*p@boc23}r-TbaD z!>XBP(u5m`S#SH_8J3gct?H5V^cvy_&#begx)Yl6h2xK*oRO@Z_Bk#4%g%EXE^a;b zkdlQ0F~ST`@j9*Ukp#&{yF1LU&!?+q4-voEIiw6U1cY^&#p3_)YP{yLY(Agqbw4*} z8(ZHtUQ70I_%0rD;mz}WmdC+0xKo3QFeYCmLt{d-lfmT;q-hFyBwF=F%k9>_`t!PruazqK8B3CmUW_dDa zB)FO$wiBn55}KS%KJ)C|1^w#z0|)Q6S9)z{ffONO7hcJN5)R|W9vdu zoyY?Fc{jh}d(4(E0)-LvT6x;Xw+t|wZ!NgmE6k&T#;PUpagBt@kH>C#&)1QC7t?o_ zAGL6{))=~`ebD+i!0lx%G|ZSqFsmA;M>fkEdtL1C89?>1IG+_kb(Cs5{gGC1!-(ON zM}(4=p|PQTfWwU^_usPnyyi7ADZw^bJ=~J+bw8SzTDySd=E@>hxg8&3{L`~}(y3Z% zTbEOv62Z1^`_1$_4C`-6(Z~G7_vh=SAG#x|65B2UCPq!?^i5{&D_Tm_eSWw1uIHig zn@TUk&u!KYG7rm4?ApX8yR0$1&ey!0O9w)5rKNLOWZR)+LC!X^mE!XjZypOQMFo== zmvnO_yf}T-26K4YI!MOfmLivK-8F#=<~6fxyZh< zDenbKj-#aen^9$u0nf~#{nX>NLw5e4-uETs@zK<|UKD6Yl2Ed0Icys!G>* z`dZe_AfCIqLx1P1+N6?X{7YMGtt7VEB{zz~#I=XoGkH}LvBRHap207-`iz$gn{&4{ zh&b+cohV1@otped*^G;Fg|p-3hRt5gX+$C`FV>nOxo6+yY`w>cwW2^NMP27@_Lw}y zeaVVqMbe^?%#osXsOgU-hFW-hvZ9_)GLOA;>wpBC`+#W8jq)h_D@5#SkY(|uF!^Be zvpDxpLH;k;0&3`IV|#nk1OM7EvmXh2`2Dis?iDd54f*uw}jI5THWNIpIqj#NNJ0^2-^Wl*XFz;=xU8n9fv&FLCRIMSj7Q{ZWQ@hZc50(s; z3m6Qr;uqSO66T^?IXs83+G)5t6Sk}PG{2s=Wk-sPcMR5+`7w%`ajV|Oy3(43TSu+C zM~-Zmxa(}^%;=3m237SDD%R~xy8}xO5~CNQrV)Ltrk&z;N6jZt9)3}| z@p0saOnkL#elg?UO_@Ig`wP$CW^}0K&8wf#eIy++_>C90jd2LruH+s%w`}ihw92os zil}cNBDANCIN?G$uC+&?1()6!CWQzL*!D=s5W4p6HKG=QYwh{gCf&{3AST zrcNN5Ph~ju9%GXq_H!sthKqWX%||#6QQ)I!eFR95MgKL%q5H-4IkR`d3zHeeKHiFy z(u>-81|;aIADIjbIk)%244uctVlG#1_LwwztihjJ%A5%KqOMyC2rvu|l#eN|91lN5 z=Nt%}c-$Ej=SrDJCxNO7n}28o!M0qw?(~+_vJ6vZYt6Tye z6T%7!VXP5SO7V$#{fL1jMC{}K@z(d_t)^>op*uwbQ*~aco^uJ0YYm$`n&-3CT0M4^ zFXv+7eDBVP03x6O-dE>vRE;nbk$iI7r0?Z}g>Ni#E!lJJj2W&fiz6x=Nh+D04r|@# zfX;@vAkD%`Z1>BilpnVOI0lkfdtaiv2ozv;#fqmZm`>4^9_7-NWrc7gB~{=VO0r|6 zi%rTpc9bR18A3{*7gMjq+3UOVpKWMM)QH+;&%Km}>K;^!mqB|X7TOYb9#>(mT>XWq4gBjFX0woPN(1n^o!XP zq~rFHG`l8OKHGr&=M^G~PMXO+(xsUFhg$FK8?}<)`m7;V2eyLo#pS zkX&aXT3)!$R%e?x&V7=z5>efncx|Ql+l*CJ5z3#j#p$}#Gqc4tP0QJgNXW1p`S}VFsL_g(d*5kcnN{R|e&8PrW zKTs&SOM>;#Ax#=6M1~6G&d35Z&T2GJkrEZ6pOpa)9IJjGsXzsSkdS{BB;hyeOv! zKFJJDEwaGMyunY48gwI|%#ti{pmXrs)Mit$ZQHhO+qP}J;Tzko*tRRSU9oMal2ljs=<)aX`hJabHP3$5o@<>0 z+y`6!4c0*S13}rfE2|m?1cU(-1cWwa-VZZH@dqxz8+{Dp8!E4*e5J^>D2lW|f-j0x zo<(~QnFNO1pI8`Gd=Dh1B^mL?ab$;(Lh-=8JXtcDpd5?J1y(UPr2%wU(aZOC<-9lL zfcxF*)xE2UIN)87z5VfIhVHN5;|_d+;QhP>h}{S&#GHB~#GGp3!G^1MJbr%lo)4`o zc_%nvPRltX1nccyRLGDVhDq}twP!iOEwD#^U`j(>W|X!^l(A2Bq}thVpjupbJb$tJs_GSbRy=NhT>;2vm1Jp_7P7}k!J11JV$6$a@ojwipW`qx8>vXJJ zJ?zdA<96Wd;j-7&y8wUZb`0vX<7W{%()c?7O2Z!-sp^ecl~$6a?0}R|mAP(@jFxjh zIhxOTBZ1C!Nb1X5dw}fW(aiP!kXA5QDScnJ7E8 zW{-~6^Pn2k&Fjj}2Ckjx{MvEXtEAXY>rYahfIyx>Hw5VZ;Rj7GOVwBeZnpy+Dv>P! zGjqds6s?W0{q=I8gany>eP?xNX%WZKX==PuvH9xy+WvMz8S6wDjx)_Zewge9Gq_0k zEAWR=HIJ|Z#=i8{dR{C6TMglt_Hv?R_Lr}FzoWzvzrxeTP*T{hrUn}X4n&;~;bm)n zhjTJA;7Z3(7NN6M_mgz4;=Ac5MkX47SN*K1*q|LqUH{umM_55_r&15}m{Drjev2>) zSD%5XQJ(QP3Kf{R!Uun#|9FREeI%^-Jz|lJy~g+~DJU z@}jhnz%n*4U3{jH#O4aLo;oZ~;-*?!?e`q^m&_*lUsR@Vuugr{mlw7#;AMPBJq!28 zFJVD=aoQsXXU9xeE7pV7LVn#q{p!VZ3%Y7}jE47Oc_kZjN{$2I_Ih`Hid_gb!z77k zLEPp?R;<|(jHShvV>3q;6{-VZbkCCwhse5}9x5_xyKM(xnjv^V-XBsASA(EHumh^r zu4uRPY+C7=BU8QW{OGSZAfm^B!Ait0-jY>*sG>$R-+;7@n-8id2AU2mHkJf0=Ox7L z3wA>N`?)k>o~;OBOg*l9-c&2Ax>sd#(g1YY--PWe-tT@R^ihOGFOUaF!s{7t|8@Ch z_a_pXzZ3hE9!TK$1W#azp-gEOQ-WuU#0`utpn2;A8trA^l6q$YQF51^@s+gh=n(ox zoxo50I#y^dUD+qqZWwdRChW+6_RmN-hX4{Bk=n^oC1Z8WWcqd|_FqA#1Txzjttspk z$qnVX*9wL95^mN zFaghCQlK}=ONlTTi^uzFqhx1MtD@5q52vJ+NFxQ!u7FgleEERVM{9Q0KxyV+k(#!U zjP{AHSQz$~(Idp)Q>buZc_HZTh*;6r2LVj?1C+I;u46gWXMuJCdyY<=&+h zm4(^0&>UeXB@WOkTUHnuLdRJ}V^~#YwH&^#l%E<;i*sXUO>N1{m4ma@FJx=_#Nw;< z>DuvrnXPe9bTKX@WWBobWN|7oK=)Lm*uH{jQz)jjk}-j>shi7zn|@FwV-hX@U0v25h!EE-T`2>;fbnoybY~s9BLR+`KF%Q zDzbQ>Qv(mtg1L{<#PeylU~f84G=c~OVgw9kph^bB%mbG$j0Gi*<7%^`biLCi$6A3Ua2o<@&WZB%x_Qab`4f8RYu2zo&RGMRxDj1!RG($dfM3s(BZguTy zLQ~Oa_37Ex6x&lHa@^$nGLNS@^H2-MXqXBgn+7g$+NPHtFwcLI4Xtep*>ku19Ga^p zp#I$0_;mELs}quj#0<%t{k44%{7sS|V3?G1-3ZXqJ$R|-W>adjIc-=-Eg~5@2km53 z@Xnl(UkDbZjcc2EDxRKDmzlg3g;+`NXn<32Cs&Gr8M9>iNKNBkYED;3NV$c>%@2(7 zGuZSz;-4HW^C9IKoKie9{tDcJelMU3LgIin!vgno;{>zF^|F}Zn0+;$q2u1o;iwNQ z*ah^oyIql#CiRE(k02Ch-UkgWPBjjbKsFW>pRn$MumX$j zqFLTNU8r{i;*{D$hD+hOUa3_r7*l8 zv!m^zk9RI`jl^J^vt>t_yJad>q#1C=@BvNJ3MPiI931*tyGN(dfE8@a@$)+PFz%6ktHtd^7EFEspL&_D^Xzo&X6_DQ78wf zz1psXF}CZ($`6(2F%C09Pw5W0$pQWGyoi+#B$=AsBzZ;_@JF(*yWu_ba8?#NS)qv3 zq)8|X$tO8<*Cm-6pLzt=@HH~~Whyl@SnX7DTU)W*f~rdggk(W%Z<}b!YT6ltALyJV z&W{eSCYIj#IUky_2kCU`3+UF0CXWJ{R8hft0T~UY^%aGF@Oo1BC3Im`#{kkc7=7sS z8CyJwKM+!`5Ng(Bjw7C=YqBjR4pZ2q^G&dX1t1Bk9B9@gNUD)hE_4oC1LkMMj*Bml z!1|Cs$=oA49A5dB(J*y(pS)A`;qu&G&y}CmAx;G$aS6rh0|Wz#;j$XWiYE!A`t z-nl(heIYdB4%$A?#G8lH%12=MhxWT30nM>+I;h~}7?yr1=LE_C8i57|Wo6{sNQ^>; z76_DvAknlKbXXCYyWKW}OVJIAO$mR9f1kA z`gr)*`~ttfA25CqYm&2*ElP{2i^7qjnqohhLcekYd2ZllD!}7e;-T;lQF}5|iT6py z$l_@r6W(PRz>DAk+cMkZ60X498M-8S!#MJ%S_YjdN(}{_^tcey;R#>;6?L~{leV>u zPbWCJT!zM&*IJeiG+#{cHEvY+ z+Lzy+60#``hEJ4SM{BO+Om>~)RW=p6jE0QoZkC2X1^f$hGAhP8_=LV(#|^Z~1k`J`5Y4{&kph&!7&$xsda&#_|163LJY#sev-!dySjv~soVP|ZwnwS8hqE7eW=?jZIr zi|q0V2R4CbUK!WWlN?7FFNm=IV8vl((EGk<62$xUXcUio))$cnA|RzW;>9U(Bnp6*3SvPm@L)RUplH%j@jDW74248VZ*?j*TrNov+S$c>Dg~fOE1Sik8ABjAeJthLGdbJHnAQl>~+P~ z#8EO}Y7Or4mzgHx>OH=BF}4#ZoI}bJDIC?5J}a%Y(U;mvo%ZW1r2&8f2;ee-6!*6Q zFsae|^`2GCb)p)TzZ{-!^I1Vp@Gyr_M=`Yr)@w?iR~9Kw1~6sAY<}DOF4BFc>oH<+*sWy5S1`mn zF_U-HR381t#PQ`v5doZKTAbNU&Q!FVsUhGIj1!oSU@eSlp5BJPTk$s@L7bUstn`sLU5{#Kyg$T}jmaPaIaQUY)z>ik7Gtj+=Nj;AU=gg&6F~`6+*>>bh zaKRIBVV{_t+a0vt?L;AJae1#NN3)b4T4J^{&oTSdK$>TA&jL2srV0Bw&K~20G=K|j zcmh{_ur7h{M7$gy0P9R^qHnt{2bc55gi`-njR>CF3==d!!^0k-~D{^(9K>;EN-H(QO zcZVNtB+4?UGKW*dGw=#54>WJ8zmpFY%WPBA)rS~ zPf*sTprcOzJg7evUSu! zamXo{%o5}g-xEvC$qkF|h4Yc;6zl5`G@*CeNRuDYY_Il}tj5jasMb`Qx$ZH!@Y3k6 z+vHg^XC|{@Ma$u!yS5RwTtFrB_OZi>IH14e>hHj(Hr+h7{XhjbX zmagNjzDdLH2|so87G^T9=ht^OPok%n@-B7JZd+EBohHA~h|rvTnJWJ-cH5wU9a3e0 zvh1;5>}1vXA)efRhiI*5y=m#|(c|RZ5MCv^G^Vm~bPhcT-P#6llM1*B)Q=|}n#G%- z`-^P3y#>dghcZ-yeS&?^yJeObqdBxnZ6z*>=yfI!cY~2T5*cEWyWcUED2Q2p@DKoz z^OkzZ20>xZGW_|beg{&(M*r^H<#dy|iqOg^qS$Jzp;gQ?*iK&xyqwoSNqVV9;-wY>Bspr8Ti;34;h$o4MC1^b+y{g*55ZzjeWc6f)u8Ng9YEkK>jNC-{Gs}VJgcq(_Z-0ggT3-5t0G)sPE93~qXib;- z5LBi{NKsUJY%s)ymtC2A6uR|VkQQsmlZ8kUrOP}~K7(I=^oSkGxQw1GjA0^MV%;%L z0MBEeSY!ch`*juR$+7!jxlX!YaQFf2)qaVx6X=@~yOIY|;Q7Tu&urcxOemAGWQ(_% z&%;!GQtn8uG%}mcAx~*me%RC!O0xY2>NJ^*f>P#Kp-eBx45d;fTDndGZeXa&yJQ*0 za^P$+D(OSmdXmuwlJN$mZO$v0QWU^gG(CY-0dir%z;;(1zsS?Q1AKQj86wg$o7 ztaYCK?g)FeF_ehxGfp3bBUXIuApba`PhLixgH}sI7BA?5T!650fhsDPJussQVzT~L zP5z4y@!x}?g|=E(0Tcw}790dbGQ|XgAO(pKDn<8@0#K@EpoAuZF5va2QMp}pDk7RR zQo~vV)0?F%tU^IPdpV&b?6r{KV$U;U+A#_+^7mH^Q|6no{|gb${o(8lWT=GQf!OKn z7SHRJpQ4oz;O`yEFG^0h1{E6PX?mV5jwt~=Im%x9VoS4;QCgDzQhy8wG}fsV1JO1V zcM6lDQh@)v|NL%>uhf-KE=_w#{GDgG=1DGP^8y_P>Ioics)A5zUA;TspE3o<7$qF=&{j!*nQi@J1H*qy&fRj5}9W1>v(;&Vb7tAwk0(9 zX1sh-ItRzL-7*><-FadFS0C!q8K!i%5?|hQ67tW-8Q|}R+f@|t;Ic$CbWHI!seIY3 zIe^OgvEl}gt)2MvJ z;gtLYk>PVo4kG_^Iw>~XrqR+p-OR`089eK{vweJqASd7@vpFlX(jNH;^z~{Ws{A6+fmmO=-OL;THV; zus@QT@>O?g;0>5_oN7s6A7PvE~9pb-ae#N05e%sWJJtWYNI&ELSq4mldQ2=9# z`vU(jc>Y(av-6N3Ae1N|AOimb-s~ZM${Za5pr%El7L$$7&vy&yFYxq@%bWY6mo25l0o3OGDC2c!%j@--0`U3x+zz69A0F$wMN$02 zORhsol7=%CP5jV;jLF3iwdX9hOGcD6I_cCYPwEqhIezA^T%Q<77F`*0GiNr`~`L^B*Mo>e6ZO63)@J@Fqo>rU@%4g zBQ>m?f}iZCwpg7>R&Sj{rVPv+iupA-bbx1enWI+;``7|Oa603ZVjH;wL(-z&0Znn~ z5H9}mw0MTe1(!`*@n#Iwq7e=93k5VifES@sNo*bC9=`!3ii(saI8k~MU(3w{W)7{j zUX%$8JUix+_eX&S!K$iFTT_!=GiOa}i2>Qlq6IhOcG@ehjGEgLCyOEfv2W?$yv1pA zIb$!pW<8rs;3lQ>&p@Cd-A&~|d{)*yLI7wXBAv);-Uzk8`9NG(Ky@37L}C>qfUd6e zgMD-F76jWB3f@)Y8FvYnC7_nl=kLP-EIK8{+(i0@Bh^x9*Ey`dUcv1SFbl|8Wbv+X z+>Dkf5qZzB{ae|1+de+rvRmLoGeaFkTUW>|t2w31FZASyo~G8RV~8!DIzpA#uX0+B zXHtKPVE(#Qq>@_9kejW*=R5@qa7|1{-a~8>5rzd3_~-AbzRQ(`p<%kc!Q>RHp{|e4 z>=bO>kc~5O#H+3iU!9SYvvKvKb2bkFx_(qz&lP%RPW6rF=4zWu)Z>aAEaQj;Y>~C* zd`Ky5dZEUEtA5d*WDQDWo^GBzYRzxlwa^Miq`Dkc_xcY5)mpuSg>3PXOZ9jr@1l63yCA+^HtdWt8pJ@|jO!LFGFVy}u}e z`9~i8`sn_Hh=0)wWZv|J88rD}5%(K@m0GQ%LFkt2%%nt~pa*fxR4_oZ&z6)y*p{zV zRUn*J)hw+z%(U9$zKy`?{&d8xow>zdcD6xKtAXOU=+D5)B){w~17M;fWPpO18Wz$F zPpfrhxkK^mad29hK&^B(9#oyT-bQm*N)ngJ+l_Z0NGuDw{ zp-TM`@@k|JAodN{0HDOHmUqiSZjMZv*}sq(&f21cTnsw7^9vEr-tqJd5DV08SVD{1 zDi$GWtahLiXqnw(&tZ%5tDgmLru-2(yb4vjZ(qv5W3bNpeGw|#&y9OFCXZ9)J-kpE zU7p*%^z+d(+ha%34Ov~uopAsIdP(*$g;)#4oa*b1rnr}r77$-V?h9Y~C56Hp(qw%F zJ-9GRmRO`9g&Z|YW&CcEAca>8NAkmzX>yoQJ$j8rsV5k>5eX~uOPh3OcqOcP@HE!W znPD$aTWvp2dkyt=_;I>RMQkU?8!MSxIJ-YV*9F<(K+HWl zfgi3a;9LjJw*hu7#j*MvUvvTj?%W@Y7tDdn`!|@JbUr(@HCM^e?U%fAWYDIa&pXU9bBOn4OH)GDN@ z!C859;_}Q9pQ>Btil0}X`c44zc{qF2d0_zX_hEycusnBiKQCvX`r0HMy7gwSAF$ZS zf4Z#M1i(MwK8bchM%z_W2mBH^kcy2gXpsAiRk?@jO%5D#x#tT+1?*|L3_fb5`ZvWq zwB;P=M;{(_5>Bem&Y=Y(Z8m_}xu_*Vz#+%y9Z{{#P^mEPr}wM4p+l^Ba! z^ZK?EMLCCHGQ9UQ=|*cl&?WM3mGivfZtrv-tEkKkF~T?3@IW)kyU>5Lj(oVUsPtcx z_4F_A`2Q#Cc#iM@d1($xOUmeDf4%UwS21vCBNODsH^7<@l1M6GW+SkvvW=Msw6IpE zvu`k+_=@i1oSv56L{YwJaQt!9grhmvmP9@*uZn_1YHeMI>_XmPyjwHu}yYeQF zQ_0X$d+18Ra;isQFq1C8Dugvb=j^7A;-)T z8Kw>?m8MpJmwyhH10(K;hEnpTs$(9>q=neA*AeB=PclT})o$W0;XjvwlPGlY>qu$5 z%)3zAuD1jy#z8G)yz+!myes)LwIeKJcV+cauP-!z^ibZFRWn$Jj$HJypESxTxMs%E ze>(K3yoRkWh{Z1(r;RdLwaI*MJ@*htv`fr3Y+B?*Tk zPDkcp8W}1Y(Fcpzh&?}(5E+Ov{KJUC0zOyyw!#U|cpQBM6$~RJmDIz_zt>A?e1Af~ z|6Cl#{$l=BDx%hbDN2}Z!EU`yxISBGo=t!u;mK*g=+u*3cL+3ENWIM}%?^ecw&te5 zW_gC7GXcN&qcMoFNQF+E_xAt!FLiJ^!K!~m5C0?j|8;M>92CSQE(aatshs+g6eTnY z+j75!X?mS$FeESvi6JCto$$s|$T=AR!@b<75zp6Sfx(qnco*g)2L$0em0$*S%hbZ z`hR{Vo>@$__3*(XJr3L%zu&`(nXgo;G|8N=TXR&Gd5=~jJiw>ohjP*CYcIY4@=&rE z#Xct5tax4~5wZGoHx3C$T0J&7M{Gm8>ts5@f6=@3W}O+RDSWrtCR6kTzz-?+Jw^AQ zghRGphBr~sclWV>=aNiI7*K9ul%#XN0L_Sy$>YiW`mqe0N2Qjo%HtZJGoAims7@)$ zVV`7E#JR7X+f-JNM5O|kGMDB732L~GrrHBNKs{~ch6)pyDR{TwteT!X`9@2aHM;hy zz)X{d485vt%S>Lv)4<+}VBK;W9_yDArFAvn1fa4uq#NFBz%4(=Va{dR6{#y12G{=r zw|<4N=N`QNPIBsV%3PzXvTM0=e~VduZDwX>o`Fzcv^N#4``PH`*2NCcyi@AwT4&G9 zm|QqlDoM1640-GiR+*aX{SbyyNP-J8gwrG&2ECNMNaZ=;{(?ag;EJ`c^sO_m6WvU& z&KW{JWfJLc6TN_=I|p{1w+xMP3IYFTI>ua1UA^EfWIRHwk9uU_fq;KOET5Y30Cfb1 zk?ipC>Sui%?L`3!WtAX6cY{lOm!ucULQR)dG;3^!tTW=R%&CfK(}|8lW8zmCve^`iz7gS6@&q+I{Bt&^)2la;H9xqXTQ2Fm}r=k9Vqrd)7KLHr%9Fp6vDyI_5UvX;1dCZ4Zv>} z$ryCl=d0hZ1NyKUXwe#Ps)wBY*-M@Z=iYd)UZvQHuDZ1>wM;%h{+pgbM z)wWWm6In6A*7gjrvMBF64|94eJB^eNp6T@<>=JdtS@E8V!;aO+YJd^DfZO#Nj2wE6RN-CJ?_k8a;F8f z02oeQBD8u)&aFG<5~D*;8i7#oOmpg9UV#=Hc*jdM$QC3g*sfMlW@m?O*WxO5{6cd3 zX`ejZ3ysbJ4C^osr=4^_<}DyInJB!z@Tf3ms3<=>a}YcWQyM(IagxaqV5^+3PRm0S zETO@Ck9QOso5yG%6F3H6>UM8A{s|Z|+TQZKdP_YYw=42PI*Tz6EO+ZmT3cr0cyVA^y%#9?eYNQ2o-rbVekn1#E|tto40;x zKcvM&tt1g8<&8v4kVLh!d^QxbXF|0dDGpU)vO-C0#it~lciKZ0=teFhq38x5LHsW3 zmVFmKm-vu)H3_ccBrwtdF@;CkT(u*-lG9TC+)?U`%n}V%SHy4%WbPm557IYD&Mb8X(*P4x^A(SGZECio_ z*s4!Y947&NIu%xz8-5lJC+fEw@NF3@KZF}VwjNyT!HaQhw&u6R177I=cCNcov*|zL z4sKxdF&uJN0--#AC2sH_I?UBZ^j&k(?JP9jNu0gIORjh@^dCeLH$b;*K7N*MJdO03 zWg(1l!uXMI1#Dbp-GNQb85mVg|Kuo&%$_~6i#QO^jCanlgwna0MXz!njj2i_|HJs} z_=PkI8Q(iln)~HJ3Lw0pE`T1Vr8Mlqf1NhU=NF+#M(tAP-M(s9~Q+LW5xZ)iOJ z1(#je@5p6<(pG|a2{2uPbr}1k+3|h7!c&*6_haZcaoBWik=N?>@fi;aP7S7@xAUHE z*hn#x0M}eWpyz53`!jsehk_=6+;mtHtYVJ6*#Bs${WS;Y4k*=@q6a2jE}Ldvd@0RS zxX`!b5Q@(M9e0b9np0*xXq zOmUzs5|0}@2Q>f4|3$1sI>jOXD0tKvk4p3lRY@W&oln6`bg?^p6J>&7izET9lOlGX zab=n`!tbc^C|HpyPT>Uu^0LO)H)a$kVN8djN0gI8?-Sf1KJfI+?yp3OdW5L%Xo^b` zM-xA0ssWRA8Cb_r!LI=Mg}x9d6v2pyq`XmuCbQIADUu&UM+(y3T?u70KO-A&|4XT{ zLZAkCO1+p6VAp9;8U0(41|7~VXmgnd1BDA4Z>1L}mJ(G#e%vx-V`ztQzJc+0b<0!o zFO`x1!Z6fdkiXQ2oeVkK#3I=(r&9fodAGTn-`|gqSV3Sd4(2M&Nn#8MW1JV>rY2*e zp^1L`GEBZQfJHdqpb+Nd(mlJ4WVxXMC9@+r12TU!qw#5sgwj-wc}Q4jdCPPT{ETF?@Uj>Nt8%IAvk(o0faQv<++d z^?{2ephHKDBrzhm2lOkIhqLVJ^fhW2TD{@?xA_z1IGCgR-Mf!ATb5BBTW z<>EuEG9#_MtNM2?NFkdi`!x|invBmdf}BIi01*t0GdJHs_i+SZoI-BAG8E|ROq3vP z)j<=o%JEUO_Grn7S~%HV8Wa8z@6Wh1y7J9Q!l>En-QgU_Xmy8*^8Q#kxl~)->TA(v zef4ykvNXkEO(it9N^k|u9A#!R=ozZMO&PvT-a!#AIvk@yg9>dq<99g@HJO}R_J^FC zBn${l$A3ZpONaA}Hp2G5WVV9>0TKG2WM-Dsf=RQmWE$xFjS!((M_MX8>^?*%zX2k@Xy$a~*t`>n;%zt)IZVEq<~ z$RxOMPxD>j_Q8hmw|rme{S85It?&?zz~@bM$b^9G{?s3TV8Q=tjAaFXEeu^N=8ZyX z40~c_xY(@6`|CihpJU|>Ln1%kpy&^U(F}GKPNAjbhXuMv5@>(yYKiigyZ>OGMJ%P6 zN9rD0KLEWk!=(zRo}03Q@+Ww1$x(hyc9g7A%x$VaKU2#3UIk@}$Fg)IW%)%Wof>;q z)dV}iqeWM|E{}rB?0kv%n5nObtjBU?8ZOOJiT;=?#hpXeQ3kB91nr7!no-pXBb$a> z7i04gJV$ozM6Q2LI&Ob%<%B**Zh2eH^OS$-D*&{gUcDd7rb%0h4Ppuv|5*CM8+@|H z5~qGbwVz(ilVPn-I!lIP%bdt88T^TJug8iaNclGU|UAFJt|9q z96;UBx%57ZCC@F?B!Ie&(}=YOZsx+anhH%RudwPi=BCupCc^yN;saDfMU0y8boIs7 zpk`aQh{3}FhRt$rl*0xyw$*YLcH|(c?8af)PKtR^_J`a|oAvZ`_L{lbdYNPFr*2X%M5x^>k$K`6R_9iuS%>}$6YR!#e*x(9F^Y)fT zFJ8NQ5QCBlJJ?pKkf;nIXHUd&=BF(MGOOXAI9`0fqW_X z;!=^x<^JJaZOxT6?Q(J8R_XS*_D(i!;4!rv3WyX(?eL!^JdCE1GIXA;nG^FHq?vlj zk{WZ5s?kVJd_$`1_cg{ZiIR$V=z!DI12(eSSO-FRfl%V?SoULOtY-@HdHbTJ2|SON zSp-@bvu$}3baxB7TUSy?$P3Kk6b}utoD7@wj_IJYb6LpnoG}AYeTX|~Si6l`^agE? zPUQyM^{XM?;R!Gr(MV@dYC|j>=}a4nQ1H(1dPf-DnNK@BNBHh2obBYi34l?apkiBj zQ3xy+A}Y!pcrGQI2#}4{3KJemmHleLygC|QHAH2zN-TxjXuigz$H+A2C3G?ygw13v>_}Q)=jIGy(J;k;GZ)u$c9OXKm!Zk4L{=it zOtz-}!cADTgcd@Ua}TknHh?>i=Ah>2U!GV}D;)Qje1rwu#P2Z_|vpx0h50+0zWP@{TNcP;s0?A5KD4E$zWB(1)gq8MCVzJTr2npH)Wk9bQYzkJ0{|s zfSgN(g&S=+JF@WcLr9q_Raf|}Xg&C?AUuSv8p+*(Yw?O;hFO?VzK%Fb24G9H&7NO} zk}^N~6=L#03rmRt;CE-Jdj+sveP_3Vq$BS;uyy=h{ocMJ=^Ot%dEH;=h@gb8IW-IB*TzqHV`{AfTZAvjsWQMAAOx zrK8>Xt0X!Oi*?q+V4B^hE@UY}2NQvxD%I{*c_t6IMd3vi=ib29v~BMJnxMlYzrT@y zE!Ic%YM!YIz>0zJLuX|pr;SGF2?a2lx9c+nk@y`MiuEzQTDukma~(qgw+cq`LG8o{ zmG@7w2nz@&B6;zCAiNjq+mDAnAirig5-cQOOWYrrju?**(TNszhb!$iEKz`Z;n+LWu zM3sRu6IuFr$w7e;h6QO->}chMx_INTlVMSY5e5SOMoge~?tSG;Q&%lpRUfPI_0Zap zi`WZ*PJ%Ms-q8R3q;BeBFx79QY`MbqGQCMvEI*Oze3`^7isChyBns#+IESY?9A&sT z6y^2m)n>f92FQbl3RAk1EMViOCwMX^aul=@+Je9^I`v`2ZWlVuCYzn}(n4CvyE+on+*XzbWTn({Mq&|Lh!8xIr6BWqd4Y`+e(;ED! z8}OY%YYdEKpz)y7h4TdWYpcv~rcd%u#YpQ&4aHmW`#!ia=FXQ$k<}R8A9V=i7a-r@I|I}1Cc2k z$Hr64_0FCw9RBM@Yp*q6;_q^1fy4P z(bpznR@&%Kclg7aE87k#9EDJzM=(NYXL?PS6m%!s!P8 zt=)MxPIKMf7}{!W6SJd~s_shuy$C;q9?PW)AF(x#TrcHdIgSkro4 zahz;Q+4qLXxHZRNVdh4*uK=JD{PrYdb?~euzuzcniLv0(g_gGwGYE^SvMQq(|5*~a zM``!z@O|HDALpbIFaZACba;zWvX7U2?e%Vl;>vU2y79w%@?+mY5M-Ba+-LBhC$x5! zFcS>veT<7Aqj-Lc%i2_M#QP&@Z40Tl^UCJviNwemWb{X@_1W0?NfRtjkV@Qf z0QDZ+AlluNNsDoNPn~3VNdI7_u9L;D&6vjSB*~}X_~?M1gFOf zyGLns1g)gx_sIJxX9|0&nusXS)pfO3V_YTlcVb{ylxhIaP@laOTXBOyLN<&V z0}8fXRSSA4TB+swnqR~xi?rXWo)~KvS)?9PCHbg2E8Y(ISA5?Gg7jsK$#r$jeMn0Y zi*hLEt4TBVTVD2-7EFru>rN7p(dASs126pY#;EcVXcrBLbS{FM&(Nk|ZHJ&wKXJ57 z$(D@K%pBMVM==5Xad7u*>(NGsq&;$zuMG$V#Smi)v}DGU-YpX}))}Vm(lors^7a{& zVHRkf(o{u@;f$T2SW^m-6NbabD&K*Se8)Ub<5L~#JHuQ@V)`_IUmOoObtyuJzC1uY zH`mN`+83e`>x<(dBxj+`Zf2Z+YoYi8u_~*%k~8prXrVh``3XKSVW@?^J@^79zF=4l5r1YsRur~&`VroB>cy&XzE=IajU9avpDm28 zj?_Fcl8^d85er3&g)_fVA~K`RE_bu$?gYe=Bb7^&urdPA|y#{y*qP-Bnd!Gf@yZk>oc?|SUZ1E4fJcD>O|q7 za>m?fsDnGse3uJ6-GJS`hbSXZY5s#`Mw*4V53xznIp@qb*zj3J_g=+I`L|{AQdrWAXd}y3 zXs4q$<%((|qq6JC8WPVXH5ta?+pl4KsQVHAN)6gY$o+7}48I;a3O+6xm>PS9{0z4u z8s^ywr(LFNWFp&5?uF9bmsRuz_4(0@bP713{r52%w8v15Dkt5wKP@i(HDzT|ah~Rp z#xKnPWCRYw(Fju;{OQFsQ=QtL`3Mfo?$-ASjPO&R{ITCB`mOWi))ynZxa{?$HgoUn zrIFU1ea@i{sa&Bw8;8;@I0?Jc+&z0y>hOk>9VBK1CRdIG zzr2tP`Yw)=jVb&)7os6i>9}tF$P7SKXg2JsxuNruT+gWTYzo#rmv^2Ha$@;C-NUJA z`c@2=Hm^^`{iAn^&S`6t(}Cj-mO&i*a8)zq2N#G9Y5n#CFdwhw-*qGxZZ zNnM(8zlmYGE%88jxU7}B9R>4}Pb%bmOYjSKHY&Il~N#SFlVf}YJQ zEPU+9AOPD9{rANMT9aCS!066cpoLI24l5oWf6Sy&aJ}G;prH5R4ct54 zv;}C%13Kdhn%DLscVV*2`d8L}HwNH#CotTsmd~xeqwHd>;uu#x?lu{^uA_34rE%FR zynUIf6dY*pz}Pb`BjB_o0*+*i7sCp{#4z!^di6|YLhID}TojNXwggC0aI1~*8j1U= zu+dz3_z{LnOTRAH&r7LMCOm9*eq1SSI_Ia!k!t7D50ntNBN;s)+o2?CR{kp>@Csx1 zQ)vMxbl_TN5GTYkC1@275IK5J_VMHPfHhk%*`_tDi*I<4-lmOEZJ#7L)$B~Os(fJZ ziLf5qYiEontFR1G6a>Up8vXJ^m(XNqBQM8%yT5%yI<>5`tVdMrZ?Ma18!WMXUbM(oKC z;dZB286@@4LBTktO`7{TPx=n60%s?MqGVF3J!YkkRp5-(oFLp-Fef-GIMA1Kz-ZE+ z^2PWfK$zE)*Ad%4*4&@_g>ls{GC{UsH1VBtRsV2w*TUz5a9(c#AUM}VqcOZc{t{}Q z)l))30Q)YS{P-uKsQ!(IC{ylj@l$@CBLKqH_0*Px(ZAC%QDr+I)X|44h>=_GVQDL< z4_ZUmo>_k~$>~g*W-pu59pngseFrfKRv?X^Ros44k2M#HuFPge2y~ym1e`8@zrDZX z1+it${6rbTxf+Q4u{P`iM#ahuniH>J0GIE^&45qp9n{#r-B^*?(iTG^2_GN|*gYBPo&T~Vlmu#} z*|gG|0m(Xlf9)vPgRI#p;iaZG3%9(OdnP7<3dU73W$IDw?eD<2KgJ zgs$dS;DxRo#X3Co78@wp8O1S^s%D;SGmJHnA*{?c`?z&>9W-!U%;UfK;Q&jx83Jb3 zb3lHt80xjzvpFLl&juOp9VuGlG$B>*4XVP8auhtDuO8 zkdxIMcVp72m|D}oJ`=-EkpdQN+6j_vQy9uRIr%4Vuhim#wc9F~vFf6&qsKVtbT8G) zx$(=4bjY4EAeZb!t&n>8lVi<`|G-><8Q?Y)%$A97go3&2ZX%vZ5KUO(ivu{k5hYD8 zz1rs+;`5oLXEx5CwAg1$w>~km1qa@4`lu4rlUw7+t%=~_RqG0~uK-`%;1Ngr!x_&g z@D45*CkRQ4ie@*I(+Iil*Cz_*oXmT_874~CT5Aw@rquZ|{(`3OhTiU%FWrJ(XI|Icw^M z(FAMEe#t9+)LvXHG-_UOG=WC&Y0>+|{%_lO{hyx|`S-&Cq7>rGf7`|yyJ~nE=--Z< zIpG#)s?yZxy26{dpcEQ(ur_vj#JIS!6zJmBvlN{On~dEZ8^V8qf^W+ieP=04SVp{L zq8?=dOIhD!-@Xetc?&L*0q^L4>Q`fa2m6*Z6}RwJ85h* zww-*jZQE93+qTWdR&%;9&c)vUVLi`WbBr0WJ$0(TxqLxS^PB(X3S47h2m_CvjB zB7?Uy=zA>A7`#0RX!R2 z;o7Nr!cluI)=i!ozV4x|SQ56Da&V@1u$d0BagE$bBP#08#J&lWbU)&!rc7e3I~{2p zv>JsLOVU5L%K0_>gq*5Ae$T{uIB)?>`=$!3b6 zTBrT0a5kLQ{}wuon7oC4YIu}NA+T$WH1WB9m@J^_w9R9wH!9dFjqL{|-}QX`l~Cqh zn3l`wDa!&IM_uY*vogsvuKP^?d#mjpm=4Dc@jtCVC0q1*SB`!Yjhs9C?}@n`Bt1Fp zV*T}kFyfM_3%2|Uu2jB~*Q?mAgIp_l{N=_`YnkiB@F>4nE!Io3cK)#Tp1hpwR^E8& zT?YWh!J(*VRBJrQ#MaIz|88r^64~8Sf%j9(dW31rMA=;Cqxnz1x874+v$66THzFs? z!>mmj$Zc>4#u}6J=kL*yd?vE@kl`P%9rj6onBH0hFL0v6AGkHz0fhXAUYw?;=8zjO z^d-4w1n#wK>L)1HeTl&vRN_xr_q^N)2}U5M@`63zK0QO~5NWEMsa;7=N$n)3-j=$*Wn9dn+^T7noK(ucN@W9% z47Md5UMq809N9y}eC0a>Qbri^=ec`jhgpjp1}K*=;i2ZRh78$@XK2@j9-?26bFbfh z@asnq(O!^{o6ec_1i{t-BvJ{?!ebL+_4Fhe>?3E%7gxBrt9P`#0#IO-(?Y&j{5p?zJ- zoyysAuntO>Ym}of{o_W6edLMd73CSc8TRBgfo^1GKkPqlyF2|l6F6ky&M27V3#Ts@2vRIH*{iygOb~`f|oexMToOL4dkot;ZCLlfShXg?hY3*`P zTPqH5L{fWfRTDiz{0lCUolF#xtkXAcM2ktfHj6s;R%@uDQE#%2H2!*o^r=V~dxjJ1 z*vlm3mzr}qwm%(ZJYWoF$kB!uSiyQpxu?wIMjE1nUQT&lbxnl>89fa6JIuk?p70+P z2a>f0k(R0`6gy|9hk8(GZh+=nqjC41XK@MNgbS8@$^1~qzE!+aQSJtzD1j0Bk(-$| zIr8diKlRD6&y3?Zcm&d@o7{?N805=PMbXQz`|ck-X(-7=>iD_LI;WHRBk&Snp1-|3 z*rJ%TI6{JcYq$S+T?WWqsw-Zc81u)EL(2|Qe zE*ENq>O|eRvg$TDIrS~W6eq@WWJy@}de}C{sV=?BxxQjmts0_MjZPrh&%mFq+Db0j z*{`b?#d`s44Rzg7b12!*45f?JVHY3XgBpKIG8)Eh@9}$9YVy|DB1;jQpZ`>%?2%u` zo@dR7o}5LTW!8rFk;w@8hSLEJ#ygD5dMC(k4{A4urO9-M_Op%TXtJ zULnG0+8z1?5+54IVAqFLQOMJ0QAYYi`rYaUf=?M3=rOV;)aXQK=exsgN0BHYB&p}+ z{W(IbecGka*X=1FDGA{f(M{ERjkb^a=EqxXH_MVWM5r;8+Zxzouy3bwqYx(>0;(s* zxJ^-slyA3(pMbR%MJkp+QnW0|Cif+g#}`^&X!ib0=#DqIrx@rj#SBf|%`BpA@P5zH z8g0(csXG5dH4tJRx1cRVzR>=Rks$x(?T1hO*ZpJPMb zKvq;rmqeaa;-vxGL|5#bA5=U$i^A0>m`4xeb!P4Sbk>wj%`(~TYJTzextmh6Az11p z^E%V}*5^6L>#FS}=RViz>bL&aloKP$9L--P>Lp+fa6c6|>)}29Y%%vOpZ#(l6(e*% zb$Clo^_A#I(ZJque1c6pR9G~+y#=BW<@0c__ zx(vWc^}G8i0>8rE{m?V$93Ar1&pEpL+04$(fu&AiRyNp`3Z0YuC7o-M+uDG@mVm^Gfm67L>0tdcME^L5M z9;aNzjLZbb!1&JJd3U$HiOXnkax~9&ScvZWdV6uJvD#~8`Dt6Rt`yfg+v~x{^Os62 z0!PTCF&X>jq{=czY_Tk#sqIpsg*k@VUGtOO>g;w0E!yVx^q>%w5*yRh`sRj{s+|{A zQ)M++1AhOn*_!Ioj*hNsM4mtAaIV1b=ZELZb68hbNRi7lO~U^DBXrrn+fObRk<35Z z3UBue9b$sBZx8Jc?0+IkL=S&T@x}j0h|YFI$)Lee_5jU5^sQ?RWrBlNO2JOS3IWRNUR~Uz;ewb>#+%A(%H) z#f*>}gUf$=h7{&RH=%2%XW87=5vxQGMqNFe+LEr7UdQ0{&)o{~wW}(K53W*hPsKxj zcb%4P_K&!SJgE1n6E@F~N>M+__H-=p7-Cg!0~t6J^4_Sv-V}}@Pk`rFAW`sEbvXNh z(+Tkc7ZdOcU)DHwSx45lTiFwEy=H=(IzB_&OKONKN4y&1rk2|a>R+LS$8yQu@}F6M z=a@Nt*nwy;Ydk=!h3@6O`zq_z)RHP|gGR!OfG3?VIcCGYiLvY}3bEOW3$PX#f^V$v z;V_?w9>nDkEeJ^}JKd|BC6ua)Lmy+XE}E2_OyR4vrzcwXHJFtQlcED^Mz64=(#4re zBnG-HT5O@I4>W&2w5fYf>KjuTj^$+H?#7Pes4$85vIQ523WC{t$(+TdR!d#gX z>-!e<5Cs^`etP%!OIM=fG2glrVR4w*`Rp9I(FixK(tP5TNORc#=_E7$4h-Y=y*W+k zl9@j`^J9(L$xtRBXiR~?`VT4cVnpoEu~W2nmxA3AGe{9FXooD*^SyXgoG8In2vd zwy_A~#_d(@k~Q>d9JC<_3tCBkm?z^obvlV+87<(&>a`2mpnQR;xJgaDAsh<0%7*M@ z15=@nR?4*+%0lEmHjY@@9pMBA8-haZ0@!R1586ZB0%iGLlhM&+$)dosGFzNaE}1O- zP3_>3l$6LZnkot+XMi_+;RSYZ%-$eFSyv@MVzwElzOJ>%z1m-QoR+fGk=2dY1pRZ~ zohG-Hfs2#G78D2!gia-=W$cVA&o}p+SZY3VsW=2t^ANsucAQ1JjnRrbvPJ5|*%H%N ze1VJ>80N5iF!7Wu^g5H$R+9M{nuFud%5>W_%yByfyHjvW+^u>LdvAjS1R(xf(0}H# z{v{(^eo=nN8P3J%nz=D!d&Be5D~}~ z46>pkz{LOCYFPjB5(-TtFD{Z{yJlG|oT*Va6{vwiTo3rR;sK<~^omr5wp?OsMEhAS?(=bMc_|KrgcSOILA8 zal2i)CmrS5n){rG?08?f=u$>bE)8nzRS zR-At7_(`6UW1gH6x&I;!gFBtPfoR=zgHE7E-#}R2iNMPO<^9rraRAwDXbvg1Xq==uFW(SZ8Z|vW8mc9X6 zWX&%j|2~>q!a_GRuh~-5CidJIch{5EuLZaYx!fq2H4^_^XYBC*Vf|F^ zZ4%GMQ&K&a%6$3C_cd^A5G84?@6Gt(W`X?cPZ~B)8#o>Ovgd44&nTU%@a;sN*pdy) zo_wCs9orQ_1f_(FQv{$U_WdhA%(mpdEC$}F-JkccRQnX^tp!C1#wQD7*5)C6^X12I z?j$Y%d!TR|3i-8_@I^2`+mqTI_9T<{hlqpg zmcF+9sQnF9#W4Wy*P*vK^G@h;Amf}EYoyx3=joEhp9c^=sxLrGg`vf44HY(NG)J+| z|F?U2U_kV$f4xSVN0tuQufwaVu{g&Bm6DqFM3r%*Zb*E@1)0OknrZfV29iRO0Y;K6h1VcKwT!0*Za171EDtI+fsc@_|X>g|s zNk=>k9ZiZ0E6-{Lz%bU&j#34iXzzv_W z2D_9C?6=D=)@M#tf14cpSP_CZZ%J}Xf0&xQpY15NS`vU$89J3k;ZakLWw|a+-q1Sf zNppMF#yOe1wDEPAbLJ@w6t{^&-U#_r;o65=9~Hwp-A@0E@GGYUMy)A2`cmpuC`d$*xH`Q(~S z)I#_{A-VTwlQ$upw&Un*STJ3R3SNO8*A%K2k*2wUtpq|}{&)nn0b`9yM^+?Z1=mk+ zO0_MZYB0qslkYW?8q|d4XFKz1B7EPGyaoaeW=>7tV37Vg8P7eR5q*+wfymh&iaDd^ zN^smWa}TmP({jw(bfT=O865K){6a@r$6BUd<&vX>eueAMk(u!?Mavj8$KykMSd*Dq zfD8K~Hh(7ZG~pb<<_I*)x@IPgFAbF0CNnd; z(AwglQw8@c1&g4g+(vo)r^eALl*>f&SI|6l^EuEwmGfJSL19sOkmpcAzGQXi+8D|* z{O+Wc_>+=gvg!>I{!pu(M$`%0DGK?7GHTj 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 VwlMN}`%er%aGR6olj~j${vQ;P=LY}) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb70..fc10b60 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index 53a6b23..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% From c36c2cdccf3d24f59f41bf753f251f276aad5950 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:05:47 +0800 Subject: [PATCH 089/112] new: Initial port to 1.19.4-pre1 --- build.gradle | 7 ++++--- gradle.properties | 6 +++--- .../client/gui/SodiumVideoOptionsScreen.java | 6 +++--- .../mixin/sodium/MixinSliderControlElement.java | 16 ++++++++++++++++ 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 4163747..9398aca 100644 --- a/build.gradle +++ b/build.gradle @@ -35,11 +35,12 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "maven.modrinth:sodium:${project.sodium_version}" + modImplementation "me.jellysquid.mods:sodium-fabric:0.4.10+build.211" + //modImplementation "maven.modrinth:sodium:${project.sodium_version}" implementation "org.joml:joml:1.10.2" - modImplementation "maven.modrinth:iris:${project.iris_version}" + //modImplementation "maven.modrinth:iris:${project.iris_version}" - modRuntimeOnly "maven.modrinth:lazydfu:0.1.3" + //modRuntimeOnly "maven.modrinth:lazydfu:0.1.3" } processResources { diff --git a/gradle.properties b/gradle.properties index 3158990..1e253ef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.19.3 - yarn_mappings=1.19.3+build.5 + minecraft_version=1.19.4-pre1 + yarn_mappings=1.19.4-pre1+build.2 loader_version=0.14.14 # Mod Properties mod_version=1.4.9 @@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1G iris_version=1.5.2+1.19.3 #Fabric api - fabric_version=0.74.0+1.19.3 + fabric_version=0.74.2+1.19.4 diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index ea76733..f10ab98 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -13,7 +13,7 @@ import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; import net.fabricmc.loader.api.FabricLoader; -import net.irisshaders.iris.api.v0.IrisApi; +//import net.irisshaders.iris.api.v0.IrisApi; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.option.VideoOptionsScreen; @@ -90,7 +90,7 @@ protected BasicFrame.Builder parentFrameBuilder() { basicFrameBuilder = this.parentBasicFrameBuilder(basicFrameDim, tabFrameDim); - if (FabricLoader.getInstance().isModLoaded("iris")) { + /*if (FabricLoader.getInstance().isModLoaded("iris")) { int size = this.client.textRenderer.getWidth(Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey())); Dim2i shaderPackButtonDim; if (!SodiumClientMod.options().notifications.hideDonationButton) { @@ -100,7 +100,7 @@ protected BasicFrame.Builder parentFrameBuilder() { } FlatButtonWidget shaderPackButton = new FlatButtonWidget(shaderPackButtonDim, Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey()), () -> this.client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(this))); basicFrameBuilder.addChild(dim -> shaderPackButton); - } + }*/ return basicFrameBuilder; } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java index e4641eb..a530796 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -42,11 +42,27 @@ public MixinSliderControlElement(Option option, Dim2i dim) { @Shadow public abstract double getThumbPositionForValue(int value); + @Shadow + protected abstract void setValueFromMouse(double d); + @Inject(method = "", at = @At(value = "TAIL")) public void postInit(Option option, Dim2i dim, int min, int max, int interval, ControlValueFormatter formatter, CallbackInfo ci) { this.max = max; } + // Fixme: Reverts keyboard slider control hack but breaks sliders on RSO if removed :> + // I will need to add keyboard navigation support soon:tm: but it's not on my priority. Help wanted :> + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (this.option.isAvailable() && button == 0 && this.sliderBounds.contains((int) mouseX, (int) mouseY)) { + this.setValueFromMouse(mouseX); + + return true; + } else { + return false; + } + } + private void setValueFromMouseScroll(double amount) { if (this.option.getValue() + this.interval * (int) amount <= this.max && this.option.getValue() + this.interval * (int) amount >= this.min) { this.option.setValue(this.option.getValue() + this.interval * (int) amount); From afc9cd0d4eb3435b6015ba2a1d7cfe5738bee28a Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:13:37 +0800 Subject: [PATCH 090/112] fix: Just don't overload my ParentElement :> --- .../client/gui/frame/AbstractFrame.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java index faed6a4..d056315 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java @@ -8,6 +8,8 @@ import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.ParentElement; +import net.minecraft.client.gui.navigation.GuiNavigation; +import net.minecraft.client.gui.navigation.GuiNavigationPath; import net.minecraft.client.util.math.MatrixStack; import org.jetbrains.annotations.Nullable; @@ -104,4 +106,9 @@ public List children() { public boolean isMouseOver(double mouseX, double mouseY) { return this.dim.containsCursor(mouseX, mouseY); } + + @Override + public @Nullable GuiNavigationPath getNavigationPath(GuiNavigation navigation) { + return ParentElement.super.getNavigationPath(navigation); + } } From b3a4cba8e66ae6d3561bb5e68fa68eccc69dcf55 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Fri, 24 Feb 2023 04:10:51 +0800 Subject: [PATCH 091/112] change: Display tooltip for focused element --- .../client/gui/frame/OptionPageFrame.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java index 2fdc1f8..27ea1bf 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java @@ -85,7 +85,10 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { ControlElement hoveredElement = this.controlElements.stream() .filter(ControlElement::isHovered) .findFirst() - .orElse(null); + .orElse(this.controlElements.stream() + .filter(ControlElement::isFocused) + .findFirst() + .orElse(null)); super.render(matrices, mouseX, mouseY, delta); if (this.dim.containsCursor(mouseX, mouseY) && hoveredElement != null && this.lastHoveredElement == hoveredElement) { if (this.lastTime == 0) { From aea87a17079c12ab6484b83f08585fc5552100e5 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Sat, 25 Feb 2023 13:12:52 +0800 Subject: [PATCH 092/112] change: Fix hovered/focused option tooltip --- .../reeses_sodium_options/client/gui/frame/OptionPageFrame.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java index 27ea1bf..776840d 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java @@ -90,7 +90,7 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { .findFirst() .orElse(null)); super.render(matrices, mouseX, mouseY, delta); - if (this.dim.containsCursor(mouseX, mouseY) && hoveredElement != null && this.lastHoveredElement == hoveredElement) { + if (hoveredElement != null && this.lastHoveredElement == hoveredElement && ((hoveredElement.isHovered() && hoveredElement.isMouseOver(mouseX, mouseY)) || hoveredElement.isFocused())) { if (this.lastTime == 0) { this.lastTime = System.currentTimeMillis(); } From 59e095bfed44779ead3d3e20c44c2946e4026816 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Sat, 25 Feb 2023 13:27:23 +0800 Subject: [PATCH 093/112] change: Add terrible hack to "fix" scrolling list This really needs a better solution but for the meanwhile keyboard navigation scrolling "works" --- .../client/gui/frame/ScrollableFrame.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java index a25741b..f0b84a0 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java @@ -2,8 +2,12 @@ import me.flashyreese.mods.reeses_sodium_options.client.gui.Dim2iExtended; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components.ScrollBarComponent; +import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.gui.navigation.GuiNavigation; +import net.minecraft.client.gui.navigation.GuiNavigationPath; import net.minecraft.client.util.math.MatrixStack; +import org.jetbrains.annotations.Nullable; import java.util.concurrent.atomic.AtomicReference; @@ -128,6 +132,32 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { } } + // fixme: Ridiculous hack to snap to focused element, it also unfocuses the element for some unknown reason :> + // for the meanwhile this works until a proper solution is implemented. + // this shouldn't be hardcoded into scrollable frame + private void snapFocusedInViewport() { + if (this.frame.getFocused() instanceof ControlElement controlElement) { + Dim2i dim = controlElement.getDimensions(); + if (this.canScrollVertical && !(dim.y() >= viewPortDimension.y() && dim.getLimitY() <= viewPortDimension.getLimitY())) { + int newOffset = this.verticalScrollBar.getOffset(); + if (dim.y() < this.viewPortDimension.y()) { + newOffset -= 23; + } else if (dim.getLimitY() > this.viewPortDimension.getLimitY()) { + newOffset += 23; // widget size of 18 and 4 gap for groups + } + + this.verticalScrollBar.setOffset(newOffset); + controlElement.setFocused(true); + } + } + } + + @Override + public @Nullable GuiNavigationPath getNavigationPath(GuiNavigation navigation) { + this.snapFocusedInViewport(); + return super.getNavigationPath(navigation); + } + @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { return super.mouseClicked(mouseX, mouseY, button) || (this.canScrollHorizontal && this.horizontalScrollBar.mouseClicked(mouseX, mouseY, button)) || (this.canScrollVertical && this.verticalScrollBar.mouseClicked(mouseX, mouseY, button)); From f113325c205f39fffd2092c6a40371b00b8c8f04 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Sat, 25 Feb 2023 13:29:07 +0800 Subject: [PATCH 094/112] new: Add `ScrollBarComponent` keyboard navigation This commit doesn't quite work yet, but should be useful to replace snapping focused element hack in ScrollableFrame --- .../frame/components/ScrollBarComponent.java | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java index 3cbfc19..53d7c6c 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java @@ -2,8 +2,13 @@ import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.gui.navigation.FocusedRect; +import net.minecraft.client.gui.navigation.GuiNavigation; +import net.minecraft.client.gui.navigation.GuiNavigationPath; +import net.minecraft.client.util.InputUtil; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.MathHelper; +import org.jetbrains.annotations.Nullable; import java.util.function.Consumer; @@ -136,6 +141,43 @@ protected void drawRectOutline(double x, double y, double w, double h, int color }); } + @Override + public FocusedRect getNavigationFocus() { + return new FocusedRect(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height()); + } + + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + if (!this.isFocused()) + return false; + + if (this.mode == Mode.VERTICAL) { + if (keyCode == InputUtil.GLFW_KEY_UP) { + this.setOffset(this.getOffset() - 6); + return true; + } else if (keyCode == InputUtil.GLFW_KEY_DOWN) { + this.setOffset(this.getOffset() + 6); + return true; + } + } else { + if (keyCode == InputUtil.GLFW_KEY_LEFT) { + this.setOffset(this.getOffset() - 6); + return true; + } else if (keyCode == InputUtil.GLFW_KEY_RIGHT) { + this.setOffset(this.getOffset() + 6); + return true; + } + } + + return false; + } + + @Override + public @Nullable GuiNavigationPath getNavigationPath(GuiNavigation navigation) { + System.out.println("working?"); + return super.getNavigationPath(navigation); + } + public enum Mode { HORIZONTAL, VERTICAL From bc98d3922e582fc662ef76c91e9e9614e4d0a85e Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Sun, 26 Feb 2023 07:02:59 +0800 Subject: [PATCH 095/112] cursed: Keyboard navigation fix for sliders --- .../client/gui/frame/ScrollableFrame.java | 4 +- .../frame/components/ScrollBarComponent.java | 9 ++-- .../sodium/MixinSliderControlElement.java | 48 +++++++++++++++++++ 3 files changed, 54 insertions(+), 7 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java index f0b84a0..c5e996d 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java @@ -101,10 +101,12 @@ public void buildFrame() { if (this.canScrollHorizontal) { ((Dim2iExtended) ((Object) this.frame.dim)).setX(this.frameOrigin.x() - this.horizontalScrollBar.getOffset()); + this.children.add(this.horizontalScrollBar); } if (this.canScrollVertical) { ((Dim2iExtended) ((Object) this.frame.dim)).setY(this.frameOrigin.y() - this.verticalScrollBar.getOffset()); + this.children.add(this.verticalScrollBar); } this.frame.buildFrame(); @@ -154,7 +156,7 @@ private void snapFocusedInViewport() { @Override public @Nullable GuiNavigationPath getNavigationPath(GuiNavigation navigation) { - this.snapFocusedInViewport(); + //this.snapFocusedInViewport(); return super.getNavigationPath(navigation); } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java index 53d7c6c..61da2cf 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java @@ -54,6 +54,9 @@ public void updateThumbPosition() { public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); this.drawRect(this.scrollThumb.x(), this.scrollThumb.y(), this.scrollThumb.getLimitX(), this.scrollThumb.getLimitY(), 0xFFAAAAAA); + if (this.isFocused()) { + this.drawBorder(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY()); + } } @Override @@ -172,12 +175,6 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { return false; } - @Override - public @Nullable GuiNavigationPath getNavigationPath(GuiNavigation navigation) { - System.out.println("working?"); - return super.getNavigationPath(navigation); - } - public enum Mode { HORIZONTAL, VERTICAL diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java index a530796..cefb645 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -3,15 +3,20 @@ import me.jellysquid.mods.sodium.client.gui.options.Option; import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter; +import me.jellysquid.mods.sodium.client.gui.options.control.SliderControl; import me.jellysquid.mods.sodium.client.util.Dim2i; import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.util.InputUtil; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.Rect2i; +import net.minecraft.util.math.MathHelper; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button") @@ -35,6 +40,9 @@ public abstract class MixinSliderControlElement extends ControlElement @Final private Rect2i sliderBounds; + @Unique + private boolean editMode; + public MixinSliderControlElement(Option option, Dim2i dim) { super(option, dim); } @@ -45,6 +53,10 @@ public MixinSliderControlElement(Option option, Dim2i dim) { @Shadow protected abstract void setValueFromMouse(double d); + @Shadow public abstract int getIntValue(); + + @Shadow @Final private int range; + @Inject(method = "", at = @At(value = "TAIL")) public void postInit(Option option, Dim2i dim, int min, int max, int interval, ControlValueFormatter formatter, CallbackInfo ci) { this.max = max; @@ -63,6 +75,42 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) { } } + @Inject(method = "renderSlider", at = @At(value = "TAIL")) + public void rso$renderSlider(MatrixStack matrixStack, CallbackInfo ci) { + int sliderX = this.sliderBounds.getX(); + int sliderY = this.sliderBounds.getY(); + int sliderWidth = this.sliderBounds.getWidth(); + int sliderHeight = this.sliderBounds.getHeight(); + this.thumbPosition = this.getThumbPositionForValue(this.option.getValue()); + double thumbOffset = MathHelper.clamp((double)(this.getIntValue() - this.min) / (double)this.range * (double)sliderWidth, 0.0, sliderWidth); + double thumbX = (double)sliderX + thumbOffset - 2.0; + if (this.isFocused() && this.editMode) { + this.drawRect(thumbX - 1, sliderY - 1, thumbX + 5, sliderY + sliderHeight + 1, 0xFFFFFFFF); + } + } + + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + if (!isFocused()) return false; + + if (keyCode == InputUtil.GLFW_KEY_ENTER) { + this.editMode = !this.editMode; + return true; + } + + if (this.editMode) { + if (keyCode == InputUtil.GLFW_KEY_LEFT) { + this.option.setValue(MathHelper.clamp(this.option.getValue() - interval, min, max)); + return true; + } else if (keyCode == InputUtil.GLFW_KEY_RIGHT) { + this.option.setValue(MathHelper.clamp(this.option.getValue() + interval, min, max)); + return true; + } + } + + return false; + } + private void setValueFromMouseScroll(double amount) { if (this.option.getValue() + this.interval * (int) amount <= this.max && this.option.getValue() + this.interval * (int) amount >= this.min) { this.option.setValue(this.option.getValue() + this.interval * (int) amount); From 9264d2f0c596f60f1763add2cd7a05662d71e75e Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Sun, 26 Feb 2023 07:37:33 +0800 Subject: [PATCH 096/112] change: more curse cleanups --- .../gui/SliderControlElementExtended.java | 7 ++++ .../frame/components/ScrollBarComponent.java | 3 -- .../sodium/MixinSliderControlElement.java | 38 ++++++++++++------- 3 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SliderControlElementExtended.java diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SliderControlElementExtended.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SliderControlElementExtended.java new file mode 100644 index 0000000..162adeb --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SliderControlElementExtended.java @@ -0,0 +1,7 @@ +package me.flashyreese.mods.reeses_sodium_options.client.gui; + +public interface SliderControlElementExtended { + boolean isEditMode(); + + void setEditMode(boolean editMode); +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java index 61da2cf..746df50 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java @@ -3,12 +3,9 @@ import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; import net.minecraft.client.gui.navigation.FocusedRect; -import net.minecraft.client.gui.navigation.GuiNavigation; -import net.minecraft.client.gui.navigation.GuiNavigationPath; import net.minecraft.client.util.InputUtil; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.MathHelper; -import org.jetbrains.annotations.Nullable; import java.util.function.Consumer; diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java index cefb645..abb2e73 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -1,9 +1,9 @@ package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; +import me.flashyreese.mods.reeses_sodium_options.client.gui.SliderControlElementExtended; import me.jellysquid.mods.sodium.client.gui.options.Option; import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter; -import me.jellysquid.mods.sodium.client.gui.options.control.SliderControl; import me.jellysquid.mods.sodium.client.util.Dim2i; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.InputUtil; @@ -16,11 +16,10 @@ import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(targets = "me.jellysquid.mods.sodium.client.gui.options.control.SliderControl$Button") -public abstract class MixinSliderControlElement extends ControlElement { +public abstract class MixinSliderControlElement extends ControlElement implements SliderControlElementExtended { @Shadow @Final @@ -36,26 +35,39 @@ public abstract class MixinSliderControlElement extends ControlElement @Unique private int max; + @Unique + private boolean editMode; + @Shadow @Final private Rect2i sliderBounds; - @Unique - private boolean editMode; + @Shadow + @Final + private int range; public MixinSliderControlElement(Option option, Dim2i dim) { super(option, dim); } + @Override + public boolean isEditMode() { + return this.editMode; + } + + @Override + public void setEditMode(boolean editMode) { + this.editMode = editMode; + } + @Shadow public abstract double getThumbPositionForValue(int value); @Shadow protected abstract void setValueFromMouse(double d); - @Shadow public abstract int getIntValue(); - - @Shadow @Final private int range; + @Shadow + public abstract int getIntValue(); @Inject(method = "", at = @At(value = "TAIL")) public void postInit(Option option, Dim2i dim, int min, int max, int interval, ControlValueFormatter formatter, CallbackInfo ci) { @@ -82,9 +94,9 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) { int sliderWidth = this.sliderBounds.getWidth(); int sliderHeight = this.sliderBounds.getHeight(); this.thumbPosition = this.getThumbPositionForValue(this.option.getValue()); - double thumbOffset = MathHelper.clamp((double)(this.getIntValue() - this.min) / (double)this.range * (double)sliderWidth, 0.0, sliderWidth); - double thumbX = (double)sliderX + thumbOffset - 2.0; - if (this.isFocused() && this.editMode) { + double thumbOffset = MathHelper.clamp((double) (this.getIntValue() - this.min) / (double) this.range * (double) sliderWidth, 0.0, sliderWidth); + double thumbX = (double) sliderX + thumbOffset - 2.0; + if (this.isFocused() && this.isEditMode()) { this.drawRect(thumbX - 1, sliderY - 1, thumbX + 5, sliderY + sliderHeight + 1, 0xFFFFFFFF); } } @@ -94,11 +106,11 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { if (!isFocused()) return false; if (keyCode == InputUtil.GLFW_KEY_ENTER) { - this.editMode = !this.editMode; + this.setEditMode(!this.isEditMode());; return true; } - if (this.editMode) { + if (this.isEditMode()) { if (keyCode == InputUtil.GLFW_KEY_LEFT) { this.option.setValue(MathHelper.clamp(this.option.getValue() - interval, min, max)); return true; From 4439e9047e0acf0017131700797babcc16a10f59 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Tue, 14 Mar 2023 17:29:42 +0800 Subject: [PATCH 097/112] change: Bump to 1.19.4-rc3 --- build.gradle | 2 +- gradle.properties | 8 ++++---- .../client/gui/frame/components/ScrollBarComponent.java | 6 +++--- .../mixin/sodium/MixinControlElement.java | 7 ++++++- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 9398aca..b775f08 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "me.jellysquid.mods:sodium-fabric:0.4.10+build.211" + modImplementation "me.jellysquid.mods:sodium-fabric:0.4.10+build.213" //modImplementation "maven.modrinth:sodium:${project.sodium_version}" implementation "org.joml:joml:1.10.2" //modImplementation "maven.modrinth:iris:${project.iris_version}" diff --git a/gradle.properties b/gradle.properties index 1e253ef..9f0576f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.19.4-pre1 - yarn_mappings=1.19.4-pre1+build.2 - loader_version=0.14.14 + minecraft_version=1.19.4-rc3 + yarn_mappings=1.19.4-rc3+build.1 + loader_version=0.14.17 # Mod Properties mod_version=1.4.9 maven_group=me.flashyreese.mods @@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1G iris_version=1.5.2+1.19.3 #Fabric api - fabric_version=0.74.2+1.19.4 + fabric_version=0.75.3+1.19.4 diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java index 746df50..66b395f 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java @@ -2,7 +2,7 @@ import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.gui.navigation.FocusedRect; +import net.minecraft.client.gui.ScreenRect; import net.minecraft.client.util.InputUtil; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.MathHelper; @@ -142,8 +142,8 @@ protected void drawRectOutline(double x, double y, double w, double h, int color } @Override - public FocusedRect getNavigationFocus() { - return new FocusedRect(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height()); + public ScreenRect getNavigationFocus() { + return new ScreenRect(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height()); } @Override diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java index 0638c0f..1f7e4de 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java @@ -1,8 +1,11 @@ package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; +import me.jellysquid.mods.sodium.client.gui.options.Option; import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; +import net.minecraft.client.gui.screen.narration.NarrationPart; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -10,12 +13,14 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(ControlElement.class) -public abstract class MixinControlElement extends AbstractWidget { +public abstract class MixinControlElement extends AbstractWidget { @Shadow @Final protected Dim2i dim; + @Shadow @Final protected Option option; + @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/util/Dim2i;containsCursor(DD)Z")) public boolean render(Dim2i dim2i, double x, double y) { return this.isMouseOver(x, y); From d94ef676e60da83824c06a1af5ae26e6af24ec13 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 15 Mar 2023 02:06:02 +0800 Subject: [PATCH 098/112] change: Update to 1.19.4 --- build.gradle | 7 +++---- gradle.properties | 8 ++++---- .../client/gui/SodiumVideoOptionsScreen.java | 6 +++--- src/main/resources/fabric.mod.json | 3 ++- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index b775f08..15bff18 100644 --- a/build.gradle +++ b/build.gradle @@ -35,10 +35,9 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "me.jellysquid.mods:sodium-fabric:0.4.10+build.213" - //modImplementation "maven.modrinth:sodium:${project.sodium_version}" - implementation "org.joml:joml:1.10.2" - //modImplementation "maven.modrinth:iris:${project.iris_version}" + //modImplementation "me.jellysquid.mods:sodium-fabric:0.4.10+build.213" + modImplementation "maven.modrinth:sodium:${project.sodium_version}" + modImplementation "maven.modrinth:iris:${project.iris_version}" //modRuntimeOnly "maven.modrinth:lazydfu:0.1.3" } diff --git a/gradle.properties b/gradle.properties index 9f0576f..9ed88fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.19.4-rc3 - yarn_mappings=1.19.4-rc3+build.1 + minecraft_version=1.19.4 + yarn_mappings=1.19.4+build.1 loader_version=0.14.17 # Mod Properties mod_version=1.4.9 @@ -11,8 +11,8 @@ org.gradle.jvmargs=-Xmx1G archives_base_name=reeses_sodium_options # Dependency - sodium_version=mc1.19.3-0.4.9 - iris_version=1.5.2+1.19.3 + sodium_version=0.4.10+build.24 + iris_version=1.5.2+1.19.4 #Fabric api fabric_version=0.75.3+1.19.4 diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index f10ab98..ea76733 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -13,7 +13,7 @@ import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; import net.fabricmc.loader.api.FabricLoader; -//import net.irisshaders.iris.api.v0.IrisApi; +import net.irisshaders.iris.api.v0.IrisApi; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.option.VideoOptionsScreen; @@ -90,7 +90,7 @@ protected BasicFrame.Builder parentFrameBuilder() { basicFrameBuilder = this.parentBasicFrameBuilder(basicFrameDim, tabFrameDim); - /*if (FabricLoader.getInstance().isModLoaded("iris")) { + if (FabricLoader.getInstance().isModLoaded("iris")) { int size = this.client.textRenderer.getWidth(Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey())); Dim2i shaderPackButtonDim; if (!SodiumClientMod.options().notifications.hideDonationButton) { @@ -100,7 +100,7 @@ protected BasicFrame.Builder parentFrameBuilder() { } FlatButtonWidget shaderPackButton = new FlatButtonWidget(shaderPackButtonDim, Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey()), () -> this.client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(this))); basicFrameBuilder.addChild(dim -> shaderPackButton); - }*/ + } return basicFrameBuilder; } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 383eb68..adbef7e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -31,7 +31,8 @@ }, "breaks": { "iris": "<1.1.4", - "sodium-extra": "<0.4.1" + "sodium-extra": "<0.4.1", + "sodium": "<0.4.10" }, "recommends": { "sodium-extra": ">=0.4.2" From d50067d797cae220cb14f940b82a978bc1361b9e Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 15 Mar 2023 02:06:59 +0800 Subject: [PATCH 099/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9ed88fa..cf9727c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.19.4+build.1 loader_version=0.14.17 # Mod Properties - mod_version=1.4.9 + mod_version=1.5.0 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From 4457fa14c22b63c3128e9f06e6c85c5976b15843 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 15 Mar 2023 02:06:59 +0800 Subject: [PATCH 100/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b131f74..9ebfdd5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.18.2+build.4 loader_version=0.14.14 # Mod Properties - mod_version=1.4.9 + mod_version=1.5.0 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From 59055d92036251dde1dfa5a42550e869280738fa Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 15 Mar 2023 02:24:11 +0800 Subject: [PATCH 101/112] blame: IMS IMS renames a version label on Modrinth while I was releasing the build :) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index cf9727c..989993a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1G archives_base_name=reeses_sodium_options # Dependency - sodium_version=0.4.10+build.24 + sodium_version=mc1.19.4-0.4.10 iris_version=1.5.2+1.19.4 #Fabric api From 0f2692c8e3689f5b0852027ec82559f198da9921 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Sun, 30 Apr 2023 21:11:06 +0800 Subject: [PATCH 102/112] new: Initial port to 23w17a --- build.gradle | 8 ++++---- gradle.properties | 8 ++++---- gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 61608 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 ++-- .../client/gui/SodiumVideoOptionsScreen.java | 14 ++++++-------- .../client/gui/frame/AbstractFrame.java | 6 +++--- .../client/gui/frame/BasicFrame.java | 6 +++--- .../client/gui/frame/OptionPageFrame.java | 11 ++++++----- .../client/gui/frame/ScrollableFrame.java | 12 ++++++------ .../frame/components/ScrollBarComponent.java | 4 ++-- .../client/gui/frame/tab/TabFrame.java | 10 +++++----- .../mixin/sodium/MixinFlatButtonWidget.java | 10 +++++----- .../sodium/MixinSliderControlElement.java | 4 ++-- src/main/resources/fabric.mod.json | 2 +- 15 files changed, 50 insertions(+), 51 deletions(-) diff --git a/build.gradle b/build.gradle index 15bff18..a1b4d39 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'org.ajoberstar.grgit' version '5.0.0' - id 'fabric-loom' version '1.1-SNAPSHOT' + id 'fabric-loom' version '1.2-SNAPSHOT' id 'maven-publish' id 'signing' } @@ -35,9 +35,9 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - //modImplementation "me.jellysquid.mods:sodium-fabric:0.4.10+build.213" - modImplementation "maven.modrinth:sodium:${project.sodium_version}" - modImplementation "maven.modrinth:iris:${project.iris_version}" + modImplementation "me.jellysquid.mods:sodium-fabric:0.4.10+build.214" + //modImplementation "maven.modrinth:sodium:${project.sodium_version}" + //modImplementation "maven.modrinth:iris:${project.iris_version}" //modRuntimeOnly "maven.modrinth:lazydfu:0.1.3" } diff --git a/gradle.properties b/gradle.properties index 989993a..8dd8204 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.19.4 - yarn_mappings=1.19.4+build.1 - loader_version=0.14.17 + minecraft_version=23w17a + yarn_mappings=23w17a+build.10 + loader_version=0.14.19 # Mod Properties mod_version=1.5.0 maven_group=me.flashyreese.mods @@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1G iris_version=1.5.2+1.19.4 #Fabric api - fabric_version=0.75.3+1.19.4 + fabric_version=0.79.2+1.20 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..ccebba7710deaf9f98673a68957ea02138b60d0a 100644 GIT binary patch delta 5094 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 delta 5107 zcmY*d1zc0@|J{HQlai7V5+f#EN-H%&UP4MFm6QgFfuJK4DG4u#ARsbQL4i>MB1q|w zmWd#pqd~BR-yN@ieE-|$^W1aKIZtf&-p_fyw{(Uwc7_sWYDh^12cY!qXvcPQ!qF;q@b0nYU7 zP&ht}K7j%}P%%|ffm;4F0^i3P0R`a!2wm89L5P3Kfu;tTZJre<{N5}AzsH+E3DS`Q zJLIl`LRMf`JOTBLf(;IV(9(h{(}dXK!cPoSLm(o@fz8vRz}6fOw%3}3VYOsCczLF` za2RTsCWa2sS-uw(6|HLJg)Xf@S8#|+(Z5Y)ER+v+8;btfB3&9sWH6<=U}0)o-jIts zsi?Nko;No&JyZI%@1G&zsG5kKo^Zd7rk_9VIUao9;fC~nv(T0F&Af0&Rp`?x94EIS zUBPyBe5R5#okNiB1Xe--q4|hPyGzhJ?Lurt#Ci09BQ+}rlHpBhm;EmfLw{EbCz)sg zgseAE#f$met1jo;`Z6ihk?O1be3aa$IGV69{nzagziA!M*~E5lMc(Sp+NGm2IUjmn zql((DU9QP~Tn1pt6L`}|$Na-v(P+Zg&?6bAN@2u%KiB*Gmf}Z)R zMENRJgjKMqVbMpzPO{`!J~2Jyu7&xXnTDW?V?IJgy+-35q1)-J8T**?@_-2H`%X+6f5 zIRv`uLp&*?g7L~6+3O*saXT~gWsmhF*FNKw4X$29ePKi02G*)ysenhHv{u9-y?_do ztT(Cu04pk>51n}zu~=wgToY5Cx|MTlNw}GR>+`|6CAhQn=bh@S<7N)`w};;KTywDU z=QWO@RBj$WKOXSgCWg{BD`xl&DS!G}`Mm3$)=%3jzO_C+s+mfTFH5JL>}*(JKs@MqX|o2b#ZBX5P;p7;c)$F1y4HwvJ?KA938$rd)gn_U^CcUtmdaBW57 zlPph>Fz&L`cSScFjcj+7Jif3vxb20Ag~FPstm?9#OrD$e?Y~#1osDB0CFZ9Mu&%iE zSj~wZpFqu6!k%BT)}$F@Z%(d-Pqy07`N8ch2F7z^=S-!r-@j{#&{SM@a8O$P#SySx zZLD_z=I300OCA1YmKV0^lo@>^)THfZvW}s<$^w^#^Ce=kO5ymAnk>H7pK!+NJ-+F7 z1Bb6Y=r)0nZ+hRXUyD+BKAyecZxb+$JTHK5k(nWv*5%2a+u*GDt|rpReYQ}vft zXrIt#!kGO85o^~|9Oc-M5A!S@9Q)O$$&g8u>1=ew?T35h8B{-Z_S78oe=E(-YZhBPe@Y1sUt63A-Cdv>D1nIT~=Rub6$?8g>meFb7Ic@w^%@RN2z72oPZ#Ta%b(P1|&6I z61iO<8hT*)p19Bgd0JgXP{^c{P2~K@^DIXv=dF(u|DFfqD^dMIl8-x)xKIpJRZru@ zDxicyYJG}mh}=1Dfg%B$#H`CiAxPTj^;f4KRMZHUz-_x6)lEq!^mu%72*PI=t$6{Uql#dqm4 zClgaN63!&?v*enz4k1sbaM+yCqUf+i9rw$(YrY%ir1+%cWRB<;r}$8si!6QcNAk~J zk3?dejBaC`>=T<=y=>QVt*4kL>SwYwn$(4ES793qaH)>n(axyV3R5jdXDh#e-N0K- zuUgk|N^|3*D1!Wlz-!M*b}Zc5=;K6I+>1N$&Q%)&8LWUiTYi&aQIj(luA< zN5R<8Y8L#*i0xBio$jWcaiZ4S2w3#R@CGemesy~akKP)2GojQF6!$}!_RdUJPBevX zG#~uz%Yirb0@1wgQ;ayb=qD}6{=QXxjuZQ@@kxbN!QWhtEvuhS2yAZe8fZy6*4Inr zdSyR9Dec4HrE|I=z-U;IlH;_h#7e^Hq}gaJ<-z^}{*s!m^66wu2=(*EM0UaV*&u1q zJrq!K23TO8a(ecSQFdD$y+`xu)Xk36Z*;1i{hS=H2E<8<5yHuHG~22-S+Jq|3HMAw z%qBz3auT=M!=5F|Wqke|I^E8pmJ-}>_DwX5w%d3MSdC>xW%$ocm8w8HRdZ|^#cEt1 zM*I7S6sLQq;;Mecet(Q()+?s+&MeVLOvx}(MkvytkvLHl7h*N0AT1#AqC&(he(^%przH`KqA$z_dAvJJb409@F)fYwD$JW_{_Oie8!@VdJE zU>D$@B?LawAf5$;`AZ1E!krn=aAC%4+YQrzL!59yl1;|T2)u=RBYA8lk0Ek&gS!Rb zt0&hVuyhSa0}rpZGjTA>Gz}>Uv*4)F zf7S%D2nfA7x?gPEXZWk8DZimQs#xi0?So_k`2zb!UVQEAcbvjPLK9v>J~!awnxGpq zEh$EPOc4q&jywmglnC&D)1-P0DH!@)x;uJwMHdhPh>ZLWDw+p1pf52{X2dk{_|UOmakJa4MHu?CY`6Hhv!!d7=aNwiB5z zb*Wlq1zf^3iDlPf)b_SzI*{JCx2jN;*s~ra8NeB!PghqP!0po-ZL?0Jk;2~*~sCQ<%wU`mRImd)~!23RS?XJu|{u( ztFPy3*F=ZhJmBugTv48WX)4U*pNmm~4oD4}$*-92&<)n=R)5lT z-VpbEDk>(C1hoo#-H_u0`#%L6L$ zln(}h2*Cl(5(JtVM{YZ26@Fwmp;?Qt}9$_F%`?+-JHbC;bPZj8PLq9 zWo-KFw!i&r8WuA-!3F_m9!24Z(RhalAUR~_H#Ln=$%b5GY z)oB)zO%J5TY}&BXq^7#M>euVL%01Tzj4$6^ZOjT*7@zr~q@6GEjGi)nbwzSL`TiLN z{DVG~I$w@%^#tD{>1Ap@%=XogG_^Hvy_xiRn4yy?LKsC+ zU!S79X8orh&D%>1S`x2iyi&(iG&r#YT{}~iy(FIOo8?MZU#eo*c*(RjAGj@uDi zARJur)-*{n0PgW~&mFeg`MJ?(Kr;NUom)jh?ozZtyywN9bea6ikQlh}953Oul~N%4 z@Sx!@>?l1e7V*@HZMJx!gMo0TeXdU~#W6^n?YVQJ$)nuFRkvKbfwv_s*2g(!wPO|@ zvuXF=2MiPIX)A7x!|BthSa$GB%ECnuZe_Scx&AlnC z!~6C_SF24#@^VMIw)a-7{00}}Cr5NImPbW8OTIHoo6@NcxLVTna8<<;uy~YaaeMnd z;k_ynYc_8jQn9vW_W8QLkgaHtmwGC}wRcgZ^I^GPbz{lW)p#YYoinez1MjkY%6LBd z+Vr>j&^!?b-*Vk>8I!28o`r3w&^Lal8@=50zV4&9V9oXI{^r8;JmVeos&wf?O!;_o zk))^k*1fvYw9?WrS!sG2TcX`hH@Y3mF&@{i05;_AV{>Umi8{uZP_0W5_1V2yHU<)E z+qviK*7SJtnL;76{WK!?Pv$-!w$08<%8Qy|sB|P%GiV1<+dHw*sj!C~SjsB6+1L@so+Q~n# z+Uc5+Uz+mGmkR@>H7D*c?mm8WQz;3VOpktU_DeBi>3#@z zmLe;3gP<7KPy>~k47nEeT?G?7e2g6316Xdb_y+ja5C9Ayg6QTNr~&Kbs(1>7zp|f@le;9B z1e(+Ga%jPWR7oc}=XcB4$z?YD)l;%#U;}~gZzGViI=fwu9OAPCCK!0w>Ay^#$b49k zT&|M?JaIyRT<;@*t_jp1ifWPvL;{maf6o0T#X!#9YX;0Q;LTQ0}0tg^_Ru4pkSr4#P zmnW|D0`A#Ie6pEfBDv39=jN2;kiUoT6I&kChsbI!jMuY6zuZql5!&i%5!c zjsHlXtjT;NV?jAb`%vy)JOK_j1rponLqc>(2qgYlLPEs>|0QV<=Pw~C`fLFKJJitt zyC6003{rxCsmtGKjhB%W2W~*%vKH8l$pZoOFT*K@uL9%CD^3rh=ZtuTU1 zJpf4|%n^yjh#dKSSCJI8;YU*CD!8Wv20*e5`-fya^75@ADLU^RdHDg3Bk3k6)dGi7 z!!z;|O1h$8q!vO*w6 I6Xdi10eY*&F8}}l diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fc10b60..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68..79a61d4 100755 --- a/gradlew +++ b/gradlew @@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index ea76733..a0d6c32 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -12,12 +12,10 @@ import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage; import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.fabricmc.loader.api.FabricLoader; -import net.irisshaders.iris.api.v0.IrisApi; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.option.VideoOptionsScreen; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.minecraft.util.Util; import org.lwjgl.glfw.GLFW; @@ -90,7 +88,7 @@ protected BasicFrame.Builder parentFrameBuilder() { basicFrameBuilder = this.parentBasicFrameBuilder(basicFrameDim, tabFrameDim); - if (FabricLoader.getInstance().isModLoaded("iris")) { + /*if (FabricLoader.getInstance().isModLoaded("iris")) { int size = this.client.textRenderer.getWidth(Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey())); Dim2i shaderPackButtonDim; if (!SodiumClientMod.options().notifications.hideDonationButton) { @@ -100,7 +98,7 @@ protected BasicFrame.Builder parentFrameBuilder() { } FlatButtonWidget shaderPackButton = new FlatButtonWidget(shaderPackButtonDim, Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey()), () -> this.client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(this))); basicFrameBuilder.addChild(dim -> shaderPackButton); - } + }*/ return basicFrameBuilder; } @@ -128,10 +126,10 @@ public BasicFrame.Builder parentBasicFrameBuilder(Dim2i parentBasicFrameDim, Dim } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - super.renderBackground(matrices); + public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { + super.renderBackground(drawContext); this.updateControls(); - this.frame.render(matrices, mouseX, mouseY, delta); + this.frame.render(drawContext, mouseX, mouseY, delta); } private void updateControls() { diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java index d056315..cb0455f 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/AbstractFrame.java @@ -5,12 +5,12 @@ import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.ParentElement; import net.minecraft.client.gui.navigation.GuiNavigation; import net.minecraft.client.gui.navigation.GuiNavigationPath; -import net.minecraft.client.util.math.MatrixStack; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -45,12 +45,12 @@ public void buildFrame() { } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { if (this.renderOutline) { this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); } for (Drawable drawable : this.drawable) { - drawable.render(matrices, mouseX, mouseY, delta); + drawable.render(drawContext, mouseX, mouseY, delta); } } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java index b08cca2..4189ea1 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/BasicFrame.java @@ -2,7 +2,7 @@ import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawContext; import org.apache.commons.lang3.Validate; import java.util.ArrayList; @@ -35,8 +35,8 @@ public void buildFrame() { } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - super.render(matrices, mouseX, mouseY, delta); + public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { + super.render(drawContext, mouseX, mouseY, delta); } public static class Builder { diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java index 776840d..63470d0 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java @@ -9,6 +9,7 @@ import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; import me.jellysquid.mods.sodium.client.util.Dim2i; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.OrderedText; import net.minecraft.text.Text; @@ -81,7 +82,7 @@ public void buildFrame() { } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { ControlElement hoveredElement = this.controlElements.stream() .filter(ControlElement::isHovered) .findFirst() @@ -89,19 +90,19 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { .filter(ControlElement::isFocused) .findFirst() .orElse(null)); - super.render(matrices, mouseX, mouseY, delta); + super.render(drawContext, mouseX, mouseY, delta); if (hoveredElement != null && this.lastHoveredElement == hoveredElement && ((hoveredElement.isHovered() && hoveredElement.isMouseOver(mouseX, mouseY)) || hoveredElement.isFocused())) { if (this.lastTime == 0) { this.lastTime = System.currentTimeMillis(); } - this.renderOptionTooltip(matrices, hoveredElement); + this.renderOptionTooltip(drawContext, hoveredElement); } else { this.lastTime = 0; this.lastHoveredElement = hoveredElement; } } - private void renderOptionTooltip(MatrixStack matrixStack, ControlElement element) { + private void renderOptionTooltip(DrawContext drawContext, ControlElement element) { if (this.lastTime + 500 > System.currentTimeMillis()) return; Dim2i dim = element.getDimensions(); @@ -141,7 +142,7 @@ private void renderOptionTooltip(MatrixStack matrixStack, ControlElement elem this.drawRectOutline(boxX, boxY, boxX + boxWidth, boxY + boxHeight, 0xFF94E4D3); for (int i = 0; i < tooltip.size(); i++) { - MinecraftClient.getInstance().textRenderer.draw(matrixStack, tooltip.get(i), boxX + textPadding, boxY + textPadding + (i * 12), 0xFFFFFFFF); + drawContext.drawText(MinecraftClient.getInstance().textRenderer, tooltip.get(i), boxX + textPadding, boxY + textPadding + (i * 12), 0xFFFFFFFF, false); } } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java index c5e996d..40f026c 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/ScrollableFrame.java @@ -4,9 +4,9 @@ import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components.ScrollBarComponent; import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.navigation.GuiNavigation; import net.minecraft.client.gui.navigation.GuiNavigationPath; -import net.minecraft.client.util.math.MatrixStack; import org.jetbrains.annotations.Nullable; import java.util.concurrent.atomic.AtomicReference; @@ -115,22 +115,22 @@ public void buildFrame() { } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { if (this.canScrollHorizontal || this.canScrollVertical) { if (this.renderOutline) { this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); } - this.applyScissor(this.viewPortDimension.x(), this.viewPortDimension.y(), this.viewPortDimension.width(), this.viewPortDimension.height(), () -> super.render(matrices, mouseX, mouseY, delta)); + this.applyScissor(this.viewPortDimension.x(), this.viewPortDimension.y(), this.viewPortDimension.width(), this.viewPortDimension.height(), () -> super.render(drawContext, mouseX, mouseY, delta)); } else { - super.render(matrices, mouseX, mouseY, delta); + super.render(drawContext, mouseX, mouseY, delta); } if (this.canScrollHorizontal) { - this.horizontalScrollBar.render(matrices, mouseX, mouseY, delta); + this.horizontalScrollBar.render(drawContext, mouseX, mouseY, delta); } if (this.canScrollVertical) { - this.verticalScrollBar.render(matrices, mouseX, mouseY, delta); + this.verticalScrollBar.render(drawContext, mouseX, mouseY, delta); } } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java index 66b395f..133b3fe 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java @@ -2,9 +2,9 @@ import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.ScreenRect; import net.minecraft.client.util.InputUtil; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.MathHelper; import java.util.function.Consumer; @@ -48,7 +48,7 @@ public void updateThumbPosition() { } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { this.drawRectOutline(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xFFAAAAAA); this.drawRect(this.scrollThumb.x(), this.scrollThumb.y(), this.scrollThumb.getLimitX(), this.scrollThumb.getLimitY(), 0xFFAAAAAA); if (this.isFocused()) { diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index 21e032e..1e473b3 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -6,7 +6,7 @@ import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; import org.apache.commons.lang3.Validate; @@ -93,17 +93,17 @@ public void buildFrame() { } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { this.applyScissor(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height(), () -> { for (AbstractWidget widget : this.children) { if (widget != this.selectedFrame) { - widget.render(matrices, mouseX, mouseY, delta); + widget.render(drawContext, mouseX, mouseY, delta); } } }); - this.selectedFrame.render(matrices, mouseX, mouseY, delta); + this.selectedFrame.render(drawContext, mouseX, mouseY, delta); if (this.tabSectionCanScroll) { - this.tabSectionScrollBar.render(matrices, mouseX, mouseY, delta); + this.tabSectionScrollBar.render(drawContext, mouseX, mouseY, delta); } } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java index e852e66..33a44bd 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinFlatButtonWidget.java @@ -4,7 +4,7 @@ import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -23,12 +23,12 @@ public abstract class MixinFlatButtonWidget extends AbstractWidget implements Fl @Unique private boolean leftAligned; - @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/gui/widgets/FlatButtonWidget;drawString(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/text/Text;III)V")) - public void redirectDrawString(FlatButtonWidget instance, MatrixStack matrixStack, Text text, int x, int y, int color) { + @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/gui/widgets/FlatButtonWidget;drawString(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/text/Text;III)V")) + public void redirectDrawString(FlatButtonWidget instance, DrawContext drawContext, Text text, int x, int y, int color) { if (this.leftAligned) { - this.drawString(matrixStack, text, this.dim.x() + 10, y, color); + this.drawString(drawContext, text, this.dim.x() + 10, y, color); } else { - this.drawString(matrixStack, text, x, y, color); + this.drawString(drawContext, text, x, y, color); } } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java index abb2e73..23ce955 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinSliderControlElement.java @@ -5,9 +5,9 @@ import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter; import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.InputUtil; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.Rect2i; import net.minecraft.util.math.MathHelper; import org.spongepowered.asm.mixin.Final; @@ -88,7 +88,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) { } @Inject(method = "renderSlider", at = @At(value = "TAIL")) - public void rso$renderSlider(MatrixStack matrixStack, CallbackInfo ci) { + public void rso$renderSlider(DrawContext drawContext, CallbackInfo ci) { int sliderX = this.sliderBounds.getX(); int sliderY = this.sliderBounds.getY(); int sliderWidth = this.sliderBounds.getWidth(); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index adbef7e..0167526 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,7 +26,7 @@ } }, "depends": { - "minecraft": "1.19.x", + "minecraft": "1.20.x", "sodium": "*" }, "breaks": { From 5c288a4e019e20a3a7aa4a1f0767aedd7283e272 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Tue, 6 Jun 2023 22:12:16 +0800 Subject: [PATCH 103/112] change: Replace IrisApi using methodhandles Previously, we transitioned from using reflection to the `IrisApi` interface for accessing Iris functionality. However, since `IrisApi` is not available separately and can only be used after the release day as a major version, we have decided to switch back to using reflection. Relying on the availability of `IrisApi` has introduced significant delays and dependencies on Iris. Until `IrisApi` becomes available separately, we will continue using reflection for accessing the required functionality. This commit reverts the changes made to utilize `IrisApi` and restores the original reflection-based approach. Please note that this revert will not be backported to previous versions. --- build.gradle | 2 +- gradle.properties | 8 +-- .../client/gui/SodiumVideoOptionsScreen.java | 13 +++-- .../compat/IrisCompat.java | 55 +++++++++++++++++++ 4 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/compat/IrisCompat.java diff --git a/build.gradle b/build.gradle index a1b4d39..02bd18d 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "me.jellysquid.mods:sodium-fabric:0.4.10+build.214" + modImplementation "me.jellysquid.mods:sodium-fabric:0.4.10+build.219" //modImplementation "maven.modrinth:sodium:${project.sodium_version}" //modImplementation "maven.modrinth:iris:${project.iris_version}" diff --git a/gradle.properties b/gradle.properties index 8dd8204..5010dd7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=23w17a - yarn_mappings=23w17a+build.10 - loader_version=0.14.19 + minecraft_version=1.20-rc1 + yarn_mappings=1.20-rc1+build.2 + loader_version=0.14.21 # Mod Properties mod_version=1.5.0 maven_group=me.flashyreese.mods @@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1G iris_version=1.5.2+1.19.4 #Fabric api - fabric_version=0.79.2+1.20 + fabric_version=0.83.0+1.20 diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index a0d6c32..0c9dd2c 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -4,6 +4,7 @@ import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.BasicFrame; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab.Tab; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab.TabFrame; +import me.flashyreese.mods.reeses_sodium_options.compat.IrisCompat; import me.jellysquid.mods.sodium.client.SodiumClientMod; import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions; import me.jellysquid.mods.sodium.client.gui.options.Option; @@ -12,6 +13,7 @@ import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage; import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; @@ -88,17 +90,20 @@ protected BasicFrame.Builder parentFrameBuilder() { basicFrameBuilder = this.parentBasicFrameBuilder(basicFrameDim, tabFrameDim); - /*if (FabricLoader.getInstance().isModLoaded("iris")) { - int size = this.client.textRenderer.getWidth(Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey())); + if (IrisCompat.isIrisPresent()) { // FabricLoader.getInstance().isModLoaded("iris")) { + //int size = this.client.textRenderer.getWidth(Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey())); + int size = this.client.textRenderer.getWidth(Text.translatable(IrisCompat.getIrisShaderPacksScreenLanguageKey())); Dim2i shaderPackButtonDim; if (!SodiumClientMod.options().notifications.hideDonationButton) { shaderPackButtonDim = new Dim2i(donateButtonDim.x() - 12 - size, tabFrameDim.y() - 26, 10 + size, 20); } else { shaderPackButtonDim = new Dim2i(tabFrameDim.getLimitX() - size - 10, tabFrameDim.y() - 26, 10 + size, 20); } - FlatButtonWidget shaderPackButton = new FlatButtonWidget(shaderPackButtonDim, Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey()), () -> this.client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(this))); + + //FlatButtonWidget shaderPackButton = new FlatButtonWidget(shaderPackButtonDim, Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey()), () -> this.client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(this))); + FlatButtonWidget shaderPackButton = new FlatButtonWidget(shaderPackButtonDim, Text.translatable(IrisCompat.getIrisShaderPacksScreenLanguageKey()), () -> this.client.setScreen(IrisCompat.getIrisShaderPacksScreen(this))); basicFrameBuilder.addChild(dim -> shaderPackButton); - }*/ + } return basicFrameBuilder; } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/compat/IrisCompat.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/compat/IrisCompat.java new file mode 100644 index 0000000..0cd7110 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/compat/IrisCompat.java @@ -0,0 +1,55 @@ +package me.flashyreese.mods.reeses_sodium_options.compat; + +import net.minecraft.client.gui.screen.Screen; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.InvocationTargetException; + +public class IrisCompat { + private static boolean irisPresent; + private static MethodHandle handleScreen; + private static MethodHandle handleTranslationKey; + private static Object apiInstance; + + static { + try { + Class api = Class.forName("net.irisshaders.iris.api.v0.IrisApi"); + apiInstance = api.cast(api.getDeclaredMethod("getInstance").invoke(null)); + handleScreen = MethodHandles.lookup().findVirtual(api, "openMainIrisScreenObj", MethodType.methodType(Object.class, Object.class)); + handleTranslationKey = MethodHandles.lookup().findVirtual(api, "getMainScreenLanguageKey", MethodType.methodType(String.class)); + irisPresent = true; + } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { + irisPresent = false; + } + } + + public static Screen getIrisShaderPacksScreen(Screen parent) { + if (irisPresent) { + try { + return (Screen) handleScreen.invokeWithArguments(apiInstance, parent); + } catch (Throwable throwable) { + throwable.printStackTrace(); + } + } + + return null; + } + + public static String getIrisShaderPacksScreenLanguageKey() { + if (irisPresent) { + try { + return (String) handleTranslationKey.invoke(apiInstance); + } catch (Throwable throwable) { + throwable.printStackTrace(); + } + } + + return null; + } + + public static boolean isIrisPresent() { + return irisPresent; + } +} \ No newline at end of file From 5c23fc6e271c936b28ac0dbbed923109477e6d56 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 7 Jun 2023 23:55:08 +0800 Subject: [PATCH 104/112] change: Update to 1.20 --- build.gradle | 4 ++-- gradle.properties | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 02bd18d..d4557c1 100644 --- a/build.gradle +++ b/build.gradle @@ -35,8 +35,8 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation "me.jellysquid.mods:sodium-fabric:0.4.10+build.219" - //modImplementation "maven.modrinth:sodium:${project.sodium_version}" + //modImplementation "me.jellysquid.mods:sodium-fabric:0.4.10+build.219" + modImplementation "maven.modrinth:sodium:${project.sodium_version}" //modImplementation "maven.modrinth:iris:${project.iris_version}" //modRuntimeOnly "maven.modrinth:lazydfu:0.1.3" diff --git a/gradle.properties b/gradle.properties index 5010dd7..80e24ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.20-rc1 - yarn_mappings=1.20-rc1+build.2 + minecraft_version=1.20 + yarn_mappings=1.20+build.1 loader_version=0.14.21 # Mod Properties mod_version=1.5.0 @@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1G archives_base_name=reeses_sodium_options # Dependency - sodium_version=mc1.19.4-0.4.10 + sodium_version=mc1.20-0.4.10 iris_version=1.5.2+1.19.4 #Fabric api From 6e04c6f0fab19adb4bfa2f4ab2ad60f015ae14bf Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 8 Jun 2023 05:35:53 +0800 Subject: [PATCH 105/112] change: Fix tooltips text rendering --- .../client/gui/frame/OptionPageFrame.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java index 63470d0..ebb5f58 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java @@ -138,11 +138,17 @@ private void renderOptionTooltip(DrawContext drawContext, ControlElement elem boxY = dim.getLimitY(); } - this.drawRect(boxX, boxY, boxX + boxWidth, boxY + boxHeight, 0xE0000000); - this.drawRectOutline(boxX, boxY, boxX + boxWidth, boxY + boxHeight, 0xFF94E4D3); + drawContext.getMatrices().translate(0, 0, 90); + //this.drawRect(boxX, boxY, boxX + boxWidth, boxY + boxHeight, 0xE0000000); + drawContext.fill(boxX, boxY, boxX + boxWidth, boxY + boxHeight, 0xE0000000); + //this.drawRectOutline(boxX, boxY, boxX + boxWidth, boxY + boxHeight, 0xFF94E4D3); + drawContext.fill(boxX, boxY, boxX + boxWidth, boxY + 1, 0xFF94E4D3); // top + drawContext.fill(boxX, boxY + boxHeight - 1, boxX + boxWidth, boxY + boxHeight, 0xFF94E4D3); // bottom + drawContext.fill(boxX, boxY, boxX + 1, boxY + boxHeight, 0xFF94E4D3); // left + drawContext.fill(boxX + boxWidth - 1, boxY, boxX + boxWidth, boxY + boxHeight, 0xFF94E4D3); // right for (int i = 0; i < tooltip.size(); i++) { - drawContext.drawText(MinecraftClient.getInstance().textRenderer, tooltip.get(i), boxX + textPadding, boxY + textPadding + (i * 12), 0xFFFFFFFF, false); + drawContext.drawText(MinecraftClient.getInstance().textRenderer, tooltip.get(i), boxX + textPadding, boxY + textPadding + (i * 12), 0xFFFFFFFF, true); } } From f4765fe58849412c70eaf77ab428e3ede4ba88da Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 8 Jun 2023 05:36:21 +0800 Subject: [PATCH 106/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 80e24ac..832be9e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.20+build.1 loader_version=0.14.21 # Mod Properties - mod_version=1.5.0 + mod_version=1.5.1 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options From 7fa3a088b486123de82293933394cba5a5755ece Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Thu, 20 Jul 2023 20:49:20 +0800 Subject: [PATCH 107/112] change: Add discord links for modmenu --- README.md | 2 +- src/main/resources/fabric.mod.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c724920..86539eb 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ![Mod loader: Fabric](https://img.shields.io/badge/modloader-Fabric-1976d2?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAFHGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDIgNzkuMTYwOTI0LCAyMDE3LzA3LzEzLTAxOjA2OjM5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDE4LTEyLTE2VDE2OjU0OjE3LTA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOS0wNy0yOFQyMToxNzo0OC0wNzowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6MGVkYjFjMmMtZmY4Yy1lNDQxLTkzMWYtNDk1ZDRmMTRjNzYwIj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDowZWRiMWMyYy1mZjhjLWU0NDEtOTMxZi00OTVkNGYxNGM3NjAiIHN0RXZ0OndoZW49IjIwMTgtMTItMTZUMTY6NTQ6MTctMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChXaW5kb3dzKSIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4/HiGMAAAAtUlEQVRYw+XXrQqAMBQF4D2P2eBL+QIG8RnEJFaNBjEum+0+zMQLtwwv+wV3ZzhhMDgfJ0wUSinxZUQWgKos1JP/AbD4OneIDyQPwCFniA+EJ4CaXm4TxAXCC0BNHgLhAdAnx9hC8PwGSRtAFVMQjF7cNTWED8B1cgwW20yfJgAvrssAsZ1cB3g/xckAxr6FmCDU5N6f488BrpCQ4rQBJkiMYh4ACmLzwOQF0CExinkCsvw7vgGikl+OotaKRwAAAABJRU5ErkJggg==) ![Version](https://img.shields.io/github/v/tag/FlashyReese/reeses-sodium-options?label=version&style=flat-square) [![CurseForge](http://cf.way2muchnoise.eu/title/511319.svg)](https://www.curseforge.com/minecraft/mc-mods/reeses-sodium-options) -[![Support Server](https://img.shields.io/discord/748363294749753484.svg?color=7289da&label=FlashyReese&logo=discord&style=flat-square)](https://discord.gg/TBGGM9VzH9) +[![Support Server](https://img.shields.io/discord/748363294749753484.svg?color=7289da&label=FlashyReese&logo=discord&style=flat-square)](https://discord.gg/MPHVG6MH4e) Reese's Edition of Sodium Options diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 0167526..ea93fc3 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -22,6 +22,9 @@ "modmenu": { "parent": { "id": "sodium" + }, + "links": { + "modmenu.discord": "https://discord.gg/MPHVG6MH4e" } } }, From 04d569015ed35b7f0b80aa9e27df5ac3555c2cc4 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Mon, 24 Jul 2023 10:12:26 +0800 Subject: [PATCH 108/112] fix: Don't show tooltip for controls outside of viewport --- .../client/gui/frame/OptionPageFrame.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java index ebb5f58..dd0a946 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java @@ -10,7 +10,6 @@ import me.jellysquid.mods.sodium.client.util.Dim2i; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.OrderedText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; @@ -21,14 +20,14 @@ import java.util.List; public class OptionPageFrame extends AbstractFrame { + protected final Dim2i originalDim; protected final OptionPage page; - private final int lastDimLimitY; private long lastTime = 0; private ControlElement lastHoveredElement = null; public OptionPageFrame(Dim2i dim, boolean renderOutline, OptionPage page) { super(dim, renderOutline); - this.lastDimLimitY = dim.getLimitY(); + this.originalDim = new Dim2i(dim.x(), dim.y(), dim.width(), dim.height()); this.page = page; this.setupFrame(); this.buildFrame(); @@ -91,7 +90,8 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) .findFirst() .orElse(null)); super.render(drawContext, mouseX, mouseY, delta); - if (hoveredElement != null && this.lastHoveredElement == hoveredElement && ((hoveredElement.isHovered() && hoveredElement.isMouseOver(mouseX, mouseY)) || hoveredElement.isFocused())) { + if (this.originalDim.containsCursor(mouseX, mouseY) && hoveredElement != null && this.lastHoveredElement == hoveredElement && + ((hoveredElement.isHovered() && hoveredElement.isMouseOver(mouseX, mouseY)) || hoveredElement.isFocused())) { if (this.lastTime == 0) { this.lastTime = System.currentTimeMillis(); } @@ -127,7 +127,7 @@ private void renderOptionTooltip(DrawContext drawContext, ControlElement elem int boxHeight = (tooltip.size() * 12) + boxPadding; int boxYLimit = boxY + boxHeight; - int boxYCutoff = this.lastDimLimitY;//this.dim.getLimitY(); + int boxYCutoff = this.originalDim.getLimitY(); // If the box is going to be cutoff on the Y-axis, move it back up the difference if (boxYLimit > boxYCutoff) { From e056f2296810596fc5cfefc560a7ae6a62fcae65 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Tue, 25 Jul 2023 05:31:55 +0800 Subject: [PATCH 109/112] fix: Display tooltips when navigating with keyboard --- .../client/gui/Dim2iExtended.java | 2 ++ .../client/gui/frame/OptionPageFrame.java | 12 ++++++++++-- .../mixin/sodium/MixinDim2i.java | 5 +++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/Dim2iExtended.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/Dim2iExtended.java index 03fe236..5a8604b 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/Dim2iExtended.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/Dim2iExtended.java @@ -12,4 +12,6 @@ public interface Dim2iExtended { void setHeight(int height); boolean canFitDimension(Dim2i anotherDim); + + boolean overlapWith(Dim2i anotherDim); } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java index dd0a946..58071d2 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java @@ -33,6 +33,10 @@ public OptionPageFrame(Dim2i dim, boolean renderOutline, OptionPage page) { this.buildFrame(); } + public static Builder createBuilder() { + return new Builder(); + } + public void setupFrame() { this.children.clear(); this.drawable.clear(); @@ -83,15 +87,18 @@ public void buildFrame() { @Override public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { ControlElement hoveredElement = this.controlElements.stream() + .filter(controlElement -> ((Dim2iExtended) (Object) controlElement.getDimensions()).overlapWith(this.originalDim)) .filter(ControlElement::isHovered) .findFirst() .orElse(this.controlElements.stream() + .filter(controlElement -> ((Dim2iExtended) (Object) controlElement.getDimensions()).overlapWith(this.originalDim)) .filter(ControlElement::isFocused) .findFirst() .orElse(null)); super.render(drawContext, mouseX, mouseY, delta); - if (this.originalDim.containsCursor(mouseX, mouseY) && hoveredElement != null && this.lastHoveredElement == hoveredElement && - ((hoveredElement.isHovered() && hoveredElement.isMouseOver(mouseX, mouseY)) || hoveredElement.isFocused())) { + if (hoveredElement != null && this.lastHoveredElement == hoveredElement && + ((this.originalDim.containsCursor(mouseX, mouseY) && hoveredElement.isHovered() && hoveredElement.isMouseOver(mouseX, mouseY)) + || hoveredElement.isFocused())) { if (this.lastTime == 0) { this.lastTime = System.currentTimeMillis(); } @@ -174,6 +181,7 @@ public Builder setOptionPage(OptionPage page) { public OptionPageFrame build() { Validate.notNull(this.dim, "Dimension must be specified"); + Validate.notNull(this.page, "Option Page must be specified"); return new OptionPageFrame(this.dim, this.renderOutline, this.page); } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java index 1802742..c577464 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinDim2i.java @@ -60,4 +60,9 @@ public void setHeight(int height) { public boolean canFitDimension(Dim2i anotherDim) { return this.x <= anotherDim.x() && this.y <= anotherDim.y() && this.getLimitX() >= anotherDim.getLimitX() && this.getLimitY() >= anotherDim.getLimitY(); } + + @Override + public boolean overlapWith(Dim2i other) { + return this.x < other.getLimitX() && this.getLimitX() > other.x() && this.y < other.getLimitY() && this.getLimitY() > other.y(); + } } From 9612d2678fd8021619a4000f100ed4944a0d70e3 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 26 Jul 2023 00:24:35 +0800 Subject: [PATCH 110/112] new: Add search bar --- .../client/gui/OptionExtended.java | 21 + .../client/gui/SodiumVideoOptionsScreen.java | 47 +- .../client/gui/frame/OptionPageFrame.java | 6 + .../frame/components/ScrollBarComponent.java | 17 +- .../components/SearchTextFieldComponent.java | 502 ++++++++++++++++++ .../client/gui/frame/tab/Tab.java | 11 +- .../client/gui/frame/tab/TabFrame.java | 59 +- .../mixin/sodium/MixinControlElement.java | 27 +- .../mixin/sodium/MixinOptionImpl.java | 59 ++ .../util/StringUtils.java | 75 +++ .../reeses-sodium-options.mixins.json | 1 + 11 files changed, 783 insertions(+), 42 deletions(-) create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/OptionExtended.java create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/SearchTextFieldComponent.java create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinOptionImpl.java create mode 100644 src/main/java/me/flashyreese/mods/reeses_sodium_options/util/StringUtils.java diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/OptionExtended.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/OptionExtended.java new file mode 100644 index 0000000..848d9db --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/OptionExtended.java @@ -0,0 +1,21 @@ +package me.flashyreese.mods.reeses_sodium_options.client.gui; + +import me.jellysquid.mods.sodium.client.util.Dim2i; + +public interface OptionExtended { + boolean isHighlight(); + + void setHighlight(boolean highlight); + + Dim2i getDim2i(); + + void setDim2i(Dim2i dim2i); + + Dim2i getParentDimension(); + + void setParentDimension(Dim2i dim2i); + + boolean getSelected(); + + void setSelected(boolean selected); +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java index 0c9dd2c..2eb5547 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/SodiumVideoOptionsScreen.java @@ -2,6 +2,7 @@ import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.BasicFrame; +import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components.SearchTextFieldComponent; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab.Tab; import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab.TabFrame; import me.flashyreese.mods.reeses_sodium_options.compat.IrisCompat; @@ -13,7 +14,6 @@ import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage; import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; @@ -36,6 +36,9 @@ public class SodiumVideoOptionsScreen extends Screen { private static final AtomicReference tabFrameScrollBarOffset = new AtomicReference<>(0); private static final AtomicReference optionPageScrollBarOffset = new AtomicReference<>(0); + private static final AtomicReference lastSearch = new AtomicReference<>(""); + private static final AtomicReference lastSearchIndex = new AtomicReference<>(0); + private final Screen prevScreen; private final List pages = new ArrayList<>(); private AbstractFrame frame; @@ -43,16 +46,28 @@ public class SodiumVideoOptionsScreen extends Screen { private FlatButtonWidget donateButton, hideDonateButton; private boolean hasPendingChanges; + private SearchTextFieldComponent searchTextField; + public SodiumVideoOptionsScreen(Screen prev, List pages) { super(Text.literal("Reese's Sodium Menu")); this.prevScreen = prev; this.pages.addAll(pages); } + // Hackalicious! Rebuild UI + public void rebuildUI() { + this.clearAndInit(); + } + @Override protected void init() { this.frame = this.parentFrameBuilder().build(); this.addDrawableChild(this.frame); + + this.searchTextField.setFocused(!lastSearch.get().trim().isEmpty()); + if (this.searchTextField.isFocused()) { + this.setFocused(this.searchTextField); + } } protected BasicFrame.Builder parentFrameBuilder() { @@ -88,6 +103,15 @@ protected BasicFrame.Builder parentFrameBuilder() { this.setDonationButtonVisibility(false); } + + Dim2i searchTextFieldDim; + if (SodiumClientMod.options().notifications.hideDonationButton) { + searchTextFieldDim = new Dim2i(tabFrameDim.x(), tabFrameDim.y() - 26, tabFrameDim.width(), 20); + } else { + searchTextFieldDim = new Dim2i(tabFrameDim.x(), tabFrameDim.y() - 26, donateButtonDim.x() - 12, 20); + } + + basicFrameBuilder = this.parentBasicFrameBuilder(basicFrameDim, tabFrameDim); if (IrisCompat.isIrisPresent()) { // FabricLoader.getInstance().isModLoaded("iris")) { @@ -96,8 +120,10 @@ protected BasicFrame.Builder parentFrameBuilder() { Dim2i shaderPackButtonDim; if (!SodiumClientMod.options().notifications.hideDonationButton) { shaderPackButtonDim = new Dim2i(donateButtonDim.x() - 12 - size, tabFrameDim.y() - 26, 10 + size, 20); + searchTextFieldDim = new Dim2i(tabFrameDim.x(), tabFrameDim.y() - 26, donateButtonDim.x() - 12 - size - 12, 20); } else { shaderPackButtonDim = new Dim2i(tabFrameDim.getLimitX() - size - 10, tabFrameDim.y() - 26, 10 + size, 20); + searchTextFieldDim = new Dim2i(tabFrameDim.x(), tabFrameDim.y() - 26, tabFrameDim.getLimitX() - size - 10 - 12, 20); } //FlatButtonWidget shaderPackButton = new FlatButtonWidget(shaderPackButtonDim, Text.translatable(IrisApi.getInstance().getMainScreenLanguageKey()), () -> this.client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(this))); @@ -105,6 +131,11 @@ protected BasicFrame.Builder parentFrameBuilder() { basicFrameBuilder.addChild(dim -> shaderPackButton); } + this.searchTextField = new SearchTextFieldComponent(searchTextFieldDim, this.pages, tabFrameSelectedTab, + tabFrameScrollBarOffset, optionPageScrollBarOffset, tabFrameDim.height(), this, lastSearch, lastSearchIndex); + + basicFrameBuilder.addChild(dim -> this.searchTextField); + return basicFrameBuilder; } @@ -122,7 +153,11 @@ public BasicFrame.Builder parentBasicFrameBuilder(Dim2i parentBasicFrameDim, Dim .shouldRenderOutline(false) .setTabSectionScrollBarOffset(tabFrameScrollBarOffset) .setTabSectionSelectedTab(tabFrameSelectedTab) - .addTabs(tabs -> this.pages.stream().filter(page -> !page.getGroups().isEmpty()).forEach(page -> tabs.add(Tab.createBuilder().from(page, optionPageScrollBarOffset)))) + .addTabs(tabs -> this.pages + .stream() + .filter(page -> !page.getGroups().isEmpty()) + .forEach(page -> tabs.add(Tab.createBuilder().from(page, optionPageScrollBarOffset))) + ) .onSetTab(() -> { optionPageScrollBarOffset.set(0); }) @@ -173,10 +208,8 @@ private void hideDonationButton() { this.setDonationButtonVisibility(false); - // Hackalicious! Rebuild UI - this.remove(this.frame); - this.frame = this.parentFrameBuilder().build(); - this.addDrawableChild(this.frame); + + this.rebuildUI(); } private void openDonationPage() { @@ -243,6 +276,8 @@ public boolean shouldCloseOnEsc() { @Override public void close() { + lastSearch.set(""); + lastSearchIndex.set(0); this.client.setScreen(this.prevScreen); } } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java index 58071d2..fcb9c02 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/OptionPageFrame.java @@ -1,6 +1,7 @@ package me.flashyreese.mods.reeses_sodium_options.client.gui.frame; import me.flashyreese.mods.reeses_sodium_options.client.gui.Dim2iExtended; +import me.flashyreese.mods.reeses_sodium_options.client.gui.OptionExtended; import me.jellysquid.mods.sodium.client.gui.options.Option; import me.jellysquid.mods.sodium.client.gui.options.OptionGroup; import me.jellysquid.mods.sodium.client.gui.options.OptionImpact; @@ -55,6 +56,11 @@ public void setupFrame() { } ((Dim2iExtended) ((Object) this.dim)).setHeight(y); + this.page.getGroups().forEach(group -> group.getOptions().forEach(option -> { + if (option instanceof OptionExtended optionExtended) { + optionExtended.setParentDimension(this.dim); + } + })); } @Override diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java index 133b3fe..0933cfa 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/ScrollBarComponent.java @@ -11,6 +11,8 @@ public class ScrollBarComponent extends AbstractWidget { + protected static final int SCROLL_OFFSET = 6; + protected final Dim2i dim; private final Mode mode; @@ -109,7 +111,7 @@ public boolean mouseDragged(double mouseX, double mouseY, int button, double del public boolean mouseScrolled(double mouseX, double mouseY, double amount) { if (this.dim.containsCursor(mouseX, mouseY) || this.extendedScrollArea != null && this.extendedScrollArea.containsCursor(mouseX, mouseY)) { if (this.offset <= this.maxScrollBarOffset && this.offset >= 0) { - int value = (int) (this.offset - amount * 6); + int value = (int) (this.offset - amount * SCROLL_OFFSET); this.setOffset(value); return true; } @@ -141,6 +143,11 @@ protected void drawRectOutline(double x, double y, double w, double h, int color }); } + public void setOffsetFromCords(int x, int y) { + int offset = x * this.viewPortLength / this.frameLength; + this.setOffset(offset); + } + @Override public ScreenRect getNavigationFocus() { return new ScreenRect(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height()); @@ -153,18 +160,18 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { if (this.mode == Mode.VERTICAL) { if (keyCode == InputUtil.GLFW_KEY_UP) { - this.setOffset(this.getOffset() - 6); + this.setOffset(this.getOffset() - SCROLL_OFFSET); return true; } else if (keyCode == InputUtil.GLFW_KEY_DOWN) { - this.setOffset(this.getOffset() + 6); + this.setOffset(this.getOffset() + SCROLL_OFFSET); return true; } } else { if (keyCode == InputUtil.GLFW_KEY_LEFT) { - this.setOffset(this.getOffset() - 6); + this.setOffset(this.getOffset() - SCROLL_OFFSET); return true; } else if (keyCode == InputUtil.GLFW_KEY_RIGHT) { - this.setOffset(this.getOffset() + 6); + this.setOffset(this.getOffset() + SCROLL_OFFSET); return true; } } diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/SearchTextFieldComponent.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/SearchTextFieldComponent.java new file mode 100644 index 0000000..c8ecf2b --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/components/SearchTextFieldComponent.java @@ -0,0 +1,502 @@ +package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.OptionExtended; +import me.flashyreese.mods.reeses_sodium_options.client.gui.SodiumVideoOptionsScreen; +import me.flashyreese.mods.reeses_sodium_options.util.StringUtils; +import me.jellysquid.mods.sodium.client.gui.options.Option; +import me.jellysquid.mods.sodium.client.gui.options.OptionPage; +import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import net.minecraft.SharedConstants; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.ScreenRect; +import net.minecraft.client.gui.navigation.GuiNavigation; +import net.minecraft.client.gui.navigation.GuiNavigationPath; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.text.OrderedText; +import net.minecraft.text.Style; +import net.minecraft.text.Text; +import net.minecraft.util.Util; +import net.minecraft.util.math.MathHelper; +import org.jetbrains.annotations.Nullable; +import org.lwjgl.glfw.GLFW; + +import java.util.List; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.BiFunction; +import java.util.function.Predicate; + +public class SearchTextFieldComponent extends AbstractWidget { + protected final Dim2i dim; + protected final List pages; + private final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer; + private final Predicate textPredicate = Objects::nonNull; + private final BiFunction renderTextProvider = (string, firstCharacterIndex) -> OrderedText.styledForwardsVisitedString(string, Style.EMPTY); + private final AtomicReference tabFrameSelectedTab; + private final AtomicReference tabFrameScrollBarOffset; + private final AtomicReference optionPageScrollBarOffset; + private final int tabDimHeight; + private final SodiumVideoOptionsScreen sodiumVideoOptionsScreen; + private final AtomicReference lastSearch; + private final AtomicReference lastSearchIndex; + protected boolean selecting; + protected String text = ""; + protected int maxLength = 100; + protected boolean visible = true; + protected boolean editable = true; + private int firstCharacterIndex; + private int selectionStart; + private int selectionEnd; + + public SearchTextFieldComponent(Dim2i dim, List pages, AtomicReference tabFrameSelectedTab, AtomicReference tabFrameScrollBarOffset, AtomicReference optionPageScrollBarOffset, int tabDimHeight, SodiumVideoOptionsScreen sodiumVideoOptionsScreen, AtomicReference lastSearch, AtomicReference lastSearchIndex) { + this.dim = dim; + this.pages = pages; + this.tabFrameSelectedTab = tabFrameSelectedTab; + this.tabFrameScrollBarOffset = tabFrameScrollBarOffset; + this.optionPageScrollBarOffset = optionPageScrollBarOffset; + this.tabDimHeight = tabDimHeight; + this.sodiumVideoOptionsScreen = sodiumVideoOptionsScreen; + this.lastSearch = lastSearch; + this.lastSearchIndex = lastSearchIndex; + if (!lastSearch.get().trim().isEmpty()) { + this.write(lastSearch.get()); + } + } + + @Override + public void render(DrawContext context, int mouseX, int mouseY, float delta) { + if (!this.isVisible()) { + return; + } + this.drawRect(this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), this.isFocused() ? 0xE0000000 : 0x90000000); + int j = this.selectionStart - this.firstCharacterIndex; + int k = this.selectionEnd - this.firstCharacterIndex; + String string = this.textRenderer.trimToWidth(this.text.substring(this.firstCharacterIndex), this.getInnerWidth()); + boolean bl = j >= 0 && j <= string.length(); + int l = this.dim.x() + 6; + int m = this.dim.y() + 6; + int n = l; + if (k > string.length()) { + k = string.length(); + } + if (!string.isEmpty()) { + String string2 = bl ? string.substring(0, j) : string; + n = context.drawTextWithShadow(this.textRenderer, this.renderTextProvider.apply(string2, this.firstCharacterIndex), n, m, 0xFFFFFFFF); + } + boolean bl3 = this.selectionStart < this.text.length() || this.text.length() >= this.getMaxLength(); + int o = n; + if (!bl) { + o = j > 0 ? l + this.dim.width() - 12 : l; + } else if (bl3) { + --o; + --n; + } + if (!string.isEmpty() && bl && j < string.length()) { + context.drawTextWithShadow(this.textRenderer, this.renderTextProvider.apply(string.substring(j), this.selectionStart), n, m, 0xFFFFFFFF); + } + // Cursor + if (this.isFocused()) { + context.fill(RenderLayer.getGuiOverlay(), o, m - 1, o + 1, m + 1 + this.textRenderer.fontHeight, -3092272); + } + // Highlighted text + if (k != j) { + int p = l + this.textRenderer.getWidth(string.substring(0, k)); + this.drawSelectionHighlight(context, o, m - 1, p - 1, m + 1 + this.textRenderer.fontHeight); + } + + /*this.drawRect(context, this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0x90000000); + //this.drawBorder(context, this.dim.x(), this.dim.y(), this.dim.getLimitX(), this.dim.getLimitY(), 0xffffffff); + this.drawString(context, this.text, this.dim.x() + 6, this.dim.y() + 6, 0xffffffff);*/ + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + int i = MathHelper.floor(mouseX) - this.dim.x() - 6; + String string = this.textRenderer.trimToWidth(this.text.substring(this.firstCharacterIndex), this.getInnerWidth()); + this.setCursor(this.textRenderer.trimToWidth(string, i).length() + this.firstCharacterIndex); + + this.setFocused(this.dim.containsCursor(mouseX, mouseY)); + this.pages.forEach(page -> page + .getOptions() + .stream() + .filter(OptionExtended.class::isInstance) + .map(OptionExtended.class::cast) + .forEach(optionExtended -> optionExtended.setSelected(false))); + return this.isFocused(); + } + + private void drawSelectionHighlight(DrawContext context, int x1, int y1, int x2, int y2) { + int i; + if (x1 < x2) { + i = x1; + x1 = x2; + x2 = i; + } + if (y1 < y2) { + i = y1; + y1 = y2; + y2 = i; + } + if (x2 > this.dim.x() + this.dim.width()) { + x2 = this.dim.x() + this.dim.width(); + } + if (x1 > this.dim.x() + this.dim.width()) { + x1 = this.dim.x() + this.dim.width(); + } + context.fill(RenderLayer.getGuiTextHighlight(), x1, y1, x2, y2, -16776961); + } + + private int getMaxLength() { + return this.maxLength; + } + + public String getSelectedText() { + int i = Math.min(this.selectionStart, this.selectionEnd); + int j = Math.max(this.selectionStart, this.selectionEnd); + return this.text.substring(i, j); + } + + public void write(String text) { + + + int i = Math.min(this.selectionStart, this.selectionEnd); + int j = Math.max(this.selectionStart, this.selectionEnd); + int k = this.maxLength - this.text.length() - (i - j); + String string = SharedConstants.stripInvalidChars(text); + int l = string.length(); + if (k < l) { + string = string.substring(0, k); + l = k; + } + + String string2 = (new StringBuilder(this.text)).replace(i, j, string).toString(); + if (this.textPredicate.test(string2)) { + this.text = string2; + this.setSelectionStart(i + l); + this.setSelectionEnd(this.selectionStart); + this.onChanged(this.text); + } + } + + private void onChanged(String newText) { + this.pages.forEach(page -> page + .getOptions() + .stream() + .filter(OptionExtended.class::isInstance) + .map(OptionExtended.class::cast) + .forEach(optionExtended -> optionExtended.setHighlight(false))); + + this.lastSearch.set(newText.trim()); + if (this.editable) { + if (!newText.trim().isEmpty()) { + List> fuzzy = StringUtils.fuzzySearch(this.pages, newText, 2); + fuzzy.stream() + .filter(OptionExtended.class::isInstance) + .map(OptionExtended.class::cast) + .forEach(optionExtended -> optionExtended.setHighlight(true)); + } + } + } + + private void erase(int offset) { + if (Screen.hasControlDown()) { + this.eraseWords(offset); + } else { + this.eraseCharacters(offset); + } + + } + + public void eraseWords(int wordOffset) { + if (!this.text.isEmpty()) { + if (this.selectionEnd != this.selectionStart) { + this.write(""); + } else { + this.eraseCharacters(this.getWordSkipPosition(wordOffset) - this.selectionStart); + } + } + } + + public void eraseCharacters(int characterOffset) { + if (!this.text.isEmpty()) { + if (this.selectionEnd != this.selectionStart) { + this.write(""); + } else { + int i = this.getCursorPosWithOffset(characterOffset); + int j = Math.min(i, this.selectionStart); + int k = Math.max(i, this.selectionStart); + if (j != k) { + String string = (new StringBuilder(this.text)).delete(j, k).toString(); + if (this.textPredicate.test(string)) { + this.text = string; + this.setCursor(j); + this.onChanged(this.text); + } + } + } + } + } + + public int getWordSkipPosition(int wordOffset) { + return this.getWordSkipPosition(wordOffset, this.getCursor()); + } + + private int getWordSkipPosition(int wordOffset, int cursorPosition) { + return this.getWordSkipPosition(wordOffset, cursorPosition, true); + } + + private int getWordSkipPosition(int wordOffset, int cursorPosition, boolean skipOverSpaces) { + int i = cursorPosition; + boolean bl = wordOffset < 0; + int j = Math.abs(wordOffset); + + for (int k = 0; k < j; ++k) { + if (!bl) { + int l = this.text.length(); + i = this.text.indexOf(32, i); + if (i == -1) { + i = l; + } else { + while (skipOverSpaces && i < l && this.text.charAt(i) == ' ') { + ++i; + } + } + } else { + while (skipOverSpaces && i > 0 && this.text.charAt(i - 1) == ' ') { + --i; + } + + while (i > 0 && this.text.charAt(i - 1) != ' ') { + --i; + } + } + } + + return i; + } + + public int getCursor() { + return this.selectionStart; + } + + public void setCursor(int cursor) { + this.setSelectionStart(cursor); + if (!this.selecting) { + this.setSelectionEnd(this.selectionStart); + } + + this.onChanged(this.text); + } + + public void moveCursor(int offset) { + this.setCursor(this.getCursorPosWithOffset(offset)); + } + + private int getCursorPosWithOffset(int offset) { + return Util.moveCursor(this.text, this.selectionStart, offset); + } + + public void setSelectionStart(int cursor) { + this.selectionStart = MathHelper.clamp(cursor, 0, this.text.length()); + } + + public void setCursorToStart() { + this.setCursor(0); + } + + public void setCursorToEnd() { + this.setCursor(this.text.length()); + } + + public void setSelectionEnd(int index) { + int i = this.text.length(); + this.selectionEnd = MathHelper.clamp(index, 0, i); + if (this.textRenderer != null) { + if (this.firstCharacterIndex > i) { + this.firstCharacterIndex = i; + } + + int j = this.getInnerWidth(); + String string = this.textRenderer.trimToWidth(this.text.substring(this.firstCharacterIndex), j); + int k = string.length() + this.firstCharacterIndex; + if (this.selectionEnd == this.firstCharacterIndex) { + this.firstCharacterIndex -= this.textRenderer.trimToWidth(this.text, j, true).length(); + } + + if (this.selectionEnd > k) { + this.firstCharacterIndex += this.selectionEnd - k; + } else if (this.selectionEnd <= this.firstCharacterIndex) { + this.firstCharacterIndex -= this.firstCharacterIndex - this.selectionEnd; + } + + this.firstCharacterIndex = MathHelper.clamp(this.firstCharacterIndex, 0, i); + } + } + + public boolean isActive() { + return this.isVisible() && this.isFocused() && this.isEditable(); + } + + @Override + public boolean charTyped(char chr, int modifiers) { + if (!this.isActive()) { + return false; + } + if (SharedConstants.isValidChar(chr)) { + if (this.editable) { + this.lastSearch.set(this.text.trim()); + this.write(Character.toString(chr)); + this.lastSearchIndex.set(0); + } + return true; + } + return false; + } + + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + this.pages.forEach(page2 -> page2 + .getOptions() + .stream() + .filter(OptionExtended.class::isInstance) + .map(OptionExtended.class::cast) + .forEach(optionExtended2 -> optionExtended2.setSelected(false))); + if (!this.isActive()) { + return false; + } else { + this.selecting = Screen.hasShiftDown(); + if (Screen.isSelectAll(keyCode)) { + this.setCursorToEnd(); + this.setSelectionEnd(0); + return true; + } else if (Screen.isCopy(keyCode)) { + MinecraftClient.getInstance().keyboard.setClipboard(this.getSelectedText()); + return true; + } else if (Screen.isPaste(keyCode)) { + if (this.editable) { + this.write(MinecraftClient.getInstance().keyboard.getClipboard()); + } + + return true; + } else if (Screen.isCut(keyCode)) { + MinecraftClient.getInstance().keyboard.setClipboard(this.getSelectedText()); + if (this.editable) { + this.write(""); + } + + return true; + } else { + switch (keyCode) { + case GLFW.GLFW_KEY_ENTER -> { + if (this.editable) { + int count = 0; + for (OptionPage page : this.pages) { + for (Option option : page.getOptions()) { + if (option instanceof OptionExtended optionExtended && optionExtended.isHighlight() && optionExtended.getParentDimension() != null) { + if (count == this.lastSearchIndex.get()) { + Dim2i optionDim = optionExtended.getDim2i(); + Dim2i parentDim = optionExtended.getParentDimension(); + int maxOffset = parentDim.height() - this.tabDimHeight; + int input = optionDim.y() - parentDim.y(); + int inputOffset = input + optionDim.height() == parentDim.height() ? parentDim.height() : input; + int offset = inputOffset * maxOffset / parentDim.height(); + + + int total = this.pages.stream().mapToInt(page2 -> Math.toIntExact(page2.getOptions().stream().filter(OptionExtended.class::isInstance).map(OptionExtended.class::cast).filter(OptionExtended::isHighlight).count())).sum(); + + int value = total == this.lastSearchIndex.get() + 1 ? 0 : this.lastSearchIndex.get() + 1; + optionExtended.setSelected(true); + this.lastSearchIndex.set(value); + this.tabFrameSelectedTab.set(page.getName()); + // todo: calculate tab frame scroll bar offset + this.tabFrameScrollBarOffset.set(0); + + + this.optionPageScrollBarOffset.set(offset); + this.setFocused(false); + this.sodiumVideoOptionsScreen.rebuildUI(); + return true; + } + count++; + } + } + } + } + return true; + } + case GLFW.GLFW_KEY_BACKSPACE -> { + if (this.editable) { + this.selecting = false; + this.erase(-1); + this.selecting = Screen.hasShiftDown(); + } + return true; + } + case GLFW.GLFW_KEY_DELETE -> { + if (this.editable) { + this.selecting = false; + this.erase(1); + this.selecting = Screen.hasShiftDown(); + } + return true; + } + case GLFW.GLFW_KEY_RIGHT -> { + if (Screen.hasControlDown()) { + this.setCursor(this.getWordSkipPosition(1)); + } else { + this.moveCursor(1); + } + return true; + } + case GLFW.GLFW_KEY_LEFT -> { + if (Screen.hasControlDown()) { + this.setCursor(this.getWordSkipPosition(-1)); + } else { + this.moveCursor(-1); + } + return true; + } + case GLFW.GLFW_KEY_HOME -> { + this.setCursorToStart(); + return true; + } + case GLFW.GLFW_KEY_END -> { + this.setCursorToEnd(); + return true; + } + default -> { + return false; + } + } + } + } + } + + public boolean isVisible() { + return visible; + } + + public boolean isEditable() { + return editable; + } + + public int getInnerWidth() { + return this.dim.width() - 12; + } + + @Override + public @Nullable GuiNavigationPath getNavigationPath(GuiNavigation navigation) { + if (!this.visible) + return null; + return super.getNavigationPath(navigation); + } + + @Override + public ScreenRect getNavigationFocus() { + return new ScreenRect(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height()); + } +} \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java index 761d6ce..3d8eb81 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/Tab.java @@ -43,7 +43,16 @@ public Tab build() { } public Tab from(OptionPage page, AtomicReference verticalScrollBarOffset) { - return new Tab<>(page.getName(), dim2i -> ScrollableFrame.createBuilder().setDimension(dim2i).setFrame(new OptionPageFrame(new Dim2i(dim2i.x(), dim2i.y(), dim2i.width(), dim2i.height()), false, page)).setVerticalScrollBarOffset(verticalScrollBarOffset).build()); + return new Tab<>(page.getName(), dim2i -> ScrollableFrame + .createBuilder() + .setDimension(dim2i) + .setFrame(OptionPageFrame + .createBuilder() + .setDimension(new Dim2i(dim2i.x(), dim2i.y(), dim2i.width(), dim2i.height())) + .setOptionPage(page) + .build()) + .setVerticalScrollBarOffset(verticalScrollBarOffset) + .build()); } } } \ No newline at end of file diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java index 1e473b3..7d34410 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/client/gui/frame/tab/TabFrame.java @@ -54,6 +54,9 @@ public TabFrame(Dim2i dim, boolean renderOutline, List> tabs, Runnable on } this.buildFrame(); + + // Let's build each frame, future note for anyone: do not move this line. + this.tabs.stream().filter(tab -> this.selectedTab != tab).forEach(tab -> tab.getFrameFunction().apply(this.frameSection)); } public static Builder createBuilder() { @@ -92,6 +95,34 @@ public void buildFrame() { super.buildFrame(); } + private void rebuildTabs() { + int offsetY = 0; + for (Tab tab : this.tabs) { + int x = this.tabSection.x(); + int y = this.tabSection.y() + offsetY - (this.tabSectionCanScroll ? this.tabSectionScrollBar.getOffset() : 0); + int width = this.tabSection.width() - (this.tabSectionCanScroll ? 12 : 4); + int height = 18; + Dim2i tabDim = new Dim2i(x, y, width, height); + + FlatButtonWidget button = new FlatButtonWidget(tabDim, tab.getTitle(), () -> this.setTab(tab)); + button.setSelected(this.selectedTab == tab); + ((FlatButtonWidgetExtended) button).setLeftAligned(true); + this.children.add(button); + + offsetY += 18; + } + } + + private void rebuildTabFrame() { + if (this.selectedTab == null) return; + AbstractFrame frame = this.selectedTab.getFrameFunction().apply(this.frameSection); + if (frame != null) { + this.selectedFrame = frame; + frame.buildFrame(); + this.children.add(frame); + } + } + @Override public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) { this.applyScissor(this.dim.x(), this.dim.y(), this.dim.width(), this.dim.height(), () -> { @@ -127,34 +158,6 @@ public boolean mouseScrolled(double mouseX, double mouseY, double amount) { return super.mouseScrolled(mouseX, mouseY, amount) || (this.tabSectionCanScroll && this.tabSectionScrollBar.mouseScrolled(mouseX, mouseY, amount)); } - private void rebuildTabs() { - int offsetY = 0; - for (Tab tab : this.tabs) { - int x = this.tabSection.x(); - int y = this.tabSection.y() + offsetY - (this.tabSectionCanScroll ? this.tabSectionScrollBar.getOffset() : 0); - int width = this.tabSection.width() - (this.tabSectionCanScroll ? 12 : 4); - int height = 18; - Dim2i tabDim = new Dim2i(x, y, width, height); - - FlatButtonWidget button = new FlatButtonWidget(tabDim, tab.getTitle(), () -> this.setTab(tab)); - button.setSelected(this.selectedTab == tab); - ((FlatButtonWidgetExtended) button).setLeftAligned(true); - this.children.add(button); - - offsetY += 18; - } - } - - private void rebuildTabFrame() { - if (this.selectedTab == null) return; - AbstractFrame frame = this.selectedTab.getFrameFunction().apply(this.frameSection); - if (frame != null) { - this.selectedFrame = frame; - frame.buildFrame(); - this.children.add(frame); - } - } - public static class Builder { private final List> functions = new ArrayList<>(); private Dim2i dim; diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java index 1f7e4de..55bd0f3 100644 --- a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinControlElement.java @@ -1,16 +1,19 @@ package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; +import me.flashyreese.mods.reeses_sodium_options.client.gui.OptionExtended; import me.jellysquid.mods.sodium.client.gui.options.Option; import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement; import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget; import me.jellysquid.mods.sodium.client.util.Dim2i; -import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; -import net.minecraft.client.gui.screen.narration.NarrationPart; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.util.Formatting; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ControlElement.class) public abstract class MixinControlElement extends AbstractWidget { @@ -21,6 +24,26 @@ public abstract class MixinControlElement extends AbstractWidget { @Shadow @Final protected Option option; + @Inject(method = "", at = @At(value = "TAIL")) + public void postInit(Option option, Dim2i dim, CallbackInfo ci) { + if (this.option instanceof OptionExtended optionExtended) { + optionExtended.setDim2i(this.dim); + } + } + + @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/gui/options/control/ControlElement;drawString(Lnet/minecraft/client/gui/DrawContext;Ljava/lang/String;III)V")) + public void drawString(ControlElement instance, DrawContext drawContext, String s, int x, int y, int color) { + if (this.option instanceof OptionExtended optionExtended && optionExtended.isHighlight()) { + String replacement = optionExtended.getSelected() ? Formatting.DARK_GREEN.toString() : Formatting.YELLOW.toString(); + + s = s.replace(Formatting.WHITE.toString(), Formatting.WHITE + replacement); + s = s.replace(Formatting.STRIKETHROUGH.toString(), Formatting.STRIKETHROUGH + replacement); + s = s.replace(Formatting.ITALIC.toString(), Formatting.ITALIC + replacement); + } + + this.drawString(drawContext, s, x, y, color); + } + @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/util/Dim2i;containsCursor(DD)Z")) public boolean render(Dim2i dim2i, double x, double y) { return this.isMouseOver(x, y); diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinOptionImpl.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinOptionImpl.java new file mode 100644 index 0000000..b2f6beb --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/mixin/sodium/MixinOptionImpl.java @@ -0,0 +1,59 @@ +package me.flashyreese.mods.reeses_sodium_options.mixin.sodium; + +import me.flashyreese.mods.reeses_sodium_options.client.gui.OptionExtended; +import me.jellysquid.mods.sodium.client.gui.options.OptionImpl; +import me.jellysquid.mods.sodium.client.util.Dim2i; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; + +@Mixin(OptionImpl.class) +public class MixinOptionImpl implements OptionExtended { + @Unique + private Dim2i parent; + @Unique + private Dim2i dim2i; + @Unique + private boolean highlight; + @Unique + private boolean selected; + + @Override + public boolean isHighlight() { + return this.highlight; + } + + @Override + public void setHighlight(boolean highlight) { + this.highlight = highlight; + } + + @Override + public Dim2i getDim2i() { + return this.dim2i; + } + + @Override + public void setDim2i(Dim2i dim2i) { + this.dim2i = dim2i; + } + + @Override + public Dim2i getParentDimension() { + return this.parent; + } + + @Override + public void setParentDimension(Dim2i parent) { + this.parent = parent; + } + + @Override + public boolean getSelected() { + return this.selected; + } + + @Override + public void setSelected(boolean selected) { + this.selected = selected; + } +} diff --git a/src/main/java/me/flashyreese/mods/reeses_sodium_options/util/StringUtils.java b/src/main/java/me/flashyreese/mods/reeses_sodium_options/util/StringUtils.java new file mode 100644 index 0000000..4ce6605 --- /dev/null +++ b/src/main/java/me/flashyreese/mods/reeses_sodium_options/util/StringUtils.java @@ -0,0 +1,75 @@ +package me.flashyreese.mods.reeses_sodium_options.util; + +import me.jellysquid.mods.sodium.client.gui.options.Option; +import me.jellysquid.mods.sodium.client.gui.options.OptionPage; + +import java.util.ArrayList; +import java.util.List; + +public class StringUtils { + // Levenshtein distance: Calculates the number of edits (insertion, deletion, substitution) needed to transform one string into another. + public static int levenshteinDistance(String s1, String s2) { + int m = s1.length(); + int n = s2.length(); + + int[][] dp = new int[m + 1][n + 1]; + + for (int i = 0; i <= m; i++) { + dp[i][0] = i; + } + + for (int j = 0; j <= n; j++) { + dp[0][j] = j; + } + + for (int i = 1; i <= m; i++) { + for (int j = 1; j <= n; j++) { + int cost = s1.charAt(i - 1) == s2.charAt(j - 1) ? 0 : 1; + dp[i][j] = Math.min(dp[i - 1][j] + 1, Math.min(dp[i][j - 1] + 1, dp[i - 1][j - 1] + cost)); + } + } + + return dp[m][n]; + } + + public static List> fuzzySearch(List pages, String userInput, int maxDistance) { + List> result = new ArrayList<>(); + String[] targetWords = userInput.toLowerCase().split("\\s+"); + + for (OptionPage page : pages) { + for (Option option : page.getOptions()) { + String sentence = (option.getName().getString()/* + + " " + + option.getTooltip().getString()+ + " " + + option.getImpact().toString()*/).toLowerCase(); + + boolean containsAllWords = true; + for (String word : targetWords) { + boolean containsWord = false; + for (String sentenceWord : sentence.toLowerCase().split("\\s+")) { + int distance = levenshteinDistance(word, sentenceWord); + if (distance <= maxDistance) { + containsWord = true; + break; + } + // Starts with match + if (sentenceWord.startsWith(word)) { + containsWord = true; + break; + } + } + if (!containsWord) { + containsAllWords = false; + break; + } + } + if (containsAllWords) { + result.add(option); + } + } + } + + return result; + } +} diff --git a/src/main/resources/reeses-sodium-options.mixins.json b/src/main/resources/reeses-sodium-options.mixins.json index a2a2cfa..499ff8c 100644 --- a/src/main/resources/reeses-sodium-options.mixins.json +++ b/src/main/resources/reeses-sodium-options.mixins.json @@ -8,6 +8,7 @@ "sodium.MixinCyclingControlElement", "sodium.MixinDim2i", "sodium.MixinFlatButtonWidget", + "sodium.MixinOptionImpl", "sodium.MixinSliderControlElement", "sodium.MixinSodiumOptionsGUI" ], From 9f92234c5a10d72fdc8891fef762ce4835ccedd5 Mon Sep 17 00:00:00 2001 From: Yao Chung Hu <30311066+FlashyReese@users.noreply.github.com> Date: Wed, 26 Jul 2023 02:23:26 +0800 Subject: [PATCH 111/112] change: Bump Loom and Gradle wrapper --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 61608 -> 62076 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 7 ++++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index d4557c1..26c4a5a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'org.ajoberstar.grgit' version '5.0.0' - id 'fabric-loom' version '1.2-SNAPSHOT' + id 'fabric-loom' version '1.3-SNAPSHOT' id 'maven-publish' id 'signing' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba7710deaf9f98673a68957ea02138b60d0a..c1962a79e29d3e0ab67b14947c167a862655af9b 100644 GIT binary patch delta 8979 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 F{TFmrHLU;u delta 8469 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 Date: Wed, 26 Jul 2023 02:23:38 +0800 Subject: [PATCH 112/112] change: Bump for release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e4c3724..b7071f6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G yarn_mappings=1.19.2+build.28 loader_version=0.14.21 # Mod Properties - mod_version=1.5.1 + mod_version=1.6.0 maven_group=me.flashyreese.mods archives_base_name=reeses_sodium_options