diff --git a/fml b/fml index 89cda92561..58a4095f56 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 89cda92561eb38876a68ecc2814fdf2df38df5ab +Subproject commit 58a4095f56930cb27f7a06db5409ca7d570761cd diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 6569649b8b..b69cba71a7 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -72,7 +72,7 @@ if (p_147108_1_ instanceof GuiMainMenu) { this.field_71474_y.field_74330_P = false; -@@ -1296,7 +1310,7 @@ +@@ -1297,7 +1311,7 @@ if (this.field_71439_g.func_82246_f(i, j, k)) { @@ -81,7 +81,7 @@ this.field_71439_g.func_71038_i(); } } -@@ -1377,11 +1391,12 @@ +@@ -1378,11 +1392,12 @@ int j = this.field_71476_x.field_72312_c; int k = this.field_71476_x.field_72309_d; @@ -96,7 +96,7 @@ { flag = false; this.field_71439_g.func_71038_i(); -@@ -1408,7 +1423,8 @@ +@@ -1409,7 +1424,8 @@ { ItemStack itemstack1 = this.field_71439_g.field_71071_by.func_70448_g(); @@ -106,7 +106,7 @@ { this.field_71460_t.field_78516_c.func_78445_c(); } -@@ -1607,6 +1623,8 @@ +@@ -1608,6 +1624,8 @@ while (Mouse.next()) { @@ -115,7 +115,7 @@ i = Mouse.getEventButton(); if (field_142025_a && i == 0 && (Keyboard.isKeyDown(29) || Keyboard.isKeyDown(157))) -@@ -2074,6 +2092,11 @@ +@@ -2075,6 +2093,11 @@ public void func_71353_a(WorldClient p_71353_1_, String p_71353_2_) { @@ -127,7 +127,7 @@ if (p_71353_1_ == null) { NetHandlerPlayClient nethandlerplayclient = this.func_147114_u(); -@@ -2086,6 +2109,18 @@ +@@ -2087,6 +2110,18 @@ if (this.field_71437_Z != null) { this.field_71437_Z.func_71263_m(); @@ -146,7 +146,7 @@ } this.field_71437_Z = null; -@@ -2234,113 +2269,10 @@ +@@ -2235,113 +2270,10 @@ if (this.field_71476_x != null) { boolean flag = this.field_71439_g.field_71075_bZ.field_75098_d; @@ -262,7 +262,7 @@ if (flag) { j = this.field_71439_g.field_71069_bz.field_75151_b.size() - 9 + this.field_71439_g.field_71071_by.field_70461_c; -@@ -2507,8 +2439,15 @@ +@@ -2508,8 +2440,15 @@ p_70001_1_.func_76472_a("gl_max_texture_size", Integer.valueOf(func_71369_N())); } @@ -278,7 +278,7 @@ for (int i = 16384; i > 0; i >>= 1) { GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null); -@@ -2516,6 +2455,7 @@ +@@ -2517,6 +2456,7 @@ if (j != 0) { diff --git a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch index 80ae41c0c4..c43e2bc180 100644 --- a/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch @@ -62,8 +62,8 @@ } @@ -339,11 +365,12 @@ - int i4; - int j5; + int j4; + int l4; - for (i3 = 0; i3 < AchievementList.field_76007_e.size(); ++i3) + List achievementList = (currentPage == -1 ? minecraftAchievements : AchievementPage.getAchievementPage(currentPage).getAchievements()); @@ -79,13 +79,13 @@ k3 = achievement1.field_75991_b * 24 - l + 11; @@ -400,9 +427,9 @@ int i5; - int l4; + int j5; -- for (j5 = 0; j5 < AchievementList.field_76007_e.size(); ++j5) -+ for (j5 = 0; j5 < achievementList.size(); ++j5) +- for (l4 = 0; l4 < AchievementList.field_76007_e.size(); ++l4) ++ for (l4 = 0; l4 < achievementList.size(); ++l4) { -- Achievement achievement2 = (Achievement)AchievementList.field_76007_e.get(j5); -+ Achievement achievement2 = (Achievement)achievementList.get(j5); - l4 = achievement2.field_75993_a * 24 - k; - i5 = achievement2.field_75991_b * 24 - l; +- Achievement achievement2 = (Achievement)AchievementList.field_76007_e.get(l4); ++ Achievement achievement2 = (Achievement)achievementList.get(l4); + i5 = achievement2.field_75993_a * 24 - k; + j5 = achievement2.field_75991_b * 24 - l; diff --git a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch index 7804c622ce..e09f07a9ef 100644 --- a/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch @@ -58,8 +58,8 @@ GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glDisable(GL11.GL_LIGHTING); @@ -273,7 +292,7 @@ - RenderPlayer renderplayer; Render render; + RenderPlayer renderplayer; - if (itemstack != null && itemstack.func_77973_b() == Items.field_151098_aY) + if (itemstack != null && itemstack.func_77973_b() instanceof ItemMap) @@ -96,21 +96,21 @@ if (itemstack.func_77973_b().func_77623_v()) { - this.func_78443_a(entityclientplayermp, itemstack, 0); -- int j1 = itemstack.func_77973_b().func_82790_a(itemstack, 1); -- f10 = (float)(j1 >> 16 & 255) / 255.0F; -- f11 = (float)(j1 >> 8 & 255) / 255.0F; -- f12 = (float)(j1 & 255) / 255.0F; +- int k1 = itemstack.func_77973_b().func_82790_a(itemstack, 1); +- f10 = (float)(k1 >> 16 & 255) / 255.0F; +- f11 = (float)(k1 >> 8 & 255) / 255.0F; +- f12 = (float)(k1 & 255) / 255.0F; - GL11.glColor4f(1.0F * f10, 1.0F * f11, 1.0F * f12, 1.0F); - this.func_78443_a(entityclientplayermp, itemstack, 1); + this.renderItem(entityclientplayermp, itemstack, 0, EQUIPPED_FIRST_PERSON); + for (int x = 1; x < itemstack.func_77973_b().getRenderPasses(itemstack.func_77960_j()); x++) + { -+ int j1 = itemstack.func_77973_b().func_82790_a(itemstack, x); -+ f10 = (float)(j1 >> 16 & 255) / 255.0F; -+ f11 = (float)(j1 >> 8 & 255) / 255.0F; -+ f12 = (float)(j1 & 255) / 255.0F; ++ int k1 = itemstack.func_77973_b().func_82790_a(itemstack, 1); ++ f10 = (float)(k1 >> 16 & 255) / 255.0F; ++ f11 = (float)(k1 >> 8 & 255) / 255.0F; ++ f12 = (float)(k1 & 255) / 255.0F; + GL11.glColor4f(1.0F * f10, 1.0F * f11, 1.0F * f12, 1.0F); -+ this.renderItem(entityclientplayermp, itemstack, x, EQUIPPED_FIRST_PERSON); ++ this.renderItem(entityclientplayermp, itemstack, 1, EQUIPPED_FIRST_PERSON); + } } else diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch index b3943bec9e..58b99e1bc4 100644 --- a/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch @@ -39,8 +39,8 @@ d1 = (double)iicon.func_94212_f(); d2 = (double)iicon.func_94206_g(); @@ -2037,7 +2041,7 @@ - double d9; double d10; + double d11; - if (!World.func_147466_a(this.field_147845_a, p_147801_2_, p_147801_3_ - 1, p_147801_4_) && !Blocks.field_150480_ab.func_149844_e(this.field_147845_a, p_147801_2_, p_147801_3_ - 1, p_147801_4_)) + if (!World.func_147466_a(this.field_147845_a, p_147801_2_, p_147801_3_ - 1, p_147801_4_) && !Blocks.field_150480_ab.canCatchFire(this.field_147845_a, p_147801_2_, p_147801_3_ - 1, p_147801_4_, UP)) diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch index 5e3256f35a..3786f52afc 100644 --- a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch @@ -42,8 +42,8 @@ + { this.field_72748_H = list.size(); + } - Entity entity; int i; + Entity entity; for (i = 0; i < this.field_72769_h.field_73007_j.size(); ++i) { diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java.patch index a0150e0fbd..ef07b6e13a 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderBiped.java.patch @@ -93,19 +93,16 @@ { f1 = 0.5F; GL11.glTranslatef(0.0F, 0.1875F, -0.3125F); -@@ -285,7 +301,10 @@ - f3 = (float)(i >> 8 & 255) / 255.0F; - float f4 = (float)(i & 255) / 255.0F; - GL11.glColor4f(f2, f3, f4, 1.0F); -- this.field_76990_c.field_78721_f.func_78443_a(p_130005_1_, itemstack, j); -+ for (int x = 1; x < itemstack.func_77973_b().getRenderPasses(itemstack.func_77960_j()); x++) -+ { -+ this.field_76990_c.field_78721_f.func_78443_a(p_130005_1_, itemstack, x); -+ } - } - } - else -@@ -336,4 +355,33 @@ +@@ -278,7 +294,7 @@ + + if (itemstack.func_77973_b().func_77623_v()) + { +- for (i = 0; i <= 1; ++i) ++ for (i = 0; i < itemstack.func_77973_b().getRenderPasses(itemstack.func_77960_j()); ++i) + { + int j = itemstack.func_77973_b().func_82790_a(itemstack, i); + f2 = (float)(j >> 16 & 255) / 255.0F; +@@ -336,4 +352,33 @@ { this.func_76986_a((EntityLiving)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); } diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch index 3dfed079a7..03657defe5 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch @@ -34,8 +34,8 @@ + GL11.glTranslatef((float)p_77014_2_, (float)p_77014_4_ + f2, (float)p_77014_6_); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - float f7; float f6; + float f7; int k; + if (ForgeHooksClient.renderEntityItem(p_77014_1_, itemstack, f2, f3, field_77025_h, field_76990_c.field_78724_e, field_147909_c, b0)) @@ -178,7 +178,7 @@ GL11.glDisable(GL11.GL_ALPHA_TEST); @@ -462,8 +508,19 @@ - GL11.glColor4f(f4, f3, f, 1.0F); + GL11.glColor4f(f3, f4, f, 1.0F); } + GL11.glDisable(GL11.GL_LIGHTING); //Forge: Make sure that render states are reset, ad renderEffect can derp them up. diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch index ff5e186b57..0d298e870a 100644 --- a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch +++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch @@ -535,7 +535,7 @@ chatcomponenttext.func_150256_b().func_150241_a(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/msg " + this.func_70005_c_() + " ")); return chatcomponenttext; } -@@ -1996,6 +2152,118 @@ +@@ -2042,6 +2198,118 @@ FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z); } diff --git a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java.patch index a388bba2ad..d336c151b6 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java.patch @@ -32,8 +32,8 @@ - this.func_150515_a(p_76484_1_, p_76484_3_, p_76484_4_ - 1, p_76484_5_, Blocks.field_150346_d); + block1.onPlantGrow(p_76484_1_, p_76484_3_, p_76484_4_ - 1, p_76484_5_, p_76484_3_, p_76484_4_, p_76484_5_); int l1; - int l2; int k2; + int l2; @@ -101,7 +104,7 @@ { int j2 = i2 - p_76484_5_; diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayer.java.patch b/patches/minecraft/net/minecraft/world/gen/layer/GenLayer.java.patch index 766d2e87cb..6c4df75d5d 100644 --- a/patches/minecraft/net/minecraft/world/gen/layer/GenLayer.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayer.java.patch @@ -16,15 +16,15 @@ } + b0 = getModdedBiomeSize(p_75901_2_, b0); - GenLayer genlayer = GenLayerZoom.func_75915_a(1000L, genlayer3, 0); + GenLayer genlayer = GenLayerZoom.func_75915_a(1000L, genlayer2, 0); GenLayerRiverInit genlayerriverinit = new GenLayerRiverInit(100L, genlayer); -- Object object = new GenLayerBiome(200L, genlayer3, p_75901_2_); -+ Object object = p_75901_2_.getBiomeLayer(p_75901_0_, genlayer3); +- Object object = new GenLayerBiome(200L, genlayer2, p_75901_2_); ++ Object object = p_75901_2_.getBiomeLayer(p_75901_0_, genlayer2); - if (!flag) - { -- GenLayer genlayer2 = GenLayerZoom.func_75915_a(1000L, (GenLayer)object, 2); -- object = new GenLayerBiomeEdge(1000L, genlayer2); +- GenLayer genlayer3 = GenLayerZoom.func_75915_a(1000L, (GenLayer)object, 2); +- object = new GenLayerBiomeEdge(1000L, genlayer3); - } - GenLayer genlayer1 = GenLayerZoom.func_75915_a(1000L, genlayerriverinit, 2); diff --git a/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java.patch index 443b20d838..48b80d6219 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java.patch @@ -10,7 +10,16 @@ public class ComponentScatteredFeaturePieces { private static final String __OBFID = "CL_00000473"; -@@ -270,9 +273,12 @@ +@@ -252,7 +255,7 @@ + { + int i1 = Direction.field_71583_a[l] * 2; + int j1 = Direction.field_71581_b[l] * 2; +- this.field_74940_h[l] = this.func_74879_a(p_74875_1_, p_74875_3_, p_74875_2_, 10 + i1, -11, 10 + j1, WeightedRandomChestContent.func_92080_a(field_74941_i, new WeightedRandomChestContent[] {Items.field_151134_bR.func_92114_b(p_74875_2_)}), 2 + p_74875_2_.nextInt(5)); ++ this.field_74940_h[l] = this.func_74879_a(p_74875_1_, p_74875_3_, p_74875_2_, 10 + i1, -11, 10 + j1, ChestGenHooks.getItems(PYRAMID_DESERT_CHEST, p_74875_2_), ChestGenHooks.getCount(PYRAMID_DESERT_CHEST, p_74875_2_)); + } + } + +@@ -508,9 +511,12 @@ this.func_151550_a(p_74875_1_, Blocks.field_150488_af, 0, 4, -3, 1, p_74875_3_); this.func_151550_a(p_74875_1_, Blocks.field_150341_Y, 0, 3, -3, 1, p_74875_3_); @@ -24,7 +33,7 @@ } this.func_151550_a(p_74875_1_, Blocks.field_150395_bd, 15, 3, -2, 2, p_74875_3_); -@@ -289,7 +295,7 @@ +@@ -527,7 +533,7 @@ if (!this.field_74946_k) { @@ -33,7 +42,7 @@ } this.func_151550_a(p_74875_1_, Blocks.field_150395_bd, 15, 8, -1, 3, p_74875_3_); -@@ -297,7 +303,7 @@ +@@ -535,7 +541,7 @@ if (!this.field_74947_h) { @@ -42,7 +51,7 @@ } this.func_151550_a(p_74875_1_, Blocks.field_150341_Y, 0, 9, -3, 2, p_74875_3_); -@@ -330,7 +336,7 @@ +@@ -568,7 +574,7 @@ if (!this.field_74948_i) { @@ -51,12 +60,3 @@ } return true; -@@ -685,7 +691,7 @@ - { - int i1 = Direction.field_71583_a[l] * 2; - int j1 = Direction.field_71581_b[l] * 2; -- this.field_74940_h[l] = this.func_74879_a(p_74875_1_, p_74875_3_, p_74875_2_, 10 + i1, -11, 10 + j1, WeightedRandomChestContent.func_92080_a(field_74941_i, new WeightedRandomChestContent[] {Items.field_151134_bR.func_92114_b(p_74875_2_)}), 2 + p_74875_2_.nextInt(5)); -+ this.field_74940_h[l] = this.func_74879_a(p_74875_1_, p_74875_3_, p_74875_2_, 10 + i1, -11, 10 + j1, ChestGenHooks.getItems(PYRAMID_DESERT_CHEST, p_74875_2_), ChestGenHooks.getCount(PYRAMID_DESERT_CHEST, p_74875_2_)); - } - } - diff --git a/patches/minecraft/net/minecraft/world/gen/structure/StructureMineshaftPieces.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/StructureMineshaftPieces.java.patch index c30f7191ac..7bcc3c8c8e 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/StructureMineshaftPieces.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureMineshaftPieces.java.patch @@ -10,7 +10,7 @@ public class StructureMineshaftPieces { public static final WeightedRandomChestContent[] field_78818_a = new WeightedRandomChestContent[] {new WeightedRandomChestContent(Items.field_151042_j, 0, 1, 5, 10), new WeightedRandomChestContent(Items.field_151043_k, 0, 1, 3, 5), new WeightedRandomChestContent(Items.field_151137_ax, 0, 4, 9, 5), new WeightedRandomChestContent(Items.field_151100_aR, 4, 4, 9, 5), new WeightedRandomChestContent(Items.field_151045_i, 0, 1, 2, 3), new WeightedRandomChestContent(Items.field_151044_h, 0, 3, 8, 10), new WeightedRandomChestContent(Items.field_151025_P, 0, 1, 3, 15), new WeightedRandomChestContent(Items.field_151035_b, 0, 1, 1, 1), new WeightedRandomChestContent(Item.func_150898_a(Blocks.field_150448_aq), 0, 4, 8, 1), new WeightedRandomChestContent(Items.field_151081_bc, 0, 2, 4, 10), new WeightedRandomChestContent(Items.field_151080_bb, 0, 2, 4, 10), new WeightedRandomChestContent(Items.field_151141_av, 0, 1, 1, 3), new WeightedRandomChestContent(Items.field_151138_bX, 0, 1, 1, 1)}; -@@ -654,14 +657,15 @@ +@@ -349,14 +352,15 @@ this.func_151552_a(p_74875_1_, p_74875_3_, p_74875_2_, 0.05F, 1, 2, k - 1, Blocks.field_150478_aa, 0); this.func_151552_a(p_74875_1_, p_74875_3_, p_74875_2_, 0.05F, 1, 2, k + 1, Blocks.field_150478_aa, 0); diff --git a/patches/minecraft/net/minecraft/world/gen/structure/StructureStrongholdPieces.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/StructureStrongholdPieces.java.patch index c8e4a48861..a8950b6223 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/StructureStrongholdPieces.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureStrongholdPieces.java.patch @@ -10,7 +10,16 @@ public class StructureStrongholdPieces { private static final StructureStrongholdPieces.PieceWeight[] field_75205_b = new StructureStrongholdPieces.PieceWeight[] {new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.Straight.class, 40, 0), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.Prison.class, 5, 5), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.LeftTurn.class, 20, 0), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.RightTurn.class, 20, 0), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.RoomCrossing.class, 10, 6), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.StairsStraight.class, 5, 5), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.Stairs.class, 5, 5), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.Crossing.class, 5, 4), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.ChestCorridor.class, 5, 4), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.Library.class, 10, 2) -@@ -562,12 +565,14 @@ +@@ -305,7 +308,7 @@ + if (p_74875_3_.func_78890_b(j, i, k)) + { + this.field_75002_c = true; +- this.func_74879_a(p_74875_1_, p_74875_3_, p_74875_2_, 3, 2, 3, WeightedRandomChestContent.func_92080_a(field_75003_a, new WeightedRandomChestContent[] {Items.field_151134_bR.func_92114_b(p_74875_2_)}), 2 + p_74875_2_.nextInt(2)); ++ this.func_74879_a(p_74875_1_, p_74875_3_, p_74875_2_, 3, 2, 3, ChestGenHooks.getItems(STRONGHOLD_CORRIDOR, p_74875_2_), ChestGenHooks.getCount(STRONGHOLD_CORRIDOR, p_74875_2_)); + } + } + +@@ -744,12 +747,14 @@ this.func_151550_a(p_74875_1_, Blocks.field_150478_aa, 0, b1, 8, b2 + 1, p_74875_3_); } @@ -27,16 +36,7 @@ } return true; -@@ -788,7 +793,7 @@ - if (p_74875_3_.func_78890_b(j, i, k)) - { - this.field_75002_c = true; -- this.func_74879_a(p_74875_1_, p_74875_3_, p_74875_2_, 3, 2, 3, WeightedRandomChestContent.func_92080_a(field_75003_a, new WeightedRandomChestContent[] {Items.field_151134_bR.func_92114_b(p_74875_2_)}), 2 + p_74875_2_.nextInt(2)); -+ this.func_74879_a(p_74875_1_, p_74875_3_, p_74875_2_, 3, 2, 3, ChestGenHooks.getItems(STRONGHOLD_CORRIDOR, p_74875_2_), ChestGenHooks.getCount(STRONGHOLD_CORRIDOR, p_74875_2_)); - } - } - -@@ -938,7 +943,7 @@ +@@ -1160,7 +1165,7 @@ this.func_151550_a(p_74875_1_, Blocks.field_150468_ap, this.func_151555_a(Blocks.field_150468_ap, 4), 9, 1, 3, p_74875_3_); this.func_151550_a(p_74875_1_, Blocks.field_150468_ap, this.func_151555_a(Blocks.field_150468_ap, 4), 9, 2, 3, p_74875_3_); this.func_151550_a(p_74875_1_, Blocks.field_150468_ap, this.func_151555_a(Blocks.field_150468_ap, 4), 9, 3, 3, p_74875_3_); diff --git a/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch index 60ea211e55..69179e6bf2 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch @@ -20,7 +20,32 @@ public class StructureVillagePieces { -@@ -346,6 +350,7 @@ +@@ -927,7 +931,7 @@ + if (p_74875_3_.func_78890_b(j, i, k)) + { + this.field_74917_c = true; +- this.func_74879_a(p_74875_1_, p_74875_3_, p_74875_2_, 5, 1, 5, field_74918_a, 3 + p_74875_2_.nextInt(6)); ++ this.func_74879_a(p_74875_1_, p_74875_3_, p_74875_2_, 5, 1, 5, ChestGenHooks.getItems(VILLAGE_BLACKSMITH, p_74875_2_), ChestGenHooks.getCount(VILLAGE_BLACKSMITH, p_74875_2_)); + } + } + +@@ -1424,6 +1428,7 @@ + public List field_74932_i = new ArrayList(); + public List field_74930_j = new ArrayList(); + private static final String __OBFID = "CL_00000527"; ++ public BiomeGenBase biome; + + public Start() {} + +@@ -1435,6 +1440,7 @@ + this.field_74928_c = p_i2104_7_; + BiomeGenBase biomegenbase = p_i2104_1_.func_76935_a(p_i2104_4_, p_i2104_5_); + this.field_74927_b = biomegenbase == BiomeGenBase.field_76769_d || biomegenbase == BiomeGenBase.field_76786_s; ++ this.biome = biomegenbase; + } + + public WorldChunkManager func_74925_d() +@@ -1495,6 +1501,7 @@ private int field_74896_a; private boolean field_143014_b; private static final String __OBFID = "CL_00000531"; @@ -28,7 +53,7 @@ public Village() {} -@@ -356,6 +361,7 @@ +@@ -1505,6 +1512,7 @@ if (p_i2107_1_ != null) { this.field_143014_b = p_i2107_1_.field_74927_b; @@ -36,7 +61,7 @@ } } -@@ -469,6 +475,9 @@ +@@ -1618,6 +1626,9 @@ protected Block func_151558_b(Block p_151558_1_, int p_151558_2_) { @@ -46,7 +71,7 @@ if (this.field_143014_b) { if (p_151558_1_ == Blocks.field_150364_r || p_151558_1_ == Blocks.field_150363_s) -@@ -507,6 +516,9 @@ +@@ -1656,6 +1667,9 @@ protected int func_151557_c(Block p_151557_1_, int p_151557_2_) { @@ -56,28 +81,3 @@ if (this.field_143014_b) { if (p_151557_1_ == Blocks.field_150364_r || p_151557_1_ == Blocks.field_150363_s) -@@ -1265,7 +1277,7 @@ - if (p_74875_3_.func_78890_b(j, i, k)) - { - this.field_74917_c = true; -- this.func_74879_a(p_74875_1_, p_74875_3_, p_74875_2_, 5, 1, 5, field_74918_a, 3 + p_74875_2_.nextInt(6)); -+ this.func_74879_a(p_74875_1_, p_74875_3_, p_74875_2_, 5, 1, 5, ChestGenHooks.getItems(VILLAGE_BLACKSMITH, p_74875_2_), ChestGenHooks.getCount(VILLAGE_BLACKSMITH, p_74875_2_)); - } - } - -@@ -1306,6 +1318,7 @@ - public List field_74932_i = new ArrayList(); - public List field_74930_j = new ArrayList(); - private static final String __OBFID = "CL_00000527"; -+ public BiomeGenBase biome; - - public Start() {} - -@@ -1317,6 +1330,7 @@ - this.field_74928_c = p_i2104_7_; - BiomeGenBase biomegenbase = p_i2104_1_.func_76935_a(p_i2104_4_, p_i2104_5_); - this.field_74927_b = biomegenbase == BiomeGenBase.field_76769_d || biomegenbase == BiomeGenBase.field_76786_s; -+ this.biome = biomegenbase; - } - - public WorldChunkManager func_74925_d()