Update to 1.20.5

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'fabric-loom' version '1.6-SNAPSHOT'
 }
 
-apply from: 'https://dawnteammc.github.io/resources/gradle_scripts/fabric-mod/java-17.gradle'
+apply from: 'https://dawnteammc.github.io/resources/gradle_scripts/fabric-mod/java-21.gradle'
 
 repositories {
     maven { url 'https://jitpack.io' }                // Required for Dawn API

gradle.properties

@@ -9,12 +9,12 @@ loader_name=Fabric
 loader_icon=https://fabricmc.net/assets/logo.png
 
 # check these on https://fabricmc.net/versions.html
-minecraft_version=24w13a
-yarn_mappings=24w13a+build.7
-loader_version=0.15.7
-fabric_version=0.96.13+1.20.5
+minecraft_version=1.20.5
+yarn_mappings=1.20.5+build.1
+loader_version=0.15.10
+fabric_version=0.97.7+1.20.5
 
 # https://github.com/DawnTeamMC/DawnAPI
 dawn_version=snapshot-SNAPSHOT
 # https://maven.terraformersmc.com/releases/com/terraformersmc/biolith-fabric
-biolith_version=2.1.0-alpha.1
+biolith_version=2.1.0-alpha.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/fr/hugman/promenade/item/PromenadeItems.java

@@ -29,7 +29,7 @@ public class PromenadeItems {
     public static final Item MAPLE_CHEST_BOAT = ofBoat(PromenadeItemKeys.MAPLE_CHEST_BOAT, PromenadeBoatTypeKeys.MAPLE, true);
     public static final Item MAPLE_SYRUP_BOTTLE = of(PromenadeItemKeys.MAPLE_SYRUP_BOTTLE, new HoneyBottleItem(new Item.Settings()
             .maxCount(16)
-            .food(new FoodComponent.Builder().hunger(6).saturationModifier(0.1F).build())
+            .food(new FoodComponent.Builder().nutrition(6).saturationModifier(0.1F).build())
             .recipeRemainder(Items.GLASS_BOTTLE)));
 
     public static final Item PALM_SIGN = of(PromenadeItemKeys.PALM_SIGN, new SignItem(new Item.Settings().maxCount(16), PromenadeBlocks.PALM_SIGN, PromenadeBlocks.PALM_WALL_SIGN));
@@ -40,14 +40,14 @@ public class PromenadeItems {
     public static final Item DARK_AMARANTH_SIGN = of(PromenadeItemKeys.DARK_AMARANTH_SIGN, new SignItem(new Item.Settings().maxCount(16), PromenadeBlocks.DARK_AMARANTH_SIGN, PromenadeBlocks.DARK_AMARANTH_WALL_SIGN));
     public static final Item DARK_AMARANTH_HANGING_SIGN = of(PromenadeItemKeys.DARK_AMARANTH_HANGING_SIGN, new HangingSignItem(PromenadeBlocks.DARK_AMARANTH_HANGING_SIGN, PromenadeBlocks.DARK_AMARANTH_WALL_HANGING_SIGN, new Item.Settings().maxCount(16)));
 
-    public static final Item BLUEBERRIES = of(PromenadeItemKeys.BLUEBERRIES, new AliasedBlockItem(PromenadeBlocks.BLUEBERRY_BUSH, new Item.Settings().food(new FoodComponent.Builder().hunger(2).saturationModifier(0.1F).build()).compostingChance(0.30F)));
+    public static final Item BLUEBERRIES = of(PromenadeItemKeys.BLUEBERRIES, new AliasedBlockItem(PromenadeBlocks.BLUEBERRY_BUSH, new Item.Settings().food(new FoodComponent.Builder().nutrition(2).saturationModifier(0.1F).build()).compostingChance(0.30F)));
 
-    public static final Item BANANA = of(PromenadeItemKeys.BANANA, new Item(new Item.Settings().food(new FoodComponent.Builder().hunger(4).saturationModifier(0.3F).build()).compostingChance(0.65F)));
-    public static final Item APRICOT = of(PromenadeItemKeys.APRICOT, new Item(new Item.Settings().food(new FoodComponent.Builder().hunger(4).saturationModifier(0.3F).build()).compostingChance(0.65F)));
-    public static final Item MANGO = of(PromenadeItemKeys.MANGO, new Item(new Item.Settings().food(new FoodComponent.Builder().hunger(4).saturationModifier(0.3F).build()).compostingChance(0.65F)));
+    public static final Item BANANA = of(PromenadeItemKeys.BANANA, new Item(new Item.Settings().food(new FoodComponent.Builder().nutrition(4).saturationModifier(0.3F).build()).compostingChance(0.65F)));
+    public static final Item APRICOT = of(PromenadeItemKeys.APRICOT, new Item(new Item.Settings().food(new FoodComponent.Builder().nutrition(4).saturationModifier(0.3F).build()).compostingChance(0.65F)));
+    public static final Item MANGO = of(PromenadeItemKeys.MANGO, new Item(new Item.Settings().food(new FoodComponent.Builder().nutrition(4).saturationModifier(0.3F).build()).compostingChance(0.65F)));
 
-    public static final Item DUCK = of(PromenadeItemKeys.DUCK, new Item(new Item.Settings().food(new FoodComponent.Builder().hunger(2).saturationModifier(0.3F).statusEffect(new StatusEffectInstance(StatusEffects.HUNGER, 600, 0), 0.3F).build())));
-    public static final Item COOKED_DUCK = of(PromenadeItemKeys.COOKED_DUCK, new Item(new Item.Settings().food(new FoodComponent.Builder().hunger(6).saturationModifier(0.6F).build())));
+    public static final Item DUCK = of(PromenadeItemKeys.DUCK, new Item(new Item.Settings().food(new FoodComponent.Builder().nutrition(2).saturationModifier(0.3F).statusEffect(new StatusEffectInstance(StatusEffects.HUNGER, 600, 0), 0.3F).build())));
+    public static final Item COOKED_DUCK = of(PromenadeItemKeys.COOKED_DUCK, new Item(new Item.Settings().food(new FoodComponent.Builder().nutrition(6).saturationModifier(0.6F).build())));
 
     public static final Item CAPYBARA_SPAWN_EGG = of(PromenadeItemKeys.CAPYBARA_SPAWN_EGG, DawnFactory.spawnEgg(PromenadeEntityTypes.CAPYBARA, 0xa0704e, 0x433930)); //TODO: review colors
     public static final Item DUCK_SPAWN_EGG = of(PromenadeItemKeys.DUCK_SPAWN_EGG, DawnFactory.spawnEgg(PromenadeEntityTypes.DUCK, 10592673, 15904341));

src/main/java/fr/hugman/promenade/particle/FallingLeafParticle.java

@@ -4,7 +4,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.particle.*;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraft.particle.DefaultParticleType;
+import net.minecraft.particle.SimpleParticleType;
 
 @Environment(value = EnvType.CLIENT)
 public class FallingLeafParticle extends SpriteBillboardParticle {
@@ -69,9 +69,9 @@ public void tick() {
     }
 
     @Environment(value = EnvType.CLIENT)
-    public record BlossomFactory(SpriteProvider spriteProvider) implements ParticleFactory<DefaultParticleType> {
+    public record BlossomFactory(SpriteProvider spriteProvider) implements ParticleFactory<SimpleParticleType> {
         @Override
-        public Particle createParticle(DefaultParticleType defaultParticleType, ClientWorld clientWorld, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
+        public Particle createParticle(SimpleParticleType simpleParticleType, ClientWorld clientWorld, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
             FallingLeafParticle particle = new FallingLeafParticle(clientWorld, x, y, z, this.spriteProvider);
             //particle.bobbingAmplitude = MathHelper.nextBetween(clientWorld.random, 0.9f, 1.2f);
             //particle.maxAge = MathHelper.nextBetween(clientWorld.random, 500, 1000);
@@ -80,9 +80,9 @@ public Particle createParticle(DefaultParticleType defaultParticleType, ClientWo
     }
 
     @Environment(value = EnvType.CLIENT)
-    public record MapleLeafFactory(SpriteProvider spriteProvider) implements ParticleFactory<DefaultParticleType> {
+    public record MapleLeafFactory(SpriteProvider spriteProvider) implements ParticleFactory<SimpleParticleType> {
         @Override
-        public Particle createParticle(DefaultParticleType defaultParticleType, ClientWorld clientWorld, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
+        public Particle createParticle(SimpleParticleType simpleParticleType, ClientWorld clientWorld, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
             FallingLeafParticle particle = new FallingLeafParticle(clientWorld, x, y, z, this.spriteProvider);
             //particle.bobbingAmplitude = MathHelper.nextBetween(world.random, 0.6f, 0.8f);
             //particle.maxAge = MathHelper.nextBetween(world.random, 500, 1000);

src/main/java/fr/hugman/promenade/particle/FloatingParticle.java

@@ -4,7 +4,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.particle.*;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraft.particle.DefaultParticleType;
+import net.minecraft.particle.SimpleParticleType;
 import net.minecraft.util.math.MathHelper;
 
 import java.util.Optional;
@@ -53,9 +53,9 @@ public ParticleTextureSheet getType() {
     }
 
     @Environment(value = EnvType.CLIENT)
-    public record BlossomFactory(SpriteProvider spriteProvider) implements ParticleFactory<DefaultParticleType> {
+    public record BlossomFactory(SpriteProvider spriteProvider) implements ParticleFactory<SimpleParticleType> {
         @Override
-        public Particle createParticle(DefaultParticleType defaultParticleType, ClientWorld clientWorld, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
+        public Particle createParticle(SimpleParticleType simpleParticleType, ClientWorld clientWorld, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
             FloatingParticle particle = new FloatingParticle(clientWorld, this.spriteProvider, x, y, z, 0.0f, -0.8f, 0.0f) {
                 @Override
                 public Optional<ParticleGroup> getGroup() {
@@ -70,9 +70,9 @@ public Optional<ParticleGroup> getGroup() {
 
 
     @Environment(value = EnvType.CLIENT)
-    public record MapleLeafFactory(SpriteProvider spriteProvider) implements ParticleFactory<DefaultParticleType> {
+    public record MapleLeafFactory(SpriteProvider spriteProvider) implements ParticleFactory<SimpleParticleType> {
         @Override
-        public Particle createParticle(DefaultParticleType type, ClientWorld world, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
+        public Particle createParticle(SimpleParticleType simpleParticleType, ClientWorld world, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
             FloatingParticle particle = new FloatingParticle(world, this.spriteProvider, x, y, z, 0.0f, -0.8f, 0.0f) {
                 @Override
                 public Optional<ParticleGroup> getGroup() {

src/main/java/fr/hugman/promenade/particle/PromenadeParticleTypes.java

@@ -2,18 +2,18 @@
 
 import fr.hugman.promenade.Promenade;
 import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes;
-import net.minecraft.particle.DefaultParticleType;
 import net.minecraft.particle.ParticleType;
+import net.minecraft.particle.SimpleParticleType;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 
 public class PromenadeParticleTypes {
-    public static final DefaultParticleType BLUSH_SAKURA_BLOSSOM = register("blush_sakura_blossom", FabricParticleTypes.simple());
-    public static final DefaultParticleType COTTON_SAKURA_BLOSSOM = register("cotton_sakura_blossom", FabricParticleTypes.simple());
+    public static final SimpleParticleType BLUSH_SAKURA_BLOSSOM = register("blush_sakura_blossom", FabricParticleTypes.simple());
+    public static final SimpleParticleType COTTON_SAKURA_BLOSSOM = register("cotton_sakura_blossom", FabricParticleTypes.simple());
 
-    public static final DefaultParticleType VERMILION_MAPLE_LEAF = register("vermilion_maple_leaf", FabricParticleTypes.simple());
-    public static final DefaultParticleType FULVOUS_MAPLE_LEAF = register("fulvous_maple_leaf", FabricParticleTypes.simple());
-    public static final DefaultParticleType MIKADO_MAPLE_LEAF = register("mikado_maple_leaf", FabricParticleTypes.simple());
+    public static final SimpleParticleType VERMILION_MAPLE_LEAF = register("vermilion_maple_leaf", FabricParticleTypes.simple());
+    public static final SimpleParticleType FULVOUS_MAPLE_LEAF = register("fulvous_maple_leaf", FabricParticleTypes.simple());
+    public static final SimpleParticleType MIKADO_MAPLE_LEAF = register("mikado_maple_leaf", FabricParticleTypes.simple());
 
     public static <B extends ParticleType<?>> B register(String path, B particleType) {
         return Registry.register(Registries.PARTICLE_TYPE, Promenade.id(path), particleType);