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

Fixup Jline integration

Browse source
This commit is contained in:
cpw 2015-11-30 14:14:03 -05:00
parent 321665efff
commit cf4c0ca001
6 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
jsons/1.8.8-dev.json
View file

@ -8,6 +8,11 @@
{
"name": "net.minecraft:launchwrapper:1.12"
},
{
"name": "jline:jline:2.13",
"children": ["sources"],
"url" : "http://repo.maven.apache.org/maven2"
},
{
"name": "com.google.code.findbugs:jsr305:1.3.9",
"children": ["sources"],

7
jsons/1.8.8-rel.json
View file

@ -39,6 +39,13 @@
"name": "org.ow2.asm:asm-all:5.0.3",
"serverreq":true
},
{
"name": "jline:jline:2.13",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "2d9530d0a25daffaffda7c35037b046b627bb171" ],
"serverreq":true,
"clientreq":false
},
{
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
"url" : "http://files.minecraftforge.net/maven/",

16
patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch
View file

@ -8,15 +8,15 @@
public DedicatedServer(File p_i1508_1_)
{
@@ -88,6 +89,7 @@
@@ -82,6 +83,7 @@
{
public void run()
{
+ if (net.minecraftforge.server.console.TerminalHandler.handleCommands(DedicatedServer.this)) return;
BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(System.in));
String s4;
@@ -107,6 +108,8 @@
@@ -107,6 +109,8 @@
field_155771_h.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
}
@ -25,7 +25,7 @@
field_155771_h.info("Loading properties");
this.field_71340_o = new PropertyManager(new File("server.properties"));
this.field_154332_n = new ServerEula(new File("eula.txt"));
@@ -198,6 +201,7 @@
@@ -198,6 +202,7 @@
}
else
{
@ -33,7 +33,7 @@
this.func_152361_a(new DedicatedPlayerList(this));
long j = System.nanoTime();
@@ -244,6 +248,7 @@
@@ -244,6 +249,7 @@
this.func_71191_d((this.func_71207_Z() + 8) / 16 * 16);
this.func_71191_d(MathHelper.func_76125_a(this.func_71207_Z(), 64, 256));
this.field_71340_o.func_73667_a("max-build-height", Integer.valueOf(this.func_71207_Z()));
@ -41,7 +41,7 @@
field_155771_h.info("Preparing level \"" + this.func_71270_I() + "\"");
this.func_71247_a(this.func_71270_I(), this.func_71270_I(), k, worldtype, s2);
long i1 = System.nanoTime() - j;
@@ -272,7 +277,7 @@
@@ -272,7 +278,7 @@
thread1.start();
}
@ -50,7 +50,3 @@
}
}
}
+ public void func_145747_a(net.minecraft.util.IChatComponent message) { field_155771_h.info(message.func_150254_d()); }
public void func_71235_a(WorldSettings.GameType p_71235_1_)
{

2
patches/minecraft/net/minecraft/util/ChatComponentStyle.java.patch
View file

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/util/ChatComponentStyle.java
+++ ../src-work/minecraft/net/minecraft/util/ChatComponentStyle.java
@@ -81,7 +81,6 @@
@@ -74,7 +74,6 @@
return stringbuilder.toString();
}

2
patches/minecraft/net/minecraft/util/ChatStyle.java.patch
View file

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/util/ChatStyle.java
+++ ../src-work/minecraft/net/minecraft/util/ChatStyle.java
@@ -230,7 +230,6 @@
@@ -229,7 +229,6 @@
return this;
}

4
patches/minecraft/net/minecraft/util/IChatComponent.java.patch
View file

@ -1,10 +1,10 @@
--- ../src-base/minecraft/net/minecraft/util/IChatComponent.java
+++ ../src-work/minecraft/net/minecraft/util/IChatComponent.java
@@ -32,7 +32,6 @@
@@ -31,7 +31,6 @@
String func_150260_c();
- @SideOnly(Side.CLIENT)
String func_150254_d();
List func_150253_a();
List<IChatComponent> func_150253_a();