Removing google deps (incomplete)

src/main/java/net/minecraft/src/AnimationMetadataSection.java

@@ -1,6 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Sets;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -64,7 +63,7 @@ public class AnimationMetadataSection implements MetadataSection
 
     public Set getFrameIndexSet()
     {
-        HashSet var1 = Sets.newHashSet();
+        HashSet var1 = new HashSet<>();
         Iterator var2 = this.animationFrames.iterator();
 
         while (var2.hasNext())

src/main/java/net/minecraft/src/AnimationMetadataSectionSerializer.java

@@ -1,6 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Lists;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonElement;
@@ -16,7 +15,7 @@ public class AnimationMetadataSectionSerializer extends BaseMetadataSectionSeria
 {
     public AnimationMetadataSection func_110493_a(JsonElement par1JsonElement, Type par2Type, JsonDeserializationContext par3JsonDeserializationContext)
     {
-        ArrayList var4 = Lists.newArrayList();
+        ArrayList var4 = new ArrayList<>();
         JsonObject var5 = (JsonObject)par1JsonElement;
         int var6 = this.func_110485_a(var5.get("frametime"), "frametime", Integer.valueOf(1), 1, Integer.MAX_VALUE);
         int var8;

src/main/java/net/minecraft/src/ChatMessageComponent.java

@@ -1,8 +1,9 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -29,7 +30,7 @@ public class ChatMessageComponent
         this.obfuscated = par1ChatMessageComponent.obfuscated;
         this.text = par1ChatMessageComponent.text;
         this.translationKey = par1ChatMessageComponent.translationKey;
-        this.field_111091_i = par1ChatMessageComponent.field_111091_i == null ? null : Lists.newArrayList(par1ChatMessageComponent.field_111091_i);
+        this.field_111091_i = par1ChatMessageComponent.field_111091_i == null ? null : new ArrayList<>(par1ChatMessageComponent.field_111091_i);
     }
 
     public ChatMessageComponent setColor(EnumChatFormatting par1EnumChatFormatting)
@@ -119,12 +120,12 @@ public class ChatMessageComponent
             }
             else
             {
-                this.field_111091_i = Lists.newArrayList(new ChatMessageComponent[] {par1ChatMessageComponent});
+                this.field_111091_i = new ArrayList<>(List.of(new ChatMessageComponent[]{par1ChatMessageComponent}));
             }
         }
         else
         {
-            this.field_111091_i = Lists.newArrayList(new ChatMessageComponent[] {new ChatMessageComponent(this), par1ChatMessageComponent});
+            this.field_111091_i = new ArrayList<>(List.of(new ChatMessageComponent[]{new ChatMessageComponent(this), par1ChatMessageComponent}));
             this.text = null;
             this.translationKey = null;
         }
@@ -147,7 +148,7 @@ public class ChatMessageComponent
         }
         else
         {
-            this.field_111091_i = Lists.newArrayList(new ChatMessageComponent[] {new ChatMessageComponent(this), createFromText(par1Str)});
+            this.field_111091_i = new ArrayList(List.of(new ChatMessageComponent[]{new ChatMessageComponent(this), createFromText(par1Str)}));
             this.text = null;
             this.translationKey = null;
         }
@@ -173,7 +174,7 @@ public class ChatMessageComponent
         }
         else
         {
-            this.field_111091_i = Lists.newArrayList(new ChatMessageComponent[] {new ChatMessageComponent(this), createFromTranslationKey(par1Str)});
+            this.field_111091_i = new ArrayList<>(List.of(new ChatMessageComponent[]{new ChatMessageComponent(this), createFromTranslationKey(par1Str)}));
             this.text = null;
             this.translationKey = null;
         }
@@ -196,7 +197,7 @@ public class ChatMessageComponent
             else
             {
                 this.translationKey = par1Str;
-                this.field_111091_i = Lists.newArrayList();
+                this.field_111091_i = new ArrayList<>();
                 Object[] var3 = par2ArrayOfObj;
                 int var4 = par2ArrayOfObj.length;
 
@@ -217,7 +218,7 @@ public class ChatMessageComponent
         }
         else
         {
-            this.field_111091_i = Lists.newArrayList(new ChatMessageComponent[] {new ChatMessageComponent(this), createFromTranslationWithSubstitutions(par1Str, par2ArrayOfObj)});
+            this.field_111091_i = new ArrayList<>(List.of(new ChatMessageComponent[]{new ChatMessageComponent(this), createFromTranslationWithSubstitutions(par1Str, par2ArrayOfObj)}));
             this.text = null;
             this.translationKey = null;
         }

src/main/java/net/minecraft/src/CommandBase.java

@@ -1,6 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.primitives.Doubles;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -93,7 +92,7 @@ public abstract class CommandBase implements ICommand
         {
             double var2 = Double.parseDouble(par1Str);
 
-            if (!Doubles.isFinite(var2))
+            if (!Double.isFinite(var2))
             {
                 throw new NumberInvalidException("commands.generic.double.invalid", new Object[] {par1Str});
             }

src/main/java/net/minecraft/src/CommandSpreadPlayers.java

@@ -1,8 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -47,7 +44,7 @@ public class CommandSpreadPlayers extends CommandBase
             double var8 = func_110664_a(par1ICommandSender, par2ArrayOfStr[var16++], 0.0D);
             double var10 = func_110664_a(par1ICommandSender, par2ArrayOfStr[var16++], var8 + 1.0D);
             boolean var12 = func_110662_c(par1ICommandSender, par2ArrayOfStr[var16++]);
-            ArrayList var13 = Lists.newArrayList();
+            ArrayList var13 = new ArrayList<>();
 
             while (true)
             {
@@ -111,7 +108,7 @@ public class CommandSpreadPlayers extends CommandBase
 
     private int func_110667_a(List par1List)
     {
-        HashSet var2 = Sets.newHashSet();
+        HashSet var2 = new HashSet<>();
         Iterator var3 = par1List.iterator();
 
         while (var3.hasNext())
@@ -224,7 +221,7 @@ public class CommandSpreadPlayers extends CommandBase
     {
         double var5 = 0.0D;
         int var7 = 0;
-        HashMap var8 = Maps.newHashMap();
+        HashMap var8 = new HashMap<>();
 
         for (int var9 = 0; var9 < par1List.size(); ++var9)
         {

src/main/java/net/minecraft/src/FileResourcePack.java

@@ -1,23 +1,15 @@
 package net.minecraft.src;
 
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
 public class FileResourcePack extends AbstractResourcePack implements Closeable
 {
-    public static final Splitter entryNameSplitter = Splitter.on('/').omitEmptyStrings().limit(3);
     private ZipFile resourcePackZipFile;
 
     public FileResourcePack(File par1File)
@@ -76,7 +68,7 @@ public class FileResourcePack extends AbstractResourcePack implements Closeable
         }
 
         Enumeration var2 = var1.entries();
-        HashSet var3 = Sets.newHashSet();
+        HashSet var3 = new HashSet<>();
 
         while (var2.hasMoreElements())
         {
@@ -85,7 +77,7 @@ public class FileResourcePack extends AbstractResourcePack implements Closeable
 
             if (var5.startsWith("assets/"))
             {
-                ArrayList var6 = Lists.newArrayList(entryNameSplitter.split(var5));
+                ArrayList var6 = new ArrayList<>(List.of(var5.split("/")));
 
                 if (var6.size() > 1)
                 {

src/main/java/net/minecraft/src/FolderResourcePack.java

@@ -1,6 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Sets;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -29,7 +28,7 @@ public class FolderResourcePack extends AbstractResourcePack
 
     public Set getResourceDomains()
     {
-        HashSet var1 = Sets.newHashSet();
+        HashSet var1 = new HashSet<>();
         File var2 = new File(this.resourcePackFile, "assets/");
 
         if (var2.isDirectory())

src/main/java/net/minecraft/src/Item.java

@@ -1,7 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
 import java.util.List;
 import net.lax1dude.eaglercraft.EaglercraftRandom;
 import java.util.UUID;
@@ -676,14 +674,6 @@ public class Item
         this.itemIcon = par1IconRegister.registerIcon(this.getIconString());
     }
 
-    /**
-     * Gets a map of item attribute modifiers, used by ItemSword to increase hit damage.
-     */
-    public Multimap getItemAttributeModifiers()
-    {
-        return HashMultimap.create();
-    }
-
     protected Item setTextureName(String par1Str)
     {
         this.iconString = par1Str;

src/main/java/net/minecraft/src/ItemStack.java

@@ -1,7 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -581,130 +579,73 @@ public final class ItemStack
     /**
      * Return a list of strings containing information about the item
      */
-    public List getTooltip(EntityPlayer par1EntityPlayer, boolean par2)
+    public List getTooltip(EntityPlayer par1EntityPlayer, boolean par2) {
-    {
         ArrayList var3 = new ArrayList();
         Item var4 = Item.itemsList[this.itemID];
         String var5 = this.getDisplayName();
 
-        if (this.hasDisplayName())
+        if (this.hasDisplayName()) {
-        {
             var5 = EnumChatFormatting.ITALIC + var5 + EnumChatFormatting.RESET;
         }
 
-        if (par2)
+        if (par2) {
-        {
             String var6 = "";
 
-            if (var5.length() > 0)
+            if (var5.length() > 0) {
-            {
                 var5 = var5 + " (";
                 var6 = ")";
             }
 
-            if (this.getHasSubtypes())
+            if (this.getHasSubtypes()) {
-            {
                 var5 = var5 + String.format("#%04d/%d%s", new Object[] { Integer.valueOf(this.itemID), Integer.valueOf(this.itemDamage), var6 });
-            }
+            } else {
-            else
-            {
                 var5 = var5 + String.format("#%04d%s", new Object[] { Integer.valueOf(this.itemID), var6 });
             }
-        }
+        } else if (!this.hasDisplayName() && this.itemID == Item.map.itemID) {
-        else if (!this.hasDisplayName() && this.itemID == Item.map.itemID)
-        {
             var5 = var5 + " #" + this.itemDamage;
         }
 
         var3.add(var5);
         var4.addInformation(this, par1EntityPlayer, var3, par2);
 
-        if (this.hasTagCompound())
+        if (this.hasTagCompound()) {
-        {
+            NBTTagList var10 = this.getEnchantmentTagList();
-            NBTTagList var14 = this.getEnchantmentTagList();
 
-            if (var14 != null)
+            if (var10 != null) {
-            {
+                for (int var7 = 0; var7 < var10.tagCount(); ++var7) {
-                for (int var7 = 0; var7 < var14.tagCount(); ++var7)
+                    short var8 = ((NBTTagCompound) var10.tagAt(var7)).getShort("id");
-                {
+                    short var9 = ((NBTTagCompound) var10.tagAt(var7)).getShort("lvl");
-                    short var8 = ((NBTTagCompound)var14.tagAt(var7)).getShort("id");
-                    short var9 = ((NBTTagCompound)var14.tagAt(var7)).getShort("lvl");
 
-                    if (Enchantment.enchantmentsList[var8] != null)
+                    if (Enchantment.enchantmentsList[var8] != null) {
-                    {
                         var3.add(Enchantment.enchantmentsList[var8].getTranslatedName(var9));
                     }
                 }
             }
 
-            if (this.stackTagCompound.hasKey("display"))
+            if (this.stackTagCompound.hasKey("display")) {
-            {
+                NBTTagCompound var11 = this.stackTagCompound.getCompoundTag("display");
-                NBTTagCompound var16 = this.stackTagCompound.getCompoundTag("display");
 
-                if (var16.hasKey("color"))
+                if (var11.hasKey("color")) {
-                {
+                    if (par2) {
-                    if (par2)
+                        var3.add("Color: #" + Integer.toHexString(var11.getInteger("color")).toUpperCase());
-                    {
+                    } else {
-                        var3.add("Color: #" + Integer.toHexString(var16.getInteger("color")).toUpperCase());
-                    }
-                    else
-                    {
                         var3.add(EnumChatFormatting.ITALIC + StatCollector.translateToLocal("item.dyed"));
                     }
                 }
 
-                if (var16.hasKey("Lore"))
+                if (var11.hasKey("Lore")) {
-                {
+                    NBTTagList var12 = var11.getTagList("Lore");
-                    NBTTagList var18 = var16.getTagList("Lore");
 
-                    if (var18.tagCount() > 0)
+                    if (var12.tagCount() > 0) {
-                    {
+                        for (int var13 = 0; var13 < var12.tagCount(); ++var13) {
-                        for (int var20 = 0; var20 < var18.tagCount(); ++var20)
+                            var3.add(EnumChatFormatting.DARK_PURPLE + "" + EnumChatFormatting.ITALIC + ((NBTTagString) var12.tagAt(var13)).data);
-                        {
-                            var3.add(EnumChatFormatting.DARK_PURPLE + "" + EnumChatFormatting.ITALIC + ((NBTTagString)var18.tagAt(var20)).data);
                         }
                     }
                 }
             }
         }
 
-        Multimap var15 = this.getAttributeModifiers();
+        if (par2 && this.isItemDamaged()) {
-
-        if (!var15.isEmpty())
-        {
-            var3.add("");
-            Iterator var17 = var15.entries().iterator();
-
-            while (var17.hasNext())
-            {
-                Entry var19 = (Entry)var17.next();
-                AttributeModifier var21 = (AttributeModifier)var19.getValue();
-                double var10 = var21.getAmount();
-                double var12;
-
-                if (var21.getOperation() != 1 && var21.getOperation() != 2)
-                {
-                    var12 = var21.getAmount();
-                }
-                else
-                {
-                    var12 = var21.getAmount() * 100.0D;
-                }
-
-                if (var10 > 0.0D)
-                {
-                    var3.add(EnumChatFormatting.BLUE + StatCollector.translateToLocalFormatted("attribute.modifier.plus." + var21.getOperation(), new Object[] {field_111284_a.format(var12), StatCollector.translateToLocal("attribute.name." + (String)var19.getKey())}));
-                }
-                else if (var10 < 0.0D)
-                {
-                    var12 *= -1.0D;
-                    var3.add(EnumChatFormatting.RED + StatCollector.translateToLocalFormatted("attribute.modifier.take." + var21.getOperation(), new Object[] {field_111284_a.format(var12), StatCollector.translateToLocal("attribute.name." + (String)var19.getKey())}));
-                }
-            }
-        }
-
-        if (par2 && this.isItemDamaged())
-        {
             var3.add("Durability: " + (this.getMaxDamage() - this.getItemDamageForDisplay()) + " / " + this.getMaxDamage());
         }
 
@@ -819,35 +760,4 @@ public final class ItemStack
         this.stackTagCompound.setInteger("RepairCost", par1);
     }
 
-    /**
-     * Gets the attribute modifiers for this ItemStack.\nWill check for an NBT tag list containing modifiers for the
-     * stack.
-     */
-    public Multimap getAttributeModifiers()
-    {
-        Object var1;
-
-        if (this.hasTagCompound() && this.stackTagCompound.hasKey("AttributeModifiers"))
-        {
-            var1 = HashMultimap.create();
-            NBTTagList var2 = this.stackTagCompound.getTagList("AttributeModifiers");
-
-            for (int var3 = 0; var3 < var2.tagCount(); ++var3)
-            {
-                NBTTagCompound var4 = (NBTTagCompound)var2.tagAt(var3);
-                AttributeModifier var5 = SharedMonsterAttributes.func_111259_a(var4);
-
-                if (var5.getID().getLeastSignificantBits() != 0L && var5.getID().getMostSignificantBits() != 0L)
-                {
-                    ((Multimap)var1).put(var4.getString("AttributeName"), var5);
-                }
-            }
-        }
-        else
-        {
-            var1 = this.getItem().getItemAttributeModifiers();
-        }
-
-        return (Multimap)var1;
-    }
 }

src/main/java/net/minecraft/src/ItemSword.java

@@ -1,7 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Multimap;
-
 public class ItemSword extends Item
 {
     private float weaponDamage;
@@ -124,13 +122,4 @@ public class ItemSword extends Item
         return this.toolMaterial.getToolCraftingMaterial() == par2ItemStack.itemID ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
     }
 
-    /**
-     * Gets a map of item attribute modifiers, used by ItemSword to increase hit damage.
-     */
-    public Multimap getItemAttributeModifiers()
-    {
-        Multimap var1 = super.getItemAttributeModifiers();
-        var1.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", (double)this.weaponDamage, 0));
-        return var1;
-    }
 }

src/main/java/net/minecraft/src/ItemTool.java

@@ -1,7 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Multimap;
-
 public class ItemTool extends Item
 {
     /** Array of blocks the tool has extra effect against. */
@@ -95,13 +93,4 @@ public class ItemTool extends Item
         return this.toolMaterial.getToolCraftingMaterial() == par2ItemStack.itemID ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
     }
 
-    /**
-     * Gets a map of item attribute modifiers, used by ItemSword to increase hit damage.
-     */
-    public Multimap getItemAttributeModifiers()
-    {
-        Multimap var1 = super.getItemAttributeModifiers();
-        var1.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Tool modifier", (double)this.damageVsEntity, 0));
-        return var1;
-    }
 }

src/main/java/net/minecraft/src/LanguageMetadataSectionSerializer.java

@@ -1,6 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Sets;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -15,7 +14,7 @@ public class LanguageMetadataSectionSerializer extends BaseMetadataSectionSerial
     public LanguageMetadataSection func_135020_a(JsonElement par1JsonElement, Type par2Type, JsonDeserializationContext par3JsonDeserializationContext)
     {
         JsonObject var4 = par1JsonElement.getAsJsonObject();
-        HashSet var5 = Sets.newHashSet();
+        HashSet var5 = new HashSet<>();
         Iterator var6 = var4.entrySet().iterator();
         String var8;
         String var11;

src/main/java/net/minecraft/src/LayeredTexture.java

@@ -1,12 +1,12 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Lists;
 import net.lax1dude.eaglercraft.TextureLocation;
 
 import java.awt.image.BufferedImage;
 import java.awt.image.ImageObserver;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import javax.imageio.ImageIO;
@@ -17,7 +17,7 @@ public class LayeredTexture extends AbstractTexture
 
     public LayeredTexture(String ... par1ArrayOfStr)
     {
-        this.layeredTextureNames = Lists.newArrayList(par1ArrayOfStr);
+        this.layeredTextureNames = new ArrayList<>(List.of(par1ArrayOfStr));
     }
 
     public void loadTexture(ResourceManager par1ResourceManager) throws IOException

src/main/java/net/minecraft/src/MessageComponentSerializer.java

@@ -1,6 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Lists;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -94,7 +93,7 @@ public class MessageComponentSerializer implements JsonDeserializer, JsonSeriali
             {
                 if (var18.isJsonArray())
                 {
-                    ArrayList var19 = Lists.newArrayList();
+                    ArrayList var19 = new ArrayList<>();
                     Iterator var20 = var18.getAsJsonArray().iterator();
 
                     while (var20.hasNext())

src/main/java/net/minecraft/src/ModifiableAttributeInstance.java

@@ -1,21 +1,14 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Maps;
+import java.util.*;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
 
 public class ModifiableAttributeInstance implements AttributeInstance
 {
     private final BaseAttributeMap field_111138_a;
     private final Attribute field_111136_b;
-    private final Map field_111137_c = Maps.newHashMap();
+    private final Map field_111137_c = new HashMap<>();
-    private final Map field_111134_d = Maps.newHashMap();
+    private final Map field_111134_d = new HashMap<>();
-    private final Map field_111135_e = Maps.newHashMap();
+    private final Map field_111135_e = new HashMap<>();
     private double baseValue;
     private boolean field_111133_g = true;
     private double field_111139_h;

src/main/java/net/minecraft/src/NetClientHandler.java

@@ -1,6 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.base.Charsets;
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -138,7 +137,7 @@ public class NetClientHandler extends NetHandler
         this.currentServerMaxPlayers = par1Packet1Login.maxPlayers;
         this.mc.playerController.setGameType(par1Packet1Login.gameType);
         this.mc.gameSettings.sendSettingsToServer();
-        this.netManager.addToSendQueue(new Packet250CustomPayload("MC|Brand", ClientBrandRetriever.getClientModName().getBytes(Charsets.UTF_8)));
+        //this.netManager.addToSendQueue(new Packet250CustomPayload("MC|Brand", ClientBrandRetriever.getClientModName().getBytes(Charsets.UTF_8)));
     }
 
     public void handleVehicleSpawn(Packet23VehicleSpawn par1Packet23VehicleSpawn)

src/main/java/net/minecraft/src/Potion.java

@@ -1,6 +1,6 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Maps;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.UUID;
@@ -65,7 +65,7 @@ public class Potion
 
     /** The Id of a Potion object. */
     public final int id;
-    private final Map field_111188_I = Maps.newHashMap();
+    private final Map field_111188_I = new HashMap<>();
 
     /**
      * This field indicated if the effect is 'bad' - negative - for the entity.

src/main/java/net/minecraft/src/RegistrySimple.java

@@ -1,6 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Maps;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -11,7 +10,7 @@ public class RegistrySimple implements IRegistry
 
     protected HashMap func_111054_a()
     {
-        return Maps.newHashMap();
+        return new HashMap<>();
     }
 
     public Object getObject(Object par1Obj)

src/main/java/net/minecraft/src/RenderBiped.java

@@ -1,6 +1,6 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Maps;
+import java.util.HashMap;
 import java.util.Map;
 
 import net.lax1dude.eaglercraft.TextureLocation;
@@ -12,7 +12,7 @@ public class RenderBiped extends RenderLiving
     protected float field_77070_b;
     protected ModelBiped field_82423_g;
     protected ModelBiped field_82425_h;
-    private static final Map field_110859_k = Maps.newHashMap();
+    private static final Map field_110859_k = new HashMap<>();
 
     /** List of armor texture filenames. */
     private static final String[] bipedArmorFilenamePrefix = new String[] {"leather", "chainmail", "iron", "diamond", "gold"};

src/main/java/net/minecraft/src/RenderHorse.java

@@ -1,6 +1,6 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Maps;
+import java.util.HashMap;
 import java.util.Map;
 
 import net.lax1dude.eaglercraft.TextureLocation;
@@ -8,7 +8,7 @@ import net.lax1dude.eaglercraft.EaglerAdapter;
 
 public class RenderHorse extends RenderLiving
 {
-    private static final Map field_110852_a = Maps.newHashMap();
+    private static final Map field_110852_a = new HashMap<>();
     private static final TextureLocation whiteHorseTextures = new TextureLocation("textures/entity/horse/horse_white.png");
     private static final TextureLocation muleTextures = new TextureLocation("textures/entity/horse/mule.png");
     private static final TextureLocation donkeyTextures = new TextureLocation("textures/entity/horse/donkey.png");

src/main/java/net/minecraft/src/ResourcePackRepository.java

@@ -1,7 +1,6 @@
 package net.minecraft.src;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
 import java.io.File;
 import java.io.FileFilter;
 import java.util.ArrayList;
@@ -16,8 +15,8 @@ public class ResourcePackRepository
     private final File dirResourcepacks;
     public final ResourcePack rprDefaultResourcePack;
     public final MetadataSerializer rprMetadataSerializer;
-    private List repositoryEntriesAll = Lists.newArrayList();
+    private List repositoryEntriesAll = new ArrayList<>();
-    private List repositoryEntries = Lists.newArrayList();
+    private List repositoryEntries = new ArrayList<>();
 
     public ResourcePackRepository(File par1File, ResourcePack par2ResourcePack, MetadataSerializer par3MetadataSerializer, GameSettings par4GameSettings)
     {
@@ -55,7 +54,7 @@ public class ResourcePackRepository
 
     public void updateRepositoryEntriesAll()
     {
-        ArrayList var1 = Lists.newArrayList();
+        ArrayList var1 = new ArrayList<>();
         Iterator var2 = this.getResourcePackFiles().iterator();
 
         while (var2.hasNext())

src/main/java/net/minecraft/src/ServerConfigurationManager.java

@@ -1,6 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.base.Charsets;
 import java.io.File;
 import java.net.SocketAddress;
 import java.text.SimpleDateFormat;
@@ -79,7 +78,7 @@ public abstract class ServerConfigurationManager
         this.func_72381_a(par2EntityPlayerMP, (EntityPlayerMP)null, var5);
         NetServerHandler var7 = new NetServerHandler(this.mcServer, par1INetworkManager, par2EntityPlayerMP);
         var7.sendPacketToPlayer(new Packet1Login(par2EntityPlayerMP.entityId, var5.getWorldInfo().getTerrainType(), par2EntityPlayerMP.theItemInWorldManager.getGameType(), var5.getWorldInfo().isHardcoreModeEnabled(), var5.provider.dimensionId, var5.difficultySetting, var5.getHeight(), this.getMaxPlayers()));
-        var7.sendPacketToPlayer(new Packet250CustomPayload("MC|Brand", this.getServerInstance().getServerModName().getBytes(Charsets.UTF_8)));
+        //var7.sendPacketToPlayer(new Packet250CustomPayload("MC|Brand", this.getServerInstance().getServerModName().getBytes(Charset.UTF_8)));
         var7.sendPacketToPlayer(new Packet6SpawnPosition(var6.posX, var6.posY, var6.posZ));
         var7.sendPacketToPlayer(new Packet202PlayerAbilities(par2EntityPlayerMP.capabilities));
         var7.sendPacketToPlayer(new Packet16BlockItemSwitch(par2EntityPlayerMP.inventory.currentItem));

src/main/java/net/minecraft/src/ServersideAttributeMap.java

@@ -1,6 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Sets;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -9,7 +8,7 @@ import java.util.Set;
 
 public class ServersideAttributeMap extends BaseAttributeMap
 {
-    private final Set field_111162_d = Sets.newHashSet();
+    private final Set field_111162_d = new HashSet<>();
     protected final Map field_111163_c = new LowerStringMap();
 
     public ModifiableAttributeInstance func_111159_c(Attribute par1Attribute)
@@ -65,7 +64,7 @@ public class ServersideAttributeMap extends BaseAttributeMap
 
     public Collection func_111160_c()
     {
-        HashSet var1 = Sets.newHashSet();
+        HashSet var1 = new HashSet<>();
         Iterator var2 = this.getAllAttributes().iterator();
 
         while (var2.hasNext())

src/main/java/net/minecraft/src/SimpleResource.java

@@ -1,11 +1,11 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Maps;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.HashMap;
 import java.util.Map;
 
 import net.lax1dude.eaglercraft.TextureLocation;
@@ -13,7 +13,7 @@ import org.apache.commons.io.IOUtils;
 
 public class SimpleResource implements Resource
 {
-    private final Map mapMetadataSections = Maps.newHashMap();
+    private final Map mapMetadataSections = new HashMap<>();
     private final TextureLocation srTextureLocation;
     private final InputStream resourceInputStream;
     private final InputStream mcmetaInputStream;

src/main/java/net/minecraft/src/SoundPool.java

@@ -1,12 +1,11 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import net.lax1dude.eaglercraft.TextureLocation;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import net.lax1dude.eaglercraft.EaglercraftRandom;
@@ -19,7 +18,7 @@ public class SoundPool
     /**
      * Maps a name (can be sound/newsound/streaming/music/newmusic) to a list of SoundPoolEntry's.
      */
-    private final Map nameToSoundPoolEntriesMapping = Maps.newHashMap();
+    private final Map nameToSoundPoolEntriesMapping = new HashMap<>();
     private final ResourceManager soundResourceManager;
     private final String soundType;
     private final boolean isGetRandomSound;
@@ -54,7 +53,7 @@ public class SoundPool
 
             if (var3 == null)
             {
-                var3 = Lists.newArrayList();
+                var3 = new ArrayList<>();
                 this.nameToSoundPoolEntriesMapping.put(par1Str, var3);
             }
 
@@ -95,7 +94,7 @@ public class SoundPool
         }
         else
         {
-            ArrayList var1 = Lists.newArrayList(this.nameToSoundPoolEntriesMapping.keySet());
+            ArrayList var1 = new ArrayList<>(this.nameToSoundPoolEntriesMapping.keySet());
             return this.getRandomSoundFromSoundPool((String)var1.get(this.rand.nextInt(var1.size())));
         }
     }

src/main/java/net/minecraft/src/TextureAtlasSprite.java

@@ -1,6 +1,5 @@
 package net.minecraft.src;
 
-import com.google.common.collect.Lists;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
@@ -12,7 +11,7 @@ import javax.imageio.ImageIO;
 public class TextureAtlasSprite implements Icon
 {
     private final String iconName;
-    protected List framesTextureData = Lists.newArrayList();
+    protected List framesTextureData = new ArrayList<>();
     private AnimationMetadataSection animationMetadata;
     protected boolean rotated;
     protected int originX;
@@ -232,7 +231,7 @@ public class TextureAtlasSprite implements Icon
             }
             else
             {
-                ArrayList var11 = Lists.newArrayList();
+                ArrayList var11 = new ArrayList<>();
 
                 for (var10 = 0; var10 < var6; ++var10)
                 {
@@ -281,7 +280,7 @@ public class TextureAtlasSprite implements Icon
     private void resetSprite()
     {
         this.animationMetadata = null;
-        this.setFramesTextureData(Lists.newArrayList());
+        this.setFramesTextureData(new ArrayList<>());
         this.frameCounter = 0;
         this.tickCounter = 0;
     }