Fix breakable tunnels, update Tunnel Wall en_us lang

Author: robotgryphon

src/main/java/com/robotgryphon/compactmachines/block/walls/ProtectedWallBlock.java

@@ -0,0 +1,42 @@
+package com.robotgryphon.compactmachines.block.walls;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.IBlockReader;
+import net.minecraft.world.IWorldReader;
+import net.minecraft.world.World;
+
+public abstract class ProtectedWallBlock extends Block {
+    protected ProtectedWallBlock(Properties properties) {
+        super(properties);
+    }
+
+    @Override
+    public void onBlockExploded(BlockState state, World world, BlockPos pos, Explosion explosion) {
+        // NO-Op, do not destroy on explosions
+    }
+
+    @Override
+    public boolean canHarvestBlock(BlockState state, IBlockReader world, BlockPos pos, PlayerEntity player) {
+        return false;
+    }
+
+    @Override
+    public boolean canEntityDestroy(BlockState state, IBlockReader world, BlockPos pos, Entity entity) {
+        return false;
+    }
+
+    @Override
+    public boolean canBeReplacedByLeaves(BlockState state, IWorldReader world, BlockPos pos) {
+        return false;
+    }
+
+    @Override
+    public boolean canDropFromExplosion(BlockState state, IBlockReader world, BlockPos pos, Explosion explosion) {
+        return false;
+    }
+}

src/main/java/com/robotgryphon/compactmachines/block/walls/SolidWallBlock.java

@@ -1,73 +1,21 @@
 package com.robotgryphon.compactmachines.block.walls;
 
-import com.robotgryphon.compactmachines.core.Registration;
-import net.minecraft.block.Block;
+import com.robotgryphon.compactmachines.config.ServerConfig;
 import net.minecraft.block.BlockState;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntitySpawnPlacementRegistry;
 import net.minecraft.entity.EntityType;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraft.fluid.FluidState;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResultType;
-import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.world.Explosion;
 import net.minecraft.world.IBlockReader;
-import net.minecraft.world.IWorldReader;
-import net.minecraft.world.World;
 
 import javax.annotation.Nullable;
 
-public class SolidWallBlock extends Block {
+public class SolidWallBlock extends ProtectedWallBlock {
     public SolidWallBlock(Properties props) {
         super(props);
     }
 
-    @Override
-    public void onBlockExploded(BlockState state, World world, BlockPos pos, Explosion explosion) {
-        // NO-Op, do not destroy on explosions
-    }
-
-    @Override
-    public boolean canHarvestBlock(BlockState state, IBlockReader world, BlockPos pos, PlayerEntity player) {
-        return false;
-    }
-
-    @Override
-    public boolean canEntityDestroy(BlockState state, IBlockReader world, BlockPos pos, Entity entity) {
-        return false;
-    }
-
-    @Override
-    public boolean canBeReplacedByLeaves(BlockState state, IWorldReader world, BlockPos pos) {
-        return false;
-    }
-
-    @Override
-    public boolean canDropFromExplosion(BlockState state, IBlockReader world, BlockPos pos, Explosion explosion) {
-        return false;
-    }
-
     @Override
     public boolean canCreatureSpawn(BlockState state, IBlockReader world, BlockPos pos, EntitySpawnPlacementRegistry.PlacementType type, @Nullable EntityType<?> entityType) {
-        return pos.getY() == 40;
-    }
-
-    @Override
-    public ActionResultType onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) {
-        ItemStack held = player.getHeldItemMainhand();
-
-        if (held.isEmpty())
-            return ActionResultType.PASS;
-
-        if (player.isSneaking())
-            return ActionResultType.PASS;
-
-        // TODO: Tunnels and Personal Shrinking Device
-
-        return super.onBlockActivated(state, worldIn, pos, player, handIn, hit);
+        return pos.getY() == ServerConfig.MACHINE_FLOOR_Y.get();
     }
 }

src/main/java/com/robotgryphon/compactmachines/block/walls/TunnelWallBlock.java

@@ -30,7 +30,7 @@
 import javax.annotation.Nullable;
 import java.util.Optional;
 
-public class TunnelWallBlock extends Block implements IProbeDataProvider {
+public class TunnelWallBlock extends ProtectedWallBlock implements IProbeDataProvider {
     public static DirectionProperty TUNNEL_SIDE = DirectionProperty.create("tunnel_side", Direction.values());
     public static DirectionProperty CONNECTED_SIDE = DirectionProperty.create("connected_side", Direction.values());
 

src/main/resources/assets/compactmachines/lang/en_us.json

@@ -24,7 +24,7 @@
 
   "block.compactmachines.solid_wall": "Solid Compact Machine Wall",
   "block.compactmachines.wall": "Compact Machine Wall",
-  "block.compactmachines.tunnel_wall": "Tunnel",
+  "block.compactmachines.tunnel_wall": "Solid Compact Machine Wall (with Tunnel)",
 
   "item.compactmachines.machine_tiny": "Compact Machine (Tiny)",
   "item.compactmachines.machine_small": "Compact Machine (Small)",