diff --git a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v1/ui/ConfigScreenFactory.java b/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v1/ui/ConfigScreenFactory.java deleted file mode 100644 index e97fcd8..0000000 --- a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v1/ui/ConfigScreenFactory.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.gitlab.jfronny.libjf.config.api.v1.ui; - -import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; -import io.gitlab.jfronny.libjf.config.impl.ui.ConfigScreenFactoryDiscovery; -import net.minecraft.client.gui.screen.Screen; - -@Deprecated -public interface ConfigScreenFactory { - static ConfigScreenFactory getInstance() { - return ConfigScreenFactoryDiscovery.getConfigured(); - } - - S create(ConfigInstance config, Screen parent); - - int getPriority(); -} diff --git a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactory1To2.java b/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactory1To2.java deleted file mode 100644 index 1643f82..0000000 --- a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactory1To2.java +++ /dev/null @@ -1,29 +0,0 @@ -package io.gitlab.jfronny.libjf.config.impl.ui; - -import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; -import io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory; -import net.minecraft.client.gui.screen.Screen; - -public record ConfigScreenFactory1To2(io.gitlab.jfronny.libjf.config.api.v1.ui.ConfigScreenFactory impl) implements ConfigScreenFactory> { - @Override - public Built create(ConfigInstance config, Screen parent) { - return new Built<>(impl.create(config, parent)); - } - - @Override - public int getPriority() { - return impl.getPriority(); - } - - public record Built(S screen) implements ConfigScreenFactory.Built { - @Override - public S get() { - return null; - } - - @Override - public void onSave(Runnable action) { - throw new UnsupportedOperationException(); - } - } -} diff --git a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactory2To1.java b/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactory2To1.java deleted file mode 100644 index 3e45b29..0000000 --- a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactory2To1.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.gitlab.jfronny.libjf.config.impl.ui; - -import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; -import io.gitlab.jfronny.libjf.config.api.v1.ui.ConfigScreenFactory; -import net.minecraft.client.gui.screen.Screen; - -public record ConfigScreenFactory2To1>(io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory impl) implements ConfigScreenFactory { - @Override - public S create(ConfigInstance config, Screen parent) { - return impl.create(config, parent).get(); - } - - @Override - public int getPriority() { - return impl.getPriority(); - } -} diff --git a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactoryDiscovery.java b/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactoryDiscovery.java index 48214e7..ba5e9fe 100644 --- a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactoryDiscovery.java +++ b/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactoryDiscovery.java @@ -1,50 +1,22 @@ package io.gitlab.jfronny.libjf.config.impl.ui; -import io.gitlab.jfronny.libjf.config.api.v1.ui.ConfigScreenFactory; +import io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory; import net.fabricmc.loader.api.FabricLoader; import java.util.Comparator; import java.util.List; public class ConfigScreenFactoryDiscovery { - private static ConfigScreenFactory discovered1 = null; - private static io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory discovered2 = null; - - @Deprecated - public static ConfigScreenFactory getConfigured() { - if (discovered1 == null) { - List entrypoints = getEntrypoints(); - discovered1 = entrypoints - .stream() - .filter(it -> it instanceof io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory) - .map(it -> (io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory) it) - .max(Comparator.comparing(io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory::getPriority)) - .map(ConfigScreenFactory2To1::new) - .orElseGet(() -> entrypoints - .stream() - .filter(it -> it instanceof ConfigScreenFactory) - .map(it -> (ConfigScreenFactory) it) - .max(Comparator.comparing(ConfigScreenFactory::getPriority)) - .orElseGet(() -> new ConfigScreenFactory2To1(new PlaceholderScreenFactory()))); - } - return discovered1; - } + private static ConfigScreenFactory discovered2 = null; public static io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory getConfigured2() { if (discovered2 == null) { - List entrypoints = getEntrypoints(); - discovered2 = entrypoints + discovered2 = getEntrypoints() .stream() .filter(it -> it instanceof io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory) - .map(it -> (io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory) it) + .>map(it -> (ConfigScreenFactory) it) .max(Comparator.comparing(io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory::getPriority)) - .orElseGet(() -> entrypoints - .stream() - .filter(it -> it instanceof ConfigScreenFactory) - .map(it -> (ConfigScreenFactory) it) - .map(ConfigScreenFactory1To2::new) - .max(Comparator.comparing(io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory::getPriority)) - .orElseGet(PlaceholderScreenFactory::new)); + .orElseGet(PlaceholderScreenFactory::new); } return discovered2; } diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/EntryInfo.java b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/EntryInfo.java index cc2cfbb..b991f8d 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/EntryInfo.java +++ b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/EntryInfo.java @@ -58,19 +58,6 @@ public interface EntryInfo { */ void fix(); - /** - * Set this entry's value to that of the element - * @param element The element to read from - */ - @Deprecated - default void loadFromJson(JsonElement element) throws IllegalAccessException { - try { - loadFromJson(new JsonTreeReader(element)); - } catch (IOException e) { - throw new JsonParseException("Could not read Json", e); - } - } - /** * Set this entry's value to that of the element * @param reader The reader to read from diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v1/ui/tiny/ConfigScreen.java b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v1/ui/tiny/ConfigScreen.java deleted file mode 100644 index b18477a..0000000 --- a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v1/ui/tiny/ConfigScreen.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.gitlab.jfronny.libjf.config.api.v1.ui.tiny; - -import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; -import io.gitlab.jfronny.libjf.config.impl.ui.tiny.TinyConfigScreenFactory; -import net.minecraft.client.gui.screen.Screen; - -@Deprecated -public interface ConfigScreen { - TinyConfigScreenFactory FACTORY = new TinyConfigScreenFactory(); - static Screen create(ConfigInstance config, Screen parent) { - return FACTORY.create(config, parent).get(); - } -} diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigTab.java b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigTab.java index 70d879e..cb4adae 100644 --- a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigTab.java +++ b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigTab.java @@ -2,7 +2,7 @@ package io.gitlab.jfronny.libjf.config.impl.ui.tiny; import io.gitlab.jfronny.libjf.config.api.v1.ConfigCategory; import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; -import io.gitlab.jfronny.libjf.config.api.v1.ui.tiny.WidgetFactory; +import io.gitlab.jfronny.libjf.config.impl.ui.tiny.entry.WidgetFactory; import io.gitlab.jfronny.libjf.config.impl.entrypoint.JfConfigSafe; import io.gitlab.jfronny.libjf.config.impl.ui.tiny.entry.*; import io.gitlab.jfronny.libjf.config.impl.ui.tiny.presets.PresetsScreen; diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryInfoWidgetBuilder.java b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryInfoWidgetBuilder.java index b437d57..7613bde 100644 --- a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryInfoWidgetBuilder.java +++ b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryInfoWidgetBuilder.java @@ -7,7 +7,6 @@ import io.gitlab.jfronny.libjf.LibJf; import io.gitlab.jfronny.libjf.config.api.v1.ConfigCategory; import io.gitlab.jfronny.libjf.config.api.v1.EntryInfo; import io.gitlab.jfronny.libjf.config.api.v1.type.Type; -import io.gitlab.jfronny.libjf.config.api.v1.ui.tiny.WidgetFactory; import io.gitlab.jfronny.libjf.config.impl.ui.tiny.EditorScreen; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v1/ui/tiny/WidgetFactory.java b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetFactory.java similarity index 78% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v1/ui/tiny/WidgetFactory.java rename to libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetFactory.java index adaafd9..e50403f 100644 --- a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v1/ui/tiny/WidgetFactory.java +++ b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetFactory.java @@ -1,8 +1,6 @@ -package io.gitlab.jfronny.libjf.config.api.v1.ui.tiny; +package io.gitlab.jfronny.libjf.config.impl.ui.tiny.entry; import io.gitlab.jfronny.libjf.config.impl.ui.tiny.TinyConfigScreen; -import io.gitlab.jfronny.libjf.config.impl.ui.tiny.entry.Reflowable; -import io.gitlab.jfronny.libjf.config.impl.ui.tiny.entry.WidgetState; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.widget.ClickableWidget; diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetState.java b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetState.java index 25d5735..d4f45fe 100644 --- a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetState.java +++ b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetState.java @@ -3,7 +3,6 @@ package io.gitlab.jfronny.libjf.config.impl.ui.tiny.entry; import io.gitlab.jfronny.commons.ref.R; import io.gitlab.jfronny.libjf.LibJf; import io.gitlab.jfronny.libjf.config.api.v1.EntryInfo; -import io.gitlab.jfronny.libjf.config.api.v1.ui.tiny.WidgetFactory; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable;