diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 44054791..aaa6843a 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -4,6 +4,8 @@ Version 2.2.2 Changes - #1261 Add max level configs for XP obelisk, killer joe, and soul binder - #900 Add different texture for quite clear glass block +- #1254 Add method for tools to control hiding of facades +- #779 Add solar upgrade for DS helm Bugs - Fix outer corners on connected texture blocks not being metadata sensitive when they should be diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index ce6df326..a3f78b73 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -618,6 +618,12 @@ enderio.darksteel.upgrade.nightVision.name=Night Vision enderio.darksteel.upgrade.nightVision.enabled=Night Vision Enabled enderio.darksteel.upgrade.nightVision.disabled=Night Vision Disabled +enderio.darksteel.upgrade.solar_one.name=Solar I +enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=Generates power from the sun. + +enderio.darksteel.upgrade.solar_two.name=Solar II +enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Generates power from the sun. + //------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 5fb26ba9..6f9bbe30 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -210,6 +210,11 @@ public final class Config { public static int darkSteelTravelCost = 30; public static int darkSteelSpoonCost = 10; + + public static int darkSteelSolarOneGen = 10; + public static int darkSteelSolarOneCost = 15; + public static int darkSteelSolarTwoGen = 40; + public static int darkSteelSolarTwoCost = 30; public static float darkSteelAnvilDamageChance = 0.024f; @@ -714,6 +719,16 @@ public final class Config { darkSteelSpoonCost = config.get(sectionDarkSteel.name, "darkSteelSpoonCost", darkSteelSpoonCost, "Number of levels required for the 'Spoon' upgrade.").getInt(darkSteelSpoonCost); + darkSteelSolarOneCost = config.get(sectionDarkSteel.name, "darkSteelSolarOneCost", darkSteelSolarOneCost, + "Cost in XP levels of the Solar I upgrade.").getInt(); + darkSteelSolarOneGen = config.get(sectionDarkSteel.name, "darkSteelSolarOneGen", darkSteelSolarOneGen, + "RF per SECOND generated by the Solar I upgrade. Split between all equipped DS armors.").getInt(); + + darkSteelSolarTwoCost = config.get(sectionDarkSteel.name, "darkSteelSolarTwoCost", darkSteelSolarTwoCost, + "Cost in XP levels of the Solar II upgrade.").getInt(); + darkSteelSolarTwoGen = config.get(sectionDarkSteel.name, "darkSteelSolarTwoGen", darkSteelSolarTwoGen, + "RF per SECOND generated by the Solar II upgrade. Split between all equipped DS armors.").getInt(); + darkSteelSwordSkullChance = (float) config.get(sectionDarkSteel.name, "darkSteelSwordSkullChance", darkSteelSwordSkullChance, "The base chance that a skull will be dropped when using a powered dark steel sword (0 = no chance, 1 = 100% chance)").getDouble( darkSteelSwordSkullChance); diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index 3192b6a4..32e91fd1 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -1,6 +1,8 @@ package crazypants.enderio.item.darksteel; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.UUID; @@ -13,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.MathHelper; import net.minecraft.util.MovementInput; import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -23,6 +26,7 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.network.PacketHandler; +import crazypants.util.BlockCoord; import crazypants.util.Util; import crazypants.vecmath.VecmathUtil; import crazypants.vecmath.Vector3d; @@ -123,10 +127,55 @@ public class DarkSteelController { updateSwim(player); + updateSolar(player); + } } + private void updateSolar(EntityPlayer player) { + if (player.worldObj.isRemote) { + return; + } + + BlockCoord block = new BlockCoord(MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY + 1), MathHelper.floor_double(player.posZ)); + if (!player.worldObj.canBlockSeeTheSky(block.x, block.y, block.z)) { + return; + } + + ItemStack helm = player.getEquipmentInSlot(4); + SolarUpgrade upgrade = SolarUpgrade.loadFromItem(helm); + if(upgrade == null) { + return; + } + + int RFperSecond = upgrade.getRFPerSec(); + int leftover = RFperSecond % 20; + boolean addExtraRF = player.worldObj.getTotalWorldTime() % 20 < leftover; + + int toAdd = (RFperSecond / 20) + (addExtraRF ? 1 : 0); + + if(toAdd != 0) { + + List validArmors = new ArrayList(); + + // we need to evenly split power between all equipped DS armors + for (int i = 0; i < 4; i++) { + ItemStack stack = player.inventory.armorInventory[i]; + if(EnergyUpgrade.loadFromItem(stack) != null) { + validArmors.add(i); + } + } + + int nextToAddTo = player.getEntityData().getInteger("dsarmor:solar"); + ItemStack armor = player.inventory.armorInventory[validArmors.get(nextToAddTo)]; + + ((IEnergyContainerItem) armor.getItem()).receiveEnergy(armor, toAdd, false); + + player.getEntityData().setInteger("dsarmor:solar", (validArmors.indexOf(nextToAddTo) + 1) % validArmors.size()); + } + } + private void updateSwim(EntityPlayer player) { ItemStack boots = player.getEquipmentInSlot(1); SwimUpgrade upgrade = SwimUpgrade.loadFromItem(boots); diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java index fe5294a7..0216a46e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -12,6 +12,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.event.AnvilUpdateEvent; + +import com.google.common.collect.ImmutableList; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.EnderIO; @@ -41,6 +44,8 @@ public class DarkSteelRecipeManager { upgrades.add(NightVisionUpgrade.INSTANCE); upgrades.add(TravelUpgrade.INSTANCE); upgrades.add(SpoonUpgrade.INSTANCE); + upgrades.add(SolarUpgrade.SOLAR_ONE); + upgrades.add(SolarUpgrade.SOLAR_TWO); if(Loader.isModLoaded("Thaumcraft")) { upgrades.add(GogglesOfRevealingUpgrade.INSTANCE); } @@ -184,4 +189,7 @@ public class DarkSteelRecipeManager { } } + public Iterator recipeIterator() { + return ImmutableList.copyOf(upgrades).iterator(); + } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java index d3022091..345a8c7a 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/EnergyUpgrade.java @@ -127,7 +127,7 @@ public class EnergyUpgrade extends AbstractUpgrade { if(up == null) { return null; } - return PowerDisplayUtil.formatStoredPower(up.energy / 10, up.capacity/10); + return PowerDisplayUtil.formatStoredPower(up.energy, up.capacity); } public static int getEnergyStored(ItemStack container) { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index 3ffc39b5..297ef30c 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -1,5 +1,6 @@ package crazypants.enderio.item.darksteel; +import java.util.Iterator; import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -109,6 +110,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte GameRegistry.registerItem(this, getUnlocalizedName()); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { @@ -118,21 +120,15 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte is = new ItemStack(this); EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); EnergyUpgrade.setPowerFull(is); - if(armorType == 2) { - 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) { - SoundDetectorUpgrade.INSTANCE.writeToItem(is); - NightVisionUpgrade.INSTANCE.writeToItem(is); - if(GogglesOfRevealingUpgrade.getGoggles() != null) { - GogglesOfRevealingUpgrade.INSTANCE.writeToItem(is); + + Iterator iter = DarkSteelRecipeManager.instance.recipeIterator(); + while (iter.hasNext()) { + IDarkSteelUpgrade upgrade = iter.next(); + if (!(upgrade instanceof EnergyUpgrade) && upgrade.canAddToItem(is)) { + upgrade.writeToItem(is); } } - + par3List.add(is); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/SolarUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/SolarUpgrade.java new file mode 100644 index 00000000..a4c647ce --- /dev/null +++ b/src/main/java/crazypants/enderio/item/darksteel/SolarUpgrade.java @@ -0,0 +1,89 @@ +package crazypants.enderio.item.darksteel; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.PotionHelper; +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; + +public class SolarUpgrade extends AbstractUpgrade { + + private static final String KEY_LEVEL = "level"; + + private static final String UPGRADE_NAME = "speedBoost"; + + public static final SolarUpgrade SOLAR_ONE = new SolarUpgrade("enderio.darksteel.upgrade.solar_one", (byte) 1, Config.darkSteelSolarOneCost); + public static final SolarUpgrade SOLAR_TWO = new SolarUpgrade("enderio.darksteel.upgrade.solar_two", (byte) 2, Config.darkSteelSolarTwoCost); + + public static SolarUpgrade 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 SolarUpgrade((NBTTagCompound) stack.stackTagCompound.getTag(KEY_UPGRADE_PREFIX + UPGRADE_NAME)); + } + + private static ItemStack createUpgradeItem() { + ItemStack pot = new ItemStack(Items.potionitem, 1, 0); + int res = PotionHelper.applyIngredient(0, Items.nether_wart.getPotionEffect(new ItemStack(Items.nether_wart))); + res = PotionHelper.applyIngredient(res, PotionHelper.sugarEffect); + pot.setItemDamage(res); + return pot; + } + + private byte level; + + public SolarUpgrade(NBTTagCompound tag) { + super(UPGRADE_NAME, tag); + level = tag.getByte(KEY_LEVEL); + } + + public SolarUpgrade(String unlocName, byte level, int levelCost) { + super(UPGRADE_NAME, unlocName, createUpgradeItem(), levelCost); + this.level = (byte) level; + } + + @Override + public boolean canAddToItem(ItemStack stack) { + if(stack == null || stack.getItem() != EnderIO.itemDarkSteelHelmet || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + return false; + } + SolarUpgrade up = loadFromItem(stack); + if(up == null) { + return level == 1; + } + return up.level == level - 1; + } + + @Override + public boolean hasUpgrade(ItemStack stack) { + if(!super.hasUpgrade(stack)) { + return false; + } + SolarUpgrade up = loadFromItem(stack); + if(up == null) { + return false; + } + return up.unlocName.equals(unlocName); + } + + @Override + public ItemStack getUpgradeItem() { + return new ItemStack(EnderIO.blockSolarPanel, 1, level - 1); + } + + @Override + public void writeUpgradeToNBT(NBTTagCompound upgradeRoot) { + upgradeRoot.setByte(KEY_LEVEL, level); + } + + public int getRFPerSec() { + return level == 1 ? Config.darkSteelSolarOneGen : Config.darkSteelSolarTwoGen; + } +} diff --git a/src/main/java/crazypants/enderio/item/darksteel/SpeedUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/SpeedUpgrade.java index d16677ce..5ed0cc32 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SpeedUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SpeedUpgrade.java @@ -104,5 +104,4 @@ public class SpeedUpgrade extends AbstractUpgrade { upgradeRoot.setShort(KEY_LEVEL, level); upgradeRoot.setFloat(KEY_MULTIPLIER, walkMultiplier); } - }