From dfd62a3bd8c90d2c8a870ab73f28cef4a9b6649c Mon Sep 17 00:00:00 2001 From: cpw Date: Sun, 2 Aug 2015 00:03:47 -0400 Subject: [PATCH] Vestigal fml-ectomy. --- build.gradle | 10 +- .../net/minecraft/block/Block.java.patch | 24 --- .../client/ClientBrandRetriever.java.patch | 10 - .../client/LoadingScreenRenderer.java.patch | 26 --- .../net/minecraft/client/Minecraft.java.patch | 194 ------------------ .../client/gui/FontRenderer.java.patch | 126 ------------ .../minecraft/client/gui/GuiButton.java.patch | 24 --- .../client/gui/GuiCreateWorld.java.patch | 11 - .../client/gui/GuiIngameMenu.java.patch | 24 --- .../client/gui/GuiMainMenu.java.patch | 43 ---- .../client/gui/GuiMultiplayer.java.patch | 19 -- .../client/gui/GuiOverlayDebug.java.patch | 12 -- .../client/gui/GuiSelectWorld.java.patch | 11 - .../gui/ServerListEntryNormal.java.patch | 23 --- .../gui/achievement/GuiStats.java.patch | 19 -- .../multiplayer/GuiConnecting.java.patch | 11 - .../NetHandlerHandshakeMemory.java.patch | 10 - .../network/NetHandlerLoginClient.java.patch | 14 -- .../network/NetHandlerPlayClient.java.patch | 11 - .../client/network/OldServerPinger.java.patch | 10 - .../renderer/entity/RenderVillager.java.patch | 11 - .../renderer/texture/Stitcher.java.patch | 26 --- .../texture/TextureManager.java.patch | 18 -- .../renderer/texture/TextureMap.java.patch | 136 ------------ .../renderer/texture/TextureUtil.java.patch | 15 -- .../resources/AbstractResourcePack.java.patch | 11 - .../FallbackResourceManager.java.patch | 10 - .../resources/LanguageManager.java.patch | 10 - .../client/resources/Locale.java.patch | 11 - ...SimpleReloadableResourceManager.java.patch | 46 ----- .../resources/model/ModelBakery.java.patch | 41 ---- .../client/settings/GameSettings.java.patch | 10 - .../minecraft/crash/CrashReport.java.patch | 19 -- .../minecraft/entity/EntityList.java.patch | 60 ------ .../minecraft/entity/EntityTracker.java.patch | 11 - .../entity/EntityTrackerEntry.java.patch | 27 --- .../entity/boss/IBossDisplayData.java.patch | 10 - .../entity/item/EntityItem.java.patch | 10 - .../entity/monster/EntitySlime.java.patch | 11 - .../entity/passive/EntityVillager.java.patch | 35 ---- .../entity/player/EntityPlayer.java.patch | 49 ----- .../entity/player/EntityPlayerMP.java.patch | 10 - .../inventory/SlotCrafting.java.patch | 10 - .../inventory/SlotFurnaceOutput.java.patch | 11 - .../net/minecraft/item/Item.java.patch | 23 --- .../minecraft/item/ItemEmptyMap.java.patch | 11 - .../net/minecraft/item/ItemMap.java.patch | 11 - .../item/ItemMonsterPlacer.java.patch | 107 ---------- .../net/minecraft/item/ItemStack.java.patch | 50 ----- .../network/NetworkManager.java.patch | 53 ----- .../network/NetworkSystem.java.patch | 11 - .../network/ServerStatusResponse.java.patch | 18 -- .../handshake/client/C00Handshake.java.patch | 48 ----- .../client/C17PacketCustomPayload.java.patch | 14 -- .../server/S3FPacketCustomPayload.java.patch | 14 -- .../minecraft/realms/RealmsConnect.java.patch | 19 -- .../server/MinecraftServer.java.patch | 115 ----------- .../dedicated/DedicatedServer.java.patch | 44 ---- .../server/gui/MinecraftServerGui.java.patch | 24 --- .../integrated/IntegratedServer.java.patch | 23 --- .../management/PlayerProfileCache.java.patch | 50 ----- .../ServerConfigurationManager.java.patch | 76 ------- .../network/NetHandlerHandshakeTCP.java.patch | 11 - .../network/NetHandlerLoginServer.java.patch | 20 -- .../tileentity/TileEntity.java.patch | 40 ---- .../tileentity/TileEntityFurnace.java.patch | 19 -- .../util/MessageSerializer.java.patch | 11 - .../net/minecraft/util/MouseHelper.java.patch | 10 - .../util/ResourceLocation.java.patch | 26 --- .../minecraft/util/StringTranslate.java.patch | 64 ------ .../net/minecraft/world/World.java.patch | 29 --- .../minecraft/world/WorldProvider.java.patch | 47 ----- .../net/minecraft/world/WorldType.java.patch | 56 ----- .../chunk/storage/AnvilChunkLoader.java.patch | 41 ---- .../world/gen/ChunkProviderServer.java.patch | 10 - .../StructureVillagePieces.java.patch | 22 -- .../world/storage/MapData.java.patch | 39 ---- .../world/storage/SaveHandler.java.patch | 89 -------- .../world/storage/WorldInfo.java.patch | 35 ---- {fml/jsons => jsons}/1.6-dev.json | 0 {fml/jsons => jsons}/1.6-rel.json | 0 {fml/jsons => jsons}/1.6.1-dev.json | 0 {fml/jsons => jsons}/1.6.1-rel.json | 0 {fml/jsons => jsons}/1.6.2-dev.json | 0 {fml/jsons => jsons}/1.6.2-rel.json | 0 {fml/jsons => jsons}/1.6.3-dev.json | 0 {fml/jsons => jsons}/1.6.3-rel.json | 0 {fml/jsons => jsons}/1.6.4-dev.json | 0 {fml/jsons => jsons}/1.6.4-rel.json | 0 {fml/jsons => jsons}/1.7.10-dev.json | 0 {fml/jsons => jsons}/1.7.10-pre3-dev.json | 0 {fml/jsons => jsons}/1.7.10-pre3.json | 0 {fml/jsons => jsons}/1.7.10-pre4-dev.json | 0 {fml/jsons => jsons}/1.7.10-pre4-rel.json | 0 {fml/jsons => jsons}/1.7.10-pre4.json | 0 {fml/jsons => jsons}/1.7.10-rel.json | 0 {fml/jsons => jsons}/1.7.10.json | 0 {fml/jsons => jsons}/1.7.2-dev.json | 0 {fml/jsons => jsons}/1.7.2-rel.json | 0 {fml/jsons => jsons}/1.7.2.json | 0 {fml/jsons => jsons}/1.7.9-dev.json | 0 {fml/jsons => jsons}/1.7.9-rel.json | 0 {fml/jsons => jsons}/1.7.9.json | 0 {fml/jsons => jsons}/1.8-dev.json | 0 {fml/jsons => jsons}/1.8-rel.json | 0 {fml/jsons => jsons}/1.8.json | 0 {fml/jsons => jsons}/big_logo.png | Bin {fml/install => mdk}/README.txt | 0 {fml/install => mdk}/build.gradle | 0 .../.projects/Minecraft/.location | 0 .../org.eclipse.core.resources/.root/0.tree | Bin .../org.eclipse.core.resources.prefs | 0 .../.settings/org.eclipse.debug.ui.prefs | 0 .../org.eclipse.epp.usagedata.gathering.prefs | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.ui.editors.prefs | 0 .../.settings/org.eclipse.ui.ide.prefs | 0 .../.settings/org.eclipse.ui.prefs | 0 .../.launches/Client.launch | 0 .../.launches/Server.launch | 0 .../launchConfigurationHistory.xml | 0 .../com/example/examplemod/ExampleMod.java | 0 .../src/main/resources/mcmod.info | 0 123 files changed, 5 insertions(+), 2515 deletions(-) delete mode 100644 fml/patches/minecraft/net/minecraft/block/Block.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/gui/GuiButton.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/network/OldServerPinger.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/resources/LanguageManager.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/resources/Locale.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/crash/CrashReport.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/entity/monster/EntitySlime.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/item/Item.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/item/ItemEmptyMap.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/item/ItemMap.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/network/NetworkManager.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/network/NetworkSystem.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/network/ServerStatusResponse.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/network/handshake/client/C00Handshake.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/server/gui/MinecraftServerGui.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/server/management/PlayerProfileCache.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/util/MessageSerializer.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/util/MouseHelper.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/util/ResourceLocation.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/world/World.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/world/WorldProvider.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/world/WorldType.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/world/storage/MapData.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch delete mode 100644 fml/patches/minecraft/net/minecraft/world/storage/WorldInfo.java.patch rename {fml/jsons => jsons}/1.6-dev.json (100%) rename {fml/jsons => jsons}/1.6-rel.json (100%) rename {fml/jsons => jsons}/1.6.1-dev.json (100%) rename {fml/jsons => jsons}/1.6.1-rel.json (100%) rename {fml/jsons => jsons}/1.6.2-dev.json (100%) rename {fml/jsons => jsons}/1.6.2-rel.json (100%) rename {fml/jsons => jsons}/1.6.3-dev.json (100%) rename {fml/jsons => jsons}/1.6.3-rel.json (100%) rename {fml/jsons => jsons}/1.6.4-dev.json (100%) rename {fml/jsons => jsons}/1.6.4-rel.json (100%) rename {fml/jsons => jsons}/1.7.10-dev.json (100%) rename {fml/jsons => jsons}/1.7.10-pre3-dev.json (100%) rename {fml/jsons => jsons}/1.7.10-pre3.json (100%) rename {fml/jsons => jsons}/1.7.10-pre4-dev.json (100%) rename {fml/jsons => jsons}/1.7.10-pre4-rel.json (100%) rename {fml/jsons => jsons}/1.7.10-pre4.json (100%) rename {fml/jsons => jsons}/1.7.10-rel.json (100%) rename {fml/jsons => jsons}/1.7.10.json (100%) rename {fml/jsons => jsons}/1.7.2-dev.json (100%) rename {fml/jsons => jsons}/1.7.2-rel.json (100%) rename {fml/jsons => jsons}/1.7.2.json (100%) rename {fml/jsons => jsons}/1.7.9-dev.json (100%) rename {fml/jsons => jsons}/1.7.9-rel.json (100%) rename {fml/jsons => jsons}/1.7.9.json (100%) rename {fml/jsons => jsons}/1.8-dev.json (100%) rename {fml/jsons => jsons}/1.8-rel.json (100%) rename {fml/jsons => jsons}/1.8.json (100%) rename {fml/jsons => jsons}/big_logo.png (100%) rename {fml/install => mdk}/README.txt (100%) rename {fml/install => mdk}/build.gradle (100%) rename {fml/install => mdk}/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location (100%) rename {fml/install => mdk}/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree (100%) rename {fml/install => mdk}/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs (100%) rename {fml/install => mdk}/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs (100%) rename {fml/install => mdk}/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs (100%) rename {fml/install => mdk}/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs (100%) rename {fml/install => mdk}/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs (100%) rename {fml/install => mdk}/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs (100%) rename {fml/install => mdk}/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs (100%) rename {fml/install => mdk}/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch (100%) rename {fml/install => mdk}/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch (100%) rename {fml/install => mdk}/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml (100%) rename {fml/install => mdk}/src/main/java/com/example/examplemod/ExampleMod.java (100%) rename {fml/install => mdk}/src/main/resources/mcmod.info (100%) diff --git a/build.gradle b/build.gradle index 2d972c5c7..f198c3805 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ minecraft { //mappings = 'stable_16' mappings = "snapshot_nodoc_20141130" workspaceDir = "projects" - versionJson = "fml/jsons/1.8-dev.json" + versionJson = "jsons/1.8-dev.json" buildUserdev = true buildInstaller = true installerVersion = "1.4" @@ -66,7 +66,7 @@ extractForgeSources { exclude "**/SideOnly.java", "**/Side.java" } genGradleProjects { addTestCompileDep "junit:junit:4.12" } processJson { - releaseJson = "fml/jsons/1.8-rel.json" + releaseJson = "jsons/1.8-rel.json" addReplacements([ "@minecraft_version@": project.minecraft.version, "@version@": project.version, @@ -106,8 +106,8 @@ task crowdin(type: CrowdinDownload) { def extraTxts = [ changelog, // yeah we can do thi, because gradle and groovy are awesome - "fml/LICENSE-fml.txt", - "fml/CREDITS-fml.txt", + "LICENSE-fml.txt", + "CREDITS-fml.txt", "MinecraftForge-Credits.txt", "MinecraftForge-License.txt", "Paulscode SoundSystem CodecIBXM License.txt", @@ -125,7 +125,7 @@ outputJar { manifest.attributes([ "Main-Class": "net.minecraftforge.fml.relauncher.ServerLaunchWrapper", "TweakClass": "net.minecraftforge.fml.common.launcher.FMLTweaker", - "Class-Path": getServerClasspath(file("fml/jsons/1.8-rel.json")) + "Class-Path": getServerClasspath(file("jsons/1.8-rel.json")) ]) } diff --git a/fml/patches/minecraft/net/minecraft/block/Block.java.patch b/fml/patches/minecraft/net/minecraft/block/Block.java.patch deleted file mode 100644 index 60c590e5a..000000000 --- a/fml/patches/minecraft/net/minecraft/block/Block.java.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/block/Block.java -+++ ../src-work/minecraft/net/minecraft/block/Block.java -@@ -39,8 +39,9 @@ - public class Block - { - private static final ResourceLocation field_176230_a = new ResourceLocation("air"); -- public static final RegistryNamespacedDefaultedByKey field_149771_c = new RegistryNamespacedDefaultedByKey(field_176230_a); -- public static final ObjectIntIdentityMap field_176229_d = new ObjectIntIdentityMap(); -+ public static final RegistryNamespacedDefaultedByKey field_149771_c = net.minecraftforge.fml.common.registry.GameData.getBlockRegistry(); -+ @Deprecated //Modders: DO NOT use this! Use GameRegistry -+ public static final ObjectIntIdentityMap field_176229_d = net.minecraftforge.fml.common.registry.GameData.getBlockStateIDMap(); - private CreativeTabs field_149772_a; - public static final Block.SoundType field_149769_e = new Block.SoundType("stone", 1.0F, 1.0F); - public static final Block.SoundType field_149766_f = new Block.SoundType("wood", 1.0F, 1.0F); -@@ -124,6 +125,9 @@ - private String field_149770_b; - private static final String __OBFID = "CL_00000199"; - -+ public final net.minecraftforge.fml.common.registry.RegistryDelegate delegate = -+ ((net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry)field_149771_c).getDelegate(this, Block.class); -+ - public static int func_149682_b(Block p_149682_0_) - { - return field_149771_c.func_148757_b(p_149682_0_); diff --git a/fml/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch b/fml/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch deleted file mode 100644 index d046aa4a5..000000000 --- a/fml/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/ClientBrandRetriever.java -+++ ../src-work/minecraft/net/minecraft/client/ClientBrandRetriever.java -@@ -10,6 +10,6 @@ - - public static String getClientModName() - { -- return "vanilla"; -+ return net.minecraftforge.fml.common.FMLCommonHandler.instance().getModName(); - } - } diff --git a/fml/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch b/fml/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch deleted file mode 100644 index 9cbf23085..000000000 --- a/fml/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/LoadingScreenRenderer.java -+++ ../src-work/minecraft/net/minecraft/client/LoadingScreenRenderer.java -@@ -139,6 +139,10 @@ - GlStateManager.func_179086_m(16640); - } - -+ try -+ { -+ if (!net.minecraftforge.fml.client.FMLClientHandler.instance().handleLoadingScreen(scaledresolution)) //FML Don't render while FML's pre-screen is rendering -+ { - Tessellator tessellator = Tessellator.func_178181_a(); - WorldRenderer worldrenderer = tessellator.func_178180_c(); - this.field_73725_b.func_110434_K().func_110577_a(Gui.field_110325_k); -@@ -177,6 +181,12 @@ - GlStateManager.func_179120_a(770, 771, 1, 0); - this.field_73725_b.field_71466_p.func_175063_a(this.field_73726_c, (float)((l - this.field_73725_b.field_71466_p.func_78256_a(this.field_73726_c)) / 2), (float)(i1 / 2 - 4 - 16), 16777215); - this.field_73725_b.field_71466_p.func_175063_a(this.field_73727_a, (float)((l - this.field_73725_b.field_71466_p.func_78256_a(this.field_73727_a)) / 2), (float)(i1 / 2 - 4 + 8), 16777215); -+ } -+ } -+ catch (java.io.IOException e) -+ { -+ com.google.common.base.Throwables.propagate(e); -+ } //FML End - this.field_146588_g.func_147609_e(); - - if (OpenGlHelper.func_148822_b()) diff --git a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch deleted file mode 100644 index 46adfef33..000000000 --- a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ /dev/null @@ -1,194 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/Minecraft.java -+++ ../src-work/minecraft/net/minecraft/client/Minecraft.java -@@ -410,10 +410,10 @@ - this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an); - this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab); - this.field_110451_am.func_110542_a(this.field_135017_as); -- this.func_110436_a(); -+ net.minecraftforge.fml.client.FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am); - this.field_71446_o = new TextureManager(this.field_110451_am); - this.field_110451_am.func_110542_a(this.field_71446_o); -- this.func_180510_a(this.field_71446_o); -+ net.minecraftforge.fml.client.SplashProgress.drawVanillaScreen(this.field_71446_o); - this.func_175595_al(); - this.field_152350_aA = new SkinManager(this.field_71446_o, new File(this.field_110446_Y, "skins"), this.field_152355_az); - this.field_71469_aa = new AnvilSaveConverter(new File(this.field_71412_D, "saves")); -@@ -449,6 +449,8 @@ - } - }); - this.field_71417_B = new MouseHelper(); -+ net.minecraftforge.fml.common.ProgressManager.ProgressBar bar= net.minecraftforge.fml.common.ProgressManager.push("Rendering Setup", 5, true); -+ bar.step("GL Setup"); - this.func_71361_d("Pre startup"); - GlStateManager.func_179098_w(); - GlStateManager.func_179103_j(7425); -@@ -462,17 +464,21 @@ - GlStateManager.func_179096_D(); - GlStateManager.func_179128_n(5888); - this.func_71361_d("Startup"); -- this.field_147128_au = new TextureMap("textures"); -+ bar.step("Loading Texture Map"); -+ this.field_147128_au = new TextureMap("textures",true); - this.field_147128_au.func_147633_a(this.field_71474_y.field_151442_I); - this.field_71446_o.func_110580_a(TextureMap.field_110575_b, this.field_147128_au); - this.field_71446_o.func_110577_a(TextureMap.field_110575_b); - this.field_147128_au.func_174937_a(false, this.field_71474_y.field_151442_I > 0); -+ bar.step("Loading Model Manager"); - this.field_175617_aL = new ModelManager(this.field_147128_au); - this.field_110451_am.func_110542_a(this.field_175617_aL); -+ bar.step("Loading Item Renderer"); - this.field_175621_X = new RenderItem(this.field_71446_o, this.field_175617_aL); - this.field_175616_W = new RenderManager(this.field_71446_o, this.field_175621_X); - this.field_175620_Y = new ItemRenderer(this); - this.field_110451_am.func_110542_a(this.field_175621_X); -+ bar.step("Loading Entity Renderer"); - this.field_71460_t = new EntityRenderer(this, this.field_110451_am); - this.field_110451_am.func_110542_a(this.field_71460_t); - this.field_175618_aM = new BlockRendererDispatcher(this.field_175617_aL.func_174954_c(), this.field_71474_y); -@@ -482,22 +488,25 @@ - this.field_71458_u = new GuiAchievement(this); - GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d); - this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o); -+ net.minecraftforge.fml.common.ProgressManager.pop(bar); -+ net.minecraftforge.fml.client.FMLClientHandler.instance().finishMinecraftLoading(); - this.func_71361_d("Post startup"); - this.field_71456_v = new GuiIngame(this); - - if (this.field_71475_ae != null) - { -- this.func_147108_a(new GuiConnecting(new GuiMainMenu(), this, this.field_71475_ae, this.field_71477_af)); -+ net.minecraftforge.fml.client.FMLClientHandler.instance().connectToServerAtStartup(this.field_71475_ae, this.field_71477_af); - } - else - { - this.func_147108_a(new GuiMainMenu()); - } - -- this.field_71446_o.func_147645_c(this.field_152354_ay); -+ net.minecraftforge.fml.client.SplashProgress.clearVanillaResources(field_71446_o, field_152354_ay); - this.field_152354_ay = null; - this.field_71461_s = new LoadingScreenRenderer(this); - -+ net.minecraftforge.fml.client.FMLClientHandler.instance().onInitializationComplete(); - if (this.field_71474_y.field_74353_u && !this.field_71431_Q) - { - this.func_71352_k(); -@@ -681,21 +690,23 @@ - File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt"); - Bootstrap.func_179870_a(p_71377_1_.func_71502_e()); - -+ int retVal; - if (p_71377_1_.func_71497_f() != null) - { - Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + p_71377_1_.func_71497_f()); -- System.exit(-1); -+ retVal = -1; - } - else if (p_71377_1_.func_147149_a(file2)) - { - Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + file2.getAbsolutePath()); -- System.exit(-1); -+ retVal = -1; - } - else - { - Bootstrap.func_179870_a("#@?@# Game crashed! Crash report could not be saved. #@?@#"); -- System.exit(-2); -+ retVal = -2; - } -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleExit(retVal); - } - - public boolean func_152349_b() -@@ -999,7 +1010,7 @@ - { - while (!this.field_152351_aB.isEmpty()) - { -- ((FutureTask)this.field_152351_aB.poll()).run(); -+ net.minecraftforge.fml.common.FMLCommonHandler.callFuture(((FutureTask)this.field_152351_aB.poll())); - } - } - -@@ -1034,9 +1045,11 @@ - - if (!this.field_71454_w) - { -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_74281_c); - this.field_71424_I.func_76318_c("gameRenderer"); - this.field_71460_t.func_78480_b(this.field_71428_T.field_74281_c); - this.field_71424_I.func_76319_b(); -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c); - } - - this.field_71424_I.func_76319_b(); -@@ -1591,6 +1604,8 @@ - --this.field_71467_ac; - } - -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreClientTick(); -+ - this.field_71424_I.func_76320_a("gui"); - - if (!this.field_71445_n) -@@ -1744,6 +1759,7 @@ - this.field_71462_r.func_146274_d(); - } - } -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().fireMouseInput(); - } - - if (this.field_71429_W > 0) -@@ -1920,6 +1936,7 @@ - } - } - } -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().fireKeyInput(); - } - - for (i = 0; i < 9; ++i) -@@ -2120,12 +2137,15 @@ - this.field_71453_ak.func_74428_b(); - } - -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostClientTick(); -+ - this.field_71424_I.func_76319_b(); - this.field_71423_H = func_71386_F(); - } - - public void func_71371_a(String p_71371_1_, String p_71371_2_, WorldSettings p_71371_3_) - { -+ net.minecraftforge.fml.client.FMLClientHandler.instance().startIntegratedServer(p_71371_1_, p_71371_2_, p_71371_3_); - this.func_71403_a((WorldClient)null); - System.gc(); - ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false); -@@ -2161,6 +2181,12 @@ - - while (!this.field_71437_Z.func_71200_ad()) - { -+ if (!net.minecraftforge.fml.common.StartupQuery.check()) -+ { -+ func_71403_a(null); -+ func_147108_a(null); -+ return; -+ } - String s2 = this.field_71437_Z.func_71195_b_(); - - if (s2 != null) -@@ -2186,7 +2212,7 @@ - SocketAddress socketaddress = this.field_71437_Z.func_147137_ag().func_151270_a(); - NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress); - networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null)); -- networkmanager.func_179290_a(new C00Handshake(47, socketaddress.toString(), 0, EnumConnectionState.LOGIN)); -+ networkmanager.func_179290_a(new C00Handshake(47, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true)); - networkmanager.func_179290_a(new C00PacketLoginStart(this.func_110432_I().func_148256_e())); - this.field_71453_ak = networkmanager; - } -@@ -2237,6 +2263,7 @@ - - this.func_71351_a((ServerData)null); - this.field_71455_al = false; -+ net.minecraftforge.fml.client.FMLClientHandler.instance().handleClientWorldClosing(this.field_71441_e); - } - - this.field_147127_av.func_147690_c(); diff --git a/fml/patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch deleted file mode 100644 index 7272aef7c..000000000 --- a/fml/patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/gui/FontRenderer.java -+++ ../src-work/minecraft/net/minecraft/client/gui/FontRenderer.java -@@ -57,7 +57,7 @@ - this.field_111273_g = p_i1035_2_; - this.field_78298_i = p_i1035_3_; - this.field_78293_l = p_i1035_4_; -- p_i1035_3_.func_110577_a(this.field_111273_g); -+ bindTexture(this.field_111273_g); - - for (int i = 0; i < 32; ++i) - { -@@ -105,7 +105,7 @@ - - try - { -- bufferedimage = TextureUtil.func_177053_a(Minecraft.func_71410_x().func_110442_L().func_110536_a(this.field_111273_g).func_110527_b()); -+ bufferedimage = TextureUtil.func_177053_a(getResourceInputStream(this.field_111273_g)); - } - catch (IOException ioexception) - { -@@ -172,7 +172,7 @@ - - try - { -- inputstream = Minecraft.func_71410_x().func_110442_L().func_110536_a(new ResourceLocation("font/glyph_sizes.bin")).func_110527_b(); -+ inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin")); - inputstream.read(this.field_78287_e); - } - catch (IOException ioexception) -@@ -195,7 +195,7 @@ - float f = (float)(p_78266_1_ % 16 * 8); - float f1 = (float)(p_78266_1_ / 16 * 8); - float f2 = p_78266_2_ ? 1.0F : 0.0F; -- this.field_78298_i.func_110577_a(this.field_111273_g); -+ bindTexture(this.field_111273_g); - float f3 = (float)this.field_78286_d[p_78266_1_] - 0.01F; - GL11.glBegin(GL11.GL_TRIANGLE_STRIP); - GL11.glTexCoord2f(f / 128.0F, f1 / 128.0F); -@@ -222,7 +222,7 @@ - - private void func_78257_a(int p_78257_1_) - { -- this.field_78298_i.func_110577_a(this.func_111271_a(p_78257_1_)); -+ bindTexture(this.func_111271_a(p_78257_1_)); - } - - protected float func_78277_a(char p_78277_1_, boolean p_78277_2_) -@@ -269,7 +269,7 @@ - - public int func_175065_a(String p_175065_1_, float p_175065_2_, float p_175065_3_, int p_175065_4_, boolean p_175065_5_) - { -- GlStateManager.func_179141_d(); -+ enableAlpha(); - this.func_78265_b(); - int j; - -@@ -341,7 +341,7 @@ - - k = this.field_78285_g[j]; - this.field_78304_r = k; -- GlStateManager.func_179131_c((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.field_78305_q); -+ setColor((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.field_78305_q); - } - else if (j == 16) - { -@@ -370,7 +370,7 @@ - this.field_78299_w = false; - this.field_78300_v = false; - this.field_78301_u = false; -- GlStateManager.func_179131_c(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q); -+ setColor(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q); - } - - ++i; -@@ -429,6 +429,15 @@ - ++f; - } - -+ doDraw(f); -+ } -+ } -+ } -+ -+ protected void doDraw(float f) -+ { -+ { -+ { - Tessellator tessellator; - WorldRenderer worldrenderer; - -@@ -504,7 +513,7 @@ - this.field_78292_o = (float)(p_180455_4_ >> 8 & 255) / 255.0F; - this.field_78306_p = (float)(p_180455_4_ & 255) / 255.0F; - this.field_78305_q = (float)(p_180455_4_ >> 24 & 255) / 255.0F; -- GlStateManager.func_179131_c(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q); -+ setColor(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q); - this.field_78295_j = p_180455_2_; - this.field_78296_k = p_180455_3_; - this.func_78255_a(p_180455_1_, p_180455_5_); -@@ -842,6 +851,26 @@ - return this.field_78294_m; - } - -+ protected void setColor(float r, float g, float b, float a) -+ { -+ GlStateManager.func_179131_c(r,g,b,a); -+ } -+ -+ protected void enableAlpha() -+ { -+ GlStateManager.func_179141_d(); -+ } -+ -+ protected void bindTexture(ResourceLocation location) -+ { -+ field_78298_i.func_110577_a(location); -+ } -+ -+ protected InputStream getResourceInputStream(ResourceLocation location) throws IOException -+ { -+ return Minecraft.func_71410_x().func_110442_L().func_110536_a(location).func_110527_b(); -+ } -+ - public int func_175064_b(char p_175064_1_) - { - return this.field_78285_g["0123456789abcdef".indexOf(p_175064_1_)]; diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiButton.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiButton.java.patch deleted file mode 100644 index 1366ae5b5..000000000 --- a/fml/patches/minecraft/net/minecraft/client/gui/GuiButton.java.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/gui/GuiButton.java -+++ ../src-work/minecraft/net/minecraft/client/gui/GuiButton.java -@@ -22,6 +22,7 @@ - public boolean field_146125_m; - protected boolean field_146123_n; - private static final String __OBFID = "CL_00000668"; -+ public int packedFGColour; //FML - - public GuiButton(int p_i1020_1_, int p_i1020_2_, int p_i1020_3_, String p_i1020_4_) - { -@@ -75,8 +76,12 @@ - this.func_146119_b(p_146112_1_, p_146112_2_, p_146112_3_); - int l = 14737632; - -- if (!this.field_146124_l) -+ if (packedFGColour != 0) - { -+ l = packedFGColour; -+ } -+ else if (!this.field_146124_l) -+ { - l = 10526880; - } - else if (this.field_146123_n) diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch deleted file mode 100644 index 3b07b5466..000000000 --- a/fml/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/gui/GuiCreateWorld.java -+++ ../src-work/minecraft/net/minecraft/client/gui/GuiCreateWorld.java -@@ -213,6 +213,8 @@ - } - } - -+ WorldType.field_77139_a[this.field_146331_K].onGUICreateWorldPress(); -+ - WorldSettings.GameType gametype = WorldSettings.GameType.func_77142_a(this.field_146342_r); - WorldSettings worldsettings = new WorldSettings(i, gametype, this.field_146341_s, this.field_146337_w, WorldType.field_77139_a[this.field_146331_K]); - worldsettings.func_82750_a(this.field_146334_a); diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch deleted file mode 100644 index d459e649f..000000000 --- a/fml/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/gui/GuiIngameMenu.java -+++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngameMenu.java -@@ -30,8 +30,9 @@ - - this.field_146292_n.add(new GuiButton(4, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 24 + b0, I18n.func_135052_a("menu.returnToGame", new Object[0]))); - this.field_146292_n.add(new GuiButton(0, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 96 + b0, 98, 20, I18n.func_135052_a("menu.options", new Object[0]))); -+ this.field_146292_n.add(new GuiButton(12, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + b0, 98, 20, I18n.func_135052_a("fml.menu.modoptions"))); - GuiButton guibutton; -- this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + b0, 98, 20, I18n.func_135052_a("menu.shareToLan", new Object[0]))); -+ this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 72 + b0, 200, 20, I18n.func_135052_a("menu.shareToLan", new Object[0]))); - this.field_146292_n.add(new GuiButton(5, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 48 + b0, 98, 20, I18n.func_135052_a("gui.achievements", new Object[0]))); - this.field_146292_n.add(new GuiButton(6, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 48 + b0, 98, 20, I18n.func_135052_a("gui.stats", new Object[0]))); - guibutton.field_146124_l = this.field_146297_k.func_71356_B() && !this.field_146297_k.func_71401_C().func_71344_c(); -@@ -65,6 +66,10 @@ - break; - case 7: - this.field_146297_k.func_147108_a(new GuiShareToLan(this)); -+ break; -+ case 12: -+ net.minecraftforge.fml.client.FMLClientHandler.instance().showInGameModOptions(this); -+ break; - } - } - diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch deleted file mode 100644 index 229de180d..000000000 --- a/fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java -+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java -@@ -198,6 +198,11 @@ - this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 100, p_73969_1_, I18n.func_135052_a("menu.singleplayer", new Object[0]))); - this.field_146292_n.add(new GuiButton(2, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.func_135052_a("menu.multiplayer", new Object[0]))); - this.field_146292_n.add(this.field_175372_K = new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0]))); -+ GuiButton fmlModButton = new GuiButton(6, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("fml.menu.mods")); -+ fmlModButton.field_146128_h = this.field_146294_l / 2 + 2; -+ field_175372_K.field_146120_f = 98; -+ fmlModButton.field_146120_f = 98; -+ this.field_146292_n.add(fmlModButton); - } - - private void func_73972_b(int p_73972_1_, int p_73972_2_) -@@ -245,6 +250,11 @@ - this.field_146297_k.func_71400_g(); - } - -+ if (p_146284_1_.field_146127_k == 6) -+ { -+ this.field_146297_k.func_147108_a(new net.minecraftforge.fml.client.GuiModList(this)); -+ } -+ - if (p_146284_1_.field_146127_k == 11) - { - this.field_146297_k.func_71371_a("Demo_World", "Demo_World", DemoWorldServer.field_73071_a); -@@ -492,7 +502,15 @@ - s = s + " Demo"; - } - -- this.func_73731_b(this.field_146289_q, s, 2, this.field_146295_m - 10, -1); -+ java.util.List brandings = com.google.common.collect.Lists.reverse(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(true)); -+ for (int i = 0; i < brandings.size(); i++) -+ { -+ String brd = brandings.get(i); -+ if (!com.google.common.base.Strings.isNullOrEmpty(brd)) -+ { -+ this.func_73731_b(this.field_146289_q, brd, 2, this.field_146295_m - ( 10 + i * (this.field_146289_q.field_78288_b + 1)), 16777215); -+ } -+ } - String s1 = "Copyright Mojang AB. Do not distribute!"; - this.func_73731_b(this.field_146289_q, s1, this.field_146294_l - this.field_146289_q.func_78256_a(s1) - 2, this.field_146295_m - 10, -1); - diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch deleted file mode 100644 index b3e441a5e..000000000 --- a/fml/patches/minecraft/net/minecraft/client/gui/GuiMultiplayer.java.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/gui/GuiMultiplayer.java -+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMultiplayer.java -@@ -41,6 +41,7 @@ - public GuiMultiplayer(GuiScreen p_i1040_1_) - { - this.field_146798_g = p_i1040_1_; -+ net.minecraftforge.fml.client.FMLClientHandler.instance().setupServerList(); - } - - public void func_73866_w_() -@@ -373,7 +374,7 @@ - - private void func_146791_a(ServerData p_146791_1_) - { -- this.field_146297_k.func_147108_a(new GuiConnecting(this, this.field_146297_k, p_146791_1_)); -+ net.minecraftforge.fml.client.FMLClientHandler.instance().connectToServer(this, p_146791_1_); - } - - public void func_146790_a(int p_146790_1_) diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch deleted file mode 100644 index dc555d651..000000000 --- a/fml/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java -+++ ../src-work/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java -@@ -170,6 +170,9 @@ - long l = j - k; - ArrayList arraylist = Lists.newArrayList(new String[] {String.format("Java: %s %dbit", new Object[]{System.getProperty("java.version"), Integer.valueOf(this.field_175242_a.func_147111_S() ? 64 : 32)}), String.format("Mem: % 2d%% %03d/%03dMB", new Object[]{Long.valueOf(l * 100L / i), Long.valueOf(func_175240_a(l)), Long.valueOf(func_175240_a(i))}), String.format("Allocated: % 2d%% %03dMB", new Object[]{Long.valueOf(j * 100L / i), Long.valueOf(func_175240_a(j))}), "", String.format("Display: %dx%d (%s)", new Object[]{Integer.valueOf(Display.getWidth()), Integer.valueOf(Display.getHeight()), GL11.glGetString(GL11.GL_VENDOR)}), GL11.glGetString(GL11.GL_RENDERER), GL11.glGetString(GL11.GL_VERSION)}); - -+ arraylist.add(""); -+ arraylist.addAll(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(false)); -+ - if (this.func_175236_d()) - { - return arraylist; diff --git a/fml/patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch deleted file mode 100644 index d4be0db7a..000000000 --- a/fml/patches/minecraft/net/minecraft/client/gui/GuiSelectWorld.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/gui/GuiSelectWorld.java -+++ ../src-work/minecraft/net/minecraft/client/gui/GuiSelectWorld.java -@@ -187,7 +187,7 @@ - - if (this.field_146297_k.func_71359_d().func_90033_f(s)) - { -- this.field_146297_k.func_71371_a(s, s1, (WorldSettings)null); -+ net.minecraftforge.fml.client.FMLClientHandler.instance().tryLoadExistingWorld(this, s, s1); - } - } - } diff --git a/fml/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch deleted file mode 100644 index 90dfde34b..000000000 --- a/fml/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java -+++ ../src-work/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java -@@ -84,7 +84,7 @@ - boolean flag2 = this.field_148301_e.field_82821_f < 47; - boolean flag3 = flag1 || flag2; - this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_180790_2_ + 32 + 3, p_180790_3_ + 1, 16777215); -- List list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_180790_4_ - 32 - 2); -+ List list = this.field_148300_d.field_71466_p.func_78271_c(net.minecraftforge.fml.client.FMLClientHandler.instance().fixDescription(this.field_148301_e.field_78843_d), p_180790_4_ - 48 - 2); - - for (int l1 = 0; l1 < Math.min(list.size(), 2); ++l1) - { -@@ -178,6 +178,11 @@ - int k2 = p_180790_6_ - p_180790_2_; - int l2 = p_180790_7_ - p_180790_3_; - -+ String tooltip = net.minecraftforge.fml.client.FMLClientHandler.instance().enhanceServerListEntry(this, this.field_148301_e, p_180790_2_, p_180790_4_, p_180790_3_, k2, l2); -+ if (tooltip != null) -+ { -+ this.field_148303_c.func_146793_a(tooltip); -+ } else - if (k2 >= p_180790_4_ - 15 && k2 <= p_180790_4_ - 5 && l2 >= 0 && l2 <= 8) - { - this.field_148303_c.func_146793_a(s1); diff --git a/fml/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.java.patch b/fml/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.java.patch deleted file mode 100644 index da29b12c2..000000000 --- a/fml/patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.java.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/gui/achievement/GuiStats.java -+++ ../src-work/minecraft/net/minecraft/client/gui/achievement/GuiStats.java -@@ -769,6 +769,7 @@ - super(p_i45510_2_, GuiStats.this.field_146294_l, GuiStats.this.field_146295_m, 32, GuiStats.this.field_146295_m - 64, GuiStats.this.field_146289_q.field_78288_b * 4); - this.func_148130_a(false); - Iterator iterator = EntityList.field_75627_a.values().iterator(); -+ iterator = com.google.common.collect.Iterators.concat(iterator, net.minecraftforge.fml.common.registry.EntityRegistry.getEggs().values().iterator()); - - while (iterator.hasNext()) - { -@@ -806,7 +807,7 @@ - protected void func_180791_a(int p_180791_1_, int p_180791_2_, int p_180791_3_, int p_180791_4_, int p_180791_5_, int p_180791_6_) - { - EntityList.EntityEggInfo entityegginfo = (EntityList.EntityEggInfo)this.field_148222_l.get(p_180791_1_); -- String s = I18n.func_135052_a("entity." + EntityList.func_75617_a(entityegginfo.field_75613_a) + ".name", new Object[0]); -+ String s = I18n.func_135052_a("entity." + entityegginfo.name + ".name", new Object[0]); - int k1 = GuiStats.this.field_146546_t.func_77444_a(entityegginfo.field_151512_d); - int l1 = GuiStats.this.field_146546_t.func_77444_a(entityegginfo.field_151513_e); - String s1 = I18n.func_135052_a("stat.entityKills", new Object[] {Integer.valueOf(k1), s}); diff --git a/fml/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch b/fml/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch deleted file mode 100644 index 05ba7abc5..000000000 --- a/fml/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java -+++ ../src-work/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java -@@ -69,7 +69,7 @@ - inetaddress = InetAddress.getByName(p_146367_1_); - GuiConnecting.this.field_146371_g = NetworkManager.func_150726_a(inetaddress, p_146367_2_); - GuiConnecting.this.field_146371_g.func_150719_a(new NetHandlerLoginClient(GuiConnecting.this.field_146371_g, GuiConnecting.this.field_146297_k, GuiConnecting.this.field_146374_i)); -- GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(47, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN)); -+ GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(47, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN, true)); - GuiConnecting.this.field_146371_g.func_179290_a(new C00PacketLoginStart(GuiConnecting.this.field_146297_k.func_110432_I().func_148256_e())); - } - catch (UnknownHostException unknownhostexception) diff --git a/fml/patches/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java.patch b/fml/patches/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java.patch deleted file mode 100644 index 1b37230bf..000000000 --- a/fml/patches/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java -+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java -@@ -24,6 +24,7 @@ - - public void func_147383_a(C00Handshake p_147383_1_) - { -+ if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerHandshake(p_147383_1_, this.field_147384_b)) return; - this.field_147384_b.func_150723_a(p_147383_1_.func_149594_c()); - this.field_147384_b.func_150719_a(new NetHandlerLoginServer(this.field_147385_a, this.field_147384_b)); - } diff --git a/fml/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch b/fml/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch deleted file mode 100644 index 0b265296c..000000000 --- a/fml/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java -+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java -@@ -92,7 +92,10 @@ - { - this.field_175091_e = p_147390_1_.func_179730_a(); - this.field_147393_d.func_150723_a(EnumConnectionState.PLAY); -- this.field_147393_d.func_150719_a(new NetHandlerPlayClient(this.field_147394_b, this.field_147395_c, this.field_147393_d, this.field_175091_e)); -+ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.fmlClientHandshake(this.field_147393_d); -+ NetHandlerPlayClient nhpc = new NetHandlerPlayClient(this.field_147394_b, this.field_147395_c, this.field_147393_d, this.field_175091_e); -+ this.field_147393_d.func_150719_a(nhpc); -+ net.minecraftforge.fml.client.FMLClientHandler.instance().setPlayClient(nhpc); - } - - public void func_147231_a(IChatComponent p_147231_1_) diff --git a/fml/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch b/fml/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch deleted file mode 100644 index f92bdb01b..000000000 --- a/fml/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java -+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java -@@ -247,7 +247,7 @@ - { - PacketThreadUtil.func_180031_a(p_147282_1_, this, this.field_147299_f); - this.field_147299_f.field_71442_b = new PlayerControllerMP(this.field_147299_f, this); -- this.field_147300_g = new WorldClient(this, new WorldSettings(0L, p_147282_1_.func_149198_e(), false, p_147282_1_.func_149195_d(), p_147282_1_.func_149196_i()), p_147282_1_.func_149194_f(), p_147282_1_.func_149192_g(), this.field_147299_f.field_71424_I); -+ this.field_147300_g = new WorldClient(this, new WorldSettings(0L, p_147282_1_.func_149198_e(), false, p_147282_1_.func_149195_d(), p_147282_1_.func_149196_i()), net.minecraftforge.fml.common.network.handshake.NetworkDispatcher.get(func_147298_b()).getOverrideDimension(p_147282_1_), p_147282_1_.func_149192_g(), this.field_147299_f.field_71424_I); - this.field_147299_f.field_71474_y.field_74318_M = p_147282_1_.func_149192_g(); - this.field_147299_f.func_71403_a(this.field_147300_g); - this.field_147299_f.field_71439_g.field_71093_bK = p_147282_1_.func_149194_f(); diff --git a/fml/patches/minecraft/net/minecraft/client/network/OldServerPinger.java.patch b/fml/patches/minecraft/net/minecraft/client/network/OldServerPinger.java.patch deleted file mode 100644 index f85c95d04..000000000 --- a/fml/patches/minecraft/net/minecraft/client/network/OldServerPinger.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/network/OldServerPinger.java -+++ ../src-work/minecraft/net/minecraft/client/network/OldServerPinger.java -@@ -148,6 +148,7 @@ - p_147224_1_.func_147407_a((String)null); - } - -+ net.minecraftforge.fml.client.FMLClientHandler.instance().bindServerListData(p_147224_1_, serverstatusresponse); - this.field_175092_e = Minecraft.func_71386_F(); - networkmanager.func_179290_a(new C01PacketPing(this.field_175092_e)); - this.field_147403_d = true; diff --git a/fml/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java.patch b/fml/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java.patch deleted file mode 100644 index 899e6b69b..000000000 --- a/fml/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java -+++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java -@@ -48,7 +48,7 @@ - case 4: - return field_110906_m; - default: -- return field_110903_f; -+ return net.minecraftforge.fml.common.registry.VillagerRegistry.getVillagerSkin(p_110775_1_.func_70946_n(), field_110903_f); - } - } - diff --git a/fml/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch b/fml/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch deleted file mode 100644 index e90c0c4b5..000000000 --- a/fml/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/renderer/texture/Stitcher.java -+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/Stitcher.java -@@ -60,6 +60,7 @@ - public void func_94305_f() - { - Stitcher.Holder[] aholder = (Stitcher.Holder[])this.field_94319_a.toArray(new Stitcher.Holder[this.field_94319_a.size()]); -+ net.minecraftforge.fml.common.ProgressManager.ProgressBar bar = net.minecraftforge.fml.common.ProgressManager.push("Texture stitching", aholder.length); - Arrays.sort(aholder); - Stitcher.Holder[] aholder1 = aholder; - int i = aholder.length; -@@ -67,6 +68,7 @@ - for (int j = 0; j < i; ++j) - { - Stitcher.Holder holder = aholder1[j]; -+ bar.step(holder.func_98150_a().func_94215_i()); - - if (!this.func_94310_b(holder)) - { -@@ -80,6 +82,7 @@ - this.field_94318_c = MathHelper.func_151236_b(this.field_94318_c); - this.field_94315_d = MathHelper.func_151236_b(this.field_94315_d); - } -+ net.minecraftforge.fml.common.ProgressManager.pop(bar); - } - - public List func_94309_g() diff --git a/fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.java.patch b/fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.java.patch deleted file mode 100644 index 727f57e75..000000000 --- a/fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.java.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureManager.java -+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureManager.java -@@ -143,12 +143,15 @@ - - public void func_110549_a(IResourceManager p_110549_1_) - { -+ net.minecraftforge.fml.common.ProgressManager.ProgressBar bar = net.minecraftforge.fml.common.ProgressManager.push("Reloading Texture Manager", this.field_110585_a.keySet().size(), true); - Iterator iterator = this.field_110585_a.entrySet().iterator(); - - while (iterator.hasNext()) - { - Entry entry = (Entry)iterator.next(); -+ bar.step(entry.getKey().toString()); - this.func_110579_a((ResourceLocation)entry.getKey(), (ITextureObject)entry.getValue()); - } -+ net.minecraftforge.fml.common.ProgressManager.pop(bar); - } - } diff --git a/fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch b/fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch deleted file mode 100644 index 837134e1a..000000000 --- a/fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureMap.java -+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureMap.java -@@ -29,6 +29,7 @@ - @SideOnly(Side.CLIENT) - public class TextureMap extends AbstractTexture implements ITickableTextureObject - { -+ private static final boolean ENABLE_SKIP = Boolean.parseBoolean(System.getProperty("fml.skipFirstTextureLoad", "true")); - private static final Logger field_147635_d = LogManager.getLogger(); - public static final ResourceLocation field_174945_f = new ResourceLocation("missingno"); - public static final ResourceLocation field_110575_b = new ResourceLocation("textures/atlas/blocks.png"); -@@ -40,6 +41,7 @@ - private int field_147636_j; - private final TextureAtlasSprite field_94249_f; - private static final String __OBFID = "CL_00001058"; -+ private boolean skipFirst = false; - - public TextureMap(String p_i46099_1_) - { -@@ -48,12 +50,23 @@ - - public TextureMap(String p_i46100_1_, IIconCreator p_i46100_2_) - { -+ this(p_i46100_1_, p_i46100_2_, false); -+ } -+ -+ public TextureMap(String p_i46100_1_, boolean skipFirst) -+ { -+ this(p_i46100_1_, null, skipFirst); -+ } -+ -+ public TextureMap(String p_i46100_1_, IIconCreator iconCreatorIn, boolean skipFirst) -+ { - this.field_94258_i = Lists.newArrayList(); - this.field_110574_e = Maps.newHashMap(); - this.field_94252_e = Maps.newHashMap(); - this.field_94249_f = new TextureAtlasSprite("missingno"); - this.field_94254_c = p_i46100_1_; -- this.field_174946_m = p_i46100_2_; -+ this.field_174946_m = iconCreatorIn; -+ this.skipFirst = skipFirst && ENABLE_SKIP; - } - - private void func_110569_e() -@@ -91,14 +104,16 @@ - this.field_94258_i.clear(); - int j = Integer.MAX_VALUE; - int k = 1 << this.field_147636_j; -+ net.minecraftforge.fml.common.ProgressManager.ProgressBar bar = net.minecraftforge.fml.common.ProgressManager.push("Texture stitching", skipFirst ? 0 : this.field_110574_e.size()); - Iterator iterator = this.field_110574_e.entrySet().iterator(); - -- while (iterator.hasNext()) -+ while (!skipFirst && iterator.hasNext()) - { - Entry entry = (Entry)iterator.next(); - TextureAtlasSprite textureatlassprite = (TextureAtlasSprite)entry.getValue(); - ResourceLocation resourcelocation = new ResourceLocation(textureatlassprite.func_94215_i()); - ResourceLocation resourcelocation1 = this.func_147634_a(resourcelocation, 0); -+ bar.step(resourcelocation1.func_110623_a()); - - try - { -@@ -150,12 +165,14 @@ - } - catch (RuntimeException runtimeexception) - { -- field_147635_d.error("Unable to parse metadata from " + resourcelocation1, runtimeexception); -+ //logger.error("Unable to parse metadata from " + resourcelocation1, runtimeexception); -+ net.minecraftforge.fml.client.FMLClientHandler.instance().trackBrokenTexture(resourcelocation1, runtimeexception.getMessage()); - continue; - } - catch (IOException ioexception1) - { -- field_147635_d.error("Using missing texture, unable to load " + resourcelocation1, ioexception1); -+ //logger.error("Using missing texture, unable to load " + resourcelocation1, ioexception1); -+ net.minecraftforge.fml.client.FMLClientHandler.instance().trackMissingTexture(resourcelocation1); - continue; - } - -@@ -171,6 +188,7 @@ - stitcher.func_110934_a(textureatlassprite); - } - -+ net.minecraftforge.fml.common.ProgressManager.pop(bar); - int j1 = Math.min(j, k); - int k1 = MathHelper.func_151239_c(j1); - -@@ -181,10 +199,12 @@ - } - - Iterator iterator1 = this.field_110574_e.values().iterator(); -+ bar = net.minecraftforge.fml.common.ProgressManager.push("Mipmap generation", skipFirst ? 0 : this.field_110574_e.size()); - -- while (iterator1.hasNext()) -+ while (!skipFirst && iterator1.hasNext()) - { - final TextureAtlasSprite textureatlassprite1 = (TextureAtlasSprite)iterator1.next(); -+ bar.step(textureatlassprite1.func_94215_i()); - - try - { -@@ -225,9 +245,13 @@ - - this.field_94249_f.func_147963_d(this.field_147636_j); - stitcher.func_110934_a(this.field_94249_f); -+ net.minecraftforge.fml.common.ProgressManager.pop(bar); -+ skipFirst = false; -+ bar = net.minecraftforge.fml.common.ProgressManager.push("Texture creation", 3); - - try - { -+ bar.step("Stitching"); - stitcher.func_94305_f(); - } - catch (StitcherException stitcherexception) -@@ -236,11 +260,13 @@ - } - - field_147635_d.info("Created: {}x{} {}-atlas", new Object[] {Integer.valueOf(stitcher.func_110935_a()), Integer.valueOf(stitcher.func_110936_b()), this.field_94254_c}); -+ bar.step("Allocating GL texture"); - TextureUtil.func_180600_a(this.func_110552_b(), this.field_147636_j, stitcher.func_110935_a(), stitcher.func_110936_b()); - HashMap hashmap = Maps.newHashMap(this.field_110574_e); - Iterator iterator2 = stitcher.func_94309_g().iterator(); - TextureAtlasSprite textureatlassprite2; - -+ bar.step("Uploading GL texture"); - while (iterator2.hasNext()) - { - textureatlassprite2 = (TextureAtlasSprite)iterator2.next(); -@@ -276,6 +302,7 @@ - } - - TextureUtil.func_177055_a(this.field_94254_c.replaceAll("/", "_"), this.func_110552_b(), this.field_147636_j, stitcher.func_110935_a(), stitcher.func_110936_b()); -+ net.minecraftforge.fml.common.ProgressManager.pop(bar); - } - - private ResourceLocation func_147634_a(ResourceLocation p_147634_1_, int p_147634_2_) diff --git a/fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java.patch b/fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java.patch deleted file mode 100644 index 4e5c66c9f..000000000 --- a/fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java -+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java -@@ -202,9 +202,11 @@ - - public static void func_180600_a(int p_180600_0_, int p_180600_1_, int p_180600_2_, int p_180600_3_) - { -+ synchronized (net.minecraftforge.fml.client.SplashProgress.class) -+ { - func_147942_a(p_180600_0_); - func_94277_a(p_180600_0_); -- -+ } - if (p_180600_1_ >= 0) - { - GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL12.GL_TEXTURE_MAX_LEVEL, p_180600_1_); diff --git a/fml/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.java.patch b/fml/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.java.patch deleted file mode 100644 index feee903f7..000000000 --- a/fml/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/resources/AbstractResourcePack.java -+++ ../src-work/minecraft/net/minecraft/client/resources/AbstractResourcePack.java -@@ -58,7 +58,7 @@ - - protected void func_110594_c(String p_110594_1_) - { -- field_110598_a.warn("ResourcePack: ignored non-lowercase namespace: %s in %s", new Object[] {p_110594_1_, this.field_110597_b}); -+ field_110598_a.warn("ResourcePack: ignored non-lowercase namespace: {} in {}", new Object[] {p_110594_1_, this.field_110597_b}); - } - - public IMetadataSection func_135058_a(IMetadataSerializer p_135058_1_, String p_135058_2_) throws IOException diff --git a/fml/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch b/fml/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch deleted file mode 100644 index c002dd01f..000000000 --- a/fml/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/resources/FallbackResourceManager.java -+++ ../src-work/minecraft/net/minecraft/client/resources/FallbackResourceManager.java -@@ -70,6 +70,7 @@ - throw new FileNotFoundException(p_110536_1_.toString()); - } - -+ @SuppressWarnings("resource") - protected InputStream func_177245_a(ResourceLocation p_177245_1_, IResourcePack p_177245_2_) throws IOException - { - InputStream inputstream = p_177245_2_.func_110590_a(p_177245_1_); diff --git a/fml/patches/minecraft/net/minecraft/client/resources/LanguageManager.java.patch b/fml/patches/minecraft/net/minecraft/client/resources/LanguageManager.java.patch deleted file mode 100644 index de7ea2b62..000000000 --- a/fml/patches/minecraft/net/minecraft/client/resources/LanguageManager.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/resources/LanguageManager.java -+++ ../src-work/minecraft/net/minecraft/client/resources/LanguageManager.java -@@ -83,6 +83,7 @@ - } - - field_135049_a.func_135022_a(p_110549_1_, arraylist); -+ net.minecraftforge.fml.common.registry.LanguageRegistry.instance().mergeLanguageTable(field_135049_a.field_135032_a, this.field_135048_c); - StringTranslate.func_135063_a(field_135049_a.field_135032_a); - } - diff --git a/fml/patches/minecraft/net/minecraft/client/resources/Locale.java.patch b/fml/patches/minecraft/net/minecraft/client/resources/Locale.java.patch deleted file mode 100644 index fc84931f7..000000000 --- a/fml/patches/minecraft/net/minecraft/client/resources/Locale.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/resources/Locale.java -+++ ../src-work/minecraft/net/minecraft/client/resources/Locale.java -@@ -107,6 +107,8 @@ - - private void func_135021_a(InputStream p_135021_1_) throws IOException - { -+ p_135021_1_ = net.minecraftforge.fml.common.FMLCommonHandler.instance().loadLanguage(field_135032_a, p_135021_1_); -+ if (p_135021_1_ == null) return; - Iterator iterator = IOUtils.readLines(p_135021_1_, Charsets.UTF_8).iterator(); - - while (iterator.hasNext()) diff --git a/fml/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch b/fml/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch deleted file mode 100644 index 8d8b19f58..000000000 --- a/fml/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java -+++ ../src-work/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java -@@ -95,6 +95,7 @@ - public void func_110541_a(List p_110541_1_) - { - this.func_110543_a(); -+ net.minecraftforge.fml.common.ProgressManager.ProgressBar resReload = net.minecraftforge.fml.common.ProgressManager.push("Loading Resources", p_110541_1_.size()+1, true); - field_147967_a.info("Reloading ResourceManager: " + field_130074_a.join(Iterables.transform(p_110541_1_, new Function() - { - private static final String __OBFID = "CL_00001092"; -@@ -112,26 +113,35 @@ - while (iterator.hasNext()) - { - IResourcePack iresourcepack = (IResourcePack)iterator.next(); -+ resReload.step(iresourcepack.func_130077_b()); - this.func_110545_a(iresourcepack); - } - -+ resReload.step("Reloading listeners"); - this.func_110544_b(); -+ net.minecraftforge.fml.common.ProgressManager.pop(resReload); - } - - public void func_110542_a(IResourceManagerReloadListener p_110542_1_) - { - this.field_110546_b.add(p_110542_1_); -+ net.minecraftforge.fml.common.ProgressManager.ProgressBar resReload = net.minecraftforge.fml.common.ProgressManager.push("Loading Resource", 1); -+ resReload.step(p_110542_1_.getClass()); - p_110542_1_.func_110549_a(this); -+ net.minecraftforge.fml.common.ProgressManager.pop(resReload); - } - - private void func_110544_b() - { - Iterator iterator = this.field_110546_b.iterator(); - -+ net.minecraftforge.fml.common.ProgressManager.ProgressBar resReload = net.minecraftforge.fml.common.ProgressManager.push("Reloading", this.field_110546_b.size()); - while (iterator.hasNext()) - { - IResourceManagerReloadListener iresourcemanagerreloadlistener = (IResourceManagerReloadListener)iterator.next(); -+ resReload.step(iresourcemanagerreloadlistener.getClass()); - iresourcemanagerreloadlistener.func_110549_a(this); - } -+ net.minecraftforge.fml.common.ProgressManager.pop(resReload); - } - } diff --git a/fml/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.java.patch b/fml/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.java.patch deleted file mode 100644 index e7a1716d9..000000000 --- a/fml/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.java.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/resources/model/ModelBakery.java -+++ ../src-work/minecraft/net/minecraft/client/resources/model/ModelBakery.java -@@ -318,6 +318,7 @@ - - private void func_177592_e() - { -+ this.field_177613_u.clear(); //FML clear this to prevent double ups. - this.field_177613_u.put(Item.func_150898_a(Blocks.field_150348_b), Lists.newArrayList(new String[] {"stone", "granite", "granite_smooth", "diorite", "diorite_smooth", "andesite", "andesite_smooth"})); - this.field_177613_u.put(Item.func_150898_a(Blocks.field_150346_d), Lists.newArrayList(new String[] {"dirt", "coarse_dirt", "podzol"})); - this.field_177613_u.put(Item.func_150898_a(Blocks.field_150344_f), Lists.newArrayList(new String[] {"oak_planks", "spruce_planks", "birch_planks", "jungle_planks", "acacia_planks", "dark_oak_planks"})); -@@ -360,6 +361,10 @@ - this.field_177613_u.put(Item.func_150898_a(Blocks.field_180390_bo), Lists.newArrayList(new String[] {"oak_fence_gate"})); - this.field_177613_u.put(Item.func_150898_a(Blocks.field_180407_aO), Lists.newArrayList(new String[] {"oak_fence"})); - this.field_177613_u.put(Items.field_179570_aq, Lists.newArrayList(new String[] {"oak_door"})); -+ for (Entry, Set> e : customVariantNames.entrySet()) -+ { -+ this.field_177613_u.put(e.getKey().get(), Lists.newArrayList(e.getValue().iterator())); -+ } - } - - private List func_177596_a(Item p_177596_1_) -@@ -809,4 +814,19 @@ - field_177617_q.field_178317_b = "class generation marker"; - field_177616_r.field_178317_b = "block entity marker"; - } -+ -+ /*********************************************************** -+ * FML Start -+ ***********************************************************/ -+ private static Map, Set> customVariantNames = Maps.newHashMap(); -+ public static void addVariantName(Item item, String... names) -+ { -+ if (customVariantNames.containsKey(item.delegate)) -+ customVariantNames.get(item.delegate).addAll(Lists.newArrayList(names)); -+ else -+ customVariantNames.put(item.delegate, Sets.newHashSet(names)); -+ } -+ /*********************************************************** -+ * FML End -+ ***********************************************************/ - } diff --git a/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch b/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch deleted file mode 100644 index 74702821a..000000000 --- a/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/client/settings/GameSettings.java -+++ ../src-work/minecraft/net/minecraft/client/settings/GameSettings.java -@@ -1067,6 +1067,7 @@ - - public void func_74303_b() - { -+ if (net.minecraftforge.fml.client.FMLClientHandler.instance().isLoading()) return; - try - { - PrintWriter printwriter = new PrintWriter(new FileWriter(this.field_74354_ai)); diff --git a/fml/patches/minecraft/net/minecraft/crash/CrashReport.java.patch b/fml/patches/minecraft/net/minecraft/crash/CrashReport.java.patch deleted file mode 100644 index 224cdfd43..000000000 --- a/fml/patches/minecraft/net/minecraft/crash/CrashReport.java.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/crash/CrashReport.java -+++ ../src-work/minecraft/net/minecraft/crash/CrashReport.java -@@ -126,6 +126,7 @@ - return IntCache.func_85144_b(); - } - }); -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().enhanceCrashReport(this, this.field_85061_c); - } - - public String func_71501_a() -@@ -220,6 +221,8 @@ - { - StringBuilder stringbuilder = new StringBuilder(); - stringbuilder.append("---- Minecraft Crash Report ----\n"); -+ net.minecraftforge.fml.common.asm.transformers.BlamingTransformer.onCrash(stringbuilder); -+ net.minecraftforge.fml.relauncher.CoreModManager.onCrash(stringbuilder); - stringbuilder.append("// "); - stringbuilder.append(func_71503_h()); - stringbuilder.append("\n\n"); diff --git a/fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch b/fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch deleted file mode 100644 index 5cd79b257..000000000 --- a/fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/entity/EntityList.java -+++ ../src-work/minecraft/net/minecraft/entity/EntityList.java -@@ -153,9 +153,10 @@ - p_75615_0_.func_82580_o("Type"); - } - -+ Class oclass = null; - try - { -- Class oclass = (Class)field_75625_b.get(p_75615_0_.func_74779_i("id")); -+ oclass = (Class)field_75625_b.get(p_75615_0_.func_74779_i("id")); - - if (oclass != null) - { -@@ -169,7 +170,17 @@ - - if (entity != null) - { -+ try -+ { - entity.func_70020_e(p_75615_0_); -+ } -+ catch (Exception e) -+ { -+ net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e, -+ "An Entity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author", -+ p_75615_0_.func_74779_i("id"), oclass.getName()); -+ entity = null; -+ } - } - else - { -@@ -344,7 +355,9 @@ - - public static class EntityEggInfo - { -+ @Deprecated // This is not always a valid number in the global ID list. - public final int field_75613_a; -+ public final String name; - public final int field_75611_b; - public final int field_75612_c; - public final StatBase field_151512_d; -@@ -358,6 +371,17 @@ - this.field_75612_c = p_i1583_3_; - this.field_151512_d = StatList.func_151182_a(this); - this.field_151513_e = StatList.func_151176_b(this); -+ this.name = EntityList.func_75617_a(p_i1583_1_); - } -+ -+ public EntityEggInfo(String name, int primaryColor, int secondaryColor) -+ { -+ this.field_75613_a = -1; -+ this.name = name; -+ this.field_75611_b = primaryColor; -+ this.field_75612_c = secondaryColor; -+ this.field_151512_d = (new StatBase("stat.killEntity." + name, new net.minecraft.util.ChatComponentTranslation("stat.entityKill", new net.minecraft.util.ChatComponentTranslation("entity." + name + ".name")))).func_75971_g(); -+ this.field_151513_e = (new StatBase("stat.entityKilledBy." + name, new net.minecraft.util.ChatComponentTranslation("stat.entityKilledBy", new net.minecraft.util.ChatComponentTranslation("entity." + name + ".name")))).func_75971_g(); -+ } - } - } diff --git a/fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch b/fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch deleted file mode 100644 index abade62f5..000000000 --- a/fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/entity/EntityTracker.java -+++ ../src-work/minecraft/net/minecraft/entity/EntityTracker.java -@@ -58,6 +58,8 @@ - - public void func_72786_a(Entity p_72786_1_) - { -+ if (net.minecraftforge.fml.common.registry.EntityRegistry.instance().tryTrackingEntity(this, p_72786_1_)) return; -+ - if (p_72786_1_ instanceof EntityPlayerMP) - { - this.func_72791_a(p_72786_1_, 512, 2); diff --git a/fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch b/fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch deleted file mode 100644 index 35e4a50b3..000000000 --- a/fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/entity/EntityTrackerEntry.java -+++ ../src-work/minecraft/net/minecraft/entity/EntityTrackerEntry.java -@@ -388,6 +388,14 @@ - this.field_73138_k = this.field_73132_a.field_70181_x; - this.field_73135_l = this.field_73132_a.field_70179_y; - -+ int posX = MathHelper.func_76128_c(this.field_73132_a.field_70165_t * 32.0D); -+ int posY = MathHelper.func_76128_c(this.field_73132_a.field_70163_u * 32.0D); -+ int posZ = MathHelper.func_76128_c(this.field_73132_a.field_70161_v * 32.0D); -+ if (posX != this.field_73128_d || posY != this.field_73129_e || posZ != this.field_73126_f) -+ { -+ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.makeEntitySpawnAdjustment(this.field_73132_a, p_73117_1_, this.field_73128_d, this.field_73129_e, this.field_73126_f); -+ } -+ - if (this.field_73143_t && !(packet instanceof S0FPacketSpawnMob)) - { - p_73117_1_.field_71135_a.func_147359_a(new S12PacketEntityVelocity(this.field_73132_a.func_145782_y(), this.field_73132_a.field_70159_w, this.field_73132_a.field_70181_x, this.field_73132_a.field_70179_y)); -@@ -474,6 +482,9 @@ - field_151262_p.warn("Fetching addPacket for removed entity"); - } - -+ Packet pkt = net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.getEntitySpawningPacket(this.field_73132_a); -+ if (pkt != null) return pkt; -+ - if (this.field_73132_a instanceof EntityItem) - { - return new S0EPacketSpawnObject(this.field_73132_a, 2, 1); diff --git a/fml/patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch b/fml/patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch deleted file mode 100644 index ee9c56e4c..000000000 --- a/fml/patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/entity/boss/IBossDisplayData.java -+++ ../src-work/minecraft/net/minecraft/entity/boss/IBossDisplayData.java -@@ -4,7 +4,6 @@ - import net.minecraftforge.fml.relauncher.Side; - import net.minecraftforge.fml.relauncher.SideOnly; - --@SideOnly(Side.CLIENT) - public interface IBossDisplayData - { - float func_110138_aP(); diff --git a/fml/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch b/fml/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch deleted file mode 100644 index df3a42a3c..000000000 --- a/fml/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/entity/item/EntityItem.java -+++ ../src-work/minecraft/net/minecraft/entity/item/EntityItem.java -@@ -366,6 +366,7 @@ - } - } - -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerItemPickupEvent(p_70100_1_, this); - if (!this.func_174814_R()) - { - this.field_70170_p.func_72956_a(p_70100_1_, "random.pop", 0.2F, ((this.field_70146_Z.nextFloat() - this.field_70146_Z.nextFloat()) * 0.7F + 1.0F) * 2.0F); diff --git a/fml/patches/minecraft/net/minecraft/entity/monster/EntitySlime.java.patch b/fml/patches/minecraft/net/minecraft/entity/monster/EntitySlime.java.patch deleted file mode 100644 index 45e3d5eec..000000000 --- a/fml/patches/minecraft/net/minecraft/entity/monster/EntitySlime.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/entity/monster/EntitySlime.java -+++ ../src-work/minecraft/net/minecraft/entity/monster/EntitySlime.java -@@ -271,7 +271,7 @@ - { - Chunk chunk = this.field_70170_p.func_175726_f(new BlockPos(MathHelper.func_76128_c(this.field_70165_t), 0, MathHelper.func_76128_c(this.field_70161_v))); - -- if (this.field_70170_p.func_72912_H().func_76067_t() == WorldType.field_77138_c && this.field_70146_Z.nextInt(4) != 1) -+ if (this.field_70170_p.func_72912_H().func_76067_t().handleSlimeSpawnReduction(field_70146_Z, field_70170_p)) - { - return false; - } diff --git a/fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch b/fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch deleted file mode 100644 index ddd2ac065..000000000 --- a/fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/entity/passive/EntityVillager.java -+++ ../src-work/minecraft/net/minecraft/entity/passive/EntityVillager.java -@@ -83,6 +83,7 @@ - private boolean field_82190_bM; - private boolean field_175564_by; - private InventoryBasic field_175560_bz; -+ @Deprecated //Use VillagerRegistry - private static final EntityVillager.ITradeList[][][][] field_175561_bA = new EntityVillager.ITradeList[][][][] {{{{new EntityVillager.EmeraldForItems(Items.field_151015_O, new EntityVillager.PriceInfo(18, 22)), new EntityVillager.EmeraldForItems(Items.field_151174_bG, new EntityVillager.PriceInfo(15, 19)), new EntityVillager.EmeraldForItems(Items.field_151172_bF, new EntityVillager.PriceInfo(15, 19)), new EntityVillager.ListItemForEmeralds(Items.field_151025_P, new EntityVillager.PriceInfo(-4, -2))}, {new EntityVillager.EmeraldForItems(Item.func_150898_a(Blocks.field_150423_aK), new EntityVillager.PriceInfo(8, 13)), new EntityVillager.ListItemForEmeralds(Items.field_151158_bO, new EntityVillager.PriceInfo(-3, -2))}, {new EntityVillager.EmeraldForItems(Item.func_150898_a(Blocks.field_150440_ba), new EntityVillager.PriceInfo(7, 12)), new EntityVillager.ListItemForEmeralds(Items.field_151034_e, new EntityVillager.PriceInfo(-5, -7))}, {new EntityVillager.ListItemForEmeralds(Items.field_151106_aX, new EntityVillager.PriceInfo(-6, -10)), new EntityVillager.ListItemForEmeralds(Items.field_151105_aU, new EntityVillager.PriceInfo(1, 1))}}, {{new EntityVillager.EmeraldForItems(Items.field_151007_F, new EntityVillager.PriceInfo(15, 20)), new EntityVillager.EmeraldForItems(Items.field_151044_h, new EntityVillager.PriceInfo(16, 24)), new EntityVillager.ItemAndEmeraldToItem(Items.field_151115_aP, new EntityVillager.PriceInfo(6, 6), Items.field_179566_aV, new EntityVillager.PriceInfo(6, 6))}, {new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151112_aM, new EntityVillager.PriceInfo(7, 8))}}, {{new EntityVillager.EmeraldForItems(Item.func_150898_a(Blocks.field_150325_L), new EntityVillager.PriceInfo(16, 22)), new EntityVillager.ListItemForEmeralds(Items.field_151097_aZ, new EntityVillager.PriceInfo(3, 4))}, {new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 0), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 1), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 2), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 3), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 4), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 5), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 6), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 7), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 8), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 9), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 10), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 11), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 12), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 13), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 14), new EntityVillager.PriceInfo(1, 2)), new EntityVillager.ListItemForEmeralds(new ItemStack(Item.func_150898_a(Blocks.field_150325_L), 1, 15), new EntityVillager.PriceInfo(1, 2))}}, {{new EntityVillager.EmeraldForItems(Items.field_151007_F, new EntityVillager.PriceInfo(15, 20)), new EntityVillager.ListItemForEmeralds(Items.field_151032_g, new EntityVillager.PriceInfo(-12, -8))}, {new EntityVillager.ListItemForEmeralds(Items.field_151031_f, new EntityVillager.PriceInfo(2, 3)), new EntityVillager.ItemAndEmeraldToItem(Item.func_150898_a(Blocks.field_150351_n), new EntityVillager.PriceInfo(10, 10), Items.field_151145_ak, new EntityVillager.PriceInfo(6, 10))}}}, {{{new EntityVillager.EmeraldForItems(Items.field_151121_aF, new EntityVillager.PriceInfo(24, 36)), new EntityVillager.ListEnchantedBookForEmeralds()}, {new EntityVillager.EmeraldForItems(Items.field_151122_aG, new EntityVillager.PriceInfo(8, 10)), new EntityVillager.ListItemForEmeralds(Items.field_151111_aL, new EntityVillager.PriceInfo(10, 12)), new EntityVillager.ListItemForEmeralds(Item.func_150898_a(Blocks.field_150342_X), new EntityVillager.PriceInfo(3, 4))}, {new EntityVillager.EmeraldForItems(Items.field_151164_bB, new EntityVillager.PriceInfo(2, 2)), new EntityVillager.ListItemForEmeralds(Items.field_151113_aN, new EntityVillager.PriceInfo(10, 12)), new EntityVillager.ListItemForEmeralds(Item.func_150898_a(Blocks.field_150359_w), new EntityVillager.PriceInfo(-5, -3))}, {new EntityVillager.ListEnchantedBookForEmeralds()}, {new EntityVillager.ListEnchantedBookForEmeralds()}, {new EntityVillager.ListItemForEmeralds(Items.field_151057_cb, new EntityVillager.PriceInfo(20, 22))}}}, {{{new EntityVillager.EmeraldForItems(Items.field_151078_bh, new EntityVillager.PriceInfo(36, 40)), new EntityVillager.EmeraldForItems(Items.field_151043_k, new EntityVillager.PriceInfo(8, 10))}, {new EntityVillager.ListItemForEmeralds(Items.field_151137_ax, new EntityVillager.PriceInfo(-4, -1)), new EntityVillager.ListItemForEmeralds(new ItemStack(Items.field_151100_aR, 1, EnumDyeColor.BLUE.func_176767_b()), new EntityVillager.PriceInfo(-2, -1))}, {new EntityVillager.ListItemForEmeralds(Items.field_151061_bv, new EntityVillager.PriceInfo(7, 11)), new EntityVillager.ListItemForEmeralds(Item.func_150898_a(Blocks.field_150426_aN), new EntityVillager.PriceInfo(-3, -1))}, {new EntityVillager.ListItemForEmeralds(Items.field_151062_by, new EntityVillager.PriceInfo(3, 11))}}}, {{{new EntityVillager.EmeraldForItems(Items.field_151044_h, new EntityVillager.PriceInfo(16, 24)), new EntityVillager.ListItemForEmeralds(Items.field_151028_Y, new EntityVillager.PriceInfo(4, 6))}, {new EntityVillager.EmeraldForItems(Items.field_151042_j, new EntityVillager.PriceInfo(7, 9)), new EntityVillager.ListItemForEmeralds(Items.field_151030_Z, new EntityVillager.PriceInfo(10, 14))}, {new EntityVillager.EmeraldForItems(Items.field_151045_i, new EntityVillager.PriceInfo(3, 4)), new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151163_ad, new EntityVillager.PriceInfo(16, 19))}, {new EntityVillager.ListItemForEmeralds(Items.field_151029_X, new EntityVillager.PriceInfo(5, 7)), new EntityVillager.ListItemForEmeralds(Items.field_151022_W, new EntityVillager.PriceInfo(9, 11)), new EntityVillager.ListItemForEmeralds(Items.field_151020_U, new EntityVillager.PriceInfo(5, 7)), new EntityVillager.ListItemForEmeralds(Items.field_151023_V, new EntityVillager.PriceInfo(11, 15))}}, {{new EntityVillager.EmeraldForItems(Items.field_151044_h, new EntityVillager.PriceInfo(16, 24)), new EntityVillager.ListItemForEmeralds(Items.field_151036_c, new EntityVillager.PriceInfo(6, 8))}, {new EntityVillager.EmeraldForItems(Items.field_151042_j, new EntityVillager.PriceInfo(7, 9)), new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151040_l, new EntityVillager.PriceInfo(9, 10))}, {new EntityVillager.EmeraldForItems(Items.field_151045_i, new EntityVillager.PriceInfo(3, 4)), new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151048_u, new EntityVillager.PriceInfo(12, 15)), new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151056_x, new EntityVillager.PriceInfo(9, 12))}}, {{new EntityVillager.EmeraldForItems(Items.field_151044_h, new EntityVillager.PriceInfo(16, 24)), new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151037_a, new EntityVillager.PriceInfo(5, 7))}, {new EntityVillager.EmeraldForItems(Items.field_151042_j, new EntityVillager.PriceInfo(7, 9)), new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151035_b, new EntityVillager.PriceInfo(9, 11))}, {new EntityVillager.EmeraldForItems(Items.field_151045_i, new EntityVillager.PriceInfo(3, 4)), new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151046_w, new EntityVillager.PriceInfo(12, 15))}}}, {{{new EntityVillager.EmeraldForItems(Items.field_151147_al, new EntityVillager.PriceInfo(14, 18)), new EntityVillager.EmeraldForItems(Items.field_151076_bf, new EntityVillager.PriceInfo(14, 18))}, {new EntityVillager.EmeraldForItems(Items.field_151044_h, new EntityVillager.PriceInfo(16, 24)), new EntityVillager.ListItemForEmeralds(Items.field_151157_am, new EntityVillager.PriceInfo(-7, -5)), new EntityVillager.ListItemForEmeralds(Items.field_151077_bg, new EntityVillager.PriceInfo(-8, -6))}}, {{new EntityVillager.EmeraldForItems(Items.field_151116_aA, new EntityVillager.PriceInfo(9, 12)), new EntityVillager.ListItemForEmeralds(Items.field_151026_S, new EntityVillager.PriceInfo(2, 4))}, {new EntityVillager.ListEnchantedItemForEmeralds(Items.field_151027_R, new EntityVillager.PriceInfo(7, 12))}, {new EntityVillager.ListItemForEmeralds(Items.field_151141_av, new EntityVillager.PriceInfo(8, 10))}}}}; - private static final String __OBFID = "CL_00001707"; - -@@ -540,6 +541,7 @@ - - private void func_175554_cu() - { -+ //TODO: Hook into VillagerRegistry - EntityVillager.ITradeList[][][] aitradelist = field_175561_bA[this.func_70946_n()]; - - if (this.field_175563_bv != 0 && this.field_175562_bw != 0) -@@ -648,6 +650,7 @@ - } - } - -+ //TODO: Hook into VillagerRegistry to get name - if (s1 != null) - { - ChatComponentTranslation chatcomponenttranslation = new ChatComponentTranslation("entity.Villager." + s1, new Object[0]); -@@ -710,7 +713,7 @@ - public IEntityLivingData func_180482_a(DifficultyInstance p_180482_1_, IEntityLivingData p_180482_2_) - { - p_180482_2_ = super.func_180482_a(p_180482_1_, p_180482_2_); -- this.func_70938_b(this.field_70170_p.field_73012_v.nextInt(5)); -+ net.minecraftforge.fml.common.registry.VillagerRegistry.setRandomProfession(this, this.field_70170_p.field_73012_v); - this.func_175552_ct(); - return p_180482_2_; - } diff --git a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch b/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch deleted file mode 100644 index 78c6c36d7..000000000 --- a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/entity/player/EntityPlayer.java -+++ ../src-work/minecraft/net/minecraft/entity/player/EntityPlayer.java -@@ -200,6 +200,7 @@ - - public void func_70071_h_() - { -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPlayerPreTick(this); - this.field_70145_X = this.func_175149_v(); - - if (this.func_175149_v()) -@@ -344,6 +345,7 @@ - { - this.func_70107_b(d3, this.field_70163_u, d4); - } -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPlayerPostTick(this); - } - - public int func_82145_z() -@@ -1725,6 +1727,7 @@ - } - - EntityList.EntityEggInfo entityegginfo = (EntityList.EntityEggInfo)EntityList.field_75627_a.get(Integer.valueOf(EntityList.func_75619_a(p_70074_1_))); -+ if (entityegginfo == null) entityegginfo = net.minecraftforge.fml.common.registry.EntityRegistry.getEggs().get(EntityList.func_75621_b(p_70074_1_)); - - if (entityegginfo != null) - { -@@ -2139,6 +2142,22 @@ - this.field_175153_bG = p_175150_1_; - } - -+ /** -+ * Opens a GUI with this player, uses FML's IGuiHandler system. -+ * Allows for extension by modders. -+ * -+ * @param mod The mod trying to open a GUI -+ * @param modGuiId GUI ID -+ * @param world Current World -+ * @param x Passed directly to IGuiHandler, data meaningless Typically world X position -+ * @param y Passed directly to IGuiHandler, data meaningless Typically world Y position -+ * @param z Passed directly to IGuiHandler, data meaningless Typically world Z position -+ */ -+ public void openGui(Object mod, int modGuiId, World world, int x, int y, int z) -+ { -+ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z); -+ } -+ - public static enum EnumChatVisibility - { - FULL(0, "options.chat.visibility.full"), diff --git a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch b/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch deleted file mode 100644 index 9f8fc06f6..000000000 --- a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/entity/player/EntityPlayerMP.java -+++ ../src-work/minecraft/net/minecraft/entity/player/EntityPlayerMP.java -@@ -481,6 +481,7 @@ - if (entitylivingbase != null) - { - EntityList.EntityEggInfo entityegginfo = (EntityList.EntityEggInfo)EntityList.field_75627_a.get(Integer.valueOf(EntityList.func_75619_a(entitylivingbase))); -+ if (entityegginfo == null) entityegginfo = net.minecraftforge.fml.common.registry.EntityRegistry.getEggs().get(EntityList.func_75621_b(entitylivingbase)); - - if (entityegginfo != null) - { diff --git a/fml/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch b/fml/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch deleted file mode 100644 index e95cd2fe5..000000000 --- a/fml/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/inventory/SlotCrafting.java -+++ ../src-work/minecraft/net/minecraft/inventory/SlotCrafting.java -@@ -113,6 +113,7 @@ - - public void func_82870_a(EntityPlayer p_82870_1_, ItemStack p_82870_2_) - { -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerCraftingEvent(p_82870_1_, p_82870_2_, field_75239_a); - this.func_75208_c(p_82870_2_); - ItemStack[] aitemstack = CraftingManager.func_77594_a().func_180303_b(this.field_75239_a, p_82870_1_.field_70170_p); - diff --git a/fml/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java.patch b/fml/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java.patch deleted file mode 100644 index e0dda7760..000000000 --- a/fml/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java -+++ ../src-work/minecraft/net/minecraft/inventory/SlotFurnaceOutput.java -@@ -83,6 +83,8 @@ - - this.field_75228_b = 0; - -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerSmeltedEvent(field_75229_a, p_75208_1_); -+ - if (p_75208_1_.func_77973_b() == Items.field_151042_j) - { - this.field_75229_a.func_71029_a(AchievementList.field_76016_k); diff --git a/fml/patches/minecraft/net/minecraft/item/Item.java.patch b/fml/patches/minecraft/net/minecraft/item/Item.java.patch deleted file mode 100644 index bf45b6cf7..000000000 --- a/fml/patches/minecraft/net/minecraft/item/Item.java.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/item/Item.java -+++ ../src-work/minecraft/net/minecraft/item/Item.java -@@ -47,8 +47,8 @@ - - public class Item - { -- public static final RegistryNamespaced field_150901_e = new RegistryNamespaced(); -- private static final Map field_179220_a = Maps.newHashMap(); -+ public static final RegistryNamespaced field_150901_e = net.minecraftforge.fml.common.registry.GameData.getItemRegistry(); -+ private static final Map field_179220_a = net.minecraftforge.fml.common.registry.GameData.getBlockItemMap(); - protected static final UUID field_111210_e = UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF"); - private CreativeTabs field_77701_a; - protected static Random field_77697_d = new Random(); -@@ -61,6 +61,9 @@ - private String field_77774_bZ; - private static final String __OBFID = "CL_00000041"; - -+ public final net.minecraftforge.fml.common.registry.RegistryDelegate delegate = -+ ((net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry)field_150901_e).getDelegate(this, Item.class); -+ - public static int func_150891_b(Item p_150891_0_) - { - return p_150891_0_ == null ? 0 : field_150901_e.func_148757_b(p_150891_0_); diff --git a/fml/patches/minecraft/net/minecraft/item/ItemEmptyMap.java.patch b/fml/patches/minecraft/net/minecraft/item/ItemEmptyMap.java.patch deleted file mode 100644 index dce46dfd0..000000000 --- a/fml/patches/minecraft/net/minecraft/item/ItemEmptyMap.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/item/ItemEmptyMap.java -+++ ../src-work/minecraft/net/minecraft/item/ItemEmptyMap.java -@@ -24,7 +24,7 @@ - p_77659_2_.func_72823_a(s, mapdata); - mapdata.field_76197_d = 0; - mapdata.func_176054_a(p_77659_3_.field_70165_t, p_77659_3_.field_70161_v, mapdata.field_76197_d); -- mapdata.field_76200_c = (byte)p_77659_2_.field_73011_w.func_177502_q(); -+ mapdata.field_76200_c = p_77659_2_.field_73011_w.func_177502_q(); - mapdata.func_76185_a(); - --p_77659_1_.field_77994_a; - diff --git a/fml/patches/minecraft/net/minecraft/item/ItemMap.java.patch b/fml/patches/minecraft/net/minecraft/item/ItemMap.java.patch deleted file mode 100644 index 9201f5bba..000000000 --- a/fml/patches/minecraft/net/minecraft/item/ItemMap.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/item/ItemMap.java -+++ ../src-work/minecraft/net/minecraft/item/ItemMap.java -@@ -58,7 +58,7 @@ - mapdata = new MapData(s); - mapdata.field_76197_d = 3; - mapdata.func_176054_a((double)p_77873_2_.func_72912_H().func_76079_c(), (double)p_77873_2_.func_72912_H().func_76074_e(), mapdata.field_76197_d); -- mapdata.field_76200_c = (byte)p_77873_2_.field_73011_w.func_177502_q(); -+ mapdata.field_76200_c = p_77873_2_.field_73011_w.func_177502_q(); - mapdata.func_76185_a(); - p_77873_2_.func_72823_a(s, mapdata); - } diff --git a/fml/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.java.patch b/fml/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.java.patch deleted file mode 100644 index eae24e0ab..000000000 --- a/fml/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.java.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/item/ItemMonsterPlacer.java -+++ ../src-work/minecraft/net/minecraft/item/ItemMonsterPlacer.java -@@ -39,7 +39,7 @@ - public String func_77653_i(ItemStack p_77653_1_) - { - String s = ("" + StatCollector.func_74838_a(this.func_77658_a() + ".name")).trim(); -- String s1 = EntityList.func_75617_a(p_77653_1_.func_77960_j()); -+ String s1 = ItemMonsterPlacer.getEntityName(p_77653_1_); - - if (s1 != null) - { -@@ -52,7 +52,7 @@ - @SideOnly(Side.CLIENT) - public int func_82790_a(ItemStack p_82790_1_, int p_82790_2_) - { -- EntityList.EntityEggInfo entityegginfo = (EntityList.EntityEggInfo)EntityList.field_75627_a.get(Integer.valueOf(p_82790_1_.func_77960_j())); -+ EntityList.EntityEggInfo entityegginfo = ItemMonsterPlacer.getEggInfo(p_82790_1_); - return entityegginfo != null ? (p_82790_2_ == 0 ? entityegginfo.field_75611_b : entityegginfo.field_75612_c) : 16777215; - } - -@@ -77,7 +77,7 @@ - if (tileentity instanceof TileEntityMobSpawner) - { - MobSpawnerBaseLogic mobspawnerbaselogic = ((TileEntityMobSpawner)tileentity).func_145881_a(); -- mobspawnerbaselogic.func_98272_a(EntityList.func_75617_a(p_180614_1_.func_77960_j())); -+ mobspawnerbaselogic.func_98272_a(ItemMonsterPlacer.getEntityName(p_180614_1_)); - tileentity.func_70296_d(); - p_180614_3_.func_175689_h(p_180614_4_); - -@@ -98,7 +98,7 @@ - d0 = 0.5D; - } - -- Entity entity = func_77840_a(p_180614_3_, p_180614_1_.func_77960_j(), (double)p_180614_4_.func_177958_n() + 0.5D, (double)p_180614_4_.func_177956_o() + d0, (double)p_180614_4_.func_177952_p() + 0.5D); -+ Entity entity = spawnCreature(p_180614_3_, ItemMonsterPlacer.getEntityName(p_180614_1_), (double)p_180614_4_.func_177958_n() + 0.5D, (double)p_180614_4_.func_177956_o() + d0, (double)p_180614_4_.func_177952_p() + 0.5D); - - if (entity != null) - { -@@ -149,7 +149,7 @@ - - if (p_77659_2_.func_180495_p(blockpos).func_177230_c() instanceof BlockLiquid) - { -- Entity entity = func_77840_a(p_77659_2_, p_77659_1_.func_77960_j(), (double)blockpos.func_177958_n() + 0.5D, (double)blockpos.func_177956_o() + 0.5D, (double)blockpos.func_177952_p() + 0.5D); -+ Entity entity = spawnCreature(p_77659_2_, ItemMonsterPlacer.getEntityName(p_77659_1_), (double)blockpos.func_177958_n() + 0.5D, (double)blockpos.func_177956_o() + 0.5D, (double)blockpos.func_177952_p() + 0.5D); - - if (entity != null) - { -@@ -173,19 +173,29 @@ - } - } - -+ @Deprecated // Use string version below. - public static Entity func_77840_a(World p_77840_0_, int p_77840_1_, double p_77840_2_, double p_77840_4_, double p_77840_6_) - { - if (!EntityList.field_75627_a.containsKey(Integer.valueOf(p_77840_1_))) - { - return null; - } -+ return spawnCreature(p_77840_0_, EntityList.func_75617_a(p_77840_1_), p_77840_2_, p_77840_4_, p_77840_6_); -+ } -+ -+ public static Entity spawnCreature(World p_77840_0_, String name, double p_77840_2_, double p_77840_4_, double p_77840_6_) -+ { -+ if (!EntityList.field_75625_b.containsKey(name)) -+ { -+ return null; -+ } - else - { - Entity entity = null; - - for (int j = 0; j < 1; ++j) - { -- entity = EntityList.func_75616_a(p_77840_1_, p_77840_0_); -+ entity = EntityList.func_75620_a(name, p_77840_0_); - - if (entity instanceof EntityLivingBase) - { -@@ -213,5 +223,28 @@ - EntityList.EntityEggInfo entityegginfo = (EntityList.EntityEggInfo)iterator.next(); - p_150895_3_.add(new ItemStack(p_150895_1_, 1, entityegginfo.field_75613_a)); - } -+ -+ for (String name : net.minecraftforge.fml.common.registry.EntityRegistry.getEggs().keySet()) -+ { -+ ItemStack stack = new ItemStack(p_150895_1_); -+ net.minecraft.nbt.NBTTagCompound nbt = new net.minecraft.nbt.NBTTagCompound(); -+ nbt.func_74778_a("entity_name", name); -+ stack.func_77982_d(nbt); -+ p_150895_3_.add(stack); -+ } - } -+ -+ private static String getEntityName(ItemStack stack) -+ { -+ if (stack.func_77942_o() && stack.func_77978_p().func_150297_b("entity_name", 8)) -+ return stack.func_77978_p().func_74779_i("entity_name"); -+ return EntityList.func_75617_a(stack.func_77960_j()); -+ } -+ -+ private static EntityList.EntityEggInfo getEggInfo(ItemStack stack) -+ { -+ if (stack.func_77942_o() && stack.func_77978_p().func_150297_b("entity_name", 8)) -+ return net.minecraftforge.fml.common.registry.EntityRegistry.getEggs().get(stack.func_77978_p().func_74779_i("entity_name")); -+ return (EntityList.EntityEggInfo)EntityList.field_75627_a.get(stack.func_77960_j()); -+ } - } diff --git a/fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch b/fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch deleted file mode 100644 index 64974a752..000000000 --- a/fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/item/ItemStack.java -+++ ../src-work/minecraft/net/minecraft/item/ItemStack.java -@@ -52,6 +52,7 @@ - private boolean field_179551_k; - private static final String __OBFID = "CL_00000043"; - -+ private net.minecraftforge.fml.common.registry.RegistryDelegate delegate; - public ItemStack(Block p_i1876_1_) - { - this(p_i1876_1_, 1); -@@ -83,7 +84,7 @@ - this.field_179553_i = false; - this.field_179550_j = null; - this.field_179551_k = false; -- this.field_151002_e = p_i1881_1_; -+ this.func_150996_a(p_i1881_1_); - this.field_77994_a = p_i1881_2_; - this.field_77991_e = p_i1881_3_; - -@@ -123,7 +124,7 @@ - - public Item func_77973_b() - { -- return this.field_151002_e; -+ return this.delegate != null ? this.delegate.get() : null; - } - - public boolean func_179546_a(EntityPlayer p_179546_1_, World p_179546_2_, BlockPos p_179546_3_, EnumFacing p_179546_4_, float p_179546_5_, float p_179546_6_, float p_179546_7_) -@@ -172,11 +173,11 @@ - { - if (p_77963_1_.func_150297_b("id", 8)) - { -- this.field_151002_e = Item.func_111206_d(p_77963_1_.func_74779_i("id")); -+ this.func_150996_a(Item.func_111206_d(p_77963_1_.func_74779_i("id"))); - } - else - { -- this.field_151002_e = Item.func_150899_d(p_77963_1_.func_74765_d("id")); -+ this.func_150996_a(Item.func_150899_d(p_77963_1_.func_74765_d("id"))); - } - - this.field_77994_a = p_77963_1_.func_74771_c("Count"); -@@ -870,6 +871,7 @@ - - public void func_150996_a(Item p_150996_1_) - { -+ this.delegate = p_150996_1_ != null ? p_150996_1_.delegate : null; - this.field_151002_e = p_150996_1_; - } - diff --git a/fml/patches/minecraft/net/minecraft/network/NetworkManager.java.patch b/fml/patches/minecraft/net/minecraft/network/NetworkManager.java.patch deleted file mode 100644 index b37433cda..000000000 --- a/fml/patches/minecraft/net/minecraft/network/NetworkManager.java.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/network/NetworkManager.java -+++ ../src-work/minecraft/net/minecraft/network/NetworkManager.java -@@ -88,6 +88,11 @@ - this.field_179294_g = p_i46004_1_; - } - -+ public EnumPacketDirection getDirection() -+ { -+ return this.field_179294_g; -+ } -+ - public void channelActive(ChannelHandlerContext p_channelActive_1_) throws Exception - { - super.channelActive(p_channelActive_1_); -@@ -175,7 +180,7 @@ - final EnumConnectionState enumconnectionstate = EnumConnectionState.func_150752_a(p_150732_1_); - final EnumConnectionState enumconnectionstate1 = (EnumConnectionState)this.field_150746_k.attr(field_150739_c).get(); - -- if (enumconnectionstate1 != enumconnectionstate) -+ if (enumconnectionstate1 != enumconnectionstate && !( p_150732_1_ instanceof net.minecraftforge.fml.common.network.internal.FMLProxyPacket)) - { - field_150735_g.debug("Disabled auto read"); - this.field_150746_k.config().setAutoRead(false); -@@ -183,7 +188,7 @@ - - if (this.field_150746_k.eventLoop().inEventLoop()) - { -- if (enumconnectionstate != enumconnectionstate1) -+ if (enumconnectionstate != enumconnectionstate1 && !( p_150732_1_ instanceof net.minecraftforge.fml.common.network.internal.FMLProxyPacket)) - { - this.func_150723_a(enumconnectionstate); - } -@@ -204,7 +209,7 @@ - private static final String __OBFID = "CL_00001243"; - public void run() - { -- if (enumconnectionstate != enumconnectionstate1) -+ if (enumconnectionstate != enumconnectionstate1 && !( p_150732_1_ instanceof net.minecraftforge.fml.common.network.internal.FMLProxyPacket)) - { - NetworkManager.this.func_150723_a(enumconnectionstate); - } -@@ -409,6 +414,11 @@ - this.channelRead0(p_channelRead0_1_, (Packet)p_channelRead0_2_); - } - -+ public Channel channel() -+ { -+ return field_150746_k; -+ } -+ - static class InboundHandlerTuplePacketListener - { - private final Packet field_150774_a; diff --git a/fml/patches/minecraft/net/minecraft/network/NetworkSystem.java.patch b/fml/patches/minecraft/net/minecraft/network/NetworkSystem.java.patch deleted file mode 100644 index 9452bc6bc..000000000 --- a/fml/patches/minecraft/net/minecraft/network/NetworkSystem.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/network/NetworkSystem.java -+++ ../src-work/minecraft/net/minecraft/network/NetworkSystem.java -@@ -110,7 +110,7 @@ - ; - } - -- p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer(EnumPacketDirection.SERVERBOUND)).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer(EnumPacketDirection.CLIENTBOUND)); -+ p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.READ_TIMEOUT)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer(EnumPacketDirection.SERVERBOUND)).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer(EnumPacketDirection.CLIENTBOUND)); - NetworkManager networkmanager = new NetworkManager(EnumPacketDirection.SERVERBOUND); - NetworkSystem.this.field_151272_f.add(networkmanager); - p_initChannel_1_.pipeline().addLast("packet_handler", networkmanager); diff --git a/fml/patches/minecraft/net/minecraft/network/ServerStatusResponse.java.patch b/fml/patches/minecraft/net/minecraft/network/ServerStatusResponse.java.patch deleted file mode 100644 index ad72405fe..000000000 --- a/fml/patches/minecraft/net/minecraft/network/ServerStatusResponse.java.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/network/ServerStatusResponse.java -+++ ../src-work/minecraft/net/minecraft/network/ServerStatusResponse.java -@@ -233,6 +233,7 @@ - serverstatusresponse.func_151320_a(JsonUtils.func_151200_h(jsonobject, "favicon")); - } - -+ net.minecraftforge.fml.client.FMLClientHandler.instance().captureAdditionalData(serverstatusresponse, jsonobject); - return serverstatusresponse; - } - -@@ -260,6 +261,7 @@ - jsonobject.addProperty("favicon", p_serialize_1_.func_151316_d()); - } - -+ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.enhanceStatusQuery(jsonobject); - return jsonobject; - } - diff --git a/fml/patches/minecraft/net/minecraft/network/handshake/client/C00Handshake.java.patch b/fml/patches/minecraft/net/minecraft/network/handshake/client/C00Handshake.java.patch deleted file mode 100644 index 2e990c3ad..000000000 --- a/fml/patches/minecraft/net/minecraft/network/handshake/client/C00Handshake.java.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/network/handshake/client/C00Handshake.java -+++ ../src-work/minecraft/net/minecraft/network/handshake/client/C00Handshake.java -@@ -16,6 +16,7 @@ - private int field_149599_c; - private EnumConnectionState field_149597_d; - private static final String __OBFID = "CL_00001372"; -+ private boolean hasFMLMarker = false; - - public C00Handshake() {} - -@@ -28,18 +29,26 @@ - this.field_149597_d = p_i45266_4_; - } - -+ public C00Handshake(int protocol, String address, int port, EnumConnectionState state, boolean addFMLMarker) -+ { -+ this(protocol, address, port, state); -+ this.hasFMLMarker = addFMLMarker; -+ } -+ - public void func_148837_a(PacketBuffer p_148837_1_) throws IOException - { - this.field_149600_a = p_148837_1_.func_150792_a(); - this.field_149598_b = p_148837_1_.func_150789_c(255); - this.field_149599_c = p_148837_1_.readUnsignedShort(); - this.field_149597_d = EnumConnectionState.func_150760_a(p_148837_1_.func_150792_a()); -+ this.hasFMLMarker = this.field_149598_b.contains("\0FML\0"); -+ this.field_149598_b = this.field_149598_b.split("\0")[0]; - } - - public void func_148840_b(PacketBuffer p_148840_1_) throws IOException - { - p_148840_1_.func_150787_b(this.field_149600_a); -- p_148840_1_.func_180714_a(this.field_149598_b); -+ p_148840_1_.func_180714_a(this.field_149598_b + "\0FML\0"); - p_148840_1_.writeShort(this.field_149599_c); - p_148840_1_.func_150787_b(this.field_149597_d.func_150759_c()); - } -@@ -63,4 +72,9 @@ - { - this.func_180770_a((INetHandlerHandshakeServer)p_148833_1_); - } -+ -+ public boolean hasFMLMarker() -+ { -+ return this.hasFMLMarker; -+ } - } diff --git a/fml/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.java.patch b/fml/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.java.patch deleted file mode 100644 index 1345ee125..000000000 --- a/fml/patches/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.java.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.java -+++ ../src-work/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.java -@@ -47,7 +47,11 @@ - public void func_148840_b(PacketBuffer p_148840_1_) throws IOException - { - p_148840_1_.func_180714_a(this.field_149562_a); -+ synchronized(this.field_149561_c) { //This may be access multiple times, from multiple threads, lets be safe. -+ this.field_149561_c.markReaderIndex(); - p_148840_1_.writeBytes((ByteBuf)this.field_149561_c); -+ this.field_149561_c.resetReaderIndex(); -+ } - } - - public void func_148833_a(INetHandlerPlayServer p_148833_1_) diff --git a/fml/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java.patch b/fml/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java.patch deleted file mode 100644 index ae048b6b5..000000000 --- a/fml/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java -+++ ../src-work/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java -@@ -46,7 +46,11 @@ - public void func_148840_b(PacketBuffer p_148840_1_) throws IOException - { - p_148840_1_.func_180714_a(this.field_149172_a); -+ synchronized(this.field_149171_b) { //This may be access multiple times, from multiple threads, lets be safe. -+ this.field_149171_b.markReaderIndex(); - p_148840_1_.writeBytes((ByteBuf)this.field_149171_b); -+ this.field_149171_b.resetReaderIndex(); -+ } - } - - public void func_180734_a(INetHandlerPlayClient p_180734_1_) diff --git a/fml/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch b/fml/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch deleted file mode 100644 index 0e3324da7..000000000 --- a/fml/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/realms/RealmsConnect.java -+++ ../src-work/minecraft/net/minecraft/realms/RealmsConnect.java -@@ -39,6 +39,7 @@ - - try - { -+ net.minecraftforge.fml.client.FMLClientHandler.instance().connectToRealmsServer(p_connect_1_, p_connect_2_); - inetaddress = InetAddress.getByName(p_connect_1_); - - if (RealmsConnect.this.aborted) -@@ -60,7 +61,7 @@ - return; - } - -- RealmsConnect.this.connection.func_179290_a(new C00Handshake(47, p_connect_1_, p_connect_2_, EnumConnectionState.LOGIN)); -+ RealmsConnect.this.connection.func_179290_a(new C00Handshake(47, p_connect_1_, p_connect_2_, EnumConnectionState.LOGIN, true)); - - if (RealmsConnect.this.aborted) - { diff --git a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch deleted file mode 100644 index 55f72e5d5..000000000 --- a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch +++ /dev/null @@ -1,115 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/server/MinecraftServer.java -+++ ../src-work/minecraft/net/minecraft/server/MinecraftServer.java -@@ -399,7 +399,7 @@ - - public void func_71260_j() - { -- if (!this.field_71290_O) -+ if (!this.field_71290_O && net.minecraftforge.fml.common.Loader.instance().hasReachedState(net.minecraftforge.fml.common.LoaderState.SERVER_STARTED) && !field_71316_v) // make sure the save is valid and we don't save twice - { - field_147145_h.info("Stopping server"); - -@@ -456,6 +456,7 @@ - { - if (this.func_71197_b()) - { -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStarted(); - this.field_175591_ab = func_130071_aq(); - long i = 0L; - this.field_147147_p.func_151315_a(new ChatComponentText(this.field_71286_C)); -@@ -500,12 +501,20 @@ - Thread.sleep(Math.max(1L, 50L - i)); - this.field_71296_Q = true; - } -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStopping(); -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions - } - else - { -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions - this.func_71228_a((CrashReport)null); - } - } -+ catch (net.minecraftforge.fml.common.StartupQuery.AbortedException e) -+ { -+ // ignore silently -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions -+ } - catch (Throwable throwable1) - { - field_147145_h.error("Encountered an unexpected exception", throwable1); -@@ -531,6 +540,7 @@ - field_147145_h.error("We were unable to save this crash report to disk."); - } - -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions - this.func_71228_a(crashreport); - } - finally -@@ -546,6 +556,8 @@ - } - finally - { -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStopped(); -+ this.field_71316_v = true; - this.func_71240_o(); - } - } -@@ -591,6 +603,7 @@ - public void func_71217_p() - { - long i = System.nanoTime(); -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreServerTick(); - ++this.field_71315_w; - - if (this.field_71295_T) -@@ -644,6 +657,7 @@ - - this.field_71304_b.func_76319_b(); - this.field_71304_b.func_76319_b(); -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostServerTick(); - } - - public void func_71190_q() -@@ -657,7 +671,7 @@ - { - try - { -- ((FutureTask)this.field_175589_i.poll()).run(); -+ net.minecraftforge.fml.common.FMLCommonHandler.callFuture(((FutureTask)this.field_175589_i.poll())); - } - catch (Throwable throwable2) - { -@@ -686,6 +700,7 @@ - } - - this.field_71304_b.func_76320_a("tick"); -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreWorldTick(worldserver); - CrashReport crashreport; - - try -@@ -710,6 +725,7 @@ - throw new ReportedException(crashreport); - } - -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostWorldTick(worldserver); - this.field_71304_b.func_76319_b(); - this.field_71304_b.func_76320_a("tracker"); - worldserver.func_73039_n().func_72788_a(); -@@ -741,6 +757,7 @@ - - public void func_71256_s() - { -+ net.minecraftforge.fml.common.StartupQuery.reset(); - this.field_175590_aa = new Thread(this, "Server thread"); - this.field_175590_aa.start(); - } -@@ -787,7 +804,7 @@ - - public String getServerModName() - { -- return "vanilla"; -+ return net.minecraftforge.fml.common.FMLCommonHandler.instance().getModName(); - } - - public CrashReport func_71230_b(CrashReport p_71230_1_) diff --git a/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch b/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch deleted file mode 100644 index 1af800c17..000000000 --- a/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/server/dedicated/DedicatedServer.java -+++ ../src-work/minecraft/net/minecraft/server/dedicated/DedicatedServer.java -@@ -49,6 +49,7 @@ - private boolean field_71338_p; - private WorldSettings.GameType field_71337_q; - private boolean field_71335_s; -+ public static boolean allowPlayerLogins = false; - private static final String __OBFID = "CL_00001784"; - - public DedicatedServer(File p_i1508_1_) -@@ -113,6 +114,8 @@ - field_155771_h.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); - } - -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onServerStart(this); -+ - 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")); -@@ -204,6 +207,7 @@ - } - else - { -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onServerStarted(); - this.func_152361_a(new DedicatedPlayerList(this)); - long j = System.nanoTime(); - -@@ -250,6 +254,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())); -+ if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerAboutToStart(this)) return false; - 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; -@@ -278,7 +283,7 @@ - thread1.start(); - } - -- return true; -+ return net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStarting(this); - } - } - } diff --git a/fml/patches/minecraft/net/minecraft/server/gui/MinecraftServerGui.java.patch b/fml/patches/minecraft/net/minecraft/server/gui/MinecraftServerGui.java.patch deleted file mode 100644 index 1caa6d7a0..000000000 --- a/fml/patches/minecraft/net/minecraft/server/gui/MinecraftServerGui.java.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/server/gui/MinecraftServerGui.java -+++ ../src-work/minecraft/net/minecraft/server/gui/MinecraftServerGui.java -@@ -79,6 +79,7 @@ - System.exit(0); - } - }); -+ minecraftservergui.latch.countDown(); - } - - public MinecraftServerGui(DedicatedServer p_i2362_1_) -@@ -164,8 +165,13 @@ - return jpanel; - } - -+ private java.util.concurrent.CountDownLatch latch = new java.util.concurrent.CountDownLatch(1); - public void func_164247_a(final JTextArea p_164247_1_, final JScrollPane p_164247_2_, final String p_164247_3_) - { -+ try -+ { -+ latch.await(); -+ } catch (InterruptedException e){} //Prevent logging until after constructor has ended. - if (!SwingUtilities.isEventDispatchThread()) - { - SwingUtilities.invokeLater(new Runnable() diff --git a/fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch b/fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch deleted file mode 100644 index 4f0ce861c..000000000 --- a/fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/server/integrated/IntegratedServer.java -+++ ../src-work/minecraft/net/minecraft/server/integrated/IntegratedServer.java -@@ -144,9 +144,10 @@ - this.func_71245_h(true); - field_147148_h.info("Generating keypair"); - this.func_71253_a(CryptManager.func_75891_b()); -+ if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerAboutToStart(this)) return false; - this.func_71247_a(this.func_71270_I(), this.func_71221_J(), this.field_71350_m.func_77160_d(), this.field_71350_m.func_77165_h(), this.field_71350_m.func_82749_j()); - this.func_71205_p(this.func_71214_G() + " - " + this.field_71305_c[0].func_72912_H().func_76065_j()); -- return true; -+ return net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStarting(this); - } - - public void func_71217_p() -@@ -171,7 +172,7 @@ - { - try - { -- ((FutureTask)this.field_175589_i.poll()).run(); -+ net.minecraftforge.fml.common.FMLCommonHandler.callFuture(((FutureTask)this.field_175589_i.poll())); - } - catch (Throwable throwable) - { diff --git a/fml/patches/minecraft/net/minecraft/server/management/PlayerProfileCache.java.patch b/fml/patches/minecraft/net/minecraft/server/management/PlayerProfileCache.java.patch deleted file mode 100644 index 93c276883..000000000 --- a/fml/patches/minecraft/net/minecraft/server/management/PlayerProfileCache.java.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/server/management/PlayerProfileCache.java -+++ ../src-work/minecraft/net/minecraft/server/management/PlayerProfileCache.java -@@ -204,26 +204,12 @@ - { - List list = null; - BufferedReader bufferedreader = null; -- label64: - { - try - { - bufferedreader = Files.newReader(this.field_152665_g, Charsets.UTF_8); - list = (List)this.field_152660_b.fromJson(bufferedreader, field_152666_h); -- break label64; -- } -- catch (FileNotFoundException filenotfoundexception) -- { -- ; -- } -- finally -- { -- IOUtils.closeQuietly(bufferedreader); -- } - -- return; -- } -- - if (list != null) - { - this.field_152661_c.clear(); -@@ -242,6 +228,20 @@ - } - } - } -+ } -+ catch (FileNotFoundException filenotfoundexception) -+ { -+ ; -+ } -+ catch (com.google.gson.JsonParseException parsefail) -+ { -+ // No op - the cache can quietly rebuild if it's junk -+ } -+ finally -+ { -+ IOUtils.closeQuietly(bufferedreader); -+ } -+ } - } - - public void func_152658_c() diff --git a/fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch b/fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch deleted file mode 100644 index 259097c60..000000000 --- a/fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/server/management/ServerConfigurationManager.java -+++ ../src-work/minecraft/net/minecraft/server/management/ServerConfigurationManager.java -@@ -103,7 +103,7 @@ - this.field_72405_c = 8; - } - -- public void func_72355_a(NetworkManager p_72355_1_, EntityPlayerMP p_72355_2_) -+ public void func_72355_a(NetworkManager p_72355_1_, EntityPlayerMP p_72355_2_, NetHandlerPlayServer nethandlerplayserver) - { - GameProfile gameprofile = p_72355_2_.func_146103_bH(); - PlayerProfileCache playerprofilecache = this.field_72400_f.func_152358_ax(); -@@ -125,7 +125,7 @@ - WorldInfo worldinfo = worldserver.func_72912_H(); - BlockPos blockpos = worldserver.func_175694_M(); - this.func_72381_a(p_72355_2_, (EntityPlayerMP)null, worldserver); -- NetHandlerPlayServer nethandlerplayserver = new NetHandlerPlayServer(this.field_72400_f, p_72355_1_, p_72355_2_); -+ p_72355_2_.field_71135_a = nethandlerplayserver; - nethandlerplayserver.func_147359_a(new S01PacketJoinGame(p_72355_2_.func_145782_y(), p_72355_2_.field_71134_c.func_73081_b(), worldinfo.func_76093_s(), worldserver.field_73011_w.func_177502_q(), worldserver.func_175659_aa(), this.func_72352_l(), worldinfo.func_76067_t(), worldserver.func_82736_K().func_82766_b("reducedDebugInfo"))); - nethandlerplayserver.func_147359_a(new S3FPacketCustomPayload("MC|Brand", (new PacketBuffer(Unpooled.buffer())).func_180714_a(this.func_72365_p().getServerModName()))); - nethandlerplayserver.func_147359_a(new S41PacketServerDifficulty(worldinfo.func_176130_y(), worldinfo.func_176123_z())); -@@ -168,6 +168,7 @@ - - p_72355_2_.func_71116_b(); - -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerLoggedIn(p_72355_2_); - if (nbttagcompound != null && nbttagcompound.func_150297_b("Riding", 10)) - { - Entity entity = EntityList.func_75615_a(nbttagcompound.func_74775_l("Riding"), worldserver); -@@ -281,8 +282,23 @@ - return nbttagcompound1; - } - -+ public NBTTagCompound getPlayerNBT(EntityPlayerMP player) -+ { -+ // Hacky method to allow loading the NBT for a player prior to login -+ NBTTagCompound nbttagcompound = this.field_72400_f.field_71305_c[0].func_72912_H().func_76072_h(); -+ if (player.func_70005_c_().equals(this.field_72400_f.func_71214_G()) && nbttagcompound != null) -+ { -+ return nbttagcompound; -+ } -+ else -+ { -+ return ((net.minecraft.world.storage.SaveHandler)this.field_72412_k).getPlayerNBT(player); -+ } -+ } - protected void func_72391_b(EntityPlayerMP p_72391_1_) - { -+ if (p_72391_1_.field_71135_a == null) return; -+ - this.field_72412_k.func_75753_a(p_72391_1_); - StatisticsFile statisticsfile = (StatisticsFile)this.field_148547_k.get(p_72391_1_.func_110124_au()); - -@@ -315,6 +331,7 @@ - - public void func_72367_e(EntityPlayerMP p_72367_1_) - { -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerLoggedOut(p_72367_1_); - p_72367_1_.func_71029_a(StatList.field_75947_j); - this.func_72391_b(p_72367_1_); - WorldServer worldserver = p_72367_1_.func_71121_q(); -@@ -473,6 +490,7 @@ - this.field_177454_f.put(entityplayermp1.func_110124_au(), entityplayermp1); - entityplayermp1.func_71116_b(); - entityplayermp1.func_70606_j(entityplayermp1.func_110143_aJ()); -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1); - return entityplayermp1; - } - -@@ -498,6 +516,7 @@ - PotionEffect potioneffect = (PotionEffect)iterator.next(); - p_72356_1_.field_71135_a.func_147359_a(new S1DPacketEntityEffect(p_72356_1_.func_145782_y(), potioneffect)); - } -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerChangedDimensionEvent(p_72356_1_, j, p_72356_2_); - } - - public void func_82448_a(Entity p_82448_1_, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_) diff --git a/fml/patches/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java.patch b/fml/patches/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java.patch deleted file mode 100644 index 855a224f4..000000000 --- a/fml/patches/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java -+++ ../src-work/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java -@@ -23,6 +23,8 @@ - - public void func_147383_a(C00Handshake p_147383_1_) - { -+ if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerHandshake(p_147383_1_, this.field_147386_b)) return; -+ - switch (NetHandlerHandshakeTCP.SwitchEnumConnectionState.field_151291_a[p_147383_1_.func_149594_c().ordinal()]) - { - case 1: diff --git a/fml/patches/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java.patch b/fml/patches/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java.patch deleted file mode 100644 index b77bfc330..000000000 --- a/fml/patches/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java -+++ ../src-work/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java -@@ -62,7 +62,7 @@ - this.func_147326_c(); - } - -- if (this.field_147336_h++ == 600) -+ if (this.field_147336_h++ == net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.LOGIN_TIMEOUT) - { - this.func_147322_a("Took too long to log in"); - } -@@ -113,7 +113,7 @@ - } - - this.field_147333_a.func_179290_a(new S02PacketLoginSuccess(this.field_147337_i)); -- this.field_147327_f.func_71203_ab().func_72355_a(this.field_147333_a, this.field_147327_f.func_71203_ab().func_148545_a(this.field_147337_i)); -+ net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.fmlServerHandshake(this.field_147327_f.func_71203_ab(), this.field_147333_a, this.field_147327_f.func_71203_ab().func_148545_a(this.field_147337_i)); - } - } - diff --git a/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch b/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch deleted file mode 100644 index 7d8e85837..000000000 --- a/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/tileentity/TileEntity.java -+++ ../src-work/minecraft/net/minecraft/tileentity/TileEntity.java -@@ -89,9 +89,10 @@ - { - TileEntity tileentity = null; - -+ Class oclass = null; - try - { -- Class oclass = (Class)field_145855_i.get(p_145827_0_.func_74779_i("id")); -+ oclass = (Class)field_145855_i.get(p_145827_0_.func_74779_i("id")); - - if (oclass != null) - { -@@ -109,7 +110,17 @@ - } - else - { -+ try -+ { - field_145852_a.warn("Skipping BlockEntity with id " + p_145827_0_.func_74779_i("id")); -+ } -+ catch (Exception ex) -+ { -+ net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, ex, -+ "A TileEntity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author", -+ p_145827_0_.func_74779_i("id"), oclass.getName()); -+ tileentity = null; -+ } - } - - return tileentity; -@@ -141,7 +152,6 @@ - } - } - -- @SideOnly(Side.CLIENT) - public double func_145835_a(double p_145835_1_, double p_145835_3_, double p_145835_5_) - { - double d3 = (double)this.field_174879_c.func_177958_n() + 0.5D - p_145835_1_; diff --git a/fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch b/fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch deleted file mode 100644 index 244db3b50..000000000 --- a/fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/tileentity/TileEntityFurnace.java -+++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityFurnace.java -@@ -348,7 +348,15 @@ - } - } - -- return item instanceof ItemTool && ((ItemTool)item).func_77861_e().equals("WOOD") ? 200 : (item instanceof ItemSword && ((ItemSword)item).func_150932_j().equals("WOOD") ? 200 : (item instanceof ItemHoe && ((ItemHoe)item).func_77842_f().equals("WOOD") ? 200 : (item == Items.field_151055_y ? 100 : (item == Items.field_151044_h ? 1600 : (item == Items.field_151129_at ? 20000 : (item == Item.func_150898_a(Blocks.field_150345_g) ? 100 : (item == Items.field_151072_bj ? 2400 : 0))))))); -+ if (item instanceof ItemTool && ((ItemTool)item).func_77861_e().equals("WOOD")) return 200; -+ if (item instanceof ItemSword && ((ItemSword)item).func_150932_j().equals("WOOD")) return 200; -+ if (item instanceof ItemHoe && ((ItemHoe)item).func_77842_f().equals("WOOD")) return 200; -+ if (item == Items.field_151055_y) return 100; -+ if (item == Items.field_151044_h) return 1600; -+ if (item == Items.field_151129_at) return 20000; -+ if (item == Item.func_150898_a(Blocks.field_150345_g)) return 100; -+ if (item == Items.field_151072_bj) return 2400; -+ return net.minecraftforge.fml.common.registry.GameRegistry.getFuelValue(p_145952_0_); - } - } - diff --git a/fml/patches/minecraft/net/minecraft/util/MessageSerializer.java.patch b/fml/patches/minecraft/net/minecraft/util/MessageSerializer.java.patch deleted file mode 100644 index 7724ff4c7..000000000 --- a/fml/patches/minecraft/net/minecraft/util/MessageSerializer.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/util/MessageSerializer.java -+++ ../src-work/minecraft/net/minecraft/util/MessageSerializer.java -@@ -49,7 +49,7 @@ - { - if (p_encode_2_ instanceof S0CPacketSpawnPlayer) - { -- p_encode_2_ = p_encode_2_; -+ //p_encode_2_ = p_encode_2_; FML: Kill warning - } - - p_encode_2_.func_148840_b(packetbuffer); diff --git a/fml/patches/minecraft/net/minecraft/util/MouseHelper.java.patch b/fml/patches/minecraft/net/minecraft/util/MouseHelper.java.patch deleted file mode 100644 index 55d49a58d..000000000 --- a/fml/patches/minecraft/net/minecraft/util/MouseHelper.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/util/MouseHelper.java -+++ ../src-work/minecraft/net/minecraft/util/MouseHelper.java -@@ -14,6 +14,7 @@ - - public void func_74372_a() - { -+ if (Boolean.parseBoolean(System.getProperty("fml.noGrab","false"))) return; - Mouse.setGrabbed(true); - this.field_74377_a = 0; - this.field_74375_b = 0; diff --git a/fml/patches/minecraft/net/minecraft/util/ResourceLocation.java.patch b/fml/patches/minecraft/net/minecraft/util/ResourceLocation.java.patch deleted file mode 100644 index ba2981731..000000000 --- a/fml/patches/minecraft/net/minecraft/util/ResourceLocation.java.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/util/ResourceLocation.java -+++ ../src-work/minecraft/net/minecraft/util/ResourceLocation.java -@@ -1,7 +1,5 @@ - package net.minecraft.util; - --import net.minecraftforge.fml.relauncher.Side; --import net.minecraftforge.fml.relauncher.SideOnly; - import org.apache.commons.lang3.Validate; - - public class ResourceLocation -@@ -22,7 +20,6 @@ - this(0, func_177516_a(p_i1293_1_)); - } - -- @SideOnly(Side.CLIENT) - public ResourceLocation(String p_i1292_1_, String p_i1292_2_) - { - this(0, new String[] {p_i1292_1_, p_i1292_2_}); -@@ -51,7 +48,6 @@ - return this.field_110625_b; - } - -- @SideOnly(Side.CLIENT) - public String func_110624_b() - { - return this.field_110626_a; diff --git a/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch b/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch deleted file mode 100644 index cbdfc628a..000000000 --- a/fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/util/StringTranslate.java -+++ ../src-work/minecraft/net/minecraft/util/StringTranslate.java -@@ -18,16 +18,38 @@ - { - private static final Pattern field_111053_a = Pattern.compile("%(\\d+\\$)?[\\d\\.]*[df]"); - private static final Splitter field_135065_b = Splitter.on('=').limit(2); -+ private final Map field_74816_c; - private static StringTranslate field_74817_a = new StringTranslate(); -- private final Map field_74816_c = Maps.newHashMap(); - private long field_150511_e; - private static final String __OBFID = "CL_00001212"; - - public StringTranslate() - { -+ InputStream inputstream = StringTranslate.class.getResourceAsStream("/assets/minecraft/lang/en_US.lang"); -+ field_74816_c = Maps.newHashMap(); -+ inject(this, inputstream); -+ } -+ -+ public static void inject(InputStream inputstream) -+ { -+ inject(field_74817_a, inputstream); -+ } -+ -+ private static void inject(StringTranslate inst, InputStream inputstream) -+ { -+ java.util.HashMap map = parseLangFile(inputstream); -+ inst.field_74816_c.putAll(map); -+ inst.field_150511_e = System.currentTimeMillis(); -+ } -+ -+ public static java.util.HashMap parseLangFile(InputStream inputstream) -+ { -+ java.util.HashMap table = Maps.newHashMap(); - try - { -- InputStream inputstream = StringTranslate.class.getResourceAsStream("/assets/minecraft/lang/en_US.lang"); -+ inputstream = net.minecraftforge.fml.common.FMLCommonHandler.instance().loadLanguage(table, inputstream); -+ if (inputstream == null) return table; -+ - Iterator iterator = IOUtils.readLines(inputstream, Charsets.UTF_8).iterator(); - - while (iterator.hasNext()) -@@ -42,17 +64,17 @@ - { - String s1 = astring[0]; - String s2 = field_111053_a.matcher(astring[1]).replaceAll("%$1s"); -- this.field_74816_c.put(s1, s2); -+ table.put(s1, s2); - } - } - } - -- this.field_150511_e = System.currentTimeMillis(); - } -- catch (IOException ioexception) -+ catch (Exception ioexception) - { - ; - } -+ return table; - } - - static StringTranslate func_74808_a() diff --git a/fml/patches/minecraft/net/minecraft/world/World.java.patch b/fml/patches/minecraft/net/minecraft/world/World.java.patch deleted file mode 100644 index b7c78b9f3..000000000 --- a/fml/patches/minecraft/net/minecraft/world/World.java.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/world/World.java -+++ ../src-work/minecraft/net/minecraft/world/World.java -@@ -1626,8 +1626,6 @@ - } - } - -- this.field_147481_N = false; -- - if (!this.field_147483_b.isEmpty()) - { - this.field_175730_i.removeAll(this.field_147483_b); -@@ -1635,6 +1633,8 @@ - this.field_147483_b.clear(); - } - -+ this.field_147481_N = false; //FML Move below remove to prevent CMEs -+ - this.field_72984_F.func_76318_c("pendingBlockEntities"); - - if (!this.field_147484_a.isEmpty()) -@@ -3429,7 +3429,7 @@ - @SideOnly(Side.CLIENT) - public double func_72919_O() - { -- return this.field_72986_A.func_76067_t() == WorldType.field_77138_c ? 0.0D : 63.0D; -+ return this.field_72986_A.func_76067_t().getHorizon(this); - } - - public void func_175715_c(int p_175715_1_, BlockPos p_175715_2_, int p_175715_3_) diff --git a/fml/patches/minecraft/net/minecraft/world/WorldProvider.java.patch b/fml/patches/minecraft/net/minecraft/world/WorldProvider.java.patch deleted file mode 100644 index 2f2668b79..000000000 --- a/fml/patches/minecraft/net/minecraft/world/WorldProvider.java.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/world/WorldProvider.java -+++ ../src-work/minecraft/net/minecraft/world/WorldProvider.java -@@ -52,26 +52,12 @@ - - protected void func_76572_b() - { -- WorldType worldtype = this.field_76579_a.func_72912_H().func_76067_t(); -- -- if (worldtype == WorldType.field_77138_c) -- { -- FlatGeneratorInfo flatgeneratorinfo = FlatGeneratorInfo.func_82651_a(this.field_76579_a.func_72912_H().func_82571_y()); -- this.field_76578_c = new WorldChunkManagerHell(BiomeGenBase.func_180276_a(flatgeneratorinfo.func_82648_a(), BiomeGenBase.field_180279_ad), 0.5F); -- } -- else if (worldtype == WorldType.field_180272_g) -- { -- this.field_76578_c = new WorldChunkManagerHell(BiomeGenBase.field_76772_c, 0.0F); -- } -- else -- { -- this.field_76578_c = new WorldChunkManager(this.field_76579_a); -- } -+ this.field_76578_c = field_76577_b.getChunkManager(field_76579_a); - } - - public IChunkProvider func_76555_c() - { -- return (IChunkProvider)(this.field_76577_b == WorldType.field_77138_c ? new ChunkProviderFlat(this.field_76579_a, this.field_76579_a.func_72905_C(), this.field_76579_a.func_72912_H().func_76089_r(), this.field_82913_c) : (this.field_76577_b == WorldType.field_180272_g ? new ChunkProviderDebug(this.field_76579_a) : (this.field_76577_b == WorldType.field_180271_f ? new ChunkProviderGenerate(this.field_76579_a, this.field_76579_a.func_72905_C(), this.field_76579_a.func_72912_H().func_76089_r(), this.field_82913_c) : new ChunkProviderGenerate(this.field_76579_a, this.field_76579_a.func_72905_C(), this.field_76579_a.func_72912_H().func_76089_r(), this.field_82913_c)))); -+ return field_76577_b.getChunkGenerator(field_76579_a, field_82913_c); - } - - public boolean func_76566_a(int p_76566_1_, int p_76566_2_) -@@ -177,13 +163,13 @@ - - public int func_76557_i() - { -- return this.field_76577_b == WorldType.field_77138_c ? 4 : 64; -+ return this.field_76577_b.getMinimumSpawnHeight(this.field_76579_a); - } - - @SideOnly(Side.CLIENT) - public double func_76565_k() - { -- return this.field_76577_b == WorldType.field_77138_c ? 1.0D : 0.03125D; -+ return this.field_76577_b.voidFadeMagnitude(); - } - - @SideOnly(Side.CLIENT) diff --git a/fml/patches/minecraft/net/minecraft/world/WorldType.java.patch b/fml/patches/minecraft/net/minecraft/world/WorldType.java.patch deleted file mode 100644 index 5053a737c..000000000 --- a/fml/patches/minecraft/net/minecraft/world/WorldType.java.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/world/WorldType.java -+++ ../src-work/minecraft/net/minecraft/world/WorldType.java -@@ -114,4 +114,53 @@ - this.field_151361_l = true; - return this; - } -+ -+ public net.minecraft.world.biome.WorldChunkManager getChunkManager(World world) -+ { -+ if (this == field_77138_c) -+ { -+ net.minecraft.world.gen.FlatGeneratorInfo flatgeneratorinfo = net.minecraft.world.gen.FlatGeneratorInfo.func_82651_a(world.func_72912_H().func_82571_y()); -+ return new net.minecraft.world.biome.WorldChunkManagerHell(net.minecraft.world.biome.BiomeGenBase.func_180276_a(flatgeneratorinfo.func_82648_a(), net.minecraft.world.biome.BiomeGenBase.field_180279_ad), 0.5F); -+ } -+ else if (this == field_180272_g) -+ { -+ return new net.minecraft.world.biome.WorldChunkManagerHell(net.minecraft.world.biome.BiomeGenBase.field_76772_c, 0.0F); -+ } -+ else -+ { -+ return new net.minecraft.world.biome.WorldChunkManager(world); -+ } -+ } -+ -+ public net.minecraft.world.chunk.IChunkProvider getChunkGenerator(World world, String generatorOptions) -+ { -+ if (this == field_77138_c) return new net.minecraft.world.gen.ChunkProviderFlat(world, world.func_72905_C(), world.func_72912_H().func_76089_r(), generatorOptions); -+ if (this == field_180272_g) return new net.minecraft.world.gen.ChunkProviderDebug(world); -+ return new net.minecraft.world.gen.ChunkProviderGenerate(world, world.func_72905_C(), world.func_72912_H().func_76089_r(), generatorOptions); -+ } -+ -+ public int getMinimumSpawnHeight(World world) -+ { -+ return this == field_77138_c ? 4 : 64; -+ } -+ -+ public double getHorizon(World world) -+ { -+ return this == field_77138_c ? 0.0D : 63.0D; -+ } -+ -+ public double voidFadeMagnitude() -+ { -+ return this == field_77138_c ? 1.0D : 0.03125D; -+ } -+ -+ public boolean handleSlimeSpawnReduction(java.util.Random random, World world) -+ { -+ return this == field_77138_c ? random.nextInt(4) != 1 : false; -+ } -+ -+ /** -+ * Called when 'Create New World' button is pressed before starting game -+ */ -+ public void onGUICreateWorldPress() { } - } diff --git a/fml/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch b/fml/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch deleted file mode 100644 index 01d1962a6..000000000 --- a/fml/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java -+++ ../src-work/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java -@@ -287,11 +287,20 @@ - Entity entity = (Entity)iterator.next(); - nbttagcompound1 = new NBTTagCompound(); - -+ try -+ { - if (entity.func_70039_c(nbttagcompound1)) - { - p_75820_1_.func_177409_g(true); - nbttaglist1.func_74742_a(nbttagcompound1); - } -+ } -+ catch (Exception e) -+ { -+ net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e, -+ "An Entity type %s has thrown an exception trying to write state. It will not persist. Report this to the mod author", -+ entity.getClass().getName()); -+ } - } - } - -@@ -303,8 +312,17 @@ - { - TileEntity tileentity = (TileEntity)iterator.next(); - nbttagcompound1 = new NBTTagCompound(); -+ try -+ { - tileentity.func_145841_b(nbttagcompound1); - nbttaglist2.func_74742_a(nbttagcompound1); -+ } -+ catch (Exception e) -+ { -+ net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e, -+ "A TileEntity type %s has throw an exception trying to write state. It will not persist. Report this to the mod author", -+ tileentity.getClass().getName()); -+ } - } - - p_75820_3_.func_74782_a("TileEntities", nbttaglist2); diff --git a/fml/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch b/fml/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch deleted file mode 100644 index 931c0bc1d..000000000 --- a/fml/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/world/gen/ChunkProviderServer.java -+++ ../src-work/minecraft/net/minecraft/world/gen/ChunkProviderServer.java -@@ -209,6 +209,7 @@ - if (this.field_73246_d != null) - { - this.field_73246_d.func_73153_a(p_73153_1_, p_73153_2_, p_73153_3_); -+ net.minecraftforge.fml.common.registry.GameRegistry.generateWorld(p_73153_2_, p_73153_3_, field_73251_h, field_73246_d, p_73153_1_); - chunk.func_76630_e(); - } - } diff --git a/fml/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch b/fml/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch deleted file mode 100644 index 0050eacf0..000000000 --- a/fml/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java -+++ ../src-work/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java -@@ -59,6 +59,8 @@ - arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.Field2.class, 3, MathHelper.func_76136_a(p_75084_0_, 2 + p_75084_1_, 4 + p_75084_1_ * 2))); - arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.House2.class, 15, MathHelper.func_76136_a(p_75084_0_, 0, 1 + p_75084_1_))); - arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.House3.class, 8, MathHelper.func_76136_a(p_75084_0_, 0 + p_75084_1_, 3 + p_75084_1_ * 2))); -+ net.minecraftforge.fml.common.registry.VillagerRegistry.addExtraVillageComponents(arraylist, p_75084_0_, p_75084_1_); -+ - Iterator iterator = arraylist.iterator(); - - while (iterator.hasNext()) -@@ -132,6 +134,10 @@ - { - object = StructureVillagePieces.House3.func_175849_a(p_176065_0_, p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_); - } -+ else -+ { -+ object = net.minecraftforge.fml.common.registry.VillagerRegistry.getVillageComponent(p_176065_1_, p_176065_0_ , p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_); -+ } - - return (StructureVillagePieces.Village)object; - } diff --git a/fml/patches/minecraft/net/minecraft/world/storage/MapData.java.patch b/fml/patches/minecraft/net/minecraft/world/storage/MapData.java.patch deleted file mode 100644 index e23138bc9..000000000 --- a/fml/patches/minecraft/net/minecraft/world/storage/MapData.java.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/world/storage/MapData.java -+++ ../src-work/minecraft/net/minecraft/world/storage/MapData.java -@@ -22,7 +22,7 @@ - { - public int field_76201_a; - public int field_76199_b; -- public byte field_76200_c; -+ public int field_76200_c; //FML byte -> int - public byte field_76197_d; - public byte[] field_76198_e = new byte[16384]; - public List field_76196_g = Lists.newArrayList(); -@@ -46,7 +46,17 @@ - - public void func_76184_a(NBTTagCompound p_76184_1_) - { -- this.field_76200_c = p_76184_1_.func_74771_c("dimension"); -+ net.minecraft.nbt.NBTBase dimension = p_76184_1_.func_74781_a("dimension"); -+ -+ if (dimension instanceof net.minecraft.nbt.NBTTagByte) -+ { -+ this.field_76200_c = ((net.minecraft.nbt.NBTTagByte)dimension).func_150290_f(); -+ } -+ else -+ { -+ this.field_76200_c = ((net.minecraft.nbt.NBTTagInt)dimension).func_150287_d(); -+ } -+ - this.field_76201_a = p_76184_1_.func_74762_e("xCenter"); - this.field_76199_b = p_76184_1_.func_74762_e("zCenter"); - this.field_76197_d = p_76184_1_.func_74771_c("scale"); -@@ -87,7 +97,7 @@ - - public void func_76187_b(NBTTagCompound p_76187_1_) - { -- p_76187_1_.func_74774_a("dimension", this.field_76200_c); -+ p_76187_1_.func_74768_a("dimension", this.field_76200_c); - p_76187_1_.func_74768_a("xCenter", this.field_76201_a); - p_76187_1_.func_74768_a("zCenter", this.field_76199_b); - p_76187_1_.func_74774_a("scale", this.field_76197_d); diff --git a/fml/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch b/fml/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch deleted file mode 100644 index 6b8e86b5c..000000000 --- a/fml/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/world/storage/SaveHandler.java -+++ ../src-work/minecraft/net/minecraft/world/storage/SaveHandler.java -@@ -107,20 +107,29 @@ - NBTTagCompound nbttagcompound; - NBTTagCompound nbttagcompound1; - -+ WorldInfo worldInfo = null; -+ - if (file1.exists()) - { - try - { - nbttagcompound = CompressedStreamTools.func_74796_a(new FileInputStream(file1)); - nbttagcompound1 = nbttagcompound.func_74775_l("Data"); -- return new WorldInfo(nbttagcompound1); -+ worldInfo = new WorldInfo(nbttagcompound1); -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound); -+ return worldInfo; - } -+ catch (net.minecraftforge.fml.common.StartupQuery.AbortedException e) -+ { -+ throw e; -+ } - catch (Exception exception1) - { - exception1.printStackTrace(); - } - } - -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().confirmBackupLevelDatUse(this); - file1 = new File(this.field_75770_b, "level.dat_old"); - - if (file1.exists()) -@@ -129,7 +138,13 @@ - { - nbttagcompound = CompressedStreamTools.func_74796_a(new FileInputStream(file1)); - nbttagcompound1 = nbttagcompound.func_74775_l("Data"); -- return new WorldInfo(nbttagcompound1); -+ worldInfo = new WorldInfo(nbttagcompound1); -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound); -+ return worldInfo; -+ } -+ catch (net.minecraftforge.fml.common.StartupQuery.AbortedException e) -+ { -+ throw e; - } - catch (Exception exception) - { -@@ -146,6 +161,8 @@ - NBTTagCompound nbttagcompound2 = new NBTTagCompound(); - nbttagcompound2.func_74782_a("Data", nbttagcompound1); - -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataSave(this, p_75755_1_, nbttagcompound2); -+ - try - { - File file1 = new File(this.field_75770_b, "level.dat_new"); -@@ -184,6 +201,8 @@ - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - nbttagcompound1.func_74782_a("Data", nbttagcompound); - -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataSave(this, p_75761_1_, nbttagcompound1); -+ - try - { - File file1 = new File(this.field_75770_b, "level.dat_new"); -@@ -301,4 +320,22 @@ - { - return this.field_75767_f; - } -+ -+ public NBTTagCompound getPlayerNBT(net.minecraft.entity.player.EntityPlayerMP player) -+ { -+ try -+ { -+ File file1 = new File(this.field_75771_c, player.func_110124_au().toString() + ".dat"); -+ -+ if (file1.exists() && file1.isFile()) -+ { -+ return CompressedStreamTools.func_74796_a(new FileInputStream(file1)); -+ } -+ } -+ catch (Exception exception) -+ { -+ field_151478_a.warn("Failed to load player data for " + player.func_70005_c_()); -+ } -+ return null; -+ } - } diff --git a/fml/patches/minecraft/net/minecraft/world/storage/WorldInfo.java.patch b/fml/patches/minecraft/net/minecraft/world/storage/WorldInfo.java.patch deleted file mode 100644 index b1d007002..000000000 --- a/fml/patches/minecraft/net/minecraft/world/storage/WorldInfo.java.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/world/storage/WorldInfo.java -+++ ../src-work/minecraft/net/minecraft/world/storage/WorldInfo.java -@@ -52,6 +52,7 @@ - private int field_176155_J; - private GameRules field_82577_x; - private static final String __OBFID = "CL_00000587"; -+ private java.util.Map additionalProperties; - - protected WorldInfo() - { -@@ -803,4 +804,24 @@ - } - }); - } -+ -+ /** -+ * Allow access to additional mod specific world based properties -+ * Used by FML to store mod list associated with a world, and maybe an id map -+ * Used by Forge to store the dimensions available to a world -+ * @param additionalProperties -+ */ -+ public void setAdditionalProperties(java.util.Map additionalProperties) -+ { -+ // one time set for this -+ if (this.additionalProperties == null) -+ { -+ this.additionalProperties = additionalProperties; -+ } -+ } -+ -+ public net.minecraft.nbt.NBTBase getAdditionalProperty(String additionalProperty) -+ { -+ return this.additionalProperties!=null? this.additionalProperties.get(additionalProperty) : null; -+ } - } diff --git a/fml/jsons/1.6-dev.json b/jsons/1.6-dev.json similarity index 100% rename from fml/jsons/1.6-dev.json rename to jsons/1.6-dev.json diff --git a/fml/jsons/1.6-rel.json b/jsons/1.6-rel.json similarity index 100% rename from fml/jsons/1.6-rel.json rename to jsons/1.6-rel.json diff --git a/fml/jsons/1.6.1-dev.json b/jsons/1.6.1-dev.json similarity index 100% rename from fml/jsons/1.6.1-dev.json rename to jsons/1.6.1-dev.json diff --git a/fml/jsons/1.6.1-rel.json b/jsons/1.6.1-rel.json similarity index 100% rename from fml/jsons/1.6.1-rel.json rename to jsons/1.6.1-rel.json diff --git a/fml/jsons/1.6.2-dev.json b/jsons/1.6.2-dev.json similarity index 100% rename from fml/jsons/1.6.2-dev.json rename to jsons/1.6.2-dev.json diff --git a/fml/jsons/1.6.2-rel.json b/jsons/1.6.2-rel.json similarity index 100% rename from fml/jsons/1.6.2-rel.json rename to jsons/1.6.2-rel.json diff --git a/fml/jsons/1.6.3-dev.json b/jsons/1.6.3-dev.json similarity index 100% rename from fml/jsons/1.6.3-dev.json rename to jsons/1.6.3-dev.json diff --git a/fml/jsons/1.6.3-rel.json b/jsons/1.6.3-rel.json similarity index 100% rename from fml/jsons/1.6.3-rel.json rename to jsons/1.6.3-rel.json diff --git a/fml/jsons/1.6.4-dev.json b/jsons/1.6.4-dev.json similarity index 100% rename from fml/jsons/1.6.4-dev.json rename to jsons/1.6.4-dev.json diff --git a/fml/jsons/1.6.4-rel.json b/jsons/1.6.4-rel.json similarity index 100% rename from fml/jsons/1.6.4-rel.json rename to jsons/1.6.4-rel.json diff --git a/fml/jsons/1.7.10-dev.json b/jsons/1.7.10-dev.json similarity index 100% rename from fml/jsons/1.7.10-dev.json rename to jsons/1.7.10-dev.json diff --git a/fml/jsons/1.7.10-pre3-dev.json b/jsons/1.7.10-pre3-dev.json similarity index 100% rename from fml/jsons/1.7.10-pre3-dev.json rename to jsons/1.7.10-pre3-dev.json diff --git a/fml/jsons/1.7.10-pre3.json b/jsons/1.7.10-pre3.json similarity index 100% rename from fml/jsons/1.7.10-pre3.json rename to jsons/1.7.10-pre3.json diff --git a/fml/jsons/1.7.10-pre4-dev.json b/jsons/1.7.10-pre4-dev.json similarity index 100% rename from fml/jsons/1.7.10-pre4-dev.json rename to jsons/1.7.10-pre4-dev.json diff --git a/fml/jsons/1.7.10-pre4-rel.json b/jsons/1.7.10-pre4-rel.json similarity index 100% rename from fml/jsons/1.7.10-pre4-rel.json rename to jsons/1.7.10-pre4-rel.json diff --git a/fml/jsons/1.7.10-pre4.json b/jsons/1.7.10-pre4.json similarity index 100% rename from fml/jsons/1.7.10-pre4.json rename to jsons/1.7.10-pre4.json diff --git a/fml/jsons/1.7.10-rel.json b/jsons/1.7.10-rel.json similarity index 100% rename from fml/jsons/1.7.10-rel.json rename to jsons/1.7.10-rel.json diff --git a/fml/jsons/1.7.10.json b/jsons/1.7.10.json similarity index 100% rename from fml/jsons/1.7.10.json rename to jsons/1.7.10.json diff --git a/fml/jsons/1.7.2-dev.json b/jsons/1.7.2-dev.json similarity index 100% rename from fml/jsons/1.7.2-dev.json rename to jsons/1.7.2-dev.json diff --git a/fml/jsons/1.7.2-rel.json b/jsons/1.7.2-rel.json similarity index 100% rename from fml/jsons/1.7.2-rel.json rename to jsons/1.7.2-rel.json diff --git a/fml/jsons/1.7.2.json b/jsons/1.7.2.json similarity index 100% rename from fml/jsons/1.7.2.json rename to jsons/1.7.2.json diff --git a/fml/jsons/1.7.9-dev.json b/jsons/1.7.9-dev.json similarity index 100% rename from fml/jsons/1.7.9-dev.json rename to jsons/1.7.9-dev.json diff --git a/fml/jsons/1.7.9-rel.json b/jsons/1.7.9-rel.json similarity index 100% rename from fml/jsons/1.7.9-rel.json rename to jsons/1.7.9-rel.json diff --git a/fml/jsons/1.7.9.json b/jsons/1.7.9.json similarity index 100% rename from fml/jsons/1.7.9.json rename to jsons/1.7.9.json diff --git a/fml/jsons/1.8-dev.json b/jsons/1.8-dev.json similarity index 100% rename from fml/jsons/1.8-dev.json rename to jsons/1.8-dev.json diff --git a/fml/jsons/1.8-rel.json b/jsons/1.8-rel.json similarity index 100% rename from fml/jsons/1.8-rel.json rename to jsons/1.8-rel.json diff --git a/fml/jsons/1.8.json b/jsons/1.8.json similarity index 100% rename from fml/jsons/1.8.json rename to jsons/1.8.json diff --git a/fml/jsons/big_logo.png b/jsons/big_logo.png similarity index 100% rename from fml/jsons/big_logo.png rename to jsons/big_logo.png diff --git a/fml/install/README.txt b/mdk/README.txt similarity index 100% rename from fml/install/README.txt rename to mdk/README.txt diff --git a/fml/install/build.gradle b/mdk/build.gradle similarity index 100% rename from fml/install/build.gradle rename to mdk/build.gradle diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location b/mdk/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location similarity index 100% rename from fml/install/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location rename to mdk/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree b/mdk/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree similarity index 100% rename from fml/install/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree rename to mdk/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs rename to mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs b/mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs similarity index 100% rename from fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs rename to mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs b/mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs similarity index 100% rename from fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs rename to mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs b/mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs rename to mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs b/mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs similarity index 100% rename from fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs rename to mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs similarity index 100% rename from fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs rename to mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs b/mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs similarity index 100% rename from fml/install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs rename to mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch b/mdk/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch similarity index 100% rename from fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch rename to mdk/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch b/mdk/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch similarity index 100% rename from fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch rename to mdk/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch diff --git a/fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml b/mdk/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml similarity index 100% rename from fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml rename to mdk/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml diff --git a/fml/install/src/main/java/com/example/examplemod/ExampleMod.java b/mdk/src/main/java/com/example/examplemod/ExampleMod.java similarity index 100% rename from fml/install/src/main/java/com/example/examplemod/ExampleMod.java rename to mdk/src/main/java/com/example/examplemod/ExampleMod.java diff --git a/fml/install/src/main/resources/mcmod.info b/mdk/src/main/resources/mcmod.info similarity index 100% rename from fml/install/src/main/resources/mcmod.info rename to mdk/src/main/resources/mcmod.info