From ef4c65c6e67d7316d6d98e950b823d4fbc3dfebb Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 3 Jun 2016 06:09:33 -0700 Subject: [PATCH] Fix some bee particles showing up as very dark --- gradle.properties | 2 +- .../forestry/apiculture/entities/ParticleBeeExplore.java | 8 ++------ .../apiculture/entities/ParticleBeeRoundTrip.java | 6 +----- .../apiculture/entities/ParticleBeeTargetEntity.java | 7 +------ 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index e77a3002e..d9d62d0d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,4 @@ jei_version=3.4.0.+ version_major=5 version_minor=0 -version_patch=3 +version_patch=4 diff --git a/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java b/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java index 7b145cbd8..f587f0291 100644 --- a/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java +++ b/src/main/java/forestry/apiculture/entities/ParticleBeeExplore.java @@ -22,8 +22,7 @@ import forestry.apiculture.PluginApiculture; public class ParticleBeeExplore extends Particle { private final Vec3d origin; - private final int brightness; - + public ParticleBeeExplore(World world, Vec3d origin, BlockPos destination, int color) { super(world, origin.xCoord, origin.yCoord, origin.zCoord, 0.0D, 0.0D, 0.0D); setParticleTexture(PluginApiculture.beeSprite); @@ -44,9 +43,6 @@ public class ParticleBeeExplore extends Particle { this.motionX *= 0.9D; this.motionY *= 0.015D; this.motionZ *= 0.9D; - - BlockPos blockpos = new BlockPos(this.posX, this.posY, this.posZ); - this.brightness = this.worldObj.isBlockLoaded(blockpos) ? this.worldObj.getCombinedLight(blockpos, 0) : 0; } /** @@ -125,7 +121,7 @@ public class ParticleBeeExplore extends Particle { // avoid calculating lighting for bees, it is too much processing @Override public int getBrightnessForRender(float p_189214_1_) { - return this.brightness; + return 15728880; } @Override diff --git a/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java b/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java index af4c23b28..b7690783b 100644 --- a/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java +++ b/src/main/java/forestry/apiculture/entities/ParticleBeeRoundTrip.java @@ -22,7 +22,6 @@ import forestry.apiculture.PluginApiculture; public class ParticleBeeRoundTrip extends Particle { private final Vec3d origin; private final BlockPos destination; - private final int brightness; public ParticleBeeRoundTrip(World world, Vec3d origin, BlockPos destination, int color) { super(world, origin.xCoord, origin.yCoord, origin.zCoord, 0.0D, 0.0D, 0.0D); @@ -45,9 +44,6 @@ public class ParticleBeeRoundTrip extends Particle { this.motionX *= 0.9D; this.motionY *= 0.015D; this.motionZ *= 0.9D; - - BlockPos blockpos = new BlockPos(this.posX, this.posY, this.posZ); - this.brightness = this.worldObj.isBlockLoaded(blockpos) ? this.worldObj.getCombinedLight(blockpos, 0) : 0; } /** @@ -127,7 +123,7 @@ public class ParticleBeeRoundTrip extends Particle { // avoid calculating lighting for bees, it is too much processing @Override public int getBrightnessForRender(float p_189214_1_) { - return this.brightness; + return 15728880; } @Override diff --git a/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java b/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java index 1a8832820..69508910b 100644 --- a/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java +++ b/src/main/java/forestry/apiculture/entities/ParticleBeeTargetEntity.java @@ -20,10 +20,8 @@ import net.minecraft.world.World; import forestry.apiculture.PluginApiculture; public class ParticleBeeTargetEntity extends Particle { - private final Vec3d origin; private final Entity entity; - private final int brightness; public ParticleBeeTargetEntity(World world, Vec3d origin, Entity entity, int color) { super(world, origin.xCoord, origin.yCoord, origin.zCoord, 0.0D, 0.0D, 0.0D); @@ -47,9 +45,6 @@ public class ParticleBeeTargetEntity extends Particle { this.motionX *= 0.9D; this.motionY *= 0.9D; this.motionZ *= 0.9D; - - BlockPos blockpos = new BlockPos(this.posX, this.posY, this.posZ); - this.brightness = this.worldObj.isBlockLoaded(blockpos) ? this.worldObj.getCombinedLight(blockpos, 0) : 0; } /** @@ -126,7 +121,7 @@ public class ParticleBeeTargetEntity extends Particle { // avoid calculating lighting for bees, it is too much processing @Override public int getBrightnessForRender(float p_189214_1_) { - return this.brightness; + return 15728880; } // avoid calculating collisions