Bugfixes 3

6 files changed, 38 insertions, 32 deletions

diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index ffe2a39a0a..d45825155f 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -838,7 +838,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
             }
             aEvent.bow.damageItem(1, aEvent.entityPlayer);
             aEvent.bow.getItem();
-            aEvent.entityPlayer.worldObj.playSoundAtEntity(aEvent.entityPlayer, "random.bow", 1.0F, 1.0F / (new Random().nextFloat() * 0.4F + 1.2F) + tSpeed
+            aEvent.entityPlayer.worldObj.playSoundAtEntity(aEvent.entityPlayer, "random.bow", 1.0F, 0.64893958288F + tSpeed
                     * 0.5F);
 
             tArrowEntity.canBePickedUp = 1;
@@ -931,14 +931,16 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
                             aEvent.z, (byte) aEvent.blockMetadata, aEvent.fortuneLevel, aEvent.isSilkTouching, aEvent);
                 }
                 if (EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, aStack) > 2) {
-                    for (ItemStack tDrop : aEvent.drops) {
-                        ItemStack tSmeltingOutput = GT_ModHandler.getSmeltingOutput(tDrop, false, null);
-                        if (tSmeltingOutput != null) {
-                            tDrop.stackSize *= tSmeltingOutput.stackSize;
-                            tSmeltingOutput.stackSize = tDrop.stackSize;
-                            GT_Utility.setStack(tDrop, tSmeltingOutput);
+                    try {
+                        for (ItemStack tDrop : aEvent.drops) {
+                            ItemStack tSmeltingOutput = GT_ModHandler.getSmeltingOutput(tDrop, false, null);
+                            if (tSmeltingOutput != null) {
+                                tDrop.stackSize *= tSmeltingOutput.stackSize;
+                                tSmeltingOutput.stackSize = tDrop.stackSize;
+                                GT_Utility.setStack(tDrop, tSmeltingOutput);
+                            }
                         }
-                    }
+                    } catch (Throwable e) {e.printStackTrace(GT_Log.err);}
                 }
             }
         }
diff --git a/src/main/java/gregtech/common/render/GT_CapeRenderer.java b/src/main/java/gregtech/common/render/GT_CapeRenderer.java
index 49ba9a72e8..26ffc282ca 100644
--- a/src/main/java/gregtech/common/render/GT_CapeRenderer.java
+++ b/src/main/java/gregtech/common/render/GT_CapeRenderer.java
@@ -19,6 +19,8 @@ public class GT_CapeRenderer
         extends RenderPlayer {

     private final ResourceLocation[] mCapes = {new ResourceLocation("gregtech:textures/BrainTechCape.png"), new ResourceLocation("gregtech:textures/GregTechCape.png"), new ResourceLocation("gregtech:textures/MrBrainCape.png"), new ResourceLocation("gregtech:textures/GregoriusCape.png")};

     private final Collection<String> mCapeList;

+    private static final float glf0 = 0.0F;

+    private static final float glf1 = 1.0F;

 

     public GT_CapeRenderer(Collection<String> aCapeList) {

         this.mCapeList = aCapeList;

@@ -55,13 +57,15 @@ public class GT_CapeRenderer
             if ((tResource != null) && (!aPlayer.getHideCape())) {

                 bindTexture(tResource);

                 GL11.glPushMatrix();

-                GL11.glTranslatef(0.0F, 0.0F, 0.125F);

-                double d0 = aPlayer.field_71091_bM + (aPlayer.field_71094_bP - aPlayer.field_71091_bM) * aPartialTicks - (aPlayer.prevPosX + (aPlayer.posX - aPlayer.prevPosX) * aPartialTicks);

-                double d1 = aPlayer.field_71096_bN + (aPlayer.field_71095_bQ - aPlayer.field_71096_bN) * aPartialTicks - (aPlayer.prevPosY + (aPlayer.posY - aPlayer.prevPosY) * aPartialTicks);

-                double d2 = aPlayer.field_71097_bO + (aPlayer.field_71085_bR - aPlayer.field_71097_bO) * aPartialTicks - (aPlayer.prevPosZ + (aPlayer.posZ - aPlayer.prevPosZ) * aPartialTicks);

+                GL11.glTranslatef(glf0, glf0, 0.125F);

+                double var1f = (aPlayer.prevPosX + (aPlayer.posX - aPlayer.prevPosX) * aPartialTicks);

+                double d0 = aPlayer.field_71091_bM + var1f;

+                double d1 = aPlayer.field_71096_bN + var1f;

+                double d2 = aPlayer.field_71097_bO + var1f;

                 float f6 = aPlayer.prevRenderYawOffset + (aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset) * aPartialTicks;

-                double d3 = MathHelper.sin(f6 * 3.141593F / 180.0F);

-                double d4 = -MathHelper.cos(f6 * 3.141593F / 180.0F);

+                float var2f = f6 * 3.141593F / 180.0F;

+                double d3 = MathHelper.sin(var2f);

+                double d4 = -MathHelper.cos(var2f);

                 float f7 = (float) d1 * 10.0F;

                 float f8 = (float) (d0 * d3 + d2 * d4) * 100.0F;

                 float f9 = (float) (d0 * d4 - d2 * d3) * 100.0F;

@@ -71,18 +75,18 @@ public class GT_CapeRenderer
                 if (f7 > 32.0F) {

                     f7 = 32.0F;

                 }

-                if (f8 < 0.0F) {

-                    f8 = 0.0F;

+                if (f8 < glf0) {

+                    f8 = glf0;

                 }

                 float f10 = aPlayer.prevCameraYaw + (aPlayer.cameraYaw - aPlayer.prevCameraYaw) * aPartialTicks;

                 f7 += MathHelper.sin((aPlayer.prevDistanceWalkedModified + (aPlayer.distanceWalkedModified - aPlayer.prevDistanceWalkedModified) * aPartialTicks) * 6.0F) * 32.0F * f10;

                 if (aPlayer.isSneaking()) {

                     f7 += 25.0F;

                 }

-                GL11.glRotatef(6.0F + f8 / 2.0F + f7, 1.0F, 0.0F, 0.0F);

-                GL11.glRotatef(f9 / 2.0F, 0.0F, 0.0F, 1.0F);

-                GL11.glRotatef(-f9 / 2.0F, 0.0F, 1.0F, 0.0F);

-                GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F);

+                GL11.glRotatef(6.0F + f8 / 2.0F + f7, glf1, glf0, glf0);

+                GL11.glRotatef(f9 / 2.0F, glf0, glf0, glf1);

+                GL11.glRotatef(-f9 / 2.0F, glf0, glf1, glf0);

+                GL11.glRotatef(180.0F, glf0, glf1, glf0);

                 ((ModelBiped) this.mainModel).renderCloak(0.0625F);

                 GL11.glPopMatrix();

             }

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
index dc7904a027..281d6cc4bc 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
@@ -201,10 +201,10 @@ public class GT_MetaTileEntity_BronzeBlastFurnace
                         this.mOutputItem2 = null;

                         this.mProgresstime = 0;

                         this.mMaxProgresstime = 0;

-                        try {

+                        //try {

                             GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "steel");

-                        } catch (Exception e) {

-                        }

+                        //} catch (Exception e) {

+                        //}

                     }

                 } else if (aBaseMetaTileEntity.isAllowedToWork()) {

                     checkRecipe();

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
index 30a6dd1496..02a6d6152e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
@@ -151,10 +151,10 @@ public abstract class GT_MetaTileEntity_LargeBoiler
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {

         if (mProgresstime > 0 && firstRun) {

             firstRun = false;

-            try {

+            //try {

                 GT_Mod.instance.achievements.issueAchievement(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), "extremepressure");

-            } catch (Exception e) {

-            }

+            //} catch (Exception e) {

+            //}

         }

         super.onPostTick(aBaseMetaTileEntity, aTick);

     }

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
index aa1f46afb3..d05c511872 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_HPSteam.java
@@ -86,10 +86,10 @@ public class GT_MetaTileEntity_LargeTurbine_HPSteam extends GT_MetaTileEntity_La
                 remainingFlow -= flow; // track amount we're allowed to keep depleting from hatches
                 totalFlow += flow; // track total used
                 if (!achievement) {
-                    try {
+                    //try {
                         GT_Mod.instance.achievements.issueAchievement(this.getBaseMetaTileEntity().getWorld().getPlayerEntityByName(this.getBaseMetaTileEntity().getOwnerName()), "efficientsteam");
-                    } catch (Exception e) {
-                    }
+                    //} catch (Exception e) {
+                    //}
                     achievement = true;
                 }
             }else if(fluidName.equals("fluid.steam") || fluidName.equals("ic2.fluidSteam") || fluidName.equals("fluid.mfr.steam.still.name")){
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
index 1023235c59..21c66c823e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Steam.java
@@ -95,10 +95,10 @@ public class GT_MetaTileEntity_LargeTurbine_Steam extends GT_MetaTileEntity_Larg
                 remainingFlow -= flow; // track amount we're allowed to continue depleting from hatches
                 totalFlow += flow; // track total input used
                 if (!achievement) {
-                    try {
+                    //try {
                         GT_Mod.instance.achievements.issueAchievement(this.getBaseMetaTileEntity().getWorld().getPlayerEntityByName(this.getBaseMetaTileEntity().getOwnerName()), "muchsteam");
-                    } catch (Exception e) {
-                    }
+                    //} catch (Exception e) {
+                    //}
                     achievement = true;
                 }
             }