From 09466ce8971299c6efb38a0aaec2a27b305ccbe0 Mon Sep 17 00:00:00 2001 From: JFronny Date: Wed, 30 Aug 2023 14:14:20 +0200 Subject: [PATCH] chore: clean up config modules --- docs/README.md | 4 +- docs/SUMMARY.md | 9 +- docs/config/README.md | 4 +- ...ommands-v1.md => libjf-config-commands.md} | 2 +- ...fig-core-v1.md => libjf-config-core-v2.md} | 2 +- docs/config/libjf-config-reflect-v1.md | 8 -- docs/config/libjf-config-ui-tiny-v1.md | 4 - docs/config/libjf-config-ui-tiny.md | 4 + docs/libjf-web-v0.md | 2 +- .../build.gradle.kts | 4 +- .../config/impl/commands/JfConfigCommand.java | 38 +++++---- .../src/main/resources/fabric.mod.json | 4 +- .../build.gradle.kts | 2 +- .../libjf/config/plugin/ConfigProcessor.java | 6 +- .../libjf/config/plugin/test/PluginTest.java | 2 +- .../libjf-config-core-v1/lang/en_us.json | 12 --- .../build.gradle.kts | 2 +- .../config/api/v2/ui/ConfigScreenFactory.java | 2 +- .../impl/ui/ConfigScreenFactoryDiscovery.java | 0 .../libjf/config/impl/ui/ModMenuAdapter.java | 4 +- .../config/impl/ui/PlaceholderScreen.java | 4 +- .../impl/ui/PlaceholderScreenFactory.java | 2 +- .../assets/libjf-config-core/lang/en_us.json | 12 +++ .../libjf/config/api/v2}/Category.java | 2 +- .../libjf/config/api/v2}/ConfigCategory.java | 2 +- .../libjf/config/api/v2}/ConfigHolder.java | 2 +- .../libjf/config/api/v2}/ConfigInstance.java | 2 +- .../jfronny/libjf/config/api/v2}/Entry.java | 2 +- .../libjf/config/api/v2}/EntryInfo.java | 6 +- .../libjf/config/api/v2}/JfConfig.java | 2 +- .../libjf/config/api/v2}/JfCustomConfig.java | 4 +- .../jfronny/libjf/config/api/v2}/Preset.java | 2 +- .../libjf/config/api/v2}/Verifier.java | 2 +- .../config/api/v2}/dsl/CategoryBuilder.java | 9 +- .../config/api/v2}/dsl/ConfigBuilder.java | 4 +- .../jfronny/libjf/config/api/v2}/dsl/DSL.java | 6 +- .../libjf/config/api/v2}/dsl/Migration.java | 2 +- .../libjf/config/api/v2}/type/Type.java | 2 +- .../libjf/config/impl/AuxiliaryMetadata.java | 6 +- .../jfronny/libjf/config/impl/ConfigCore.java | 6 +- .../libjf/config/impl/ConfigHolderImpl.java | 4 +- .../config/impl/dsl/CategoryBuilderImpl.java | 8 +- .../config/impl/dsl/ConfigBuilderImpl.java | 4 +- .../libjf/config/impl/dsl/DSLImpl.java | 8 +- .../config/impl/dsl/DefaultConfigIO.java | 2 +- .../config/impl/dsl/DslConfigCategory.java | 4 +- .../config/impl/dsl/DslConfigInstance.java | 4 +- .../libjf/config/impl/dsl/DslEntryInfo.java | 6 +- .../config/impl/entrypoint/JfConfigSafe.java | 4 +- .../impl/watch/JfConfigWatchService.java | 0 .../impl/watch/JfConfigWatchServiceImpl.java | 2 +- .../watch/ToggleableConfigWatchService.java | 0 .../src/main/resources/fabric.mod.json | 2 +- libjf-config-reflect-v1/build.gradle.kts | 15 ---- .../v1/reflect/ReflectiveConfigBuilder.java | 10 --- .../reflect/ReflectiveConfigBuilderImpl.java | 84 ------------------- .../entrypoint/JfConfigReflectSafe.java | 37 -------- .../reflect/entrypoint/JfConfigUnsafe.java | 16 ---- .../src/main/resources/fabric.mod.json | 36 -------- .../libjf/config/test/reflect/TestConfig.java | 57 ------------- .../test/reflect/TestConfigTweaker.java | 16 ---- .../libjf-config-v0-testmod/lang/en_us.json | 15 ---- .../src/testmod/resources/fabric.mod.json | 17 ---- .../libjf-config-ui-tiny-v1/lang/en_us.json | 4 - .../lang/en_us.json | 21 ----- .../build.gradle.kts | 4 +- .../config/impl/ui/tiny/EditorScreen.java | 0 .../config/impl/ui/tiny/Placeholder.java | 0 .../impl/ui/tiny/ScreenWithSaveHook.java | 0 .../config/impl/ui/tiny/TinyConfigScreen.java | 7 +- .../impl/ui/tiny/TinyConfigScreenFactory.java | 12 +-- .../config/impl/ui/tiny/TinyConfigTab.java | 11 +-- .../impl/ui/tiny/TinyConfigTabWrapper.java | 0 .../impl/ui/tiny/entry/CustomSlider.java | 0 .../ui/tiny/entry/EntryInfoWidgetBuilder.java | 16 ++-- .../impl/ui/tiny/entry/EntryListWidget.java | 0 .../config/impl/ui/tiny/entry/Reflowable.java | 0 .../impl/ui/tiny/entry/WidgetFactory.java | 0 .../impl/ui/tiny/entry/WidgetState.java | 2 +- .../ui/tiny/presets/PresetListWidget.java | 0 .../impl/ui/tiny/presets/PresetsScreen.java | 5 +- .../libjf-config-ui-tiny/lang/en_us.json | 4 + .../src/main/resources/fabric.mod.json | 4 +- .../libjf/config/test/tiny/TestConfig.java | 4 +- .../test/tiny/mixin/OptionsScreenMixin.java | 2 +- .../lang/en_us.json | 21 +++++ .../src/testmod/resources/fabric.mod.json | 4 +- .../libjf-config-ui-tiny-testmod.mixins.json | 0 libjf-translate-v1/build.gradle.kts | 2 +- .../libjf/translate/impl/TranslateConfig.java | 4 +- libjf-web-v0/build.gradle.kts | 2 +- .../jfronny/libjf/web/impl/JfWebConfig.java | 2 +- .../src/main/resources/fabric.mod.json | 2 +- settings.gradle.kts | 7 +- 94 files changed, 190 insertions(+), 495 deletions(-) rename docs/config/{libjf-config-commands-v1.md => libjf-config-commands.md} (90%) rename docs/config/{libjf-config-core-v1.md => libjf-config-core-v2.md} (99%) delete mode 100644 docs/config/libjf-config-reflect-v1.md delete mode 100644 docs/config/libjf-config-ui-tiny-v1.md create mode 100644 docs/config/libjf-config-ui-tiny.md rename {libjf-config-commands-v1 => libjf-config-commands}/build.gradle.kts (74%) rename {libjf-config-commands-v1 => libjf-config-commands}/src/main/java/io/gitlab/jfronny/libjf/config/impl/commands/JfConfigCommand.java (80%) rename {libjf-config-commands-v1 => libjf-config-commands}/src/main/resources/fabric.mod.json (90%) delete mode 100644 libjf-config-core-v1/src/client/resources/assets/libjf-config-core-v1/lang/en_us.json rename {libjf-config-core-v1 => libjf-config-core-v2}/build.gradle.kts (84%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/client/java/io/gitlab/jfronny/libjf/config/api/v2/ui/ConfigScreenFactory.java (90%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactoryDiscovery.java (100%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ModMenuAdapter.java (90%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreen.java (87%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreenFactory.java (93%) create mode 100644 libjf-config-core-v2/src/client/resources/assets/libjf-config-core/lang/en_us.json rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/Category.java (92%) rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/ConfigCategory.java (95%) rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/ConfigHolder.java (97%) rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/ConfigInstance.java (90%) rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/Entry.java (87%) rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/EntryInfo.java (91%) rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/JfConfig.java (91%) rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/JfCustomConfig.java (60%) rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/Preset.java (83%) rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/Verifier.java (86%) rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/dsl/CategoryBuilder.java (89%) rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/dsl/ConfigBuilder.java (87%) rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/dsl/DSL.java (86%) rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/dsl/Migration.java (78%) rename {libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1 => libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2}/type/Type.java (99%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/java/io/gitlab/jfronny/libjf/config/impl/AuxiliaryMetadata.java (93%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/java/io/gitlab/jfronny/libjf/config/impl/ConfigCore.java (71%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/java/io/gitlab/jfronny/libjf/config/impl/ConfigHolderImpl.java (95%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/CategoryBuilderImpl.java (97%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/ConfigBuilderImpl.java (93%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DSLImpl.java (86%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DefaultConfigIO.java (99%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigCategory.java (96%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigInstance.java (93%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslEntryInfo.java (97%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/java/io/gitlab/jfronny/libjf/config/impl/entrypoint/JfConfigSafe.java (91%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/JfConfigWatchService.java (100%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/JfConfigWatchServiceImpl.java (98%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/ToggleableConfigWatchService.java (100%) rename {libjf-config-core-v1 => libjf-config-core-v2}/src/main/resources/fabric.mod.json (96%) delete mode 100644 libjf-config-reflect-v1/build.gradle.kts delete mode 100644 libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/reflect/ReflectiveConfigBuilder.java delete mode 100644 libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/reflect/ReflectiveConfigBuilderImpl.java delete mode 100644 libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/reflect/entrypoint/JfConfigReflectSafe.java delete mode 100644 libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/reflect/entrypoint/JfConfigUnsafe.java delete mode 100644 libjf-config-reflect-v1/src/main/resources/fabric.mod.json delete mode 100644 libjf-config-reflect-v1/src/testmod/java/io/gitlab/jfronny/libjf/config/test/reflect/TestConfig.java delete mode 100644 libjf-config-reflect-v1/src/testmod/java/io/gitlab/jfronny/libjf/config/test/reflect/TestConfigTweaker.java delete mode 100644 libjf-config-reflect-v1/src/testmod/resources/assets/libjf-config-v0-testmod/lang/en_us.json delete mode 100644 libjf-config-reflect-v1/src/testmod/resources/fabric.mod.json delete mode 100644 libjf-config-ui-tiny-v1/src/client/resources/assets/libjf-config-ui-tiny-v1/lang/en_us.json delete mode 100644 libjf-config-ui-tiny-v1/src/testmod/resources/assets/libjf-config-ui-tiny-v1-testmod/lang/en_us.json rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/build.gradle.kts (73%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/EditorScreen.java (100%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/Placeholder.java (100%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/ScreenWithSaveHook.java (100%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreen.java (97%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreenFactory.java (90%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigTab.java (88%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigTabWrapper.java (100%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/CustomSlider.java (100%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryInfoWidgetBuilder.java (96%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryListWidget.java (100%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/Reflowable.java (100%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetFactory.java (100%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetState.java (96%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetListWidget.java (100%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java (91%) create mode 100644 libjf-config-ui-tiny/src/client/resources/assets/libjf-config-ui-tiny/lang/en_us.json rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/main/resources/fabric.mod.json (90%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/testmod/java/io/gitlab/jfronny/libjf/config/test/tiny/TestConfig.java (91%) rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/testmod/java/io/gitlab/jfronny/libjf/config/test/tiny/mixin/OptionsScreenMixin.java (96%) create mode 100644 libjf-config-ui-tiny/src/testmod/resources/assets/libjf-config-ui-tiny-testmod/lang/en_us.json rename {libjf-config-ui-tiny-v1 => libjf-config-ui-tiny}/src/testmod/resources/fabric.mod.json (73%) rename libjf-config-ui-tiny-v1/src/testmod/resources/libjf-config-ui-tiny-v1-testmod.mixins.json => libjf-config-ui-tiny/src/testmod/resources/libjf-config-ui-tiny-testmod.mixins.json (100%) diff --git a/docs/README.md b/docs/README.md index 806746c..9550e8c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -20,8 +20,8 @@ repositories { and include LibJF modules like this: ```groovy dependencies { - include modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${project.libjf_version}") - include modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${project.libjf_version}") + include modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${project.libjf_version}") + include modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-config-ui-tiny:${project.libjf_version}") include("io.gitlab.jfronny.libjf:libjf-base:${project.libjf_version}") modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${project.libjf_version}") diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md index 9ed830a..b24fe64 100644 --- a/docs/SUMMARY.md +++ b/docs/SUMMARY.md @@ -6,11 +6,10 @@ - [libjf-base](./libjf-base.md) - [Config](./config/README.md) - - [libjf-config-core-v1](./config/libjf-config-core-v1.md) - - [libjf-config-reflect-v1](./config/libjf-config-reflect-v1.md) - - [libjf-config-compiler-plugin](./config/libjf-config-compiler-plugin.md) - - [libjf-config-commands-v1](./config/libjf-config-commands-v1.md) - - [libjf-config-ui-tiny-v1](./config/libjf-config-ui-tiny-v1.md) + - [libjf-config-core-v2](./config/libjf-config-core-v2.md) + - [libjf-config-compiler-plugin-v2](./config/libjf-config-compiler-plugin-v2.md) + - [libjf-config-commands](./config/libjf-config-commands.md) + - [libjf-config-ui-tiny](./config/libjf-config-ui-tiny.md) - [libjf-devutil](./libjf-devutil.md) - [libjf-data-v0](./libjf-data-v0.md) - [libjf-data-manipulation-v0](./libjf-data-manipulation-v0.md) diff --git a/docs/config/README.md b/docs/config/README.md index d438c94..3654f66 100644 --- a/docs/config/README.md +++ b/docs/config/README.md @@ -11,8 +11,8 @@ repositories { } dependencies { - include modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${project.libjf_version}") - include modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${project.libjf_version}") + include modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${project.libjf_version}") + include modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-config-ui-tiny:${project.libjf_version}") include("io.gitlab.jfronny.libjf:libjf-base:${project.libjf_version}") annotationProcessor("io.gitlab.jfronny.libjf:libjf-config-compiler-plugin-v2:${project.libjf_version}") diff --git a/docs/config/libjf-config-commands-v1.md b/docs/config/libjf-config-commands.md similarity index 90% rename from docs/config/libjf-config-commands-v1.md rename to docs/config/libjf-config-commands.md index 4f0983f..7b5fc03 100644 --- a/docs/config/libjf-config-commands-v1.md +++ b/docs/config/libjf-config-commands.md @@ -1,4 +1,4 @@ -# libjf-config-commands-v1 +# libjf-config-commands This serverside module provides commands for modifying configs using this library. If you are developing a serverside mod, you may wish to include it to enable easier configuration. The commands are available under `/libjf config`, using auto-complete is recommended. \ No newline at end of file diff --git a/docs/config/libjf-config-core-v1.md b/docs/config/libjf-config-core-v2.md similarity index 99% rename from docs/config/libjf-config-core-v1.md rename to docs/config/libjf-config-core-v2.md index 0dfdd91..6eabb3b 100644 --- a/docs/config/libjf-config-core-v1.md +++ b/docs/config/libjf-config-core-v2.md @@ -1,4 +1,4 @@ -# libjf-config-core-v1 +# libjf-config-core-v2 The core module contains the abstractions and annotations used by other modules to interact with configs. It also contains the code for registering configs to mods, serialization and automatic reloads on change. diff --git a/docs/config/libjf-config-reflect-v1.md b/docs/config/libjf-config-reflect-v1.md deleted file mode 100644 index ed0d08b..0000000 --- a/docs/config/libjf-config-reflect-v1.md +++ /dev/null @@ -1,8 +0,0 @@ -# libjf-config-reflect-v1 -This module uses reflection to register configs from files using the annotations as presented [here](./libjf-config-core-v1.md) -In order to register a config, simply add the class annotated as `@JfConfig` to the `libjf:config` entrypoint. -Please be aware that this module may load your config class before the game classes are available. -Using them there WILL result in problems! - -Instead of using this implementation, you should use the [compiler plugin](./libjf-config-compiler-plugin-v2.md), -which removes the runtime overhead of this implementation. \ No newline at end of file diff --git a/docs/config/libjf-config-ui-tiny-v1.md b/docs/config/libjf-config-ui-tiny-v1.md deleted file mode 100644 index 6cd3f47..0000000 --- a/docs/config/libjf-config-ui-tiny-v1.md +++ /dev/null @@ -1,4 +0,0 @@ -# libjf-config-ui-tiny-v1 -This module provides an automatically registered, TinyConfig-based UI for all mods using libjf-config. -Embedding this is recommended when developing client-side mods. -Manually generating config screens is also possible through `ConfigScreen.create(config, parent)` \ No newline at end of file diff --git a/docs/config/libjf-config-ui-tiny.md b/docs/config/libjf-config-ui-tiny.md new file mode 100644 index 0000000..6aab4c6 --- /dev/null +++ b/docs/config/libjf-config-ui-tiny.md @@ -0,0 +1,4 @@ +# libjf-config-ui-tiny +This module provides an automatically registered, TinyConfig-based UI for all mods using libjf-config. +Embedding this is recommended when developing client-side mods. +libjf-config-ui-tiny implements the config-core-provided `ConfigScreenFactory`, so you can `ConfigScreenFactory.getInstance().create(config, parent).get()` to obtain a screen for your config. \ No newline at end of file diff --git a/docs/libjf-web-v0.md b/docs/libjf-web-v0.md index 6928e3b..b71a110 100644 --- a/docs/libjf-web-v0.md +++ b/docs/libjf-web-v0.md @@ -1,7 +1,7 @@ # libjf-web-v0 libjf-web-v0 provides an HTTP web server you can use in your serverside (and technically also clientside) mods to serve web content through a unified port. -libjf-web-v0 depends on libjf-config-v1 to provide its config, libjf-base, fabric-lifecycle-events-v1 and fabric-command-api-v1 +libjf-web-v0 depends on libjf-config-core-v2 to provide its config, libjf-base, fabric-lifecycle-events-v1 and fabric-command-api-v1 ### Getting started Implement WebInit and register it as a libjf:web entrypoint. To enable the server, also add the following to your fabric.mod.json: diff --git a/libjf-config-commands-v1/build.gradle.kts b/libjf-config-commands/build.gradle.kts similarity index 74% rename from libjf-config-commands-v1/build.gradle.kts rename to libjf-config-commands/build.gradle.kts index 923c36f..695d0e8 100644 --- a/libjf-config-commands-v1/build.gradle.kts +++ b/libjf-config-commands/build.gradle.kts @@ -5,12 +5,12 @@ plugins { } base { - archivesName.set("libjf-config-commands-v1") + archivesName.set("libjf-config-commands") } dependencies { val fabricVersion: String by rootProject.extra api(devProject(":libjf-base")) - api(devProject(":libjf-config-core-v1")) + api(devProject(":libjf-config-core-v2")) include(modImplementation(fabricApi.module("fabric-command-api-v2", fabricVersion))!!) } diff --git a/libjf-config-commands-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/commands/JfConfigCommand.java b/libjf-config-commands/src/main/java/io/gitlab/jfronny/libjf/config/impl/commands/JfConfigCommand.java similarity index 80% rename from libjf-config-commands-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/commands/JfConfigCommand.java rename to libjf-config-commands/src/main/java/io/gitlab/jfronny/libjf/config/impl/commands/JfConfigCommand.java index 597d027..3edd15a 100644 --- a/libjf-config-commands-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/commands/JfConfigCommand.java +++ b/libjf-config-commands/src/main/java/io/gitlab/jfronny/libjf/config/impl/commands/JfConfigCommand.java @@ -8,11 +8,12 @@ import com.mojang.brigadier.exceptions.DynamicCommandExceptionType; import io.gitlab.jfronny.commons.throwable.ThrowingRunnable; import io.gitlab.jfronny.commons.throwable.ThrowingSupplier; import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.*; -import io.gitlab.jfronny.libjf.config.api.v1.type.Type; +import io.gitlab.jfronny.libjf.config.api.v2.*; +import io.gitlab.jfronny.libjf.config.api.v2.type.Type; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.text.MutableText; import net.minecraft.text.Text; import java.util.function.Consumer; @@ -22,6 +23,12 @@ import static net.minecraft.server.command.CommandManager.argument; import static net.minecraft.server.command.CommandManager.literal; public class JfConfigCommand implements ModInitializer { + private static final String MOD_ID = "libjf-config-commands"; + + private MutableText text(String text) { + return Text.literal("[" + MOD_ID + "] " + text); + } + @Override public void onInitialize() { CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> { @@ -29,25 +36,24 @@ public class JfConfigCommand implements ModInitializer { LiteralArgumentBuilder c_config = literal("config") .requires((serverCommandSource) -> serverCommandSource.hasPermissionLevel(4)) .executes(context -> { - context.getSource().sendFeedback(() -> Text.literal("[libjf-config-v1] Loaded configs for:"), false); - ConfigHolder.getInstance().getRegistered().forEach((s, config) -> { - context.getSource().sendFeedback(() -> Text.literal("- " + s), false); - }); + MutableText text = text("Loaded configs for:"); + ConfigHolder.getInstance().getRegistered().forEach((s, config) -> text.append("\n- " + s)); + context.getSource().sendFeedback(() -> text, false); return Command.SINGLE_SUCCESS; }); LiteralArgumentBuilder c_reload = literal("reload").executes(context -> { ConfigHolder.getInstance().getRegistered().forEach((mod, config) -> config.load()); - context.getSource().sendFeedback(() -> Text.literal("[libjf-config-v1] Reloaded configs"), true); + context.getSource().sendFeedback(() -> text("Reloaded configs"), true); return Command.SINGLE_SUCCESS; }); LiteralArgumentBuilder c_reset = literal("reset").executes(context -> { - context.getSource().sendError(Text.literal("[libjf-config-v1] Please specify a config to reset")); + context.getSource().sendError(text("Please specify a config to reset")); return Command.SINGLE_SUCCESS; }); ConfigHolder.getInstance().getRegistered().forEach((id, config) -> { c_reload.then(literal(id).executes(context -> { config.load(); - context.getSource().sendFeedback(() -> Text.literal("[libjf-config-v1] Reloaded config for " + id), true); + context.getSource().sendFeedback(() -> text("Reloaded config for " + id), true); return Command.SINGLE_SUCCESS; })); registerEntries(config, id, c_config, c_reset, cns -> { @@ -63,7 +69,7 @@ public class JfConfigCommand implements ModInitializer { private void registerEntries(ConfigCategory config, String subpath, LiteralArgumentBuilder c_config, LiteralArgumentBuilder c_reset, Function>, LiteralArgumentBuilder> pathGen) { c_config.then(pathGen.apply(cns -> { cns.executes(context -> { - context.getSource().sendFeedback(() -> Text.literal("[libjf-config-v1] " + subpath + " is a category"), false); + context.getSource().sendFeedback(() -> text(subpath + " is a category"), false); return Command.SINGLE_SUCCESS; }); for (EntryInfo entry : config.getEntries()) { @@ -73,13 +79,13 @@ public class JfConfigCommand implements ModInitializer { c_reset.then(pathGen.apply(cns -> { cns.executes(context -> { config.reset(); - context.getSource().sendFeedback(() -> Text.literal("[libjf-config-v1] Reset config for " + subpath), true); + context.getSource().sendFeedback(() -> text("Reset config for " + subpath), true); return Command.SINGLE_SUCCESS; }); config.getPresets().forEach((id2, preset) -> { cns.then(literal(id2).executes(context -> { preset.run(); - context.getSource().sendFeedback(() -> Text.literal("[libjf-config-v1] Loaded preset " + id2 + " for " + subpath), true); + context.getSource().sendFeedback(() -> text("Loaded preset " + id2 + " for " + subpath), true); return Command.SINGLE_SUCCESS; })); }); @@ -103,8 +109,8 @@ public class JfConfigCommand implements ModInitializer { private void registerEntry(ConfigCategory config, String subpath, LiteralArgumentBuilder cns, EntryInfo entry) { LiteralArgumentBuilder c_entry = literal(entry.getName()).executes(context -> { - String msg = "[libjf-config-v1] The value of " + subpath + "." + entry.getName() + " is " + tryRun(entry::getValue); - context.getSource().sendFeedback(() -> Text.literal(msg), false); + String msg = "The value of " + subpath + "." + entry.getName() + " is " + tryRun(entry::getValue); + context.getSource().sendFeedback(() -> text(msg), false); return Command.SINGLE_SUCCESS; }); ArgumentType type = getType(entry); @@ -115,7 +121,7 @@ public class JfConfigCommand implements ModInitializer { entry.setValue(value); config.getRoot().write(); }); - context.getSource().sendFeedback(() -> Text.literal("[libjf-config-v1] Set " + subpath + "." + entry.getName() + " to " + value), true); + context.getSource().sendFeedback(() -> text("Set " + subpath + "." + entry.getName() + " to " + value), true); return Command.SINGLE_SUCCESS; })); } @@ -126,7 +132,7 @@ public class JfConfigCommand implements ModInitializer { entry.setValue(enumConstant); config.getRoot().write(); }); - context.getSource().sendFeedback(() -> Text.literal("[libjf-config-v1] Set " + subpath + "." + entry.getName() + " to " + enumConstant), true); + context.getSource().sendFeedback(() -> text("Set " + subpath + "." + entry.getName() + " to " + enumConstant), true); return Command.SINGLE_SUCCESS; })); } diff --git a/libjf-config-commands-v1/src/main/resources/fabric.mod.json b/libjf-config-commands/src/main/resources/fabric.mod.json similarity index 90% rename from libjf-config-commands-v1/src/main/resources/fabric.mod.json rename to libjf-config-commands/src/main/resources/fabric.mod.json index eba5d9b..e5a8dff 100644 --- a/libjf-config-commands-v1/src/main/resources/fabric.mod.json +++ b/libjf-config-commands/src/main/resources/fabric.mod.json @@ -1,6 +1,6 @@ { "schemaVersion": 1, - "id": "libjf-config-commands-v1", + "id": "libjf-config-commands", "name": "LibJF Config Commands", "version": "${version}", "authors": ["JFronny"], @@ -20,7 +20,7 @@ "minecraft": "*", "fabric-command-api-v2": "*", "libjf-base": ">=${version}", - "libjf-config-core-v1": ">=${version}" + "libjf-config-core-v2": ">=${version}" }, "custom": { "modmenu": { diff --git a/libjf-config-compiler-plugin-v2/build.gradle.kts b/libjf-config-compiler-plugin-v2/build.gradle.kts index 2e791ee..338e9a8 100644 --- a/libjf-config-compiler-plugin-v2/build.gradle.kts +++ b/libjf-config-compiler-plugin-v2/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { val annotationsVersion: String by rootProject.extra val javapoetVersion: String by rootProject.extra implementation("io.gitlab.jfronny.gson:gson-compile-processor-core:$gsonCompileVersion") - implementation(devProject(":libjf-config-core-v1")) + implementation(devProject(":libjf-config-core-v2")) implementation("org.jetbrains:annotations:$annotationsVersion") implementation("io.gitlab.jfronny:commons:$commonsVersion") implementation("io.gitlab.jfronny:commons-gson:$commonsVersion") diff --git a/libjf-config-compiler-plugin-v2/src/main/java/io/gitlab/jfronny/libjf/config/plugin/ConfigProcessor.java b/libjf-config-compiler-plugin-v2/src/main/java/io/gitlab/jfronny/libjf/config/plugin/ConfigProcessor.java index 5c96300..e2568b1 100644 --- a/libjf-config-compiler-plugin-v2/src/main/java/io/gitlab/jfronny/libjf/config/plugin/ConfigProcessor.java +++ b/libjf-config-compiler-plugin-v2/src/main/java/io/gitlab/jfronny/libjf/config/plugin/ConfigProcessor.java @@ -4,9 +4,9 @@ import com.squareup.javapoet.*; import io.gitlab.jfronny.commons.StringFormatter; import io.gitlab.jfronny.gson.compile.processor.core.*; import io.gitlab.jfronny.gson.reflect.TypeToken; -import io.gitlab.jfronny.libjf.config.api.v1.*; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.DSL; -import io.gitlab.jfronny.libjf.config.api.v1.type.Type; +import io.gitlab.jfronny.libjf.config.api.v2.*; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.DSL; +import io.gitlab.jfronny.libjf.config.api.v2.type.Type; import javax.annotation.processing.*; import javax.lang.model.SourceVersion; diff --git a/libjf-config-compiler-plugin-v2/src/test/java/io/gitlab/jfronny/libjf/config/plugin/test/PluginTest.java b/libjf-config-compiler-plugin-v2/src/test/java/io/gitlab/jfronny/libjf/config/plugin/test/PluginTest.java index abfa073..2307750 100644 --- a/libjf-config-compiler-plugin-v2/src/test/java/io/gitlab/jfronny/libjf/config/plugin/test/PluginTest.java +++ b/libjf-config-compiler-plugin-v2/src/test/java/io/gitlab/jfronny/libjf/config/plugin/test/PluginTest.java @@ -1,6 +1,6 @@ package io.gitlab.jfronny.libjf.config.plugin.test; -import io.gitlab.jfronny.libjf.config.api.v1.*; +import io.gitlab.jfronny.libjf.config.api.v2.*; import java.util.Map; diff --git a/libjf-config-core-v1/src/client/resources/assets/libjf-config-core-v1/lang/en_us.json b/libjf-config-core-v1/src/client/resources/assets/libjf-config-core-v1/lang/en_us.json deleted file mode 100644 index a5678ab..0000000 --- a/libjf-config-core-v1/src/client/resources/assets/libjf-config-core-v1/lang/en_us.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "libjf-config-core-v1.jfconfig.title": "LibJF Config", - "libjf-config-core-v1.jfconfig.watchForChanges": "Watch for changes", - "libjf-config-core-v1.jfconfig.watchForChanges.tooltip": "Automatically reload configs when they are changed", - "libjf-config-v1.presets": "Presets", - "libjf-config-v1.default": "Default", - "libjf-config-v1.see-also": "See also: %s", - "libjf-config-v1.reset": "Reset", - "libjf-config-core-v1.no-screen": "No screen", - "libjf-config-core-v1.no-screen.description": "No mod for rendering config UIs was discovered. Install LibJF to add one.", - "libjf-config-core-v1.edit": "Edit" -} \ No newline at end of file diff --git a/libjf-config-core-v1/build.gradle.kts b/libjf-config-core-v2/build.gradle.kts similarity index 84% rename from libjf-config-core-v1/build.gradle.kts rename to libjf-config-core-v2/build.gradle.kts index 4bcc048..794dfb7 100644 --- a/libjf-config-core-v1/build.gradle.kts +++ b/libjf-config-core-v2/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } base { - archivesName.set("libjf-config-core-v1") + archivesName.set("libjf-config-core-v2") } dependencies { diff --git a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v2/ui/ConfigScreenFactory.java b/libjf-config-core-v2/src/client/java/io/gitlab/jfronny/libjf/config/api/v2/ui/ConfigScreenFactory.java similarity index 90% rename from libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v2/ui/ConfigScreenFactory.java rename to libjf-config-core-v2/src/client/java/io/gitlab/jfronny/libjf/config/api/v2/ui/ConfigScreenFactory.java index e8a65e8..01b9b41 100644 --- a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/api/v2/ui/ConfigScreenFactory.java +++ b/libjf-config-core-v2/src/client/java/io/gitlab/jfronny/libjf/config/api/v2/ui/ConfigScreenFactory.java @@ -1,6 +1,6 @@ package io.gitlab.jfronny.libjf.config.api.v2.ui; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance; import io.gitlab.jfronny.libjf.config.impl.ui.ConfigScreenFactoryDiscovery; import net.minecraft.client.gui.screen.Screen; diff --git a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactoryDiscovery.java b/libjf-config-core-v2/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactoryDiscovery.java similarity index 100% rename from libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactoryDiscovery.java rename to libjf-config-core-v2/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ConfigScreenFactoryDiscovery.java diff --git a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ModMenuAdapter.java b/libjf-config-core-v2/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ModMenuAdapter.java similarity index 90% rename from libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ModMenuAdapter.java rename to libjf-config-core-v2/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ModMenuAdapter.java index dd34880..b906054 100644 --- a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ModMenuAdapter.java +++ b/libjf-config-core-v2/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/ModMenuAdapter.java @@ -3,8 +3,8 @@ package io.gitlab.jfronny.libjf.config.impl.ui; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigHolder; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigHolder; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance; import io.gitlab.jfronny.libjf.config.impl.ConfigCore; import java.util.HashMap; diff --git a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreen.java b/libjf-config-core-v2/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreen.java similarity index 87% rename from libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreen.java rename to libjf-config-core-v2/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreen.java index 7c4ff55..406c466 100644 --- a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreen.java +++ b/libjf-config-core-v2/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreen.java @@ -7,10 +7,10 @@ import java.util.Objects; public class PlaceholderScreen extends Screen { private final Screen parent; - private final Text description = Text.translatable("libjf-config-core-v1.no-screen.description"); + private final Text description = Text.translatable("libjf-config-core-v2.no-screen.description"); protected PlaceholderScreen(Screen parent) { - super(Text.translatable("libjf-config-core-v1.no-screen")); + super(Text.translatable("libjf-config-core-v2.no-screen")); this.parent = parent; addDrawable((context, mouseX, mouseY, delta) -> { context.drawCenteredTextWithShadow(textRenderer, description, width / 2, (height - textRenderer.fontHeight) / 2, 0xFFFFFF); diff --git a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreenFactory.java b/libjf-config-core-v2/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreenFactory.java similarity index 93% rename from libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreenFactory.java rename to libjf-config-core-v2/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreenFactory.java index c3d580e..b9300fc 100644 --- a/libjf-config-core-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreenFactory.java +++ b/libjf-config-core-v2/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/PlaceholderScreenFactory.java @@ -1,6 +1,6 @@ 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.ConfigInstance; import io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory; import net.minecraft.client.gui.screen.Screen; diff --git a/libjf-config-core-v2/src/client/resources/assets/libjf-config-core/lang/en_us.json b/libjf-config-core-v2/src/client/resources/assets/libjf-config-core/lang/en_us.json new file mode 100644 index 0000000..bfe56a3 --- /dev/null +++ b/libjf-config-core-v2/src/client/resources/assets/libjf-config-core/lang/en_us.json @@ -0,0 +1,12 @@ +{ + "libjf-config-core-v2.jfconfig.title": "LibJF Config", + "libjf-config-core-v2.jfconfig.watchForChanges": "Watch for changes", + "libjf-config-core-v2.jfconfig.watchForChanges.tooltip": "Automatically reload configs when they are changed", + "libjf-config-core-v2.presets": "Presets", + "libjf-config-core-v2.default": "Default", + "libjf-config-core-v2.see-also": "See also: %s", + "libjf-config-core-v2.reset": "Reset", + "libjf-config-core-v2.no-screen": "No screen", + "libjf-config-core-v2.no-screen.description": "No mod for rendering config UIs was discovered. Install LibJF to add one.", + "libjf-config-core-v2.edit": "Edit" +} \ No newline at end of file diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Category.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/Category.java similarity index 92% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Category.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/Category.java index b24fd31..816260b 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Category.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/Category.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.libjf.config.api.v1; +package io.gitlab.jfronny.libjf.config.api.v2; import java.lang.annotation.*; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/ConfigCategory.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/ConfigCategory.java similarity index 95% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/ConfigCategory.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/ConfigCategory.java index 4d35dc1..f4f0c02 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/ConfigCategory.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/ConfigCategory.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.libjf.config.api.v1; +package io.gitlab.jfronny.libjf.config.api.v2; import io.gitlab.jfronny.libjf.LibJf; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/ConfigHolder.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/ConfigHolder.java similarity index 97% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/ConfigHolder.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/ConfigHolder.java index c18fe67..2d43a2e 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/ConfigHolder.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/ConfigHolder.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.libjf.config.api.v1; +package io.gitlab.jfronny.libjf.config.api.v2; import io.gitlab.jfronny.libjf.LibJf; import io.gitlab.jfronny.libjf.config.impl.ConfigHolderImpl; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/ConfigInstance.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/ConfigInstance.java similarity index 90% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/ConfigInstance.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/ConfigInstance.java index 38fd34e..e3173a4 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/ConfigInstance.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/ConfigInstance.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.libjf.config.api.v1; +package io.gitlab.jfronny.libjf.config.api.v2; import java.nio.file.Path; import java.util.Optional; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Entry.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/Entry.java similarity index 87% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Entry.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/Entry.java index 6c6b18c..1a1ce01 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Entry.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/Entry.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.libjf.config.api.v1; +package io.gitlab.jfronny.libjf.config.api.v2; import java.lang.annotation.*; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/EntryInfo.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/EntryInfo.java similarity index 91% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/EntryInfo.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/EntryInfo.java index b991f8d..c3e6290 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/EntryInfo.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/EntryInfo.java @@ -1,9 +1,7 @@ -package io.gitlab.jfronny.libjf.config.api.v1; +package io.gitlab.jfronny.libjf.config.api.v2; -import io.gitlab.jfronny.gson.JsonElement; -import io.gitlab.jfronny.gson.JsonParseException; import io.gitlab.jfronny.gson.stream.*; -import io.gitlab.jfronny.libjf.config.api.v1.type.Type; +import io.gitlab.jfronny.libjf.config.api.v2.type.Type; import io.gitlab.jfronny.libjf.config.impl.dsl.DslEntryInfo; import org.jetbrains.annotations.ApiStatus; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/JfConfig.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/JfConfig.java similarity index 91% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/JfConfig.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/JfConfig.java index 983c646..bee1994 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/JfConfig.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/JfConfig.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.libjf.config.api.v1; +package io.gitlab.jfronny.libjf.config.api.v2; import java.lang.annotation.*; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/JfCustomConfig.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/JfCustomConfig.java similarity index 60% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/JfCustomConfig.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/JfCustomConfig.java index f4b8d1f..d43b7fd 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/JfCustomConfig.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/JfCustomConfig.java @@ -1,6 +1,6 @@ -package io.gitlab.jfronny.libjf.config.api.v1; +package io.gitlab.jfronny.libjf.config.api.v2; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.DSL; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.DSL; /** * The interface for entrypoints performing custom config registrations diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Preset.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/Preset.java similarity index 83% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Preset.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/Preset.java index ed45ae6..7f7ddf4 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Preset.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/Preset.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.libjf.config.api.v1; +package io.gitlab.jfronny.libjf.config.api.v2; import java.lang.annotation.*; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Verifier.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/Verifier.java similarity index 86% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Verifier.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/Verifier.java index e23d6a8..c659494 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Verifier.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/Verifier.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.libjf.config.api.v1; +package io.gitlab.jfronny.libjf.config.api.v2; import java.lang.annotation.*; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/dsl/CategoryBuilder.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/dsl/CategoryBuilder.java similarity index 89% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/dsl/CategoryBuilder.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/dsl/CategoryBuilder.java index 45378fa..af74762 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/dsl/CategoryBuilder.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/dsl/CategoryBuilder.java @@ -1,8 +1,9 @@ -package io.gitlab.jfronny.libjf.config.api.v1.dsl; +package io.gitlab.jfronny.libjf.config.api.v2.dsl; import io.gitlab.jfronny.commons.SamWithReceiver; -import io.gitlab.jfronny.libjf.config.api.v1.*; -import io.gitlab.jfronny.libjf.config.api.v1.type.Type; +import io.gitlab.jfronny.libjf.config.api.v2.*; +import io.gitlab.jfronny.libjf.config.api.v2.type.Type; +import io.gitlab.jfronny.libjf.config.impl.ConfigCore; import org.jetbrains.annotations.ApiStatus; import java.util.List; @@ -14,7 +15,7 @@ import java.util.function.Supplier; * @param The class implementing this builder */ public interface CategoryBuilder> { - String CONFIG_PRESET_DEFAULT = "libjf-config-v1.default"; + String CONFIG_PRESET_DEFAULT = ConfigCore.MOD_ID + ".default"; Builder setTranslationPrefix(String translationPrefix); String getTranslationPrefix(); diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/dsl/ConfigBuilder.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/dsl/ConfigBuilder.java similarity index 87% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/dsl/ConfigBuilder.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/dsl/ConfigBuilder.java index f7755ff..4266c9f 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/dsl/ConfigBuilder.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/dsl/ConfigBuilder.java @@ -1,7 +1,7 @@ -package io.gitlab.jfronny.libjf.config.api.v1.dsl; +package io.gitlab.jfronny.libjf.config.api.v2.dsl; import io.gitlab.jfronny.commons.SamWithReceiver; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance; import java.nio.file.Path; import java.util.function.Consumer; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/dsl/DSL.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/dsl/DSL.java similarity index 86% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/dsl/DSL.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/dsl/DSL.java index b43bd0e..55e7e64 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/dsl/DSL.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/dsl/DSL.java @@ -1,7 +1,7 @@ -package io.gitlab.jfronny.libjf.config.api.v1.dsl; +package io.gitlab.jfronny.libjf.config.api.v2.dsl; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigHolder; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigHolder; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance; import io.gitlab.jfronny.libjf.config.impl.dsl.DSLImpl; /** diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/dsl/Migration.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/dsl/Migration.java similarity index 78% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/dsl/Migration.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/dsl/Migration.java index 01973d8..31c752c 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/dsl/Migration.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/dsl/Migration.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.libjf.config.api.v1.dsl; +package io.gitlab.jfronny.libjf.config.api.v2.dsl; import io.gitlab.jfronny.gson.stream.JsonReader; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/type/Type.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/type/Type.java similarity index 99% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/type/Type.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/type/Type.java index bdf3cae..c92ca32 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/type/Type.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/api/v2/type/Type.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.libjf.config.api.v1.type; +package io.gitlab.jfronny.libjf.config.api.v2.type; import org.jetbrains.annotations.Nullable; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/AuxiliaryMetadata.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/AuxiliaryMetadata.java similarity index 93% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/AuxiliaryMetadata.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/AuxiliaryMetadata.java index fb5d2ab..53e5637 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/AuxiliaryMetadata.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/AuxiliaryMetadata.java @@ -1,9 +1,9 @@ package io.gitlab.jfronny.libjf.config.impl; import io.gitlab.jfronny.commons.serialize.gson.api.v1.GsonHolders; -import io.gitlab.jfronny.libjf.config.api.v1.Category; -import io.gitlab.jfronny.libjf.config.api.v1.JfConfig; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder; +import io.gitlab.jfronny.libjf.config.api.v2.Category; +import io.gitlab.jfronny.libjf.config.api.v2.JfConfig; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.CategoryBuilder; import io.gitlab.jfronny.libjf.gson.FabricLoaderGsonGenerator; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.metadata.CustomValue; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/ConfigCore.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/ConfigCore.java similarity index 71% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/ConfigCore.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/ConfigCore.java index bff80d2..fd97734 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/ConfigCore.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/ConfigCore.java @@ -1,10 +1,10 @@ package io.gitlab.jfronny.libjf.config.impl; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.DSL; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.DSL; public class ConfigCore { - public static final String MOD_ID = "libjf-config-core-v1"; + public static final String MOD_ID = "libjf-config-core-v2"; public static final String MODULE_ID = "libjf:config"; public static boolean watchForChanges = true; public static final ConfigInstance CONFIG_INSTANCE; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/ConfigHolderImpl.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/ConfigHolderImpl.java similarity index 95% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/ConfigHolderImpl.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/ConfigHolderImpl.java index f5c7b04..6bf2d22 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/ConfigHolderImpl.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/ConfigHolderImpl.java @@ -2,8 +2,8 @@ package io.gitlab.jfronny.libjf.config.impl; import com.google.common.collect.ImmutableMap; import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigHolder; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigHolder; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance; import net.fabricmc.loader.api.FabricLoader; import org.jetbrains.annotations.ApiStatus; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/CategoryBuilderImpl.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/CategoryBuilderImpl.java similarity index 97% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/CategoryBuilderImpl.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/CategoryBuilderImpl.java index eb5bb9a..4babb6e 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/CategoryBuilderImpl.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/CategoryBuilderImpl.java @@ -3,10 +3,10 @@ package io.gitlab.jfronny.libjf.config.impl.dsl; import io.gitlab.jfronny.commons.throwable.Coerce; import io.gitlab.jfronny.gson.stream.JsonReader; import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.*; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.Migration; -import io.gitlab.jfronny.libjf.config.api.v1.type.Type; +import io.gitlab.jfronny.libjf.config.api.v2.*; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.CategoryBuilder; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.Migration; +import io.gitlab.jfronny.libjf.config.api.v2.type.Type; import java.util.*; import java.util.function.Consumer; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/ConfigBuilderImpl.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/ConfigBuilderImpl.java similarity index 93% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/ConfigBuilderImpl.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/ConfigBuilderImpl.java index b395e19..625bb2a 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/ConfigBuilderImpl.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/ConfigBuilderImpl.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.libjf.config.impl.dsl; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.ConfigBuilder; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.ConfigBuilder; import net.fabricmc.loader.api.FabricLoader; import java.nio.file.Path; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DSLImpl.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DSLImpl.java similarity index 86% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DSLImpl.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DSLImpl.java index 369f7a0..9a4587f 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DSLImpl.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DSLImpl.java @@ -1,9 +1,9 @@ package io.gitlab.jfronny.libjf.config.impl.dsl; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigHolder; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.ConfigBuilder; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.DSL; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigHolder; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.ConfigBuilder; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.DSL; public class DSLImpl implements DSL { @Override diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DefaultConfigIO.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DefaultConfigIO.java similarity index 99% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DefaultConfigIO.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DefaultConfigIO.java index 8369290..8db48d2 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DefaultConfigIO.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DefaultConfigIO.java @@ -4,7 +4,7 @@ import io.gitlab.jfronny.commons.serialize.gson.api.v1.GsonHolders; import io.gitlab.jfronny.gson.*; import io.gitlab.jfronny.gson.stream.*; import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.*; +import io.gitlab.jfronny.libjf.config.api.v2.*; import io.gitlab.jfronny.libjf.config.impl.entrypoint.JfConfigSafe; import io.gitlab.jfronny.libjf.config.impl.watch.JfConfigWatchService; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigCategory.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigCategory.java similarity index 96% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigCategory.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigCategory.java index b5e3d85..9eb471e 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigCategory.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigCategory.java @@ -1,8 +1,8 @@ package io.gitlab.jfronny.libjf.config.impl.dsl; import io.gitlab.jfronny.gson.stream.JsonReader; -import io.gitlab.jfronny.libjf.config.api.v1.*; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder; +import io.gitlab.jfronny.libjf.config.api.v2.*; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.CategoryBuilder; import org.jetbrains.annotations.ApiStatus; import java.util.*; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigInstance.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigInstance.java similarity index 93% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigInstance.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigInstance.java index d997e68..6e7a294 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigInstance.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigInstance.java @@ -1,8 +1,8 @@ package io.gitlab.jfronny.libjf.config.impl.dsl; import io.gitlab.jfronny.gson.stream.JsonReader; -import io.gitlab.jfronny.libjf.config.api.v1.*; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder; +import io.gitlab.jfronny.libjf.config.api.v2.*; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.CategoryBuilder; import org.jetbrains.annotations.Nullable; import java.nio.file.Path; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslEntryInfo.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslEntryInfo.java similarity index 97% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslEntryInfo.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslEntryInfo.java index 18498ab..efa7ab1 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslEntryInfo.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslEntryInfo.java @@ -5,9 +5,9 @@ import io.gitlab.jfronny.commons.throwable.ThrowingConsumer; import io.gitlab.jfronny.commons.throwable.ThrowingSupplier; import io.gitlab.jfronny.gson.stream.*; import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.Entry; -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.v2.Entry; +import io.gitlab.jfronny.libjf.config.api.v2.EntryInfo; +import io.gitlab.jfronny.libjf.config.api.v2.type.Type; import io.gitlab.jfronny.libjf.config.impl.entrypoint.JfConfigSafe; import java.io.IOException; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/entrypoint/JfConfigSafe.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/entrypoint/JfConfigSafe.java similarity index 91% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/entrypoint/JfConfigSafe.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/entrypoint/JfConfigSafe.java index 636a934..948dffe 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/entrypoint/JfConfigSafe.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/entrypoint/JfConfigSafe.java @@ -1,8 +1,8 @@ package io.gitlab.jfronny.libjf.config.impl.entrypoint; import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.JfCustomConfig; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.DSL; +import io.gitlab.jfronny.libjf.config.api.v2.JfCustomConfig; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.DSL; import io.gitlab.jfronny.libjf.config.impl.ConfigCore; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.entrypoint.EntrypointContainer; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/JfConfigWatchService.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/JfConfigWatchService.java similarity index 100% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/JfConfigWatchService.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/JfConfigWatchService.java diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/JfConfigWatchServiceImpl.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/JfConfigWatchServiceImpl.java similarity index 98% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/JfConfigWatchServiceImpl.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/JfConfigWatchServiceImpl.java index 58e4ed0..05475e7 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/JfConfigWatchServiceImpl.java +++ b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/JfConfigWatchServiceImpl.java @@ -2,7 +2,7 @@ package io.gitlab.jfronny.libjf.config.impl.watch; import io.gitlab.jfronny.commons.throwable.ThrowingRunnable; import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigHolder; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigHolder; import net.fabricmc.loader.api.FabricLoader; import java.io.IOException; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/ToggleableConfigWatchService.java b/libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/ToggleableConfigWatchService.java similarity index 100% rename from libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/ToggleableConfigWatchService.java rename to libjf-config-core-v2/src/main/java/io/gitlab/jfronny/libjf/config/impl/watch/ToggleableConfigWatchService.java diff --git a/libjf-config-core-v1/src/main/resources/fabric.mod.json b/libjf-config-core-v2/src/main/resources/fabric.mod.json similarity index 96% rename from libjf-config-core-v1/src/main/resources/fabric.mod.json rename to libjf-config-core-v2/src/main/resources/fabric.mod.json index 7c378cb..624a8b6 100644 --- a/libjf-config-core-v1/src/main/resources/fabric.mod.json +++ b/libjf-config-core-v2/src/main/resources/fabric.mod.json @@ -1,6 +1,6 @@ { "schemaVersion": 1, - "id": "libjf-config-core-v1", + "id": "libjf-config-core-v2", "name": "LibJF Config", "version": "${version}", "authors": ["JFronny"], diff --git a/libjf-config-reflect-v1/build.gradle.kts b/libjf-config-reflect-v1/build.gradle.kts deleted file mode 100644 index 745747a..0000000 --- a/libjf-config-reflect-v1/build.gradle.kts +++ /dev/null @@ -1,15 +0,0 @@ -import io.gitlab.jfronny.scripts.* - -plugins { - id("jfmod.module") -} - -base { - archivesName.set("libjf-config-reflect-v1") -} - -dependencies { - api(devProject(":libjf-base")) - api(devProject(":libjf-unsafe-v0")) - api(devProject(":libjf-config-core-v1")) -} diff --git a/libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/reflect/ReflectiveConfigBuilder.java b/libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/reflect/ReflectiveConfigBuilder.java deleted file mode 100644 index c0ac31a..0000000 --- a/libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/reflect/ReflectiveConfigBuilder.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.gitlab.jfronny.libjf.config.api.v1.reflect; - -import io.gitlab.jfronny.libjf.config.api.v1.dsl.ConfigBuilder; -import io.gitlab.jfronny.libjf.config.impl.reflect.ReflectiveConfigBuilderImpl; - -public interface ReflectiveConfigBuilder extends ConfigBuilder.ConfigBuilderFunction { - static ReflectiveConfigBuilder of(String id, Class klazz) { - return new ReflectiveConfigBuilderImpl(id, klazz); - } -} diff --git a/libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/reflect/ReflectiveConfigBuilderImpl.java b/libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/reflect/ReflectiveConfigBuilderImpl.java deleted file mode 100644 index 9639cd9..0000000 --- a/libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/reflect/ReflectiveConfigBuilderImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -package io.gitlab.jfronny.libjf.config.impl.reflect; - -import io.gitlab.jfronny.commons.reflect.Reflect; -import io.gitlab.jfronny.commons.throwable.ThrowingConsumer; -import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.*; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.ConfigBuilder; -import io.gitlab.jfronny.libjf.config.api.v1.reflect.ReflectiveConfigBuilder; -import io.gitlab.jfronny.libjf.config.impl.AuxiliaryMetadata; -import io.gitlab.jfronny.libjf.config.impl.dsl.DslEntryInfo; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.Objects; -import java.util.function.Function; - -public class ReflectiveConfigBuilderImpl implements ReflectiveConfigBuilder { - private final AuxiliaryMetadata rootMeta; - private final Class rootClass; - private final Class rootTweaker; - private final String id; - - public ReflectiveConfigBuilderImpl(String id, Class klazz) { - this.id = id; - this.rootClass = Objects.requireNonNull(klazz); - JfConfig annotation = klazz.getAnnotation(JfConfig.class); - rootTweaker = annotation.tweaker(); - this.rootMeta = AuxiliaryMetadata.of(annotation).merge(AuxiliaryMetadata.forMod(id)); - } - - @Override - public ConfigBuilder apply(ConfigBuilder builder) { - return applyCategory(builder, rootClass, findTweaker(rootTweaker, ConfigBuilder.class), rootMeta); - } - - private > T applyCategory(T builder, Class configClass, Function tweaker, AuxiliaryMetadata meta) { - meta.applyTo(builder); - for (Field field : configClass.getFields()) { - if (field.isAnnotationPresent(Entry.class)) { - builder.value(DslEntryInfo.ofField(field)); - } - } - for (Method method : configClass.getMethods()) { - try { - if (method.isAnnotationPresent(Preset.class)) { - builder.addPreset(builder.getTranslationPrefix() + method.getName(), ReflectiveConfigBuilderImpl.staticToConsumer(configClass, method).addHandler(e -> LibJf.LOGGER.error("Could not apply preset", e))); - } else if (method.isAnnotationPresent(Verifier.class)) { - builder.addVerifier(ReflectiveConfigBuilderImpl.staticToConsumer(configClass, method).addHandler(e -> LibJf.LOGGER.error("Could not run verifier", e))); - } - } catch (Throwable t) { - LibJf.LOGGER.error("Could not process method " + method.getName() + " of config class " + configClass.getName()); - } - } - - for (Class categoryClass : configClass.getClasses()) { - if (categoryClass.isAnnotationPresent(Category.class)) { - Category annotation = categoryClass.getAnnotation(Category.class); - String name = categoryClass.getSimpleName(); - name = Character.toLowerCase(name.charAt(0)) + name.substring(1); // camelCase - var categoryTweaker = findTweaker(annotation.tweaker(), CategoryBuilder.class); - builder.category(name, builder1 -> applyCategory(builder1, categoryClass, categoryTweaker, AuxiliaryMetadata.of(categoryClass.getAnnotation(Category.class)))); - } - } - - return tweaker.apply(builder); - } - - private Function findTweaker(Class targetClass, Class tweakedClass) { - try { - return Objects.equals(targetClass, void.class) - ? Function.identity() - : Reflect.staticFunction(targetClass, "tweak", tweakedClass, tweakedClass); - } catch (Throwable t) { - LibJf.LOGGER.error("Could not find tweaker " + targetClass + " for mod " + id, t); - return Function.identity(); - } - } - - public static ThrowingConsumer staticToConsumer(Class klazz, Method method) throws Throwable { - Runnable rn = Reflect.staticProcedure(klazz, method.getName()); - return c -> rn.run(); - } -} diff --git a/libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/reflect/entrypoint/JfConfigReflectSafe.java b/libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/reflect/entrypoint/JfConfigReflectSafe.java deleted file mode 100644 index 36dcb9c..0000000 --- a/libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/reflect/entrypoint/JfConfigReflectSafe.java +++ /dev/null @@ -1,37 +0,0 @@ -package io.gitlab.jfronny.libjf.config.impl.reflect.entrypoint; - -import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.*; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.DSL; -import io.gitlab.jfronny.libjf.config.api.v1.reflect.ReflectiveConfigBuilder; -import io.gitlab.jfronny.libjf.config.impl.ConfigCore; -import io.gitlab.jfronny.libjf.config.impl.entrypoint.JfConfigSafe; -import net.fabricmc.loader.api.FabricLoader; -import net.fabricmc.loader.api.entrypoint.EntrypointContainer; -import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint; - -public class JfConfigReflectSafe implements PreLaunchEntrypoint { - @Override - public void onPreLaunch() { - LibJf.setup(); - for (EntrypointContainer config : FabricLoader.getInstance().getEntrypointContainers(ConfigCore.MODULE_ID, Object.class)) { - registerIfMissing(config.getProvider().getMetadata().getId(), config.getEntrypoint()); - } - } - - public static void registerIfMissing(String modId, Object config) { - if (JfConfigSafe.REGISTERED_MODS.add(modId)) { - ConfigHolder.getInstance().migrateFiles(modId); - if (config instanceof JfCustomConfig cfg) { - cfg.register(DSL.create(modId)); - } else { - Class klazz = config.getClass(); - if (klazz.isAnnotationPresent(JfConfig.class)) { - DSL.create(modId).register(ReflectiveConfigBuilder.of(modId, klazz)); - } else { - LibJf.LOGGER.error("Attempted to register improper config for mod " + modId + " (missing @JfConfig annotation or JfCustomConfig interface)"); - } - } - } - } -} diff --git a/libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/reflect/entrypoint/JfConfigUnsafe.java b/libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/reflect/entrypoint/JfConfigUnsafe.java deleted file mode 100644 index dce4269..0000000 --- a/libjf-config-reflect-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/reflect/entrypoint/JfConfigUnsafe.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.gitlab.jfronny.libjf.config.impl.reflect.entrypoint; - -import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.impl.ConfigCore; -import io.gitlab.jfronny.libjf.unsafe.DynamicEntry; -import io.gitlab.jfronny.libjf.unsafe.UltraEarlyInit; - -public class JfConfigUnsafe implements UltraEarlyInit { - @Override - public void init() { - DynamicEntry.execute(ConfigCore.MODULE_ID, Object.class, - s -> JfConfigReflectSafe.registerIfMissing(s.modId(), s.instance()) - ); - LibJf.LOGGER.info("Finished LibJF config entrypoint"); - } -} diff --git a/libjf-config-reflect-v1/src/main/resources/fabric.mod.json b/libjf-config-reflect-v1/src/main/resources/fabric.mod.json deleted file mode 100644 index 98c1618..0000000 --- a/libjf-config-reflect-v1/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "schemaVersion": 1, - "id": "libjf-config-reflect-v1", - "name": "LibJF Config Reflect", - "version": "${version}", - "authors": ["JFronny"], - "contact": { - "email": "projects.contact@frohnmeyer-wds.de", - "homepage": "https://jfronny.gitlab.io", - "issues": "https://git.frohnmeyer-wds.de/JfMods/LibJF/issues", - "sources": "https://git.frohnmeyer-wds.de/JfMods/LibJF" - }, - "license": "MIT", - "environment": "*", - "entrypoints": { - "libjf:preEarly": [ - "io.gitlab.jfronny.libjf.config.impl.reflect.entrypoint.JfConfigUnsafe" - ], - "preLaunch": [ - "io.gitlab.jfronny.libjf.config.impl.reflect.entrypoint.JfConfigReflectSafe" - ] - }, - "depends": { - "fabricloader": ">=0.12.0", - "minecraft": "*", - "libjf-base": ">=${version}", - "libjf-unsafe-v0": ">=${version}", - "libjf-config-core-v1": ">=${version}" - }, - "custom": { - "modmenu": { - "badges": ["library"], - "parent": "libjf" - } - } -} diff --git a/libjf-config-reflect-v1/src/testmod/java/io/gitlab/jfronny/libjf/config/test/reflect/TestConfig.java b/libjf-config-reflect-v1/src/testmod/java/io/gitlab/jfronny/libjf/config/test/reflect/TestConfig.java deleted file mode 100644 index 091eff2..0000000 --- a/libjf-config-reflect-v1/src/testmod/java/io/gitlab/jfronny/libjf/config/test/reflect/TestConfig.java +++ /dev/null @@ -1,57 +0,0 @@ -package io.gitlab.jfronny.libjf.config.test.reflect; - -import io.gitlab.jfronny.commons.serialize.gson.api.v1.Ignore; -import io.gitlab.jfronny.libjf.config.api.v1.*; - -import java.util.ArrayList; -import java.util.List; - -@JfConfig(referencedConfigs = {"libjf-web-v0"}, tweaker = TestConfigTweaker.class) -public class TestConfig { - @Entry public static boolean disablePacks = false; - @Entry public static Boolean disablePacks2 = false; - @Entry public static int intTest = 20; - @Entry(min = -5, max = 12) public static int intTestB = 20; - @Entry(min = -6) public static float floatTest = -5; - @Entry(min = 2, max = 21) public static double doubleTest = 20; - @Entry public static String dieStr = "lolz"; - @Entry @Ignore public static String guiOnlyStr = "lolz"; - public static String gsonOnlyStr = "lolz"; - @Entry public static Test enumTest = Test.Test; - @Entry public static List stringList; - - @Preset - public static void moskau() { - disablePacks = true; - disablePacks2 = true; - intTest = -5; - floatTest = -6; - doubleTest = 4; - dieStr = "Moskau"; - } - - @Verifier - public static void setIntTestIfDisable() { - if (disablePacks) intTest = 0; - } - - @Verifier - public static void stringListVerifier() { - if (stringList == null) stringList = new ArrayList<>(List.of("Obama")); - } - - public enum Test { - Test, ER - } - - @Category - public static class Subcategory { - @Entry public static boolean boolInSub = false; - @Entry public static int intIbSub = 15; - - @Category - public static class Inception { - @Entry public static Test yesEnum = Test.ER; - } - } -} diff --git a/libjf-config-reflect-v1/src/testmod/java/io/gitlab/jfronny/libjf/config/test/reflect/TestConfigTweaker.java b/libjf-config-reflect-v1/src/testmod/java/io/gitlab/jfronny/libjf/config/test/reflect/TestConfigTweaker.java deleted file mode 100644 index f1c74f3..0000000 --- a/libjf-config-reflect-v1/src/testmod/java/io/gitlab/jfronny/libjf/config/test/reflect/TestConfigTweaker.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.gitlab.jfronny.libjf.config.test.reflect; - -import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.ConfigBuilder; - -import java.util.Objects; - -public class TestConfigTweaker { - public static ConfigBuilder tweak(ConfigBuilder builder) { - if (!Objects.equals("libjf-config-reflect-v1-testmod", builder.getId())) throw new IllegalStateException("No!"); - LibJf.LOGGER.info("Called config tweaker"); - return builder.addMigration("joe", reader -> { - TestConfig.disablePacks = reader.nextBoolean(); - }); - } -} diff --git a/libjf-config-reflect-v1/src/testmod/resources/assets/libjf-config-v0-testmod/lang/en_us.json b/libjf-config-reflect-v1/src/testmod/resources/assets/libjf-config-v0-testmod/lang/en_us.json deleted file mode 100644 index 464230d..0000000 --- a/libjf-config-reflect-v1/src/testmod/resources/assets/libjf-config-v0-testmod/lang/en_us.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "libjf-config-reflect-v1-testmod.jfconfig.title": "JfConfig example", - "libjf-config-reflect-v1-testmod.jfconfig.disablePacks": "Disable resource packs", - "libjf-config-reflect-v1-testmod.jfconfig.intTest": "Int Test", - "libjf-config-reflect-v1-testmod.jfconfig.decimalTest": "Decimal Test", - "libjf-config-reflect-v1-testmod.jfconfig.dieStr": "String Test", - "libjf-config-reflect-v1-testmod.jfconfig.gsonOnlyStr.tooltip": "George", - "libjf-config-reflect-v1-testmod.jfconfig.enumTest": "Enum Test", - "libjf-config-reflect-v1-testmod.jfconfig.enumTest.tooltip": "Enum Test Tooltip", - "libjf-config-reflect-v1-testmod.jfconfig.enum.Test.Test": "Test", - "libjf-config-reflect-v1-testmod.jfconfig.enum.Test.ER": "ER", - "libjf-config-reflect-v1-testmod.jfconfig.moskau": "Moskau", - "libjf-config-reflect-v1-testmod.jfconfig.stringList": "String list", - "libjf-config-reflect-v1-testmod.jfconfig.stringList.tooltip": "Tooltip of the String list" -} \ No newline at end of file diff --git a/libjf-config-reflect-v1/src/testmod/resources/fabric.mod.json b/libjf-config-reflect-v1/src/testmod/resources/fabric.mod.json deleted file mode 100644 index 9cacc7e..0000000 --- a/libjf-config-reflect-v1/src/testmod/resources/fabric.mod.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "schemaVersion": 1, - "id": "libjf-config-reflect-v1-testmod", - "name": "LibJF Config Reflect", - "version": "1.0", - "environment": "*", - "entrypoints": { - "libjf:config": [ - "io.gitlab.jfronny.libjf.config.test.reflect.TestConfig" - ] - }, - "custom": { - "modmenu": { - "parent": "libjf-testmod" - } - } -} \ No newline at end of file diff --git a/libjf-config-ui-tiny-v1/src/client/resources/assets/libjf-config-ui-tiny-v1/lang/en_us.json b/libjf-config-ui-tiny-v1/src/client/resources/assets/libjf-config-ui-tiny-v1/lang/en_us.json deleted file mode 100644 index e33841b..0000000 --- a/libjf-config-ui-tiny-v1/src/client/resources/assets/libjf-config-ui-tiny-v1/lang/en_us.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "libjf-config-ui-tiny-v1.entry.json.read.fail.title": "Could not read", - "libjf-config-ui-tiny-v1.entry.json.read.fail.description": "The given entry could not be stringified. Please edit the config manually" -} \ No newline at end of file diff --git a/libjf-config-ui-tiny-v1/src/testmod/resources/assets/libjf-config-ui-tiny-v1-testmod/lang/en_us.json b/libjf-config-ui-tiny-v1/src/testmod/resources/assets/libjf-config-ui-tiny-v1-testmod/lang/en_us.json deleted file mode 100644 index 407c994..0000000 --- a/libjf-config-ui-tiny-v1/src/testmod/resources/assets/libjf-config-ui-tiny-v1-testmod/lang/en_us.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "libjf-config-ui-tiny-v1-testmod.jfconfig.title": "JfConfig example", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca1.title": "Category 1", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca1.tooltip": "This is category 1\nIt has an excessively long description to test multiline descriptions and wrapping, which are required for this to look good.\nThis is supported btw.", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca1.value1": "Value 1", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca2.title": "Category 2", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca2.tooltip": "This is category 2", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca2.value2": "Value 2", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca3.title": "Category 3", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca3.tooltip": "This is category 3", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca3.value3": "Value 3", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca4.title": "Category 4", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca4.tooltip": "This is category 4", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca4.value4": "Value 4", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca5.title": "Category 5", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca5.tooltip": "This is category 5", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca5.value5": "Value 5", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca6.title": "Category 6", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca6.tooltip": "This is category 6", - "libjf-config-ui-tiny-v1-testmod.jfconfig.ca6.value6": "Value 6" -} \ No newline at end of file diff --git a/libjf-config-ui-tiny-v1/build.gradle.kts b/libjf-config-ui-tiny/build.gradle.kts similarity index 73% rename from libjf-config-ui-tiny-v1/build.gradle.kts rename to libjf-config-ui-tiny/build.gradle.kts index a8fd5ce..4cfa50c 100644 --- a/libjf-config-ui-tiny-v1/build.gradle.kts +++ b/libjf-config-ui-tiny/build.gradle.kts @@ -5,12 +5,12 @@ plugins { } base { - archivesName.set("libjf-config-ui-tiny-v1") + archivesName.set("libjf-config-ui-tiny") } dependencies { val fabricVersion: String by rootProject.extra api(devProject(":libjf-base")) - api(devProject(":libjf-config-core-v1")) + api(devProject(":libjf-config-core-v2")) include(fabricApi.module("fabric-resource-loader-v0", fabricVersion)) } diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/EditorScreen.java b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/EditorScreen.java similarity index 100% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/EditorScreen.java rename to libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/EditorScreen.java diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/Placeholder.java b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/Placeholder.java similarity index 100% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/Placeholder.java rename to libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/Placeholder.java diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/ScreenWithSaveHook.java b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/ScreenWithSaveHook.java similarity index 100% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/ScreenWithSaveHook.java rename to libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/ScreenWithSaveHook.java diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreen.java b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreen.java similarity index 97% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreen.java rename to libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreen.java index e0f5837..d39d492 100644 --- a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreen.java +++ b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreen.java @@ -2,8 +2,9 @@ package io.gitlab.jfronny.libjf.config.impl.ui.tiny; import io.gitlab.jfronny.commons.throwable.Try; import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigCategory; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigCategory; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.CategoryBuilder; +import io.gitlab.jfronny.libjf.config.impl.ConfigCore; import io.gitlab.jfronny.libjf.config.impl.entrypoint.JfConfigSafe; import io.gitlab.jfronny.libjf.config.impl.ui.tiny.entry.EntryListWidget; import io.gitlab.jfronny.libjf.config.impl.ui.tiny.entry.WidgetState; @@ -98,7 +99,7 @@ public class TinyConfigScreen extends ScreenWithSaveHook { this.addDrawableChild(done); if (tabs.size() == 1 && !config.getPresets().isEmpty()) { - this.addDrawableChild(ButtonWidget.builder(Text.translatable("libjf-config-v1.presets"), + this.addDrawableChild(ButtonWidget.builder(Text.translatable(ConfigCore.MOD_ID + ".presets"), button -> Objects.requireNonNull(client).setScreen(new PresetsScreen(this, config, this::afterSelectPreset))) .dimensions(4, 6, 80, 20) .build()); diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreenFactory.java b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreenFactory.java similarity index 90% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreenFactory.java rename to libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreenFactory.java index 9902980..b51421d 100644 --- a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreenFactory.java +++ b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreenFactory.java @@ -2,10 +2,10 @@ package io.gitlab.jfronny.libjf.config.impl.ui.tiny; import io.gitlab.jfronny.commons.serialize.gson.api.v1.GsonHolders; import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance; -import io.gitlab.jfronny.libjf.config.api.v1.EntryInfo; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder; -import io.gitlab.jfronny.libjf.config.api.v1.type.Type; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance; +import io.gitlab.jfronny.libjf.config.api.v2.EntryInfo; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.CategoryBuilder; +import io.gitlab.jfronny.libjf.config.api.v2.type.Type; import io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; @@ -45,8 +45,8 @@ public class TinyConfigScreenFactory implements ConfigScreenFactory new PresetsScreen(screen, config, screen::afterSelectPreset)); } } for (WidgetState info : widgets) { MutableText name = Text.translatable(config.getTranslationPrefix() + info.entry.getName()); WidgetFactory.Widget control = info.factory == null ? null : info.factory.build(screen, textRenderer); - ButtonWidget resetButton = ButtonWidget.builder(Text.translatable("libjf-config-v1.reset"), (button -> info.reset())) + ButtonWidget resetButton = ButtonWidget.builder(Text.translatable(ConfigCore.MOD_ID + ".reset"), (button -> info.reset())) .dimensions(screen.width - 155, 0, 40, 20) .build(); BooleanSupplier resetVisible = () -> { @@ -70,7 +71,7 @@ public class TinyConfigTab implements Tab { } for (ConfigInstance ci : config.getReferencedConfigs()) { if (ci != null) { - this.list.addReference(Text.translatable("libjf-config-v1.see-also", TinyConfigScreen.getTitle(ci.getTranslationPrefix())), + this.list.addReference(Text.translatable(ConfigCore.MOD_ID + ".see-also", TinyConfigScreen.getTitle(ci.getTranslationPrefix())), () -> new TinyConfigScreen(ci, screen)); } } diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigTabWrapper.java b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigTabWrapper.java similarity index 100% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigTabWrapper.java rename to libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigTabWrapper.java diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/CustomSlider.java b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/CustomSlider.java similarity index 100% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/CustomSlider.java rename to libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/CustomSlider.java 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/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryInfoWidgetBuilder.java similarity index 96% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryInfoWidgetBuilder.java rename to libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryInfoWidgetBuilder.java index 7613bde..8ce50f4 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/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryInfoWidgetBuilder.java @@ -4,9 +4,9 @@ import io.gitlab.jfronny.commons.ref.R; import io.gitlab.jfronny.commons.serialize.gson.api.v1.GsonHolders; import io.gitlab.jfronny.commons.throwable.Try; 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.v2.ConfigCategory; +import io.gitlab.jfronny.libjf.config.api.v2.EntryInfo; +import io.gitlab.jfronny.libjf.config.api.v2.type.Type; import io.gitlab.jfronny.libjf.config.impl.ui.tiny.EditorScreen; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -156,7 +156,7 @@ public class EntryInfoWidgetBuilder { state.managedTemp = false; state.tempValue = null; return (screen, textRenderer) -> { - final ButtonWidget button = ButtonWidget.builder(Text.translatable("libjf-config-core-v1.edit"), $ -> { + final ButtonWidget button = ButtonWidget.builder(Text.translatable("libjf-config-core-v2.edit"), $ -> { final String jsonified; if (state.tempValue == null) { try { @@ -166,8 +166,8 @@ public class EntryInfoWidgetBuilder { SystemToast.add( screen.getClient().getToastManager(), SystemToast.Type.PACK_LOAD_FAILURE, - Text.translatable("libjf-config-ui-tiny-v1.entry.json.read.fail.title"), - Text.translatable("libjf-config-ui-tiny-v1.entry.json.read.fail.description") + Text.translatable("libjf-config-ui-tiny.entry.json.read.fail.title"), + Text.translatable("libjf-config-ui-tiny.entry.json.read.fail.description") ); return; } @@ -189,8 +189,8 @@ public class EntryInfoWidgetBuilder { SystemToast.add( screen.getClient().getToastManager(), SystemToast.Type.PACK_LOAD_FAILURE, - Text.translatable("libjf-config-ui-tiny-v1.entry.json.write.fail.title"), - Text.translatable("libjf-config-ui-tiny-v1.entry.json.write.fail.description") + Text.translatable("libjf-config-ui-tiny.entry.json.write.fail.title"), + Text.translatable("libjf-config-ui-tiny.entry.json.write.fail.description") ); state.tempValue = json; } diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryListWidget.java b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryListWidget.java similarity index 100% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryListWidget.java rename to libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryListWidget.java diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/Reflowable.java b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/Reflowable.java similarity index 100% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/Reflowable.java rename to libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/Reflowable.java diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetFactory.java b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetFactory.java similarity index 100% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetFactory.java rename to libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetFactory.java 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/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetState.java similarity index 96% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetState.java rename to libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetState.java index d4f45fe..8044c72 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/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/WidgetState.java @@ -2,7 +2,7 @@ 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.v2.EntryInfo; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetListWidget.java b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetListWidget.java similarity index 100% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetListWidget.java rename to libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetListWidget.java diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java similarity index 91% rename from libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java rename to libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java index 09d3ef9..28db33f 100644 --- a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java +++ b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java @@ -1,7 +1,8 @@ package io.gitlab.jfronny.libjf.config.impl.ui.tiny.presets; import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigCategory; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigCategory; +import io.gitlab.jfronny.libjf.config.impl.ConfigCore; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.DrawContext; @@ -19,7 +20,7 @@ public class PresetsScreen extends Screen { private final Runnable afterSelect; public PresetsScreen(Screen parent, ConfigCategory config, Runnable afterSelect) { - super(Text.translatable("libjf-config-v1.presets")); + super(Text.translatable(ConfigCore.MOD_ID + ".presets")); this.parent = parent; this.config = config; this.afterSelect = afterSelect; diff --git a/libjf-config-ui-tiny/src/client/resources/assets/libjf-config-ui-tiny/lang/en_us.json b/libjf-config-ui-tiny/src/client/resources/assets/libjf-config-ui-tiny/lang/en_us.json new file mode 100644 index 0000000..1bd4da7 --- /dev/null +++ b/libjf-config-ui-tiny/src/client/resources/assets/libjf-config-ui-tiny/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "libjf-config-ui-tiny.entry.json.read.fail.title": "Could not read", + "libjf-config-ui-tiny.entry.json.read.fail.description": "The given entry could not be stringified. Please edit the config manually" +} \ No newline at end of file diff --git a/libjf-config-ui-tiny-v1/src/main/resources/fabric.mod.json b/libjf-config-ui-tiny/src/main/resources/fabric.mod.json similarity index 90% rename from libjf-config-ui-tiny-v1/src/main/resources/fabric.mod.json rename to libjf-config-ui-tiny/src/main/resources/fabric.mod.json index a1ff522..65c4e50 100644 --- a/libjf-config-ui-tiny-v1/src/main/resources/fabric.mod.json +++ b/libjf-config-ui-tiny/src/main/resources/fabric.mod.json @@ -1,6 +1,6 @@ { "schemaVersion": 1, - "id": "libjf-config-ui-tiny-v1", + "id": "libjf-config-ui-tiny", "name": "LibJF Config UI: Tiny", "version": "${version}", "authors": ["JFronny"], @@ -20,7 +20,7 @@ "minecraft": "*", "fabric-resource-loader-v0": "*", "libjf-base": ">=${version}", - "libjf-config-core-v1": ">=${version}" + "libjf-config-core-v2": ">=${version}" }, "custom": { "modmenu": { diff --git a/libjf-config-ui-tiny-v1/src/testmod/java/io/gitlab/jfronny/libjf/config/test/tiny/TestConfig.java b/libjf-config-ui-tiny/src/testmod/java/io/gitlab/jfronny/libjf/config/test/tiny/TestConfig.java similarity index 91% rename from libjf-config-ui-tiny-v1/src/testmod/java/io/gitlab/jfronny/libjf/config/test/tiny/TestConfig.java rename to libjf-config-ui-tiny/src/testmod/java/io/gitlab/jfronny/libjf/config/test/tiny/TestConfig.java index 6238207..ef92773 100644 --- a/libjf-config-ui-tiny-v1/src/testmod/java/io/gitlab/jfronny/libjf/config/test/tiny/TestConfig.java +++ b/libjf-config-ui-tiny/src/testmod/java/io/gitlab/jfronny/libjf/config/test/tiny/TestConfig.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.libjf.config.test.tiny; -import io.gitlab.jfronny.libjf.config.api.v1.JfCustomConfig; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.DSL; +import io.gitlab.jfronny.libjf.config.api.v2.JfCustomConfig; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.DSL; public class TestConfig implements JfCustomConfig { private int value1 = 0; diff --git a/libjf-config-ui-tiny-v1/src/testmod/java/io/gitlab/jfronny/libjf/config/test/tiny/mixin/OptionsScreenMixin.java b/libjf-config-ui-tiny/src/testmod/java/io/gitlab/jfronny/libjf/config/test/tiny/mixin/OptionsScreenMixin.java similarity index 96% rename from libjf-config-ui-tiny-v1/src/testmod/java/io/gitlab/jfronny/libjf/config/test/tiny/mixin/OptionsScreenMixin.java rename to libjf-config-ui-tiny/src/testmod/java/io/gitlab/jfronny/libjf/config/test/tiny/mixin/OptionsScreenMixin.java index d6c34f2..e195779 100644 --- a/libjf-config-ui-tiny-v1/src/testmod/java/io/gitlab/jfronny/libjf/config/test/tiny/mixin/OptionsScreenMixin.java +++ b/libjf-config-ui-tiny/src/testmod/java/io/gitlab/jfronny/libjf/config/test/tiny/mixin/OptionsScreenMixin.java @@ -1,6 +1,6 @@ package io.gitlab.jfronny.libjf.config.test.tiny.mixin; -import io.gitlab.jfronny.libjf.config.api.v1.ConfigHolder; +import io.gitlab.jfronny.libjf.config.api.v2.ConfigHolder; import io.gitlab.jfronny.libjf.config.api.v2.ui.ConfigScreenFactory; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.option.OptionsScreen; diff --git a/libjf-config-ui-tiny/src/testmod/resources/assets/libjf-config-ui-tiny-testmod/lang/en_us.json b/libjf-config-ui-tiny/src/testmod/resources/assets/libjf-config-ui-tiny-testmod/lang/en_us.json new file mode 100644 index 0000000..82fd1d0 --- /dev/null +++ b/libjf-config-ui-tiny/src/testmod/resources/assets/libjf-config-ui-tiny-testmod/lang/en_us.json @@ -0,0 +1,21 @@ +{ + "libjf-config-ui-tiny-testmod.jfconfig.title": "JfConfig example", + "libjf-config-ui-tiny-testmod.jfconfig.ca1.title": "Category 1", + "libjf-config-ui-tiny-testmod.jfconfig.ca1.tooltip": "This is category 1\nIt has an excessively long description to test multiline descriptions and wrapping, which are required for this to look good.\nThis is supported btw.", + "libjf-config-ui-tiny-testmod.jfconfig.ca1.value1": "Value 1", + "libjf-config-ui-tiny-testmod.jfconfig.ca2.title": "Category 2", + "libjf-config-ui-tiny-testmod.jfconfig.ca2.tooltip": "This is category 2", + "libjf-config-ui-tiny-testmod.jfconfig.ca2.value2": "Value 2", + "libjf-config-ui-tiny-testmod.jfconfig.ca3.title": "Category 3", + "libjf-config-ui-tiny-testmod.jfconfig.ca3.tooltip": "This is category 3", + "libjf-config-ui-tiny-testmod.jfconfig.ca3.value3": "Value 3", + "libjf-config-ui-tiny-testmod.jfconfig.ca4.title": "Category 4", + "libjf-config-ui-tiny-testmod.jfconfig.ca4.tooltip": "This is category 4", + "libjf-config-ui-tiny-testmod.jfconfig.ca4.value4": "Value 4", + "libjf-config-ui-tiny-testmod.jfconfig.ca5.title": "Category 5", + "libjf-config-ui-tiny-testmod.jfconfig.ca5.tooltip": "This is category 5", + "libjf-config-ui-tiny-testmod.jfconfig.ca5.value5": "Value 5", + "libjf-config-ui-tiny-testmod.jfconfig.ca6.title": "Category 6", + "libjf-config-ui-tiny-testmod.jfconfig.ca6.tooltip": "This is category 6", + "libjf-config-ui-tiny-testmod.jfconfig.ca6.value6": "Value 6" +} \ No newline at end of file diff --git a/libjf-config-ui-tiny-v1/src/testmod/resources/fabric.mod.json b/libjf-config-ui-tiny/src/testmod/resources/fabric.mod.json similarity index 73% rename from libjf-config-ui-tiny-v1/src/testmod/resources/fabric.mod.json rename to libjf-config-ui-tiny/src/testmod/resources/fabric.mod.json index 53546bd..d7c5c53 100644 --- a/libjf-config-ui-tiny-v1/src/testmod/resources/fabric.mod.json +++ b/libjf-config-ui-tiny/src/testmod/resources/fabric.mod.json @@ -1,10 +1,10 @@ { "schemaVersion": 1, - "id": "libjf-config-ui-tiny-v1-testmod", + "id": "libjf-config-ui-tiny-testmod", "name": "LibJF Config UI: Tiny", "version": "1.0", "environment": "*", - "mixins": ["libjf-config-ui-tiny-v1-testmod.mixins.json"], + "mixins": ["libjf-config-ui-tiny-testmod.mixins.json"], "entrypoints": { "libjf:config": [ "io.gitlab.jfronny.libjf.config.test.tiny.TestConfig" diff --git a/libjf-config-ui-tiny-v1/src/testmod/resources/libjf-config-ui-tiny-v1-testmod.mixins.json b/libjf-config-ui-tiny/src/testmod/resources/libjf-config-ui-tiny-testmod.mixins.json similarity index 100% rename from libjf-config-ui-tiny-v1/src/testmod/resources/libjf-config-ui-tiny-v1-testmod.mixins.json rename to libjf-config-ui-tiny/src/testmod/resources/libjf-config-ui-tiny-testmod.mixins.json diff --git a/libjf-translate-v1/build.gradle.kts b/libjf-translate-v1/build.gradle.kts index 2bbd137..3e400d0 100644 --- a/libjf-translate-v1/build.gradle.kts +++ b/libjf-translate-v1/build.gradle.kts @@ -10,5 +10,5 @@ base { dependencies { api(devProject(":libjf-base")) - api(devProject(":libjf-config-core-v1")) + api(devProject(":libjf-config-core-v2")) } diff --git a/libjf-translate-v1/src/main/java/io/gitlab/jfronny/libjf/translate/impl/TranslateConfig.java b/libjf-translate-v1/src/main/java/io/gitlab/jfronny/libjf/translate/impl/TranslateConfig.java index 9a93c47..329f80a 100644 --- a/libjf-translate-v1/src/main/java/io/gitlab/jfronny/libjf/translate/impl/TranslateConfig.java +++ b/libjf-translate-v1/src/main/java/io/gitlab/jfronny/libjf/translate/impl/TranslateConfig.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.libjf.translate.impl; -import io.gitlab.jfronny.libjf.config.api.v1.JfCustomConfig; -import io.gitlab.jfronny.libjf.config.api.v1.dsl.DSL; +import io.gitlab.jfronny.libjf.config.api.v2.JfCustomConfig; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.DSL; import io.gitlab.jfronny.libjf.translate.api.TranslateService; import io.gitlab.jfronny.libjf.translate.impl.google.GoogleTranslateService; import io.gitlab.jfronny.libjf.translate.impl.libretranslate.LibreTranslateService; diff --git a/libjf-web-v0/build.gradle.kts b/libjf-web-v0/build.gradle.kts index ed9bac7..c5e453a 100644 --- a/libjf-web-v0/build.gradle.kts +++ b/libjf-web-v0/build.gradle.kts @@ -11,7 +11,7 @@ base { dependencies { val fabricVersion: String by rootProject.extra api(devProject(":libjf-base")) - api(devProject(":libjf-config-core-v1")) + api(devProject(":libjf-config-core-v2")) include(modImplementation(fabricApi.module("fabric-command-api-v2", fabricVersion))!!) annotationProcessor(project(":libjf-config-compiler-plugin-v2")) diff --git a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWebConfig.java b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWebConfig.java index 424dad3..3d1e3b7 100644 --- a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWebConfig.java +++ b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWebConfig.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.libjf.web.impl; import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.config.api.v1.*; +import io.gitlab.jfronny.libjf.config.api.v2.*; import java.io.IOException; import java.net.ServerSocket; diff --git a/libjf-web-v0/src/main/resources/fabric.mod.json b/libjf-web-v0/src/main/resources/fabric.mod.json index 59e1042..d9bb8e4 100644 --- a/libjf-web-v0/src/main/resources/fabric.mod.json +++ b/libjf-web-v0/src/main/resources/fabric.mod.json @@ -23,7 +23,7 @@ "fabricloader": ">=0.12.0", "minecraft": "*", "libjf-base": ">=${version}", - "libjf-config-core-v1": ">=${version}", + "libjf-config-core-v2": ">=${version}", "fabric-command-api-v2": "*" }, "custom": { diff --git a/settings.gradle.kts b/settings.gradle.kts index 2f8c2cd..db592b1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,10 +14,9 @@ rootProject.name = "libjf" include("libjf-base") -include("libjf-config-core-v1") -include("libjf-config-reflect-v1") -include("libjf-config-commands-v1") -include("libjf-config-ui-tiny-v1") +include("libjf-config-core-v2") +include("libjf-config-commands") +include("libjf-config-ui-tiny") include("libjf-data-v0") include("libjf-data-manipulation-v0") include("libjf-devutil")