From aca0a0c43c17883b1487acf459bd504e6785f09c Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 4 Aug 2014 19:49:37 +0800 Subject: [PATCH] Added flipper upgrade for DS boots. --- resources/assets/enderio/lang/en_US.lang | 2 + .../crazypants/enderio/config/Config.java | 5 ++ .../item/darksteel/DarkSteelController.java | 16 +++++- .../darksteel/DarkSteelRecipeManager.java | 1 + .../item/darksteel/ItemDarkSteelArmor.java | 1 + .../enderio/item/darksteel/SwimUpgrade.java | 54 +++++++++++++++++++ 6 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 src/main/java/crazypants/enderio/item/darksteel/SwimUpgrade.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index f7b9471a..95d78b92 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -421,6 +421,8 @@ enderio.darksteel.upgrade.speed_two.tooltip.detailed.line1=Increases movement sp enderio.darksteel.upgrade.speed_three.name=Speed III enderio.darksteel.upgrade.speed_three.tooltip.detailed.line1=Increases movement speed +enderio.darksteel.upgrade.swim.name=Flippers + //------GUI enderio.gui.enabled=Enabled diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 4baf9fa1..6268cd35 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -172,6 +172,8 @@ public final class Config { public static double darkSteelGliderVerticalSpeed = -0.05; public static double darkSteelGliderVerticalSpeedSprinting = -0.15; + public static int darkSteelSwimCost = 15; + public static int darkSteelSoundLocatorCost = 10; public static int darkSteelSoundLocatorRange = 40; public static int darkSteelSoundLocatorLifespan = 40; @@ -462,6 +464,9 @@ public final class Config { darkSteelFallDistanceCost = config.get(sectionDarkSteel.name, "darkSteelFallDistanceCost", darkSteelFallDistanceCost, "Amount of power used (RF) per block height of fall distance damage negated.").getInt(darkSteelFallDistanceCost); + darkSteelSwimCost = config.get(sectionDarkSteel.name, "darkSteelGliderCost", darkSteelGliderCost, + "Number of levels required for the 'Swim' upgrade.").getInt(darkSteelGliderCost); + darkSteelGliderCost = config.get(sectionDarkSteel.name, "darkSteelGliderCost", darkSteelGliderCost, "Number of levels required for the 'Glider' upgrade.").getInt(darkSteelGliderCost); darkSteelGliderHorizontalSpeed = config.get(sectionDarkSteel.name, "darkSteelGliderHorizontalSpeed", darkSteelGliderHorizontalSpeed, diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index 670c67af..e9f66caa 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -87,10 +87,24 @@ public class DarkSteelController { updateSword(player); updateGlide(player); + + updateSwim(player); } } + private void updateSwim(EntityPlayer player) { + ItemStack boots = player.getEquipmentInSlot(1); + SwimUpgrade upgrade = SwimUpgrade.loadFromItem(boots); + if(upgrade == null) { + return; + } + if(player.isInWater()) { + player.motionX *= 1.1; + player.motionZ *= 1.1; + } + } + private void updateGlide(EntityPlayer player) { if(!isGlideActive(player) || !isGliderUpgradeEquipped(player)) { return; @@ -169,7 +183,7 @@ public class DarkSteelController { } else if(moveInst.getModifier(sprintModifiers[0].getID()) != null) { moveInst.removeModifier(sprintModifiers[0]); } - + ItemStack leggings = player.getEquipmentInSlot(2); SpeedUpgrade speedUpgrade = SpeedUpgrade.loadFromItem(leggings); if(leggings != null && leggings.getItem() == EnderIO.itemDarkSteelLeggings && speedUpgrade != null) { diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java index ab83e00f..f9ed2baf 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -36,6 +36,7 @@ public class DarkSteelRecipeManager { upgrades.add(SpeedUpgrade.SPEED_THREE); upgrades.add(GliderUpgrade.INSTANCE); upgrades.add(SoundDetectorUpgrade.INSTANCE); + upgrades.add(SwimUpgrade.INSTANCE); } @SubscribeEvent diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index d8848d5b..bcd4242b 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -107,6 +107,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte SpeedUpgrade.SPEED_THREE.writeToItem(is); } else if(armorType == 3) { JumpUpgrade.JUMP_THREE.writeToItem(is); + SwimUpgrade.INSTANCE.writeToItem(is); } else if(armorType == 1) { GliderUpgrade.INSTANCE.writeToItem(is); } else if(armorType == 0) { diff --git a/src/main/java/crazypants/enderio/item/darksteel/SwimUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/SwimUpgrade.java new file mode 100644 index 00000000..d255b15c --- /dev/null +++ b/src/main/java/crazypants/enderio/item/darksteel/SwimUpgrade.java @@ -0,0 +1,54 @@ +package crazypants.enderio.item.darksteel; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; + +public class SwimUpgrade extends AbstractUpgrade { + + private static String UPGRADE_NAME = "swim"; + + public static final SwimUpgrade INSTANCE = new SwimUpgrade(); + + public static SwimUpgrade loadFromItem(ItemStack stack) { + if(stack == null) { + return null; + } + if(stack.stackTagCompound == null) { + return null; + } + if(!stack.stackTagCompound.hasKey(KEY_UPGRADE_PREFIX + UPGRADE_NAME)) { + return null; + } + return new SwimUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); + } + + + public SwimUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); + } + + public SwimUpgrade() { + super(UPGRADE_NAME, "enderio.darksteel.upgrade.swim", new ItemStack(Blocks.waterlily), Config.darkSteelSwimCost); + } + + @Override + public boolean canAddToItem(ItemStack stack) { + if(stack == null || stack.getItem() != EnderIO.itemDarkSteelBoots) { + return false; + } + SwimUpgrade up = loadFromItem(stack); + if(up == null) { + return true; + } + return false; + } + + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { + } + + +}