xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Make configurable messages, close #244

Browse Source
This commit is contained in:
Sergey Shatunov
2016-01-05 13:54:34 +07:00
parent 955af15697
commit 0aad7977fc
5 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/net/minecraft/server/management/ServerConfigurationManager.java.patch
View File

@ -294,7 +294,21 @@
}
public String allowUserToConnect(SocketAddress p_148542_1_, GameProfile p_148542_2_)
@@ -372,6 +516,71 @@
@@ -352,7 +496,7 @@
}
else if (!this.func_152607_e(p_148542_2_))
{
- return "You are not white-listed on this server!";
+ return org.spigotmc.SpigotConfig.whitelistMessage;
}
else if (this.bannedIPs.func_152708_a(p_148542_1_))
{
@@ -368,10 +512,75 @@
}
else
{
- return this.playerEntityList.size() >= this.maxPlayers ? "The server is full!" : null;
+ return this.playerEntityList.size() >= this.maxPlayers ? org.spigotmc.SpigotConfig.serverFullMessage : null;
}
}

16
patches/net/minecraft/server/network/NetHandlerHandshakeTCP.java.patch
View File

@ -33,7 +33,7 @@
private final MinecraftServer field_147387_a;
private final NetworkManager field_147386_b;
private static final String __OBFID = "CL_00001456";
@@ -39,6 +56,52 @@
@@ -39,21 +56,94 @@
this.field_147386_b.setConnectionState(EnumConnectionState.LOGIN);
ChatComponentText chatcomponenttext;
@ -85,8 +85,18 @@
+
if (p_147383_1_.func_149595_d() > 5)
{
chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.7.10");
@@ -54,6 +117,33 @@
- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.7.10");
+ chatcomponenttext = new ChatComponentText(java.text.MessageFormat.format(org.spigotmc.SpigotConfig.outdatedServerMessage, "1.7.10"));
this.field_147386_b.scheduleOutboundPacket(new S00PacketDisconnect(chatcomponenttext), new GenericFutureListener[0]);
this.field_147386_b.closeChannel(chatcomponenttext);
}
else if (p_147383_1_.func_149595_d() < 5)
{
- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.7.10");
+ chatcomponenttext = new ChatComponentText(java.text.MessageFormat.format(org.spigotmc.SpigotConfig.outdatedClientMessage, "1.7.10"));
this.field_147386_b.scheduleOutboundPacket(new S00PacketDisconnect(chatcomponenttext), new GenericFutureListener[0]);
this.field_147386_b.closeChannel(chatcomponenttext);
}
else
{
this.field_147386_b.setNetHandler(new NetHandlerLoginServer(this.field_147387_a, this.field_147386_b));

4
patches/net/minecraftforge/oredict/OreDictionary.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraftforge/oredict/OreDictionary.java
+++ ../src-work/minecraft/net/minecraftforge/oredict/OreDictionary.java
@@ -216,7 +216,7 @@
@@ -221,7 +221,7 @@
{
ShapedRecipes recipe = (ShapedRecipes)obj;
ItemStack output = recipe.getRecipeOutput();
@ -9,7 +9,7 @@
{
continue;
}
@@ -231,7 +231,7 @@
@@ -236,7 +236,7 @@
{
ShapelessRecipes recipe = (ShapelessRecipes)obj;
ItemStack output = recipe.getRecipeOutput();