From 3716d9ded0dc4f64a391f088c8a9934a6d8ff182 Mon Sep 17 00:00:00 2001 From: Hugman Date: Sun, 26 Mar 2023 13:08:29 +0200 Subject: [PATCH] Update to 1.19.4 - Updated to 1.19.4 --- gradle.properties | 16 ++++++++-------- .../fr/hugman/promenade/block/DyliumBlock.java | 2 +- .../fr/hugman/promenade/block/MoaiBlock.java | 2 +- .../promenade/block/WitherRosePileBlock.java | 15 +++++++-------- .../render/entity/SunkenSkeletonRenderer.java | 2 +- .../hugman/promenade/entity/CapybaraBrain.java | 8 ++++---- .../hugman/promenade/entity/CapybaraEntity.java | 2 +- .../promenade/entity/SunkenSkeletonEntity.java | 2 +- .../gen/tree/foliage/PalmFoliagePlacer.java | 15 ++++++--------- .../promenade/mixin/LivingEntityMixin.java | 3 +-- .../worldgen/biome/blush_sakura_grove.json | 2 +- .../worldgen/biome/carnelian_treeway.json | 2 +- .../worldgen/biome/cotton_sakura_grove.json | 2 +- .../worldgen/biome/dark_amaranth_forest.json | 2 +- .../worldgen/biome/glacarian_taiga.json | 2 +- .../biome/tall_dark_amaranth_forest.json | 2 +- src/main/resources/fabric.mod.json | 2 +- 17 files changed, 38 insertions(+), 43 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6e9271b6..456244b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,27 +17,27 @@ github_name=Promenade # CurseForge Metadata curseforge_slug=promenade curseforge_id=399648 -curseforge_game_versions=1.19.3, Java 17, Fabric, Quilt +curseforge_game_versions=1.19.4, Java 17, Fabric, Quilt curseforge_required_dependencies=fabric-api, dawn curseforge_optional_dependencies=columns, farming-for-blockheads-fabric, terrablender-fabric # Modrinth Metadata modrinth_slug=promenade modrinth_id=GuE5FpvB -modrinth_game_versions=1.19.3 +modrinth_game_versions=1.19.4 modrinth_mod_loaders=fabric, quilt modrinth_required_dependencies=fabric-api, dawn modrinth_optional_dependencies=farming-for-blockheads # check these on https://fabricmc.net/versions.html -minecraft_version=1.19.3 -yarn_mappings=1.19.3+build.5 -loader_version=0.14.12 -fabric_version=0.72.0+1.19.3 +minecraft_version=1.19.4 +yarn_mappings=1.19.4+build.1 +loader_version=0.14.18 +fabric_version=0.76.0+1.19.4 # https://github.com/DawnTeamMC/DawnAPI -dawn_version=4.1.1 +dawn_version=4.2.0 # https://www.curseforge.com/minecraft/mc-mods/terrablender-fabric -terrablender_version=1.19.3-2.1.0.134 +terrablender_version=1.19.4-2.2.0.154 # https://www.curseforge.com/minecraft/mc-mods/columns columns_version=3836307 \ No newline at end of file diff --git a/src/main/java/fr/hugman/promenade/block/DyliumBlock.java b/src/main/java/fr/hugman/promenade/block/DyliumBlock.java index c50ff7fa..171211a0 100644 --- a/src/main/java/fr/hugman/promenade/block/DyliumBlock.java +++ b/src/main/java/fr/hugman/promenade/block/DyliumBlock.java @@ -61,6 +61,6 @@ public void grow(ServerWorld world, Random random, BlockPos pos, BlockState stat @Override public boolean canSpreadAt(BlockView world, BlockPos pos) { - return world.getBlockState(pos).isIn(PromenadeBlockTags.CAN_SPREAD_BLACK_DYLIUM) && world.getBlockState(pos.up()).isTranslucent(world, pos); + return world.getBlockState(pos).isIn(PromenadeBlockTags.CAN_SPREAD_BLACK_DYLIUM) && world.getBlockState(pos.up()).isAir(); } } diff --git a/src/main/java/fr/hugman/promenade/block/MoaiBlock.java b/src/main/java/fr/hugman/promenade/block/MoaiBlock.java index c076f635..f3eccf99 100644 --- a/src/main/java/fr/hugman/promenade/block/MoaiBlock.java +++ b/src/main/java/fr/hugman/promenade/block/MoaiBlock.java @@ -33,7 +33,7 @@ protected void appendProperties(StateManager.Builder builder) public BlockState getPlacementState(ItemPlacementContext context) { var world = context.getWorld(); boolean sneaking = context.shouldCancelInteraction(); // stupid yarn name - var direction = context.getPlayerFacing().getOpposite(); + var direction = context.getPlayerLookDirection().getOpposite(); var hitSide = context.getSide(); var posBelow = context.getBlockPos().down(); diff --git a/src/main/java/fr/hugman/promenade/block/WitherRosePileBlock.java b/src/main/java/fr/hugman/promenade/block/WitherRosePileBlock.java index 9aa19754..702986b4 100644 --- a/src/main/java/fr/hugman/promenade/block/WitherRosePileBlock.java +++ b/src/main/java/fr/hugman/promenade/block/WitherRosePileBlock.java @@ -6,7 +6,6 @@ import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.particle.ParticleTypes; @@ -22,25 +21,25 @@ public WitherRosePileBlock(Settings builder) { } @Override - public boolean canPlantOnTop(BlockState state, BlockView worldIn, BlockPos pos) { - return super.canPlantOnTop(state, worldIn, pos) || state.getBlock() == Blocks.SOUL_SAND; + public boolean canPlantOnTop(BlockState state, BlockView world, BlockPos pos) { + return super.canPlantOnTop(state, world, pos) || state.getBlock() == Blocks.SOUL_SAND; } @Override @Environment(EnvType.CLIENT) - public void randomDisplayTick(BlockState stateIn, World worldIn, BlockPos pos, Random rand) { + public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random rand) { for(int i = 0; i < 5; ++i) { if(rand.nextBoolean()) { - worldIn.addParticle(ParticleTypes.SMOKE, (double) pos.getX() + (double) (rand.nextInt(17) / 16), (double) pos.getY() + (0.5D - (double) rand.nextFloat()), (double) pos.getZ() + (double) (rand.nextInt(17) / 16), 0.0D, 0.0D, 0.0D); + world.addParticle(ParticleTypes.SMOKE, (double) pos.getX() + (double) (rand.nextInt(17) / 16), (double) pos.getY() + (0.5D - (double) rand.nextFloat()), (double) pos.getZ() + (double) (rand.nextInt(17) / 16), 0.0D, 0.0D, 0.0D); } } } @Override - public void onEntityCollision(BlockState state, World worldIn, BlockPos pos, Entity entityIn) { - if(!worldIn.isClient && worldIn.getDifficulty() != Difficulty.PEACEFUL) { + public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entityIn) { + if(!world.isClient && world.getDifficulty() != Difficulty.PEACEFUL) { if(entityIn instanceof LivingEntity livingentity) { - if(!livingentity.isInvulnerableTo(DamageSource.WITHER)) { + if(!livingentity.isInvulnerableTo(world.getDamageSources().wither())) { livingentity.addStatusEffect(new StatusEffectInstance(StatusEffects.WITHER, 40)); } } diff --git a/src/main/java/fr/hugman/promenade/client/render/entity/SunkenSkeletonRenderer.java b/src/main/java/fr/hugman/promenade/client/render/entity/SunkenSkeletonRenderer.java index 3200aa36..3c475b49 100644 --- a/src/main/java/fr/hugman/promenade/client/render/entity/SunkenSkeletonRenderer.java +++ b/src/main/java/fr/hugman/promenade/client/render/entity/SunkenSkeletonRenderer.java @@ -24,7 +24,7 @@ public SunkenSkeletonRenderer(EntityRendererFactory.Context context) { public SunkenSkeletonRenderer(EntityRendererFactory.Context ctx, EntityModelLayer layer, EntityModelLayer legArmorLayer, EntityModelLayer bodyArmorLayer) { super(ctx, new SunkenSkeletonModel(ctx.getPart(layer)), 0.5F); - this.addFeature(new ArmorFeatureRenderer<>(this, new SunkenSkeletonModel(ctx.getPart(legArmorLayer)), new SunkenSkeletonModel(ctx.getPart(bodyArmorLayer)))); + this.addFeature(new ArmorFeatureRenderer<>(this, new SunkenSkeletonModel(ctx.getPart(legArmorLayer)), new SunkenSkeletonModel(ctx.getPart(bodyArmorLayer)), ctx.getModelManager())); } @Override diff --git a/src/main/java/fr/hugman/promenade/entity/CapybaraBrain.java b/src/main/java/fr/hugman/promenade/entity/CapybaraBrain.java index 628dc361..ea5bae47 100644 --- a/src/main/java/fr/hugman/promenade/entity/CapybaraBrain.java +++ b/src/main/java/fr/hugman/promenade/entity/CapybaraBrain.java @@ -74,7 +74,7 @@ private static void addCoreActivities(Brain brain) { private static void addIdleActivities(Brain brain) { brain.setTaskList(Activity.IDLE, ImmutableList.of( - Pair.of(0, FollowMobWithIntervalTask.follow(EntityType.PLAYER, 6.0f, UniformIntProvider.create(30, 60))), + Pair.of(0, LookAtMobWithIntervalTask.follow(EntityType.PLAYER, 6.0f, UniformIntProvider.create(30, 60))), Pair.of(1, new BreedTask(AnimalContent.CAPYBARA, 1.0f)), Pair.of(2, new TemptTask(entity -> 1.5f)), Pair.of(3, TaskTriggerer.runIf(Predicate.not(CapybaraEntity::isStationary), WalkTowardClosestAdultTask.create(WALK_TOWARD_ADULT_RANGE, 1.5f))), @@ -92,7 +92,7 @@ public static void updateActivities(CapybaraEntity capybara) { capybara.getBrain().resetPossibleActivities(ImmutableList.of(Activity.IDLE)); } - public static class WalkTask extends net.minecraft.entity.ai.brain.task.WalkTask { + public static class WalkTask extends FleeTask { public WalkTask(float speed) { super(speed); } @@ -116,7 +116,7 @@ public SleepTask(int lastPoseSecondsDelta) { @Override protected boolean shouldRun(ServerWorld world, CapybaraEntity capybara) { - return !capybara.isTouchingWater() && capybara.getLastStateTickDelta() >= (long) this.lastPoseTickDelta && !capybara.isLeashed() && capybara.isOnGround() && !capybara.hasPrimaryPassenger(); + return !capybara.isTouchingWater() && capybara.getLastStateTickDelta() >= (long) this.lastPoseTickDelta && !capybara.isLeashed() && capybara.isOnGround() && !capybara.hasControllingPassenger(); } @Override @@ -140,7 +140,7 @@ public FartTask(int lastPoseSecondsDelta) { @Override protected boolean shouldRun(ServerWorld world, CapybaraEntity capybara) { - return capybara.canFart() && !capybara.isTouchingWater() && capybara.getLastStateTickDelta() >= (long) this.lastPoseTickDelta && !capybara.isLeashed() && capybara.isOnGround() && !capybara.hasPrimaryPassenger(); + return capybara.canFart() && !capybara.isTouchingWater() && capybara.getLastStateTickDelta() >= (long) this.lastPoseTickDelta && !capybara.isLeashed() && capybara.isOnGround() && !capybara.hasControllingPassenger(); } @Override diff --git a/src/main/java/fr/hugman/promenade/entity/CapybaraEntity.java b/src/main/java/fr/hugman/promenade/entity/CapybaraEntity.java index 0a39eeff..f1c0ae5a 100644 --- a/src/main/java/fr/hugman/promenade/entity/CapybaraEntity.java +++ b/src/main/java/fr/hugman/promenade/entity/CapybaraEntity.java @@ -273,7 +273,7 @@ private void updateAnimations() { switch(this.getState()) { case STANDING -> { - this.walkingAnimationState.setRunning((this.onGround || this.hasPrimaryPassenger()) && this.getVelocity().horizontalLengthSquared() > 1.0E-6, this.age); + this.walkingAnimationState.setRunning((this.onGround || this.hasControllingPassenger()) && this.getVelocity().horizontalLengthSquared() > 1.0E-6, this.age); this.fallToSleepAnimState.stop(); this.sleepingAnimState.stop(); this.wakeUpAnimState.stop(); diff --git a/src/main/java/fr/hugman/promenade/entity/SunkenSkeletonEntity.java b/src/main/java/fr/hugman/promenade/entity/SunkenSkeletonEntity.java index a6a891cd..e2028bb9 100644 --- a/src/main/java/fr/hugman/promenade/entity/SunkenSkeletonEntity.java +++ b/src/main/java/fr/hugman/promenade/entity/SunkenSkeletonEntity.java @@ -127,7 +127,7 @@ public void attack(LivingEntity target, float pullProgress) { this.shoot(this, 1.6F); } else { - ItemStack itemStack = this.getArrowType(this.getStackInHand(ProjectileUtil.getHandPossiblyHolding(this, Items.BOW))); + ItemStack itemStack = this.getProjectileType(this.getStackInHand(ProjectileUtil.getHandPossiblyHolding(this, Items.BOW))); PersistentProjectileEntity persistentProjectileEntity = this.createArrowProjectile(itemStack, pullProgress); double d = target.getX() - this.getX(); double e = target.getBodyY(0.3333333333333333D) - persistentProjectileEntity.getY(); diff --git a/src/main/java/fr/hugman/promenade/gen/tree/foliage/PalmFoliagePlacer.java b/src/main/java/fr/hugman/promenade/gen/tree/foliage/PalmFoliagePlacer.java index d3551a77..6ff73e3f 100644 --- a/src/main/java/fr/hugman/promenade/gen/tree/foliage/PalmFoliagePlacer.java +++ b/src/main/java/fr/hugman/promenade/gen/tree/foliage/PalmFoliagePlacer.java @@ -3,7 +3,6 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import fr.hugman.promenade.registry.content.CommonContent; -import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.intprovider.IntProvider; import net.minecraft.util.math.random.Random; @@ -12,8 +11,6 @@ import net.minecraft.world.gen.foliage.FoliagePlacer; import net.minecraft.world.gen.foliage.FoliagePlacerType; -import java.util.function.BiConsumer; - public class PalmFoliagePlacer extends FoliagePlacer { public static final Codec CODEC = RecordCodecBuilder.create(instance -> PalmFoliagePlacer.fillFoliagePlacerFields(instance) @@ -29,16 +26,16 @@ protected FoliagePlacerType getType() { } @Override - protected void generate(TestableWorld world, BiConsumer replacer, Random random, TreeFeatureConfig config, int trunkHeight, TreeNode treeNode, int foliageHeight, int radius, int offset) { + protected void generate(TestableWorld world, BlockPlacer placer, Random random, TreeFeatureConfig config, int trunkHeight, TreeNode treeNode, int foliageHeight, int radius, int offset) { boolean bl = treeNode.isGiantTrunk(); BlockPos blockPos = treeNode.getCenter().down(); int i = radius + treeNode.getFoliageRadius(); - if(i > 1) this.generateSquare(world, replacer, random, config, blockPos, i, 2, bl); - this.generateSquare(world, replacer, random, config, blockPos, i + 1, 1, bl); - this.generateSquare(world, replacer, random, config, blockPos, i + 2, 0, bl); - this.generateSquare(world, replacer, random, config, blockPos, i + 2, -1, bl); - this.generateSquare(world, replacer, random, config, blockPos, i + 1, -2, bl); + if(i > 1) this.generateSquare(world, placer, random, config, blockPos, i, 2, bl); + this.generateSquare(world, placer, random, config, blockPos, i + 1, 1, bl); + this.generateSquare(world, placer, random, config, blockPos, i + 2, 0, bl); + this.generateSquare(world, placer, random, config, blockPos, i + 2, -1, bl); + this.generateSquare(world, placer, random, config, blockPos, i + 1, -2, bl); } @Override diff --git a/src/main/java/fr/hugman/promenade/mixin/LivingEntityMixin.java b/src/main/java/fr/hugman/promenade/mixin/LivingEntityMixin.java index 7fc915cf..c30d5791 100644 --- a/src/main/java/fr/hugman/promenade/mixin/LivingEntityMixin.java +++ b/src/main/java/fr/hugman/promenade/mixin/LivingEntityMixin.java @@ -2,7 +2,6 @@ import fr.hugman.promenade.registry.content.GlaglaglaContent; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.registry.tag.EntityTypeTags; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -19,7 +18,7 @@ private void tickMovement(CallbackInfo ci) { if(GlaglaglaContent.canFreezeFromBiomeAndWeather(entity)) { entity.setFrozenTicks(Math.min(entity.getMinFreezeDamageTicks(), frozenTicks + 1)); if (entity.age % 40 == 0 && entity.isFrozen()) { - entity.damage(DamageSource.FREEZE, entity.getType().isIn(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES) ? 5 : 1); + entity.damage(entity.getDamageSources().freeze(), entity.getType().isIn(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES) ? 5 : 1); } ci.cancel(); } diff --git a/src/main/resources/data/promenade/worldgen/biome/blush_sakura_grove.json b/src/main/resources/data/promenade/worldgen/biome/blush_sakura_grove.json index 32fed308..a4e755b6 100644 --- a/src/main/resources/data/promenade/worldgen/biome/blush_sakura_grove.json +++ b/src/main/resources/data/promenade/worldgen/biome/blush_sakura_grove.json @@ -1,7 +1,7 @@ { "temperature": 0.6, "downfall": 0.4, - "precipitation": "rain", + "has_precipitation": true, "effects": { "sky_color": 8037887, "fog_color": 12638463, diff --git a/src/main/resources/data/promenade/worldgen/biome/carnelian_treeway.json b/src/main/resources/data/promenade/worldgen/biome/carnelian_treeway.json index 462e9a43..84a72d38 100644 --- a/src/main/resources/data/promenade/worldgen/biome/carnelian_treeway.json +++ b/src/main/resources/data/promenade/worldgen/biome/carnelian_treeway.json @@ -1,7 +1,7 @@ { "temperature": 1.2, "downfall": 0.9, - "precipitation": "rain", + "has_precipitation": true, "effects": { "sky_color": 7907327, "fog_color": 12638463, diff --git a/src/main/resources/data/promenade/worldgen/biome/cotton_sakura_grove.json b/src/main/resources/data/promenade/worldgen/biome/cotton_sakura_grove.json index d2097822..72c18722 100644 --- a/src/main/resources/data/promenade/worldgen/biome/cotton_sakura_grove.json +++ b/src/main/resources/data/promenade/worldgen/biome/cotton_sakura_grove.json @@ -1,7 +1,7 @@ { "temperature": 0.6, "downfall": 0.4, - "precipitation": "rain", + "has_precipitation": true, "effects": { "sky_color": 8037887, "fog_color": 12638463, diff --git a/src/main/resources/data/promenade/worldgen/biome/dark_amaranth_forest.json b/src/main/resources/data/promenade/worldgen/biome/dark_amaranth_forest.json index 6138a9f2..7cc90c47 100644 --- a/src/main/resources/data/promenade/worldgen/biome/dark_amaranth_forest.json +++ b/src/main/resources/data/promenade/worldgen/biome/dark_amaranth_forest.json @@ -1,7 +1,7 @@ { "temperature": 0.5, "downfall": 0.5, - "precipitation": "none", + "has_precipitation": false, "effects": { "sky_color": 0, "fog_color": 10518688, diff --git a/src/main/resources/data/promenade/worldgen/biome/glacarian_taiga.json b/src/main/resources/data/promenade/worldgen/biome/glacarian_taiga.json index af5b0436..e65d4b2c 100644 --- a/src/main/resources/data/promenade/worldgen/biome/glacarian_taiga.json +++ b/src/main/resources/data/promenade/worldgen/biome/glacarian_taiga.json @@ -1,7 +1,7 @@ { "temperature": -0.7, "downfall": 0.8, - "precipitation": "snow", + "has_precipitation": true, "effects": { "sky_color": 7897269, "fog_color": 10138064, diff --git a/src/main/resources/data/promenade/worldgen/biome/tall_dark_amaranth_forest.json b/src/main/resources/data/promenade/worldgen/biome/tall_dark_amaranth_forest.json index a4bffcb2..4693d170 100644 --- a/src/main/resources/data/promenade/worldgen/biome/tall_dark_amaranth_forest.json +++ b/src/main/resources/data/promenade/worldgen/biome/tall_dark_amaranth_forest.json @@ -1,7 +1,7 @@ { "temperature": 0.5, "downfall": 0.5, - "precipitation": "none", + "has_precipitation": false, "effects": { "sky_color": 0, "fog_color": 10518688, diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 48d171d8..db0f8e96 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -34,7 +34,7 @@ "depends": { "fabric": "*", "cloth-config": "*", - "dawn": ">=4.1.1" + "dawn": ">=4.2.0" }, "suggests": { "columns": "*",