Update MCP to 20170624

src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java

@@ -633,7 +633,7 @@ public class CraftingHelper {
             if (fPath != null && Files.exists(fPath))
             {
                 reader = Files.newBufferedReader(fPath);
-                JsonObject json = JsonUtils.func_193839_a(GSON, reader, JsonObject.class);
+                JsonObject json = JsonUtils.fromJson(GSON, reader, JsonObject.class);
                 loadFactories(json, ctx);
             }
         }
@@ -699,7 +699,7 @@ public class CraftingHelper {
                 try
                 {
                     reader = Files.newBufferedReader(fPath);
-                    JsonObject[] json = JsonUtils.func_193839_a(GSON, reader, JsonObject[].class);
+                    JsonObject[] json = JsonUtils.fromJson(GSON, reader, JsonObject[].class);
                     ctx.loadConstants(json);
                 }
                 catch (IOException e)
@@ -734,7 +734,7 @@ public class CraftingHelper {
                 try
                 {
                     reader = Files.newBufferedReader(f);
-                    JsonObject json = JsonUtils.func_193839_a(GSON, reader, JsonObject.class);
+                    JsonObject json = JsonUtils.fromJson(GSON, reader, JsonObject.class);
                     if (json.has("conditions") && !CraftingHelper.processConditions(json.getAsJsonArray("conditions"), ctx))
                         continue;
                     IRecipe recipe = CraftingHelper.getRecipe(json, ctx);

src/main/java/net/minecraftforge/event/entity/living/BabyEntitySpawnEvent.java

@@ -62,12 +62,12 @@ public class BabyEntitySpawnEvent extends Event
         //causedByPlayer calculated here to simplify the patch.
         EntityPlayer causedByPlayer = null;
         if (parentA instanceof EntityAnimal) {
-            causedByPlayer = ((EntityAnimal)parentA).func_191993_do();
+            causedByPlayer = ((EntityAnimal)parentA).getLoveCause();
         }
 
         if (causedByPlayer == null && parentB instanceof EntityAnimal)
         {
-            causedByPlayer = ((EntityAnimal)parentB).func_191993_do();
+            causedByPlayer = ((EntityAnimal)parentB).getLoveCause();
         }
 
         this.parentA = parentA;

src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java

@@ -1624,7 +1624,7 @@ public class GuiConfigEntries extends GuiListExtended
         public abstract boolean saveConfigElement();
 
         @Override
-        public void func_192633_a(int p_178011_1_, int p_178011_2_, int p_178011_3_, float partial){}
+        public void updatePosition(int p_178011_1_, int p_178011_2_, int p_178011_3_, float partial){}
 
         @Override
         public boolean enabled()

src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java

@@ -687,7 +687,7 @@ public class GuiEditArrayEntries extends GuiListExtended
         }
 
         @Override
-        public void func_192633_a(int p_178011_1_, int p_178011_2_, int p_178011_3_, float partial){}
+        public void updatePosition(int p_178011_1_, int p_178011_2_, int p_178011_3_, float partial){}
     }
 
     public static interface IArrayEntry extends GuiListExtended.IGuiListEntry

src/main/java/net/minecraftforge/fml/client/config/GuiSelectStringEntries.java

@@ -195,7 +195,7 @@ public class GuiSelectStringEntries extends GuiListExtended
         }
 
         @Override
-        public void func_192633_a(int p_192633_1_, int p_192633_2_, int p_192633_3_, float p_192633_4_){}
+        public void updatePosition(int p_192633_1_, int p_192633_2_, int p_192633_3_, float p_192633_4_){}
     }
 
     public static interface IGuiSelectStringListEntry extends GuiListExtended.IGuiListEntry