use latest Netty and Guava

java/src/game/init/CraftingRegistry.java

@@ -6,6 +6,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
 import game.block.Block;
 import game.block.BlockBed;
 import game.block.BlockDirt;
@@ -16,8 +19,6 @@ import game.block.BlockSand;
 import game.block.BlockSandStone;
 import game.block.BlockStoneBrick;
 import game.block.BlockWall;
-import game.collect.Lists;
-import game.collect.Maps;
 import game.color.DyeColor;
 import game.entity.animal.EntitySheep;
 import game.inventory.InventoryCrafting;

java/src/game/init/EntityRegistry.java

@@ -3,7 +3,8 @@ package game.init;
 import java.util.Map;
 import java.util.Set;
 
-import game.collect.Maps;
+import com.google.common.collect.Maps;
+
 import game.entity.Entity;
 import game.entity.animal.EntityBat;
 import game.entity.animal.EntityChicken;

java/src/game/init/FluidRegistry.java

@@ -3,12 +3,13 @@ package game.init;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
 import game.block.Block;
 import game.block.BlockDynamicLiquid;
 import game.block.BlockLiquid;
 import game.block.BlockStaticLiquid;
-import game.collect.Lists;
-import game.collect.Maps;
 import game.material.Material;
 
 public abstract class FluidRegistry {

java/src/game/init/ItemRegistry.java

@@ -4,6 +4,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
 import game.block.Block;
 import game.block.BlockBed;
 import game.block.BlockButton;
@@ -20,8 +23,6 @@ import game.block.BlockSapling;
 import game.block.BlockSlab;
 import game.block.BlockStoneBrick;
 import game.block.BlockWall;
-import game.collect.Maps;
-import game.collect.Sets;
 import game.color.DyeColor;
 import game.color.TextColor;
 import game.entity.item.EntityCart;

java/src/game/init/ObjectIntIdentityMap.java

@@ -4,9 +4,9 @@ import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.List;
 
-import game.collect.Iterators;
-import game.collect.Lists;
-import game.util.Predicates;
+import com.google.common.base.Predicates;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
 
 public class ObjectIntIdentityMap<T> implements IObjectIntIterable<T>
 {

java/src/game/init/RegistryNamespaced.java

@@ -3,8 +3,8 @@ package game.init;
 import java.util.Iterator;
 import java.util.Map;
 
-import game.collect.BiMap;
-import game.collect.HashBiMap;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 
 public class RegistryNamespaced<K, V> extends RegistrySimple<K, V> implements IObjectIntIterable<V>
 {

java/src/game/init/RegistrySimple.java

@@ -5,7 +5,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import game.collect.Maps;
+import com.google.common.collect.Maps;
 
 public class RegistrySimple<K, V> implements IRegistry<K, V>
 {

java/src/game/init/RotationRegistry.java

@@ -3,7 +3,10 @@ package game.init;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Predicate;
+import com.google.common.base.Predicate;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 
 import game.block.Block;
 import game.block.BlockDoor;
@@ -19,8 +22,6 @@ import game.block.BlockRotatedPillar;
 import game.clipboard.Rotation;
 import game.clipboard.RotationValue;
 import game.clipboard.Vector;
-import game.collect.Lists;
-import game.collect.Maps;
 import game.properties.IProperty;
 import game.properties.PropertyDirection;
 import game.world.Facing;
@@ -37,7 +38,7 @@ public abstract class RotationRegistry {
         		if(prop == BlockDoor.FACING) {
         			predicate = new Predicate<Integer>() {
 						@Override
-						public boolean test(Integer meta) {
+						public boolean apply(Integer meta) {
 							return (meta & 8) == 0;
 						}
 					};

java/src/game/init/SmeltingRegistry.java

@@ -2,11 +2,13 @@ package game.init;
 
 import java.util.Map;
 import java.util.Map.Entry;
+
+import com.google.common.collect.Maps;
+
 import java.util.Set;
 
 import game.block.Block;
 import game.block.BlockStoneBrick;
-import game.collect.Maps;
 import game.color.DyeColor;
 import game.item.Item;
 import game.item.ItemFishFood;

java/src/game/init/SpeciesRegistry.java

@@ -4,9 +4,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import game.collect.Lists;
-import game.collect.Maps;
-import game.collect.Sets;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
 import game.entity.npc.EntityArachnoid;
 import game.entity.npc.EntityBloodElf;
 import game.entity.npc.EntityChaosMarine;

java/src/game/init/TileRegistry.java

@@ -2,7 +2,8 @@ package game.init;
 
 import java.util.Map;
 
-import game.collect.Maps;
+import com.google.common.collect.Maps;
+
 import game.tileentity.TileEntity;
 import game.tileentity.TileEntityBanner;
 import game.tileentity.TileEntityBeacon;

java/src/game/init/ToolMaterial.java

@@ -2,7 +2,8 @@ package game.init;
 
 import java.util.Set;
 
-import game.collect.Sets;
+import com.google.common.collect.Sets;
+
 import game.item.Item;
 
 public class ToolMaterial

java/src/game/init/UniverseRegistry.java

@@ -3,15 +3,17 @@ package game.init;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
 import java.util.Set;
 
 import game.biome.Biome;
 import game.block.BlockColored;
 import game.block.BlockSand;
 import game.block.LeavesType;
-import game.collect.Lists;
-import game.collect.Maps;
-import game.collect.Sets;
 import game.color.DyeColor;
 import game.dimension.Area;
 import game.dimension.DimType;