Update to 1.21

DawnTeamMC · Jul 21, 2024 · 45c07c6 · 45c07c6
1 parent a8054c7
commit 45c07c6
Show file tree

Hide file tree

Showing 505 changed files with 168 additions and 167 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'fabric-loom' version '1.7-SNAPSHOT'
 }
 
 apply from: 'https://dawnteammc.github.io/resources/gradle_scripts/fabric-mod/java-21.gradle'

diff --git a/gradle.properties b/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=1.20.5
-yarn_mappings=1.20.5+build.1
+minecraft_version=1.21
+yarn_mappings=1.21+build.9
 loader_version=0.15.11
-fabric_version=0.97.8+1.20.5
+fabric_version=0.100.7+1.21
 
 # https://github.com/DawnTeamMC/DawnAPI
 dawn_version=snapshot-SNAPSHOT
 # https://maven.terraformersmc.com/releases/com/terraformersmc/biolith-fabric
-biolith_version=2.1.0-alpha.4
+biolith_version=3.0.0-beta.1
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/fr/hugman/promenade/Promenade.java b/src/main/java/fr/hugman/promenade/Promenade.java
@@ -7,7 +7,6 @@
 import fr.hugman.promenade.entity.PromenadeEntityTypes;
 import fr.hugman.promenade.entity.ai.brain.sensor.PromenadeSensorTypes;
 import fr.hugman.promenade.entity.data.PromenadeTrackedData;
-import fr.hugman.promenade.entity.decoration.painting.PromenadePaintingVariants;
 import fr.hugman.promenade.item.PromenadeItems;
 import fr.hugman.promenade.registry.PromenadeRegistries;
 import fr.hugman.promenade.sound.PromenadeSoundEvents;
@@ -51,8 +50,6 @@ public void onInitialize() {
         PromenadeBiomes.appendWorldGen();
         PromenadePlacedFeatures.appendWorldGen();
         PromenadeEntityTypes.appendWorldGen();
-
-        PromenadePaintingVariants.register();
     }
 
     public static Identifier id(String path) {

diff --git a/src/main/java/fr/hugman/promenade/PromenadeClient.java b/src/main/java/fr/hugman/promenade/PromenadeClient.java
@@ -21,10 +21,10 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.color.world.BiomeColors;
-import net.minecraft.client.color.world.FoliageColors;
-import net.minecraft.client.color.world.GrassColors;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.item.BlockItem;
+import net.minecraft.world.biome.FoliageColors;
+import net.minecraft.world.biome.GrassColors;
 
 @Environment(EnvType.CLIENT)
 public class PromenadeClient implements ClientModInitializer {

diff --git a/src/main/java/fr/hugman/promenade/PromenadeFactory.java b/src/main/java/fr/hugman/promenade/PromenadeFactory.java
@@ -1,9 +1,9 @@
 package fr.hugman.promenade;
 
-import com.terraformersmc.terraform.sign.block.TerraformHangingSignBlock;
-import com.terraformersmc.terraform.sign.block.TerraformSignBlock;
-import com.terraformersmc.terraform.sign.block.TerraformWallHangingSignBlock;
-import com.terraformersmc.terraform.sign.block.TerraformWallSignBlock;
+import com.terraformersmc.terraform.sign.api.block.TerraformHangingSignBlock;
+import com.terraformersmc.terraform.sign.api.block.TerraformSignBlock;
+import com.terraformersmc.terraform.sign.api.block.TerraformWallHangingSignBlock;
+import com.terraformersmc.terraform.sign.api.block.TerraformWallSignBlock;
 import fr.hugman.dawn.DawnFactory;
 import fr.hugman.promenade.block.*;
 import net.minecraft.block.AbstractBlock;
@@ -85,20 +85,4 @@ public static DecoratedLeavesBlock decoratedLeaves(MapColor mapColor, int bound,
     public static DecoratedLeavesBlock decoratedLeaves(MapColor mapColor, ParticleEffect particle) {
         return decoratedLeaves(mapColor, BlockSoundGroup.GRASS, 10, particle);
     }
-
-    //TODO: move to Dawn API
-    public static Block sign(boolean hanging, boolean wall, Identifier texturePath, Block basePlanks, BlockSoundGroup soundGroup) {
-        return sign(hanging, wall, texturePath, DawnFactory.signSettings(basePlanks, soundGroup));
-    }
-
-    //TODO: move to Dawn API
-    public static Block sign(boolean hanging, boolean wall, Identifier texturePath, AbstractBlock.Settings settings) {
-        if (hanging) {
-            var hangingSignTexture = Identifier.of(texturePath.getNamespace(), "entity/signs/hanging/" + texturePath.getPath());
-            var hangingSignGuiTexture = Identifier.of(texturePath.getNamespace(), "textures/gui/hanging_signs/" + texturePath.getPath());
-            return wall ? new TerraformWallHangingSignBlock(hangingSignTexture, hangingSignGuiTexture, settings) : new TerraformHangingSignBlock(hangingSignTexture, hangingSignGuiTexture, settings);
-        }
-        var signTexture = Identifier.of(texturePath.getNamespace(), "entity/signs/" + texturePath.getPath());
-        return wall ? new TerraformWallSignBlock(signTexture, settings) : new TerraformSignBlock(signTexture, settings);
-    }
 }
diff --git a/src/main/java/fr/hugman/promenade/block/DecoratedLeavesBlock.java b/src/main/java/fr/hugman/promenade/block/DecoratedLeavesBlock.java
@@ -5,9 +5,9 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.LeavesBlock;
-import net.minecraft.client.util.ParticleUtil;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.particle.ParticleTypes;
+import net.minecraft.particle.ParticleUtil;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.random.Random;

diff --git a/src/main/java/fr/hugman/promenade/block/PromenadeBlocks.java b/src/main/java/fr/hugman/promenade/block/PromenadeBlocks.java
@@ -12,7 +12,7 @@
 import fr.hugman.promenade.world.gen.feature.PromenadeConfiguredFeatureKeys;
 import net.fabricmc.fabric.api.object.builder.v1.trade.TradeOfferHelper;
 import net.minecraft.block.*;
-import net.minecraft.block.enums.Instrument;
+import net.minecraft.block.enums.NoteBlockInstrument;
 import net.minecraft.block.piston.PistonBehavior;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.EquipmentSlot;
@@ -117,10 +117,10 @@ public class PromenadeBlocks {
     public static final Block SAKURA_TRAPDOOR = of(PromenadeBlockKeys.SAKURA_TRAPDOOR, DawnFactory.trapdoor(SAKURA_PLANKS, PromenadeBlockSetTypes.SAKURA));
     public static final Block SAKURA_BUTTON = of(PromenadeBlockKeys.SAKURA_BUTTON, DawnFactory.woodenButton(SAKURA_PLANKS, PromenadeBlockSetTypes.SAKURA));
     public static final Block SAKURA_PRESSURE_PLATE = of(PromenadeBlockKeys.SAKURA_PRESSURE_PLATE, DawnFactory.pressurePlate(SAKURA_PLANKS, PromenadeBlockSetTypes.SAKURA));
-    public static final Block SAKURA_SIGN = of(PromenadeBlockKeys.SAKURA_SIGN, PromenadeFactory.sign(false, false, Promenade.id("sakura"), SAKURA_PLANKS, SAKURA_WOOD_SOUNDS));
-    public static final Block SAKURA_WALL_SIGN = of(PromenadeBlockKeys.SAKURA_WALL_SIGN, PromenadeFactory.sign(false, true, Promenade.id("sakura"), SAKURA_PLANKS, SAKURA_WOOD_SOUNDS));
-    public static final Block SAKURA_HANGING_SIGN = of(PromenadeBlockKeys.SAKURA_HANGING_SIGN, PromenadeFactory.sign(true, false, Promenade.id("sakura"), SAKURA_PLANKS, BlockSoundGroup.CHERRY_WOOD_HANGING_SIGN));
-    public static final Block SAKURA_WALL_HANGING_SIGN = of(PromenadeBlockKeys.SAKURA_WALL_HANGING_SIGN, PromenadeFactory.sign(true, true, Promenade.id("sakura"), SAKURA_PLANKS, BlockSoundGroup.CHERRY_WOOD_HANGING_SIGN));
+    public static final Block SAKURA_SIGN = of(PromenadeBlockKeys.SAKURA_SIGN, DawnFactory.sign(false, false, Promenade.id("sakura"), SAKURA_PLANKS, SAKURA_WOOD_SOUNDS));
+    public static final Block SAKURA_WALL_SIGN = of(PromenadeBlockKeys.SAKURA_WALL_SIGN, DawnFactory.sign(false, true, Promenade.id("sakura"), SAKURA_PLANKS, SAKURA_WOOD_SOUNDS));
+    public static final Block SAKURA_HANGING_SIGN = of(PromenadeBlockKeys.SAKURA_HANGING_SIGN, DawnFactory.sign(true, false, Promenade.id("sakura"), SAKURA_PLANKS, BlockSoundGroup.CHERRY_WOOD_HANGING_SIGN));
+    public static final Block SAKURA_WALL_HANGING_SIGN = of(PromenadeBlockKeys.SAKURA_WALL_HANGING_SIGN, DawnFactory.sign(true, true, Promenade.id("sakura"), SAKURA_PLANKS, BlockSoundGroup.CHERRY_WOOD_HANGING_SIGN));
 
     public static final Block BLUSH_SAKURA_SAPLING = of(PromenadeBlockKeys.BLUSH_SAKURA_SAPLING, DawnFactory.sapling(BLUSH_BLOSSOMS_COLOR, PromenadeSaplingGenerators.BLUSH_SAKURA_SAPLING_GENERATOR));
     public static final Block POTTED_BLUSH_SAKURA_SAPLING = of(PromenadeBlockKeys.POTTED_BLUSH_SAKURA_SAPLING, DawnFactory.potted(BLUSH_SAKURA_SAPLING));
@@ -160,10 +160,10 @@ public class PromenadeBlocks {
     public static final Block MAPLE_TRAPDOOR = of(PromenadeBlockKeys.MAPLE_TRAPDOOR, DawnFactory.trapdoor(MAPLE_PLANKS, PromenadeBlockSetTypes.MAPLE));
     public static final Block MAPLE_BUTTON = of(PromenadeBlockKeys.MAPLE_BUTTON, DawnFactory.woodenButton(MAPLE_PLANKS, PromenadeBlockSetTypes.MAPLE));
     public static final Block MAPLE_PRESSURE_PLATE = of(PromenadeBlockKeys.MAPLE_PRESSURE_PLATE, DawnFactory.pressurePlate(MAPLE_PLANKS, PromenadeBlockSetTypes.MAPLE));
-    public static final Block MAPLE_SIGN = of(PromenadeBlockKeys.MAPLE_SIGN, PromenadeFactory.sign(false, false, Promenade.id("maple"), MAPLE_PLANKS, MAPLE_WOOD_SOUNDS));
-    public static final Block MAPLE_WALL_SIGN = of(PromenadeBlockKeys.MAPLE_WALL_SIGN, PromenadeFactory.sign(false, true, Promenade.id("maple"), MAPLE_PLANKS, MAPLE_WOOD_SOUNDS));
-    public static final Block MAPLE_HANGING_SIGN = of(PromenadeBlockKeys.MAPLE_HANGING_SIGN, PromenadeFactory.sign(true, false, Promenade.id("maple"), MAPLE_PLANKS, BlockSoundGroup.HANGING_SIGN));
-    public static final Block MAPLE_WALL_HANGING_SIGN = of(PromenadeBlockKeys.MAPLE_WALL_HANGING_SIGN, PromenadeFactory.sign(true, true, Promenade.id("maple"), MAPLE_PLANKS, BlockSoundGroup.HANGING_SIGN));
+    public static final Block MAPLE_SIGN = of(PromenadeBlockKeys.MAPLE_SIGN, DawnFactory.sign(false, false, Promenade.id("maple"), MAPLE_PLANKS, MAPLE_WOOD_SOUNDS));
+    public static final Block MAPLE_WALL_SIGN = of(PromenadeBlockKeys.MAPLE_WALL_SIGN, DawnFactory.sign(false, true, Promenade.id("maple"), MAPLE_PLANKS, MAPLE_WOOD_SOUNDS));
+    public static final Block MAPLE_HANGING_SIGN = of(PromenadeBlockKeys.MAPLE_HANGING_SIGN, DawnFactory.sign(true, false, Promenade.id("maple"), MAPLE_PLANKS, BlockSoundGroup.HANGING_SIGN));
+    public static final Block MAPLE_WALL_HANGING_SIGN = of(PromenadeBlockKeys.MAPLE_WALL_HANGING_SIGN, DawnFactory.sign(true, true, Promenade.id("maple"), MAPLE_PLANKS, BlockSoundGroup.HANGING_SIGN));
 
     public static final Block SAP_MAPLE_SAPLING = of(PromenadeBlockKeys.SAP_MAPLE_SAPLING, DawnFactory.sapling(MAPLE_SAP_LEAVES_COLOR, PromenadeSaplingGenerators.SAP_MAPLE_SAPLING_GENERATOR));
     public static final Block POTTED_SAP_MAPLE_SAPLING = of(PromenadeBlockKeys.POTTED_SAP_MAPLE_SAPLING, DawnFactory.potted(SAP_MAPLE_SAPLING));
@@ -212,10 +212,10 @@ public class PromenadeBlocks {
     public static final Block PALM_TRAPDOOR = of(PromenadeBlockKeys.PALM_TRAPDOOR, DawnFactory.trapdoor(PALM_PLANKS, PromenadeBlockSetTypes.PALM));
     public static final Block PALM_BUTTON = of(PromenadeBlockKeys.PALM_BUTTON, DawnFactory.woodenButton(PALM_PLANKS, PromenadeBlockSetTypes.PALM));
     public static final Block PALM_PRESSURE_PLATE = of(PromenadeBlockKeys.PALM_PRESSURE_PLATE, DawnFactory.pressurePlate(PALM_PLANKS, PromenadeBlockSetTypes.PALM));
-    public static final Block PALM_SIGN = of(PromenadeBlockKeys.PALM_SIGN, PromenadeFactory.sign(false, false, Promenade.id("palm"), PALM_PLANKS, PALM_WOOD_SOUNDS));
-    public static final Block PALM_WALL_SIGN = of(PromenadeBlockKeys.PALM_WALL_SIGN, PromenadeFactory.sign(false, true, Promenade.id("palm"), PALM_PLANKS, PALM_WOOD_SOUNDS));
-    public static final Block PALM_HANGING_SIGN = of(PromenadeBlockKeys.PALM_HANGING_SIGN, PromenadeFactory.sign(true, false, Promenade.id("palm"), PALM_PLANKS, BlockSoundGroup.HANGING_SIGN));
-    public static final Block PALM_WALL_HANGING_SIGN = of(PromenadeBlockKeys.PALM_WALL_HANGING_SIGN, PromenadeFactory.sign(true, true, Promenade.id("palm"), PALM_PLANKS, BlockSoundGroup.HANGING_SIGN));
+    public static final Block PALM_SIGN = of(PromenadeBlockKeys.PALM_SIGN, DawnFactory.sign(false, false, Promenade.id("palm"), PALM_PLANKS, PALM_WOOD_SOUNDS));
+    public static final Block PALM_WALL_SIGN = of(PromenadeBlockKeys.PALM_WALL_SIGN, DawnFactory.sign(false, true, Promenade.id("palm"), PALM_PLANKS, PALM_WOOD_SOUNDS));
+    public static final Block PALM_HANGING_SIGN = of(PromenadeBlockKeys.PALM_HANGING_SIGN, DawnFactory.sign(true, false, Promenade.id("palm"), PALM_PLANKS, BlockSoundGroup.HANGING_SIGN));
+    public static final Block PALM_WALL_HANGING_SIGN = of(PromenadeBlockKeys.PALM_WALL_HANGING_SIGN, DawnFactory.sign(true, true, Promenade.id("palm"), PALM_PLANKS, BlockSoundGroup.HANGING_SIGN));
 
     public static final Block PALM_SAPLING = of(PromenadeBlockKeys.PALM_SAPLING, DawnFactory.sapling(PALM_LEAVES_COLOR, PromenadeSaplingGenerators.PALM_SAPLING_GENERATOR, state -> state.isIn(BlockTags.SAND)));
     public static final Block POTTED_PALM_SAPLING = of(PromenadeBlockKeys.POTTED_PALM_SAPLING, DawnFactory.potted(PALM_SAPLING));
@@ -255,7 +255,7 @@ public class PromenadeBlocks {
             AbstractBlock.Settings.create()
                     .item()
                     .mapColor(MapColor.BLACK)
-                    .instrument(Instrument.BASEDRUM)
+                    .instrument(NoteBlockInstrument.BASEDRUM)
                     .requiresTool()
                     .strength(3.0F, 9.0F)
                     .sounds(BlockSoundGroup.NYLIUM)
@@ -289,16 +289,16 @@ public class PromenadeBlocks {
     public static final Block DARK_AMARANTH_TRAPDOOR = of(PromenadeBlockKeys.DARK_AMARANTH_TRAPDOOR, DawnFactory.trapdoor(DARK_AMARANTH_PLANKS, PromenadeBlockSetTypes.AMARANTH));
     public static final Block DARK_AMARANTH_BUTTON = of(PromenadeBlockKeys.DARK_AMARANTH_BUTTON, DawnFactory.woodenButton(DARK_AMARANTH_PLANKS, PromenadeBlockSetTypes.AMARANTH));
     public static final Block DARK_AMARANTH_PRESSURE_PLATE = of(PromenadeBlockKeys.DARK_AMARANTH_PRESSURE_PLATE, DawnFactory.pressurePlate(DARK_AMARANTH_PLANKS, PromenadeBlockSetTypes.AMARANTH));
-    public static final Block DARK_AMARANTH_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_SIGN, PromenadeFactory.sign(false, false, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, AMARANTH_WOOD_SOUNDS));
-    public static final Block DARK_AMARANTH_WALL_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_WALL_SIGN, PromenadeFactory.sign(false, true, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, AMARANTH_WOOD_SOUNDS));
-    public static final Block DARK_AMARANTH_HANGING_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_HANGING_SIGN, PromenadeFactory.sign(true, false, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, BlockSoundGroup.HANGING_SIGN));
-    public static final Block DARK_AMARANTH_WALL_HANGING_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_WALL_HANGING_SIGN, PromenadeFactory.sign(true, true, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, BlockSoundGroup.HANGING_SIGN));
+    public static final Block DARK_AMARANTH_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_SIGN, DawnFactory.sign(false, false, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, AMARANTH_WOOD_SOUNDS));
+    public static final Block DARK_AMARANTH_WALL_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_WALL_SIGN, DawnFactory.sign(false, true, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, AMARANTH_WOOD_SOUNDS));
+    public static final Block DARK_AMARANTH_HANGING_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_HANGING_SIGN, DawnFactory.sign(true, false, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, BlockSoundGroup.HANGING_SIGN));
+    public static final Block DARK_AMARANTH_WALL_HANGING_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_WALL_HANGING_SIGN, DawnFactory.sign(true, true, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, BlockSoundGroup.HANGING_SIGN));
 
     public static final Block DARK_AMARANTH_FUNGUS = of(PromenadeBlockKeys.DARK_AMARANTH_FUNGUS, DawnFactory.fungus(MapColor.PURPLE, PromenadeConfiguredFeatureKeys.PLANTED_AMARANTH_FUNGUS, PromenadeBlockTags.DARK_AMARANTH_FUNGUS_PLACEABLE_ON, PromenadeBlockTags.DARK_AMARANTH_FUNGUS_GROWABLE_ON));
     public static final Block POTTED_DARK_AMARANTH_FUNGUS = of(PromenadeBlockKeys.POTTED_DARK_AMARANTH_FUNGUS, DawnFactory.potted(DARK_AMARANTH_FUNGUS));
 
 
-    public static final Block MOAI = of(PromenadeBlockKeys.MOAI, new MoaiBlock(AbstractBlock.Settings.copy(Blocks.TUFF).mapColor(MapColor.TERRACOTTA_LIGHT_GRAY).item(new Item.Settings().equipmentSlot(stack -> EquipmentSlot.HEAD))));
+    public static final Block MOAI = of(PromenadeBlockKeys.MOAI, new MoaiBlock(AbstractBlock.Settings.copy(Blocks.TUFF).mapColor(MapColor.TERRACOTTA_LIGHT_GRAY).item(new Item.Settings().equipmentSlot((entity, stack) -> EquipmentSlot.HEAD))));
 
     public static final Block BLUEBERRY_BUSH = of(PromenadeBlockKeys.BLUEBERRY_BUSH, BerryBushBlock.of(PromenadeItemKeys.BLUEBERRIES, false));
 

diff --git a/src/main/java/fr/hugman/promenade/client/render/entity/LushCreeperOverlayRenderer.java b/src/main/java/fr/hugman/promenade/client/render/entity/LushCreeperOverlayRenderer.java
@@ -24,8 +24,8 @@ public LushCreeperOverlayRenderer(FeatureRendererContext<T, CreeperEntityModel<T
     }
 
     @Override
-    public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T creeperEntity, float f, float g, float h, float j, float k, float l) {
-        LushCreeperOverlayRenderer.render(this.getContextModel(), this.model, TEXTURE, matrixStack, vertexConsumerProvider, i, creeperEntity, f, g, j, k, l, h, 1.0f, 1.0f, 1.0f);
+    public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, T entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) {
+        LushCreeperOverlayRenderer.render(this.getContextModel(), this.model, TEXTURE, matrices, vertexConsumers, light, entity, limbAngle, limbDistance, tickDelta, headYaw, headPitch, animationProgress, -1);
     }
 }
 
diff --git a/src/main/java/fr/hugman/promenade/client/render/entity/model/CapybaraModel.java b/src/main/java/fr/hugman/promenade/client/render/entity/model/CapybaraModel.java
@@ -86,15 +86,15 @@ private void updateAnimations(CapybaraEntity capybara, float progress) {
     }
 
     @Override
-    public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, float red, float green, float blue, float alpha) {
+    public void render(MatrixStack matrices, VertexConsumer vertices, int light, int overlay, int color) {
         if (this.child) {
             matrices.push();
             matrices.scale(BABY_SCALE, BABY_SCALE, BABY_SCALE);
             matrices.translate(0.0F, BABY_Y_OFFSET, 0.0F);
-            this.getPart().render(matrices, vertices, light, overlay, red, green, blue, alpha);
+            this.getPart().render(matrices, vertices, light, overlay, color);
             matrices.pop();
         } else {
-            this.getPart().render(matrices, vertices, light, overlay, red, green, blue, alpha);
+            this.getPart().render(matrices, vertices, light, overlay, color);
         }
     }
 }
diff --git a/src/main/java/fr/hugman/promenade/entity/CapybaraBrain.java b/src/main/java/fr/hugman/promenade/entity/CapybaraBrain.java
@@ -63,7 +63,7 @@ private static void addCoreActivities(Brain<CapybaraEntity> brain) {
                 new StayAboveWaterTask(0.8f),
                 new WalkTask(1.0f),
                 new LookAroundTask(45, 90),
-                new WanderAroundTask(),
+                new MoveToTargetTask(),
                 new TemptationCooldownTask(MemoryModuleType.TEMPTATION_COOLDOWN_TICKS),
                 new TemptationCooldownTask(MemoryModuleType.GAZE_COOLDOWN_TICKS)));
     }