keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix mcp_snapshot mapping issue causing unneeded patches. Closes #7424

Browse source
This commit is contained in:
LexManos 2020-10-20 12:32:19 -07:00
parent 395f89c973
commit 74f9ef838a
6 changed files with 1 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -53,7 +53,7 @@ ext {
] ]
} }
MAPPING_CHANNEL = 'snapshot' MAPPING_CHANNEL = 'snapshot'
MAPPING_VERSION = '20200514-1.16' MAPPING_VERSION = '20200514-1.16.3'
MC_VERSION = '1.16.3' MC_VERSION = '1.16.3'
MCP_VERSION = '20200911.084530' MCP_VERSION = '20200911.084530'
} }

13
patches/minecraft/net/minecraft/entity/monster/HoglinEntity.java.patch
View file

@ -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() {

18
patches/minecraft/net/minecraft/entity/passive/AnimalEntity.java.patch
View file

@ -1,23 +1,5 @@
--- a/net/minecraft/entity/passive/AnimalEntity.java --- a/net/minecraft/entity/passive/AnimalEntity.java
+++ b/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 @@ @@ -199,6 +199,17 @@
public void func_234177_a_(ServerWorld p_234177_1_, AnimalEntity p_234177_2_) { public void func_234177_a_(ServerWorld p_234177_1_, AnimalEntity p_234177_2_) {

11
patches/minecraft/net/minecraft/entity/passive/PandaEntity.java.patch
View file

@ -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 {

13
patches/minecraft/net/minecraft/entity/passive/TurtleEntity.java.patch
View file

@ -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() {

11
patches/minecraft/net/minecraft/entity/passive/horse/LlamaEntity.java.patch
View file

@ -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_);
}