From 4f7ad220df0438b6f3382110577b53f29da46453 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 15:50:07 -0400 Subject: Update of all changes --- .../jewelrycraft/particles/EntityShadowsFX.java | 189 +++++++++++---------- 1 file changed, 101 insertions(+), 88 deletions(-) mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java (limited to 'src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java') diff --git a/src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java b/src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java old mode 100644 new mode 100755 index 6cfcbaa..7e492bc --- a/src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java +++ b/src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java @@ -2,7 +2,9 @@ package darkknight.jewelrycraft.particles; import java.util.Iterator; import java.util.List; + import org.lwjgl.opengl.GL11; + import darkknight.jewelrycraft.damage.DamageSourceList; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; @@ -13,92 +15,103 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -public class EntityShadowsFX extends EntityFX -{ - float moteParticleScale; - ResourceLocation texture; - - /** - * @param world - * @param x - * @param y - * @param z - * @param size - * @param maxAge - * @param texture - */ - public EntityShadowsFX(World world, double x, double y, double z, float size, float maxAge, ResourceLocation texture) - { - super(world, x, y, z, 0D, 0D, 0D); - particleMaxAge = (int)(28D / (Math.random() * 0.3D + 0.7D) * maxAge); - particleGravity = 0F; - motionX = motionY = motionZ = 0; - particleScale *= size; - moteParticleScale = particleScale; - noClip = true; - this.texture = texture; - setSize(0.01F, 0.01F); - } - - /** - * @param tessellator - * @param partialTicks - * @param minX - * @param minY - * @param minZ - * @param maxX - * @param maxZ - */ - @Override - public void renderParticle(Tessellator tessellator, float partialTicks, float minX, float minY, float minZ, float maxX, float maxZ) - { - tessellator.draw(); - Minecraft.getMinecraft().renderEngine.bindTexture(texture); - GL11.glColor4f(1, 1, 1, 1); - tessellator.startDrawingQuads(); - tessellator.setBrightness(getBrightnessForRender(0)); - float scale = 0.1F * particleScale; - float x = (float)(posX - interpPosX); - float y = (float)(posY - interpPosY); - float z = (float)(posZ - interpPosZ); - tessellator.setColorRGBA_F(0F, 0F, 0F, 0.5F); - tessellator.addVertexWithUV(x - minX * scale - maxX * scale, y - minY * scale, z - minZ * scale - maxZ * scale, 0, 0); - tessellator.addVertexWithUV(x - minX * scale + maxX * scale, y + minY * scale, z - minZ * scale + maxZ * scale, 1, 0); - tessellator.addVertexWithUV(x + minX * scale + maxX * scale, y + minY * scale, z + minZ * scale + maxZ * scale, 1, 1); - tessellator.addVertexWithUV(x + minX * scale - maxX * scale, y - minY * scale, z + minZ * scale - maxZ * scale, 0, 1); - tessellator.draw(); - tessellator.startDrawingQuads(); - } - - /** - * - */ - @Override - public void onUpdate() - { - prevPosX = posX; - prevPosY = posY; - prevPosZ = posZ; - motionX = motionY = motionZ = 0; - if (particleAge++ >= particleMaxAge) setDead(); - AxisAlignedBB axisalignedbb = boundingBox.expand(16.0D, 16.0D, 16.0D); - List list1 = worldObj.getEntitiesWithinAABB(Entity.class, axisalignedbb); - if (!worldObj.isRemote && list1 != null && !list1.isEmpty()){ - Iterator iterator = list1.iterator(); - while (iterator.hasNext()){ - Entity entity = (Entity)iterator.next(); - if (entity != null && posX <= entity.posX + 0.5F && posX >= entity.posX - 0.5F && posZ <= entity.posZ + 0.5F && posZ >= entity.posZ - 0.5F) entity.attackEntityFrom(DamageSourceList.shadows, 100F); - if (entity instanceof EntityThrowable) ((EntityThrowable)entity).setDead(); - } - } - } - - /** - * @return - */ - @Override - public int getFXLayer() - { - return 2; - } +public class EntityShadowsFX extends EntityFX { + float moteParticleScale; + ResourceLocation texture; + + /** + * @param world + * @param x + * @param y + * @param z + * @param size + * @param maxAge + * @param texture + */ + public EntityShadowsFX(World world, double x, double y, double z, + float size, float maxAge, ResourceLocation texture) { + super(world, x, y, z, 0D, 0D, 0D); + particleMaxAge = + (int) (28D / (Math.random() * 0.3D + 0.7D) * maxAge); + particleGravity = 0F; + motionX = motionY = motionZ = 0; + particleScale *= size; + moteParticleScale = particleScale; + noClip = true; + this.texture = texture; + setSize(0.01F, 0.01F); + } + + /** + * @param tessellator + * @param partialTicks + * @param minX + * @param minY + * @param minZ + * @param maxX + * @param maxZ + */ + @Override + public void renderParticle(Tessellator tessellator, float partialTicks, + float minX, float minY, float minZ, float maxX, float maxZ) { + tessellator.draw(); + Minecraft.getMinecraft().renderEngine.bindTexture(texture); + GL11.glColor4f(1, 1, 1, 1); + tessellator.startDrawingQuads(); + tessellator.setBrightness(getBrightnessForRender(0)); + float scale = 0.1F * particleScale; + float x = (float) (posX - interpPosX); + float y = (float) (posY - interpPosY); + float z = (float) (posZ - interpPosZ); + tessellator.setColorRGBA_F(0F, 0F, 0F, 0.5F); + tessellator.addVertexWithUV(x - minX * scale - maxX * scale, + y - minY * scale, z - minZ * scale - maxZ * scale, 0, 0); + tessellator.addVertexWithUV(x - minX * scale + maxX * scale, + y + minY * scale, z - minZ * scale + maxZ * scale, 1, 0); + tessellator.addVertexWithUV(x + minX * scale + maxX * scale, + y + minY * scale, z + minZ * scale + maxZ * scale, 1, 1); + tessellator.addVertexWithUV(x + minX * scale - maxX * scale, + y - minY * scale, z + minZ * scale - maxZ * scale, 0, 1); + tessellator.draw(); + tessellator.startDrawingQuads(); + } + + /** + * + */ + @Override + public void onUpdate() { + prevPosX = posX; + prevPosY = posY; + prevPosZ = posZ; + motionX = motionY = motionZ = 0; + if (particleAge++ >= particleMaxAge) + setDead(); + AxisAlignedBB axisalignedbb = + boundingBox.expand(16.0D, 16.0D, 16.0D); + List list1 = worldObj.getEntitiesWithinAABB(Entity.class, + axisalignedbb); + if (!worldObj.isRemote && list1 != null && !list1.isEmpty()) { + Iterator iterator = list1.iterator(); + while (iterator.hasNext()) { + Entity entity = (Entity) iterator.next(); + if (entity != null && posX <= entity.posX + 0.5F + && posX >= entity.posX - 0.5F + && posZ <= entity.posZ + 0.5F + && posZ >= entity.posZ - 0.5F) + entity.attackEntityFrom(DamageSourceList.shadows, + 100F); + if (entity instanceof EntityThrowable) + ((EntityThrowable) entity).setDead(); + } + } + } + + /** + * @return + */ + @Override + public int getFXLayer() { + return 2; + } } -- cgit v1.2.3