diff options
| author | isXander <xander@isxander.dev> | 2024-04-23 18:07:18 +0100 |
|---|---|---|
| committer | isXander <xander@isxander.dev> | 2024-04-23 18:07:18 +0100 |
| commit | e1d95961881b72f40d8c12d2cdcaeee4d9e6b31b (patch) | |
| tree | 8b826cb20fa429ec6502456bcc4c1e07928f8cd2 /src/main/java/dev/isxander/yacl3/config | |
| parent | 66fd6b3fac8c7893037934cd0af0925c59114516 (diff) | |
| download | YetAnotherConfigLib-e1d95961881b72f40d8c12d2cdcaeee4d9e6b31b.tar.gz YetAnotherConfigLib-e1d95961881b72f40d8c12d2cdcaeee4d9e6b31b.tar.bz2 YetAnotherConfigLib-e1d95961881b72f40d8c12d2cdcaeee4d9e6b31b.zip | |
Last minute 1.20.5 changes
Add changelog
Fix the mods.toml
Re-add fix from 3.3.3
VCS stonecutter version is now 1.20.5
Diffstat (limited to 'src/main/java/dev/isxander/yacl3/config')
| -rw-r--r-- | src/main/java/dev/isxander/yacl3/config/GsonConfigInstance.java | 12 | ||||
| -rw-r--r-- | src/main/java/dev/isxander/yacl3/config/v2/impl/serializer/GsonConfigSerializer.java | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/dev/isxander/yacl3/config/GsonConfigInstance.java b/src/main/java/dev/isxander/yacl3/config/GsonConfigInstance.java index c47afe2..83a0b1c 100644 --- a/src/main/java/dev/isxander/yacl3/config/GsonConfigInstance.java +++ b/src/main/java/dev/isxander/yacl3/config/GsonConfigInstance.java @@ -68,11 +68,11 @@ public class GsonConfigInstance<T> extends ConfigInstance<T> { this.path = path; this.gson = builder .setExclusionStrategies(new ConfigExclusionStrategy()) - /*? if >1.20.4 { *//* + /*? if >1.20.4 { */ .registerTypeHierarchyAdapter(Component.class, new Component.SerializerAdapter(RegistryAccess.EMPTY)) - *//*? } elif =1.20.4 {*/ + /*? } elif =1.20.4 {*//* .registerTypeHierarchyAdapter(Component.class, new Component.SerializerAdapter()) - /*? } else {*//* + *//*? } else {*//* .registerTypeHierarchyAdapter(Component.class, new Component.Serializer()) *//*?}*/ .registerTypeHierarchyAdapter(Style.class, /*? if >=1.20.4 {*/new GsonConfigSerializer.StyleTypeAdapter()/*?} else {*//*new Style.Serializer()*//*?}*/) @@ -169,11 +169,11 @@ public class GsonConfigInstance<T> extends ConfigInstance<T> { private UnaryOperator<GsonBuilder> gsonBuilder = builder -> builder .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES) .serializeNulls() - /*? if >1.20.4 { *//* + /*? if >1.20.4 { */ .registerTypeHierarchyAdapter(Component.class, new Component.SerializerAdapter(RegistryAccess.EMPTY)) - *//*? } elif =1.20.4 {*/ + /*? } elif =1.20.4 {*//* .registerTypeHierarchyAdapter(Component.class, new Component.SerializerAdapter()) - /*? } else {*//* + *//*? } else {*//* .registerTypeHierarchyAdapter(Component.class, new Component.Serializer()) *//*?}*/ .registerTypeHierarchyAdapter(Style.class, /*? if >=1.20.4 {*/new GsonConfigSerializer.StyleTypeAdapter()/*?} else {*//*new Style.Serializer()*//*?}*/) diff --git a/src/main/java/dev/isxander/yacl3/config/v2/impl/serializer/GsonConfigSerializer.java b/src/main/java/dev/isxander/yacl3/config/v2/impl/serializer/GsonConfigSerializer.java index 9f6d8c8..3492c55 100644 --- a/src/main/java/dev/isxander/yacl3/config/v2/impl/serializer/GsonConfigSerializer.java +++ b/src/main/java/dev/isxander/yacl3/config/v2/impl/serializer/GsonConfigSerializer.java @@ -221,11 +221,11 @@ public class GsonConfigSerializer<T> extends ConfigSerializer<T> { private UnaryOperator<GsonBuilder> gsonBuilder = builder -> builder .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES) .serializeNulls() - /*? if >1.20.4 { *//* + /*? if >1.20.4 { */ .registerTypeHierarchyAdapter(Component.class, new Component.SerializerAdapter(RegistryAccess.EMPTY)) - *//*? } elif =1.20.4 {*/ + /*? } elif =1.20.4 {*//* .registerTypeHierarchyAdapter(Component.class, new Component.SerializerAdapter()) - /*? } else {*//* + *//*? } else {*//* .registerTypeHierarchyAdapter(Component.class, new Component.Serializer()) *//*?}*/ .registerTypeHierarchyAdapter(Style.class, /*? if >=1.20.4 {*/new StyleTypeAdapter()/*?} else {*//*new Style.Serializer()*//*?}*/) |