diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index 61a374eb..86fc2ffc 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -236,14 +236,14 @@ public class TankLayerScan extends LogicComponent { public int recurseStructureDown(int y) { Iterator i = layerAirCoords.iterator(); if (i.hasNext()) { - CoordTuple coord = (CoordTuple) i.next(); + CoordTuple coord = i.next(); if (checkAir(coord.x, y, coord.z)) { boolean valid = true; addAirBlock(coord.x, y, coord.z); // Don't skip first one // Air blocks while (i.hasNext()) { - coord = (CoordTuple) i.next(); + coord = i.next(); if (checkAir(coord.x, y, coord.z)) { addAirBlock(coord.x, y, coord.z); } else { @@ -255,7 +255,7 @@ public class TankLayerScan extends LogicComponent { // Bricks i = layerBlockCoords.iterator(); while (i.hasNext()) { - coord = (CoordTuple) i.next(); + coord = i.next(); if (checkServant(coord.x, y, coord.z)) blockCoords.add(new CoordTuple(coord.x, y, coord.z)); else { valid = false; @@ -268,7 +268,7 @@ public class TankLayerScan extends LogicComponent { // Bottom floor. All blocks, please vacate the elevator boolean valid = true; while (i.hasNext()) { - coord = (CoordTuple) i.next(); + coord = i.next(); if (checkServant(coord.x, y, coord.z)) blockCoords.add(new CoordTuple(coord.x, y, coord.z)); else { @@ -286,13 +286,13 @@ public class TankLayerScan extends LogicComponent { public int recurseStructureUp(int y) { Iterator i = layerBlockCoords.iterator(); if (i.hasNext()) { - CoordTuple coord = (CoordTuple) i.next(); + CoordTuple coord = i.next(); if (checkServant(coord.x, y, coord.z)) { boolean valid = true; // Bricks while (i.hasNext()) { - coord = (CoordTuple) i.next(); + coord = i.next(); if (checkServant(coord.x, y, coord.z)) blockCoords.add(new CoordTuple(coord.x, y, coord.z)); else { valid = false; @@ -304,7 +304,7 @@ public class TankLayerScan extends LogicComponent { if (valid) { i = layerAirCoords.iterator(); while (i.hasNext()) { - coord = (CoordTuple) i.next(); + coord = i.next(); if (checkAir(coord.x, y, coord.z)) { addAirBlock(coord.x, y, coord.z); } else { diff --git a/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java b/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java index 78066e97..3908d5cc 100644 --- a/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java +++ b/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java @@ -136,8 +136,8 @@ public class CrosshairHandler { } private void drawAlternateCrosshairPart(float width, float height, int part) { - double w = (double) width; - double h = (double) height; + double w = width; + double h = height; final double s = 8d; final double z = -90; diff --git a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java index 74c1c044..80980675 100644 --- a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java +++ b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java @@ -153,12 +153,12 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon { break; case "mobSpell": entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, 0.0D, 0.0D, 0.0D); - ((EntityFX) entityfx).setRBGColorF((float) par8, (float) par10, (float) par12); + entityfx.setRBGColorF((float) par8, (float) par10, (float) par12); break; case "mobSpellAmbient": entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, 0.0D, 0.0D, 0.0D); - ((EntityFX) entityfx).setAlphaF(0.15F); - ((EntityFX) entityfx).setRBGColorF((float) par8, (float) par10, (float) par12); + entityfx.setAlphaF(0.15F); + entityfx.setRBGColorF((float) par8, (float) par10, (float) par12); break; case "spell": entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); @@ -171,7 +171,7 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon { entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12); ((EntitySpellParticleFX) entityfx).setBaseSpellTextureIndex(144); float f = mc.theWorld.rand.nextFloat() * 0.5F + 0.35F; - ((EntityFX) entityfx).setRBGColorF(1.0F * f, 0.0F * f, 1.0F * f); + entityfx.setRBGColorF(1.0F * f, 0.0F * f, 1.0F * f); break; case "note": entityfx = new EntityNoteFX(mc.theWorld, par2, par4, par6, par8, par10, par12); @@ -228,13 +228,13 @@ public class TinkerWorldProxyClient extends TinkerWorldProxyCommon { break; case "angryVillager": entityfx = new EntityHeartFX(mc.theWorld, par2, par4 + 0.5D, par6, par8, par10, par12); - ((EntityFX) entityfx).setParticleTextureIndex(81); - ((EntityFX) entityfx).setRBGColorF(1.0F, 1.0F, 1.0F); + entityfx.setParticleTextureIndex(81); + entityfx.setRBGColorF(1.0F, 1.0F, 1.0F); break; case "happyVillager": entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12); - ((EntityFX) entityfx).setParticleTextureIndex(82); - ((EntityFX) entityfx).setRBGColorF(1.0F, 1.0F, 1.0F); + entityfx.setParticleTextureIndex(82); + entityfx.setRBGColorF(1.0F, 1.0F, 1.0F); break; }