From d954b8754d642d7dc2dd620fb0f7359df0df00db Mon Sep 17 00:00:00 2001 From: Blue Staggo Date: Sat, 11 May 2024 18:45:10 +0100 Subject: [PATCH] Port fix-up --- gradle.properties | 6 ++--- .../feature/ModernBetaFoliagePlacers.java | 4 ++-- .../foliage/Oak14a08FoliagePlacer.java | 3 ++- .../Infdev325CavePlacementModifier.java | 3 ++- .../minecraft/dimension_type/overworld.json | 6 ++--- .../configured_carver/beta_cave_deep.json | 24 +++++++------------ .../resourcepacks/reduced_height/pack.mcmeta | 6 ++--- 7 files changed, 22 insertions(+), 30 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6669cf71..ae78e1e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties -minecraft_version=1.20.5 -yarn_mappings=1.20.5+build.1 +minecraft_version=1.20.6 +yarn_mappings=1.20.6+build.1 loader_version=0.15.10 loom_version=1.6.5 @@ -14,7 +14,7 @@ maven_group = io.bluestaggo archives_base_name = moderner-beta-fabric # Dependencies -fabric_version=0.97.6+1.20.5 +fabric_version=0.97.8+1.20.6 cloth_config_version = 14.0.126 mod_menu_version = 10.0.0-beta.1 diff --git a/src/main/java/mod/bespectacled/modernbeta/world/feature/ModernBetaFoliagePlacers.java b/src/main/java/mod/bespectacled/modernbeta/world/feature/ModernBetaFoliagePlacers.java index e0d697f7..1099c96e 100644 --- a/src/main/java/mod/bespectacled/modernbeta/world/feature/ModernBetaFoliagePlacers.java +++ b/src/main/java/mod/bespectacled/modernbeta/world/feature/ModernBetaFoliagePlacers.java @@ -1,6 +1,6 @@ package mod.bespectacled.modernbeta.world.feature; -import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; import mod.bespectacled.modernbeta.ModernBeta; import mod.bespectacled.modernbeta.world.feature.foliage.Oak14a08FoliagePlacer; import net.minecraft.registry.Registries; @@ -13,7 +13,7 @@ public class ModernBetaFoliagePlacers { ModernBetaFeatureTags.OAK_14A_08_FOLIAGE_PLACER, Oak14a08FoliagePlacer.CODEC ); - private static

FoliagePlacerType

register(String id, Codec

codec) { + private static

FoliagePlacerType

register(String id, MapCodec

codec) { return Registry.register(Registries.FOLIAGE_PLACER_TYPE, ModernBeta.createId(id), new FoliagePlacerType<>(codec)); } diff --git a/src/main/java/mod/bespectacled/modernbeta/world/feature/foliage/Oak14a08FoliagePlacer.java b/src/main/java/mod/bespectacled/modernbeta/world/feature/foliage/Oak14a08FoliagePlacer.java index a6377dcb..fe35d258 100644 --- a/src/main/java/mod/bespectacled/modernbeta/world/feature/foliage/Oak14a08FoliagePlacer.java +++ b/src/main/java/mod/bespectacled/modernbeta/world/feature/foliage/Oak14a08FoliagePlacer.java @@ -1,6 +1,7 @@ package mod.bespectacled.modernbeta.world.feature.foliage; import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; import mod.bespectacled.modernbeta.world.feature.ModernBetaFoliagePlacers; import net.minecraft.util.math.intprovider.IntProvider; @@ -11,7 +12,7 @@ import net.minecraft.world.gen.foliage.FoliagePlacer; import net.minecraft.world.gen.foliage.FoliagePlacerType; public class Oak14a08FoliagePlacer extends FoliagePlacer { - public static final Codec CODEC = RecordCodecBuilder.create(instance -> fillFoliagePlacerFields(instance) + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> fillFoliagePlacerFields(instance) .and(Codec.intRange(0, 16).fieldOf("height").forGetter(placer -> placer.height)) .apply(instance, Oak14a08FoliagePlacer::new)); diff --git a/src/main/java/mod/bespectacled/modernbeta/world/feature/placement/Infdev325CavePlacementModifier.java b/src/main/java/mod/bespectacled/modernbeta/world/feature/placement/Infdev325CavePlacementModifier.java index 80d7e342..e7ac9f5b 100644 --- a/src/main/java/mod/bespectacled/modernbeta/world/feature/placement/Infdev325CavePlacementModifier.java +++ b/src/main/java/mod/bespectacled/modernbeta/world/feature/placement/Infdev325CavePlacementModifier.java @@ -1,6 +1,7 @@ package mod.bespectacled.modernbeta.world.feature.placement; import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; import mod.bespectacled.modernbeta.util.noise.PerlinOctaveNoise; import net.minecraft.util.math.BlockPos; @@ -16,7 +17,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; public class Infdev325CavePlacementModifier extends PlacementModifier { - public static final Codec MODIFIER_CODEC = RecordCodecBuilder.create( + public static final MapCodec MODIFIER_CODEC = RecordCodecBuilder.mapCodec( instance -> instance.group( Codec.INT.fieldOf("min_section").forGetter(i -> i.minSection), Codec.INT.fieldOf("max_section").forGetter(i -> i.maxSection) diff --git a/src/main/resources/resourcepacks/reduced_height/data/minecraft/dimension_type/overworld.json b/src/main/resources/resourcepacks/reduced_height/data/minecraft/dimension_type/overworld.json index 32ef9ceb..81b6c775 100644 --- a/src/main/resources/resourcepacks/reduced_height/data/minecraft/dimension_type/overworld.json +++ b/src/main/resources/resourcepacks/reduced_height/data/minecraft/dimension_type/overworld.json @@ -13,10 +13,8 @@ "monster_spawn_block_light_limit": 0, "monster_spawn_light_level": { "type": "minecraft:uniform", - "value": { - "max_inclusive": 7, - "min_inclusive": 0 - } + "max_inclusive": 7, + "min_inclusive": 0 }, "natural": true, "piglin_safe": false, diff --git a/src/main/resources/resourcepacks/reduced_height/data/modern_beta/worldgen/configured_carver/beta_cave_deep.json b/src/main/resources/resourcepacks/reduced_height/data/modern_beta/worldgen/configured_carver/beta_cave_deep.json index 10aea66e..b1e1dc0b 100644 --- a/src/main/resources/resourcepacks/reduced_height/data/modern_beta/worldgen/configured_carver/beta_cave_deep.json +++ b/src/main/resources/resourcepacks/reduced_height/data/modern_beta/worldgen/configured_carver/beta_cave_deep.json @@ -27,17 +27,13 @@ }, "floor_level": { "type": "minecraft:uniform", - "value": { - "max_exclusive": -0.4, - "min_inclusive": -1.0 - } + "max_exclusive": -0.4, + "min_inclusive": -1.0 }, "horizontal_radius_multiplier": { "type": "minecraft:uniform", - "value": { - "max_exclusive": 1.4, - "min_inclusive": 0.7 - } + "max_exclusive": 1.4, + "min_inclusive": 0.7 }, "lava_level": { "above_bottom": 10 @@ -46,10 +42,8 @@ "replaceable": "#modern_beta:overworld_carver_replaceables", "vertical_radius_multiplier": { "type": "minecraft:uniform", - "value": { - "max_exclusive": 1.3, - "min_inclusive": 0.8 - } + "max_exclusive": 1.3, + "min_inclusive": 0.8 }, "y": { "type": "minecraft:uniform", @@ -62,10 +56,8 @@ }, "yScale": { "type": "minecraft:uniform", - "value": { - "max_exclusive": 0.9, - "min_inclusive": 0.1 - } + "max_exclusive": 0.9, + "min_inclusive": 0.1 } } } \ No newline at end of file diff --git a/src/main/resources/resourcepacks/reduced_height/pack.mcmeta b/src/main/resources/resourcepacks/reduced_height/pack.mcmeta index 5613d1f3..56944ea2 100644 --- a/src/main/resources/resourcepacks/reduced_height/pack.mcmeta +++ b/src/main/resources/resourcepacks/reduced_height/pack.mcmeta @@ -1,10 +1,10 @@ { "pack": { "description": "Min Y = 0, pre-1.18 ore gen", - "pack_format": 15, + "pack_format": 41, "supported_formats": { - "min_inclusive": 15, - "max_inclusive": 36 + "min_inclusive": 37, + "max_inclusive": 41 } } } \ No newline at end of file -- knotmirror 0.0.1