Refactor tunnel wall classes into tunnel package

Author: robotgryphon

src/main/java/dev/compactmods/machines/client/TunnelColors.java

@@ -4,7 +4,7 @@
 import java.awt.*;
 import java.util.Optional;
 import dev.compactmods.machines.api.tunnels.TunnelDefinition;
-import dev.compactmods.machines.block.tiles.TunnelWallEntity;
+import dev.compactmods.machines.tunnel.TunnelWallEntity;
 import net.minecraft.client.color.block.BlockColor;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.BlockAndTintGetter;

src/main/java/dev/compactmods/machines/compat/theoneprobe/providers/TunnelProvider.java

@@ -5,8 +5,8 @@
 import dev.compactmods.machines.api.core.Messages;
 import dev.compactmods.machines.api.tunnels.TunnelDefinition;
 import dev.compactmods.machines.api.tunnels.connection.ITunnelConnection;
-import dev.compactmods.machines.block.tiles.TunnelWallEntity;
-import dev.compactmods.machines.block.walls.TunnelWallBlock;
+import dev.compactmods.machines.tunnel.TunnelWallEntity;
+import dev.compactmods.machines.tunnel.TunnelWallBlock;
 import dev.compactmods.machines.core.Tunnels;
 import dev.compactmods.machines.util.TranslationUtil;
 import mcjty.theoneprobe.api.*;

src/main/java/dev/compactmods/machines/core/Registration.java

@@ -5,8 +5,8 @@
 import static dev.compactmods.machines.CompactMachines.MOD_ID;
 import dev.compactmods.machines.block.BlockCompactMachine;
 import dev.compactmods.machines.block.tiles.CompactMachineTile;
-import dev.compactmods.machines.block.walls.BreakableWallBlock;
-import dev.compactmods.machines.block.walls.SolidWallBlock;
+import dev.compactmods.machines.wall.BreakableWallBlock;
+import dev.compactmods.machines.wall.SolidWallBlock;
 import dev.compactmods.machines.item.ItemBlockMachine;
 import dev.compactmods.machines.item.ItemBlockWall;
 import dev.compactmods.machines.item.ItemPersonalShrinkingDevice;

src/main/java/dev/compactmods/machines/core/Tunnels.java

@@ -3,10 +3,9 @@
 import java.util.function.Supplier;
 import static dev.compactmods.machines.CompactMachines.MOD_ID;
 import dev.compactmods.machines.api.tunnels.TunnelDefinition;
-import dev.compactmods.machines.block.tiles.TunnelWallEntity;
-import dev.compactmods.machines.block.walls.TunnelWallBlock;
 import dev.compactmods.machines.item.TunnelItem;
-import dev.compactmods.machines.tunnel.ItemImportTunnel;
+import dev.compactmods.machines.tunnel.TunnelWallBlock;
+import dev.compactmods.machines.tunnel.TunnelWallEntity;
 import dev.compactmods.machines.tunnel.UnknownTunnel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;

src/main/java/dev/compactmods/machines/datagen/TunnelWallStateGenerator.java

@@ -2,7 +2,7 @@
 
 
 import dev.compactmods.machines.CompactMachines;
-import dev.compactmods.machines.block.walls.TunnelWallBlock;
+import dev.compactmods.machines.tunnel.TunnelWallBlock;
 import dev.compactmods.machines.core.Tunnels;
 import net.minecraft.core.Direction;
 import net.minecraft.data.DataGenerator;

src/main/java/dev/compactmods/machines/item/TunnelItem.java

@@ -11,9 +11,9 @@
 import dev.compactmods.machines.api.core.Tooltips;
 import dev.compactmods.machines.api.tunnels.TunnelDefinition;
 import dev.compactmods.machines.api.tunnels.redstone.IRedstoneTunnel;
-import dev.compactmods.machines.block.tiles.TunnelWallEntity;
-import dev.compactmods.machines.block.walls.SolidWallBlock;
-import dev.compactmods.machines.block.walls.TunnelWallBlock;
+import dev.compactmods.machines.tunnel.TunnelWallEntity;
+import dev.compactmods.machines.wall.SolidWallBlock;
+import dev.compactmods.machines.tunnel.TunnelWallBlock;
 import dev.compactmods.machines.core.Capabilities;
 import dev.compactmods.machines.core.Tunnels;
 import dev.compactmods.machines.data.persistent.CompactMachineData;

src/main/java/dev/compactmods/machines/rooms/capability/MachineRoomTunnels.java

@@ -6,7 +6,7 @@
 import dev.compactmods.machines.api.tunnels.TunnelDefinition;
 import dev.compactmods.machines.api.tunnels.connection.IRoomTunnels;
 import dev.compactmods.machines.api.tunnels.connection.ITunnelConnection;
-import dev.compactmods.machines.block.tiles.TunnelWallEntity;
+import dev.compactmods.machines.tunnel.TunnelWallEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.chunk.LevelChunk;
 

src/main/java/dev/compactmods/machines/tunnel/TunnelHelper.java

@@ -10,7 +10,6 @@
 import dev.compactmods.machines.api.tunnels.lifecycle.ITunnelSetup;
 import dev.compactmods.machines.api.tunnels.lifecycle.ITunnelTeardown;
 import dev.compactmods.machines.api.tunnels.lifecycle.TeardownReason;
-import dev.compactmods.machines.block.tiles.TunnelWallEntity;
 import dev.compactmods.machines.core.Capabilities;
 import dev.compactmods.machines.core.Registration;
 import dev.compactmods.machines.core.Tunnels;

src/main/java/dev/compactmods/machines/tunnel/TunnelMachineConnection.java

@@ -1,7 +1,6 @@
 package dev.compactmods.machines.tunnel;
 
 import dev.compactmods.machines.api.tunnels.connection.ITunnelConnection;
-import dev.compactmods.machines.block.tiles.TunnelWallEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.MinecraftServer;

…achines/block/walls/TunnelWallBlock.java …ods/machines/tunnel/TunnelWallBlock.javasrc/main/java/dev/compactmods/machines/block/walls/TunnelWallBlock.java renamed to src/main/java/dev/compactmods/machines/tunnel/TunnelWallBlock.java src/main/java/dev/compactmods/machines/block/walls/TunnelWallBlock.java renamed to src/main/java/dev/compactmods/machines/tunnel/TunnelWallBlock.java

@@ -1,4 +1,4 @@
-package dev.compactmods.machines.block.walls;
+package dev.compactmods.machines.tunnel;
 
 import javax.annotation.Nullable;
 import java.util.Optional;
@@ -7,10 +7,9 @@
 import dev.compactmods.machines.api.tunnels.lifecycle.ITunnelTeardown;
 import dev.compactmods.machines.api.tunnels.lifecycle.TeardownReason;
 import dev.compactmods.machines.api.tunnels.redstone.IRedstoneReaderTunnel;
-import dev.compactmods.machines.block.tiles.TunnelWallEntity;
+import dev.compactmods.machines.wall.ProtectedWallBlock;
 import dev.compactmods.machines.core.Registration;
 import dev.compactmods.machines.core.Tunnels;
-import dev.compactmods.machines.tunnel.TunnelHelper;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;