From d769d83224296d7910d7f1092759fa1773441102 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 24 Jun 2017 00:56:21 -0700 Subject: [PATCH] Update MCP to 20170624 --- build.gradle | 2 +- .../net/minecraftforge/common/crafting/CraftingHelper.java | 6 +++--- .../event/entity/living/BabyEntitySpawnEvent.java | 4 ++-- .../minecraftforge/fml/client/config/GuiConfigEntries.java | 2 +- .../fml/client/config/GuiEditArrayEntries.java | 2 +- .../fml/client/config/GuiSelectStringEntries.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 5b22a176d6..b73f01d055 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ apply plugin: "net.minecraftforge.gradle.launch4j" minecraft.version = "1.12" minecraft { - mappings = 'snapshot_nodoc_20170617' + mappings = 'snapshot_nodoc_20170624' workspaceDir = "projects" versionJson = "jsons/${minecraft.version}-dev.json" buildUserdev = true diff --git a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java index 9e9f1b77b3..0dc77d6061 100644 --- a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java +++ b/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); diff --git a/src/main/java/net/minecraftforge/event/entity/living/BabyEntitySpawnEvent.java b/src/main/java/net/minecraftforge/event/entity/living/BabyEntitySpawnEvent.java index b7982640e3..310cf436b0 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/BabyEntitySpawnEvent.java +++ b/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; diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java b/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java index 7e0e0c71b9..493f65ff8c 100644 --- a/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java +++ b/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() diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java b/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java index 260b2b7c8c..ccde2d3aa5 100644 --- a/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java +++ b/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 diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiSelectStringEntries.java b/src/main/java/net/minecraftforge/fml/client/config/GuiSelectStringEntries.java index bb498cfa0f..23a6b4e097 100644 --- a/src/main/java/net/minecraftforge/fml/client/config/GuiSelectStringEntries.java +++ b/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