Use Properties instead of Overriden methods

Cadiboo · Cadiboo · commit 407b038009da · 2019-12-19T01:39:07.000+11:00
diff --git a/src/main/java/io/github/cadiboo/examplemod/ModEventSubscriber.java b/src/main/java/io/github/cadiboo/examplemod/ModEventSubscriber.java
@@ -61,7 +61,7 @@ public static void onRegisterBlocks(final RegistryEvent.Register<Block> event) {
 				// This block has the IRON material, meaning it needs at least a stone pickaxe to break it. It is very similar to the Iron Block
 				setup(new Block(Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(5.0F, 6.0F).sound(SoundType.METAL)), "example_block"),
 				// This block has the MISCELLANEOUS material. It is very similar to the Redstone Torch
-				setup(new MiniModelBlock(Block.Properties.create(Material.MISCELLANEOUS).hardnessAndResistance(1.5F).lightValue(13)), "mini_model"),
+				setup(new MiniModelBlock(Block.Properties.create(Material.MISCELLANEOUS).hardnessAndResistance(1.5F).lightValue(13).doesNotBlockMovement()), "mini_model"),
 				// This block has the ROCK material, meaning it needs at least a wooden pickaxe to break it. It is very similar to the Furnace
 				setup(new HeatCollectorBlock(Block.Properties.create(Material.ROCK).hardnessAndResistance(3.5F).lightValue(13)), "heat_collector"),
 				setup(new ElectricFurnaceBlock(Block.Properties.create(Material.ROCK).hardnessAndResistance(3.5F)), "electric_furnace"),
diff --git a/src/main/java/io/github/cadiboo/examplemod/block/MiniModelBlock.java b/src/main/java/io/github/cadiboo/examplemod/block/MiniModelBlock.java
@@ -11,16 +11,12 @@
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.shapes.ISelectionContext;
-import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.util.math.shapes.VoxelShapes;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.DistExecutor;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /**
@@ -44,27 +40,6 @@ public TileEntity createTileEntity(final BlockState state, final IBlockReader wo
 		return ModTileEntityTypes.MINI_MODEL.create();
 	}
 
-	/**
-	 * @deprecated Call via {@link BlockState#isSolid()} whenever possible.
-	 * Implementing/overriding is fine.
-	 */
-	@Override
-	public boolean isSolid(final BlockState state) {
-		// This prevents xraying through the world and allows light to go through this block.
-		return false;
-	}
-
-	/**
-	 * @deprecated Call via {@link BlockState#getCollisionShape(IBlockReader, BlockPos, ISelectionContext)} whenever possible.
-	 * Implementing/overriding is fine.
-	 */
-	@Override
-	@Nonnull
-	public VoxelShape getCollisionShape(final BlockState state, final IBlockReader reader, final BlockPos pos, final ISelectionContext context) {
-		// Allow entities to walk through the model
-		return VoxelShapes.empty();
-	}
-
 	/**
 	 * @deprecated Call via {@link BlockState#onBlockActivated(World, PlayerEntity, Hand, BlockRayTraceResult)} whenever possible.
 	 * Implementing/overriding is fine.
