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

Fix a small patch misalignment.

Browse source
This commit is contained in:
LexManos 2020-02-03 13:21:18 -08:00
parent 1f46169e1e
commit 982ed69776
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -210,7 +210,7 @@ project(':forge') {
MCP_ARTIFACT = project(':mcp').mcp.config MCP_ARTIFACT = project(':mcp').mcp.config
SPECIAL_SOURCE = 'net.md-5:SpecialSource:1.8.5' SPECIAL_SOURCE = 'net.md-5:SpecialSource:1.8.5'
VERSION_JSON = project(':mcp').file('build/mcp/downloadJson/version.json') VERSION_JSON = project(':mcp').file('build/mcp/downloadJson/version.json')
BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.0.7:fatjar' BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.0.12:fatjar'
} }
def getVersion = { def getVersion = {

18
patches/minecraft/net/minecraft/client/Minecraft.java.patch
View file

@ -302,13 +302,7 @@
WorkingScreen workingscreen = new WorkingScreen(); WorkingScreen workingscreen = new WorkingScreen();
workingscreen.func_200210_a(new TranslationTextComponent("connect.joining")); workingscreen.func_200210_a(new TranslationTextComponent("connect.joining"));
this.func_213241_c(workingscreen); this.func_213241_c(workingscreen);
@@ -1608,15 +1665,18 @@ @@ -1613,10 +1670,12 @@
if (clientplaynethandler != null) {
this.func_213159_be();
clientplaynethandler.func_147296_c();
+ net.minecraftforge.client.MinecraftForgeClient.clearRenderCache();
}
IntegratedServer integratedserver = this.field_71437_Z; IntegratedServer integratedserver = this.field_71437_Z;
this.field_71437_Z = null; this.field_71437_Z = null;
this.field_71460_t.func_190564_k(); this.field_71460_t.func_190564_k();
@ -321,7 +315,7 @@
if (integratedserver != null) { if (integratedserver != null) {
while(!integratedserver.func_213201_w()) { while(!integratedserver.func_213201_w()) {
this.func_195542_b(false); this.func_195542_b(false);
@@ -1627,6 +1687,7 @@ @@ -1627,6 +1686,7 @@
this.field_71456_v.func_181029_i(); this.field_71456_v.func_181029_i();
this.field_71422_O = null; this.field_71422_O = null;
this.field_71455_al = false; this.field_71455_al = false;
@ -329,6 +323,14 @@
this.field_213274_aO.func_216815_b(); this.field_213274_aO.func_216815_b();
} }
@@ -1649,6 +1709,7 @@
this.field_71452_i.func_78870_a(p_213257_1_);
TileEntityRendererDispatcher.field_147556_a.func_147543_a(p_213257_1_);
this.func_230150_b_();
+ net.minecraftforge.client.MinecraftForgeClient.clearRenderCache();
}
public final boolean func_71355_q() {
@@ -1674,112 +1735,9 @@ @@ -1674,112 +1735,9 @@
private void func_147112_ai() { private void func_147112_ai() {