From eb06a63222e324a79c7f8fac98c7cafcb4f634bc Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 6 Mar 2012 12:11:24 -0800 Subject: [PATCH] Updated gitignore, fixed digging particles, fixed creative container showing to many blocks, fixed wrong argument for custom renderers. --- .gitignore | 41 +------------------ .../src/ContainerCreative.java.patch | 5 ++- .../minecraft/src/EffectRenderer.java.patch | 24 +++-------- .../net/minecraft/src/RenderItem.java.patch | 12 +++--- 4 files changed, 17 insertions(+), 65 deletions(-) diff --git a/.gitignore b/.gitignore index 60195b5d64..c8f7d788d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,39 +1,2 @@ -/bin/ -/conf/ -/docs/ -/eclipse/ -/jars/ -/lib/ -/logs/ -/reobf/ -/runtime/ -/src/ -/temp/ -/CHANGELOG -/LICENSE -/cleanup.bat -/cleanup.sh -/decompile.bat -/decompile.sh -/getmodsource.bat -/getmodsource.sh -/recompile.bat -/recompile.sh -/reobfuscate.bat -/reobfuscate.sh -/startclient.bat -/startclient.sh -/startserver.bat -/startserver.sh -/updatemcp.bat -/updatemcp.sh -/updatemd5.bat -/updatemd5.sh -/updatenames.bat -/updatenames.sh -/src_base/ -/src_work/ -/getchangedsrc.bat -/getchangedsrc.sh -/reformat.bat -/reformat.sh +/* +!/forge \ No newline at end of file diff --git a/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch b/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch index 7954a7597a..8a5cf3b653 100644 --- a/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/ContainerCreative.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/ContainerCreative.java 0000-00-00 00:00:00.000000000 -0000 -@@ -57,12 +57,20 @@ +@@ -57,12 +57,21 @@ this.itemList.add(new ItemStack(var2[var10], 1, var11)); } @@ -15,10 +15,11 @@ + } + } + ++ int x = 0; + for (Item item : Item.itemsList) { - if (Item.itemsList[var10] != null && Item.itemsList[var10].shiftedIndex != Item.potion.shiftedIndex && Item.itemsList[var10].shiftedIndex != Item.monsterPlacer.shiftedIndex) -+ if (item != null) ++ if (item != null && x++ < 256) { - this.itemList.add(new ItemStack(Item.itemsList[var10])); + item.addCreativeItems((ArrayList)itemList); diff --git a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch index 0591f9742a..f9729bd5f1 100644 --- a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch @@ -42,7 +42,7 @@ } /** -@@ -102,12 +123,29 @@ +@@ -102,12 +123,30 @@ for (int var11 = 0; var11 < this.fxLayers[var8].size(); ++var11) { EntityFX var12 = (EntityFX)this.fxLayers[var8].get(var11); @@ -68,24 +68,12 @@ + tessallator.setBrightness(entryfx.getEntityBrightnessForRender(par2)); + entryfx.renderParticle(tessallator, par2, var3, var7, var4, var5, var6); + } ++ tessallator.draw(); + } } } -@@ -131,6 +169,12 @@ - var11.renderParticle(var9, par2, var3, var7, var4, var5, var6); - } - } -+ for (int x = 0; x < effectList.size(); x++) -+ { -+ BlockTextureParticles entry = (BlockTextureParticles)effectList.get(x); -+ entry.effects.clear(); -+ } -+ effectList.clear(); - } - - public void clearEffects(World par1World) -@@ -141,6 +185,13 @@ +@@ -141,6 +180,13 @@ { this.fxLayers[var2].clear(); } @@ -99,7 +87,7 @@ } public void addBlockDestroyEffects(int par1, int par2, int par3, int par4, int par5) -@@ -160,7 +211,7 @@ +@@ -160,7 +206,7 @@ double var13 = (double)par2 + ((double)var9 + 0.5D) / (double)var7; double var15 = (double)par3 + ((double)var10 + 0.5D) / (double)var7; int var17 = this.rand.nextInt(6); @@ -108,7 +96,7 @@ } } } -@@ -212,7 +263,7 @@ +@@ -212,7 +258,7 @@ var8 = (double)par1 + var6.maxX + (double)var7; } @@ -117,7 +105,7 @@ } } -@@ -220,4 +271,30 @@ +@@ -220,4 +266,30 @@ { return "" + (this.fxLayers[0].size() + this.fxLayers[1].size() + this.fxLayers[2].size()); } diff --git a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch index a71fe9e122..faa45207d2 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch @@ -21,8 +21,9 @@ + + ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(var10.itemID); + if (customRenderer != null) -+ { -+ GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F); + { + GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F); +- this.loadTexture("/terrain.png"); + loadTexture(ForgeHooksClient.getTexture("/terrain.png", var10.getItem())); + GL11.glScalef(0.5F, 0.5F, 0.5F); + for(int j = 0; j < var13; j++) @@ -40,9 +41,8 @@ + } + } + else if (var10.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[var10.itemID].getRenderType())) - { - GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F); -- this.loadTexture("/terrain.png"); ++ { ++ GL11.glRotatef(var12, 0.0F, 1.0F, 0.0F); + this.loadTexture(ForgeHooksClient.getTexture("/terrain.png", Block.blocksList[var10.itemID])); float var21 = 0.25F; var15 = Block.blocksList[var10.itemID].getRenderType(); @@ -82,7 +82,7 @@ + { + par2RenderEngine.bindTexture(par2RenderEngine.getTexture(ForgeHooksClient.getTexture("/terrain.png", Item.itemsList[par3]))); + GL11.glPushMatrix(); -+ GL11.glTranslatef(par4 - 2, par7 + 3, -3F + zLevel); ++ GL11.glTranslatef((float)(par6 - 2), (float)(par7 + 3), -3.0F + this.zLevel); + GL11.glScalef(10F, 10F, 10F); + GL11.glTranslatef(1.0F, 0.5F, 1.0F); + GL11.glScalef(1.0F, 1.0F, -1F);