JfMods/LibJF
JfMods
/
LibJF
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(config-ui): remove deprecated APIs

This commit is contained in:
Johannes Frohnmeyer 2023-08-20 12:18:38 +02:00
parent 10527ec2bb
commit a759d20064
Signed by: Johannes
GPG Key ID: E76429612C2929F4
10 changed files with 7 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v1/ui/ConfigScreenFactory.java
View File

@ -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<S extends Screen> {
static ConfigScreenFactory<?> getInstance() {
return ConfigScreenFactoryDiscovery.getConfigured();
}
S create(ConfigInstance config, Screen parent);
int getPriority();
}

29
libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactory1To2.java
View File

@ -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<S extends Screen>(io.gitlab.jfronny.libjf.config.api.v1.ui.ConfigScreenFactory<S> impl) implements ConfigScreenFactory<S, ConfigScreenFactory1To2.Built<S>> {
@Override
public Built<S> create(ConfigInstance config, Screen parent) {
return new Built<>(impl.create(config, parent));
}
@Override
public int getPriority() {
return impl.getPriority();
}
public record Built<S extends Screen>(S screen) implements ConfigScreenFactory.Built<S> {
@Override
public S get() {
return null;
}
@Override
public void onSave(Runnable action) {
throw new UnsupportedOperationException();
}
}
}

17
libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactory2To1.java
View File

@ -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<S extends Screen, B extends io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory.Built<S>>(io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory<S, B> impl) implements ConfigScreenFactory<S> {
@Override
public S create(ConfigInstance config, Screen parent) {
return impl.create(config, parent).get();
}
@Override
public int getPriority() {
return impl.getPriority();
}
}

38
libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactoryDiscovery.java
View File

@ -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<Object> 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))
.<ConfigScreenFactory>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<Object> 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)
.<ConfigScreenFactory<?, ?>>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)
.<io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory>map(ConfigScreenFactory1To2::new)
.max(Comparator.comparing(io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory::getPriority))
.orElseGet(PlaceholderScreenFactory::new));
.orElseGet(PlaceholderScreenFactory::new);
}
return discovered2;
}

13
libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/EntryInfo.java
View File

@ -58,19 +58,6 @@ public interface EntryInfo<T> {
*/
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

13
libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v1/ui/tiny/ConfigScreen.java
View File

@ -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();
}
}

2
libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigTab.java
View File

@ -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;

1
libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryInfoWidgetBuilder.java
View File

@ -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;

4
libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v1/ui/tiny/WidgetFactory.java → libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetFactory.java
View File

@ -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;

1
libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetState.java
View File

@ -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;