R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated default Blacklist, Fixed Cloth Config compat with saving

Browse Source
This commit is contained in:
Tschipp 2025-04-21 13:19:54 +02:00
parent 24c15ffb7b
commit 43012f8462
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java
View File

@ -284,7 +284,8 @@ public class CarryConfig
"modern_industrialization:*_item_pipe", "modern_industrialization:*_item_pipe",
"modern_industrialization:fluid_pipe", "modern_industrialization:fluid_pipe",
"modern_industrialization:*_fluid_pipe", "modern_industrialization:*_fluid_pipe",
"yigd:*" "yigd:*", "domum_ornamentum:*", "connectiblechains:*",
"cobblemon:*"
}; };
@Property( @Property(
@ -300,7 +301,8 @@ public class CarryConfig
"minecraft:interaction", "minecraft:marker", "minecraft:block_display", "minecraft:item_display", "minecraft:text_display", "minecraft:interaction", "minecraft:marker", "minecraft:block_display", "minecraft:item_display", "minecraft:text_display",
"animania:hamster", "animania:ferret*", "animania:hedgehog*", "animania:cart", "animania:hamster", "animania:ferret*", "animania:hedgehog*", "animania:cart",
"animania:wagon", "mynko:*", "pixelmon:*", "mocreatures:*", "quark:totem", "vehicle:*", "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( @Property(

3
Common/src/main/java/tschipp/carryon/compat/ClothConfigCompat.java
View File

@ -80,8 +80,9 @@ public record ClothConfigCompat(BuiltConfig client, BuiltConfig common, Runnable
.setSaveConsumer((Consumer<Double>) propertyData.getSetter()) .setSaveConsumer((Consumer<Double>) propertyData.getSetter())
.build(); .build();
case STRING_ARRAY -> 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())) .setTooltip(Component.literal(data.description()))
.setInsertInFront(true)
.setDefaultValue(List.of(propertyData.getDefaultStringArray())) .setDefaultValue(List.of(propertyData.getDefaultStringArray()))
.setCellErrorSupplier(str -> str.matches(data.validationRegex()) ? Optional.empty() : Optional.of(Component.literal("Invalid Format"))) .setCellErrorSupplier(str -> str.matches(data.validationRegex()) ? Optional.empty() : Optional.of(Component.literal("Invalid Format")))
.setSaveConsumer((Consumer<List<String>>) propertyData.getSetter()) .setSaveConsumer((Consumer<List<String>>) propertyData.getSetter())

4
Fabric/src/main/java/tschipp/carryon/config/fabric/ConfigLoaderImpl.java
View File

@ -23,6 +23,9 @@ package tschipp.carryon.config.fabric;
import com.google.gson.*; import com.google.gson.*;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import org.apache.commons.io.FileUtils; 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 tschipp.carryon.config.*;
import java.io.File; import java.io.File;
@ -121,6 +124,7 @@ public class ConfigLoaderImpl {
cfgPath.toFile().mkdirs(); cfgPath.toFile().mkdirs();
FileUtils.write(cfgFile, GSON.toJson(entry.getKey()), StandardCharsets.UTF_8); FileUtils.write(cfgFile, GSON.toJson(entry.getKey()), StandardCharsets.UTF_8);
} }
ListHandler.initConfigLists();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }