Update to 24w13a.

- Update to 24w13a
- Upgrade to Biolith 2

Author: gniftygnome

common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesItems.java

@@ -2,6 +2,7 @@
 
 import com.terraformersmc.cinderscapes.init.helpers.CinderscapesRegistry;
 import net.fabricmc.fabric.api.registry.CompostingChanceRegistry;
+import net.minecraft.component.type.FoodComponent;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.item.*;

common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesPlacementModifierTypes.java

@@ -8,8 +8,8 @@
 import net.minecraft.world.gen.placementmodifier.PlacementModifierType;
 
 public class CinderscapesPlacementModifierTypes {
-    public static final PlacementModifierType<SafelistRangeCeilingPlacementModifier> COUNT_CEILING = () -> SafelistRangeCeilingPlacementModifier.UNIFORM_CODEC;
-    public static final PlacementModifierType<SafelistRangeFloorPlacementModifier> COUNT_FLOOR  = () -> SafelistRangeFloorPlacementModifier.UNIFORM_CODEC;
+    public static final PlacementModifierType<SafelistRangeCeilingPlacementModifier> COUNT_CEILING = () -> SafelistRangeCeilingPlacementModifier.MODIFIER_CODEC;
+    public static final PlacementModifierType<SafelistRangeFloorPlacementModifier> COUNT_FLOOR  = () -> SafelistRangeFloorPlacementModifier.MODIFIER_CODEC;
 
     public static void init() {
         Registry.register(Registries.PLACEMENT_MODIFIER_TYPE, new Identifier("cinderscapes", "safelist_range_ceiling"), COUNT_CEILING);

common/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesTrades.java

@@ -4,26 +4,24 @@
 import net.fabricmc.fabric.api.object.builder.v1.trade.TradeOfferHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.loot.LootTables;
 import net.minecraft.loot.entry.ItemEntry;
 import net.minecraft.loot.function.SetCountLootFunction;
 import net.minecraft.loot.provider.number.UniformLootNumberProvider;
-import net.minecraft.util.Identifier;
 import net.minecraft.village.TradeOffer;
 import net.minecraft.village.TradedItem;
 import net.minecraft.village.VillagerProfession;
 
 public class CinderscapesTrades {
-    private static final Identifier BARTERING_LOOT_TABLE_ID = new Identifier("minecraft", "gameplay/piglin_bartering");
-
     public static void init() {
 
-        LootTableEvents.MODIFY.register((resourceManager, manager, id, supplier, setter) -> {
-            if (BARTERING_LOOT_TABLE_ID.equals(id)) {
-                supplier.modifyPools((pools) -> {
+        LootTableEvents.MODIFY.register((key, supplier, setter) -> {
+            if (LootTables.PIGLIN_BARTERING_GAMEPLAY.equals(key)) {
+                supplier.modifyPools((pools) ->
                     pools   .with(ItemEntry.builder(CinderscapesItems.ROSE_QUARTZ).weight(20).quality(0).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(5, 12))).build())
                             .with(ItemEntry.builder(CinderscapesItems.SMOKY_QUARTZ).weight(20).quality(0).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(5, 12))).build())
-                            .with(ItemEntry.builder(CinderscapesItems.SULFUR_QUARTZ).weight(20).quality(0).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(5, 12))).build());
-                });
+                            .with(ItemEntry.builder(CinderscapesItems.SULFUR_QUARTZ).weight(20).quality(0).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(5, 12))).build())
+                );
             }
         });
 

common/src/main/java/com/terraformersmc/cinderscapes/placementmodifier/SafelistRangeCeilingPlacementModifier.java

@@ -1,6 +1,6 @@
 package com.terraformersmc.cinderscapes.placementmodifier;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.cinderscapes.init.CinderscapesPlacementModifierTypes;
 import net.minecraft.block.BlockState;
@@ -16,12 +16,13 @@
 import java.util.stream.Stream;
 
 public class SafelistRangeCeilingPlacementModifier extends PlacementModifier {
-    public static final Codec<SafelistRangeCeilingPlacementModifier> UNIFORM_CODEC = RecordCodecBuilder.create(
+    public static final MapCodec<SafelistRangeCeilingPlacementModifier> MODIFIER_CODEC = RecordCodecBuilder.mapCodec(
             instance -> instance.group(
                     YOffset.OFFSET_CODEC.fieldOf("min_inclusive").forGetter(provider -> provider.minOffset),
                     YOffset.OFFSET_CODEC.fieldOf("max_inclusive").forGetter(provider -> provider.maxOffset),
                     BlockState.CODEC.listOf().fieldOf("safelist").forGetter(provider -> provider.safelist)
-            ).apply(instance, SafelistRangeCeilingPlacementModifier::new));
+            ).apply(instance, SafelistRangeCeilingPlacementModifier::new)
+    );
     private final List<BlockState> safelist;
     private final YOffset minOffset;
     private final YOffset maxOffset;

common/src/main/java/com/terraformersmc/cinderscapes/placementmodifier/SafelistRangeFloorPlacementModifier.java

@@ -1,6 +1,6 @@
 package com.terraformersmc.cinderscapes.placementmodifier;
 
-import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import com.terraformersmc.cinderscapes.init.CinderscapesPlacementModifierTypes;
 import net.minecraft.block.BlockState;
@@ -16,12 +16,13 @@
 import java.util.stream.Stream;
 
 public class SafelistRangeFloorPlacementModifier extends PlacementModifier {
-    public static final Codec<SafelistRangeFloorPlacementModifier> UNIFORM_CODEC = RecordCodecBuilder.create(
+    public static final MapCodec<SafelistRangeFloorPlacementModifier> MODIFIER_CODEC = RecordCodecBuilder.mapCodec(
             instance -> instance.group(
                     YOffset.OFFSET_CODEC.fieldOf("min_inclusive").forGetter(provider -> provider.minOffset),
                     YOffset.OFFSET_CODEC.fieldOf("max_inclusive").forGetter(provider -> provider.maxOffset),
                     BlockState.CODEC.listOf().fieldOf("safelist").forGetter(provider -> provider.safelist)
-            ).apply(instance, SafelistRangeFloorPlacementModifier::new));
+            ).apply(instance, SafelistRangeFloorPlacementModifier::new)
+    );
     private final List<BlockState> safelist;
     private final YOffset minOffset;
     private final YOffset maxOffset;

gradle.properties

@@ -4,19 +4,19 @@ fabric.loom.multiProjectOptimisation=true
 maven_group=com.terraformersmc
 archive_name=cinderscapes
 
-minecraft_version=24w11a
-yarn_mappings=24w11a+build.2
+minecraft_version=24w13a
+yarn_mappings=24w13a+build.2
 loader_version=0.15.7
-fabric_version=0.96.10+1.20.5
+fabric_version=0.96.13+1.20.5
 
 # Terraform modules
-terraform_biome_remapper_api_version=10.0.0-alpha.7
-terraform_shapes_api_version=10.0.0-alpha.7
-terraform_surfaces_api_version=10.0.0-alpha.7
-terraform_wood_api_version=10.0.0-alpha.7
+terraform_biome_remapper_api_version=10.0.0-alpha.8
+terraform_shapes_api_version=10.0.0-alpha.8
+terraform_surfaces_api_version=10.0.0-alpha.8
+terraform_wood_api_version=10.0.0-alpha.8
 
 # Biolith for worldgen module and testing
-biolith_version=1.3.0-alpha.2
+biolith_version=2.1.0-alpha.1
 
 # TerraBlender for worldgen module and testing
 terrablender_version=1.20.4-3.3.0.12
@@ -44,7 +44,7 @@ curseforge_optional_dependencies=
 # Modrinth Metadata
 modrinth_slug=cinderscapes
 modrinth_id=QC4wcUXZ
-modrinth_game_versions=24w11a
+modrinth_game_versions=24w13a
 modrinth_mod_loaders=fabric, quilt
 #modrinth_embedded_dependencies=biolith