move clipboard classes

common/src/common/init/Registry.java

@@ -32,8 +32,6 @@ public abstract class Registry {
         EntityRegistry.register();
 		DispenserRegistry.register();
 		UniverseRegistry.register();
-	    RotationRegistry.register();
-	    ReorderRegistry.register();
 	}
 	
 	public static void setup(String thread) {

server/src/server/Server.java

@@ -86,6 +86,8 @@ import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.handler.timeout.ReadTimeoutHandler;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
+import server.clipboard.ReorderRegistry;
+import server.clipboard.RotationRegistry;
 import server.command.CommandEnvironment;
 import server.command.FixedExecutor;
 import server.network.HandshakeHandler;
@@ -142,6 +144,8 @@ public final class Server implements IThreadListener {
 	public static void main(String[] args) {
 		Util.checkOs();
 		Registry.setup("Server thread");
+	    RotationRegistry.register();
+	    ReorderRegistry.register();
 		boolean debug = System.getProperty("server.debug", null) != null;
 		boolean ipc = System.getProperty("server.pipe", null) != null;
 		int port = Integer.parseInt(System.getProperty("server.port", "" + Config.PORT));

server/src/server/clipboard/BlockTransform.java

@@ -1,4 +1,4 @@
-package common.clipboard;
+package server.clipboard;
 
 public class BlockTransform {
     private double m00, m01, m02, m03;

server/src/server/clipboard/ClipboardBlock.java

@@ -1,4 +1,4 @@
-package common.clipboard;
+package server.clipboard;
 
 import common.nbt.NBTTagCompound;
 import common.tileentity.TileEntity;

server/src/server/clipboard/ClipboardPlacer.java

@@ -12,10 +12,8 @@ import common.block.Block;
 import common.block.BlockDoor;
 import common.block.BlockRailBase;
 import common.block.ITileEntityProvider;
-import common.clipboard.ClipboardBlock;
 import common.collect.Lists;
 import common.init.Blocks;
-import common.init.ReorderRegistry;
 import common.inventory.IInventory;
 import common.tileentity.TileEntity;
 import common.util.BlockPos;

server/src/server/clipboard/ReorderRegistry.java

@@ -1,4 +1,4 @@
-package common.init;
+package server.clipboard;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -9,6 +9,9 @@ import common.block.Block;
 import common.block.BlockBed;
 import common.block.BlockDoor;
 import common.color.DyeColor;
+import common.init.BlockRegistry;
+import common.init.Blocks;
+import common.init.WoodType;
 import common.util.Facing;
 import common.util.Vec3i;
 import common.world.State;
@@ -33,7 +36,7 @@ public abstract class ReorderRegistry {
         return STATE_ATTACH.get(state);
     }
     
-    static void register() {
+    public static void register() {
     	for(WoodType wood : WoodType.values()) {
     		PLACE_LAST.add(BlockRegistry.getRegisteredBlock(wood.getName() + "_sapling"));
     	}

server/src/server/clipboard/Rotation.java

@@ -1,4 +1,4 @@
-package common.clipboard;
+package server.clipboard;
 
 import java.util.function.Predicate;
 

server/src/server/clipboard/RotationRegistry.java

@@ -1,4 +1,4 @@
-package common.init;
+package server.clipboard;
 
 import java.util.HashMap;
 import java.util.List;
@@ -16,9 +16,6 @@ import common.block.BlockRailBase;
 import common.block.BlockRailDetector;
 import common.block.BlockRailPowered;
 import common.block.BlockRotatedPillar;
-import common.clipboard.Rotation;
-import common.clipboard.RotationValue;
-import common.clipboard.Vector;
 import common.collect.Lists;
 import common.collect.Maps;
 import common.properties.IProperty;
@@ -30,7 +27,7 @@ import common.world.State;
 public abstract class RotationRegistry {
     private static final Map<Block, Rotation> MAP = new HashMap<Block, Rotation>();
     
-    static void register() {
+    public static void register() {
     	for(Block block : common.init.BlockRegistry.REGISTRY) {
         	for(IProperty<?> prop : block.getPropertyMap()) {
         		Predicate<Integer> predicate = null;

server/src/server/clipboard/RotationValue.java

@@ -1,4 +1,4 @@
-package common.clipboard;
+package server.clipboard;
 
 public class RotationValue {
 	public final byte mask;

server/src/server/clipboard/Vector.java

@@ -1,4 +1,4 @@
-package common.clipboard;
+package server.clipboard;
 
 public class Vector implements Comparable<Vector> {
     public static final Vector ZERO = new Vector(0, 0, 0);

server/src/server/network/Player.java

@@ -12,11 +12,6 @@ import common.block.Block;
 import common.block.BlockFence;
 import common.block.BlockFenceGate;
 import common.block.BlockWall;
-import common.clipboard.BlockTransform;
-import common.clipboard.ClipboardBlock;
-import common.clipboard.Rotation;
-import common.clipboard.RotationValue;
-import common.clipboard.Vector;
 import common.collect.Lists;
 import common.color.TextColor;
 import common.dimension.Dimension;
@@ -35,7 +30,6 @@ import common.init.BlockRegistry;
 import common.init.Config;
 import common.init.EntityRegistry;
 import common.init.Items;
-import common.init.RotationRegistry;
 import common.init.SoundEvent;
 import common.init.UniverseRegistry;
 import common.init.Config.ValueType;
@@ -130,7 +124,13 @@ import common.world.World;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 import server.Server;
+import server.clipboard.BlockTransform;
+import server.clipboard.ClipboardBlock;
 import server.clipboard.ClipboardPlacer;
+import server.clipboard.Rotation;
+import server.clipboard.RotationRegistry;
+import server.clipboard.RotationValue;
+import server.clipboard.Vector;
 import server.command.Executor;
 import server.world.Region;
 import server.world.WorldServer;

server/src/server/world/WorldServer.java

@@ -21,7 +21,6 @@ import common.block.BlockEventData;
 import common.block.BlockFalling;
 import common.block.BlockLiquid;
 import common.block.BlockSnow;
-import common.clipboard.ClipboardBlock;
 import common.collect.Lists;
 import common.collect.Maps;
 import common.collect.Sets;
@@ -98,6 +97,7 @@ import common.worldgen.caves.MapGenBigCaves;
 import common.worldgen.caves.MapGenCaves;
 import common.worldgen.caves.MapGenRavine;
 import server.Server;
+import server.clipboard.ClipboardBlock;
 import server.network.Player;
 import server.village.VillageCollection;
 import server.worldgen.structure.MapGenBridge;