From d1c9c6f4c1d43ccc32e0b4b5491593be1876acf1 Mon Sep 17 00:00:00 2001 From: Calum Date: Fri, 26 Jan 2024 23:39:47 +0000 Subject: [PATCH] 1.20.4 --- .github/workflows/publish.yml | 1 - gradle.properties | 16 ++++++++-------- .../skinshuffle/client/SkinShuffleClient.java | 1 + .../skinshuffle/client/gui/PresetEditScreen.java | 2 +- .../client/gui/widgets/IconButtonWidget.java | 4 ++-- .../client/gui/widgets/OpenCarouselButton.java | 5 ++--- .../gui/widgets/WarningIndicatorButton.java | 2 +- .../gui/widgets/preset/AbstractCardWidget.java | 8 ++++++++ .../mixin/screen/TitleScreenMixin.java | 2 +- src/main/resources/fabric.mod.json | 4 ++-- 10 files changed, 26 insertions(+), 19 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 69e5386..664e138 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -26,7 +26,6 @@ jobs: run: ./gradlew build - uses: Kir-Antipov/mc-publish@v3.3 with: -# version-type: beta modrinth-id: ${{ vars.MODRINTH_ID }} modrinth-token: ${{ secrets.MODRINTH_TOKEN }} curseforge-id: ${{ vars.CURSEFORGE_ID }} diff --git a/gradle.properties b/gradle.properties index ec025b9..fe905e9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,18 +2,18 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.2 -yarn_mappings=1.20.2+build.4 -loader_version=0.14.23 +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.3 +loader_version=0.15.6 # Mod Properties -mod_version=1.1.0+1.20.2 +mod_version=1.1.0+1.20.4 maven_group=com.mineblock11 archives_base_name=SkinShuffle # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.90.0+1.20.2 -spruceui_version=5.0.3+1.20.2 +fabric_version=0.95.1+1.20.4 +spruceui_version=5.0.3+1.20.4 jsoup_version=1.16.1 cvurlio_version=1.5.1 -modmenu_version=8.0.0 -yacl_version=3.3.0-beta.1+1.20.2 +modmenu_version=9.0.0 +yacl_version=3.3.2+1.20.4 diff --git a/src/main/java/com/mineblock11/skinshuffle/client/SkinShuffleClient.java b/src/main/java/com/mineblock11/skinshuffle/client/SkinShuffleClient.java index 1adf83e..fec09e2 100644 --- a/src/main/java/com/mineblock11/skinshuffle/client/SkinShuffleClient.java +++ b/src/main/java/com/mineblock11/skinshuffle/client/SkinShuffleClient.java @@ -30,6 +30,7 @@ public class SkinShuffleClient implements ClientModInitializer { @Override public void onInitializeClient() { SkinPresetManager.setup(); + SkinPresetManager.loadPresets(); ClientSkinHandling.init(); SkinShuffleConfig.load(); } diff --git a/src/main/java/com/mineblock11/skinshuffle/client/gui/PresetEditScreen.java b/src/main/java/com/mineblock11/skinshuffle/client/gui/PresetEditScreen.java index 2d269ff..a5d55f6 100644 --- a/src/main/java/com/mineblock11/skinshuffle/client/gui/PresetEditScreen.java +++ b/src/main/java/com/mineblock11/skinshuffle/client/gui/PresetEditScreen.java @@ -319,7 +319,7 @@ public int getHeight() { this.textFieldWidget.setChangedListener(str -> updateValidity()); - skinModelButton = new CyclingButtonWidget.Builder<>(Text::of) + skinModelButton = new CyclingButtonWidget.Builder(Text::of) .values("default", "slim") .build(0, 0, 192, 20, Text.translatable("skinshuffle.edit.source.skin_model")); diff --git a/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/IconButtonWidget.java b/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/IconButtonWidget.java index 1eb8e60..cb3c71e 100644 --- a/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/IconButtonWidget.java +++ b/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/IconButtonWidget.java @@ -52,8 +52,8 @@ public IconButtonWidget(int x, int y, int width, int height, int iconU, int icon this.iconHeight = iconHeight; } - public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { - super.renderButton(context, mouseX, mouseY, delta); + public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) { + super.renderWidget(context, mouseX, mouseY, delta); context.drawTexture(this.iconTexture, this.getIconX(), this.getIconY(), this.iconU, this.iconV + (active ? (hovered ? 16 : 0) : this.iconDisabledVOffset), 0, this.iconWidth, this.iconHeight, this.iconTextureWidth, this.iconTextureHeight); } diff --git a/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/OpenCarouselButton.java b/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/OpenCarouselButton.java index 0f1502d..37840c4 100644 --- a/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/OpenCarouselButton.java +++ b/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/OpenCarouselButton.java @@ -61,9 +61,8 @@ private float getEntityRotation() { } @Override - public void render(DrawContext context, int mouseX, int mouseY, float delta) { - super.render(context, mouseX, mouseY, delta); - + public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) { + super.renderWidget(context, mouseX, mouseY, delta); if (this.entity != null && selectedPreset != null) { // Don't want to render the entity if the skin is still loading if (!selectedPreset.getSkin().isLoading()) { diff --git a/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/WarningIndicatorButton.java b/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/WarningIndicatorButton.java index 7d06a5e..ad36e57 100644 --- a/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/WarningIndicatorButton.java +++ b/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/WarningIndicatorButton.java @@ -54,7 +54,7 @@ public WarningIndicatorButton(int x, int y, Screen parent) { } @Override - public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { + public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) { context.drawTexture(this.iconTexture, this.getIconX(), this.getIconY(), this.iconU, this.iconV + (hovered ? 16 : 0), 0, this.iconWidth, this.iconHeight, this.iconTextureWidth, this.iconTextureHeight); } } diff --git a/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/preset/AbstractCardWidget.java b/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/preset/AbstractCardWidget.java index 5f52e36..d455c0c 100644 --- a/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/preset/AbstractCardWidget.java +++ b/src/main/java/com/mineblock11/skinshuffle/client/gui/widgets/preset/AbstractCardWidget.java @@ -23,6 +23,7 @@ import com.mineblock11.skinshuffle.client.gui.CarouselScreen; import dev.lambdaurora.spruceui.Position; import dev.lambdaurora.spruceui.widget.container.SpruceContainerWidget; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.GlfwUtil; import net.minecraft.util.math.MathHelper; @@ -100,6 +101,13 @@ public void setDragStart(double x, double y) { this.dragStartY = y; } + @Override + protected void renderWidget(DrawContext graphics, int mouseX, int mouseY, float delta) { + this.renderBackground(graphics, mouseX, mouseY, delta); + + super.renderWidget(graphics, mouseX, mouseY, delta); + } + @Override public boolean isDragging() { return dragging; diff --git a/src/main/java/com/mineblock11/skinshuffle/mixin/screen/TitleScreenMixin.java b/src/main/java/com/mineblock11/skinshuffle/mixin/screen/TitleScreenMixin.java index 642784f..5fa958f 100644 --- a/src/main/java/com/mineblock11/skinshuffle/mixin/screen/TitleScreenMixin.java +++ b/src/main/java/com/mineblock11/skinshuffle/mixin/screen/TitleScreenMixin.java @@ -69,7 +69,7 @@ public void refreshConfig(CallbackInfo ci) { public void close() { if (this.openCarouselWidgets != null) { for (ClickableWidget openCarouselWidget : this.openCarouselWidgets) { - if(openCarouselWidget instanceof OpenCarouselButton button) { + if(openCarouselWidget instanceof OpenCarouselButton button) { button.disposed(); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7252f61..6933778 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ "enjarai" ], "contact": { - "repo": "https://github.com/mineblock11/skinshuffle" + "repo": "https://github.com/IMB11/skinshuffle" }, "license": "MIT", "icon": "assets/skinshuffle/icon.png", @@ -32,6 +32,6 @@ "depends": { "fabricloader": ">=${loader_version}", "fabric": "*", - "minecraft": ">=1.20" + "minecraft": ">=1.20.3 <=1.20.4" } }