From 08a636c34f1b0c1be506244036cd7040d7662b92 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 18 Feb 2014 21:03:41 -0500 Subject: [PATCH] Update Forge for patch changes MinecraftForge/FML@064b66af3d6c92b19821b88ec26cbb59577d68b4 Prevent players from logging in until server has finished starting. MinecraftForge/FML@2aa73afa15908dadb0a033c49deb0ffefad2f265 Fix ExampleMod.java for build #1024+ MinecraftForge/FML@c890206268da3c594d97198f5426b52ff6b8460c Try and handle removal of mods a bit better. Currently no way to allow a world which has missing blocks to load - but i have the code in place to allow it i think. MinecraftForge/FML@995c204338cd601e118396d4b4ef8feb6e759037 Fix failing to load a world with missing mod blocks and items. There will be a way to force worlds to load when stuff is missing, but for right now, it will fail as this is "world safe". MinecraftForge/FML@fa5f4c884272f415933329a9e914e0b7d052e31a Some argumentation MinecraftForge/FML@45409bfa0c136078823a1aef1358396d92a269ee Prevent player dat files getting reset during disconnects. MinecraftForge/FML@33100d6bab654a4bd59701b1ec2bf91caa3399da Merge pull request #371 from bl4ckscor3/patch-1 MinecraftForge/FML@572d32358ab11e5916d91c4c7b9c04a70cfed2f6 Merge pull request #373 from bloodmc/master MinecraftForge/FML@d0dd05a15c2eca9eabd308319c2ed85cb632922b FML expands S3F to support payloads up to 2 megs in size. Should be transparent --- fml | 2 +- .../net/minecraft/client/Minecraft.java.patch | 26 +++++++++---------- .../server/MinecraftServer.java.patch | 26 +++++++++---------- .../ServerConfigurationManager.java.patch | 14 +++++----- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/fml b/fml index 8c9e8b527..d0dd05a15 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 8c9e8b52708bd0630303f8b5dc184ab60e2553a1 +Subproject commit d0dd05a15c2eca9eabd308319c2ed85cb632922b diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 2f09a324f..1fe82e388 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -24,7 +24,7 @@ this.isDemo = par5; this.displayWidth = par2; this.displayHeight = par3; -@@ -447,7 +455,7 @@ +@@ -450,7 +458,7 @@ try { @@ -33,7 +33,7 @@ } catch (LWJGLException lwjglexception) { -@@ -547,7 +555,7 @@ +@@ -550,7 +558,7 @@ this.effectRenderer = new EffectRenderer(this.theWorld, this.renderEngine); FMLClientHandler.instance().finishMinecraftLoading(); this.checkGLError("Post startup"); @@ -42,7 +42,7 @@ if (this.serverName != null) { -@@ -734,11 +742,6 @@ +@@ -737,11 +745,6 @@ // JAVADOC METHOD $$ func_147108_a public void displayGuiScreen(GuiScreen p_147108_1_) { @@ -54,7 +54,7 @@ if (p_147108_1_ == null && this.theWorld == null) { p_147108_1_ = new GuiMainMenu(); -@@ -748,6 +751,17 @@ +@@ -751,6 +754,17 @@ p_147108_1_ = new GuiGameOver(); } @@ -72,7 +72,7 @@ if (p_147108_1_ instanceof GuiMainMenu) { this.gameSettings.showDebugInfo = false; -@@ -1338,7 +1352,7 @@ +@@ -1342,7 +1356,7 @@ if (this.thePlayer.isCurrentToolAdventureModeExempt(i, j, k)) { @@ -81,7 +81,7 @@ this.thePlayer.swingItem(); } } -@@ -1419,11 +1433,12 @@ +@@ -1423,11 +1437,12 @@ int j = this.objectMouseOver.blockY; int k = this.objectMouseOver.blockZ; @@ -96,7 +96,7 @@ { flag = false; this.thePlayer.swingItem(); -@@ -1450,7 +1465,8 @@ +@@ -1454,7 +1469,8 @@ { ItemStack itemstack1 = this.thePlayer.inventory.getCurrentItem(); @@ -106,7 +106,7 @@ { this.entityRenderer.itemRenderer.resetEquippedProgress2(); } -@@ -1652,6 +1668,8 @@ +@@ -1656,6 +1672,8 @@ while (Mouse.next()) { @@ -115,7 +115,7 @@ i = Mouse.getEventButton(); if (isRunningOnMac && i == 0 && (Keyboard.isKeyDown(29) || Keyboard.isKeyDown(157))) -@@ -2122,6 +2140,11 @@ +@@ -2126,6 +2144,11 @@ // JAVADOC METHOD $$ func_71353_a public void loadWorld(WorldClient par1WorldClient, String par2Str) { @@ -127,7 +127,7 @@ if (par1WorldClient == null) { NetHandlerPlayClient nethandlerplayclient = this.getNetHandler(); -@@ -2134,6 +2157,18 @@ +@@ -2138,6 +2161,18 @@ if (this.theIntegratedServer != null) { this.theIntegratedServer.initiateShutdown(); @@ -146,7 +146,7 @@ } this.theIntegratedServer = null; -@@ -2289,113 +2324,10 @@ +@@ -2293,113 +2328,10 @@ if (this.objectMouseOver != null) { boolean flag = this.thePlayer.capabilities.isCreativeMode; @@ -262,7 +262,7 @@ if (flag) { j = this.thePlayer.inventoryContainer.inventorySlots.size() - 9 + this.thePlayer.inventory.currentItem; -@@ -2565,9 +2497,16 @@ +@@ -2569,9 +2501,16 @@ par1PlayerUsageSnooper.addData("gl_max_texture_size", Integer.valueOf(getGLMaximumTextureSize())); } @@ -279,7 +279,7 @@ for (int i = 16384; i > 0; i >>= 1) { GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null); -@@ -2575,6 +2514,7 @@ +@@ -2579,6 +2518,7 @@ if (j != 0) { diff --git a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch index 333735f5a..35022555e 100644 --- a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch +++ b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/server/MinecraftServer.java +++ ../src-work/minecraft/net/minecraft/server/MinecraftServer.java -@@ -23,6 +23,7 @@ +@@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Date; @@ -8,7 +8,7 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -@@ -71,6 +72,10 @@ +@@ -73,6 +74,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -19,7 +19,7 @@ public abstract class MinecraftServer implements ICommandSender, Runnable, IPlayerUsage { private static final Logger logger = LogManager.getLogger(); -@@ -93,7 +98,7 @@ +@@ -95,7 +100,7 @@ // JAVADOC FIELD $$ field_71319_s private int serverPort = -1; // JAVADOC FIELD $$ field_71305_c @@ -28,7 +28,7 @@ // JAVADOC FIELD $$ field_71318_t private ServerConfigurationManager serverConfigManager; // JAVADOC FIELD $$ field_71317_u -@@ -123,7 +128,8 @@ +@@ -125,7 +130,8 @@ private int field_143008_E = 0; public final long[] tickTimeArray = new long[100]; // JAVADOC FIELD $$ field_71312_k @@ -38,7 +38,7 @@ private KeyPair serverKeyPair; // JAVADOC FIELD $$ field_71293_J private String serverOwner; -@@ -215,8 +221,6 @@ +@@ -217,8 +223,6 @@ { this.convertMapIfNeeded(par1Str); this.setUserMessage("menu.loadingLevel"); @@ -47,7 +47,7 @@ ISaveHandler isavehandler = this.anvilConverterForAnvilFile.getSaveLoader(par1Str, true); WorldInfo worldinfo = isavehandler.loadWorldInfo(); WorldSettings worldsettings; -@@ -236,46 +240,21 @@ +@@ -238,46 +242,21 @@ worldsettings.enableBonusChest(); } @@ -101,7 +101,7 @@ this.func_147139_a(this.func_147135_j()); this.initialWorldChunkLoad(); } -@@ -346,6 +325,7 @@ +@@ -348,6 +327,7 @@ if (!this.worldIsBeingDeleted) { WorldServer[] aworldserver = this.worldServers; @@ -109,7 +109,7 @@ int i = aworldserver.length; for (int j = 0; j < i; ++j) -@@ -397,9 +377,16 @@ +@@ -399,9 +379,16 @@ for (int i = 0; i < this.worldServers.length; ++i) { WorldServer worldserver = this.worldServers[i]; @@ -126,7 +126,7 @@ if (this.usageSnooper.isSnooperRunning()) { this.usageSnooper.stopSnooper(); -@@ -629,13 +616,15 @@ +@@ -630,13 +617,15 @@ this.theProfiler.startSection("levels"); int i; @@ -145,7 +145,7 @@ this.theProfiler.startSection(worldserver.getWorldInfo().getWorldName()); this.theProfiler.startSection("pools"); worldserver.getWorldVec3Pool().clear(); -@@ -682,9 +671,11 @@ +@@ -683,9 +672,11 @@ this.theProfiler.endSection(); } @@ -158,7 +158,7 @@ this.theProfiler.endStartSection("connection"); this.func_147137_ag().networkTick(); this.theProfiler.endStartSection("players"); -@@ -731,7 +722,13 @@ +@@ -732,7 +723,13 @@ // JAVADOC METHOD $$ func_71218_a public WorldServer worldServerForDimension(int par1) { @@ -173,7 +173,7 @@ } // JAVADOC METHOD $$ func_71249_w -@@ -1007,6 +1004,7 @@ +@@ -1008,6 +1005,7 @@ if (worldserver != null) { @@ -181,7 +181,7 @@ worldserver.flush(); } } -@@ -1496,7 +1494,6 @@ +@@ -1497,7 +1495,6 @@ this.field_147141_M = p_155759_1_; } diff --git a/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch b/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch index e91ca1910..f3d80cf47 100644 --- a/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch +++ b/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch @@ -10,7 +10,7 @@ import net.minecraft.world.WorldServer; import net.minecraft.world.WorldSettings; import net.minecraft.world.demo.DemoWorldManager; -@@ -377,13 +379,23 @@ +@@ -379,13 +381,23 @@ // JAVADOC METHOD $$ func_72368_a public EntityPlayerMP respawnPlayer(EntityPlayerMP par1EntityPlayerMP, int par2, boolean par3) { @@ -36,7 +36,7 @@ par1EntityPlayerMP.dimension = par2; Object object; -@@ -399,6 +411,7 @@ +@@ -401,6 +413,7 @@ EntityPlayerMP entityplayermp1 = new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension), par1EntityPlayerMP.getGameProfile(), (ItemInWorldManager)object); entityplayermp1.playerNetServerHandler = par1EntityPlayerMP.playerNetServerHandler; entityplayermp1.clonePlayer(par1EntityPlayerMP, par3); @@ -44,7 +44,7 @@ entityplayermp1.setEntityId(par1EntityPlayerMP.getEntityId()); WorldServer worldserver = this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension); this.func_72381_a(entityplayermp1, par1EntityPlayerMP, worldserver); -@@ -443,6 +456,11 @@ +@@ -445,6 +458,11 @@ public void transferPlayerToDimension(EntityPlayerMP par1EntityPlayerMP, int par2) { @@ -56,7 +56,7 @@ int j = par1EntityPlayerMP.dimension; WorldServer worldserver = this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension); par1EntityPlayerMP.dimension = par2; -@@ -450,7 +468,7 @@ +@@ -452,7 +470,7 @@ par1EntityPlayerMP.playerNetServerHandler.sendPacket(new S07PacketRespawn(par1EntityPlayerMP.dimension, par1EntityPlayerMP.worldObj.difficultySetting, par1EntityPlayerMP.worldObj.getWorldInfo().getTerrainType(), par1EntityPlayerMP.theItemInWorldManager.getGameType())); worldserver.removePlayerEntityDangerously(par1EntityPlayerMP); par1EntityPlayerMP.isDead = false; @@ -65,7 +65,7 @@ this.func_72375_a(par1EntityPlayerMP, worldserver); par1EntityPlayerMP.playerNetServerHandler.setPlayerLocation(par1EntityPlayerMP.posX, par1EntityPlayerMP.posY, par1EntityPlayerMP.posZ, par1EntityPlayerMP.rotationYaw, par1EntityPlayerMP.rotationPitch); par1EntityPlayerMP.theItemInWorldManager.setWorld(worldserver1); -@@ -469,15 +487,23 @@ +@@ -471,15 +489,23 @@ // JAVADOC METHOD $$ func_82448_a public void transferEntityToWorld(Entity par1Entity, int par2, WorldServer par3WorldServer, WorldServer par4WorldServer) { @@ -92,7 +92,7 @@ if (par1Entity.dimension == -1) { d0 /= d2; -@@ -500,7 +526,8 @@ +@@ -502,7 +528,8 @@ par3WorldServer.updateEntityWithOptionalForce(par1Entity, false); } } @@ -102,7 +102,7 @@ { ChunkCoordinates chunkcoordinates; -@@ -535,7 +562,7 @@ +@@ -537,7 +564,7 @@ if (par1Entity.isEntityAlive()) { par1Entity.setLocationAndAngles(d0, par1Entity.posY, d1, par1Entity.rotationYaw, par1Entity.rotationPitch);