diff --git a/src/main/java/ru/betterend/blocks/MurkweedBlock.java b/src/main/java/ru/betterend/blocks/MurkweedBlock.java index 14fd6e19..6dac38de 100644 --- a/src/main/java/ru/betterend/blocks/MurkweedBlock.java +++ b/src/main/java/ru/betterend/blocks/MurkweedBlock.java @@ -7,10 +7,12 @@ import net.fabricmc.api.Environment; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.pathing.NavigationType; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.particle.ParticleTypes; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import ru.betterend.blocks.basis.EndPlantBlock; import ru.betterend.registry.EndBlocks; @@ -37,4 +39,9 @@ public class MurkweedBlock extends EndPlantBlock { protected boolean isTerrain(BlockState state) { return state.isOf(EndBlocks.SHADOW_GRASS); } + + @Override + public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { + return false; + } } diff --git a/src/main/java/ru/betterend/blocks/NeedlegrassBlock.java b/src/main/java/ru/betterend/blocks/NeedlegrassBlock.java index fe6bd91e..e55699eb 100644 --- a/src/main/java/ru/betterend/blocks/NeedlegrassBlock.java +++ b/src/main/java/ru/betterend/blocks/NeedlegrassBlock.java @@ -10,12 +10,14 @@ import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.Enchantments; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.pathing.NavigationType; import net.minecraft.entity.damage.DamageSource; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.loot.context.LootContext; import net.minecraft.loot.context.LootContextParameters; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import ru.betterend.blocks.basis.EndPlantBlock; import ru.betterend.registry.EndBlocks; @@ -44,4 +46,9 @@ public class NeedlegrassBlock extends EndPlantBlock { protected boolean isTerrain(BlockState state) { return state.isOf(EndBlocks.SHADOW_GRASS); } + + @Override + public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { + return false; + } } diff --git a/src/main/java/ru/betterend/mixin/common/LandPathNodeMakerMixin.java b/src/main/java/ru/betterend/mixin/common/LandPathNodeMakerMixin.java deleted file mode 100644 index 224c3d89..00000000 --- a/src/main/java/ru/betterend/mixin/common/LandPathNodeMakerMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package ru.betterend.mixin.common; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.ai.pathing.LandPathNodeMaker; -import net.minecraft.entity.ai.pathing.PathNodeType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockView; -import ru.betterend.registry.EndBlocks; - -@Mixin(LandPathNodeMaker.class) -public class LandPathNodeMakerMixin { - @Inject(method = "getCommonNodeType", at = @At(value = "HEAD"), cancellable = true) - private static void beModifyPathNodes(BlockView blockView, BlockPos blockPos, CallbackInfoReturnable info) { - BlockState blockState = blockView.getBlockState(blockPos); - if (blockState.isOf(EndBlocks.NEEDLEGRASS) || blockState.isOf(EndBlocks.MURKWEED)) { - beCactusDamage(info); - } - } - - private static void beCactusDamage(CallbackInfoReturnable info) { - info.setReturnValue(PathNodeType.DAMAGE_CACTUS); - } -} diff --git a/src/main/resources/betterend.mixins.common.json b/src/main/resources/betterend.mixins.common.json index 3c6ce7fa..47b3b116 100644 --- a/src/main/resources/betterend.mixins.common.json +++ b/src/main/resources/betterend.mixins.common.json @@ -15,7 +15,6 @@ "ServerPlayerEntityMixin", "ComposterBlockAccessor", "ChorusFlowerBlockMixin", - "LandPathNodeMakerMixin", "EndPortalFeatureMixin", "ChorusPlantBlockMixin", "RecipeManagerAccessor",