- Fixed all of the bugs mentioned on github

- Added new config options
- Rabbits paw now increases the chance of spawning hearts, rather than
itself spawning some
- Hearts now have a much lower chance to spawn by default
- You can no longer increase your health past 20 hearts (aka double the
default health)
- The guide now also shows the total number of pages on each tab
- A new luck stat has been added to the Curse API
- Cleaned up the code a bit (removed unused methods, imports etc)
- The displayer's info now has a purple solid color background; the text
also has a much closer shadow and now shrinks in height as well as in
width when too big
- I have modified the potion list to use Mithion's code, credits have
been given

1 files changed, 104 insertions, 104 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java b/src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java
index 85dfae5..6cfcbaa 100644
--- a/src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java
+++ b/src/main/java/darkknight/jewelrycraft/particles/EntityShadowsFX.java
@@ -1,104 +1,104 @@
-package darkknight.jewelrycraft.particles;
-
-import java.util.Iterator;
-import java.util.List;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.particle.EntityFX;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.projectile.EntityThrowable;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
-import org.lwjgl.opengl.GL11;
-import darkknight.jewelrycraft.damage.DamageSourceList;
-
-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;
-    }
-}
+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;

+import net.minecraft.client.renderer.Tessellator;

+import net.minecraft.entity.Entity;

+import net.minecraft.entity.projectile.EntityThrowable;

+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;

+    }

+}