From 4ada1ff8b7101a50aab5d69920cfe9eb6f7156aa Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 15 Sep 2014 03:49:47 +0100 Subject: [PATCH] Small laser refinements: * Allow slightly larger render size. * Stop breaking blocks *just* at the end of the laser. * Reduce default range to 64 blocks. --- src/main/java/mekanism/client/entity/EntityLaser.java | 2 +- src/main/java/mekanism/common/CommonProxy.java | 2 +- src/main/java/mekanism/common/LaserManager.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/client/entity/EntityLaser.java b/src/main/java/mekanism/client/entity/EntityLaser.java index 4e397a3aa..cd716be47 100644 --- a/src/main/java/mekanism/client/entity/EntityLaser.java +++ b/src/main/java/mekanism/client/entity/EntityLaser.java @@ -28,7 +28,7 @@ public class EntityLaser extends EntityFX particleGreen = 0; particleBlue = 0; particleAlpha = 0.1F; - particleScale = (float) Math.min(energy / 50000, 0.5); + particleScale = (float) Math.min(energy / 50000, 0.6); length = end.distance(start); direction = dir; } diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index da8411390..a197586fa 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -241,7 +241,7 @@ public class CommonProxy general.TO_TE = general.TO_BC*10; general.FROM_TE = general.FROM_BC/10; - general.laserRange = Mekanism.configuration.get("general", "LaserRange", 100).getInt(100); + general.laserRange = Mekanism.configuration.get("general", "LaserRange", 64).getInt(64); general.laserEnergyNeededPerHardness = Mekanism.configuration.get("general", "LaserDiggingEnergy", 100000).getInt(100000); usage.enrichmentChamberUsage = Mekanism.configuration.get("usage", "EnrichmentChamberUsage", 50D).getDouble(50D); diff --git a/src/main/java/mekanism/common/LaserManager.java b/src/main/java/mekanism/common/LaserManager.java index 611afabf6..b7f79d173 100644 --- a/src/main/java/mekanism/common/LaserManager.java +++ b/src/main/java/mekanism/common/LaserManager.java @@ -25,7 +25,7 @@ public class LaserManager public static MovingObjectPosition fireLaser(Pos3D from, ForgeDirection direction, double energy, World world) { - Pos3D to = from.clone().translate(direction, general.laserRange); + Pos3D to = from.clone().translate(direction, general.laserRange - 0.002); MovingObjectPosition mop = world.rayTraceBlocks(Vec3.createVectorHelper(from.xPos, from.yPos, from.zPos), Vec3.createVectorHelper(to.xPos, to.yPos, to.zPos)); @@ -80,7 +80,7 @@ public class LaserManager public static void fireLaserClient(Pos3D from, ForgeDirection direction, double energy, World world) { - Pos3D to = from.clone().translate(direction, general.laserRange); + Pos3D to = from.clone().translate(direction, general.laserRange - 0.002); MovingObjectPosition mop = world.rayTraceBlocks(Vec3.createVectorHelper(from.xPos, from.yPos, from.zPos), Vec3.createVectorHelper(to.xPos, to.yPos, to.zPos)); if(mop != null)