diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java index 5f8b2fa..6d0529c 100644 --- a/1.16_combat-6/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java +++ b/1.16_combat-6/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java @@ -57,9 +57,9 @@ public class ColorSelectionScreen extends io.github.axolotlclient.AxolotlClientC private final ColorOption option; private final Screen parent; private NVGPaint paint; - private BooleanOption chroma; - private FloatOption speed; - private IntegerOption alpha; + private final BooleanOption chroma; + private final FloatOption speed; + private final IntegerOption alpha; private int selectorRadius; private float selectorX; private float selectorY; @@ -69,16 +69,8 @@ public ColorSelectionScreen(Screen parent, ColorOption option) { super("select_color"); this.option = option; this.parent = parent; - } - - @Override - public void init() { - super.init(); - addDrawableChild(new RoundedButtonWidget(width / 2 - 75, height - 40, new TranslatableText("gui.back"), - button -> MinecraftClient.getInstance().openScreen(parent))); - - chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), option.getOriginal()::setChroma); - speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), option.getOriginal()::setChromaSpeed, 0f, 4f); + chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), v -> option.getOriginal().setChroma(v)); + speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), v -> option.getOriginal().setChromaSpeed(v), 0f, 4f); alpha = new IntegerOption("option.alpha", option.getOriginal().getAlpha(), val -> { option.getOriginal().setAlpha(val); children().forEach(e -> { @@ -87,6 +79,13 @@ public void init() { } }); }, 0, 255); + } + + @Override + public void init() { + super.init(); + addDrawableChild(new RoundedButtonWidget(width / 2 - 75, height - 40, new TranslatableText("gui.back"), + button -> MinecraftClient.getInstance().openScreen(parent))); selectorRadius = Math.max(Math.min(width / 4 - 10, (height) / 2 - 60), 75); selectorX = width / 4f - selectorRadius;//width/2f-selectorRadius*2; diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java index 9d926d7..fc8948f 100644 --- a/1.16_combat-6/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java +++ b/1.16_combat-6/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java @@ -51,9 +51,9 @@ public class ColorSelectionScreen extends io.github.axolotlclient.AxolotlClientC private final ColorOption option; private final Identifier texture = new Identifier("axolotlclientconfig", "textures/gui/colorwheel.png"); private final Screen parent; - private BooleanOption chroma; - private FloatOption speed; - private IntegerOption alpha; + private final BooleanOption chroma; + private final FloatOption speed; + private final IntegerOption alpha; private int selectorRadius; private float selectorX; private float selectorY; @@ -63,16 +63,8 @@ public ColorSelectionScreen(Screen parent, ColorOption option) { super("select_color"); this.option = option; this.parent = parent; - } - - @Override - public void init() { - super.init(); - addDrawableChild(new VanillaButtonWidget(width / 2 - 75, height - 40, 150, 20, - ScreenTexts.BACK, buttonWidget -> removed())); - - chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), option.getOriginal()::setChroma); - speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), option.getOriginal()::setChromaSpeed, 0f, 4f); + chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), v -> option.getOriginal().setChroma(v)); + speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), v -> option.getOriginal().setChromaSpeed(v), 0f, 4f); alpha = new IntegerOption("option.alpha", option.getOriginal().getAlpha(), val -> { option.getOriginal().setAlpha(val); children().forEach(e -> { @@ -81,6 +73,13 @@ public void init() { } }); }, 0, 255); + } + + @Override + public void init() { + super.init(); + addDrawableChild(new VanillaButtonWidget(width / 2 - 75, height - 40, 150, 20, + ScreenTexts.BACK, buttonWidget -> removed())); selectorRadius = Math.max(Math.min(width / 4 - 10, (height) / 2 - 60), 75); selectorX = width / 4f - selectorRadius; diff --git a/1.20/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java b/1.20/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java index 3e87bd2..fae7595 100644 --- a/1.20/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java +++ b/1.20/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java @@ -56,9 +56,9 @@ public class ColorSelectionScreen extends Screen implements DrawingUtil { private final ColorOption option; private final Screen parent; private NVGPaint paint; - private BooleanOption chroma; - private FloatOption speed; - private IntegerOption alpha; + private final BooleanOption chroma; + private final FloatOption speed; + private final IntegerOption alpha; private int selectorRadius; private float selectorX; private float selectorY; @@ -68,15 +68,8 @@ public ColorSelectionScreen(Screen parent, ColorOption option) { super(Text.translatable("select_color")); this.option = option; this.parent = parent; - } - - @Override - public void init() { - addDrawableChild(new RoundedButtonWidget(width / 2 - 75, height - 40, Text.translatable("gui.back"), - button -> MinecraftClient.getInstance().setScreen(parent))); - - chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), option.getOriginal()::setChroma); - speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), option.getOriginal()::setChromaSpeed, 0f, 4f); + chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), v -> option.getOriginal().setChroma(v)); + speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), v -> option.getOriginal().setChromaSpeed(v), 0f, 4f); alpha = new IntegerOption("option.alpha", option.getOriginal().getAlpha(), val -> { option.getOriginal().setAlpha(val); children().forEach(e -> { @@ -85,6 +78,12 @@ public void init() { } }); }, 0, 255); + } + + @Override + public void init() { + addDrawableChild(new RoundedButtonWidget(width / 2 - 75, height - 40, Text.translatable("gui.back"), + button -> MinecraftClient.getInstance().setScreen(parent))); selectorRadius = Math.max(Math.min(width / 4 - 10, (height) / 2 - 60), 75); selectorX = width / 4f - selectorRadius;//width/2f-selectorRadius*2; diff --git a/1.20/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java b/1.20/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java index 4254fb2..cac193e 100644 --- a/1.20/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java +++ b/1.20/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java @@ -50,9 +50,9 @@ public class ColorSelectionScreen extends Screen { private final ColorOption option; private final Identifier texture = new Identifier("axolotlclientconfig", "textures/gui/colorwheel.png"); private final Screen parent; - private BooleanOption chroma; - private FloatOption speed; - private IntegerOption alpha; + private final BooleanOption chroma; + private final FloatOption speed; + private final IntegerOption alpha; private int selectorRadius; private float selectorX; private float selectorY; @@ -62,16 +62,8 @@ public ColorSelectionScreen(Screen parent, ColorOption option) { super(Text.translatable("select_color")); this.option = option; this.parent = parent; - } - - @Override - public void init() { - super.init(); - addDrawableChild(ButtonWidget.builder(CommonTexts.BACK, buttonWidget -> closeScreen()) - .position(width / 2 - 75, height - 40).build()); - - chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), option.getOriginal()::setChroma); - speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), option.getOriginal()::setChromaSpeed, 0f, 4f); + chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), v -> option.getOriginal().setChroma(v)); + speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), v -> option.getOriginal().setChromaSpeed(v), 0f, 4f); alpha = new IntegerOption("option.alpha", option.getOriginal().getAlpha(), val -> { option.getOriginal().setAlpha(val); children().forEach(e -> { @@ -80,6 +72,13 @@ public void init() { } }); }, 0, 255); + } + + @Override + public void init() { + super.init(); + addDrawableChild(ButtonWidget.builder(CommonTexts.BACK, buttonWidget -> closeScreen()) + .position(width / 2 - 75, height - 40).build()); selectorRadius = Math.max(Math.min(width / 4 - 10, (height) / 2 - 60), 75); selectorX = width / 4f - selectorRadius; diff --git a/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/mixin/AbstractSelectionListMixin.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/mixin/AbstractSelectionListMixin.java new file mode 100644 index 0000000..794380f --- /dev/null +++ b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/mixin/AbstractSelectionListMixin.java @@ -0,0 +1,42 @@ +/* + * Copyright © 2021-2025 moehreag & Contributors + * + * This file is part of AxolotlClient. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * For more information, see the LICENSE file. + */ + +package io.github.axolotlclient.AxolotlClientConfig.impl.mixin; + +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import io.github.axolotlclient.AxolotlClientConfig.impl.ui.rounded.widgets.RoundedButtonListWidget; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.AbstractSelectionList; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +@Mixin(AbstractSelectionList.class) +public class AbstractSelectionListMixin { + + @WrapOperation(method = "renderWidget", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;disableScissor()V")) + private void noVanillaScissor(GuiGraphics instance, Operation original) { + if (!(((AbstractSelectionList) (Object) this) instanceof RoundedButtonListWidget)) { + original.call(instance); + } + } +} diff --git a/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java index fc91b90..dd30e19 100644 --- a/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java +++ b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java @@ -56,9 +56,9 @@ public class ColorSelectionScreen extends Screen implements DrawingUtil { private final ColorOption option; private final Screen parent; private NVGPaint paint; - private BooleanOption chroma; - private FloatOption speed; - private IntegerOption alpha; + private final BooleanOption chroma; + private final FloatOption speed; + private final IntegerOption alpha; private int selectorRadius; private float selectorX; private float selectorY; @@ -68,15 +68,8 @@ public ColorSelectionScreen(Screen parent, ColorOption option) { super(Component.translatable("select_color")); this.option = option; this.parent = parent; - } - - @Override - public void init() { - addRenderableWidget(new RoundedButtonWidget(width / 2 - 75, height - 40, Component.translatable("gui.back"), - button -> minecraft.setScreen(parent))); - - chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), option.getOriginal()::setChroma); - speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), option.getOriginal()::setChromaSpeed, 0f, 4f); + chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), v -> option.getOriginal().setChroma(v)); + speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), v -> option.getOriginal().setChromaSpeed(v), 0f, 4f); alpha = new IntegerOption("option.alpha", option.getOriginal().getAlpha(), val -> { option.getOriginal().setAlpha(val); children().forEach(e -> { @@ -85,6 +78,12 @@ public void init() { } }); }, 0, 255); + } + + @Override + public void init() { + addRenderableWidget(new RoundedButtonWidget(width / 2 - 75, height - 40, Component.translatable("gui.back"), + button -> minecraft.setScreen(parent))); selectorRadius = Math.max(Math.min(width / 4 - 10, (height) / 2 - 60), 75); selectorX = width / 4f - selectorRadius;//width/2f-selectorRadius*2; diff --git a/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/RoundedButtonListWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/RoundedButtonListWidget.java index afa74a5..46f8164 100644 --- a/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/RoundedButtonListWidget.java +++ b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/RoundedButtonListWidget.java @@ -73,6 +73,11 @@ protected void renderDecorations(GuiGraphics graphics, int mouseX, int mouseY) { } } + @Override + protected void enableScissor(GuiGraphics guiGraphics) { + + } + private class RoundedOptionEntry extends Entry implements DrawingUtil { private final Option option; diff --git a/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java index f4e8014..9ae61de 100644 --- a/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java +++ b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java @@ -50,9 +50,9 @@ public class ColorSelectionScreen extends Screen { private final ColorOption option; private final ResourceLocation texture = ResourceLocation.fromNamespaceAndPath("axolotlclientconfig", "textures/gui/colorwheel.png"); private final Screen parent; - private BooleanOption chroma; - private FloatOption speed; - private IntegerOption alpha; + private final BooleanOption chroma; + private final FloatOption speed; + private final IntegerOption alpha; private int selectorRadius; private float selectorX; private float selectorY; @@ -62,16 +62,8 @@ public ColorSelectionScreen(Screen parent, ColorOption option) { super(Component.translatable("select_color")); this.option = option; this.parent = parent; - } - - @Override - public void init() { - super.init(); - addRenderableWidget(Button.builder(CommonComponents.GUI_BACK, buttonWidget -> onClose()) - .pos(width / 2 - 75, height - 40).build()); - - chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), option.getOriginal()::setChroma); - speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), option.getOriginal()::setChromaSpeed, 0f, 4f); + chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), v -> option.getOriginal().setChroma(v)); + speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), v -> option.getOriginal().setChromaSpeed(v), 0f, 4f); alpha = new IntegerOption("option.alpha", option.getOriginal().getAlpha(), val -> { option.getOriginal().setAlpha(val); children().forEach(e -> { @@ -80,6 +72,13 @@ public void init() { } }); }, 0, 255); + } + + @Override + public void init() { + super.init(); + addRenderableWidget(Button.builder(CommonComponents.GUI_BACK, buttonWidget -> onClose()) + .pos(width / 2 - 75, height - 40).build()); selectorRadius = Math.max(Math.min(width / 4 - 10, (height) / 2 - 60), 75); selectorX = width / 4f - selectorRadius; diff --git a/1.21.4/src/main/resources/axolotlclientconfig.mixins.json b/1.21.4/src/main/resources/axolotlclientconfig.mixins.json index 1f89568..554d7f6 100644 --- a/1.21.4/src/main/resources/axolotlclientconfig.mixins.json +++ b/1.21.4/src/main/resources/axolotlclientconfig.mixins.json @@ -5,6 +5,7 @@ "compatibilityLevel": "JAVA_21", "mixins": [], "client": [ + "AbstractSelectionListMixin", "NativeImageInvoker" ], "injectors": { diff --git a/1.21/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java b/1.21/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java index d25f53b..d4f09fb 100644 --- a/1.21/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java +++ b/1.21/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java @@ -56,9 +56,9 @@ public class ColorSelectionScreen extends Screen implements DrawingUtil { private final ColorOption option; private final Screen parent; private NVGPaint paint; - private BooleanOption chroma; - private FloatOption speed; - private IntegerOption alpha; + private final BooleanOption chroma; + private final FloatOption speed; + private final IntegerOption alpha; private int selectorRadius; private float selectorX; private float selectorY; @@ -68,15 +68,8 @@ public ColorSelectionScreen(Screen parent, ColorOption option) { super(Text.translatable("select_color")); this.option = option; this.parent = parent; - } - - @Override - public void init() { - addDrawableSelectableElement(new RoundedButtonWidget(width / 2 - 75, height - 40, Text.translatable("gui.back"), - button -> MinecraftClient.getInstance().setScreen(parent))); - - chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), option.getOriginal()::setChroma); - speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), option.getOriginal()::setChromaSpeed, 0f, 4f); + chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), v -> option.getOriginal().setChroma(v)); + speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), v -> option.getOriginal().setChromaSpeed(v), 0f, 4f); alpha = new IntegerOption("option.alpha", option.getOriginal().getAlpha(), val -> { option.getOriginal().setAlpha(val); children().forEach(e -> { @@ -85,6 +78,12 @@ public void init() { } }); }, 0, 255); + } + + @Override + public void init() { + addDrawableSelectableElement(new RoundedButtonWidget(width / 2 - 75, height - 40, Text.translatable("gui.back"), + button -> MinecraftClient.getInstance().setScreen(parent))); selectorRadius = Math.max(Math.min(width / 4 - 10, (height) / 2 - 60), 75); selectorX = width / 4f - selectorRadius;//width/2f-selectorRadius*2; diff --git a/1.21/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java b/1.21/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java index 48afac1..1cd4d1f 100644 --- a/1.21/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java +++ b/1.21/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java @@ -50,9 +50,9 @@ public class ColorSelectionScreen extends Screen { private final ColorOption option; private final Identifier texture = Identifier.of("axolotlclientconfig", "textures/gui/colorwheel.png"); private final Screen parent; - private BooleanOption chroma; - private FloatOption speed; - private IntegerOption alpha; + private final BooleanOption chroma; + private final FloatOption speed; + private final IntegerOption alpha; private int selectorRadius; private float selectorX; private float selectorY; @@ -62,16 +62,8 @@ public ColorSelectionScreen(Screen parent, ColorOption option) { super(Text.translatable("select_color")); this.option = option; this.parent = parent; - } - - @Override - public void init() { - super.init(); - addDrawableSelectableElement(ButtonWidget.builder(CommonTexts.BACK, buttonWidget -> closeScreen()) - .position(width / 2 - 75, height - 40).build()); - - chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), option.getOriginal()::setChroma); - speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), option.getOriginal()::setChromaSpeed, 0f, 4f); + chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), v -> option.getOriginal().setChroma(v)); + speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), v -> option.getOriginal().setChromaSpeed(v), 0f, 4f); alpha = new IntegerOption("option.alpha", option.getOriginal().getAlpha(), val -> { option.getOriginal().setAlpha(val); children().forEach(e -> { @@ -80,6 +72,13 @@ public void init() { } }); }, 0, 255); + } + + @Override + public void init() { + super.init(); + addDrawableSelectableElement(ButtonWidget.builder(CommonTexts.BACK, buttonWidget -> closeScreen()) + .position(width / 2 - 75, height - 40).build()); selectorRadius = Math.max(Math.min(width / 4 - 10, (height) / 2 - 60), 75); selectorX = width / 4f - selectorRadius; diff --git a/1.8.9/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java b/1.8.9/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java index 65a6ee4..59dba21 100644 --- a/1.8.9/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java +++ b/1.8.9/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java @@ -53,9 +53,9 @@ public class ColorSelectionScreen extends io.github.axolotlclient.AxolotlClientC private final ColorOption option; private final Screen parent; private NVGPaint paint; - private BooleanOption chroma; - private FloatOption speed; - private IntegerOption alpha; + private final BooleanOption chroma; + private final FloatOption speed; + private final IntegerOption alpha; private int selectorRadius; private float selectorX; private float selectorY; @@ -65,19 +65,8 @@ public ColorSelectionScreen(Screen parent, ColorOption option) { super(I18n.translate("select_color")); this.option = option; this.parent = parent; - } - - @Override - public void init() { - addDrawableChild(new RoundedButtonWidget(width / 2 - 75, height - 40, I18n.translate("gui.back"), - button -> Minecraft.getInstance().openScreen(parent))); - - chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), val -> { - option.getOriginal().setChroma(val); - }); - speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), val -> { - option.getOriginal().setChromaSpeed(val); - }, 0f, 4f); + chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), v -> option.getOriginal().setChroma(v)); + speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), v -> option.getOriginal().setChromaSpeed(v), 0f, 4f); alpha = new IntegerOption("option.alpha", option.getOriginal().getAlpha(), val -> { option.getOriginal().setAlpha(val); children().forEach(e -> { @@ -86,6 +75,12 @@ public void init() { } }); }, 0, 255); + } + + @Override + public void init() { + addDrawableChild(new RoundedButtonWidget(width / 2 - 75, height - 40, I18n.translate("gui.back"), + button -> Minecraft.getInstance().openScreen(parent))); selectorRadius = Math.max(Math.min(width / 4 - 10, (height) / 2 - 60), 75); selectorX = width / 4f - selectorRadius;//width/2f-selectorRadius*2; diff --git a/1.8.9/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java b/1.8.9/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java index 6b5e4a2..12554a4 100644 --- a/1.8.9/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java +++ b/1.8.9/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java @@ -47,9 +47,9 @@ public class ColorSelectionScreen extends io.github.axolotlclient.AxolotlClientC private final ColorOption option; private final Identifier texture = new Identifier("axolotlclientconfig", "textures/gui/colorwheel.png"); private final Screen parent; - private BooleanOption chroma; - private FloatOption speed; - private IntegerOption alpha; + private final BooleanOption chroma; + private final FloatOption speed; + private final IntegerOption alpha; private int selectorRadius; private float selectorX; private float selectorY; @@ -59,20 +59,8 @@ public ColorSelectionScreen(Screen parent, ColorOption option) { super(I18n.translate("select_color")); this.option = option; this.parent = parent; - } - - @Override - public void init() { - super.init(); - addDrawableChild(new VanillaButtonWidget(width / 2 - 75, height - 40, 150, 20, - I18n.translate("gui.back"), buttonWidget -> minecraft.openScreen(parent))); - - chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), val -> { - option.getOriginal().setChroma(val); - }); - speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), val -> { - option.getOriginal().setChromaSpeed(val); - }, 0f, 4f); + chroma = new BooleanOption("option.chroma", option.getOriginal().isChroma(), v -> option.getOriginal().setChroma(v)); + speed = new FloatOption("option.speed", option.getOriginal().getChromaSpeed(), v -> option.getOriginal().setChromaSpeed(v), 0f, 4f); alpha = new IntegerOption("option.alpha", option.getOriginal().getAlpha(), val -> { option.getOriginal().setAlpha(val); children().forEach(e -> { @@ -81,6 +69,13 @@ public void init() { } }); }, 0, 255); + } + + @Override + public void init() { + super.init(); + addDrawableChild(new VanillaButtonWidget(width / 2 - 75, height - 40, 150, 20, + I18n.translate("gui.back"), buttonWidget -> minecraft.openScreen(parent))); selectorRadius = Math.max(Math.min(width / 4 - 10, (height) / 2 - 60), 75); selectorX = width / 4f - selectorRadius; diff --git a/gradle.properties b/gradle.properties index 0c68906..44401bc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G org.gradle.parallel=true # Mod Properties -version=3.0.3 +version=3.0.4 maven_group=io.github.axolotlclient archives_base_name=AxolotlClientConfig @@ -20,7 +20,7 @@ mappings_120=1.20.1+build.23 mappings_121=1.21.1+build.3 # Loader versions -fabric_loader=0.16.9 +fabric_loader=0.16.10 # Library versions fapi_120=0.92.2