From 43012f84625a0db6fb1d735d62df86bbed941e0f Mon Sep 17 00:00:00 2001 From: Tschipp <11649893+Tschipp@users.noreply.github.com> Date: Mon, 21 Apr 2025 13:19:54 +0200 Subject: [PATCH] Updated default Blacklist, Fixed Cloth Config compat with saving --- .../java/tschipp/carryon/common/config/CarryConfig.java | 6 ++++-- .../main/java/tschipp/carryon/compat/ClothConfigCompat.java | 3 ++- .../tschipp/carryon/config/fabric/ConfigLoaderImpl.java | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java b/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java index a345615..9fe4012 100644 --- a/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java +++ b/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java @@ -284,7 +284,8 @@ public class CarryConfig "modern_industrialization:*_item_pipe", "modern_industrialization:fluid_pipe", "modern_industrialization:*_fluid_pipe", - "yigd:*" + "yigd:*", "domum_ornamentum:*", "connectiblechains:*", + "cobblemon:*" }; @Property( @@ -300,7 +301,8 @@ public class CarryConfig "minecraft:interaction", "minecraft:marker", "minecraft:block_display", "minecraft:item_display", "minecraft:text_display", "animania:hamster", "animania:ferret*", "animania:hedgehog*", "animania:cart", "animania:wagon", "mynko:*", "pixelmon:*", "mocreatures:*", "quark:totem", "vehicle:*", - "securitycraft:*", "taterzens:npc", "easy_npc:*", "bodiesbodies:dead_body", "littletiles:*" + "securitycraft:*", "taterzens:npc", "easy_npc:*", "bodiesbodies:dead_body", "littletiles:*", + "connectiblechains:*", "cobblemon:*", "create:*" }; @Property( diff --git a/Common/src/main/java/tschipp/carryon/compat/ClothConfigCompat.java b/Common/src/main/java/tschipp/carryon/compat/ClothConfigCompat.java index 554ef44..597c2af 100644 --- a/Common/src/main/java/tschipp/carryon/compat/ClothConfigCompat.java +++ b/Common/src/main/java/tschipp/carryon/compat/ClothConfigCompat.java @@ -80,8 +80,9 @@ public record ClothConfigCompat(BuiltConfig client, BuiltConfig common, Runnable .setSaveConsumer((Consumer) propertyData.getSetter()) .build(); case STRING_ARRAY -> - entryBuilder.startStrList(Component.literal(propertyData.getField().getName()), List.of(propertyData.getDefaultStringArray())) + entryBuilder.startStrList(Component.literal(propertyData.getField().getName()), List.of(propertyData.getStringArray())) .setTooltip(Component.literal(data.description())) + .setInsertInFront(true) .setDefaultValue(List.of(propertyData.getDefaultStringArray())) .setCellErrorSupplier(str -> str.matches(data.validationRegex()) ? Optional.empty() : Optional.of(Component.literal("Invalid Format"))) .setSaveConsumer((Consumer>) propertyData.getSetter()) diff --git a/Fabric/src/main/java/tschipp/carryon/config/fabric/ConfigLoaderImpl.java b/Fabric/src/main/java/tschipp/carryon/config/fabric/ConfigLoaderImpl.java index 55f2f23..fd385ea 100644 --- a/Fabric/src/main/java/tschipp/carryon/config/fabric/ConfigLoaderImpl.java +++ b/Fabric/src/main/java/tschipp/carryon/config/fabric/ConfigLoaderImpl.java @@ -23,6 +23,9 @@ package tschipp.carryon.config.fabric; import com.google.gson.*; import net.fabricmc.loader.api.FabricLoader; import org.apache.commons.io.FileUtils; +import tschipp.carryon.Constants; +import tschipp.carryon.common.config.CarryConfig; +import tschipp.carryon.common.config.ListHandler; import tschipp.carryon.config.*; import java.io.File; @@ -121,6 +124,7 @@ public class ConfigLoaderImpl { cfgPath.toFile().mkdirs(); FileUtils.write(cfgFile, GSON.toJson(entry.getKey()), StandardCharsets.UTF_8); } + ListHandler.initConfigLists(); } catch (Exception e) { e.printStackTrace(); }