From 25f03d56336bf12aba11a56f7abd11758cc283c4 Mon Sep 17 00:00:00 2001 From: Cheeserolls Date: Sat, 25 Apr 2015 17:24:55 +0100 Subject: [PATCH] Remove unused imports, remove an unused and mileading line in EntityWasp --- .../java/biomesoplenty/client/handler/ModelBakeHandler.java | 3 --- .../biomesoplenty/client/texture/TextureAnimationFrame.java | 6 ------ src/main/java/biomesoplenty/client/util/ModelUtils.java | 4 ---- src/main/java/biomesoplenty/client/util/TextureUtils.java | 1 - src/main/java/biomesoplenty/common/entities/EntityWasp.java | 5 +---- 5 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/main/java/biomesoplenty/client/handler/ModelBakeHandler.java b/src/main/java/biomesoplenty/client/handler/ModelBakeHandler.java index a0998734a..a8d7a786d 100644 --- a/src/main/java/biomesoplenty/client/handler/ModelBakeHandler.java +++ b/src/main/java/biomesoplenty/client/handler/ModelBakeHandler.java @@ -11,13 +11,10 @@ package biomesoplenty.client.handler; import biomesoplenty.client.model.ModelBiomeFinder; import biomesoplenty.client.texture.TextureAnimationFrame; import biomesoplenty.client.util.TextureUtils; -import net.minecraft.client.renderer.block.model.ModelBlock; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.util.IRegistry; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/biomesoplenty/client/texture/TextureAnimationFrame.java b/src/main/java/biomesoplenty/client/texture/TextureAnimationFrame.java index f8579fabb..d24df3a80 100644 --- a/src/main/java/biomesoplenty/client/texture/TextureAnimationFrame.java +++ b/src/main/java/biomesoplenty/client/texture/TextureAnimationFrame.java @@ -10,11 +10,6 @@ package biomesoplenty.client.texture; import java.awt.image.BufferedImage; import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import com.google.common.collect.Lists; import biomesoplenty.client.util.TextureUtils; import biomesoplenty.core.BiomesOPlenty; @@ -23,7 +18,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.client.resources.IResource; import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.resources.data.AnimationFrame; import net.minecraft.client.resources.data.AnimationMetadataSection; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/biomesoplenty/client/util/ModelUtils.java b/src/main/java/biomesoplenty/client/util/ModelUtils.java index 4cf80d017..c6804902b 100644 --- a/src/main/java/biomesoplenty/client/util/ModelUtils.java +++ b/src/main/java/biomesoplenty/client/util/ModelUtils.java @@ -9,16 +9,12 @@ package biomesoplenty.client.util; import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedList; import java.util.List; -import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.SimpleBakedModel; import net.minecraft.util.EnumFacing; -import biomesoplenty.client.texture.TextureAnimationFrame; import com.google.common.collect.Lists; diff --git a/src/main/java/biomesoplenty/client/util/TextureUtils.java b/src/main/java/biomesoplenty/client/util/TextureUtils.java index 3d120788d..7203ba266 100644 --- a/src/main/java/biomesoplenty/client/util/TextureUtils.java +++ b/src/main/java/biomesoplenty/client/util/TextureUtils.java @@ -9,7 +9,6 @@ package biomesoplenty.client.util; import biomesoplenty.client.texture.TextureAnimationFrame; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/biomesoplenty/common/entities/EntityWasp.java b/src/main/java/biomesoplenty/common/entities/EntityWasp.java index ff784ca91..527bb19ba 100644 --- a/src/main/java/biomesoplenty/common/entities/EntityWasp.java +++ b/src/main/java/biomesoplenty/common/entities/EntityWasp.java @@ -352,10 +352,7 @@ public class EntityWasp extends EntityFlying implements IMob { // focus attack on target position EntityLivingBase attackTarget = this.wasp.getAttackTarget(); this.targetPos.setTarget(attackTarget.posX, attackTarget.posY, attackTarget.posZ); - - // give up if the target is too far away - // double followRange = this.wasp.getEntityAttribute(SharedMonsterAttributes.followRange).getAttributeValue(); - + // damage the target if it's in range, and it has been long enough since the last attack double damageRange = (double)(this.wasp.width + attackTarget.width); if (this.attackTick <= 0 && this.targetPos.dist < damageRange)