diff options
| author | Alkalus <draknyte1@hotmail.com> | 2017-11-11 22:11:27 +1000 |
|---|---|---|
| committer | Alkalus <draknyte1@hotmail.com> | 2017-11-11 22:11:27 +1000 |
| commit | b9168d6c0d36a0bc3aa1dab551f2bd2fdda1dc9b (patch) | |
| tree | a5e32220ceeb405053845f955b537e630b08c639 /src/Java/gtPlusPlus/core/item | |
| parent | 3e8d2c58af25cad0542cdc77b5056031c5ce186d (diff) | |
| download | GT5-Unofficial-b9168d6c0d36a0bc3aa1dab551f2bd2fdda1dc9b.tar.gz GT5-Unofficial-b9168d6c0d36a0bc3aa1dab551f2bd2fdda1dc9b.tar.bz2 GT5-Unofficial-b9168d6c0d36a0bc3aa1dab551f2bd2fdda1dc9b.zip | |
+ More work.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/bauble/BaseBauble.java | 6 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java | 25 |
2 files changed, 24 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/Java/gtPlusPlus/core/item/bauble/BaseBauble.java index 654d92ff36..9827b0281b 100644 --- a/src/Java/gtPlusPlus/core/item/bauble/BaseBauble.java +++ b/src/Java/gtPlusPlus/core/item/bauble/BaseBauble.java @@ -93,8 +93,12 @@ public class BaseBauble extends Item implements IBauble{ } public boolean SetBaubleType(BT arg0) { + return SetBaubleType(arg0.getType()); + } + + public boolean SetBaubleType(BaubleType arg0) { BaubleType temp = this.mThisBauble; - this.mThisBauble = arg0.getType(); + this.mThisBauble = arg0; if (this.mThisBauble != temp){ return true; } diff --git a/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java b/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java index 4ba475f4be..ec3d9dca43 100644 --- a/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java +++ b/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java @@ -134,7 +134,7 @@ public class ModularBauble extends BaseBauble{ if ((mStatlevel = ModularArmourUtils.getModifierLevel(stack, Modifiers.BOOST_DAMAGE)) > 0){ list.add(EnumChatFormatting.GRAY+"Damage Boost: "+EnumChatFormatting.DARK_RED+mStatlevel+EnumChatFormatting.GRAY+"/100."); } - + if ((mStatlevel = ModularArmourUtils.getModifierLevel(stack, Modifiers.BOOST_HP)) > 0){ list.add(EnumChatFormatting.GRAY+"Health Boost: "+EnumChatFormatting.RED+mStatlevel+EnumChatFormatting.GRAY+"/100."); } @@ -147,11 +147,11 @@ public class ModularBauble extends BaseBauble{ if ((mStatlevel = ModularArmourUtils.getModifierLevel(stack, Modifiers.BOOST_HOLY)) > 0){ list.add(EnumChatFormatting.GRAY+"Holy Boost: "+EnumChatFormatting.GOLD+mStatlevel+EnumChatFormatting.GRAY+"/100."); } - + //Defence Boost if ((mStatlevel = ModularArmourUtils.getModifierLevel(stack, Modifiers.BOOST_DEF)) > 0){ list.add(EnumChatFormatting.GRAY+"Defence Boost: "+EnumChatFormatting.BLUE+mStatlevel+EnumChatFormatting.GRAY+"/100."); - + if (mStatlevel >= 1){ list.add(EnumChatFormatting.GRAY+"Protected From: "+EnumChatFormatting.BLUE+"Cactus"+EnumChatFormatting.GRAY+"."); } @@ -185,10 +185,10 @@ public class ModularBauble extends BaseBauble{ if (mStatlevel >= 100){ list.add(EnumChatFormatting.GRAY+"Protected From: "+EnumChatFormatting.BLUE+"Void"+EnumChatFormatting.GRAY+"."); } - + } - - + + if (NBTUtils.getBotanicaSoulboundOwner(stack) != null){ if (!NBTUtils.getBotanicaSoulboundOwner(stack).equals("")){ list.add(EnumChatFormatting.GRAY+"Relic Owner: "+EnumChatFormatting.GREEN+NBTUtils.getBotanicaSoulboundOwner(stack)+EnumChatFormatting.GRAY+"."); @@ -384,5 +384,18 @@ public class ModularBauble extends BaseBauble{ } } + private BaubleType mTypeArray[] = new BaubleType[]{ + BaubleType.AMULET, + BaubleType.RING, + BaubleType.BELT + }; + + @Override + public void onWornTick(ItemStack stack, EntityLivingBase player) { + int mTemp = ModularArmourUtils.getBaubleTypeID(stack); + SetBaubleType(ModularArmourUtils.getBaubleByID(mTemp)); + super.onWornTick(stack, player); + } + } |