From 2342897a409d08e2431b66191c4a7c4491e5222d Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Thu, 7 May 2015 14:32:45 +0100 Subject: Refined the Interface a bit more --- build.gradle | 11 +++-------- .../java/darkknight/jewelrycraft/api/IJewelryItem.java | 16 +++++++++++----- .../jewelrycraft/events/EntityEventHandler.java | 10 +++++----- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index f22c34a..de18f2e 100644 --- a/build.gradle +++ b/build.gradle @@ -15,10 +15,6 @@ buildscript { } } -dependencies { - compile fileTree(dir: 'libs', include: '*.jar') -} - apply plugin: "curseforge" apply plugin: 'forge' @@ -37,7 +33,7 @@ if (System.getenv().BUILD_NUMBER != null) { version = "${project.ext.massive}.${project.ext.major}.${project.minor}" group= "darkknight.jewelrycraft2" -archivesBaseName = "Jewelrycraft2" +archivesBaseName = "[${project.ext.mcVersion}] Jewelrycraft2" sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 @@ -76,11 +72,11 @@ processResources{ curse { apiKey = System.getenv("onyxdarkknight_curse") projectId = "229927" // my project url is http://minecraft.curseforge.com/mc-mods/229927-jewelrycraft-2 - changelog = new File('Changelog.txt').text + changelog = new File('changelog.txt').text releaseType = "release" // the default obfuscated jar is uploaded by default - // artifact = project.file("some/jar/to/upload.jar") + // artifact = project.file("build/libs/to/upload.jar") // allows you to add extra compatible MC versions. The one specified in the minecraft{} block is used by default. // addGameversion "1.7.0", "1.7.4" @@ -99,7 +95,6 @@ sourceSets { } jar { - appendix = "${project.ext.mcVersion}" classifier = 'universal' } diff --git a/src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java b/src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java index 26ce183..80121de 100644 --- a/src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java +++ b/src/main/java/darkknight/jewelrycraft/api/IJewelryItem.java @@ -5,6 +5,7 @@ package darkknight.jewelrycraft.api; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.event.entity.player.PlayerEvent; @@ -21,37 +22,42 @@ public interface IJewelryItem /** * This is the action performed each player tick + * @param item The item stack of the item (allows for fine item search, like metadata and nbt) * @param player The player wearing the jewelry */ - public void onWearAction(EntityPlayer player); + public void onWearAction(ItemStack item, EntityPlayer player); /** * This performs an action whenever a player gets attacked by an entity besides another Player + * @param item The item stack of the item (allows for fine item search, like metadata and nbt) * @param player The player that was attacked * @param source Source of the damage * @param amount The amount of damage taken */ - public void onPlayerAttackedAction(EntityPlayer player, DamageSource source, float amount); + public void onPlayerAttackedAction(ItemStack item, EntityPlayer player, DamageSource source, float amount); /** * This does an action whenever an Entity gets attacked by a player, this includes other Players + * @param item The item stack of the item (allows for fine item search, like metadata and nbt) * @param player The attacking player * @param entity The target entity * @param amount The amount of damage dealt */ - public void onEntityAttackedByPlayer(EntityPlayer player, EntityLivingBase entity, float amount); + public void onEntityAttackedByPlayer(ItemStack item, EntityPlayer player, EntityLivingBase entity, float amount); /** * This runs whenever a player dies + * @param item The item stack of the item (allows for fine item search, like metadata and nbt) * @param player The player that died * @param source The damage source that caused the death */ - public void onPlayerDeadAction(EntityPlayer player, DamageSource source); + public void onPlayerDeadAction(ItemStack item, EntityPlayer player, DamageSource source); /** * Runs whenever a player respawns (switches dimensions or actually respawns) + * @param item The item stack of the item (allows for fine item search, like metadata and nbt) * @param player The player that respawns * @param event The clone event that runs whenever a player respawns, either because he died or switched dimensions */ - public void onPlayerRespawnAction(PlayerEvent.Clone event); + public void onPlayerRespawnAction(ItemStack item, PlayerEvent.Clone event); } diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java index dc13b09..14f74cd 100644 --- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java @@ -121,7 +121,7 @@ public class EntityEventHandler ItemStack item = ItemStack.loadItemStackFromNBT(nbt); if (item != null){ if(item.getItem() instanceof ItemBaseJewelry)((ItemBaseJewelry)item.getItem()).action(item, player); - if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onWearAction(player); + if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onWearAction(item, player); } } if (!player.worldObj.isRemote){ @@ -192,7 +192,7 @@ public class EntityEventHandler } if (item != null){ if(item.getItem() instanceof ItemBaseJewelry)((ItemBaseJewelry)item.getItem()).onPlayerAttacked(item, player, event.source, event.ammount); - if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onPlayerAttackedAction(player, event.source, event.ammount); + if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onPlayerAttackedAction(item, player, event.source, event.ammount); } } if (player.getHealth() != player.prevHealth){ @@ -253,7 +253,7 @@ public class EntityEventHandler } if (item != null){ if(item.getItem() instanceof ItemBaseJewelry)((ItemBaseJewelry)item.getItem()).onEntityAttacked(item, player, entity, event.ammount); - if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onEntityAttackedByPlayer(player, entity, event.ammount); + if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onEntityAttackedByPlayer(item, player, entity, event.ammount); } } for(Curse curse: Curse.getCurseList()) @@ -290,7 +290,7 @@ public class EntityEventHandler ItemStack item = ItemStack.loadItemStackFromNBT(nbt); if (item != null){ if(item.getItem() instanceof ItemBaseJewelry)((ItemBaseJewelry)item.getItem()).onPlayerRespawn(item, event); - if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onPlayerRespawnAction(event); + if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onPlayerRespawnAction(item, event); } } } @@ -404,7 +404,7 @@ public class EntityEventHandler ItemStack item = ItemStack.loadItemStackFromNBT(nbt); if (item != null){ if(item.getItem() instanceof ItemBaseJewelry)((ItemBaseJewelry)item.getItem()).onPlayerDead(item, player, event.source); - if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onPlayerDeadAction(player, event.source); + if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onPlayerDeadAction(item, player, event.source); } } } -- cgit v1.2.3