From 6a8a8a78c4d0ba4a5e83541c9ac1840c10a46db8 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 18 Nov 2012 00:17:21 -0500 Subject: [PATCH] Update FML: f348496 f348496 Fix mod display list. Shouldn't be derpy anymore. a5c31b5 Fix World patch- workaround no longer required and leftovers are bad. 2dc3f0d Cleaned up the AT config updater, should work for any setup of the MCP w --- ...src-4.5.3.446.zip => fml-src-4.5.6.448.zip | Bin 895405 -> 895212 bytes .../common/net/minecraft/src/World.java.patch | 110 +++++++++--------- 2 files changed, 55 insertions(+), 55 deletions(-) rename fml-src-4.5.3.446.zip => fml-src-4.5.6.448.zip (97%) diff --git a/fml-src-4.5.3.446.zip b/fml-src-4.5.6.448.zip similarity index 97% rename from fml-src-4.5.3.446.zip rename to fml-src-4.5.6.448.zip index cfee5a4b42cf8d45d479d65d265ef044ff3d5709..08da3fe41e9a147bc6b9ba5516bb6ee49d21a243 100644 GIT binary patch delta 14552 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 SE2RN~@*xyRe`z2v?f(b$h4rQY delta 14849 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 diff --git a/patches/common/net/minecraft/src/World.java.patch b/patches/common/net/minecraft/src/World.java.patch index 03ef588073..1b543aeec8 100644 --- a/patches/common/net/minecraft/src/World.java.patch +++ b/patches/common/net/minecraft/src/World.java.patch @@ -1,8 +1,8 @@ --- ../src_base/common/net/minecraft/src/World.java +++ ../src_work/common/net/minecraft/src/World.java -@@ -13,8 +13,30 @@ - - import com.google.common.collect.ImmutableList; +@@ -11,8 +11,30 @@ + import java.util.Random; + import java.util.Set; +import com.google.common.collect.ImmutableSetMultimap; + @@ -31,7 +31,7 @@ /** * boolean; if true updates scheduled by scheduleBlockUpdate happen immediately */ -@@ -139,6 +161,11 @@ +@@ -137,6 +159,11 @@ * Gets the biome for a given set of x/z coordinates */ public BiomeGenBase getBiomeGenForCoords(int par1, int par2) @@ -43,7 +43,7 @@ { if (this.blockExists(par1, 0, par2)) { -@@ -169,7 +196,13 @@ +@@ -167,7 +194,13 @@ this.theProfiler = par5Profiler; this.worldInfo = new WorldInfo(par4WorldSettings, par2Str); this.provider = par3WorldProvider; @@ -58,7 +58,7 @@ VillageCollection var6 = (VillageCollection)this.mapStorage.loadData(VillageCollection.class, "villages"); if (var6 == null) -@@ -183,7 +216,7 @@ +@@ -181,7 +214,7 @@ this.villageCollectionObj.func_82566_a(this); } @@ -67,7 +67,7 @@ this.chunkProvider = this.createChunkProvider(); this.calculateInitialSkylight(); this.calculateInitialWeather(); -@@ -197,7 +230,7 @@ +@@ -195,7 +228,7 @@ this.isRemote = false; this.saveHandler = par1ISaveHandler; this.theProfiler = par5Profiler; @@ -76,7 +76,7 @@ this.worldInfo = par1ISaveHandler.loadWorldInfo(); if (par4WorldProvider != null) -@@ -250,12 +283,20 @@ +@@ -248,12 +281,20 @@ this.worldInfo.setServerInitialized(true); } @@ -99,7 +99,7 @@ } else { -@@ -265,6 +306,19 @@ +@@ -263,6 +304,19 @@ this.calculateInitialSkylight(); this.calculateInitialWeather(); @@ -119,7 +119,7 @@ } /** -@@ -353,7 +407,8 @@ +@@ -351,7 +405,8 @@ */ public boolean isAirBlock(int par1, int par2, int par3) { @@ -129,7 +129,7 @@ } /** -@@ -362,7 +417,8 @@ +@@ -360,7 +415,8 @@ public boolean blockHasTileEntity(int par1, int par2, int par3) { int var4 = this.getBlockId(par1, par2, par3); @@ -139,7 +139,7 @@ } public int func_85175_e(int par1, int par2, int par3) -@@ -1104,7 +1160,7 @@ +@@ -1102,7 +1158,7 @@ */ public boolean isDaytime() { @@ -148,7 +148,7 @@ } /** -@@ -1136,7 +1192,7 @@ +@@ -1134,7 +1190,7 @@ int var12 = this.getBlockMetadata(var8, var9, var10); Block var13 = Block.blocksList[var11]; @@ -157,7 +157,7 @@ { MovingObjectPosition var14 = var13.collisionRayTrace(this, var8, var9, var10, par1Vec3, par2Vec3); -@@ -1336,6 +1392,12 @@ +@@ -1334,6 +1390,12 @@ */ public void playSoundAtEntity(Entity par1Entity, String par2Str, float par3, float par4) { @@ -170,7 +170,7 @@ if (par1Entity != null && par2Str != null) { for (int var5 = 0; var5 < this.worldAccesses.size(); ++var5) -@@ -1433,6 +1495,11 @@ +@@ -1431,6 +1493,11 @@ EntityPlayer var5 = (EntityPlayer)par1Entity; this.playerEntities.add(var5); this.updateAllPlayersSleepingFlag(); @@ -182,7 +182,7 @@ } this.getChunkFromChunkCoords(var2, var3).addEntity(par1Entity); -@@ -1676,6 +1743,12 @@ +@@ -1674,6 +1741,12 @@ * Calculates the color for the skybox */ public Vec3 getSkyColor(Entity par1Entity, float par2) @@ -195,7 +195,7 @@ { float var3 = this.getCelestialAngle(par2); float var4 = MathHelper.cos(var3 * (float)Math.PI * 2.0F) * 2.0F + 0.5F; -@@ -1771,6 +1844,12 @@ +@@ -1769,6 +1842,12 @@ @SideOnly(Side.CLIENT) public Vec3 drawClouds(float par1) { @@ -208,7 +208,7 @@ float var2 = this.getCelestialAngle(par1); float var3 = MathHelper.cos(var2 * (float)Math.PI * 2.0F) * 2.0F + 0.5F; -@@ -1849,7 +1928,7 @@ +@@ -1847,7 +1926,7 @@ { int var5 = var3.getBlockID(par1, var4, par2); @@ -217,7 +217,7 @@ { return var4 + 1; } -@@ -1864,6 +1943,12 @@ +@@ -1862,6 +1941,12 @@ * How bright are stars in the sky */ public float getStarBrightness(float par1) @@ -230,7 +230,7 @@ { float var2 = this.getCelestialAngle(par1); float var3 = 1.0F - (MathHelper.cos(var2 * (float)Math.PI * 2.0F) * 2.0F + 0.25F); -@@ -2063,7 +2148,7 @@ +@@ -2062,7 +2147,7 @@ if (var11 != null) { @@ -239,7 +239,7 @@ } } } -@@ -2073,6 +2158,10 @@ +@@ -2072,6 +2157,10 @@ if (!this.entityRemoval.isEmpty()) { @@ -250,7 +250,7 @@ this.loadedTileEntityList.removeAll(this.entityRemoval); this.entityRemoval.clear(); } -@@ -2091,7 +2180,9 @@ +@@ -2090,7 +2179,9 @@ { this.loadedTileEntityList.add(var12); } @@ -261,7 +261,7 @@ if (this.chunkExists(var12.xCoord >> 4, var12.zCoord >> 4)) { Chunk var15 = this.getChunkFromChunkCoords(var12.xCoord >> 4, var12.zCoord >> 4); -@@ -2101,8 +2192,6 @@ +@@ -2100,8 +2191,6 @@ var15.setChunkBlockTileEntity(var12.xCoord & 15, var12.yCoord, var12.zCoord & 15, var12); } } @@ -270,7 +270,7 @@ } } -@@ -2115,13 +2204,13 @@ +@@ -2114,13 +2203,13 @@ public void addTileEntity(Collection par1Collection) { @@ -291,7 +291,7 @@ } } -@@ -2141,9 +2230,17 @@ +@@ -2140,9 +2229,17 @@ { int var3 = MathHelper.floor_double(par1Entity.posX); int var4 = MathHelper.floor_double(par1Entity.posZ); @@ -312,7 +312,7 @@ { par1Entity.lastTickPosX = par1Entity.posX; par1Entity.lastTickPosY = par1Entity.posY; -@@ -2375,6 +2472,14 @@ +@@ -2374,6 +2471,14 @@ { return true; } @@ -327,7 +327,7 @@ } } } -@@ -2680,25 +2785,21 @@ +@@ -2679,25 +2784,21 @@ */ public void setBlockTileEntity(int par1, int par2, int par3, TileEntity par4TileEntity) { @@ -368,7 +368,7 @@ } } -@@ -2707,27 +2808,10 @@ +@@ -2706,27 +2807,10 @@ */ public void removeBlockTileEntity(int par1, int par2, int par3) { @@ -400,7 +400,7 @@ } } -@@ -2753,7 +2837,8 @@ +@@ -2752,7 +2836,8 @@ */ public boolean isBlockNormalCube(int par1, int par2, int par3) { @@ -410,7 +410,7 @@ } public boolean func_85174_u(int par1, int par2, int par3) -@@ -2776,8 +2861,7 @@ +@@ -2775,8 +2860,7 @@ */ public boolean doesBlockHaveSolidTopSurface(int par1, int par2, int par3) { @@ -420,7 +420,7 @@ } /** -@@ -2793,7 +2877,7 @@ +@@ -2792,7 +2876,7 @@ if (var5 != null && !var5.isEmpty()) { Block var6 = Block.blocksList[this.getBlockId(par1, par2, par3)]; @@ -429,7 +429,7 @@ } else { -@@ -2824,8 +2908,7 @@ +@@ -2823,8 +2907,7 @@ */ public void setAllowedSpawnTypes(boolean par1, boolean par2) { @@ -439,7 +439,7 @@ } /** -@@ -2841,6 +2924,11 @@ +@@ -2840,6 +2923,11 @@ */ private void calculateInitialWeather() { @@ -451,7 +451,7 @@ if (this.worldInfo.isRaining()) { this.rainingStrength = 1.0F; -@@ -2856,6 +2944,11 @@ +@@ -2855,6 +2943,11 @@ * Updates all weather states. */ protected void updateWeather() @@ -463,7 +463,7 @@ { if (!this.provider.hasNoSky) { -@@ -2958,12 +3051,14 @@ +@@ -2957,12 +3050,14 @@ public void toggleRain() { @@ -479,7 +479,7 @@ this.theProfiler.startSection("buildList"); int var1; EntityPlayer var2; -@@ -3070,6 +3165,11 @@ +@@ -3069,6 +3164,11 @@ */ public boolean canBlockFreeze(int par1, int par2, int par3, boolean par4) { @@ -491,7 +491,7 @@ BiomeGenBase var5 = this.getBiomeGenForCoords(par1, par3); float var6 = var5.getFloatTemperature(); -@@ -3127,6 +3227,11 @@ +@@ -3126,6 +3226,11 @@ * Tests whether or not snow can be placed at a given location */ public boolean canSnowAt(int par1, int par2, int par3) @@ -503,7 +503,7 @@ { BiomeGenBase var4 = this.getBiomeGenForCoords(par1, par3); float var5 = var4.getFloatTemperature(); -@@ -3220,7 +3325,7 @@ +@@ -3219,7 +3324,7 @@ private int computeBlockLightValue(int par1, int par2, int par3, int par4, int par5, int par6) { @@ -512,7 +512,7 @@ int var8 = this.getSavedLightValue(EnumSkyBlock.Block, par2 - 1, par3, par4) - par6; int var9 = this.getSavedLightValue(EnumSkyBlock.Block, par2 + 1, par3, par4) - par6; int var10 = this.getSavedLightValue(EnumSkyBlock.Block, par2, par3 - 1, par4) - par6; -@@ -3355,7 +3460,7 @@ +@@ -3354,7 +3459,7 @@ int var21 = var24 + (var18 / 2 + 1) % 3 / 2 * var19; int var22 = var12 + (var18 / 2 + 2) % 3 / 2 * var19; var14 = this.getSavedLightValue(par1EnumSkyBlock, var20, var21, var22); @@ -521,7 +521,7 @@ if (var23 == 0) { -@@ -3386,7 +3491,7 @@ +@@ -3385,7 +3490,7 @@ var12 = (var9 >> 12 & 63) - 32 + par4; var13 = this.getSavedLightValue(par1EnumSkyBlock, var10, var24, var12); var14 = this.getBlockId(var10, var24, var12); @@ -530,7 +530,7 @@ if (var15 == 0) { -@@ -3488,10 +3593,10 @@ +@@ -3487,10 +3592,10 @@ public List getEntitiesWithinAABBExcludingEntity(Entity par1Entity, AxisAlignedBB par2AxisAlignedBB) { this.entitiesWithinAABBExcludingEntity.clear(); @@ -545,7 +545,7 @@ for (int var7 = var3; var7 <= var4; ++var7) { -@@ -3517,10 +3622,10 @@ +@@ -3516,10 +3621,10 @@ public List selectEntitiesWithinAABB(Class par1Class, AxisAlignedBB par2AxisAlignedBB, IEntitySelector par3IEntitySelector) { @@ -560,7 +560,7 @@ ArrayList var8 = new ArrayList(); for (int var9 = var4; var9 <= var5; ++var9) -@@ -3613,11 +3718,14 @@ +@@ -3612,11 +3717,14 @@ */ public void addLoadedEntities(List par1List) { @@ -578,7 +578,7 @@ } } -@@ -3651,6 +3759,11 @@ +@@ -3650,6 +3758,11 @@ else { if (var9 != null && (var9 == Block.waterMoving || var9 == Block.waterStill || var9 == Block.lavaMoving || var9 == Block.lavaStill || var9 == Block.fire || var9.blockMaterial.isReplaceable())) @@ -590,7 +590,7 @@ { var9 = null; } -@@ -3868,7 +3981,7 @@ +@@ -3867,7 +3980,7 @@ */ public long getSeed() { @@ -599,7 +599,7 @@ } public long getTotalWorldTime() -@@ -3878,7 +3991,7 @@ +@@ -3877,7 +3990,7 @@ public long getWorldTime() { @@ -608,7 +608,7 @@ } /** -@@ -3886,7 +3999,7 @@ +@@ -3885,7 +3998,7 @@ */ public void setWorldTime(long par1) { @@ -617,7 +617,7 @@ } /** -@@ -3894,13 +4007,13 @@ +@@ -3893,13 +4006,13 @@ */ public ChunkCoordinates getSpawnPoint() { @@ -633,7 +633,7 @@ } @SideOnly(Side.CLIENT) -@@ -3924,7 +4037,10 @@ +@@ -3923,7 +4036,10 @@ if (!this.loadedEntityList.contains(par1Entity)) { @@ -645,7 +645,7 @@ } } -@@ -3932,6 +4048,11 @@ +@@ -3931,6 +4047,11 @@ * Called when checking if a certain block can be mined or not. The 'spawn safe zone' check is located here. */ public boolean canMineBlock(EntityPlayer par1EntityPlayer, int par2, int par3, int par4) @@ -657,7 +657,7 @@ { return true; } -@@ -4052,8 +4173,7 @@ +@@ -4051,8 +4172,7 @@ */ public boolean isBlockHighHumidity(int par1, int par2, int par3) { @@ -667,7 +667,7 @@ } /** -@@ -4115,7 +4235,7 @@ +@@ -4114,7 +4234,7 @@ */ public int getHeight() { @@ -676,7 +676,7 @@ } /** -@@ -4123,7 +4243,7 @@ +@@ -4122,7 +4242,7 @@ */ public int getActualHeight() { @@ -685,7 +685,7 @@ } public IUpdatePlayerListBox func_82735_a(EntityMinecart par1EntityMinecart) -@@ -4166,7 +4286,7 @@ +@@ -4165,7 +4285,7 @@ */ public double getHorizon() { @@ -694,7 +694,7 @@ } /** -@@ -4224,4 +4344,75 @@ +@@ -4223,4 +4343,75 @@ return this.theCalendar; }