From 2d13e6185e4ef82d62772e627cf825e8ab96cf2b Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 25 Jan 2023 23:57:49 +0100 Subject: [PATCH] quick fix : Redundant type cast --- .../tconstruct/armor/ArmorProxyClient.java | 40 ++++----- .../tconstruct/armor/PlayerAbilityHelper.java | 2 +- .../armor/gui/ArmorExtendedGui.java | 8 +- .../armor/inventory/KnapsackContainer.java | 2 +- .../armor/model/RenderArmorCast.java | 88 +++++++++---------- .../armor/player/ArmorExtended.java | 2 +- .../armor/player/KnapsackInventory.java | 2 +- .../armor/player/TPlayerHandler.java | 2 +- .../tconstruct/blocks/slime/SlimeGel.java | 2 +- .../tconstruct/blocks/slime/SlimeGrass.java | 4 +- .../tconstruct/blocks/traps/Landmine.java | 24 ++--- .../java/tconstruct/blocks/traps/Punji.java | 6 +- .../client/BlockSkinRenderHelper.java | 48 +++++----- .../java/tconstruct/client/BreakingFX.java | 48 +++++----- .../client/entity/projectile/ArrowRender.java | 12 +-- .../entity/projectile/DaggerRender.java | 74 ++++++++-------- .../entity/projectile/LaunchedItemRender.java | 8 +- .../tconstruct/items/tools/Battleaxe.java | 8 +- .../tconstruct/items/tools/Longsword.java | 8 +- .../tconstruct/items/tools/LumberAxe.java | 2 +- .../java/tconstruct/items/tools/Rapier.java | 8 +- .../armor/BehaviorDispenseArmorCopy.java | 2 +- .../library/component/MultiFluidTank.java | 2 +- .../library/crafting/Detailing.java | 2 +- .../library/crafting/PatternBuilder.java | 8 +- .../library/entity/ProjectileBase.java | 12 +-- .../library/tools/AbilityHelper.java | 18 ++-- .../library/tools/DynamicToolPart.java | 2 +- .../util/BehaviorProjectileBaseDispense.java | 6 +- .../mechworks/blocks/BlockLandmine.java | 20 ++--- .../entity/item/EntityLandmineFirework.java | 4 +- .../entity/item/ExplosivePrimed.java | 4 +- .../inventory/ContainerLandmine.java | 22 ++--- .../landmine/behavior/BehaviorBlockThrow.java | 6 +- .../landmine/behavior/BehaviorExplosive.java | 2 +- .../landmine/behavior/BehaviorFirework.java | 2 +- .../landmine/behavior/BehaviorProjectile.java | 6 +- .../landmine/behavior/BehaviorSpawnEgg.java | 2 +- .../mechworks/logic/TileEntityLandmine.java | 2 +- .../modifiers/armor/AModLeadBoots.java | 2 +- .../modifiers/tools/ModButtertouch.java | 6 +- .../tconstruct/modifiers/tools/ModLapis.java | 6 +- .../tconstruct/smeltery/TinkerSmeltery.java | 4 +- .../smeltery/blocks/GlassBlockConnected.java | 2 +- .../smeltery/blocks/GlassPaneConnected.java | 2 +- .../smeltery/blocks/SearedBlock.java | 8 +- .../smeltery/inventory/SmelteryContainer.java | 4 +- .../smeltery/logic/LavaTankLogic.java | 2 +- .../smeltery/logic/SmelteryLogic.java | 14 +-- .../java/tconstruct/tools/TinkerTools.java | 4 +- .../tconstruct/tools/blocks/EquipBlock.java | 12 +-- .../tconstruct/tools/entity/ArrowEntity.java | 26 +++--- .../tconstruct/tools/entity/RotatingBase.java | 2 +- .../tconstruct/tools/gui/BattlesignGui.java | 2 +- .../tconstruct/tools/gui/PartCrafterGui.java | 2 +- .../tconstruct/tools/gui/ToolStationGui.java | 2 +- .../tools/inventory/FrypanContainer.java | 2 +- .../tools/inventory/FurnaceContainer.java | 2 +- .../tools/inventory/PartCrafterContainer.java | 2 +- .../inventory/PatternChestContainer.java | 2 +- .../tools/inventory/ToolStationContainer.java | 2 +- .../java/tconstruct/tools/items/Pattern.java | 2 +- .../tconstruct/tools/items/TitleIcon.java | 8 +- .../tconstruct/tools/logic/FurnaceLogic.java | 2 +- .../tools/model/FancyItemRender.java | 74 ++++++++-------- .../weaponry/client/CrosshairHandler.java | 4 +- .../tconstruct/weaponry/weapons/Crossbow.java | 2 +- .../tconstruct/world/MiningExplosion.java | 24 ++--- .../world/TDispenserBehaviorSpawnEgg.java | 4 +- .../tconstruct/world/TinkerWorldEvents.java | 2 +- .../world/TinkerWorldProxyClient.java | 6 +- .../world/blocks/OreberryBushEssence.java | 2 +- .../world/blocks/SlimeExplosive.java | 14 +-- .../tconstruct/world/blocks/SoilBlock.java | 4 +- .../tconstruct/world/blocks/StoneTorch.java | 8 +- .../tconstruct/world/entity/CartEntity.java | 30 +++---- .../tconstruct/world/entity/SlimeBase.java | 6 +- .../tconstruct/world/gen/OreberryBushGen.java | 2 +- .../tconstruct/world/gen/SurfaceOreGen.java | 14 +-- .../world/itemblocks/BarricadeItem.java | 6 +- .../world/itemblocks/OreberryBushItem.java | 2 +- .../itemblocks/OreberryBushSecondItem.java | 2 +- .../world/itemblocks/WoolSlab1Item.java | 6 +- .../world/itemblocks/WoolSlab2Item.java | 6 +- 84 files changed, 426 insertions(+), 434 deletions(-) diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java index 3786d05b..55f63a97 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyClient.java +++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java @@ -377,29 +377,29 @@ public class ArmorProxyClient extends ArmorProxyCommon { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.addVertexWithUV( - (double) (par1 + 0), - (double) (par2 + par6), - (double) this.zLevel, - (double) ((float) (par3 + 0) * f), - (double) ((float) (par4 + par6) * f1)); + par1 + 0, + par2 + par6, + this.zLevel, + (float) (par3 + 0) * f, + (float) (par4 + par6) * f1); tessellator.addVertexWithUV( - (double) (par1 + par5), - (double) (par2 + par6), - (double) this.zLevel, - (double) ((float) (par3 + par5) * f), - (double) ((float) (par4 + par6) * f1)); + par1 + par5, + par2 + par6, + this.zLevel, + (float) (par3 + par5) * f, + (float) (par4 + par6) * f1); tessellator.addVertexWithUV( - (double) (par1 + par5), - (double) (par2 + 0), - (double) this.zLevel, - (double) ((float) (par3 + par5) * f), - (double) ((float) (par4 + 0) * f1)); + par1 + par5, + par2 + 0, + this.zLevel, + (float) (par3 + par5) * f, + (float) (par4 + 0) * f1); tessellator.addVertexWithUV( - (double) (par1 + 0), - (double) (par2 + 0), - (double) this.zLevel, - (double) ((float) (par3 + 0) * f), - (double) ((float) (par4 + 0) * f1)); + par1 + 0, + par2 + 0, + this.zLevel, + (float) (par3 + 0) * f, + (float) (par4 + 0) * f1); tessellator.draw(); } diff --git a/src/main/java/tconstruct/armor/PlayerAbilityHelper.java b/src/main/java/tconstruct/armor/PlayerAbilityHelper.java index 9604cf84..82fb797a 100644 --- a/src/main/java/tconstruct/armor/PlayerAbilityHelper.java +++ b/src/main/java/tconstruct/armor/PlayerAbilityHelper.java @@ -74,7 +74,7 @@ public class PlayerAbilityHelper { entity.boundingBox.maxY = entity.boundingBox.minY + (double) entity.height; if (entity.width > f2 && !entity.worldObj.isRemote) { - entity.moveEntity((double) (f2 - entity.width), 0.0D, (double) (f2 - entity.width)); + entity.moveEntity(f2 - entity.width, 0.0D, f2 - entity.width); } } diff --git a/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java b/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java index bb7bda71..78aacaf3 100644 --- a/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java +++ b/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java @@ -120,10 +120,10 @@ public class ArmorExtendedGui extends InventoryEffectRenderer { GL11.glRotatef(135.0F, 0.0F, 1.0F, 0.0F); RenderHelper.enableStandardItemLighting(); GL11.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-((float) Math.atan((double) (par5 / 40.0F))) * 20.0F, 1.0F, 0.0F, 0.0F); - par0Minecraft.thePlayer.renderYawOffset = (float) Math.atan((double) (par4 / 40.0F)) * 20.0F; - par0Minecraft.thePlayer.rotationYaw = (float) Math.atan((double) (par4 / 40.0F)) * 40.0F; - par0Minecraft.thePlayer.rotationPitch = -((float) Math.atan((double) (par5 / 40.0F))) * 20.0F; + GL11.glRotatef(-((float) Math.atan(par5 / 40.0F)) * 20.0F, 1.0F, 0.0F, 0.0F); + par0Minecraft.thePlayer.renderYawOffset = (float) Math.atan(par4 / 40.0F) * 20.0F; + par0Minecraft.thePlayer.rotationYaw = (float) Math.atan(par4 / 40.0F) * 40.0F; + par0Minecraft.thePlayer.rotationPitch = -((float) Math.atan(par5 / 40.0F)) * 20.0F; par0Minecraft.thePlayer.rotationYawHead = par0Minecraft.thePlayer.rotationYaw; GL11.glTranslatef(0.0F, par0Minecraft.thePlayer.yOffset, 0.0F); RenderManager.instance.playerViewY = 180.0F; diff --git a/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java b/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java index 40816021..d391b573 100644 --- a/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java +++ b/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java @@ -55,7 +55,7 @@ public class KnapsackContainer extends Container { } if (slotStack.stackSize == 0) { - slot.putStack((ItemStack) null); + slot.putStack(null); } else { slot.onSlotChanged(); } diff --git a/src/main/java/tconstruct/armor/model/RenderArmorCast.java b/src/main/java/tconstruct/armor/model/RenderArmorCast.java index eb440a7f..b5283e95 100644 --- a/src/main/java/tconstruct/armor/model/RenderArmorCast.java +++ b/src/main/java/tconstruct/armor/model/RenderArmorCast.java @@ -74,17 +74,17 @@ public class RenderArmorCast implements IItemRenderer { public void renderCube(Tessellator tessellator, RenderBlocks renderer, IIcon icon) { tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0F, 0F); - renderer.renderFaceXNeg((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceXNeg(null, 0F, 0F, 0F, icon); tessellator.setNormal(1F, 0F, 0F); - renderer.renderFaceXPos((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceXPos(null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, -1F, 0F); - renderer.renderFaceYNeg((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceYNeg(null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 1F, 0F); - renderer.renderFaceYPos((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceYPos(null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 0F, -1F); - renderer.renderFaceZNeg((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceZNeg(null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 0F, 1F); - renderer.renderFaceZPos((Block) null, 0F, 0F, 0F, icon); + renderer.renderFaceZPos(null, 0F, 0F, 0F, icon); tessellator.draw(); } @@ -92,17 +92,17 @@ public class RenderArmorCast implements IItemRenderer { Tessellator tessellator, RenderBlocks renderer, IIcon icon, List sidesToRender) { tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0F, 0F); - if (sidesToRender.contains(ForgeDirection.WEST)) renderer.renderFaceXNeg((Block) null, 0F, 0F, 0F, icon); + if (sidesToRender.contains(ForgeDirection.WEST)) renderer.renderFaceXNeg(null, 0F, 0F, 0F, icon); tessellator.setNormal(1F, 0F, 0F); - if (sidesToRender.contains(ForgeDirection.EAST)) renderer.renderFaceXPos((Block) null, 0F, 0F, 0F, icon); + if (sidesToRender.contains(ForgeDirection.EAST)) renderer.renderFaceXPos(null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, -1F, 0F); - if (sidesToRender.contains(ForgeDirection.DOWN)) renderer.renderFaceYNeg((Block) null, 0F, 0F, 0F, icon); + if (sidesToRender.contains(ForgeDirection.DOWN)) renderer.renderFaceYNeg(null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 1F, 0F); - if (sidesToRender.contains(ForgeDirection.UP)) renderer.renderFaceYPos((Block) null, 0F, 0F, 0F, icon); + if (sidesToRender.contains(ForgeDirection.UP)) renderer.renderFaceYPos(null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 0F, -1F); - if (sidesToRender.contains(ForgeDirection.SOUTH)) renderer.renderFaceZNeg((Block) null, 0F, 0F, 0F, icon); + if (sidesToRender.contains(ForgeDirection.SOUTH)) renderer.renderFaceZNeg(null, 0F, 0F, 0F, icon); tessellator.setNormal(0F, 0F, 1F); - if (sidesToRender.contains(ForgeDirection.NORTH)) renderer.renderFaceZPos((Block) null, 0F, 0F, 0F, icon); + if (sidesToRender.contains(ForgeDirection.NORTH)) renderer.renderFaceZPos(null, 0F, 0F, 0F, icon); tessellator.draw(); } @@ -150,20 +150,20 @@ public class RenderArmorCast implements IItemRenderer { float par7) { par0Tessellator.startDrawingQuads(); par0Tessellator.setNormal(0.0F, 0.0F, 1.0F); - par0Tessellator.addVertexWithUV(0.0D, 0.0D, 0.0D, (double) par1, (double) par4); - par0Tessellator.addVertexWithUV(1.0D, 0.0D, 0.0D, (double) par3, (double) par4); - par0Tessellator.addVertexWithUV(1.0D, 1.0D, 0.0D, (double) par3, (double) par2); - par0Tessellator.addVertexWithUV(0.0D, 1.0D, 0.0D, (double) par1, (double) par2); + par0Tessellator.addVertexWithUV(0.0D, 0.0D, 0.0D, par1, par4); + par0Tessellator.addVertexWithUV(1.0D, 0.0D, 0.0D, par3, par4); + par0Tessellator.addVertexWithUV(1.0D, 1.0D, 0.0D, par3, par2); + par0Tessellator.addVertexWithUV(0.0D, 1.0D, 0.0D, par1, par2); par0Tessellator.draw(); par0Tessellator.startDrawingQuads(); par0Tessellator.setNormal(0.0F, 0.0F, -1.0F); - par0Tessellator.addVertexWithUV(0.0D, 1.0D, (double) (0.0F - par7), (double) par1, (double) par2); - par0Tessellator.addVertexWithUV(1.0D, 1.0D, (double) (0.0F - par7), (double) par3, (double) par2); - par0Tessellator.addVertexWithUV(1.0D, 0.0D, (double) (0.0F - par7), (double) par3, (double) par4); - par0Tessellator.addVertexWithUV(0.0D, 0.0D, (double) (0.0F - par7), (double) par1, (double) par4); + par0Tessellator.addVertexWithUV(0.0D, 1.0D, 0.0F - par7, par1, par2); + par0Tessellator.addVertexWithUV(1.0D, 1.0D, 0.0F - par7, par3, par2); + par0Tessellator.addVertexWithUV(1.0D, 0.0D, 0.0F - par7, par3, par4); + par0Tessellator.addVertexWithUV(0.0D, 0.0D, 0.0F - par7, par1, par4); par0Tessellator.draw(); - float f5 = 0.5F * (par1 - par3) / (float) par5; - float f6 = 0.5F * (par4 - par2) / (float) par6; + float f5 = 0.5F * (par1 - par3) / par5; + float f6 = 0.5F * (par4 - par2) / par6; par0Tessellator.startDrawingQuads(); par0Tessellator.setNormal(-1.0F, 0.0F, 0.0F); int k; @@ -171,12 +171,12 @@ public class RenderArmorCast implements IItemRenderer { float f8; for (k = 0; k < par5; ++k) { - f7 = (float) k / (float) par5; + f7 = (float) k / par5; f8 = par1 + (par3 - par1) * f7 - f5; - par0Tessellator.addVertexWithUV((double) f7, 0.0D, (double) (0.0F - par7), (double) f8, (double) par4); - par0Tessellator.addVertexWithUV((double) f7, 0.0D, 0.0D, (double) f8, (double) par4); - par0Tessellator.addVertexWithUV((double) f7, 1.0D, 0.0D, (double) f8, (double) par2); - par0Tessellator.addVertexWithUV((double) f7, 1.0D, (double) (0.0F - par7), (double) f8, (double) par2); + par0Tessellator.addVertexWithUV(f7, 0.0D, 0.0F - par7, f8, par4); + par0Tessellator.addVertexWithUV(f7, 0.0D, 0.0D, f8, par4); + par0Tessellator.addVertexWithUV(f7, 1.0D, 0.0D, f8, par2); + par0Tessellator.addVertexWithUV(f7, 1.0D, 0.0F - par7, f8, par2); } par0Tessellator.draw(); @@ -185,13 +185,13 @@ public class RenderArmorCast implements IItemRenderer { float f9; for (k = 0; k < par5; ++k) { - f7 = (float) k / (float) par5; + f7 = (float) k / par5; f8 = par1 + (par3 - par1) * f7 - f5; - f9 = f7 + 1.0F / (float) par5; - par0Tessellator.addVertexWithUV((double) f9, 1.0D, (double) (0.0F - par7), (double) f8, (double) par2); - par0Tessellator.addVertexWithUV((double) f9, 1.0D, 0.0D, (double) f8, (double) par2); - par0Tessellator.addVertexWithUV((double) f9, 0.0D, 0.0D, (double) f8, (double) par4); - par0Tessellator.addVertexWithUV((double) f9, 0.0D, (double) (0.0F - par7), (double) f8, (double) par4); + f9 = f7 + 1.0F / par5; + par0Tessellator.addVertexWithUV(f9, 1.0D, 0.0F - par7, f8, par2); + par0Tessellator.addVertexWithUV(f9, 1.0D, 0.0D, f8, par2); + par0Tessellator.addVertexWithUV(f9, 0.0D, 0.0D, f8, par4); + par0Tessellator.addVertexWithUV(f9, 0.0D, 0.0F - par7, f8, par4); } par0Tessellator.draw(); @@ -199,13 +199,13 @@ public class RenderArmorCast implements IItemRenderer { par0Tessellator.setNormal(0.0F, 1.0F, 0.0F); for (k = 0; k < par6; ++k) { - f7 = (float) k / (float) par6; + f7 = (float) k / par6; f8 = par4 + (par2 - par4) * f7 - f6; - f9 = f7 + 1.0F / (float) par6; - par0Tessellator.addVertexWithUV(0.0D, (double) f9, 0.0D, (double) par1, (double) f8); - par0Tessellator.addVertexWithUV(1.0D, (double) f9, 0.0D, (double) par3, (double) f8); - par0Tessellator.addVertexWithUV(1.0D, (double) f9, (double) (0.0F - par7), (double) par3, (double) f8); - par0Tessellator.addVertexWithUV(0.0D, (double) f9, (double) (0.0F - par7), (double) par1, (double) f8); + f9 = f7 + 1.0F / par6; + par0Tessellator.addVertexWithUV(0.0D, f9, 0.0D, par1, f8); + par0Tessellator.addVertexWithUV(1.0D, f9, 0.0D, par3, f8); + par0Tessellator.addVertexWithUV(1.0D, f9, 0.0F - par7, par3, f8); + par0Tessellator.addVertexWithUV(0.0D, f9, 0.0F - par7, par1, f8); } par0Tessellator.draw(); @@ -213,12 +213,12 @@ public class RenderArmorCast implements IItemRenderer { par0Tessellator.setNormal(0.0F, -1.0F, 0.0F); for (k = 0; k < par6; ++k) { - f7 = (float) k / (float) par6; + f7 = (float) k / par6; f8 = par4 + (par2 - par4) * f7 - f6; - par0Tessellator.addVertexWithUV(1.0D, (double) f7, 0.0D, (double) par3, (double) f8); - par0Tessellator.addVertexWithUV(0.0D, (double) f7, 0.0D, (double) par1, (double) f8); - par0Tessellator.addVertexWithUV(0.0D, (double) f7, (double) (0.0F - par7), (double) par1, (double) f8); - par0Tessellator.addVertexWithUV(1.0D, (double) f7, (double) (0.0F - par7), (double) par3, (double) f8); + par0Tessellator.addVertexWithUV(1.0D, f7, 0.0D, par3, f8); + par0Tessellator.addVertexWithUV(0.0D, f7, 0.0D, par1, f8); + par0Tessellator.addVertexWithUV(0.0D, f7, 0.0F - par7, par1, f8); + par0Tessellator.addVertexWithUV(1.0D, f7, 0.0F - par7, par3, f8); } par0Tessellator.draw(); diff --git a/src/main/java/tconstruct/armor/player/ArmorExtended.java b/src/main/java/tconstruct/armor/player/ArmorExtended.java index 10a0cb78..98752495 100644 --- a/src/main/java/tconstruct/armor/player/ArmorExtended.java +++ b/src/main/java/tconstruct/armor/player/ArmorExtended.java @@ -186,7 +186,7 @@ public class ArmorExtended implements IInventory { if (tagCompound != null) { NBTTagList tagList = tagCompound.getTagList("Inventory", 10); for (int i = 0; i < tagList.tagCount(); ++i) { - NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.getCompoundTagAt(i); + NBTTagCompound nbttagcompound = tagList.getCompoundTagAt(i); int j = nbttagcompound.getByte("Slot") & 255; ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound); diff --git a/src/main/java/tconstruct/armor/player/KnapsackInventory.java b/src/main/java/tconstruct/armor/player/KnapsackInventory.java index 51cdc2f7..700c97fe 100644 --- a/src/main/java/tconstruct/armor/player/KnapsackInventory.java +++ b/src/main/java/tconstruct/armor/player/KnapsackInventory.java @@ -121,7 +121,7 @@ public class KnapsackInventory implements IInventory { NBTTagList tagList = tagCompound.getTagList("Knapsack", 10); for (int i = 0; i < tagList.tagCount(); ++i) { - NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.getCompoundTagAt(i); + NBTTagCompound nbttagcompound = tagList.getCompoundTagAt(i); int j = nbttagcompound.getByte("Slot") & 255; ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound); diff --git a/src/main/java/tconstruct/armor/player/TPlayerHandler.java b/src/main/java/tconstruct/armor/player/TPlayerHandler.java index 9c536818..f2a5d893 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/armor/player/TPlayerHandler.java @@ -215,7 +215,7 @@ public class TPlayerHandler { if (!event.entity.worldObj.isRemote) { TPlayerStats properties = (TPlayerStats) event.entity.getExtendedProperties(TPlayerStats.PROP_NAME); properties.hunger = ((EntityPlayer) event.entity).getFoodStats().getFoodLevel(); - playerStats.put(((EntityPlayer) event.entity).getPersistentID(), properties); + playerStats.put(event.entity.getPersistentID(), properties); } } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGel.java b/src/main/java/tconstruct/blocks/slime/SlimeGel.java index 98f1d802..7335f464 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGel.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGel.java @@ -38,7 +38,7 @@ public class SlimeGel extends TConstructBlock { public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { if (entity.motionY < 0) { if (entity.motionY < -0.08F) { - Block var9 = (Block) this; + Block var9 = this; world.playSoundEffect( x + 0.5F, y + 0.5F, diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index 427ba368..13873070 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -100,12 +100,12 @@ public class SlimeGrass extends MantleBlock { && blockAbove != this) { Block block = world.getBlock(posX, posY, posZ); if (block == Blocks.dirt) { - world.setBlock(posX, posY, posZ, (Block) this, 1, 3); + world.setBlock(posX, posY, posZ, this, 1, 3); return; } int blockMeta = world.getBlockMetadata(posX, posY, posZ); if (block == TinkerTools.craftedSoil) { - if (blockMeta == 5) world.setBlock(posX, posY, posZ, (Block) this, 0, 3); + if (blockMeta == 5) world.setBlock(posX, posY, posZ, this, 0, 3); } } } diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java index 8bee975c..0125877f 100644 --- a/src/main/java/tconstruct/blocks/traps/Landmine.java +++ b/src/main/java/tconstruct/blocks/traps/Landmine.java @@ -155,26 +155,26 @@ public class Landmine extends MantleBlock { if (this.triggerMobType == EnumCreatureType.creature) { var8 = world.getEntitiesWithinAABBExcludingEntity( - (Entity) null, + null, AxisAlignedBB.getBoundingBox( - (double) ((float) posX + var7), - (double) posY, - (double) ((float) posZ + var7), - (double) ((float) (posX + 1) - var7), + (float) posX + var7, + posY, + (float) posZ + var7, + (float) (posX + 1) - var7, (double) posY + 0.25D, - (double) ((float) (posZ + 1) - var7))); + (float) (posZ + 1) - var7)); } if (this.triggerMobType == EnumCreatureType.monster) { var8 = world.getEntitiesWithinAABB( EntityLiving.class, AxisAlignedBB.getBoundingBox( - (double) ((float) posX + var7), - (double) posY, - (double) ((float) posZ + var7), - (double) ((float) (posX + 1) - var7), + (float) posX + var7, + posY, + (float) posZ + var7, + (float) (posX + 1) - var7, (double) posY + 0.25D, - (double) ((float) (posZ + 1) - var7))); + (float) (posZ + 1) - var7)); } /* @@ -197,7 +197,7 @@ public class Landmine extends MantleBlock { if (var6 && !var5) { WorldHelper.setBlockToAir(world, posX, posY, posZ); - world.createExplosion((Entity) null, posX, posY, posZ, 2.0F, true); + world.createExplosion(null, posX, posY, posZ, 2.0F, true); /* * par1World.setBlockMetadataWithNotify(posX, posY, posZ, 1); * par1World.notifyBlocksOfNeighborChange(posX, posY, posZ, diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index b2b77429..05719022 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -50,9 +50,9 @@ public class Punji extends MantleBlock { if (stack != null && stack.getItem() == Item.getItemFromBlock(TinkerWorld.punji)) { world.setBlockMetadataWithNotify(x, y, z, meta + 1, 3); world.playSoundEffect( - (double) ((float) x + 0.5F), - (double) ((float) y + 0.5F), - (double) ((float) z + 0.5F), + (float) x + 0.5F, + (float) y + 0.5F, + (float) z + 0.5F, this.stepSound.soundName, (this.stepSound.getVolume() + 1.0F) / 2.0F, this.stepSound.getPitch() * 0.8F); diff --git a/src/main/java/tconstruct/client/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/BlockSkinRenderHelper.java index dde29c65..9fdbf202 100644 --- a/src/main/java/tconstruct/client/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/BlockSkinRenderHelper.java @@ -193,7 +193,7 @@ public class BlockSkinRenderHelper { render.colorRedTopRight *= f6; render.colorGreenTopRight *= f6; render.colorBlueTopRight *= f6; - render.renderFaceYNeg(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(0, metadata)); + render.renderFaceYNeg(block, xPos, yPos, zPos, block.getIcon(0, metadata)); flag = true; } @@ -313,7 +313,7 @@ public class BlockSkinRenderHelper { render.colorRedTopRight *= f6; render.colorGreenTopRight *= f6; render.colorBlueTopRight *= f6; - render.renderFaceYPos(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(1, metadata)); + render.renderFaceYPos(block, xPos, yPos, zPos, block.getIcon(1, metadata)); flag = true; } @@ -447,7 +447,7 @@ public class BlockSkinRenderHelper { render.colorGreenTopRight *= f6; render.colorBlueTopRight *= f6; icon = block.getIcon(2, metadata); - render.renderFaceZNeg(block, (double) xPos, (double) yPos, (double) zPos, icon); + render.renderFaceZNeg(block, xPos, yPos, zPos, icon); flag = true; } @@ -580,7 +580,7 @@ public class BlockSkinRenderHelper { render.colorGreenTopRight *= f6; render.colorBlueTopRight *= f6; icon = block.getIcon(3, metadata); - render.renderFaceZPos(block, (double) xPos, (double) yPos, (double) zPos, icon); + render.renderFaceZPos(block, xPos, yPos, zPos, icon); flag = true; } @@ -713,7 +713,7 @@ public class BlockSkinRenderHelper { render.colorGreenTopRight *= f6; render.colorBlueTopRight *= f6; icon = block.getIcon(4, metadata); - render.renderFaceXNeg(block, (double) xPos, (double) yPos, (double) zPos, icon); + render.renderFaceXNeg(block, xPos, yPos, zPos, icon); flag = true; } @@ -846,7 +846,7 @@ public class BlockSkinRenderHelper { render.colorGreenTopRight *= f6; render.colorBlueTopRight *= f6; icon = block.getIcon(5, metadata); - render.renderFaceXPos(block, (double) xPos, (double) yPos, (double) zPos, icon); + render.renderFaceXPos(block, xPos, yPos, zPos, icon); flag = true; } @@ -906,7 +906,7 @@ public class BlockSkinRenderHelper { ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); tessellator.setColorOpaque_F(f10, f13, f16); - render.renderFaceYNeg(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(0, metadata)); + render.renderFaceYNeg(block, xPos, yPos, zPos, block.getIcon(0, metadata)); flag = true; } @@ -916,7 +916,7 @@ public class BlockSkinRenderHelper { ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); tessellator.setColorOpaque_F(f7, f8, f9); - render.renderFaceYPos(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(1, metadata)); + render.renderFaceYPos(block, xPos, yPos, zPos, block.getIcon(1, metadata)); flag = true; } @@ -928,7 +928,7 @@ public class BlockSkinRenderHelper { ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZNeg(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(2, metadata)); + render.renderFaceZNeg(block, xPos, yPos, zPos, block.getIcon(2, metadata)); flag = true; } @@ -939,7 +939,7 @@ public class BlockSkinRenderHelper { ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZPos(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(3, metadata)); + render.renderFaceZPos(block, xPos, yPos, zPos, block.getIcon(3, metadata)); flag = true; } @@ -950,7 +950,7 @@ public class BlockSkinRenderHelper { ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.renderFaceXNeg(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(4, metadata)); + render.renderFaceXNeg(block, xPos, yPos, zPos, block.getIcon(4, metadata)); flag = true; } @@ -961,7 +961,7 @@ public class BlockSkinRenderHelper { ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.renderFaceXPos(block, (double) xPos, (double) yPos, (double) zPos, block.getIcon(5, metadata)); + render.renderFaceXPos(block, xPos, yPos, zPos, block.getIcon(5, metadata)); flag = true; } @@ -1204,7 +1204,7 @@ public class BlockSkinRenderHelper { render.colorRedTopRight *= f6; render.colorGreenTopRight *= f6; render.colorBlueTopRight *= f6; - render.renderFaceYNeg(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); + render.renderFaceYNeg(block, xPos, yPos, zPos, stillIcon); flag = true; } @@ -1324,7 +1324,7 @@ public class BlockSkinRenderHelper { render.colorRedTopRight *= f6; render.colorGreenTopRight *= f6; render.colorBlueTopRight *= f6; - render.renderFaceYPos(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); + render.renderFaceYPos(block, xPos, yPos, zPos, stillIcon); flag = true; } @@ -1455,7 +1455,7 @@ public class BlockSkinRenderHelper { render.colorRedTopRight *= f6; render.colorGreenTopRight *= f6; render.colorBlueTopRight *= f6; - render.renderFaceZNeg(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.renderFaceZNeg(block, xPos, yPos, zPos, flowingIcon); flag = true; } @@ -1587,7 +1587,7 @@ public class BlockSkinRenderHelper { render.colorRedTopRight *= f6; render.colorGreenTopRight *= f6; render.colorBlueTopRight *= f6; - render.renderFaceZPos(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.renderFaceZPos(block, xPos, yPos, zPos, flowingIcon); flag = true; } @@ -1719,7 +1719,7 @@ public class BlockSkinRenderHelper { render.colorRedTopRight *= f6; render.colorGreenTopRight *= f6; render.colorBlueTopRight *= f6; - render.renderFaceXNeg(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.renderFaceXNeg(block, xPos, yPos, zPos, flowingIcon); flag = true; } @@ -1851,7 +1851,7 @@ public class BlockSkinRenderHelper { render.colorRedTopRight *= f6; render.colorGreenTopRight *= f6; render.colorBlueTopRight *= f6; - render.renderFaceXPos(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.renderFaceXPos(block, xPos, yPos, zPos, flowingIcon); flag = true; } @@ -1912,7 +1912,7 @@ public class BlockSkinRenderHelper { ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos - 1, zPos)); tessellator.setColorOpaque_F(f10, f13, f16); - render.renderFaceYNeg(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); + render.renderFaceYNeg(block, xPos, yPos, zPos, stillIcon); flag = true; } @@ -1922,7 +1922,7 @@ public class BlockSkinRenderHelper { ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos + 1, zPos)); tessellator.setColorOpaque_F(f7, f8, f9); - render.renderFaceYPos(block, (double) xPos, (double) yPos, (double) zPos, stillIcon); + render.renderFaceYPos(block, xPos, yPos, zPos, stillIcon); flag = true; } @@ -1934,7 +1934,7 @@ public class BlockSkinRenderHelper { ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos - 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZNeg(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.renderFaceZNeg(block, xPos, yPos, zPos, flowingIcon); flag = true; } @@ -1945,7 +1945,7 @@ public class BlockSkinRenderHelper { ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos, yPos, zPos + 1)); tessellator.setColorOpaque_F(f11, f14, f17); - render.renderFaceZPos(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.renderFaceZPos(block, xPos, yPos, zPos, flowingIcon); flag = true; } @@ -1956,7 +1956,7 @@ public class BlockSkinRenderHelper { ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos - 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.renderFaceXNeg(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.renderFaceXNeg(block, xPos, yPos, zPos, flowingIcon); flag = true; } @@ -1967,7 +1967,7 @@ public class BlockSkinRenderHelper { ? l : block.getMixedBrightnessForBlock(render.blockAccess, xPos + 1, yPos, zPos)); tessellator.setColorOpaque_F(f12, f15, f18); - render.renderFaceXPos(block, (double) xPos, (double) yPos, (double) zPos, flowingIcon); + render.renderFaceXPos(block, xPos, yPos, zPos, flowingIcon); flag = true; } diff --git a/src/main/java/tconstruct/client/BreakingFX.java b/src/main/java/tconstruct/client/BreakingFX.java index 275d7e71..ede12eaa 100644 --- a/src/main/java/tconstruct/client/BreakingFX.java +++ b/src/main/java/tconstruct/client/BreakingFX.java @@ -55,10 +55,10 @@ public class BreakingFX extends EntityFX { float f10 = 0.1F * this.particleScale; if (this.particleIcon != null) { - f6 = this.particleIcon.getInterpolatedU((double) (this.particleTextureJitterX / 4.0F * 16.0F)); - f7 = this.particleIcon.getInterpolatedU((double) ((this.particleTextureJitterX + 1.0F) / 4.0F * 16.0F)); - f8 = this.particleIcon.getInterpolatedV((double) (this.particleTextureJitterY / 4.0F * 16.0F)); - f9 = this.particleIcon.getInterpolatedV((double) ((this.particleTextureJitterY + 1.0F) / 4.0F * 16.0F)); + f6 = this.particleIcon.getInterpolatedU(this.particleTextureJitterX / 4.0F * 16.0F); + f7 = this.particleIcon.getInterpolatedU((this.particleTextureJitterX + 1.0F) / 4.0F * 16.0F); + f8 = this.particleIcon.getInterpolatedV(this.particleTextureJitterY / 4.0F * 16.0F); + f9 = this.particleIcon.getInterpolatedV((this.particleTextureJitterY + 1.0F) / 4.0F * 16.0F); } float f11 = (float) (this.prevPosX + (this.posX - this.prevPosX) * (double) par2 - interpPosX); @@ -67,28 +67,28 @@ public class BreakingFX extends EntityFX { float f14 = 1.0F; par1Tessellator.setColorOpaque_F(f14 * this.particleRed, f14 * this.particleGreen, f14 * this.particleBlue); par1Tessellator.addVertexWithUV( - (double) (f11 - par3 * f10 - par6 * f10), - (double) (f12 - par4 * f10), - (double) (f13 - par5 * f10 - par7 * f10), - (double) f6, - (double) f9); + f11 - par3 * f10 - par6 * f10, + f12 - par4 * f10, + f13 - par5 * f10 - par7 * f10, + f6, + f9); par1Tessellator.addVertexWithUV( - (double) (f11 - par3 * f10 + par6 * f10), - (double) (f12 + par4 * f10), - (double) (f13 - par5 * f10 + par7 * f10), - (double) f6, - (double) f8); + f11 - par3 * f10 + par6 * f10, + f12 + par4 * f10, + f13 - par5 * f10 + par7 * f10, + f6, + f8); par1Tessellator.addVertexWithUV( - (double) (f11 + par3 * f10 + par6 * f10), - (double) (f12 + par4 * f10), - (double) (f13 + par5 * f10 + par7 * f10), - (double) f7, - (double) f8); + f11 + par3 * f10 + par6 * f10, + f12 + par4 * f10, + f13 + par5 * f10 + par7 * f10, + f7, + f8); par1Tessellator.addVertexWithUV( - (double) (f11 + par3 * f10 - par6 * f10), - (double) (f12 - par4 * f10), - (double) (f13 + par5 * f10 - par7 * f10), - (double) f7, - (double) f9); + f11 + par3 * f10 - par6 * f10, + f12 - par4 * f10, + f13 + par5 * f10 - par7 * f10, + f7, + f9); } } diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java index 26aaee09..0a912a01 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java @@ -159,10 +159,10 @@ public class ArrowRender extends Render { par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno"); } - float f4 = ((IIcon) par2Icon).getMinU(); - float f5 = ((IIcon) par2Icon).getMaxU(); - float f6 = ((IIcon) par2Icon).getMinV(); - float f7 = ((IIcon) par2Icon).getMaxV(); + float f4 = par2Icon.getMinU(); + float f5 = par2Icon.getMaxU(); + float f6 = par2Icon.getMinV(); + float f7 = par2Icon.getMaxV(); float f8 = 1.0F; float f9 = 0.5F; float f10 = 0.25F; @@ -216,8 +216,8 @@ public class ArrowRender extends Render { f6, f4, f7, - ((IIcon) par2Icon).getIconWidth(), - ((IIcon) par2Icon).getIconHeight(), + par2Icon.getIconWidth(), + par2Icon.getIconHeight(), f12); if (itemstack.hasEffect(pass)) { diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java index 5e3b02c7..ed3413d0 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java @@ -176,10 +176,10 @@ public class DaggerRender extends Render { par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno"); } - float f4 = ((IIcon) par2Icon).getMinU(); - float f5 = ((IIcon) par2Icon).getMaxU(); - float f6 = ((IIcon) par2Icon).getMinV(); - float f7 = ((IIcon) par2Icon).getMaxV(); + float f4 = par2Icon.getMinU(); + float f5 = par2Icon.getMaxU(); + float f6 = par2Icon.getMinV(); + float f7 = par2Icon.getMaxV(); float f8 = 1.0F; float f9 = 0.5F; float f10 = 0.25F; @@ -227,8 +227,8 @@ public class DaggerRender extends Render { f6, f4, f7, - ((IIcon) par2Icon).getIconWidth(), - ((IIcon) par2Icon).getIconHeight(), + par2Icon.getIconWidth(), + par2Icon.getIconHeight(), f12); /* @@ -444,26 +444,25 @@ public class DaggerRender extends Render { tessellator.startDrawingQuads(); tessellator.addVertexWithUV( - (double) (par2 + 0), - (double) (par3 + par5), - (double) this.zLevel, - (double) ((f2 + (float) par5 * f4) * f), - (double) ((f3 + (float) par5) * f1)); + par2 + 0, + par3 + par5, + this.zLevel, + (f2 + (float) par5 * f4) * f, + (f3 + (float) par5) * f1); tessellator.addVertexWithUV( - (double) (par2 + par4), - (double) (par3 + par5), - (double) this.zLevel, - (double) ((f2 + (float) par4 + (float) par5 * f4) * f), - (double) ((f3 + (float) par5) * f1)); + par2 + par4, + par3 + par5, + this.zLevel, + (f2 + (float) par4 + (float) par5 * f4) * f, + (f3 + (float) par5) * f1); tessellator.addVertexWithUV( - (double) (par2 + par4), - (double) (par3 + 0), - (double) this.zLevel, - (double) ((f2 + (float) par4) * f), - (double) ((f3 + 0.0F) * f1)); + par2 + par4, + par3 + 0, + this.zLevel, + (f2 + (float) par4) * f, + (f3 + 0.0F) * f1); tessellator.addVertexWithUV( - (double) (par2 + 0), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + 0.0F) * f), (double) - ((f3 + 0.0F) * f1)); + par2 + 0, par3 + 0, this.zLevel, (f2 + 0.0F) * f, (f3 + 0.0F) * f1); tessellator.draw(); } } @@ -478,7 +477,7 @@ public class DaggerRender extends Render { ItemStack par3ItemStack, int par4, int par5) { - this.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, (String) null); + this.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, null); } public void renderItemOverlayIntoGUI( @@ -532,10 +531,10 @@ public class DaggerRender extends Render { private void renderQuad(Tessellator par1Tessellator, int par2, int par3, int par4, int par5, int par6) { par1Tessellator.startDrawingQuads(); par1Tessellator.setColorOpaque_I(par6); - par1Tessellator.addVertex((double) (par2 + 0), (double) (par3 + 0), 0.0D); - par1Tessellator.addVertex((double) (par2 + 0), (double) (par3 + par5), 0.0D); - par1Tessellator.addVertex((double) (par2 + par4), (double) (par3 + par5), 0.0D); - par1Tessellator.addVertex((double) (par2 + par4), (double) (par3 + 0), 0.0D); + par1Tessellator.addVertex(par2 + 0, par3 + 0, 0.0D); + par1Tessellator.addVertex(par2 + 0, par3 + par5, 0.0D); + par1Tessellator.addVertex(par2 + par4, par3 + par5, 0.0D); + par1Tessellator.addVertex(par2 + par4, par3 + 0, 0.0D); par1Tessellator.draw(); } @@ -543,20 +542,17 @@ public class DaggerRender extends Render { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.addVertexWithUV( - (double) (par1 + 0), (double) (par2 + par5), (double) this.zLevel, (double) par3Icon.getMinU(), (double) - par3Icon.getMaxV()); + par1 + 0, par2 + par5, this.zLevel, par3Icon.getMinU(), par3Icon.getMaxV()); tessellator.addVertexWithUV( - (double) (par1 + par4), - (double) (par2 + par5), - (double) this.zLevel, - (double) par3Icon.getMaxU(), - (double) par3Icon.getMaxV()); + par1 + par4, + par2 + par5, + this.zLevel, + par3Icon.getMaxU(), + par3Icon.getMaxV()); tessellator.addVertexWithUV( - (double) (par1 + par4), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) - par3Icon.getMinV()); + par1 + par4, par2 + 0, this.zLevel, par3Icon.getMaxU(), par3Icon.getMinV()); tessellator.addVertexWithUV( - (double) (par1 + 0), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMinU(), (double) - par3Icon.getMinV()); + par1 + 0, par2 + 0, this.zLevel, par3Icon.getMinU(), par3Icon.getMinV()); tessellator.draw(); } diff --git a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java index 957d7d8d..0e24583e 100644 --- a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java @@ -80,10 +80,10 @@ public class LaunchedItemRender extends Render { GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); par1Tessellator.startDrawingQuads(); par1Tessellator.setNormal(0.0F, 1.0F, 0.0F); - par1Tessellator.addVertexWithUV((double) (0.0F - f5), (double) (0.0F - f6), 0.0D, (double) f, (double) f3); - par1Tessellator.addVertexWithUV((double) (f4 - f5), (double) (0.0F - f6), 0.0D, (double) f1, (double) f3); - par1Tessellator.addVertexWithUV((double) (f4 - f5), (double) (f4 - f6), 0.0D, (double) f1, (double) f2); - par1Tessellator.addVertexWithUV((double) (0.0F - f5), (double) (f4 - f6), 0.0D, (double) f, (double) f2); + par1Tessellator.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); + par1Tessellator.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); + par1Tessellator.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); + par1Tessellator.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); par1Tessellator.draw(); } } diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java index 462f8bdc..cac16566 100644 --- a/src/main/java/tconstruct/items/tools/Battleaxe.java +++ b/src/main/java/tconstruct/items/tools/Battleaxe.java @@ -188,12 +188,12 @@ public class Battleaxe extends AOEHarvestTool implements IBattlegearWeapon { if (increase > 0.56f) increase = 0.56f; player.motionY += increase; - player.motionX = (double) (-MathHelper.sin(player.rotationYaw / 180.0F * (float) Math.PI) + player.motionX = -MathHelper.sin(player.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) - * speed); - player.motionZ = (double) (MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) + * speed; + player.motionZ = MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) - * speed); + * speed; } } } diff --git a/src/main/java/tconstruct/items/tools/Longsword.java b/src/main/java/tconstruct/items/tools/Longsword.java index 6dfb957b..4f163009 100644 --- a/src/main/java/tconstruct/items/tools/Longsword.java +++ b/src/main/java/tconstruct/items/tools/Longsword.java @@ -64,12 +64,12 @@ public class Longsword extends Weapon { float speed = 0.05F * time; if (speed > 0.925f) speed = 0.925f; - player.motionX = (double) (-MathHelper.sin(player.rotationYaw / 180.0F * (float) Math.PI) + player.motionX = -MathHelper.sin(player.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) - * speed); - player.motionZ = (double) (MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) + * speed; + player.motionZ = MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) - * speed); + * speed; } } diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index 71e98f28..e38cc073 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -93,7 +93,7 @@ public class LumberAxe extends AOEHarvestTool { if (wood.isWood(world, x, y, z) || wood.getMaterial() == Material.sponge) if (detectTree(world, x, y, z)) { TreeChopTask chopper = - new TreeChopTask((AOEHarvestTool) this, stack, new ChunkPosition(x, y, z), player, 128); + new TreeChopTask(this, stack, new ChunkPosition(x, y, z), player, 128); try { FMLCommonHandler.instance().bus().register(chopper); } catch (LinkageError l) { diff --git a/src/main/java/tconstruct/items/tools/Rapier.java b/src/main/java/tconstruct/items/tools/Rapier.java index 7a790034..29b02c83 100644 --- a/src/main/java/tconstruct/items/tools/Rapier.java +++ b/src/main/java/tconstruct/items/tools/Rapier.java @@ -26,12 +26,12 @@ public class Rapier extends Weapon { player.addExhaustion(0.1f); player.motionY += 0.32; float f = 0.5F; - player.motionX = (double) (MathHelper.sin(player.rotationYaw / 180.0F * (float) Math.PI) + player.motionX = MathHelper.sin(player.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) - * f); - player.motionZ = (double) (-MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) + * f; + player.motionZ = -MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI) - * f); + * f; } return stack; } diff --git a/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java b/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java index d0a4461f..8a2c3059 100644 --- a/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java +++ b/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java @@ -21,7 +21,7 @@ final class BehaviorDispenseArmorCopy extends BehaviorDefaultDispenseItem { int j = par1IBlockSource.getYInt() + enumfacing.getFrontOffsetY(); int k = par1IBlockSource.getZInt() + enumfacing.getFrontOffsetZ(); AxisAlignedBB axisalignedbb = AxisAlignedBB.getBoundingBox( - (double) i, (double) j, (double) k, (double) (i + 1), (double) (j + 1), (double) (k + 1)); + i, j, k, i + 1, j + 1, k + 1); List list = par1IBlockSource .getWorld() .selectEntitiesWithinAABB( diff --git a/src/main/java/tconstruct/library/component/MultiFluidTank.java b/src/main/java/tconstruct/library/component/MultiFluidTank.java index f595716f..a264e1c8 100644 --- a/src/main/java/tconstruct/library/component/MultiFluidTank.java +++ b/src/main/java/tconstruct/library/component/MultiFluidTank.java @@ -135,7 +135,7 @@ public class MultiFluidTank extends LogicComponent implements IFluidTank { fluidlist.clear(); for (int iter = 0; iter < liquidTag.tagCount(); iter++) { - NBTTagCompound nbt = (NBTTagCompound) liquidTag.getCompoundTagAt(iter); + NBTTagCompound nbt = liquidTag.getCompoundTagAt(iter); FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt); if (fluid != null) fluidlist.add(fluid); } diff --git a/src/main/java/tconstruct/library/crafting/Detailing.java b/src/main/java/tconstruct/library/crafting/Detailing.java index 43d90a5f..560a0ed7 100644 --- a/src/main/java/tconstruct/library/crafting/Detailing.java +++ b/src/main/java/tconstruct/library/crafting/Detailing.java @@ -70,7 +70,7 @@ public class Detailing { public DetailInput getDetailing(Block block, int inputMeta) { for (int i = 0; i < detailing.size(); i++) { - DetailInput detail = (DetailInput) detailing.get(i); + DetailInput detail = detailing.get(i); if (Item.getItemFromBlock(block) == detail.input.getItem() && inputMeta == detail.inputMeta) { return detail; } diff --git a/src/main/java/tconstruct/library/crafting/PatternBuilder.java b/src/main/java/tconstruct/library/crafting/PatternBuilder.java index 535753ed..273c8747 100644 --- a/src/main/java/tconstruct/library/crafting/PatternBuilder.java +++ b/src/main/java/tconstruct/library/crafting/PatternBuilder.java @@ -55,7 +55,7 @@ public class PatternBuilder { ItemKey key = getItemKey(material); if (key != null) { - MaterialSet mat = (MaterialSet) materialSets.get(key.key); + MaterialSet mat = materialSets.get(key.key); ItemStack toolPart = getMatchingPattern(pattern, material, mat); if (toolPart != null) { @@ -99,7 +99,7 @@ public class PatternBuilder { if (material != null) { ItemKey key = getItemKey(material); if (key != null) { - MaterialSet set = (MaterialSet) materialSets.get(key.key); + MaterialSet set = materialSets.get(key.key); return set.materialID; } } @@ -136,13 +136,13 @@ public class PatternBuilder { } public ItemStack getShardFromSet(String materialset) { - MaterialSet set = (MaterialSet) materialSets.get(materialset); + MaterialSet set = materialSets.get(materialset); if (set != null && set.shard != null) return set.shard.copy(); return null; } public ItemStack getRodFromSet(String materialset) { - MaterialSet set = (MaterialSet) materialSets.get(materialset); + MaterialSet set = materialSets.get(materialset); if (set != null) return set.rod.copy(); return null; } diff --git a/src/main/java/tconstruct/library/entity/ProjectileBase.java b/src/main/java/tconstruct/library/entity/ProjectileBase.java index 347042db..b1d5c951 100644 --- a/src/main/java/tconstruct/library/entity/ProjectileBase.java +++ b/src/main/java/tconstruct/library/entity/ProjectileBase.java @@ -135,7 +135,7 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit entityHit.addVelocity( this.motionX * (double) knockback * 0.6000000238418579D / horizontalSpeed, 0.1D, - this.motionZ * (double) knockback * 0.6000000238418579D / (double) horizontalSpeed); + this.motionZ * (double) knockback * 0.6000000238418579D / horizontalSpeed); } } @@ -359,7 +359,7 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); this.prevRotationPitch = - this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI); + this.rotationPitch = (float) (Math.atan2(this.motionY, f) * 180.0D / Math.PI); } // we previously hit something. Check if the block is still there. @@ -394,9 +394,9 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit } } else { this.inGround = false; - this.motionX *= (double) (this.rand.nextFloat() * 0.2F); - this.motionY *= (double) (this.rand.nextFloat() * 0.2F); - this.motionZ *= (double) (this.rand.nextFloat() * 0.2F); + this.motionX *= this.rand.nextFloat() * 0.2F; + this.motionY *= this.rand.nextFloat() * 0.2F; + this.motionZ *= this.rand.nextFloat() * 0.2F; this.ticksInGround = 0; this.ticksInAir = 0; } @@ -443,7 +443,7 @@ public abstract class ProjectileBase extends EntityArrow implements IEntityAddit if (ent == this.shootingEntity && this.ticksInAir < 5) continue; f1 = 0.3F; - AxisAlignedBB axisalignedbb1 = ent.boundingBox.expand((double) f1, (double) f1, (double) f1); + AxisAlignedBB axisalignedbb1 = ent.boundingBox.expand(f1, f1, f1); MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(curPos, newPos); // did we actually collide with the entity, or was it just really close nearby? diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index 4a265e49..6ecc2fa6 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -145,13 +145,13 @@ public class AbilityHelper { if (knockback > 0) { entity.addVelocity( - (double) (-MathHelper.sin(player.rotationYaw * (float) Math.PI / 180.0F) - * (float) knockback - * 0.5F), + -MathHelper.sin(player.rotationYaw * (float) Math.PI / 180.0F) + * knockback + * 0.5F, 0.1D, - (double) (MathHelper.cos(player.rotationYaw * (float) Math.PI / 180.0F) - * (float) knockback - * 0.5F)); + MathHelper.cos(player.rotationYaw * (float) Math.PI / 180.0F) + * knockback + * 0.5F); player.motionX *= 0.6D; player.motionZ *= 0.6D; player.setSprinting(false); @@ -535,9 +535,9 @@ public class AbilityHelper { && (block == Blocks.grass || block == Blocks.dirt)) { Block block1 = Blocks.farmland; world.playSoundEffect( - (double) ((float) x + 0.5F), - (double) ((float) y + 0.5F), - (double) ((float) z + 0.5F), + (float) x + 0.5F, + (float) y + 0.5F, + (float) z + 0.5F, block1.stepSound.getStepResourcePath(), (block1.stepSound.getVolume() + 1.0F) / 2.0F, block1.stepSound.getPitch() * 0.8F); diff --git a/src/main/java/tconstruct/library/tools/DynamicToolPart.java b/src/main/java/tconstruct/library/tools/DynamicToolPart.java index f2882f61..c846ce4f 100644 --- a/src/main/java/tconstruct/library/tools/DynamicToolPart.java +++ b/src/main/java/tconstruct/library/tools/DynamicToolPart.java @@ -34,7 +34,7 @@ public class DynamicToolPart extends CraftingItem implements IToolPart { } public DynamicToolPart(String texture, String name, String domain) { - this(texture, name, domain, (Class) null); + this(texture, name, domain, null); } public DynamicToolPart( diff --git a/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java b/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java index 591abb10..e7ae0f4f 100644 --- a/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java +++ b/src/main/java/tconstruct/library/util/BehaviorProjectileBaseDispense.java @@ -33,9 +33,9 @@ public abstract class BehaviorProjectileBaseDispense extends BehaviorDefaultDisp ProjectileBase projectile = this.getProjectileEntity(world, iposition, reference); projectile.setThrowableHeading( - (double) enumfacing.getFrontOffsetX(), - (double) ((float) enumfacing.getFrontOffsetY() + ballistic()), - (double) enumfacing.getFrontOffsetZ(), + enumfacing.getFrontOffsetX(), + (float) enumfacing.getFrontOffsetY() + ballistic(), + enumfacing.getFrontOffsetZ(), this.accuraccy(), this.speed()); projectile.returnStack = reference; diff --git a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java index ea296575..a3a2bd72 100644 --- a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java @@ -58,7 +58,7 @@ public class BlockLandmine extends BlockContainer { @Override public int getLightValue(IBlockAccess world, int x, int y, int z) { - if (world.getBlock(x, y, z) == (Block) this && world.getTileEntity(x, y, z) instanceof TileEntityLandmine) { + if (world.getBlock(x, y, z) == this && world.getTileEntity(x, y, z) instanceof TileEntityLandmine) { TileEntityLandmine te = (TileEntityLandmine) world.getTileEntity(x, y, z); if (te != null) { @@ -161,9 +161,9 @@ public class BlockLandmine extends BlockContainer { itemstack.stackSize -= ss; EntityItem entityitem = new EntityItem( par1World, - (double) ((float) par2), - (double) ((float) par3), - (double) ((float) par4), + (float) par2, + (float) par3, + (float) par4, new ItemStack(itemstack.getItem(), ss, itemstack.getItemDamage())); if (itemstack.hasTagCompound()) { @@ -172,9 +172,9 @@ public class BlockLandmine extends BlockContainer { } float f3 = 0.05F; - entityitem.motionX = (double) (f3); - entityitem.motionY = (double) (f3 + 0.2F); - entityitem.motionZ = (double) (f3); + entityitem.motionX = f3; + entityitem.motionY = f3 + 0.2F; + entityitem.motionZ = f3; par1World.spawnEntityInWorld(entityitem); } } @@ -445,7 +445,7 @@ public class BlockLandmine extends BlockContainer { if (triggerType == Sensitivity.everything) { list = par1World.getEntitiesWithinAABBExcludingEntity( - (Entity) null, getSensitiveAABB(par1World, par2, par3, par4)); + null, getSensitiveAABB(par1World, par2, par3, par4)); } if (triggerType == Sensitivity.mobs) { @@ -537,7 +537,7 @@ public class BlockLandmine extends BlockContainer { if (triggerType == Sensitivity.everything) { list = par1World.getEntitiesWithinAABBExcludingEntity( - (Entity) null, + null, AxisAlignedBB.getBoundingBox(par2 + 0D, par3 + 0D, par4 + 0D, par2 + 1D, par3 + 1D, par4 + 1D)); } @@ -562,7 +562,7 @@ public class BlockLandmine extends BlockContainer { } } - return new EntityTNTPrimed(par1World, par2, par3, par4, (EntityLivingBase) null); + return new EntityTNTPrimed(par1World, par2, par3, par4, null); } @Override diff --git a/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java b/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java index 0d69e553..281729be 100644 --- a/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java +++ b/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java @@ -86,7 +86,7 @@ public class EntityLandmineFirework extends Entity { if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { float f = MathHelper.sqrt_double(par1 * par1 + par5 * par5); this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(par1, par5) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(par3, (double) f) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(par3, f) * 180.0D / Math.PI); } } @@ -110,7 +110,7 @@ public class EntityLandmineFirework extends Entity { float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI); + for (this.rotationPitch = (float) (Math.atan2(this.motionY, f) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { } diff --git a/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java b/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java index faa3a943..d01ed7d5 100644 --- a/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java +++ b/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java @@ -27,9 +27,9 @@ public class ExplosivePrimed extends Entity { this(par1World); this.setPosition(par2, par4, par6); float f = (float) (Math.random() * Math.PI * 2.0D); - this.motionX = (double) (-((float) Math.sin((double) f)) * 0.02F); + this.motionX = -((float) Math.sin(f)) * 0.02F; this.motionY = 0.20000000298023224D; - this.motionZ = (double) (-((float) Math.cos((double) f)) * 0.02F); + this.motionZ = -((float) Math.cos(f)) * 0.02F; this.fuse = 80; this.prevPosX = par2; this.prevPosY = par4; diff --git a/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java index 3c3fa44c..0c76234d 100644 --- a/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java +++ b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java @@ -177,7 +177,7 @@ public class ContainerLandmine extends Container { if (inventoryplayer.getItemStack() != null && par1 == -999) { if (par2 == 0) { par4EntityPlayer.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack(), false); - inventoryplayer.setItemStack((ItemStack) null); + inventoryplayer.setItemStack(null); } if (par2 == 1) { @@ -185,7 +185,7 @@ public class ContainerLandmine extends Container { inventoryplayer.getItemStack().splitStack(1), false); if (inventoryplayer.getItemStack().stackSize == 0) { - inventoryplayer.setItemStack((ItemStack) null); + inventoryplayer.setItemStack(null); } } } @@ -202,7 +202,7 @@ public class ContainerLandmine extends Container { itemstack1 = this.transferStackInSlot(par4EntityPlayer, par1); if (itemstack1 != null) { - localObject2 = ((ItemStack) itemstack1).getItem(); + localObject2 = itemstack1.getItem(); itemstack = itemstack1.copy(); if (slot2 != null @@ -242,7 +242,7 @@ public class ContainerLandmine extends Container { } if (itemstack4.stackSize == 0) { - inventoryplayer.setItemStack((ItemStack) null); + inventoryplayer.setItemStack(null); } } else if (shouldDoStuff && slot2 instanceof SlotBehavedOnly @@ -260,7 +260,7 @@ public class ContainerLandmine extends Container { } if (itemstack4.stackSize == 0) { - inventoryplayer.setItemStack((ItemStack) null); + inventoryplayer.setItemStack(null); } } } else if (slot2.canTakeStack(par4EntityPlayer)) { @@ -270,7 +270,7 @@ public class ContainerLandmine extends Container { inventoryplayer.setItemStack(itemstack3); if (itemstack1.stackSize == 0) { - slot2.putStack((ItemStack) null); + slot2.putStack(null); } slot2.onPickupFromSlot(par4EntityPlayer, inventoryplayer.getItemStack()); @@ -289,7 +289,7 @@ public class ContainerLandmine extends Container { itemstack4.splitStack(k1); if (itemstack4.stackSize == 0) { - inventoryplayer.setItemStack((ItemStack) null); + inventoryplayer.setItemStack(null); } itemstack1.stackSize += k1; @@ -305,7 +305,7 @@ public class ContainerLandmine extends Container { itemstack1 = slot2.decrStackSize(k1); if (itemstack1.stackSize == 0) { - slot2.putStack((ItemStack) null); + slot2.putStack(null); } slot2.onPickupFromSlot(par4EntityPlayer, inventoryplayer.getItemStack()); @@ -339,7 +339,7 @@ public class ContainerLandmine extends Container { if (k1 > -1) { inventoryplayer.addItemStackToInventory(itemstack1); slot2.decrStackSize(itemstack3.stackSize); - slot2.putStack((ItemStack) null); + slot2.putStack(null); slot2.onPickupFromSlot(par4EntityPlayer, itemstack3); } } else { @@ -348,7 +348,7 @@ public class ContainerLandmine extends Container { slot2.onPickupFromSlot(par4EntityPlayer, itemstack3); } } else if (!slot2.getHasStack() && itemstack1 != null && slot2.isItemValid(itemstack1)) { - inventoryplayer.setInventorySlotContents(par2, (ItemStack) null); + inventoryplayer.setInventorySlotContents(par2, null); slot2.putStack(itemstack1); } } @@ -402,7 +402,7 @@ public class ContainerLandmine extends Container { itemstack1.stackSize += j2; if (itemstack5.stackSize <= 0) { - slot3.putStack((ItemStack) null); + slot3.putStack(null); } slot3.onPickupFromSlot(par4EntityPlayer, itemstack5); diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java index 6a7c9aaa..6e48e9fa 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java @@ -68,9 +68,9 @@ public class BehaviorBlockThrow extends Behavior { EntityFallingBlock entityfallingsand = new EntityFallingBlock( par1World, - (double) ((float) par2 + 0.5F), - (double) ((float) par3 + 2F), - (double) ((float) par4 + 0.5F), + (float) par2 + 0.5F, + (float) par3 + 2F, + (float) par4 + 0.5F, BlockUtils.getBlockFromItemStack(par5ItemStack), par5ItemStack.getItemDamage()); entityfallingsand.preventEntitySpawning = false; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java index 608df51e..4ce2d10f 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java @@ -31,7 +31,7 @@ public class BehaviorExplosive extends Behavior { } par1World.createExplosion( - new EntityTNTPrimed(par1World, par2, par3, par4, (EntityLivingBase) null), + new EntityTNTPrimed(par1World, par2, par3, par4, null), par2, par3, par4, diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java index 00bac0a2..c55b7a6b 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirework.java @@ -28,7 +28,7 @@ public class BehaviorFirework extends Behavior { for (int i = 0; i < par5ItemStack.stackSize; i++) { // TODO entity registration and stuffs EntityLandmineFirework entityfireworkrocket = new EntityLandmineFirework( - par1World, (double) par2, (double) par3, (double) par4, par5ItemStack, facing.ordinal()) + par1World, par2, par3, par4, par5ItemStack, facing.ordinal()) .setRider(i == 0 ? triggerer : null); par1World.spawnEntityInWorld(entityfireworkrocket); diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java index 1a02b1dd..a3fecf59 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java @@ -47,9 +47,9 @@ public class BehaviorProjectile extends Behavior { } entity.setThrowableHeading( - (double) enumfacing.getFrontOffsetX(), - (double) ((float) enumfacing.getFrontOffsetY() + 0.1F), - (double) enumfacing.getFrontOffsetZ(), + enumfacing.getFrontOffsetX(), + (float) enumfacing.getFrontOffsetY() + 0.1F, + enumfacing.getFrontOffsetZ(), 1.1F, 6.0F); par1World.spawnEntityInWorld((Entity) entity); diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java index 5a7a4faf..5fdd4dba 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java @@ -23,7 +23,7 @@ public class BehaviorSpawnEgg extends Behavior { boolean willBlockBeRemoved) { EnumFacing enumfacing = getFacing(par1World, par2, par3, par4); double d0 = par2 + Math.random() + (double) enumfacing.getFrontOffsetX(); - double d1 = (double) ((float) par3 + 0.2F); + double d1 = (float) par3 + 0.2F; double d2 = par4 + Math.random() + (double) enumfacing.getFrontOffsetZ(); Entity entity = ItemMonsterPlacer.spawnCreature(par1World, par5ItemStack.getItemDamage(), d0, d1, d2); diff --git a/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java index 85cc2c7c..5de00781 100644 --- a/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java @@ -65,7 +65,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory { this.inventory = new ItemStack[this.getSizeInventory()]; for (int i = 0; i < nbttaglist.tagCount(); ++i) { - NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.getCompoundTagAt(i); + NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); byte b0 = nbttagcompound1.getByte("Slot"); if (b0 >= 0 && b0 < this.inventory.length) { diff --git a/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java b/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java index 88ac721d..9fe30883 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java +++ b/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java @@ -28,7 +28,7 @@ public class AModLeadBoots extends AModBoolean { if (baseTag.hasKey("AttributeModifiers")) { attributes = baseTag.getTagList("AttributeModifiers", 0); for (int iter = 0; iter < attributes.tagCount(); iter++) { - NBTTagCompound tag = (NBTTagCompound) attributes.getCompoundTagAt(iter); + NBTTagCompound tag = attributes.getCompoundTagAt(iter); if (tag.getString("AttributeName").equals("generic.knockbackResistance")) attributes.removeTag(iter); } } else { diff --git a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java index 535191e2..2f50d758 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java +++ b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java @@ -71,17 +71,17 @@ public class ModButtertouch extends ModBoolean { if (index == enchant.effectId) { hasEnchant = true; enchantTag.setShort("id", (short) index); - enchantTag.setShort("lvl", (short) ((byte) level)); + enchantTag.setShort("lvl", (byte) level); } else { enchantTag.setShort("id", (short) index); - enchantTag.setShort("lvl", (short) ((byte) lvl)); + enchantTag.setShort("lvl", (byte) lvl); } tags.appendTag(enchantTag); } if (!hasEnchant) { NBTTagCompound enchantTag = new NBTTagCompound(); enchantTag.setShort("id", (short) enchant.effectId); - enchantTag.setShort("lvl", (short) ((byte) level)); + enchantTag.setShort("lvl", (byte) level); tags.appendTag(enchantTag); } tool.stackTagCompound.setTag("ench", tags); diff --git a/src/main/java/tconstruct/modifiers/tools/ModLapis.java b/src/main/java/tconstruct/modifiers/tools/ModLapis.java index 9b5afa0b..36e5c924 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModLapis.java +++ b/src/main/java/tconstruct/modifiers/tools/ModLapis.java @@ -136,17 +136,17 @@ public class ModLapis extends ItemModTypeFilter { if (index == enchant.effectId) { hasEnchant = true; enchantTag.setShort("id", (short) index); - enchantTag.setShort("lvl", (short) ((byte) level)); + enchantTag.setShort("lvl", (byte) level); } else { enchantTag.setShort("id", (short) index); - enchantTag.setShort("lvl", (short) ((byte) lvl)); + enchantTag.setShort("lvl", (byte) lvl); } tags.appendTag(enchantTag); } if (!hasEnchant) { NBTTagCompound enchantTag = new NBTTagCompound(); enchantTag.setShort("id", (short) enchant.effectId); - enchantTag.setShort("lvl", (short) ((byte) level)); + enchantTag.setShort("lvl", (byte) level); tags.appendTag(enchantTag); } tool.stackTagCompound.setTag("ench", tags); diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index dc3a5201..ecffed05 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -883,7 +883,7 @@ public class TinkerSmeltery { // Ores Smeltery.addDictionaryMelting( - "ore" + fluidTypeName, ft, 0, ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre)); + "ore" + fluidTypeName, ft, 0, (TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre)); // Poor ores Smeltery.addDictionaryMelting("orePoor" + fluidTypeName, ft, 0, (int) @@ -894,7 +894,7 @@ public class TinkerSmeltery { "oreNether" + fluidTypeName, ft, 75, - ((int) TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre * 2)); + (TConstruct.ingotLiquidValue * (int) PHConstruct.ingotsPerOre * 2)); // Blocks Smeltery.addDictionaryMelting("block" + fluidTypeName, ft, 100, TConstruct.ingotLiquidValue * 2); diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java index 0c4a361c..4144fa88 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java @@ -60,7 +60,7 @@ public class GlassBlockConnected extends MantleBlock { */ public boolean shouldConnectToBlock( IBlockAccess par1IBlockAccess, int par2, int par3, int par4, Block par5, int par6) { - return par5 == (Block) this; + return par5 == this; } @Override diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java index d4f9b138..7335580a 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java @@ -584,7 +584,7 @@ public class GlassPaneConnected extends GlassBlockConnected { } public final boolean canThisPaneConnectToThisBlock(Block b) { - return b.isOpaqueCube() || b == (Block) this || b == Blocks.glass; + return b.isOpaqueCube() || b == this || b == Blocks.glass; } @Override diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java index 83bd2e50..936b04a0 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java @@ -231,12 +231,12 @@ public class SearedBlock extends InventoryBlock { } return AxisAlignedBB.getBoundingBox( - (double) ((float) x + xMin), + (float) x + xMin, (double) y + 0.25, - (double) ((float) z + zMin), - (double) ((float) x + xMax), + (float) z + zMin, + (float) x + xMax, (double) y + 0.625, - (double) ((float) z + zMax)); + (float) z + zMax); } } diff --git a/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java b/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java index 6cd652db..f857ca86 100644 --- a/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java +++ b/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java @@ -56,7 +56,7 @@ public class SmelteryContainer extends ActiveContainer { // TConstruct.logger.info(invRow); int basePos = invRow * columns; for (int iter = 0; iter < activeInventorySlots.size(); iter++) { - ActiveSlot slot = (ActiveSlot) activeInventorySlots.get(iter); + ActiveSlot slot = activeInventorySlots.get(iter); slot.setActive(slot.activeSlotNumber >= basePos && slot.activeSlotNumber < basePos + columns * SmelteryGui.maxRows); @@ -135,7 +135,7 @@ public class SmelteryContainer extends ActiveContainer { } if (slotStack.stackSize == 0) { - slot.putStack((ItemStack) null); + slot.putStack(null); } else { slot.onSlotChanged(); } diff --git a/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java index d241d77b..a2e985c1 100644 --- a/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java @@ -75,7 +75,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler { */ public float getFluidAmountScaled() { - return (float) (tank.getFluid().amount - renderOffset) / (float) (tank.getCapacity() * 1.01F); + return (float) (tank.getFluid().amount - renderOffset) / (tank.getCapacity() * 1.01F); } public boolean containsFluid() { diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index b17b8584..ed0bcfc3 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -168,9 +168,9 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci stack.stackSize -= itemSize; EntityItem entityitem = new EntityItem( worldObj, - (double) ((float) xCoord + jumpX + offsetX), - (double) ((float) yCoord + jumpY), - (double) ((float) zCoord + jumpZ + offsetZ), + (float) xCoord + jumpX + offsetX, + (float) yCoord + jumpY, + (float) zCoord + jumpZ + offsetZ, new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); if (stack.hasTagCompound()) { @@ -179,9 +179,9 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } float offset = 0.05F; - entityitem.motionX = (double) ((float) rand.nextGaussian() * offset); - entityitem.motionY = (double) ((float) rand.nextGaussian() * offset + 0.2F); - entityitem.motionZ = (double) ((float) rand.nextGaussian() * offset); + entityitem.motionX = (float) rand.nextGaussian() * offset; + entityitem.motionY = (float) rand.nextGaussian() * offset + 0.2F; + entityitem.motionZ = (float) rand.nextGaussian() * offset; worldObj.spawnEntityInWorld(entityitem); } } @@ -1033,7 +1033,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci moltenMetal.clear(); for (int iter = 0; iter < liquidTag.tagCount(); iter++) { - NBTTagCompound nbt = (NBTTagCompound) liquidTag.getCompoundTagAt(iter); + NBTTagCompound nbt = liquidTag.getCompoundTagAt(iter); FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt); if (fluid != null) moltenMetal.add(fluid); } diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index 3f0a638d..3881ad92 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -1360,9 +1360,9 @@ public class TinkerTools { new ItemStack(TinkerTools.binding, 1, 6), ""); if (batHardened != null) - TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), (ItemStack) batHardened); + TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), batHardened); if (basicCell != null) - TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), (ItemStack) basicCell); + TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), basicCell); /* Thaumcraft */ Object obj = ItemHelper.getStaticItem("itemResource", "thaumcraft.common.config.ConfigItems"); diff --git a/src/main/java/tconstruct/tools/blocks/EquipBlock.java b/src/main/java/tconstruct/tools/blocks/EquipBlock.java index 15ed46a6..33e4da82 100644 --- a/src/main/java/tconstruct/tools/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/tools/blocks/EquipBlock.java @@ -144,9 +144,9 @@ public class EquipBlock extends InventoryBlock { stack.stackSize -= itemSize; EntityItem entityitem = new EntityItem( par1World, - (double) ((float) x + jumpX), - (double) ((float) y + jumpY), - (double) ((float) z + jumpZ), + (float) x + jumpX, + (float) y + jumpY, + (float) z + jumpZ, new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); if (stack.hasTagCompound()) { @@ -155,9 +155,9 @@ public class EquipBlock extends InventoryBlock { } float offset = 0.05F; - entityitem.motionX = (double) ((float) rand.nextGaussian() * offset); - entityitem.motionY = (double) ((float) rand.nextGaussian() * offset + 0.2F); - entityitem.motionZ = (double) ((float) rand.nextGaussian() * offset); + entityitem.motionX = (float) rand.nextGaussian() * offset; + entityitem.motionY = (float) rand.nextGaussian() * offset + 0.2F; + entityitem.motionZ = (float) rand.nextGaussian() * offset; par1World.spawnEntityInWorld(entityitem); } } diff --git a/src/main/java/tconstruct/tools/entity/ArrowEntity.java b/src/main/java/tconstruct/tools/entity/ArrowEntity.java index 3f431157..7bfbafbc 100644 --- a/src/main/java/tconstruct/tools/entity/ArrowEntity.java +++ b/src/main/java/tconstruct/tools/entity/ArrowEntity.java @@ -76,7 +76,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); this.prevRotationPitch = - this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI); + this.rotationPitch = (float) (Math.atan2(this.motionY, f) * 180.0D / Math.PI); } Block i = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); @@ -107,9 +107,9 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa } } else { this.inGround = false; - this.motionX *= (double) (this.rand.nextFloat() * 0.2F); - this.motionY *= (double) (this.rand.nextFloat() * 0.2F); - this.motionZ *= (double) (this.rand.nextFloat() * 0.2F); + this.motionX *= this.rand.nextFloat() * 0.2F; + this.motionY *= this.rand.nextFloat() * 0.2F; + this.motionZ *= this.rand.nextFloat() * 0.2F; this.ticksInGround = 0; this.ticksInAir = 0; } @@ -147,7 +147,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa if (entity1.canBeCollidedWith() && (entity1 != this.shootingEntity || this.ticksInAir >= 5)) { ySpeed = 0.3F; AxisAlignedBB axisalignedbb1 = - entity1.boundingBox.expand((double) ySpeed, (double) ySpeed, (double) ySpeed); + entity1.boundingBox.expand(ySpeed, ySpeed, ySpeed); MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec3, vec31); if (movingobjectposition1 != null) { @@ -294,9 +294,9 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); this.inData = this.worldObj.getBlockMetadata( this.field_145791_d, this.field_145792_e, this.field_145789_f); - this.motionX = (double) ((float) (movingobjectposition.hitVec.xCoord - this.posX)); - this.motionY = (double) ((float) (movingobjectposition.hitVec.yCoord - this.posY)); - this.motionZ = (double) ((float) (movingobjectposition.hitVec.zCoord - this.posZ)); + this.motionX = (float) (movingobjectposition.hitVec.xCoord - this.posX); + this.motionY = (float) (movingobjectposition.hitVec.yCoord - this.posY); + this.motionZ = (float) (movingobjectposition.hitVec.zCoord - this.posZ); speed = MathHelper.sqrt_double( this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); this.posX -= this.motionX / (double) speed * 0.05000000074505806D; @@ -333,7 +333,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa speed = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) speed) * 180.0D / Math.PI); + for (this.rotationPitch = (float) (Math.atan2(this.motionY, speed) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { } @@ -372,10 +372,10 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa dropSpeed = 0.8F; } - this.motionX *= (double) dropSpeed; - this.motionY *= (double) dropSpeed; - this.motionZ *= (double) dropSpeed; - this.motionY -= (double) ySpeed; + this.motionX *= dropSpeed; + this.motionY *= dropSpeed; + this.motionZ *= dropSpeed; + this.motionY -= ySpeed; this.setPosition(this.posX, this.posY, this.posZ); this.func_145775_I(); } diff --git a/src/main/java/tconstruct/tools/entity/RotatingBase.java b/src/main/java/tconstruct/tools/entity/RotatingBase.java index fbd4c4d8..662e9e6b 100644 --- a/src/main/java/tconstruct/tools/entity/RotatingBase.java +++ b/src/main/java/tconstruct/tools/entity/RotatingBase.java @@ -280,7 +280,7 @@ public class RotatingBase extends Entity implements IEntityAdditionalSpawnData { tags.setShort("xTile", (short) xTile); tags.setShort("yTile", (short) yTile); tags.setShort("zTile", (short) zTile); - tags.setString("inTile", (String) inTile.getUnlocalizedName()); + tags.setString("inTile", inTile.getUnlocalizedName()); tags.setByte("shake", (byte) arrowShake); tags.setByte("onGround", (byte) (onGround ? 1 : 0)); tags.setBoolean("Retrieval", doNotRetrieve); diff --git a/src/main/java/tconstruct/tools/gui/BattlesignGui.java b/src/main/java/tconstruct/tools/gui/BattlesignGui.java index f6eab745..b4773725 100644 --- a/src/main/java/tconstruct/tools/gui/BattlesignGui.java +++ b/src/main/java/tconstruct/tools/gui/BattlesignGui.java @@ -165,7 +165,7 @@ public class BattlesignGui extends GuiScreen { @Override protected void actionPerformed(GuiButton button) { if (button.id == 0) { - this.mc.displayGuiScreen((GuiScreen) null); + this.mc.displayGuiScreen(null); this.mc.setIngameFocus(); } } diff --git a/src/main/java/tconstruct/tools/gui/PartCrafterGui.java b/src/main/java/tconstruct/tools/gui/PartCrafterGui.java index 6b8354f7..d3e49c4f 100644 --- a/src/main/java/tconstruct/tools/gui/PartCrafterGui.java +++ b/src/main/java/tconstruct/tools/gui/PartCrafterGui.java @@ -52,7 +52,7 @@ public class PartCrafterGui extends GuiContainer implements INEIGuiHandler { public PartCrafterGui( InventoryPlayer inventoryplayer, PartBuilderLogic partlogic, World world, int x, int y, int z) { - super((ActiveContainer) partlogic.getGuiContainer(inventoryplayer, world, x, y, z)); + super(partlogic.getGuiContainer(inventoryplayer, world, x, y, z)); logic = partlogic; drawChestPart = inventorySlots instanceof PartCrafterChestContainer; diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGui.java b/src/main/java/tconstruct/tools/gui/ToolStationGui.java index f4f4b5f7..fd970cd9 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGui.java @@ -40,7 +40,7 @@ public class ToolStationGui extends GuiContainer implements INEIGuiHandler { public ToolStationGui( InventoryPlayer inventoryplayer, ToolStationLogic stationlogic, World world, int x, int y, int z) { - super((ActiveContainer) stationlogic.getGuiContainer(inventoryplayer, world, x, y, z)); + super(stationlogic.getGuiContainer(inventoryplayer, world, x, y, z)); this.logic = stationlogic; toolSlots = (ToolStationContainer) inventorySlots; text = new GuiTextField(this.fontRendererObj, 83, 8, 30, 12); diff --git a/src/main/java/tconstruct/tools/inventory/FrypanContainer.java b/src/main/java/tconstruct/tools/inventory/FrypanContainer.java index 062b7e59..3979837a 100644 --- a/src/main/java/tconstruct/tools/inventory/FrypanContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FrypanContainer.java @@ -94,7 +94,7 @@ public class FrypanContainer extends Container { } if (slotStack.stackSize == 0) { - slot.putStack((ItemStack) null); + slot.putStack(null); } else { slot.onSlotChanged(); } diff --git a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java index 1d3f501e..0988e434 100644 --- a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java @@ -129,7 +129,7 @@ public class FurnaceContainer extends Container { } if (itemstack1.stackSize == 0) { - slot.putStack((ItemStack) null); + slot.putStack(null); } else { slot.onSlotChanged(); } diff --git a/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java b/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java index 070d338b..df612a47 100644 --- a/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java @@ -74,7 +74,7 @@ public class PartCrafterContainer extends ActiveContainer { } if (slotStack.stackSize == 0) { - slot.putStack((ItemStack) null); + slot.putStack(null); logic.tryBuildPart(slotID); } slot.onSlotChanged(); diff --git a/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java b/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java index c954f0bb..01d5a13b 100644 --- a/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java @@ -62,7 +62,7 @@ public class PatternChestContainer extends Container { } if (slotStack.stackSize == 0) { - slot.putStack((ItemStack) null); + slot.putStack(null); } else { slot.onSlotChanged(); } diff --git a/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java b/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java index 196e82cf..19d64c2b 100644 --- a/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java @@ -104,7 +104,7 @@ public class ToolStationContainer extends ActiveContainer { } if (slotStack.stackSize == 0) { - slot.putStack((ItemStack) null); + slot.putStack(null); } else { slot.onSlotChanged(); } diff --git a/src/main/java/tconstruct/tools/items/Pattern.java b/src/main/java/tconstruct/tools/items/Pattern.java index 446a9821..104ba39c 100644 --- a/src/main/java/tconstruct/tools/items/Pattern.java +++ b/src/main/java/tconstruct/tools/items/Pattern.java @@ -144,6 +144,6 @@ public class Pattern extends CraftingItem implements IPattern { @Override public ItemStack getPatternOutput(ItemStack stack, ItemStack input, MaterialSet set) { - return TConstructRegistry.getPartMapping((Item) this, stack.getItemDamage(), set.materialID); + return TConstructRegistry.getPartMapping(this, stack.getItemDamage(), set.materialID); } } diff --git a/src/main/java/tconstruct/tools/items/TitleIcon.java b/src/main/java/tconstruct/tools/items/TitleIcon.java index e00ffb0c..533fcb2a 100644 --- a/src/main/java/tconstruct/tools/items/TitleIcon.java +++ b/src/main/java/tconstruct/tools/items/TitleIcon.java @@ -168,7 +168,7 @@ public class TitleIcon extends Item { public static void spawnEntity(double x, double y, double z, Entity entity, World world) { if (!world.isRemote) { entity.setPosition(x, y, z); - ((EntityLiving) entity).onSpawnWithEgg((IEntityLivingData) null); + ((EntityLiving) entity).onSpawnWithEgg(null); world.spawnEntityInWorld(entity); } } @@ -178,7 +178,7 @@ public class TitleIcon extends Item { entity.setPosition(x, y, z); if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) entity.setAngles(player.cameraYaw, player.cameraYaw); - ((EntityLiving) entity).onSpawnWithEgg((IEntityLivingData) null); + ((EntityLiving) entity).onSpawnWithEgg(null); world.spawnEntityInWorld(entity); } } @@ -188,7 +188,7 @@ public class TitleIcon extends Item { if (!world.isRemote) { entity.setPosition(x, y, z); entity.setSlimeSize(8); - entity.onSpawnWithEgg((IEntityLivingData) null); + entity.onSpawnWithEgg(null); world.spawnEntityInWorld(entity); } } @@ -197,7 +197,7 @@ public class TitleIcon extends Item { if (!world.isRemote) { entity.setPosition(x, y, z); entity.setSlimeSize(8); - entity.onSpawnWithEgg((IEntityLivingData) null); + entity.onSpawnWithEgg(null); world.spawnEntityInWorld(entity); } } diff --git a/src/main/java/tconstruct/tools/logic/FurnaceLogic.java b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java index 47073b15..e7b76cdd 100644 --- a/src/main/java/tconstruct/tools/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java @@ -79,7 +79,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin boolean burning = isBurning(); boolean updateInventory = false; if (fuel <= 0 && canSmelt()) { - fuel = fuelGague = (int) (getItemBurnTime(inventory[1])); + fuel = fuelGague = getItemBurnTime(inventory[1]); if (fuel > 0) { if (inventory[1].getItem().hasContainerItem()) // Fuel slot { diff --git a/src/main/java/tconstruct/tools/model/FancyItemRender.java b/src/main/java/tconstruct/tools/model/FancyItemRender.java index f5332b7e..aabfd7fa 100644 --- a/src/main/java/tconstruct/tools/model/FancyItemRender.java +++ b/src/main/java/tconstruct/tools/model/FancyItemRender.java @@ -188,10 +188,10 @@ public class FancyItemRender extends Render { par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno"); } - float f4 = ((IIcon) par2Icon).getMinU(); - float f5 = ((IIcon) par2Icon).getMaxU(); - float f6 = ((IIcon) par2Icon).getMinV(); - float f7 = ((IIcon) par2Icon).getMaxV(); + float f4 = par2Icon.getMinU(); + float f5 = par2Icon.getMaxU(); + float f6 = par2Icon.getMinV(); + float f7 = par2Icon.getMaxV(); float f8 = 1.0F; float f9 = 0.5F; float f10 = 0.25F; @@ -242,8 +242,8 @@ public class FancyItemRender extends Render { f6, f4, f7, - ((IIcon) par2Icon).getIconWidth(), - ((IIcon) par2Icon).getIconHeight(), + par2Icon.getIconWidth(), + par2Icon.getIconHeight(), f12); if (itemstack.hasEffect(pass)) { @@ -471,26 +471,25 @@ public class FancyItemRender extends Render { tessellator.startDrawingQuads(); tessellator.addVertexWithUV( - (double) (par2 + 0), - (double) (par3 + par5), - (double) this.zLevel, - (double) ((f2 + (float) par5 * f4) * f), - (double) ((f3 + (float) par5) * f1)); + par2 + 0, + par3 + par5, + this.zLevel, + (f2 + (float) par5 * f4) * f, + (f3 + (float) par5) * f1); tessellator.addVertexWithUV( - (double) (par2 + par4), - (double) (par3 + par5), - (double) this.zLevel, - (double) ((f2 + (float) par4 + (float) par5 * f4) * f), - (double) ((f3 + (float) par5) * f1)); + par2 + par4, + par3 + par5, + this.zLevel, + (f2 + (float) par4 + (float) par5 * f4) * f, + (f3 + (float) par5) * f1); tessellator.addVertexWithUV( - (double) (par2 + par4), - (double) (par3 + 0), - (double) this.zLevel, - (double) ((f2 + (float) par4) * f), - (double) ((f3 + 0.0F) * f1)); + par2 + par4, + par3 + 0, + this.zLevel, + (f2 + (float) par4) * f, + (f3 + 0.0F) * f1); tessellator.addVertexWithUV( - (double) (par2 + 0), (double) (par3 + 0), (double) this.zLevel, (double) ((f2 + 0.0F) * f), (double) - ((f3 + 0.0F) * f1)); + par2 + 0, par3 + 0, this.zLevel, (f2 + 0.0F) * f, (f3 + 0.0F) * f1); tessellator.draw(); } } @@ -505,7 +504,7 @@ public class FancyItemRender extends Render { ItemStack par3ItemStack, int par4, int par5) { - this.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, (String) null); + this.renderItemOverlayIntoGUI(par1FontRenderer, par2TextureManager, par3ItemStack, par4, par5, null); } public void renderItemOverlayIntoGUI( @@ -559,10 +558,10 @@ public class FancyItemRender extends Render { private void renderQuad(Tessellator par1Tessellator, int par2, int par3, int par4, int par5, int par6) { par1Tessellator.startDrawingQuads(); par1Tessellator.setColorOpaque_I(par6); - par1Tessellator.addVertex((double) (par2 + 0), (double) (par3 + 0), 0.0D); - par1Tessellator.addVertex((double) (par2 + 0), (double) (par3 + par5), 0.0D); - par1Tessellator.addVertex((double) (par2 + par4), (double) (par3 + par5), 0.0D); - par1Tessellator.addVertex((double) (par2 + par4), (double) (par3 + 0), 0.0D); + par1Tessellator.addVertex(par2 + 0, par3 + 0, 0.0D); + par1Tessellator.addVertex(par2 + 0, par3 + par5, 0.0D); + par1Tessellator.addVertex(par2 + par4, par3 + par5, 0.0D); + par1Tessellator.addVertex(par2 + par4, par3 + 0, 0.0D); par1Tessellator.draw(); } @@ -570,20 +569,17 @@ public class FancyItemRender extends Render { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.addVertexWithUV( - (double) (par1 + 0), (double) (par2 + par5), (double) this.zLevel, (double) par3Icon.getMinU(), (double) - par3Icon.getMaxV()); + par1 + 0, par2 + par5, this.zLevel, par3Icon.getMinU(), par3Icon.getMaxV()); tessellator.addVertexWithUV( - (double) (par1 + par4), - (double) (par2 + par5), - (double) this.zLevel, - (double) par3Icon.getMaxU(), - (double) par3Icon.getMaxV()); + par1 + par4, + par2 + par5, + this.zLevel, + par3Icon.getMaxU(), + par3Icon.getMaxV()); tessellator.addVertexWithUV( - (double) (par1 + par4), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMaxU(), (double) - par3Icon.getMinV()); + par1 + par4, par2 + 0, this.zLevel, par3Icon.getMaxU(), par3Icon.getMinV()); tessellator.addVertexWithUV( - (double) (par1 + 0), (double) (par2 + 0), (double) this.zLevel, (double) par3Icon.getMinU(), (double) - par3Icon.getMinV()); + par1 + 0, par2 + 0, this.zLevel, par3Icon.getMinU(), par3Icon.getMinV()); tessellator.draw(); } diff --git a/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java b/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java index e40d15da..5a371534 100644 --- a/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java +++ b/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java @@ -90,8 +90,8 @@ public class CrosshairHandler { } private void drawCrosshairPart(float width, float height, int part) { - double w = (double) width; - double h = (double) height; + double w = width; + double h = height; double s = 4; double z = -90; diff --git a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java index 190a3d5a..e6138658 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java +++ b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java @@ -145,7 +145,7 @@ public class Crossbow extends ProjectileWeapon { if (ammo.getItem() instanceof IAmmo) ((IAmmo) ammo.getItem()).consumeAmmo(1, ammo); else { if (Loader.isModLoaded("battlegear2")) { - ((InventoryPlayerBattle) player.inventory).consumeInventoryItem(ammo.getItem()); + player.inventory.consumeInventoryItem(ammo.getItem()); } else { player.inventory.consumeInventoryItem(ammo.getItem()); } diff --git a/src/main/java/tconstruct/world/MiningExplosion.java b/src/main/java/tconstruct/world/MiningExplosion.java index 43bf545e..7e19ed88 100644 --- a/src/main/java/tconstruct/world/MiningExplosion.java +++ b/src/main/java/tconstruct/world/MiningExplosion.java @@ -41,9 +41,9 @@ public class MiningExplosion extends Explosion { || j == this.field_77289_h - 1 || k == 0 || k == this.field_77289_h - 1) { - double d3 = (double) ((float) i / ((float) this.field_77289_h - 1.0F) * 2.0F - 1.0F); - double d4 = (double) ((float) j / ((float) this.field_77289_h - 1.0F) * 2.0F - 1.0F); - double d5 = (double) ((float) k / ((float) this.field_77289_h - 1.0F) * 2.0F - 1.0F); + double d3 = (float) i / ((float) this.field_77289_h - 1.0F) * 2.0F - 1.0F; + double d4 = (float) j / ((float) this.field_77289_h - 1.0F) * 2.0F - 1.0F; + double d5 = (float) k / ((float) this.field_77289_h - 1.0F) * 2.0F - 1.0F; double d6 = Math.sqrt(d3 * d3 + d4 * d4 + d5 * d5); d3 /= d6; d4 /= d6; @@ -93,7 +93,7 @@ public class MiningExplosion extends Explosion { List list = this.world.getEntitiesWithinAABBExcludingEntity( this.exploder, AxisAlignedBB.getBoundingBox( - (double) i, (double) k, (double) i2, (double) j, (double) l1, (double) j2)); + i, k, i2, j, l1, j2)); Vec3 vec3 = Vec3.createVectorHelper(this.explosionX, this.explosionY, this.explosionZ); for (int k2 = 0; k2 < list.size(); ++k2) { @@ -105,13 +105,13 @@ public class MiningExplosion extends Explosion { d0 = entity.posX - this.explosionX; d1 = entity.posY + (double) entity.getEyeHeight() - this.explosionY; d2 = entity.posZ - this.explosionZ; - double d8 = (double) MathHelper.sqrt_double(d0 * d0 + d1 * d1 + d2 * d2); + double d8 = MathHelper.sqrt_double(d0 * d0 + d1 * d1 + d2 * d2); if (d8 != 0.0D) { d0 /= d8; d1 /= d8; d2 /= d8; - double d9 = (double) this.world.getBlockDensity(vec3, entity.boundingBox); + double d9 = this.world.getBlockDensity(vec3, entity.boundingBox); double d10 = (1.0D - d7) * d9; if (!(entity instanceof EntityItem)) entity.attackEntityFrom(DamageSource.setExplosionSource(this), (float) @@ -123,7 +123,7 @@ public class MiningExplosion extends Explosion { if (entity instanceof EntityPlayer) { this.field_77288_k.put( - (EntityPlayer) entity, Vec3.createVectorHelper(d0 * d10, d1 * d10, d2 * d10)); + entity, Vec3.createVectorHelper(d0 * d10, d1 * d10, d2 * d10)); } } } @@ -168,18 +168,18 @@ public class MiningExplosion extends Explosion { l = this.world.getBlock(i, j, k); if (par1) { - double d0 = (double) ((float) i + this.world.rand.nextFloat()); - double d1 = (double) ((float) j + this.world.rand.nextFloat()); - double d2 = (double) ((float) k + this.world.rand.nextFloat()); + double d0 = (float) i + this.world.rand.nextFloat(); + double d1 = (float) j + this.world.rand.nextFloat(); + double d2 = (float) k + this.world.rand.nextFloat(); double d3 = d0 - this.explosionX; double d4 = d1 - this.explosionY; double d5 = d2 - this.explosionZ; - double d6 = (double) MathHelper.sqrt_double(d3 * d3 + d4 * d4 + d5 * d5); + double d6 = MathHelper.sqrt_double(d3 * d3 + d4 * d4 + d5 * d5); d3 /= d6; d4 /= d6; d5 /= d6; double d7 = 0.5D / (d6 / (double) this.explosionSize + 0.1D); - d7 *= (double) (this.world.rand.nextFloat() * this.world.rand.nextFloat() + 0.3F); + d7 *= this.world.rand.nextFloat() * this.world.rand.nextFloat() + 0.3F; d3 *= d7; d4 *= d7; d5 *= d7; diff --git a/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java b/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java index dfc755e3..4329c334 100644 --- a/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java @@ -16,12 +16,12 @@ public class TDispenserBehaviorSpawnEgg extends BehaviorDefaultDispenseItem { public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { EnumFacing enumfacing = BlockDispenser.func_149937_b(par1IBlockSource.getBlockMetadata()); double d0 = par1IBlockSource.getX() + (double) enumfacing.getFrontOffsetX(); - double d1 = (double) ((float) par1IBlockSource.getYInt() + 0.2F); + double d1 = (float) par1IBlockSource.getYInt() + 0.2F; double d2 = par1IBlockSource.getZ() + (double) enumfacing.getFrontOffsetZ(); EntityLiving entity = TitleIcon.activateSpawnEgg(par2ItemStack, par1IBlockSource.getWorld(), d0, d1, d2, 0); if (par2ItemStack.hasDisplayName()) { - ((EntityLiving) entity).setCustomNameTag(par2ItemStack.getDisplayName()); + entity.setCustomNameTag(par2ItemStack.getDisplayName()); } par2ItemStack.splitStack(1); diff --git a/src/main/java/tconstruct/world/TinkerWorldEvents.java b/src/main/java/tconstruct/world/TinkerWorldEvents.java index fcc255ac..9cb31c5b 100644 --- a/src/main/java/tconstruct/world/TinkerWorldEvents.java +++ b/src/main/java/tconstruct/world/TinkerWorldEvents.java @@ -35,7 +35,7 @@ public class TinkerWorldEvents { public static void spawnEntityLiving(double x, double y, double z, EntityLiving entity, World world) { if (!world.isRemote) { entity.setPosition(x, y, z); - entity.onSpawnWithEgg((IEntityLivingData) null); + entity.onSpawnWithEgg(null); world.spawnEntityInWorld(entity); } } diff --git a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java index a71662c9..5b7437eb 100644 --- a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java +++ b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java @@ -125,7 +125,7 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon { } if (entityfx != null) { - return (EntityFX) entityfx; + return entityfx; } else { double d9 = 16.0D; @@ -241,10 +241,10 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon { } if (entityfx != null) { - this.mc.effectRenderer.addEffect((EntityFX) entityfx); + this.mc.effectRenderer.addEffect(entityfx); } - return (EntityFX) entityfx; + return entityfx; } } } else { diff --git a/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java b/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java index 7221cc14..8b6ff743 100644 --- a/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java +++ b/src/main/java/tconstruct/world/blocks/OreberryBushEssence.java @@ -24,7 +24,7 @@ public class OreberryBushEssence extends OreberryBush implements IPlantable { int meta = world.getBlockMetadata(x, y, z); if (world.getFullBlockLightValue(x, y, z) < 10 || meta % 4 == 1) { if (meta < 12) { - world.setBlock(x, y, z, (Block) this, meta + 4, 3); + world.setBlock(x, y, z, this, meta + 4, 3); } } /* diff --git a/src/main/java/tconstruct/world/blocks/SlimeExplosive.java b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java index 4a87ee1f..1ff6ac80 100644 --- a/src/main/java/tconstruct/world/blocks/SlimeExplosive.java +++ b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java @@ -69,9 +69,9 @@ public class SlimeExplosive extends TConstructBlock { if (!par1World.isRemote) { ExplosivePrimed entitytntprimed = new ExplosivePrimed( par1World, - (double) ((float) par2 + 0.5F), - (double) ((float) par3 + 0.5F), - (double) ((float) par4 + 0.5F), + (float) par2 + 0.5F, + (float) par3 + 0.5F, + (float) par4 + 0.5F, par5Explosion.getExplosivePlacedBy()); entitytntprimed.fuse = par1World.rand.nextInt(entitytntprimed.fuse / 4) + entitytntprimed.fuse / 8; par1World.spawnEntityInWorld(entitytntprimed); @@ -80,7 +80,7 @@ public class SlimeExplosive extends TConstructBlock { @Override public void onBlockDestroyedByPlayer(World par1World, int par2, int par3, int par4, int par5) { - this.primeTnt(par1World, par2, par3, par4, par5, (EntityLivingBase) null); + this.primeTnt(par1World, par2, par3, par4, par5, null); } public void primeTnt( @@ -89,9 +89,9 @@ public class SlimeExplosive extends TConstructBlock { if ((par5 % 2) == 1) { ExplosivePrimed entitytntprimed = new ExplosivePrimed( par1World, - (double) ((float) par2 + 0.5F), - (double) ((float) par3 + 0.5F), - (double) ((float) par4 + 0.5F), + (float) par2 + 0.5F, + (float) par3 + 0.5F, + (float) par4 + 0.5F, par6EntityLivingBase); par1World.spawnEntityInWorld(entitytntprimed); par1World.playSoundAtEntity(entitytntprimed, "random.fuse", 1.0F, 1.0F); diff --git a/src/main/java/tconstruct/world/blocks/SoilBlock.java b/src/main/java/tconstruct/world/blocks/SoilBlock.java index 474a5f9f..9eaae6b9 100644 --- a/src/main/java/tconstruct/world/blocks/SoilBlock.java +++ b/src/main/java/tconstruct/world/blocks/SoilBlock.java @@ -26,8 +26,8 @@ public class SoilBlock extends TConstructBlock { if (metadata == 3) { ((EntityLivingBase) entity).heal(1); } else if (metadata == 4) { - ((EntityLivingBase) entity).attackEntityFrom(DamageSource.magic, 1); - ((EntityLivingBase) entity).setFire(1); + entity.attackEntityFrom(DamageSource.magic, 1); + entity.setFire(1); } } } diff --git a/src/main/java/tconstruct/world/blocks/StoneTorch.java b/src/main/java/tconstruct/world/blocks/StoneTorch.java index 40699d68..c25e10c3 100644 --- a/src/main/java/tconstruct/world/blocks/StoneTorch.java +++ b/src/main/java/tconstruct/world/blocks/StoneTorch.java @@ -199,7 +199,7 @@ public class StoneTorch extends MantleBlock { */ protected boolean dropTorchIfCantStay(World par1World, int par2, int par3, int par4) { if (!this.canPlaceBlockAt(par1World, par2, par3, par4)) { - if (par1World.getBlock(par2, par3, par4) == (Block) this) { + if (par1World.getBlock(par2, par3, par4) == this) { this.dropBlockAsItem(par1World, par2, par3, par4, par1World.getBlockMetadata(par2, par3, par4), 0); par1World.setBlockToAir(par2, par3, par4); // WorldHelper.setBlockToAir(par1World, par2, par3, par4); @@ -244,9 +244,9 @@ public class StoneTorch extends MantleBlock { */ public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { int meta = par1World.getBlockMetadata(par2, par3, par4); - double d0 = (double) ((float) par2 + 0.5F); - double d1 = (double) ((float) par3 + 0.7F); - double d2 = (double) ((float) par4 + 0.5F); + double d0 = (float) par2 + 0.5F; + double d1 = (float) par3 + 0.7F; + double d2 = (float) par4 + 0.5F; double d3 = 0.2199999988079071D; double d4 = 0.27000001072883606D; diff --git a/src/main/java/tconstruct/world/entity/CartEntity.java b/src/main/java/tconstruct/world/entity/CartEntity.java index 8027c652..6fa18e0f 100644 --- a/src/main/java/tconstruct/world/entity/CartEntity.java +++ b/src/main/java/tconstruct/world/entity/CartEntity.java @@ -261,9 +261,9 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } float var8 = 0.05F; - entityitem.motionX = (double) ((float) this.rand.nextGaussian() * var8); - entityitem.motionY = (double) ((float) this.rand.nextGaussian() * var8 + 0.2F); - entityitem.motionZ = (double) ((float) this.rand.nextGaussian() * var8); + entityitem.motionX = (float) this.rand.nextGaussian() * var8; + entityitem.motionY = (float) this.rand.nextGaussian() * var8 + 0.2F; + entityitem.motionZ = (float) this.rand.nextGaussian() * var8; this.worldObj.spawnEntityInWorld(entityitem); } } @@ -392,7 +392,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS } } - double var51 = (double) MathHelper.wrapAngleTo180_float(this.rotationYaw - this.prevRotationYaw); + double var51 = MathHelper.wrapAngleTo180_float(this.rotationYaw - this.prevRotationYaw); if (var51 < -170.0D || var51 >= 170.0D) { this.rotationYaw += 180.0F; @@ -523,10 +523,10 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS if (BlockRail.func_150051_a(var10)) { int var11 = 0; - par3 = (double) var8; + par3 = var8; if (var11 >= 2 && var11 <= 5) { - par3 = (double) (var8 + 1); + par3 = var8 + 1; } int[][] var12 = matrix[var11]; @@ -622,7 +622,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS this.cargoItems = new ItemStack[this.getSizeInventory()]; for (int var3 = 0; var3 < var2.tagCount(); ++var3) { - NBTTagCompound var4 = (NBTTagCompound) var2.getCompoundTagAt(var3); + NBTTagCompound var4 = var2.getCompoundTagAt(var3); int var5 = var4.getByte("Slot") & 255; if (var5 >= 0 && var5 < this.cargoItems.length) { @@ -661,7 +661,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS double var6 = var2 * var2 + var4 * var4; if (var6 >= 9.999999747378752E-5D) { - var6 = (double) MathHelper.sqrt_double(var6); + var6 = MathHelper.sqrt_double(var6); var2 /= var6; var4 /= var6; double var8 = 1.0D / var6; @@ -674,8 +674,8 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS var4 *= var8; var2 *= 0.10000000149011612D; var4 *= 0.10000000149011612D; - var2 *= (double) (1.0F - this.entityCollisionReduction); - var4 *= (double) (1.0F - this.entityCollisionReduction); + var2 *= 1.0F - this.entityCollisionReduction; + var4 *= 1.0F - this.entityCollisionReduction; var2 *= 0.5D; var4 *= 0.5D; @@ -684,9 +684,9 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS double var12 = par1Entity.posZ - this.posZ; Vec3 var14 = Vec3.createVectorHelper(var10, 0.0D, var12).normalize(); Vec3 var15 = Vec3.createVectorHelper( - (double) MathHelper.cos(this.rotationYaw * (float) Math.PI / 180.0F), + MathHelper.cos(this.rotationYaw * (float) Math.PI / 180.0F), 0.0D, - (double) MathHelper.sin(this.rotationYaw * (float) Math.PI / 180.0F)) + MathHelper.sin(this.rotationYaw * (float) Math.PI / 180.0F)) .normalize(); double var16 = Math.abs(var14.dotProduct(var15)); @@ -854,7 +854,7 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS if (var2 != null && var2.getItem() == Items.coal) { if (--var2.stackSize == 0) { - player.inventory.setInventorySlotContents(player.inventory.currentItem, (ItemStack) null); + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } this.fuel += 3600; @@ -877,8 +877,8 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS this.minecartX = par1; this.minecartY = par3; this.minecartZ = par5; - this.minecartYaw = (double) par7; - this.minecartPitch = (double) par8; + this.minecartYaw = par7; + this.minecartPitch = par8; this.turnProgress = par9 + 2; this.motionX = this.velocityX; this.motionY = this.velocityY; diff --git a/src/main/java/tconstruct/world/entity/SlimeBase.java b/src/main/java/tconstruct/world/entity/SlimeBase.java index 69c4579b..510872bd 100644 --- a/src/main/java/tconstruct/world/entity/SlimeBase.java +++ b/src/main/java/tconstruct/world/entity/SlimeBase.java @@ -121,13 +121,13 @@ public abstract class SlimeBase extends EntityLiving implements IMob { if (this.isPotionActive(Potion.jump)) { this.motionY += - (double) ((float) (this.getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.1F); + (float) (this.getActivePotionEffect(Potion.jump).getAmplifier() + 1) * 0.1F; } if (this.isSprinting()) { float f = this.rotationYaw * 0.017453292F; - this.motionX -= (double) (MathHelper.sin(f) * 0.2F); - this.motionZ += (double) (MathHelper.cos(f) * 0.2F); + this.motionX -= MathHelper.sin(f) * 0.2F; + this.motionZ += MathHelper.cos(f) * 0.2F; } if (!(this instanceof IBossDisplayData) diff --git a/src/main/java/tconstruct/world/gen/OreberryBushGen.java b/src/main/java/tconstruct/world/gen/OreberryBushGen.java index f715094a..bf613883 100644 --- a/src/main/java/tconstruct/world/gen/OreberryBushGen.java +++ b/src/main/java/tconstruct/world/gen/OreberryBushGen.java @@ -18,7 +18,7 @@ public class OreberryBushGen extends WorldGenerator { meta, chance, Blocks.stone, - (Block) Blocks.grass, + Blocks.grass, Blocks.dirt, Blocks.water, Blocks.sand, diff --git a/src/main/java/tconstruct/world/gen/SurfaceOreGen.java b/src/main/java/tconstruct/world/gen/SurfaceOreGen.java index 21cdc631..ee7e36af 100644 --- a/src/main/java/tconstruct/world/gen/SurfaceOreGen.java +++ b/src/main/java/tconstruct/world/gen/SurfaceOreGen.java @@ -27,7 +27,7 @@ public class SurfaceOreGen extends WorldGenerator { number, changeSize, Blocks.stone, - (Block) Blocks.grass, + Blocks.grass, Blocks.dirt, Blocks.water, Blocks.sand, @@ -76,12 +76,12 @@ public class SurfaceOreGen extends WorldGenerator { float f = random.nextFloat() * (float) Math.PI; int blockNumber = numberOfBlocks; if (alterSize) blockNumber = numberOfBlocks * 2 / 5 + random.nextInt(numberOfBlocks * 3 / 5); - double d0 = (double) ((float) (startX + 8) + MathHelper.sin(f) * (float) blockNumber / 8.0F); - double d1 = (double) ((float) (startX + 8) - MathHelper.sin(f) * (float) blockNumber / 8.0F); - double d2 = (double) ((float) (startZ + 8) + MathHelper.cos(f) * (float) blockNumber / 8.0F); - double d3 = (double) ((float) (startZ + 8) - MathHelper.cos(f) * (float) blockNumber / 8.0F); - double d4 = (double) (startY + random.nextInt(3) - 2); - double d5 = (double) (startY + random.nextInt(3) - 2); + double d0 = (float) (startX + 8) + MathHelper.sin(f) * (float) blockNumber / 8.0F; + double d1 = (float) (startX + 8) - MathHelper.sin(f) * (float) blockNumber / 8.0F; + double d2 = (float) (startZ + 8) + MathHelper.cos(f) * (float) blockNumber / 8.0F; + double d3 = (float) (startZ + 8) - MathHelper.cos(f) * (float) blockNumber / 8.0F; + double d4 = startY + random.nextInt(3) - 2; + double d5 = startY + random.nextInt(3) - 2; for (int l = 0; l <= blockNumber; ++l) { double d6 = d0 + (d1 - d0) * (double) l / (double) blockNumber; diff --git a/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java b/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java index 42ad05af..9ba31ec3 100644 --- a/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java +++ b/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java @@ -83,9 +83,9 @@ public class BarricadeItem extends ItemBlock { if (placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) { world.playSoundEffect( - (double) ((float) x + 0.5F), - (double) ((float) y + 0.5F), - (double) ((float) z + 0.5F), + (float) x + 0.5F, + (float) y + 0.5F, + (float) z + 0.5F, block.stepSound.soundName, (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F); diff --git a/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java b/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java index c8f9a938..428efd59 100644 --- a/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java +++ b/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java @@ -49,7 +49,7 @@ public class OreberryBushItem extends MultiItemBlock { Block block = world.getBlock(x, y, z); if (block != null - && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TinkerWorld.oreBerry) + && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, TinkerWorld.oreBerry) && WorldHelper.isAirBlock(world, x, y + 1, z)) { world.setBlock(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3); if (!player.capabilities.isCreativeMode) stack.stackSize--; diff --git a/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java b/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java index aeefb6d2..c9d1d816 100644 --- a/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java +++ b/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java @@ -66,7 +66,7 @@ public class OreberryBushSecondItem extends MultiItemBlock { Block block = world.getBlock(x, y, z); if (block != null - && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TinkerWorld.oreBerrySecond) + && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, TinkerWorld.oreBerrySecond) && WorldHelper.isAirBlock(world, x, y + 1, z)) { world.setBlock(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3); if (!player.capabilities.isCreativeMode) stack.stackSize--; diff --git a/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java b/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java index 258f673d..b0b1c1f8 100644 --- a/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java +++ b/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java @@ -45,9 +45,9 @@ public class WoolSlab1Item extends MultiItemBlock { if ((side == 1 && flag || side == 0 && !flag) && b == this.block && trueMeta == stack.getItemDamage()) { if (world.setBlock(x, y, z, Blocks.wool, trueMeta, 3)) { world.playSoundEffect( - (double) ((float) x + 0.5F), - (double) ((float) y + 0.5F), - (double) ((float) z + 0.5F), + (float) x + 0.5F, + (float) y + 0.5F, + (float) z + 0.5F, this.block.stepSound.soundName, (this.block.stepSound.getVolume() + 1.0F) / 2.0F, this.block.stepSound.getPitch() * 0.8F); diff --git a/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java b/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java index 2b268906..486c8ec4 100644 --- a/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java +++ b/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java @@ -50,9 +50,9 @@ public class WoolSlab2Item extends MultiItemBlock { if ((side == 1 && flag || side == 0 && !flag) && block == this.block && trueMeta == stack.getItemDamage()) { if (world.setBlock(x, y, z, Blocks.wool, trueMeta + 8, 3)) { world.playSoundEffect( - (double) ((float) x + 0.5F), - (double) ((float) y + 0.5F), - (double) ((float) z + 0.5F), + (float) x + 0.5F, + (float) y + 0.5F, + (float) z + 0.5F, this.block.stepSound.soundName, (this.block.stepSound.getVolume() + 1.0F) / 2.0F, this.block.stepSound.getPitch() * 0.8F);