Fixes from rebase

CSX8600 · Mar 15, 2024 · c8ec6d3 · c8ec6d3
1 parent e408668
commit c8ec6d3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 38 deletions.
diff --git a/src/main/java/com/clussmanproductions/trafficcontrol/blocks/BlockSafetranType3.java b/src/main/java/com/clussmanproductions/trafficcontrol/blocks/BlockSafetranType3.java
@@ -101,14 +101,4 @@ public boolean causesSuffocation(IBlockState state) {
 	public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
 		return new AxisAlignedBB(0.375, 0, 0.375, 0.625, 0.8125, 0.625);
 	}
-
-	@Override
-	public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) {
-		if (face == EnumFacing.UP)
-		{
-			return BlockFaceShape.UNDEFINED;
-		}
-
-		return super.getBlockFaceShape(worldIn, state, pos, face);
-	}
 }
diff --git a/src/main/java/com/clussmanproductions/trafficcontrol/item/ItemScrewdriver.java b/src/main/java/com/clussmanproductions/trafficcontrol/item/ItemScrewdriver.java
@@ -6,36 +6,9 @@
 
 import com.clussmanproductions.trafficcontrol.Config;
 import com.clussmanproductions.trafficcontrol.ModTrafficControl;
-import com.clussmanproductions.trafficcontrol.blocks.BlockChannelizer;
-import com.clussmanproductions.trafficcontrol.blocks.BlockCone;
-import com.clussmanproductions.trafficcontrol.blocks.BlockCrossingGateBase;
-import com.clussmanproductions.trafficcontrol.blocks.BlockCrossingGateCrossbuck;
-import com.clussmanproductions.trafficcontrol.blocks.BlockCrossingGateGate;
-import com.clussmanproductions.trafficcontrol.blocks.BlockCrossingGateLamps;
-import com.clussmanproductions.trafficcontrol.blocks.BlockCrossingGatePole;
-import com.clussmanproductions.trafficcontrol.blocks.BlockDrum;
-import com.clussmanproductions.trafficcontrol.blocks.BlockPedestrianButton;
-import com.clussmanproductions.trafficcontrol.blocks.BlockSafetranMechanical;
-import com.clussmanproductions.trafficcontrol.blocks.BlockSafetranType3;
-import com.clussmanproductions.trafficcontrol.blocks.BlockSign;
-import com.clussmanproductions.trafficcontrol.blocks.BlockStand;
-import com.clussmanproductions.trafficcontrol.blocks.BlockStreetLightDouble;
-import com.clussmanproductions.trafficcontrol.blocks.BlockStreetLightSingle;
-import com.clussmanproductions.trafficcontrol.blocks.BlockTrafficLight;
-import com.clussmanproductions.trafficcontrol.blocks.BlockTrafficLight1;
-import com.clussmanproductions.trafficcontrol.blocks.BlockTrafficLight2;
-import com.clussmanproductions.trafficcontrol.blocks.BlockTrafficLight4;
-import com.clussmanproductions.trafficcontrol.blocks.BlockTrafficLight5;
-import com.clussmanproductions.trafficcontrol.blocks.BlockTrafficLight5Upper;
-import com.clussmanproductions.trafficcontrol.blocks.BlockTrafficLight6;
-import com.clussmanproductions.trafficcontrol.blocks.BlockTrafficLightDoghouse;
-import com.clussmanproductions.trafficcontrol.blocks.BlockVerticalWigWag;
-import com.clussmanproductions.trafficcontrol.blocks.BlockWCHBell;
-import com.clussmanproductions.trafficcontrol.blocks.BlockWCHMechanicalBell;
-import com.clussmanproductions.trafficcontrol.blocks.BlockWigWag;
-import com.clussmanproductions.trafficcontrol.tileentity.IHasRotationProperty;
 import com.clussmanproductions.trafficcontrol.network.PacketHandler;
 import com.clussmanproductions.trafficcontrol.network.ServerSideSoundPacket;
+import com.clussmanproductions.trafficcontrol.tileentity.IHasRotationProperty;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.properties.IProperty;