From 92b3214ff78a40ff92c3d44baa435ddfda29779b Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Tue, 7 Nov 2023 22:08:55 -0500 Subject: Remove yacl patches --- .../mixin/yacl/DoubleFieldControllerMixin.java | 27 -------------- .../mixin/yacl/FloatFieldControllerMixin.java | 27 -------------- .../mixin/yacl/IntegerFieldControllerMixin.java | 31 ---------------- .../mixin/yacl/LongFieldControllerMixin.java | 31 ---------------- .../mixin/yacl/NumberFieldControllerMixin.java | 43 ---------------------- 5 files changed, 159 deletions(-) delete mode 100644 src/main/java/de/hysky/skyblocker/mixin/yacl/DoubleFieldControllerMixin.java delete mode 100644 src/main/java/de/hysky/skyblocker/mixin/yacl/FloatFieldControllerMixin.java delete mode 100644 src/main/java/de/hysky/skyblocker/mixin/yacl/IntegerFieldControllerMixin.java delete mode 100644 src/main/java/de/hysky/skyblocker/mixin/yacl/LongFieldControllerMixin.java delete mode 100644 src/main/java/de/hysky/skyblocker/mixin/yacl/NumberFieldControllerMixin.java (limited to 'src/main/java/de/hysky/skyblocker/mixin/yacl') diff --git a/src/main/java/de/hysky/skyblocker/mixin/yacl/DoubleFieldControllerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/yacl/DoubleFieldControllerMixin.java deleted file mode 100644 index ac24c09f..00000000 --- a/src/main/java/de/hysky/skyblocker/mixin/yacl/DoubleFieldControllerMixin.java +++ /dev/null @@ -1,27 +0,0 @@ -package de.hysky.skyblocker.mixin.yacl; - -import java.text.NumberFormat; -import java.util.function.Function; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.gui.controllers.string.number.DoubleFieldController; -import dev.isxander.yacl3.gui.controllers.string.number.NumberFieldController; -import net.minecraft.text.Text; - -@Mixin(value = DoubleFieldController.class, remap = false) -public abstract class DoubleFieldControllerMixin extends NumberFieldController { - private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance(); - - - public DoubleFieldControllerMixin(Option option, Function displayFormatter) { - super(option, displayFormatter); - } - - @Overwrite - public String getString() { - return NUMBER_FORMAT.format(option().pendingValue()); - } -} diff --git a/src/main/java/de/hysky/skyblocker/mixin/yacl/FloatFieldControllerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/yacl/FloatFieldControllerMixin.java deleted file mode 100644 index 3a82c92a..00000000 --- a/src/main/java/de/hysky/skyblocker/mixin/yacl/FloatFieldControllerMixin.java +++ /dev/null @@ -1,27 +0,0 @@ -package de.hysky.skyblocker.mixin.yacl; - -import java.text.NumberFormat; -import java.util.function.Function; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.gui.controllers.string.number.FloatFieldController; -import dev.isxander.yacl3.gui.controllers.string.number.NumberFieldController; -import net.minecraft.text.Text; - -@Mixin(value = FloatFieldController.class, remap = false) -public abstract class FloatFieldControllerMixin extends NumberFieldController { - private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance(); - - - public FloatFieldControllerMixin(Option option, Function displayFormatter) { - super(option, displayFormatter); - } - - @Overwrite - public String getString() { - return NUMBER_FORMAT.format(option().pendingValue()); - } -} diff --git a/src/main/java/de/hysky/skyblocker/mixin/yacl/IntegerFieldControllerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/yacl/IntegerFieldControllerMixin.java deleted file mode 100644 index 51dd4890..00000000 --- a/src/main/java/de/hysky/skyblocker/mixin/yacl/IntegerFieldControllerMixin.java +++ /dev/null @@ -1,31 +0,0 @@ -package de.hysky.skyblocker.mixin.yacl; - -import java.text.NumberFormat; -import java.util.function.Function; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.gui.controllers.string.number.IntegerFieldController; -import dev.isxander.yacl3.gui.controllers.string.number.NumberFieldController; -import net.minecraft.text.Text; - -@Mixin(value = IntegerFieldController.class, remap = false) -public abstract class IntegerFieldControllerMixin extends NumberFieldController { - private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance(); - - public IntegerFieldControllerMixin(Option option, Function displayFormatter) { - super(option, displayFormatter); - } - - @Overwrite - public String getString() { - return NUMBER_FORMAT.format(option().pendingValue()); - } - - @Overwrite - public boolean isInputValid(String input) { - return super.isInputValid(input); - } -} diff --git a/src/main/java/de/hysky/skyblocker/mixin/yacl/LongFieldControllerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/yacl/LongFieldControllerMixin.java deleted file mode 100644 index f744c310..00000000 --- a/src/main/java/de/hysky/skyblocker/mixin/yacl/LongFieldControllerMixin.java +++ /dev/null @@ -1,31 +0,0 @@ -package de.hysky.skyblocker.mixin.yacl; - -import java.text.NumberFormat; -import java.util.function.Function; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.gui.controllers.string.number.LongFieldController; -import dev.isxander.yacl3.gui.controllers.string.number.NumberFieldController; -import net.minecraft.text.Text; - -@Mixin(value = LongFieldController.class, remap = false) -public abstract class LongFieldControllerMixin extends NumberFieldController { - private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance(); - - public LongFieldControllerMixin(Option option, Function displayFormatter) { - super(option, displayFormatter); - } - - @Overwrite - public String getString() { - return NUMBER_FORMAT.format(option().pendingValue()); - } - - @Overwrite - public boolean isInputValid(String input) { - return super.isInputValid(input); - } -} diff --git a/src/main/java/de/hysky/skyblocker/mixin/yacl/NumberFieldControllerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/yacl/NumberFieldControllerMixin.java deleted file mode 100644 index 010f9a26..00000000 --- a/src/main/java/de/hysky/skyblocker/mixin/yacl/NumberFieldControllerMixin.java +++ /dev/null @@ -1,43 +0,0 @@ -package de.hysky.skyblocker.mixin.yacl; - -import java.text.DecimalFormatSymbols; -import java.text.NumberFormat; -import java.text.ParseException; -import java.text.ParsePosition; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -import dev.isxander.yacl3.gui.controllers.slider.ISliderController; -import dev.isxander.yacl3.gui.controllers.string.number.NumberFieldController; -import dev.isxander.yacl3.impl.utils.YACLConstants; -import net.minecraft.util.math.MathHelper; - -@Mixin(value = NumberFieldController.class, remap = false) -public abstract class NumberFieldControllerMixin implements ISliderController { - private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance(); - private static final DecimalFormatSymbols DECIMAL_FORMAT_SYMBOLS = DecimalFormatSymbols.getInstance(); - - @Overwrite - public void setFromString(String value) { - try { - setPendingValue(MathHelper.clamp(NUMBER_FORMAT.parse(value).doubleValue(), min(), max())); - } catch (ParseException ignore) { - YACLConstants.LOGGER.warn("Failed to parse number: {}", value); - } - } - - @Overwrite - public boolean isInputValid(String input) { - input = input.replace(DECIMAL_FORMAT_SYMBOLS.getGroupingSeparator() + "", ""); - ParsePosition parsePosition = new ParsePosition(0); - NUMBER_FORMAT.parse(input, parsePosition); - - return parsePosition.getIndex() == input.length(); - } - - @Overwrite - protected String cleanupNumberString(String number) { - throw new UnsupportedOperationException("This method should no longer be called."); - } -} -- cgit