diff --git a/1.21.3/build.gradle b/1.21.4/build.gradle similarity index 97% rename from 1.21.3/build.gradle rename to 1.21.4/build.gradle index 4b95f888..cb9dc81e 100644 --- a/1.21.3/build.gradle +++ b/1.21.4/build.gradle @@ -3,8 +3,8 @@ plugins { id "fabric-loom" } -def minecraft_version = "1.21.3" -def fapi_version = "0.110.0" +def minecraft_version = "1.21.4" +def fapi_version = "0.110.5" group = maven_group version = "${project.version}+${minecraft_version}" archivesBaseName = "AxolotlClient-config" diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/AxolotlClientConfigMod.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/AxolotlClientConfigMod.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/AxolotlClientConfigMod.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/AxolotlClientConfigMod.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/mixin/NativeImageInvoker.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/mixin/NativeImageInvoker.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/mixin/NativeImageInvoker.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/mixin/NativeImageInvoker.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/options/GraphicsOption.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/options/GraphicsOption.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/options/GraphicsOption.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/options/GraphicsOption.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/Updatable.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/Updatable.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/Updatable.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/Updatable.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/ButtonListWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/ButtonListWidget.java similarity index 90% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/ButtonListWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/ButtonListWidget.java index 43f987df..7a353e60 100644 --- a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/ButtonListWidget.java +++ b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/ButtonListWidget.java @@ -22,6 +22,9 @@ package io.github.axolotlclient.AxolotlClientConfig.impl.ui.rounded; +import java.util.*; +import java.util.stream.Stream; + import io.github.axolotlclient.AxolotlClientConfig.api.manager.ConfigManager; import io.github.axolotlclient.AxolotlClientConfig.api.options.Option; import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory; @@ -32,18 +35,13 @@ import io.github.axolotlclient.AxolotlClientConfig.impl.util.ConfigStyles; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.AbstractButton; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.ContainerObjectSelectionList; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.resources.language.I18n; -import net.minecraft.util.Mth; import org.jetbrains.annotations.Nullable; -import java.util.*; -import java.util.stream.Stream; - public class ButtonListWidget extends ContainerObjectSelectionList implements DrawingUtil { protected static int WIDGET_WIDTH = 150; @@ -55,7 +53,7 @@ public class ButtonListWidget extends ContainerObjectSelectionList 0) { - int j = this.getScrollbarPosition(); - int k = (int) ((float) ((this.height) * (this.height)) / (float) this.getMaxPosition()); - k = Mth.clamp(k, 32, this.height - 8); - int l = (int) this.getScrollAmount() * (this.height - k) / i + this.getY(); - if (l < this.getY()) { - l = this.getY(); - } - - fillRoundedRect(NVGHolder.getContext(), j, getY(), 6, getHeight(), Colors.foreground(), 6 / 2); - fillRoundedRect(NVGHolder.getContext(), j, l, 6, k, Colors.accent(), 6 / 2); + protected void renderScrollbar(GuiGraphics guiGraphics) { + if (this.scrollbarVisible()) { + int i = this.scrollBarX(); + int j = this.scrollerHeight(); + int k = this.scrollBarY(); + fillRoundedRect(NVGHolder.getContext(), i, getY(), 6, getHeight(), Colors.foreground(), 6 / 2); + fillRoundedRect(NVGHolder.getContext(), i, k, 6, j, Colors.accent(), 6 / 2); } } diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/NVGHolder.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/NVGHolder.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/NVGHolder.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/NVGHolder.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/NVGUtil.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/NVGUtil.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/NVGUtil.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/NVGUtil.java diff --git a/1.21.3/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 similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/ColorSelectionScreen.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/GraphicsEditorScreen.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/GraphicsEditorScreen.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/GraphicsEditorScreen.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/GraphicsEditorScreen.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/RoundedConfigScreen.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/RoundedConfigScreen.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/RoundedConfigScreen.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/screen/RoundedConfigScreen.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/BooleanWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/BooleanWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/BooleanWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/BooleanWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/CategoryWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/CategoryWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/CategoryWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/CategoryWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/ColorWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/ColorWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/ColorWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/ColorWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/DoubleWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/DoubleWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/DoubleWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/DoubleWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/EnumWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/EnumWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/EnumWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/EnumWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/FloatWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/FloatWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/FloatWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/FloatWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/GraphicsWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/GraphicsWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/GraphicsWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/GraphicsWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/IntegerWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/IntegerWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/IntegerWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/IntegerWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/PillBooleanWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/PillBooleanWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/PillBooleanWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/PillBooleanWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/ResetButtonWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/ResetButtonWidget.java similarity index 98% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/ResetButtonWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/ResetButtonWidget.java index f964f5a4..5250f8c6 100644 --- a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/ResetButtonWidget.java +++ b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/ResetButtonWidget.java @@ -51,7 +51,7 @@ public ResetButtonWidget(int x, int y, int width, int height, Option option) current.children().stream() .filter(e -> e instanceof RoundedButtonListWidget) .map(e -> (RoundedButtonListWidget) e).findFirst().ifPresent(list -> { - scroll.set(list.getScrollAmount()); + scroll.set(list.scrollAmount()); }); current.init(Minecraft.getInstance(), i, j); current.children().stream() diff --git a/1.21.3/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 similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/RoundedButtonListWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/RoundedButtonListWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/RoundedButtonWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/RoundedButtonWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/RoundedButtonWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/RoundedButtonWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/SliderWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/SliderWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/SliderWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/SliderWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/StringArrayButtonWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/StringArrayButtonWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/StringArrayButtonWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/StringArrayButtonWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/StringWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/StringWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/StringWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/StringWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/TextFieldWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/TextFieldWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/TextFieldWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/TextFieldWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/TextOnlyButtonWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/TextOnlyButtonWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/TextOnlyButtonWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/rounded/widgets/TextOnlyButtonWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/EntryListWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/EntryListWidget.java similarity index 96% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/EntryListWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/EntryListWidget.java index 1265a3e3..ac9f5e22 100644 --- a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/EntryListWidget.java +++ b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/EntryListWidget.java @@ -22,6 +22,9 @@ package io.github.axolotlclient.AxolotlClientConfig.impl.ui.vanilla; +import java.util.*; +import java.util.stream.Stream; + import io.github.axolotlclient.AxolotlClientConfig.api.manager.ConfigManager; import io.github.axolotlclient.AxolotlClientConfig.api.options.Option; import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory; @@ -30,18 +33,13 @@ import io.github.axolotlclient.AxolotlClientConfig.impl.util.ConfigStyles; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.AbstractButton; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.ContainerObjectSelectionList; -import net.minecraft.client.gui.components.events.ContainerEventHandler; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.resources.language.I18n; import org.jetbrains.annotations.Nullable; -import java.util.*; -import java.util.stream.Stream; - public class EntryListWidget extends ContainerObjectSelectionList { protected static int WIDGET_WIDTH = 150; @@ -130,7 +128,7 @@ protected void collectEntries(OptionCategory current, List categ } @Override - protected boolean isValidMouseClick(int index) { + protected boolean isValidClickButton(int index) { return true; } @@ -148,8 +146,8 @@ public int getRowWidth() { } @Override - protected int getScrollbarPosition() { - return super.getScrollbarPosition() - 2; + protected int scrollBarX() { + return super.scrollBarX() - 2; } @Override diff --git a/1.21.3/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 similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/ColorSelectionScreen.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/GraphicsEditorScreen.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/GraphicsEditorScreen.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/GraphicsEditorScreen.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/GraphicsEditorScreen.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/VanillaConfigScreen.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/VanillaConfigScreen.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/VanillaConfigScreen.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/screen/VanillaConfigScreen.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/BooleanWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/BooleanWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/BooleanWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/BooleanWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/CategoryWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/CategoryWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/CategoryWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/CategoryWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/ColorWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/ColorWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/ColorWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/ColorWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/DoubleWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/DoubleWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/DoubleWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/DoubleWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/EnumWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/EnumWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/EnumWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/EnumWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/FloatWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/FloatWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/FloatWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/FloatWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/GraphicsWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/GraphicsWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/GraphicsWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/GraphicsWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/IntegerWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/IntegerWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/IntegerWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/IntegerWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/ResetButtonWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/ResetButtonWidget.java similarity index 98% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/ResetButtonWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/ResetButtonWidget.java index 540f3c10..5c1482a5 100644 --- a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/ResetButtonWidget.java +++ b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/ResetButtonWidget.java @@ -47,7 +47,7 @@ public ResetButtonWidget(int x, int y, int width, int height, Option option) current.children().stream() .filter(e -> e instanceof VanillaEntryListWidget) .map(e -> (VanillaEntryListWidget) e).findFirst().ifPresent(list -> { - scroll.set(list.getScrollAmount()); + scroll.set(list.scrollAmount()); }); current.init(Minecraft.getInstance(), i, j); current.children().stream() diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/SliderWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/SliderWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/SliderWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/SliderWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/StringArrayWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/StringArrayWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/StringArrayWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/StringArrayWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/StringWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/StringWidget.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/StringWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/StringWidget.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/VanillaEntryListWidget.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/VanillaEntryListWidget.java similarity index 98% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/VanillaEntryListWidget.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/VanillaEntryListWidget.java index 0beff87d..f8ec9b9b 100644 --- a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/VanillaEntryListWidget.java +++ b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/ui/vanilla/widgets/VanillaEntryListWidget.java @@ -39,7 +39,6 @@ public class VanillaEntryListWidget extends EntryListWidget { public VanillaEntryListWidget(ConfigManager manager, OptionCategory category, int screenWidth, int screenHeight, int top, int bottom, int entryHeight) { super(manager, category, screenWidth, screenHeight, top, bottom, entryHeight); - setRenderHeader(false, headerHeight); } protected void addOptions(ConfigManager manager, Collection> options) { diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/AxolotlClientConfigModMenu.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/AxolotlClientConfigModMenu.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/AxolotlClientConfigModMenu.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/AxolotlClientConfigModMenu.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/ConfigStyles.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/ConfigStyles.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/ConfigStyles.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/ConfigStyles.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/DrawUtil.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/DrawUtil.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/DrawUtil.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/DrawUtil.java diff --git a/1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/GraphicsImpl.java b/1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/GraphicsImpl.java similarity index 100% rename from 1.21.3/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/GraphicsImpl.java rename to 1.21.4/src/main/java/io/github/axolotlclient/AxolotlClientConfig/impl/util/GraphicsImpl.java diff --git a/1.21.3/src/main/resources/assets/axolotlclientconfig/config.ui.json b/1.21.4/src/main/resources/assets/axolotlclientconfig/config.ui.json similarity index 100% rename from 1.21.3/src/main/resources/assets/axolotlclientconfig/config.ui.json rename to 1.21.4/src/main/resources/assets/axolotlclientconfig/config.ui.json diff --git a/1.21.3/src/main/resources/assets/axolotlclientconfig/icon.png b/1.21.4/src/main/resources/assets/axolotlclientconfig/icon.png similarity index 100% rename from 1.21.3/src/main/resources/assets/axolotlclientconfig/icon.png rename to 1.21.4/src/main/resources/assets/axolotlclientconfig/icon.png diff --git a/1.21.3/src/main/resources/assets/axolotlclientconfig/lang/en_us.json b/1.21.4/src/main/resources/assets/axolotlclientconfig/lang/en_us.json similarity index 100% rename from 1.21.3/src/main/resources/assets/axolotlclientconfig/lang/en_us.json rename to 1.21.4/src/main/resources/assets/axolotlclientconfig/lang/en_us.json diff --git a/1.21.3/src/main/resources/assets/axolotlclientconfig/textures/gui/colorwheel.png b/1.21.4/src/main/resources/assets/axolotlclientconfig/textures/gui/colorwheel.png similarity index 100% rename from 1.21.3/src/main/resources/assets/axolotlclientconfig/textures/gui/colorwheel.png rename to 1.21.4/src/main/resources/assets/axolotlclientconfig/textures/gui/colorwheel.png diff --git a/1.21.3/src/main/resources/axolotlclientconfig.mixins.json b/1.21.4/src/main/resources/axolotlclientconfig.mixins.json similarity index 86% rename from 1.21.3/src/main/resources/axolotlclientconfig.mixins.json rename to 1.21.4/src/main/resources/axolotlclientconfig.mixins.json index 2ad9405d..1f895686 100644 --- a/1.21.3/src/main/resources/axolotlclientconfig.mixins.json +++ b/1.21.4/src/main/resources/axolotlclientconfig.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "io.github.axolotlclient.AxolotlClientConfig.impl.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [], "client": [ "NativeImageInvoker" diff --git a/1.21.3/src/main/resources/fabric.mod.json b/1.21.4/src/main/resources/fabric.mod.json similarity index 92% rename from 1.21.3/src/main/resources/fabric.mod.json rename to 1.21.4/src/main/resources/fabric.mod.json index 0bbe0477..e8e65d68 100644 --- a/1.21.3/src/main/resources/fabric.mod.json +++ b/1.21.4/src/main/resources/fabric.mod.json @@ -27,7 +27,7 @@ ], "depends": { "fabricloader": ">=0.14.0", - "minecraft": "1.21.3", - "fabric-lifecycle-events-v1": "*" + "minecraft": "1.21.4", + "fabric-api": "*" } } diff --git a/1.21.3/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/Example.java b/1.21.4/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/Example.java similarity index 100% rename from 1.21.3/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/Example.java rename to 1.21.4/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/Example.java diff --git a/1.21.3/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/mixin/InGameHudMixin.java b/1.21.4/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/mixin/InGameHudMixin.java similarity index 100% rename from 1.21.3/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/mixin/InGameHudMixin.java rename to 1.21.4/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/mixin/InGameHudMixin.java diff --git a/1.21.3/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/mixin/TitleScreenMixin.java b/1.21.4/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/mixin/TitleScreenMixin.java similarity index 100% rename from 1.21.3/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/mixin/TitleScreenMixin.java rename to 1.21.4/src/test/java/io/github/axolotlclient/AxolotlClientConfig/example/mixin/TitleScreenMixin.java diff --git a/1.21.3/src/test/resources/assets/axolotlclientconfig-test/icon.png b/1.21.4/src/test/resources/assets/axolotlclientconfig-test/icon.png similarity index 100% rename from 1.21.3/src/test/resources/assets/axolotlclientconfig-test/icon.png rename to 1.21.4/src/test/resources/assets/axolotlclientconfig-test/icon.png diff --git a/1.21.3/src/test/resources/assets/axolotlclientconfig-test/lang/en_us.json b/1.21.4/src/test/resources/assets/axolotlclientconfig-test/lang/en_us.json similarity index 100% rename from 1.21.3/src/test/resources/assets/axolotlclientconfig-test/lang/en_us.json rename to 1.21.4/src/test/resources/assets/axolotlclientconfig-test/lang/en_us.json diff --git a/1.21.3/src/test/resources/axolotlclientconfigtest.mixins.json b/1.21.4/src/test/resources/axolotlclientconfigtest.mixins.json similarity index 100% rename from 1.21.3/src/test/resources/axolotlclientconfigtest.mixins.json rename to 1.21.4/src/test/resources/axolotlclientconfigtest.mixins.json diff --git a/1.21.3/src/test/resources/fabric.mod.json b/1.21.4/src/test/resources/fabric.mod.json similarity index 100% rename from 1.21.3/src/test/resources/fabric.mod.json rename to 1.21.4/src/test/resources/fabric.mod.json diff --git a/settings.gradle b/settings.gradle index 8046745d..ed5596b4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -22,4 +22,4 @@ include '1.8.9' include '1.16_combat-6' include '1.20' include '1.21' -include '1.21.3' +include '1.21.4'