From 375a67d10fdc5cde02904ed0e44b43d24a35890e Mon Sep 17 00:00:00 2001 From: Sen Date: Wed, 27 Aug 2025 20:25:20 +0200 Subject: [PATCH] minor light cleanup --- .../main/java/client/renderer/Renderer.java | 32 ++++- .../java/client/renderer/entity/Render.java | 6 + .../renderer/entity/RenderBlockEntity.java | 2 +- .../client/renderer/entity/RenderLiving.java | 2 +- .../client/renderer/entity/RenderManager.java | 8 +- .../renderer/entity/RenderMinecart.java | 2 +- .../renderer/entity/RenderTntPrimed.java | 2 +- .../client/renderer/entity/RenderWolf.java | 15 --- .../java/client/renderer/entity/RenderXp.java | 2 +- .../java/client/renderer/model/ModelWolf.java | 5 +- .../src/main/resources/sounds/wolf_shake.ogg | Bin 16145 -> 0 bytes common/src/main/java/common/block/Block.java | 13 --- .../java/common/block/liquid/BlockLiquid.java | 11 -- .../src/main/java/common/entity/Entity.java | 15 --- .../common/entity/animal/EntityMouse.java | 2 +- .../java/common/entity/animal/EntityWolf.java | 110 ------------------ .../java/common/entity/item/EntityXp.java | 17 --- .../common/entity/npc/EntityArachnoid.java | 4 +- .../entity/projectile/EntityProjectile.java | 13 --- .../common/entity/types/EntityAnimal.java | 2 +- .../src/main/java/common/init/SoundEvent.java | 1 - .../main/java/common/world/IWorldAccess.java | 2 + common/src/main/java/common/world/World.java | 2 + 23 files changed, 53 insertions(+), 215 deletions(-) delete mode 100644 client/src/main/resources/sounds/wolf_shake.ogg diff --git a/client/src/main/java/client/renderer/Renderer.java b/client/src/main/java/client/renderer/Renderer.java index 7c731514..436e9299 100755 --- a/client/src/main/java/client/renderer/Renderer.java +++ b/client/src/main/java/client/renderer/Renderer.java @@ -39,6 +39,7 @@ import client.renderer.tileentity.SpecialRenderer; import client.world.ChunkClient; import common.block.Block; import common.block.Material; +import common.block.artificial.BlockSlab; import common.block.liquid.BlockDynamicLiquid; import common.block.liquid.BlockLiquid; import common.block.liquid.BlockStaticLiquid; @@ -3505,6 +3506,27 @@ public class Renderer { Tessellator.draw(); } } + + private static final int getLightmapValue(IWorldAccess world, BlockPos pos) { + Block block = world.getState(pos).getBlock(); + int light = world.getCombinedLight(pos, block.getLight()); + if(light == 0 && block instanceof BlockSlab) { + pos = pos.down(); + block = world.getState(pos).getBlock(); + return world.getCombinedLight(pos, block.getLight()); + } + return light; + } + + private static final int getLightmapValueLiquid(IWorldAccess world, BlockPos pos) { + int i = world.getCombinedLight(pos, 0); + int j = world.getCombinedLight(pos.up(), 0); + int k = i & 255; + int l = j & 255; + int i1 = i >> 16 & 255; + int j1 = j >> 16 & 255; + return (k > l ? k : l) | (i1 > j1 ? i1 : j1) << 16; + } public boolean renderModel(IWorldAccess blockAccessIn, IBakedModel modelIn, State blockStateIn, BlockPos blockPosIn, RenderBuffer worldRendererIn, boolean checkSides) { @@ -3522,7 +3544,7 @@ public class Renderer { if (!checkSides || blockIn.canRender(blockAccessIn, blockpos, enumfacing)) { - int i = blockIn.getLightmapValue(blockAccessIn, blockpos); + int i = getLightmapValue(blockAccessIn, blockpos); this.renderModelStandardQuads(blockAccessIn, blockIn, blockPosIn, enumfacing, i, false, worldRendererIn, list, bitset); flag = true; } @@ -3551,7 +3573,7 @@ public class Renderer { if (ownBrightness) { this.fillQuadBounds(blockIn, bakedquad.getVertexData(), bakedquad.getFace(), (float[])null, boundsFlags); - brightnessIn = boundsFlags.get(0) ? blockIn.getLightmapValue(blockAccessIn, blockPosIn.offset(bakedquad.getFace())) : blockIn.getLightmapValue(blockAccessIn, blockPosIn); + brightnessIn = boundsFlags.get(0) ? getLightmapValue(blockAccessIn, blockPosIn.offset(bakedquad.getFace())) : getLightmapValue(blockAccessIn, blockPosIn); } worldRendererIn.addVertexData(bakedquad.getVertexData()); @@ -3713,7 +3735,7 @@ public class Renderer { f20 = textureatlassprite.getInterpolatedV((double)(8.0F + (-f22 - f21) * 16.0F)); } - int k2 = blockliquid.getLightmapValue(blockAccess, blockPosIn); + int k2 = getLightmapValueLiquid(blockAccess, blockPosIn); int l2 = k2 >> 16 & 65535; int i3 = k2 & 65535; float f24 = f4; @@ -3739,7 +3761,7 @@ public class Renderer { float f36 = atextureatlassprite[0].getMaxU(); float f37 = atextureatlassprite[0].getMinV(); float f38 = atextureatlassprite[0].getMaxV(); - int l1 = blockliquid.getLightmapValue(blockAccess, blockPosIn.down()); + int l1 = getLightmapValueLiquid(blockAccess, blockPosIn.down()); int i2 = l1 >> 16 & 65535; int j2 = l1 & 65535; worldRendererIn.pos(d0, d1, d2 + 1.0D).color(f3, f3, f3, 1.0F).tex((double)f35, (double)f38).lightmap(i2, j2).endVertex(); @@ -3829,7 +3851,7 @@ public class Renderer { float f28 = textureatlassprite1.getInterpolatedV((double)((1.0F - f39) * 16.0F * 0.5F)); float f29 = textureatlassprite1.getInterpolatedV((double)((1.0F - f40) * 16.0F * 0.5F)); float f30 = textureatlassprite1.getInterpolatedV(8.0D); - int j = blockliquid.getLightmapValue(blockAccess, blockpos); + int j = getLightmapValueLiquid(blockAccess, blockpos); int k = j >> 16 & 65535; int l = j & 65535; float f31 = i1 < 2 ? f5 : f6; diff --git a/client/src/main/java/client/renderer/entity/Render.java b/client/src/main/java/client/renderer/entity/Render.java index 652d4bbc..53f51390 100755 --- a/client/src/main/java/client/renderer/entity/Render.java +++ b/client/src/main/java/client/renderer/entity/Render.java @@ -2,6 +2,7 @@ package client.renderer.entity; import client.renderer.Frustum; import common.entity.Entity; +import common.util.BlockPos; import common.util.BoundingBox; public abstract class Render @@ -53,4 +54,9 @@ public abstract class Render { return this.manager; } + + protected static float getBrightness(Entity entity) { + BlockPos pos = new BlockPos(entity.posX, entity.posY + (double)entity.getEyeHeight(), entity.posZ); + return entity.worldObj.isBlockLoaded(pos) ? entity.worldObj.getLightBrightness(pos) : 0.0F; + } } diff --git a/client/src/main/java/client/renderer/entity/RenderBlockEntity.java b/client/src/main/java/client/renderer/entity/RenderBlockEntity.java index 796c7616..0f532a3b 100755 --- a/client/src/main/java/client/renderer/entity/RenderBlockEntity.java +++ b/client/src/main/java/client/renderer/entity/RenderBlockEntity.java @@ -43,7 +43,7 @@ public class RenderBlockEntity extends Render // float f2 = (1.0F - ((float)entity.fuse - partialTicks + 1.0F) / 100.0F) * 0.8F; this.bindEntityTexture(entity); GL11.glTranslatef(-0.5F, -0.5F, 0.5F); - Client.CLIENT.renderer.renderBlockEntity(this.state, entity.getBrightness(partialTicks)); + Client.CLIENT.renderer.renderBlockEntity(this.state, getBrightness(entity)); GL11.glTranslatef(0.0F, 0.0F, 1.0F); // if (entity.fuse / 5 % 2 == 0) diff --git a/client/src/main/java/client/renderer/entity/RenderLiving.java b/client/src/main/java/client/renderer/entity/RenderLiving.java index 6b744bcf..2982780d 100755 --- a/client/src/main/java/client/renderer/entity/RenderLiving.java +++ b/client/src/main/java/client/renderer/entity/RenderLiving.java @@ -44,7 +44,7 @@ public abstract class RenderLiving extends RendererLivin } public void setLightmap(T entity, float partial) { - int l = entity.getBrightnessForRender(partial); + int l = RenderManager.getBrightnessForRender(entity); int a = l % 65536; int b = l / 65536; GL13.glMultiTexCoord2f(GL13.GL_TEXTURE1, (float)a / 1.0F, (float)b / 1.0F); diff --git a/client/src/main/java/client/renderer/entity/RenderManager.java b/client/src/main/java/client/renderer/entity/RenderManager.java index 6b5e1073..f8d2a0c9 100755 --- a/client/src/main/java/client/renderer/entity/RenderManager.java +++ b/client/src/main/java/client/renderer/entity/RenderManager.java @@ -20,6 +20,7 @@ import common.collect.Maps; import common.entity.Entity; import common.entity.types.EntityLiving; import common.init.SpeciesRegistry.ModelType; +import common.util.BlockPos; import common.util.BoundingBox; import common.util.Vec3; import common.world.World; @@ -119,6 +120,11 @@ public class RenderManager { return render != null && render.shouldRender(entityIn, camX, camY, camZ); } + public static int getBrightnessForRender(Entity entity) { + BlockPos pos = new BlockPos(entity.posX, entity.posY + (double)entity.getEyeHeight(), entity.posZ); + return entity.worldObj.isBlockLoaded(pos) ? entity.worldObj.getCombinedLight(pos, 0) : 0; + } + public boolean renderEntity(Entity entity, float partialTicks) { if(entity.ticksExisted == 0) { entity.lastTickPosX = entity.posX; @@ -129,7 +135,7 @@ public class RenderManager { double d0 = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * (double)partialTicks; double d1 = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * (double)partialTicks; double d2 = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * (double)partialTicks; - int i = entity.getBrightnessForRender(partialTicks); + int i = getBrightnessForRender(entity); if(entity.isBurning()) { i = 15728880; diff --git a/client/src/main/java/client/renderer/entity/RenderMinecart.java b/client/src/main/java/client/renderer/entity/RenderMinecart.java index 19ef3116..abeaf6e9 100755 --- a/client/src/main/java/client/renderer/entity/RenderMinecart.java +++ b/client/src/main/java/client/renderer/entity/RenderMinecart.java @@ -124,7 +124,7 @@ public class RenderMinecart extends Render protected void func_180560_a(T minecart, float partialTicks, State state) { GL11.glPushMatrix(); - Client.CLIENT.renderer.renderBlockEntity(state, minecart.getBrightness(partialTicks)); + Client.CLIENT.renderer.renderBlockEntity(state, getBrightness(minecart)); GL11.glPopMatrix(); } } diff --git a/client/src/main/java/client/renderer/entity/RenderTntPrimed.java b/client/src/main/java/client/renderer/entity/RenderTntPrimed.java index fda5091f..e53a5831 100755 --- a/client/src/main/java/client/renderer/entity/RenderTntPrimed.java +++ b/client/src/main/java/client/renderer/entity/RenderTntPrimed.java @@ -39,7 +39,7 @@ public class RenderTntPrimed extends Render this.bindEntityTexture(entity); GL11.glTranslatef(-0.5F, -0.5F, 0.5F); Block tnt = BlockRegistry.byName("tnt" + (entity.explosionSize <= 0 || entity.explosionSize >= 8 ? "" : "_" + entity.explosionSize)); - renderer.renderBlockEntity(tnt.getState(), entity.getBrightness(partialTicks)); + renderer.renderBlockEntity(tnt.getState(), getBrightness(entity)); GL11.glTranslatef(0.0F, 0.0F, 1.0F); if (entity.fuse / 5 % 2 == 0) diff --git a/client/src/main/java/client/renderer/entity/RenderWolf.java b/client/src/main/java/client/renderer/entity/RenderWolf.java index 996d6660..3b65938b 100755 --- a/client/src/main/java/client/renderer/entity/RenderWolf.java +++ b/client/src/main/java/client/renderer/entity/RenderWolf.java @@ -1,6 +1,5 @@ package client.renderer.entity; -import client.renderer.GlState; import client.renderer.layers.LayerWolfCollar; import client.renderer.model.ModelBase; import common.entity.animal.EntityWolf; @@ -26,20 +25,6 @@ public class RenderWolf extends RenderLiving return livingBase.getTailRotation(); } - /** - * Renders the desired {@code T} type Entity. - */ - public void doRender(EntityWolf entity, double x, double y, double z, float partialTicks) - { - if (entity.isWolfWet()) - { - float f = entity.getBrightness(partialTicks) * entity.getShadingWhileWet(partialTicks); - GlState.color(f, f, f, 1.0F); - } - - super.doRender(entity, x, y, z, partialTicks); - } - /** * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture. */ diff --git a/client/src/main/java/client/renderer/entity/RenderXp.java b/client/src/main/java/client/renderer/entity/RenderXp.java index 84be78b5..25cf806f 100755 --- a/client/src/main/java/client/renderer/entity/RenderXp.java +++ b/client/src/main/java/client/renderer/entity/RenderXp.java @@ -29,7 +29,7 @@ public class RenderXp extends Render { float bx = 1.0F; float dx = 0.5F; float dy = 0.25F; - int light = entity.getBrightnessForRender(partial); + int light = RenderManager.getBrightnessForRender(entity); int block = light % 65536; int sky = light / 65536; GL13.glMultiTexCoord2f(GL13.GL_TEXTURE1, (float)block / 1.0F, (float)sky / 1.0F); diff --git a/client/src/main/java/client/renderer/model/ModelWolf.java b/client/src/main/java/client/renderer/model/ModelWolf.java index 35d8eb2b..97b05753 100755 --- a/client/src/main/java/client/renderer/model/ModelWolf.java +++ b/client/src/main/java/client/renderer/model/ModelWolf.java @@ -157,10 +157,7 @@ public class ModelWolf extends ModelBase this.wolfLeg4.rotateAngleX = ExtMath.cos(p_78086_2_ * 0.6662F) * 1.4F * p_78086_3_; } - this.wolfHeadMain.rotateAngleZ = wolf.getInterestedAngle(partialTickTime) + wolf.getShakeAngle(partialTickTime, 0.0F); - this.wolfMane.rotateAngleZ = wolf.getShakeAngle(partialTickTime, -0.08F); - this.wolfBody.rotateAngleZ = wolf.getShakeAngle(partialTickTime, -0.16F); - this.wolfTail.rotateAngleZ = wolf.getShakeAngle(partialTickTime, -0.2F); + this.wolfHeadMain.rotateAngleZ = wolf.getInterestedAngle(partialTickTime); } /** diff --git a/client/src/main/resources/sounds/wolf_shake.ogg b/client/src/main/resources/sounds/wolf_shake.ogg deleted file mode 100644 index bf01cc3e66ec05811f0acbda85709891d1ca8bec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16145 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 0 ? this.flowRate : (worldIn.isLavaFaster(pos) ? (-this.flowRate / 3) : (-this.flowRate)); } - public int getLightmapValue(IWorldAccess worldIn, BlockPos pos) - { - int i = worldIn.getCombinedLight(pos, 0); - int j = worldIn.getCombinedLight(pos.up(), 0); - int k = i & 255; - int l = j & 255; - int i1 = i >> 16 & 255; - int j1 = j >> 16 & 255; - return (k > l ? k : l) | (i1 > j1 ? i1 : j1) << 16; - } - @Clientside public boolean hasTransparency() { return !this.opaque; diff --git a/common/src/main/java/common/entity/Entity.java b/common/src/main/java/common/entity/Entity.java index 2253a473..a36cb1e0 100755 --- a/common/src/main/java/common/entity/Entity.java +++ b/common/src/main/java/common/entity/Entity.java @@ -1104,21 +1104,6 @@ public abstract class Entity } } - public int getBrightnessForRender(float partialTicks) - { - BlockPos blockpos = new BlockPos(this.posX, this.posY + (double)this.getEyeHeight(), this.posZ); - return this.worldObj.isBlockLoaded(blockpos) ? this.worldObj.getCombinedLight(blockpos, 0) : 0; - } - - /** - * Gets how bright this entity is. - */ - public float getBrightness(float partialTicks) - { - BlockPos blockpos = new BlockPos(this.posX, this.posY + (double)this.getEyeHeight(), this.posZ); - return this.worldObj.isBlockLoaded(blockpos) ? this.worldObj.getLightBrightness(blockpos) : 0.0F; - } - /** * Sets the reference to the World object. */ diff --git a/common/src/main/java/common/entity/animal/EntityMouse.java b/common/src/main/java/common/entity/animal/EntityMouse.java index 2564c4d3..6ca426d7 100755 --- a/common/src/main/java/common/entity/animal/EntityMouse.java +++ b/common/src/main/java/common/entity/animal/EntityMouse.java @@ -111,7 +111,7 @@ public class EntityMouse extends EntityAnimal { public float getBlockPathWeight(BlockPos pos) { - return 0.5F - this.worldObj.getLightBrightness(pos); + return 0.5F; } public void setCustomNameTag(String name) { diff --git a/common/src/main/java/common/entity/animal/EntityWolf.java b/common/src/main/java/common/entity/animal/EntityWolf.java index 3ab3f2b5..3d846c07 100755 --- a/common/src/main/java/common/entity/animal/EntityWolf.java +++ b/common/src/main/java/common/entity/animal/EntityWolf.java @@ -30,31 +30,15 @@ import common.item.consumable.ItemFood; import common.item.material.ItemDye; import common.pathfinding.PathNavigateGround; import common.tags.TagObject; -import common.util.Clientside; -import common.util.ExtMath; -import common.util.ParticleType; import common.util.Color; import common.vars.Vars; import common.world.World; public class EntityWolf extends EntityTameable { - /** Float used to smooth the rotation of the wolf head */ private float headRotationCourse; private float headRotationCourseOld; - /** true is the wolf is wet else false */ - private boolean isWet; - - /** True if the wolf is shaking else False */ - private boolean isShaking; - - /** - * This time increases while wolf is shaking and emitting water particles. - */ - private float timeWolfIsShaking; - private float prevTimeWolfIsShaking; - public EntityWolf(World worldIn) { super(worldIn); @@ -185,14 +169,6 @@ public class EntityWolf extends EntityTameable { super.onLivingUpdate(); - if (!this.worldObj.client && this.isWet && !this.isShaking && !this.hasPath() && this.onGround) - { - this.isShaking = true; - this.timeWolfIsShaking = 0.0F; - this.prevTimeWolfIsShaking = 0.0F; - this.worldObj.setEntityState(this, (byte)8); - } - if (!this.worldObj.client && this.getAttackTarget() == null && this.isAngry()) { this.setAngry(false); @@ -215,77 +191,6 @@ public class EntityWolf extends EntityTameable { this.headRotationCourse += (0.0F - this.headRotationCourse) * 0.4F; } - - if (this.isWet()) - { - this.isWet = true; - this.isShaking = false; - this.timeWolfIsShaking = 0.0F; - this.prevTimeWolfIsShaking = 0.0F; - } - else if ((this.isWet || this.isShaking) && this.isShaking) - { - if (this.timeWolfIsShaking == 0.0F) - { - this.playSound(SoundEvent.WOLF_SHAKE, this.getSoundVolume()); - } - - this.prevTimeWolfIsShaking = this.timeWolfIsShaking; - this.timeWolfIsShaking += 0.05F; - - if (this.prevTimeWolfIsShaking >= 2.0F) - { - this.isWet = false; - this.isShaking = false; - this.prevTimeWolfIsShaking = 0.0F; - this.timeWolfIsShaking = 0.0F; - } - - if (this.timeWolfIsShaking > 0.4F) - { - float f = (float)this.getEntityBoundingBox().minY; - int i = (int)(ExtMath.sin((this.timeWolfIsShaking - 0.4F) * (float)Math.PI) * 7.0F); - - for (int j = 0; j < i; ++j) - { - float f1 = (this.rand.floatv() * 2.0F - 1.0F) * this.width * 0.5F; - float f2 = (this.rand.floatv() * 2.0F - 1.0F) * this.width * 0.5F; - this.worldObj.clientParticle(ParticleType.SPLASH, this.posX + (double)f1, (double)(f + 0.8F), this.posZ + (double)f2); - } - } - } - } - - /** - * True if the wolf is wet - */ - public boolean isWolfWet() - { - return this.isWet; - } - - /** - * Used when calculating the amount of shading to apply while the wolf is wet. - */ - public float getShadingWhileWet(float p_70915_1_) - { - return 0.75F + (this.prevTimeWolfIsShaking + (this.timeWolfIsShaking - this.prevTimeWolfIsShaking) * p_70915_1_) / 2.0F * 0.25F; - } - - public float getShakeAngle(float p_70923_1_, float p_70923_2_) - { - float f = (this.prevTimeWolfIsShaking + (this.timeWolfIsShaking - this.prevTimeWolfIsShaking) * p_70923_1_ + p_70923_2_) / 1.8F; - - if (f < 0.0F) - { - f = 0.0F; - } - else if (f > 1.0F) - { - f = 1.0F; - } - - return ExtMath.sin(f * (float)Math.PI) * ExtMath.sin(f * (float)Math.PI * 11.0F) * 0.15F * (float)Math.PI; } public float getInterestedAngle(float p_70917_1_) @@ -430,21 +335,6 @@ public class EntityWolf extends EntityTameable return super.interact(player); } - @Clientside - public void handleStatusUpdate(byte id) - { - if (id == 8) - { - this.isShaking = true; - this.timeWolfIsShaking = 0.0F; - this.prevTimeWolfIsShaking = 0.0F; - } - else - { - super.handleStatusUpdate(id); - } - } - public float getTailRotation() { return this.isAngry() ? 1.5393804F : (this.isTamed() ? (0.55F - (20.0F - (float)this.dataWatcher.getWatchableObjectInt(18)) * 0.02F) * (float)Math.PI : ((float)Math.PI / 5F)); diff --git a/common/src/main/java/common/entity/item/EntityXp.java b/common/src/main/java/common/entity/item/EntityXp.java index 77073c2d..478f66aa 100755 --- a/common/src/main/java/common/entity/item/EntityXp.java +++ b/common/src/main/java/common/entity/item/EntityXp.java @@ -85,23 +85,6 @@ public class EntityXp extends Entity implements IObjectData return this.dataWatcher.getWatchableObjectInt(1); } - public int getBrightnessForRender(float partialTicks) - { - float f = 0.5F; - f = ExtMath.clampf(f, 0.0F, 1.0F); - int i = super.getBrightnessForRender(partialTicks); - int j = i & 255; - int k = i >> 16 & 255; - j = j + (int)(f * 15.0F * 16.0F); - - if (j > 240) - { - j = 240; - } - - return j | k << 16; - } - /** * Called to update the entity's position/logic. */ diff --git a/common/src/main/java/common/entity/npc/EntityArachnoid.java b/common/src/main/java/common/entity/npc/EntityArachnoid.java index ab075bf6..9e60df97 100755 --- a/common/src/main/java/common/entity/npc/EntityArachnoid.java +++ b/common/src/main/java/common/entity/npc/EntityArachnoid.java @@ -20,9 +20,7 @@ public class EntityArachnoid extends EntityNPC { } public boolean continueExecuting() { - float f = this.attacker.getBrightness(1.0F); - - if(f >= 0.5F && this.attacker.getRNG().chance(100)) { + if(this.attacker.getRNG().chance(100)) { this.attacker.setAttackTarget((EntityLiving)null); return false; } diff --git a/common/src/main/java/common/entity/projectile/EntityProjectile.java b/common/src/main/java/common/entity/projectile/EntityProjectile.java index a3108758..0fe8a9f5 100755 --- a/common/src/main/java/common/entity/projectile/EntityProjectile.java +++ b/common/src/main/java/common/entity/projectile/EntityProjectile.java @@ -349,19 +349,6 @@ public abstract class EntityProjectile extends Entity } // } } - - /** - * Gets how bright this entity is. - */ - public float getBrightness(float partialTicks) - { - return 1.0F; - } - - public int getBrightnessForRender(float partialTicks) - { - return 15728880; - } public int getTrackingRange() { return 64; diff --git a/common/src/main/java/common/entity/types/EntityAnimal.java b/common/src/main/java/common/entity/types/EntityAnimal.java index 3cdebd68..84aa88ce 100755 --- a/common/src/main/java/common/entity/types/EntityAnimal.java +++ b/common/src/main/java/common/entity/types/EntityAnimal.java @@ -93,7 +93,7 @@ public abstract class EntityAnimal extends EntityLiving public float getBlockPathWeight(BlockPos pos) { - return this.worldObj.getState(pos.down()).getBlock() == Blocks.grass ? 10.0F : this.worldObj.getLightBrightness(pos) - 0.5F; + return this.worldObj.getState(pos.down()).getBlock() == Blocks.grass ? 10.0F : 0.5F; } public void writeEntity(TagObject tagCompound) diff --git a/common/src/main/java/common/init/SoundEvent.java b/common/src/main/java/common/init/SoundEvent.java index b60287c6..6fcd8559 100755 --- a/common/src/main/java/common/init/SoundEvent.java +++ b/common/src/main/java/common/init/SoundEvent.java @@ -100,7 +100,6 @@ public enum SoundEvent { WOLF_GROWL("wolf_growl1", "wolf_growl2", "wolf_growl3"), WOLF_HURT("wolf_hurt1", "wolf_hurt2", "wolf_hurt3"), WOLF_PANTING("wolf_panting"), - WOLF_SHAKE("wolf_shake"), WOLF_WHINE("wolf_whine"), FOX_DEATH("fox_death"), diff --git a/common/src/main/java/common/world/IWorldAccess.java b/common/src/main/java/common/world/IWorldAccess.java index 3986e79f..77dfcb24 100755 --- a/common/src/main/java/common/world/IWorldAccess.java +++ b/common/src/main/java/common/world/IWorldAccess.java @@ -2,9 +2,11 @@ package common.world; import common.tileentity.TileEntity; import common.util.BlockPos; +import common.util.Clientside; public interface IWorldAccess extends IBlockAccess { TileEntity getTileEntity(BlockPos pos); + @Clientside int getCombinedLight(BlockPos pos, int lightValue); } diff --git a/common/src/main/java/common/world/World.java b/common/src/main/java/common/world/World.java index 2c4d68e9..c0823e2f 100755 --- a/common/src/main/java/common/world/World.java +++ b/common/src/main/java/common/world/World.java @@ -32,6 +32,7 @@ import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.BoundingBox; import common.util.ChunkPos; +import common.util.Clientside; import common.util.ExtMath; import common.util.Facing; import common.util.HitPosition; @@ -405,6 +406,7 @@ public abstract class World implements IWorldAccess { } } + @Clientside public int getCombinedLight(BlockPos pos, int lightValue) { int i = this.getLightFromNeighborsFor(LightType.SKY, pos); int j = this.getLightFromNeighborsFor(LightType.BLOCK, pos);