use latest Netty and Guava

java/src/game/worldgen/BiomeGenLayered.java

@@ -3,8 +3,9 @@ package game.worldgen;
 import java.util.List;
 import java.util.Set;
 
+import com.google.common.collect.Lists;
+
 import game.biome.Biome;
-import game.collect.Lists;
 import game.world.BlockPos;
 import game.world.LongHashMap;
 import game.worldgen.layer.GenLayer;

java/src/game/worldgen/GeneratorDebug.java

@@ -2,8 +2,9 @@ package game.worldgen;
 
 import java.util.List;
 
+import com.google.common.collect.Lists;
+
 import game.block.Block;
-import game.collect.Lists;
 import game.init.BlockRegistry;
 import game.util.ExtMath;
 import game.world.State;

java/src/game/worldgen/feature/WorldGenDesertWells.java

@@ -1,11 +1,12 @@
 package game.worldgen.feature;
 
+import com.google.common.base.Predicates;
+
 import game.block.BlockSand;
 import game.block.BlockSlab;
 import game.init.Blocks;
 import game.pattern.BlockStateHelper;
 import game.rng.Random;
-import game.util.Predicates;
 import game.world.BlockPos;
 import game.world.Facing;
 import game.world.State;
@@ -26,7 +27,7 @@ public class WorldGenDesertWells extends FeatureGenerator
             position = position.down();
         }
 
-        if (!field_175913_a.test(worldIn.getState(position)))
+        if (!field_175913_a.apply(worldIn.getState(position)))
         {
             return false;
         }

java/src/game/worldgen/layer/IntCache.java

@@ -2,7 +2,7 @@ package game.worldgen.layer;
 
 import java.util.List;
 
-import game.collect.Lists;
+import com.google.common.collect.Lists;
 
 public class IntCache
 {

java/src/game/worldgen/structure/MapGenStructure.java

@@ -3,7 +3,8 @@ package game.worldgen.structure;
 import java.util.Iterator;
 import java.util.Map;
 
-import game.collect.Maps;
+import com.google.common.collect.Maps;
+
 import game.nbt.NBTBase;
 import game.nbt.NBTTagCompound;
 import game.rng.Random;

java/src/game/worldgen/structure/MapGenStructureIO.java

@@ -2,7 +2,8 @@ package game.worldgen.structure;
 
 import java.util.Map;
 
-import game.collect.Maps;
+import com.google.common.collect.Maps;
+
 import game.log.Log;
 import game.nbt.NBTTagCompound;
 import game.world.WorldServer;

java/src/game/worldgen/structure/MapGenVillage.java

@@ -3,8 +3,9 @@ package game.worldgen.structure;
 import java.util.List;
 import java.util.Set;
 
+import com.google.common.collect.Sets;
+
 import game.biome.Biome;
-import game.collect.Sets;
 import game.nbt.NBTTagCompound;
 import game.rng.Random;
 import game.world.WorldServer;

java/src/game/worldgen/structure/StructureBridge.java

@@ -2,7 +2,8 @@ package game.worldgen.structure;
 
 import java.util.List;
 
-import game.collect.Lists;
+import com.google.common.collect.Lists;
+
 import game.init.Blocks;
 import game.nbt.NBTTagCompound;
 import game.rng.Random;

java/src/game/worldgen/structure/StructureStronghold.java

@@ -3,10 +3,11 @@ package game.worldgen.structure;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
 import game.block.BlockSlab;
 import game.block.BlockStoneBrick;
-import game.collect.Lists;
-import game.collect.Maps;
 import game.init.Blocks;
 import game.init.Items;
 import game.item.RngLoot;

java/src/game/worldgen/structure/StructureVillage.java

@@ -3,6 +3,8 @@ package game.worldgen.structure;
 import java.util.Iterator;
 import java.util.List;
 
+import com.google.common.collect.Lists;
+
 import game.biome.Biome;
 import game.block.Block;
 import game.block.BlockLog;
@@ -10,7 +12,6 @@ import game.block.BlockSandStone;
 import game.block.BlockSlab;
 import game.block.BlockStairs;
 import game.block.BlockTorch;
-import game.collect.Lists;
 import game.color.DyeColor;
 import game.entity.npc.EntityHuman;
 import game.init.BlockRegistry;

java/src/game/worldgen/tree/WorldGenBigTree.java

@@ -2,10 +2,11 @@ package game.worldgen.tree;
 
 import java.util.List;
 
+import com.google.common.collect.Lists;
+
 import game.block.Block;
 import game.block.BlockLeaves;
 import game.block.BlockLog;
-import game.collect.Lists;
 import game.init.Blocks;
 import game.material.Material;
 import game.rng.Random;