Merge branch '1.21' of https://github.com/TeamMoegMC/Caupona into 1.21

TeamMoegMC · Feb 20, 2025 · 1b947c9 · 1b947c9
2 parents 9cfd87f + e46066b
commit 1b947c9
Show file tree

Hide file tree

Showing 19 changed files with 621 additions and 652 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/src/main/java/com/teammoeg/caupona/blocks/decoration/BaseColumnBlock.java b/src/main/java/com/teammoeg/caupona/blocks/decoration/BaseColumnBlock.java
@@ -25,6 +25,7 @@
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -43,4 +44,8 @@ public BaseColumnBlock(Properties p_49795_, boolean isPlinth) {
 	public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
 		return isPlinth ? plinth : shaft;
 	}
+	@Override
+	protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) {
+		return false;
+	}
 }
diff --git a/src/main/java/com/teammoeg/caupona/blocks/decoration/CPRoadBlock.java b/src/main/java/com/teammoeg/caupona/blocks/decoration/CPRoadBlock.java
@@ -21,15 +21,21 @@
 
 package com.teammoeg.caupona.blocks.decoration;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.teammoeg.caupona.CPConfig;
 
 import net.minecraft.core.BlockPos;
+import net.minecraft.tags.FluidTags;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.Mob;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.world.level.pathfinder.PathType;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -61,6 +67,11 @@ public void stepOn(Level pLevel, BlockPos pos, BlockState pState, Entity entity)
 		}
 	}
 
+	@Override
+	protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) {
+		return false;
+	}
+
 
 
 }
diff --git a/src/main/java/com/teammoeg/caupona/blocks/decoration/ChimneyFluteBlock.java b/src/main/java/com/teammoeg/caupona/blocks/decoration/ChimneyFluteBlock.java
@@ -25,6 +25,7 @@
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -44,4 +45,8 @@ public ChimneyFluteBlock(Properties p_49795_) {
 	public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
 		return shape;
 	}
+	@Override
+	protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) {
+		return false;
+	}
 }
diff --git a/src/main/java/com/teammoeg/caupona/blocks/decoration/ColumnCapitalBlock.java b/src/main/java/com/teammoeg/caupona/blocks/decoration/ColumnCapitalBlock.java
@@ -27,6 +27,7 @@
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -46,4 +47,8 @@ public ColumnCapitalBlock(Properties p_54120_, boolean isLarge) {
 	public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
 		return isLarge ? large : small;
 	}
+	@Override
+	protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) {
+		return false;
+	}
 }
diff --git a/src/main/java/com/teammoeg/caupona/blocks/decoration/KitchenRailBlock.java b/src/main/java/com/teammoeg/caupona/blocks/decoration/KitchenRailBlock.java
@@ -28,6 +28,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition.Builder;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
@@ -60,5 +61,8 @@ protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos,
 		default:return super.getShape(state, level, pos, context);
 		}
 	}
-
+	@Override
+	public boolean isPathfindable(BlockState pState,PathComputationType pType) {
+	      return false;
+	}
 }
diff --git a/src/main/java/com/teammoeg/caupona/blocks/decoration/LacunarBlock.java b/src/main/java/com/teammoeg/caupona/blocks/decoration/LacunarBlock.java
@@ -25,6 +25,7 @@
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -45,4 +46,8 @@ public LacunarBlock(Properties p_49795_) {
 	public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
 		return shape;
 	}
+	@Override
+	public boolean isPathfindable(BlockState pState, PathComputationType pType) {
+	      return false;
+	}
 }
diff --git a/src/main/java/com/teammoeg/caupona/blocks/decoration/SelfStackingBlock.java b/src/main/java/com/teammoeg/caupona/blocks/decoration/SelfStackingBlock.java
@@ -146,4 +146,5 @@ protected BlockState updateShape(BlockState state, Direction facing, BlockState
             ? super.updateShape(state, facing, facingState, level, currentPos, facingPos)
             : Blocks.AIR.defaultBlockState();
     }
+
 }
diff --git a/src/main/java/com/teammoeg/caupona/blocks/decoration/SpokedFenceBlock.java b/src/main/java/com/teammoeg/caupona/blocks/decoration/SpokedFenceBlock.java
@@ -254,4 +254,8 @@ public BlockState mirror(BlockState pState, Mirror pMirror) {
 			return super.mirror(pState, pMirror);
 		}
 	}
+	@Override
+	public boolean isPathfindable(BlockState pState, PathComputationType pType) {
+	      return false;
+	}
 }
diff --git a/src/main/java/com/teammoeg/caupona/blocks/dolium/CounterDoliumBlock.java b/src/main/java/com/teammoeg/caupona/blocks/dolium/CounterDoliumBlock.java
@@ -41,6 +41,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
@@ -147,5 +148,8 @@ public void onRemove(BlockState state, Level worldIn, BlockPos pos, BlockState n
 		}
 		super.onRemove(state, worldIn, pos, newState, isMoving);
 	}
-
+	@Override
+	public boolean isPathfindable(BlockState pState, PathComputationType pType) {
+	      return false;
+	}
 }
diff --git a/src/main/java/com/teammoeg/caupona/blocks/fumarole/FumaroleBoulderBlock.java b/src/main/java/com/teammoeg/caupona/blocks/fumarole/FumaroleBoulderBlock.java
@@ -21,10 +21,13 @@
 
 package com.teammoeg.caupona.blocks.fumarole;
 
+import org.jetbrains.annotations.Nullable;
+
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Mob;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
@@ -38,6 +41,7 @@
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
+import net.minecraft.world.level.pathfinder.PathType;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
@@ -98,4 +102,9 @@ public void stepOn(Level pLevel, BlockPos pPos, BlockState pState, Entity pEntit
 		super.stepOn(pLevel, pPos, pState, pEntity);
 	}
 
+	@Override
+	public @Nullable PathType getBlockPathType(BlockState state, BlockGetter level, BlockPos pos, @Nullable Mob mob) {
+		return PathType.DAMAGE_OTHER;
+	}
+
 }
diff --git a/src/main/java/com/teammoeg/caupona/blocks/fumarole/FumaroleVentBlock.java b/src/main/java/com/teammoeg/caupona/blocks/fumarole/FumaroleVentBlock.java
@@ -21,6 +21,8 @@
 
 package com.teammoeg.caupona.blocks.fumarole;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.teammoeg.caupona.CPBlockEntityTypes;
 import com.teammoeg.caupona.CPBlocks;
 import com.teammoeg.caupona.CPItems;
@@ -36,6 +38,7 @@
 import net.minecraft.world.ItemInteractionResult;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
@@ -52,6 +55,7 @@
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
+import net.minecraft.world.level.pathfinder.PathType;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -141,4 +145,8 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev
 		}
 		return super.useItemOn(stack, state, level, pos, player, hand, hitResult);
 	}
+	@Override
+	public @Nullable PathType getBlockPathType(BlockState state, BlockGetter level, BlockPos pos, @Nullable Mob mob) {
+		return PathType.DAMAGE_FIRE;
+	}
 }
diff --git a/src/main/java/com/teammoeg/caupona/blocks/hypocaust/WolfStatueBlock.java b/src/main/java/com/teammoeg/caupona/blocks/hypocaust/WolfStatueBlock.java
@@ -21,13 +21,16 @@
 
 package com.teammoeg.caupona.blocks.hypocaust;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.teammoeg.caupona.CPBlockEntityTypes;
 import com.teammoeg.caupona.blocks.CPHorizontalEntityBlock;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.Mob;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
@@ -41,6 +44,7 @@
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.world.level.pathfinder.PathType;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
@@ -132,4 +136,8 @@ public int getAnalogOutputSignal(BlockState pState, Level pLevel, BlockPos pPos)
 		}
 		return ret;
 	}
+	@Override
+	public @Nullable PathType getBlockPathType(BlockState state, BlockGetter level, BlockPos pos, @Nullable Mob mob) {
+		return PathType.DAMAGE_FIRE;
+	}
 }
diff --git a/src/main/java/com/teammoeg/caupona/blocks/plants/FruitBlock.java b/src/main/java/com/teammoeg/caupona/blocks/plants/FruitBlock.java
@@ -21,18 +21,23 @@
 
 package com.teammoeg.caupona.blocks.plants;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.teammoeg.caupona.CPTags.Blocks;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.RandomSource;
+import net.minecraft.world.entity.Mob;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.CropBlock;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.world.level.pathfinder.PathType;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.neoforged.neoforge.common.CommonHooks;
@@ -98,5 +103,15 @@ public int getFlammability(BlockState state, BlockGetter level, BlockPos pos, Di
 	public int getFireSpreadSpeed(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
 		return 5;
 	}
+	@Override
+	public boolean isPathfindable(BlockState pState, PathComputationType pType) {
+	      return false;
+	}
 
+	@Override
+	public @Nullable PathType getBlockPathType(BlockState state, BlockGetter level, BlockPos pos, @Nullable Mob mob) {
+		return PathType.COCOA;
+	}
+
+
 }
diff --git a/src/main/java/com/teammoeg/caupona/blocks/plants/SnailBaitBlock.java b/src/main/java/com/teammoeg/caupona/blocks/plants/SnailBaitBlock.java
@@ -21,14 +21,20 @@
 
 package com.teammoeg.caupona.blocks.plants;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.teammoeg.caupona.CPBlocks;
 import com.teammoeg.caupona.CPTags.Blocks;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.RandomSource;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.world.level.pathfinder.PathType;
 import net.neoforged.neoforge.common.CommonHooks;
 
 public class SnailBaitBlock extends FruitBlock {
@@ -72,4 +78,13 @@ public boolean isRandomlyTicking(BlockState pState) {
 	public boolean isValidBonemealTarget(LevelReader pLevel, BlockPos pPos, BlockState pState) {
 		return false;
 	}
+	@Override
+	public boolean isPathfindable(BlockState pState, PathComputationType pType) {
+	      return false;
+	}
+
+	@Override
+	public @Nullable PathType getBlockPathType(BlockState state, BlockGetter level, BlockPos pos, @Nullable Mob mob) {
+		return PathType.COCOA;
+	}
 }
diff --git a/src/main/java/com/teammoeg/caupona/blocks/plants/SnailBlock.java b/src/main/java/com/teammoeg/caupona/blocks/plants/SnailBlock.java
@@ -21,19 +21,25 @@
 
 package com.teammoeg.caupona.blocks.plants;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.teammoeg.caupona.CPBlocks;
 import com.teammoeg.caupona.CPTags;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.RandomSource;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.CropBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
+import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.world.level.pathfinder.PathType;
 import net.neoforged.neoforge.common.CommonHooks;
 
 public class SnailBlock extends FruitBlock {
@@ -182,5 +188,14 @@ public int eatBlock(BlockPos pos,ServerLevel level,boolean toMucus) {
 	protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> pBuilder) {
 		pBuilder.add(AGE, EATEN_FRUIT);
 	}
+	@Override
+	public boolean isPathfindable(BlockState pState, PathComputationType pType) {
+	      return false;
+	}
+
+	@Override
+	public @Nullable PathType getBlockPathType(BlockState state, BlockGetter level, BlockPos pos, @Nullable Mob mob) {
+		return PathType.COCOA;
+	}
 
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 ? super.updateShape(state, facing, facingState, level, currentPos, facingPos)
                 : Blocks.AIR.defaultBlockState();
         }
     }