From 0731d781d5263b6f83509ca187c6b1655856974e Mon Sep 17 00:00:00 2001 From: Zoe Gidiere Date: Tue, 17 Sep 2024 17:54:19 -0600 Subject: [PATCH] fix-up --- .../commands/structure/StructureCommandAddon.java | 5 ----- .../src/main/java/com/dfsek/terra/mod/data/Codecs.java | 10 +++++----- .../java/com/dfsek/terra/mod/util/MinecraftUtil.java | 2 +- .../main/java/com/dfsek/terra/mod/util/PresetUtil.java | 8 ++++---- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/common/addons/command-structures/src/main/java/com/dfsek/terra/addons/commands/structure/StructureCommandAddon.java b/common/addons/command-structures/src/main/java/com/dfsek/terra/addons/commands/structure/StructureCommandAddon.java index 45e0499ee..c4ef7f7ff 100644 --- a/common/addons/command-structures/src/main/java/com/dfsek/terra/addons/commands/structure/StructureCommandAddon.java +++ b/common/addons/command-structures/src/main/java/com/dfsek/terra/addons/commands/structure/StructureCommandAddon.java @@ -1,10 +1,5 @@ package com.dfsek.terra.addons.commands.structure; -import cloud.commandframework.ArgumentDescription; -import cloud.commandframework.CommandManager; -import cloud.commandframework.arguments.standard.EnumArgument; -import cloud.commandframework.arguments.standard.LongArgument; -import cloud.commandframework.context.CommandContext; import java.util.random.RandomGenerator; import java.util.random.RandomGeneratorFactory; diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/data/Codecs.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/data/Codecs.java index 5f140c69d..bfe3a2dd9 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/data/Codecs.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/data/Codecs.java @@ -42,12 +42,12 @@ public final class Codecs { .forGetter(TerraBiomeSource::getPack)) .apply(instance, instance.stable(TerraBiomeSource::new))); - public static final Codec TERRA_CONSTANT_RANGE = RecordCodecBuilder.mapCodec(range -> range.group( + public static final Codec TERRA_CONSTANT_RANGE = RecordCodecBuilder.create(range -> range.group( Codec.INT.fieldOf("min").stable().forGetter(ConstantRange::getMin), Codec.INT.fieldOf("max").stable().forGetter(ConstantRange::getMax)).apply(range, range.stable(ConstantRange::new))); public static final Codec TERRA_GENERATION_SETTINGS = RecordCodecBuilder - .mapCodec(instance -> instance.group( + .create(instance -> instance.group( TERRA_CONSTANT_RANGE.fieldOf("height").stable().forGetter(GenerationSettings::height), Codec.INT.fieldOf("sea_level").forGetter(GenerationSettings::sealevel), Codec.BOOL.fieldOf("mob_generation").forGetter(GenerationSettings::mobGeneration), @@ -55,8 +55,8 @@ public final class Codecs { .apply(instance, instance.stable(GenerationSettings::new))); - public static final Codec MINECRAFT_CHUNK_GENERATOR_WRAPPER = RecordCodecBuilder - .create( + public static final MapCodec MINECRAFT_CHUNK_GENERATOR_WRAPPER = RecordCodecBuilder + .mapCodec( instance -> instance.group( TERRA_BIOME_SOURCE.fieldOf("biome_source") .stable() @@ -71,7 +71,7 @@ public final class Codecs { MinecraftChunkGeneratorWrapper::new)) ); - public static final Codec TERRA_CONSTANT_RANGE_INT_PROVIDER_TYPE = RecordCodecBuilder.create(range -> range.group( + public static final MapCodec TERRA_CONSTANT_RANGE_INT_PROVIDER_TYPE = RecordCodecBuilder.mapCodec(range -> range.group( Codec.INT.fieldOf("min").stable().forGetter(TerraIntProvider::getMin), Codec.INT.fieldOf("max").stable().forGetter(TerraIntProvider::getMax)) .apply(range, range.stable((min, max) -> new TerraIntProvider(new ConstantRange( diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java index d7595d0cd..e7a6cf420 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java @@ -92,7 +92,7 @@ public final class MinecraftUtil { RegistryKey vanillaKey = ((ProtoPlatformBiome) biome.getPlatformBiome()).get(biomeRegistry); biomeRegistry.getOrEmpty(vanillaKey) .ifPresentOrElse(vanillaBiome -> { - Identifier terraBiomeIdentifier = new Identifier("terra", MinecraftUtil.createBiomeID(pack, id)); + Identifier terraBiomeIdentifier = Identifier.of("terra", MinecraftUtil.createBiomeID(pack, id)); biomeRegistry.getOrEmpty(terraBiomeIdentifier).ifPresentOrElse( terraBiome -> { List> flowerFeatures = List.copyOf( diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/PresetUtil.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/PresetUtil.java index 608e32bad..63ecf391b 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/PresetUtil.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/PresetUtil.java @@ -93,7 +93,7 @@ public class PresetUtil { private static void insertCustom(ModPlatform platform, String key, ConfigPack pack, Registry dimensionTypeRegistry, Registry chunkGeneratorSettingsRegistry, HashMap, DimensionOptions> dimensionMap) { - Identifier demensionIdentifier = new Identifier(key); + Identifier demensionIdentifier = Identifier.of(key); VanillaWorldProperties vanillaWorldProperties; @@ -103,13 +103,13 @@ public class PresetUtil { vanillaWorldProperties = new VanillaWorldProperties(); } - DimensionType defaultDimension = dimensionTypeRegistry.get(new Identifier(vanillaWorldProperties.getVanillaDimension())); + DimensionType defaultDimension = dimensionTypeRegistry.get(Identifier.of(vanillaWorldProperties.getVanillaDimension())); assert defaultDimension != null; DimensionType dimensionType = DimensionUtil.createDimension(vanillaWorldProperties, defaultDimension, platform); RegistryKey dimensionTypeRegistryKey = MinecraftUtil.registerDimensionTypeKey( - new Identifier("terra", pack.getID().toLowerCase( + Identifier.of("terra", pack.getID().toLowerCase( Locale.ROOT))); Registry.registerReference(dimensionTypeRegistry, dimensionTypeRegistryKey, dimensionType); @@ -119,7 +119,7 @@ public class PresetUtil { TerraBiomeSource biomeSource = new TerraBiomeSource(pack); RegistryEntry defaultGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry( - chunkGeneratorSettingsRegistry.get(new Identifier(vanillaWorldProperties.getVanillaGeneration()))); + chunkGeneratorSettingsRegistry.get(Identifier.of(vanillaWorldProperties.getVanillaGeneration()))); GenerationSettings generatorSettings = new GenerationSettings( vanillaWorldProperties.getHeight() == null ? new ConstantRange(