From 86ccfb1d682137290692989dcd92d21503bd5e7a Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Mon, 7 Jul 2014 18:55:24 -0700 Subject: [PATCH] Made EmeraldOre respect isReplaceableOreGen. Closes #1157 --- .../net/minecraft/client/Minecraft.java.patch | 18 +++++++++--------- .../world/biome/BiomeGenHills.java.patch | 11 +++++++++++ 2 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 patches/minecraft/net/minecraft/world/biome/BiomeGenHills.java.patch diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index fb443a4c9a..9ec8287970 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -56,7 +56,7 @@ if (p_147108_1_ instanceof GuiMainMenu) { this.field_71474_y.field_74330_P = false; -@@ -1342,7 +1347,7 @@ +@@ -1341,7 +1346,7 @@ if (this.field_71439_g.func_82246_f(i, j, k)) { @@ -65,7 +65,7 @@ this.field_71439_g.func_71038_i(); } } -@@ -1423,11 +1428,12 @@ +@@ -1422,11 +1427,12 @@ int j = this.field_71476_x.field_72312_c; int k = this.field_71476_x.field_72309_d; @@ -80,7 +80,7 @@ { flag = false; this.field_71439_g.func_71038_i(); -@@ -1454,7 +1460,8 @@ +@@ -1453,7 +1459,8 @@ { ItemStack itemstack1 = this.field_71439_g.field_71071_by.func_70448_g(); @@ -90,7 +90,7 @@ { this.field_71460_t.field_78516_c.func_78445_c(); } -@@ -1666,6 +1673,8 @@ +@@ -1665,6 +1672,8 @@ while (Mouse.next()) { @@ -99,7 +99,7 @@ j = Mouse.getEventButton(); KeyBinding.func_74510_a(j - 100, Mouse.getEventButtonState()); -@@ -2128,6 +2137,11 @@ +@@ -2127,6 +2136,11 @@ public void func_71353_a(WorldClient p_71353_1_, String p_71353_2_) { @@ -111,7 +111,7 @@ if (p_71353_1_ == null) { NetHandlerPlayClient nethandlerplayclient = this.func_147114_u(); -@@ -2140,6 +2154,18 @@ +@@ -2139,6 +2153,18 @@ if (this.field_71437_Z != null) { this.field_71437_Z.func_71263_m(); @@ -130,7 +130,7 @@ } this.field_71437_Z = null; -@@ -2288,113 +2314,10 @@ +@@ -2287,113 +2313,10 @@ if (this.field_71476_x != null) { boolean flag = this.field_71439_g.field_71075_bZ.field_75098_d; @@ -246,7 +246,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; -@@ -2660,8 +2583,15 @@ +@@ -2659,8 +2582,15 @@ p_70001_1_.func_152767_b("gl_max_texture_size", Integer.valueOf(func_71369_N())); } @@ -262,7 +262,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); -@@ -2669,6 +2599,7 @@ +@@ -2668,6 +2598,7 @@ if (j != 0) { diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.java.patch new file mode 100644 index 0000000000..4930e6e2e5 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.java.patch @@ -0,0 +1,11 @@ +--- ../src-base/minecraft/net/minecraft/world/biome/BiomeGenHills.java ++++ ../src-work/minecraft/net/minecraft/world/biome/BiomeGenHills.java +@@ -55,7 +55,7 @@ + j1 = p_76728_2_.nextInt(28) + 4; + int k1 = p_76728_4_ + p_76728_2_.nextInt(16); + +- if (p_76728_1_.func_147439_a(i1, j1, k1) == Blocks.field_150348_b) ++ if (p_76728_1_.func_147439_a(i1, j1, k1).isReplaceableOreGen(p_76728_1_, i1, j1, k1, Blocks.field_150348_b)) + { + p_76728_1_.func_147465_d(i1, j1, k1, Blocks.field_150412_bA, 0, 2); + }