From 74f9ef838a53acb1e7d3d09622b604d96cf02221 Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 20 Oct 2020 12:32:19 -0700 Subject: [PATCH] Fix mcp_snapshot mapping issue causing unneeded patches. Closes #7424 --- build.gradle | 2 +- .../entity/monster/HoglinEntity.java.patch | 13 ------------- .../entity/passive/AnimalEntity.java.patch | 18 ------------------ .../entity/passive/PandaEntity.java.patch | 11 ----------- .../entity/passive/TurtleEntity.java.patch | 13 ------------- .../passive/horse/LlamaEntity.java.patch | 11 ----------- 6 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 patches/minecraft/net/minecraft/entity/monster/HoglinEntity.java.patch delete mode 100644 patches/minecraft/net/minecraft/entity/passive/PandaEntity.java.patch delete mode 100644 patches/minecraft/net/minecraft/entity/passive/TurtleEntity.java.patch delete mode 100644 patches/minecraft/net/minecraft/entity/passive/horse/LlamaEntity.java.patch diff --git a/build.gradle b/build.gradle index 02c558f4d..cee2186f7 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ ext { ] } MAPPING_CHANNEL = 'snapshot' - MAPPING_VERSION = '20200514-1.16' + MAPPING_VERSION = '20200514-1.16.3' MC_VERSION = '1.16.3' MCP_VERSION = '20200911.084530' } diff --git a/patches/minecraft/net/minecraft/entity/monster/HoglinEntity.java.patch b/patches/minecraft/net/minecraft/entity/monster/HoglinEntity.java.patch deleted file mode 100644 index 2a9a9c975..000000000 --- a/patches/minecraft/net/minecraft/entity/monster/HoglinEntity.java.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/net/minecraft/entity/monster/HoglinEntity.java -+++ b/net/minecraft/entity/monster/HoglinEntity.java -@@ -279,8 +279,8 @@ - return hoglinentity; - } - -- public boolean func_204701_dC() { -- return !HoglinTasks.func_234386_c_(this) && super.func_204701_dC(); -+ public boolean func_213743_em() { -+ return !HoglinTasks.func_234386_c_(this) && super.func_213743_em(); - } - - public SoundCategory func_184176_by() { diff --git a/patches/minecraft/net/minecraft/entity/passive/AnimalEntity.java.patch b/patches/minecraft/net/minecraft/entity/passive/AnimalEntity.java.patch index 151adbb93..eba1846f4 100644 --- a/patches/minecraft/net/minecraft/entity/passive/AnimalEntity.java.patch +++ b/patches/minecraft/net/minecraft/entity/passive/AnimalEntity.java.patch @@ -1,23 +1,5 @@ --- a/net/minecraft/entity/passive/AnimalEntity.java +++ b/net/minecraft/entity/passive/AnimalEntity.java -@@ -121,7 +121,7 @@ - ItemStack itemstack = p_230254_1_.func_184586_b(p_230254_2_); - if (this.func_70877_b(itemstack)) { - int i = this.func_70874_b(); -- if (!this.field_70170_p.field_72995_K && i == 0 && this.func_204701_dC()) { -+ if (!this.field_70170_p.field_72995_K && i == 0 && this.func_213743_em()) { - this.func_175505_a(p_230254_1_, itemstack); - this.func_146082_f(p_230254_1_); - return ActionResultType.SUCCESS; -@@ -148,7 +148,7 @@ - - } - -- public boolean func_204701_dC() { -+ public boolean func_213743_em() { - return this.field_70881_d <= 0; - } - @@ -199,6 +199,17 @@ public void func_234177_a_(ServerWorld p_234177_1_, AnimalEntity p_234177_2_) { diff --git a/patches/minecraft/net/minecraft/entity/passive/PandaEntity.java.patch b/patches/minecraft/net/minecraft/entity/passive/PandaEntity.java.patch deleted file mode 100644 index 0c20b7ec1..000000000 --- a/patches/minecraft/net/minecraft/entity/passive/PandaEntity.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/minecraft/entity/passive/PandaEntity.java -+++ b/net/minecraft/entity/passive/PandaEntity.java -@@ -586,7 +586,7 @@ - if (this.func_70631_g_()) { - this.func_175505_a(p_230254_1_, itemstack); - this.func_175501_a((int)((float)(-this.func_70874_b() / 20) * 0.1F), true); -- } else if (!this.field_70170_p.field_72995_K && this.func_70874_b() == 0 && this.func_204701_dC()) { -+ } else if (!this.field_70170_p.field_72995_K && this.func_70874_b() == 0 && this.func_213743_em()) { - this.func_175505_a(p_230254_1_, itemstack); - this.func_146082_f(p_230254_1_); - } else { diff --git a/patches/minecraft/net/minecraft/entity/passive/TurtleEntity.java.patch b/patches/minecraft/net/minecraft/entity/passive/TurtleEntity.java.patch deleted file mode 100644 index 697a7a64c..000000000 --- a/patches/minecraft/net/minecraft/entity/passive/TurtleEntity.java.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/net/minecraft/entity/passive/TurtleEntity.java -+++ b/net/minecraft/entity/passive/TurtleEntity.java -@@ -235,8 +235,8 @@ - this.func_184185_a(soundevent, 0.15F, 1.0F); - } - -- public boolean func_204701_dC() { -- return super.func_204701_dC() && !this.func_203020_dx(); -+ public boolean func_213743_em() { -+ return super.func_213743_em() && !this.func_203020_dx(); - } - - protected float func_203009_ad() { diff --git a/patches/minecraft/net/minecraft/entity/passive/horse/LlamaEntity.java.patch b/patches/minecraft/net/minecraft/entity/passive/horse/LlamaEntity.java.patch deleted file mode 100644 index bbd88ed1c..000000000 --- a/patches/minecraft/net/minecraft/entity/passive/horse/LlamaEntity.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/net/minecraft/entity/passive/horse/LlamaEntity.java -+++ b/net/minecraft/entity/passive/horse/LlamaEntity.java -@@ -181,7 +181,7 @@ - i = 90; - j = 6; - f = 10.0F; -- if (this.func_110248_bS() && this.func_70874_b() == 0 && this.func_204701_dC()) { -+ if (this.func_110248_bS() && this.func_70874_b() == 0 && this.func_213743_em()) { - flag = true; - this.func_146082_f(p_190678_1_); - }