From 094d38d3e742cd2397f8f86b3f4fe762e064d790 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Sat, 25 Apr 2015 13:17:09 +0100 Subject: Working api + hoping to fix jenkins build + trying to make blocks shiny --- .../java/darkknight/jewelrycraft/curses/Curse.java | 132 --------------------- .../darkknight/jewelrycraft/curses/CurseBlind.java | 1 + .../jewelrycraft/curses/CurseFlamingSoul.java | 1 + .../darkknight/jewelrycraft/curses/CurseGreed.java | 1 + .../jewelrycraft/curses/CurseInfamy.java | 1 + .../darkknight/jewelrycraft/curses/CurseList.java | 1 + .../jewelrycraft/curses/CurseMidasTouch.java | 1 + .../jewelrycraft/curses/CursePentagram.java | 1 + .../jewelrycraft/curses/CurseRabbitsPaw.java | 1 + .../jewelrycraft/curses/CurseRottenHeart.java | 1 + 10 files changed, 9 insertions(+), 132 deletions(-) delete mode 100644 src/main/java/darkknight/jewelrycraft/curses/Curse.java (limited to 'src/main/java/darkknight/jewelrycraft/curses') diff --git a/src/main/java/darkknight/jewelrycraft/curses/Curse.java b/src/main/java/darkknight/jewelrycraft/curses/Curse.java deleted file mode 100644 index fd2a27b..0000000 --- a/src/main/java/darkknight/jewelrycraft/curses/Curse.java +++ /dev/null @@ -1,132 +0,0 @@ -package darkknight.jewelrycraft.curses; - -import java.util.ArrayList; -import java.util.Random; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import net.minecraftforge.client.event.RenderHandEvent; -import net.minecraftforge.client.event.RenderPlayerEvent; - -public class Curse -{ - protected int textureID; - protected String name, description, texturePackName; - protected Random rand = new Random(); - private static ArrayList curses = new ArrayList(); - public static ArrayList availableCurses = new ArrayList(); - - /** - * @param id the ID of the curse - * @param name the name of the curse - * @param texturepack the ID of the pack the texture is located in - */ - protected Curse(String name, int txtID, String texturepack) - { - this.name = name; - this.texturePackName = texturepack; - this.textureID = txtID; - curses.add(this); - availableCurses.add(this); - } - - /** - * @return the name of the curse - */ - public String getName() - { - return name; - } - - /** - * @return the description of the curse - */ - public String getDescription() - { - return description; - } - - public Curse setDescription(String desc) - { - description = desc; - return this; - } - - /** - * @return the texture pack ID - */ - public String getTexturePack() - { - return texturePackName; - } - - /** - * @return the texture ID - */ - public int getTextureID() - { - return textureID; - } - - /** - * @param world - * @param player - */ - public void action(World world, EntityPlayer player) - {} - - /** - * @param world - * @param player - */ - public void playerDeathAction(World world, EntityPlayer player) - {} - - public void entityDeathAction(World world, EntityLivingBase target, EntityPlayer player) - {} - - /** - * @param world - * @param player - */ - public void respawnAction(World world, EntityPlayer player) - {} - - /** - * @param world - * @param player - */ - public void attackedAction(World world, EntityPlayer player) - {} - - /** - * @param world - * @param player - */ - public void attackedByPlayerAction(World world, EntityPlayer player, Entity target) - {} - - public void entityDropItems(EntityPlayer player, Entity target, ArrayList drops) - {} - - public void playerRender(EntityPlayer player, RenderPlayerEvent.Specials.Post event) - {} - - public void playerHandRender(EntityPlayer player, RenderHandEvent event) - {} - - public boolean itemToss() - { - return false; - } - - /** - * @return - */ - public static ArrayList getCurseList() - { - return curses; - } -} diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java index 963e588..2a9f94e 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java @@ -1,5 +1,6 @@ package darkknight.jewelrycraft.curses; +import darkknight.jewelrycraft.api.Curse; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java index b3d4967..4140a5c 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java @@ -1,5 +1,6 @@ package darkknight.jewelrycraft.curses; +import darkknight.jewelrycraft.api.Curse; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java index 0093991..cc45877 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java @@ -1,5 +1,6 @@ package darkknight.jewelrycraft.curses; +import darkknight.jewelrycraft.api.Curse; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java index 1f1628b..f888b40 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java @@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; +import darkknight.jewelrycraft.api.Curse; import darkknight.jewelrycraft.damage.DamageSourceList; import darkknight.jewelrycraft.entities.EntityHalfHeart; import darkknight.jewelrycraft.entities.EntityHeart; diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseList.java b/src/main/java/darkknight/jewelrycraft/curses/CurseList.java index 8013dce..acaafd0 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseList.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseList.java @@ -1,6 +1,7 @@ package darkknight.jewelrycraft.curses; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import darkknight.jewelrycraft.api.Curse; import darkknight.jewelrycraft.util.Variables; public class CurseList diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java index 8ea21ad..b665b0d 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java @@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import darkknight.jewelrycraft.api.Curse; import darkknight.jewelrycraft.block.BlockList; import darkknight.jewelrycraft.entities.EntityHalfHeart; import darkknight.jewelrycraft.entities.EntityHeart; diff --git a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java index a8f6900..938248f 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java @@ -9,6 +9,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; +import darkknight.jewelrycraft.api.Curse; import darkknight.jewelrycraft.util.Variables; public class CursePentagram extends Curse diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java index 26ef684..5bee390 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java @@ -4,6 +4,7 @@ package darkknight.jewelrycraft.curses; import java.util.ArrayList; +import darkknight.jewelrycraft.api.Curse; import darkknight.jewelrycraft.entities.EntityHalfHeart; import darkknight.jewelrycraft.entities.EntityHeart; import net.minecraft.entity.Entity; diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java index 3583833..4cfd635 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java @@ -1,5 +1,6 @@ package darkknight.jewelrycraft.curses; +import darkknight.jewelrycraft.api.Curse; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -- cgit v1.2.3