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/api/Curse.java | 132 +++++++++++++++++++++ .../jewelrycraft/api/ModifierEffects.java | 85 +++++++++++++ .../darkknight/jewelrycraft/client/gui/GuiTab.java | 5 +- .../commands/JewelrycraftCommands.java | 2 +- .../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 + .../jewelrycraft/effects/EffectBlazePowder.java | 1 + .../jewelrycraft/effects/EffectEnderEye.java | 1 + .../jewelrycraft/effects/EffectFeather.java | 1 + .../jewelrycraft/effects/EffectsList.java | 1 + .../jewelrycraft/effects/ModifierEffects.java | 85 ------------- .../jewelrycraft/events/EntityEventHandler.java | 2 +- .../jewelrycraft/events/PlayerRenderHandler.java | 2 +- .../jewelrycraft/events/ScreenHandler.java | 2 +- .../jewelrycraft/item/ItemBaseJewelry.java | 2 +- .../jewelrycraft/item/render/ItemRender.java | 57 +++++++-- .../jewelrycraft/util/JewelrycraftUtil.java | 2 + 25 files changed, 286 insertions(+), 235 deletions(-) create mode 100644 src/main/java/darkknight/jewelrycraft/api/Curse.java create mode 100644 src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java delete mode 100644 src/main/java/darkknight/jewelrycraft/curses/Curse.java delete mode 100644 src/main/java/darkknight/jewelrycraft/effects/ModifierEffects.java (limited to 'src/main/java') diff --git a/src/main/java/darkknight/jewelrycraft/api/Curse.java b/src/main/java/darkknight/jewelrycraft/api/Curse.java new file mode 100644 index 0000000..618f5ae --- /dev/null +++ b/src/main/java/darkknight/jewelrycraft/api/Curse.java @@ -0,0 +1,132 @@ +package darkknight.jewelrycraft.api; + +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/api/ModifierEffects.java b/src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java new file mode 100644 index 0000000..1b930c9 --- /dev/null +++ b/src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java @@ -0,0 +1,85 @@ +package darkknight.jewelrycraft.api; + +import java.util.ArrayList; +import java.util.Random; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; + +public class ModifierEffects +{ + protected ItemStack modifier; + protected Random rand = new Random(); + protected static ArrayList effects = new ArrayList(); + + /** + * @param modifier + */ + public ModifierEffects(ItemStack modifier) + { + this.modifier = modifier; + effects.add(this); + } + + /** + * @return + */ + public static ArrayList getEffects() + { + return effects; + } + + /** + * @param item + * @param player + * @param jewelry + */ + public void action(ItemStack item, EntityPlayer player, Item jewelry) + {}; + + /** + * @param item + * @param player + * @param target + * @param jewelry + * @return + */ + public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount) + { + return false; + } + + /** + * @param item + * @param player + * @param source + * @param jewelry + * @return + */ + public boolean onPlayerAttackedCacellable(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount) + { + return false; + } + + /** + * @param item + * @param player + * @param target + * @param jewelry + * @return + */ + public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount) + {} + + /** + * @param item + * @param player + * @param source + * @param jewelry + * @return + */ + public void onPlayerAttacked(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount) + {} +} diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java index 98b34f9..e2632ac 100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java @@ -6,8 +6,9 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly (Side.CLIENT) public abstract class GuiTab extends GuiRectangle { - int values, del; - private String name; + protected int values; + protected int del; + protected String name; /** * @param name diff --git a/src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java b/src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java index c3e63e9..ebf7d8b 100644 --- a/src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java +++ b/src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java @@ -23,7 +23,7 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; import darkknight.jewelrycraft.JewelrycraftMod; -import darkknight.jewelrycraft.curses.Curse; +import darkknight.jewelrycraft.api.Curse; import darkknight.jewelrycraft.events.EntityEventHandler; import darkknight.jewelrycraft.network.PacketRequestPlayerInfo; import darkknight.jewelrycraft.util.JewelryNBT; 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; diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java index fdcdd3b..1ddc364 100644 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java @@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; +import darkknight.jewelrycraft.api.ModifierEffects; import darkknight.jewelrycraft.item.ItemBracelet; import darkknight.jewelrycraft.item.ItemEarrings; import darkknight.jewelrycraft.item.ItemNecklace; diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java index 4c36593..39a1613 100644 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java @@ -17,6 +17,7 @@ import net.minecraft.util.Vec3; import net.minecraft.world.ChunkPosition; import net.minecraft.world.biome.BiomeGenBase; import cpw.mods.fml.relauncher.ReflectionHelper; +import darkknight.jewelrycraft.api.ModifierEffects; import darkknight.jewelrycraft.item.ItemBracelet; import darkknight.jewelrycraft.item.ItemEarrings; import darkknight.jewelrycraft.item.ItemNecklace; diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java index 512a25b..3a68957 100644 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java @@ -16,6 +16,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumChatFormatting; +import darkknight.jewelrycraft.api.ModifierEffects; import darkknight.jewelrycraft.damage.DamageSourceList; import darkknight.jewelrycraft.item.ItemBracelet; import darkknight.jewelrycraft.item.ItemEarrings; diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java b/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java index 13abc48..b30fa0c 100644 --- a/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java +++ b/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java @@ -1,6 +1,7 @@ package darkknight.jewelrycraft.effects; import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import darkknight.jewelrycraft.api.ModifierEffects; public class EffectsList { diff --git a/src/main/java/darkknight/jewelrycraft/effects/ModifierEffects.java b/src/main/java/darkknight/jewelrycraft/effects/ModifierEffects.java deleted file mode 100644 index d3c8e38..0000000 --- a/src/main/java/darkknight/jewelrycraft/effects/ModifierEffects.java +++ /dev/null @@ -1,85 +0,0 @@ -package darkknight.jewelrycraft.effects; - -import java.util.ArrayList; -import java.util.Random; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; - -public class ModifierEffects -{ - protected ItemStack modifier; - protected Random rand = new Random(); - protected static ArrayList effects = new ArrayList(); - - /** - * @param modifier - */ - public ModifierEffects(ItemStack modifier) - { - this.modifier = modifier; - effects.add(this); - } - - /** - * @return - */ - public static ArrayList getEffects() - { - return effects; - } - - /** - * @param item - * @param player - * @param jewelry - */ - public void action(ItemStack item, EntityPlayer player, Item jewelry) - {}; - - /** - * @param item - * @param player - * @param target - * @param jewelry - * @return - */ - public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount) - { - return false; - } - - /** - * @param item - * @param player - * @param source - * @param jewelry - * @return - */ - public boolean onPlayerAttackedCacellable(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount) - { - return false; - } - - /** - * @param item - * @param player - * @param target - * @param jewelry - * @return - */ - public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount) - {} - - /** - * @param item - * @param player - * @param source - * @param jewelry - * @return - */ - public void onPlayerAttacked(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount) - {} -} diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java index c608658..61d0955 100644 --- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java @@ -35,7 +35,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import darkknight.jewelrycraft.JewelrycraftMod; -import darkknight.jewelrycraft.curses.Curse; +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/events/PlayerRenderHandler.java b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java index 5106abd..92b84ab 100644 --- a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java @@ -14,7 +14,7 @@ import net.minecraftforge.client.event.RenderHandEvent; import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import darkknight.jewelrycraft.curses.Curse; +import darkknight.jewelrycraft.api.Curse; import darkknight.jewelrycraft.curses.CurseList; import darkknight.jewelrycraft.item.render.BraceletRender; import darkknight.jewelrycraft.item.render.EarringsRender; diff --git a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java index 5f15ed5..88ce504 100644 --- a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java @@ -11,7 +11,7 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import org.lwjgl.opengl.GL11; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import darkknight.jewelrycraft.curses.Curse; +import darkknight.jewelrycraft.api.Curse; import darkknight.jewelrycraft.util.Variables; public class ScreenHandler extends Gui diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java index cb38b76..bbd247c 100644 --- a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java +++ b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java @@ -27,7 +27,7 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import darkknight.jewelrycraft.JewelrycraftMod; -import darkknight.jewelrycraft.effects.ModifierEffects; +import darkknight.jewelrycraft.api.ModifierEffects; import darkknight.jewelrycraft.util.JewelryNBT; public abstract class ItemBaseJewelry extends Item diff --git a/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java b/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java index 0b6de4b..c8f7358 100644 --- a/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java +++ b/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java @@ -174,20 +174,10 @@ public class ItemRender implements IItemRenderer ItemRenderer.renderItemIn2D(tessellator, f1, f2, f, f3, iicon.getIconWidth(), iicon.getIconHeight(), 0.0625F); } GL11.glDepthFunc(GL11.GL_EQUAL); - texturemanager.bindTexture(RES_ITEM_GLINT); - GL11.glEnable(GL11.GL_BLEND); - OpenGlHelper.glBlendFunc(768, 1, 1, 0); - GL11.glMatrixMode(GL11.GL_TEXTURE); + renderShine(tessellator); GL11.glPushMatrix(); float f8 = 0.325F; GL11.glScalef(f8, f8, f8); - GL11.glTranslatef(17F, 0.0F, 0.0F); - GL11.glRotatef(-30.0F, 0.0F, 0.0F, 1.0F); - GL11.glColor3f(1F, 1F, 0F); - ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 256, 256, 0.0625F); - GL11.glPopMatrix(); - GL11.glPushMatrix(); - GL11.glScalef(f8, f8, f8); float f9 = (float)(Minecraft.getSystemTime() % 30000L) / 30000.0F * 8.0F; GL11.glTranslatef(-f9, 0.0F, 0.0F); GL11.glRotatef(30.0F, 0.0F, 0.0F, 1.0F); @@ -562,29 +552,74 @@ public class ItemRender implements IItemRenderer tessellator.setNormal(0.0F, -1.0F, 0.0F); renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata(block, 0, damage)); tessellator.draw(); + renderShine(tessellator); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glDisable(GL11.GL_BLEND); + GL11.glDepthFunc(GL11.GL_LEQUAL); GL11.glColor4f(1F, 1F, 0F, 1.0F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata(block, 1, damage)); tessellator.draw(); +// renderShine(tessellator); +// GL11.glMatrixMode(GL11.GL_MODELVIEW); +// GL11.glDisable(GL11.GL_BLEND); +// GL11.glDepthFunc(GL11.GL_LEQUAL); GL11.glColor4f(1F, 1F, 0F, 1.0F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata(block, 2, damage)); tessellator.draw(); +// renderShine(tessellator); +// GL11.glMatrixMode(GL11.GL_MODELVIEW); +// GL11.glDisable(GL11.GL_BLEND); +// GL11.glDepthFunc(GL11.GL_LEQUAL); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata(block, 3, damage)); tessellator.draw(); +// renderShine(tessellator); +// GL11.glMatrixMode(GL11.GL_MODELVIEW); +// GL11.glDisable(GL11.GL_BLEND); +// GL11.glDepthFunc(GL11.GL_LEQUAL); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata(block, 4, damage)); tessellator.draw(); +// renderShine(tessellator); +// GL11.glMatrixMode(GL11.GL_MODELVIEW); +// GL11.glDisable(GL11.GL_BLEND); +// GL11.glDepthFunc(GL11.GL_LEQUAL); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata(block, 5, damage)); tessellator.draw(); +// renderShine(tessellator); +// GL11.glMatrixMode(GL11.GL_MODELVIEW); +// GL11.glDisable(GL11.GL_BLEND); +// GL11.glDepthFunc(GL11.GL_LEQUAL); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } } + + public void renderShine(Tessellator tessellator) + { + TextureManager texturemanager = this.mc.getTextureManager(); + texturemanager.bindTexture(RES_ITEM_GLINT); + GL11.glEnable(GL11.GL_BLEND); + OpenGlHelper.glBlendFunc(768, 1, 1, 0); + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glPushMatrix(); + float f8 = 0.325F; + GL11.glScalef(f8, f8, f8); + GL11.glTranslatef(17F, 0.0F, 0.0F); + GL11.glRotatef(-30.0F, 0.0F, 0.0F, 1.0F); + GL11.glColor3f(1F, 1F, 0F); + ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 256, 256, 0.0625F); +// tessellator.addVertexWithUV(0.0D, 0.0D, 0.0D, (double)0F, (double)1F); +// tessellator.addVertexWithUV(1.0D, 0.0D, 0.0D, (double)1F, (double)1F); +// tessellator.addVertexWithUV(1.0D, 1.0D, 0.0D, (double)1F, (double)0F); +// tessellator.addVertexWithUV(0.0D, 1.0D, 0.0D, (double)0F, (double)0F); + GL11.glPopMatrix(); + } } diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java index 1d6e4b1..144f653 100644 --- a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java +++ b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java @@ -12,6 +12,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameData; import darkknight.jewelrycraft.JewelrycraftMod; import darkknight.jewelrycraft.events.EntityEventHandler; @@ -51,6 +52,7 @@ public class JewelrycraftUtil jewelry.add(new ItemStack(ItemList.earrings)); for(Object item: GameData.getItemRegistry()){ ArrayList items = new ArrayList(); + if (Loader.isModLoaded("Mantle") && ((Item)item).getUnlocalizedName().equals("Mantle:item.mantle.manual")) continue; if (item != null && ((Item)item).getHasSubtypes()) ((Item)item).getSubItems((Item)item, null, items); else objects.add(new ItemStack((Item)item)); -- cgit v1.2.3