From 04fe933f4c24817100f3101f088accf55a621f8a Mon Sep 17 00:00:00 2001 From: isxander Date: Thu, 11 Apr 2024 18:43:06 +0100 Subject: Extremely fragile and broken multiversion build with stonecutter --- .../yacl3/api/controller/BooleanControllerBuilder.java | 16 ---------------- .../yacl3/api/controller/ColorControllerBuilder.java | 14 -------------- .../yacl3/api/controller/ControllerBuilder.java | 10 ---------- .../api/controller/CyclingListControllerBuilder.java | 15 --------------- .../api/controller/DoubleFieldControllerBuilder.java | 10 ---------- .../api/controller/DoubleSliderControllerBuilder.java | 10 ---------- .../controller/DropdownStringControllerBuilder.java | 18 ------------------ .../yacl3/api/controller/EnumControllerBuilder.java | 12 ------------ .../api/controller/EnumDropdownControllerBuilder.java | 10 ---------- .../api/controller/FloatFieldControllerBuilder.java | 10 ---------- .../api/controller/FloatSliderControllerBuilder.java | 10 ---------- .../api/controller/IntegerFieldControllerBuilder.java | 10 ---------- .../api/controller/IntegerSliderControllerBuilder.java | 10 ---------- .../yacl3/api/controller/ItemControllerBuilder.java | 11 ----------- .../api/controller/LongFieldControllerBuilder.java | 10 ---------- .../api/controller/LongSliderControllerBuilder.java | 10 ---------- .../api/controller/NumberFieldControllerBuilder.java | 7 ------- .../yacl3/api/controller/SliderControllerBuilder.java | 6 ------ .../yacl3/api/controller/StringControllerBuilder.java | 10 ---------- .../yacl3/api/controller/TickBoxControllerBuilder.java | 10 ---------- .../api/controller/ValueFormattableController.java | 14 -------------- .../isxander/yacl3/api/controller/ValueFormatter.java | 7 ------- 22 files changed, 240 deletions(-) delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/BooleanControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/ColorControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/ControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/CyclingListControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/DoubleFieldControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/DoubleSliderControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/DropdownStringControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/EnumControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/EnumDropdownControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/FloatFieldControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/FloatSliderControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/IntegerFieldControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/IntegerSliderControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/ItemControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/LongFieldControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/LongSliderControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/NumberFieldControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/SliderControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/StringControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/TickBoxControllerBuilder.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/ValueFormattableController.java delete mode 100644 common/src/main/java/dev/isxander/yacl3/api/controller/ValueFormatter.java (limited to 'common/src/main/java/dev/isxander/yacl3/api/controller') diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/BooleanControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/BooleanControllerBuilder.java deleted file mode 100644 index 88f9a77..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/BooleanControllerBuilder.java +++ /dev/null @@ -1,16 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.BooleanControllerBuilderImpl; - -public interface BooleanControllerBuilder extends ValueFormattableController { - BooleanControllerBuilder coloured(boolean coloured); - - BooleanControllerBuilder onOffFormatter(); - BooleanControllerBuilder yesNoFormatter(); - BooleanControllerBuilder trueFalseFormatter(); - - static BooleanControllerBuilder create(Option option) { - return new BooleanControllerBuilderImpl(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/ColorControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/ColorControllerBuilder.java deleted file mode 100644 index 8e442ff..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/ColorControllerBuilder.java +++ /dev/null @@ -1,14 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.ColorControllerBuilderImpl; - -import java.awt.Color; - -public interface ColorControllerBuilder extends ControllerBuilder { - ColorControllerBuilder allowAlpha(boolean allowAlpha); - - static ColorControllerBuilder create(Option option) { - return new ColorControllerBuilderImpl(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/ControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/ControllerBuilder.java deleted file mode 100644 index bbd49a7..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/ControllerBuilder.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Controller; -import org.jetbrains.annotations.ApiStatus; - -@FunctionalInterface -public interface ControllerBuilder { - @ApiStatus.Internal - Controller build(); -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/CyclingListControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/CyclingListControllerBuilder.java deleted file mode 100644 index 8c9ea91..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/CyclingListControllerBuilder.java +++ /dev/null @@ -1,15 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.CyclingListControllerBuilderImpl; - -public interface CyclingListControllerBuilder extends ValueFormattableController> { - @SuppressWarnings("unchecked") - CyclingListControllerBuilder values(T... values); - - CyclingListControllerBuilder values(Iterable values); - - static CyclingListControllerBuilder create(Option option) { - return new CyclingListControllerBuilderImpl<>(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/DoubleFieldControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/DoubleFieldControllerBuilder.java deleted file mode 100644 index db4af94..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/DoubleFieldControllerBuilder.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.DoubleFieldControllerBuilderImpl; - -public interface DoubleFieldControllerBuilder extends NumberFieldControllerBuilder { - static DoubleFieldControllerBuilder create(Option option) { - return new DoubleFieldControllerBuilderImpl(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/DoubleSliderControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/DoubleSliderControllerBuilder.java deleted file mode 100644 index 7e4b6f9..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/DoubleSliderControllerBuilder.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.DoubleSliderControllerBuilderImpl; - -public interface DoubleSliderControllerBuilder extends SliderControllerBuilder { - static DoubleSliderControllerBuilder create(Option option) { - return new DoubleSliderControllerBuilderImpl(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/DropdownStringControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/DropdownStringControllerBuilder.java deleted file mode 100644 index 3f5fb33..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/DropdownStringControllerBuilder.java +++ /dev/null @@ -1,18 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.DropdownStringControllerBuilderImpl; - -import java.util.List; - -public interface DropdownStringControllerBuilder extends StringControllerBuilder { - DropdownStringControllerBuilder values(List values); - DropdownStringControllerBuilder values(String... values); - DropdownStringControllerBuilder allowEmptyValue(boolean allowEmptyValue); - DropdownStringControllerBuilder allowAnyValue(boolean allowAnyValue); - - - static DropdownStringControllerBuilder create(Option option) { - return new DropdownStringControllerBuilderImpl(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/EnumControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/EnumControllerBuilder.java deleted file mode 100644 index decb8f9..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/EnumControllerBuilder.java +++ /dev/null @@ -1,12 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.EnumControllerBuilderImpl; - -public interface EnumControllerBuilder> extends ValueFormattableController> { - EnumControllerBuilder enumClass(Class enumClass); - - static > EnumControllerBuilder create(Option option) { - return new EnumControllerBuilderImpl<>(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/EnumDropdownControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/EnumDropdownControllerBuilder.java deleted file mode 100644 index 0814cc6..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/EnumDropdownControllerBuilder.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.EnumDropdownControllerBuilderImpl; - -public interface EnumDropdownControllerBuilder> extends ValueFormattableController> { - static > EnumDropdownControllerBuilder create(Option option) { - return new EnumDropdownControllerBuilderImpl<>(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/FloatFieldControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/FloatFieldControllerBuilder.java deleted file mode 100644 index de81837..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/FloatFieldControllerBuilder.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.FloatFieldControllerBuilderImpl; - -public interface FloatFieldControllerBuilder extends NumberFieldControllerBuilder { - static FloatFieldControllerBuilder create(Option option) { - return new FloatFieldControllerBuilderImpl(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/FloatSliderControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/FloatSliderControllerBuilder.java deleted file mode 100644 index 2a04dde..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/FloatSliderControllerBuilder.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.FloatSliderControllerBuilderImpl; - -public interface FloatSliderControllerBuilder extends SliderControllerBuilder { - static FloatSliderControllerBuilder create(Option option) { - return new FloatSliderControllerBuilderImpl(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/IntegerFieldControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/IntegerFieldControllerBuilder.java deleted file mode 100644 index 1e31fac..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/IntegerFieldControllerBuilder.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.IntegerFieldControllerBuilderImpl; - -public interface IntegerFieldControllerBuilder extends NumberFieldControllerBuilder { - static IntegerFieldControllerBuilder create(Option option) { - return new IntegerFieldControllerBuilderImpl(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/IntegerSliderControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/IntegerSliderControllerBuilder.java deleted file mode 100644 index 11e089a..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/IntegerSliderControllerBuilder.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.IntegerSliderControllerBuilderImpl; - -public interface IntegerSliderControllerBuilder extends SliderControllerBuilder { - static IntegerSliderControllerBuilder create(Option option) { - return new IntegerSliderControllerBuilderImpl(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/ItemControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/ItemControllerBuilder.java deleted file mode 100644 index 5a1f5fa..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/ItemControllerBuilder.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.ItemControllerBuilderImpl; -import net.minecraft.world.item.Item; - -public interface ItemControllerBuilder extends ControllerBuilder { - static ItemControllerBuilder create(Option option) { - return new ItemControllerBuilderImpl(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/LongFieldControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/LongFieldControllerBuilder.java deleted file mode 100644 index c53b464..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/LongFieldControllerBuilder.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.LongFieldControllerBuilderImpl; - -public interface LongFieldControllerBuilder extends NumberFieldControllerBuilder { - static LongFieldControllerBuilder create(Option option) { - return new LongFieldControllerBuilderImpl(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/LongSliderControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/LongSliderControllerBuilder.java deleted file mode 100644 index fc09423..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/LongSliderControllerBuilder.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.LongSliderControllerBuilderImpl; - -public interface LongSliderControllerBuilder extends SliderControllerBuilder { - static LongSliderControllerBuilder create(Option option) { - return new LongSliderControllerBuilderImpl(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/NumberFieldControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/NumberFieldControllerBuilder.java deleted file mode 100644 index b5cfa1f..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/NumberFieldControllerBuilder.java +++ /dev/null @@ -1,7 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -public interface NumberFieldControllerBuilder> extends ValueFormattableController { - B min(T min); - B max(T max); - B range(T min, T max); -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/SliderControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/SliderControllerBuilder.java deleted file mode 100644 index 2fb3fec..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/SliderControllerBuilder.java +++ /dev/null @@ -1,6 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -public interface SliderControllerBuilder> extends ValueFormattableController { - B range(T min, T max); - B step(T step); -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/StringControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/StringControllerBuilder.java deleted file mode 100644 index 5e2f8c6..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/StringControllerBuilder.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.StringControllerBuilderImpl; - -public interface StringControllerBuilder extends ControllerBuilder { - static StringControllerBuilder create(Option option) { - return new StringControllerBuilderImpl(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/TickBoxControllerBuilder.java b/common/src/main/java/dev/isxander/yacl3/api/controller/TickBoxControllerBuilder.java deleted file mode 100644 index 71a2762..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/TickBoxControllerBuilder.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import dev.isxander.yacl3.api.Option; -import dev.isxander.yacl3.impl.controller.TickBoxControllerBuilderImpl; - -public interface TickBoxControllerBuilder extends ControllerBuilder { - static TickBoxControllerBuilder create(Option option) { - return new TickBoxControllerBuilderImpl(option); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/ValueFormattableController.java b/common/src/main/java/dev/isxander/yacl3/api/controller/ValueFormattableController.java deleted file mode 100644 index b886318..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/ValueFormattableController.java +++ /dev/null @@ -1,14 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import net.minecraft.network.chat.Component; - -import java.util.function.Function; - -public interface ValueFormattableController> extends ControllerBuilder { - B formatValue(ValueFormatter formatter); - - @Deprecated - default B valueFormatter(Function formatter) { - return formatValue(formatter::apply); - } -} diff --git a/common/src/main/java/dev/isxander/yacl3/api/controller/ValueFormatter.java b/common/src/main/java/dev/isxander/yacl3/api/controller/ValueFormatter.java deleted file mode 100644 index aecaf65..0000000 --- a/common/src/main/java/dev/isxander/yacl3/api/controller/ValueFormatter.java +++ /dev/null @@ -1,7 +0,0 @@ -package dev.isxander.yacl3.api.controller; - -import net.minecraft.network.chat.Component; - -public interface ValueFormatter { - Component format(T value); -} -- cgit