mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-18 19:39:14 +00:00
Adjusted dark steel repair costs and added upgraded version to creative tab.
This commit is contained in:
1 parent
f34f7ff917
commit
bbbd8b8689
7 files changed
+214
-7
No files matched your search
@@ -1,14 +1,21 @@
|
||||
package crazypants.enderio.item.darksteel;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraftforge.event.AnvilUpdateEvent;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.material.Alloy;
|
||||
import crazypants.util.Lang;
|
||||
|
||||
public class DarkSteelRecipeManager {
|
||||
@@ -36,11 +43,48 @@ public class DarkSteelRecipeManager {
|
||||
return;
|
||||
}
|
||||
|
||||
if(evt.left.getItem() instanceof IDarkSteelItem &&
|
||||
evt.right.getItem() == EnderIO.itemAlloy &&
|
||||
evt.right.getItemDamage() == Alloy.DARK_STEEL.ordinal()) {
|
||||
|
||||
handleRepair(evt);
|
||||
|
||||
} else {
|
||||
handleUpgrade(evt);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void handleRepair(AnvilUpdateEvent evt) {
|
||||
ItemStack targetStack = evt.left;
|
||||
ItemStack ingots = evt.right;
|
||||
|
||||
//repair event
|
||||
IDarkSteelItem targetItem = (IDarkSteelItem)targetStack.getItem();
|
||||
int maxIngots = targetItem.getIngotsRequiredForFullRepair();
|
||||
|
||||
double damPerc = (double)targetStack.getItemDamage()/ targetStack.getMaxDamage();
|
||||
int requiredIngots = (int)Math.ceil(damPerc * maxIngots);
|
||||
if(ingots.stackSize > requiredIngots) {
|
||||
return;
|
||||
}
|
||||
|
||||
int damageAddedPerIngot = (int)Math.ceil((double)targetStack.getMaxDamage()/maxIngots);
|
||||
int totalDamageRemoved = damageAddedPerIngot * ingots.stackSize;
|
||||
|
||||
ItemStack resultStack = targetStack.copy();
|
||||
resultStack.setItemDamage(Math.max(0, resultStack.getItemDamage() - totalDamageRemoved));
|
||||
|
||||
evt.output = resultStack;
|
||||
evt.cost = ingots.stackSize + getEnchantmentRepairCost(resultStack);//(int)Math.ceil(getEnchantmentRepairCost(resultStack)/2);
|
||||
}
|
||||
|
||||
private void handleUpgrade(AnvilUpdateEvent evt) {
|
||||
for (IDarkSteelUpgrade upgrade : upgrades) {
|
||||
if(upgrade.isUpgradeItem(evt.right) && upgrade.canAddToItem(evt.left)) {
|
||||
ItemStack res = new ItemStack(evt.left.getItem(), 1, evt.left.getItemDamage());
|
||||
if(evt.left.stackTagCompound != null) {
|
||||
res.stackTagCompound = (NBTTagCompound)evt.left.stackTagCompound.copy();
|
||||
res.stackTagCompound = (NBTTagCompound) evt.left.stackTagCompound.copy();
|
||||
}
|
||||
upgrade.writeToItem(res);
|
||||
evt.output = res;
|
||||
@@ -48,7 +92,47 @@ public class DarkSteelRecipeManager {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static int getEnchantmentRepairCost(ItemStack itemStack) {
|
||||
//derived from ContainerRepair
|
||||
int res = 0;
|
||||
Map map1 = EnchantmentHelper.getEnchantments(itemStack);
|
||||
Iterator iter = map1.keySet().iterator();
|
||||
while (iter.hasNext()) {
|
||||
int i1 = ((Integer) iter.next()).intValue();
|
||||
Enchantment enchantment = Enchantment.enchantmentsList[i1];
|
||||
|
||||
int level = ((Integer) map1.get(Integer.valueOf(i1))).intValue();
|
||||
if(enchantment.canApply(itemStack)) {
|
||||
if(level > enchantment.getMaxLevel()) {
|
||||
level = enchantment.getMaxLevel();
|
||||
}
|
||||
int costPerLevel = 0;
|
||||
switch (enchantment.getWeight()) {
|
||||
case 1:
|
||||
costPerLevel = 8;
|
||||
break;
|
||||
case 2:
|
||||
costPerLevel = 4;
|
||||
case 3:
|
||||
case 4:
|
||||
case 6:
|
||||
case 7:
|
||||
case 8:
|
||||
case 9:
|
||||
default:
|
||||
break;
|
||||
case 5:
|
||||
costPerLevel = 2;
|
||||
break;
|
||||
case 10:
|
||||
costPerLevel = 1;
|
||||
}
|
||||
res += costPerLevel * level;
|
||||
}
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
public List<IDarkSteelUpgrade> getUpgrades() {
|
||||
@@ -84,8 +168,9 @@ public class DarkSteelRecipeManager {
|
||||
if(!applyableUpgrades.isEmpty()) {
|
||||
list.add(EnumChatFormatting.YELLOW + "Anvil Upgrades: ");
|
||||
for (IDarkSteelUpgrade up : applyableUpgrades) {
|
||||
list.add(EnumChatFormatting.DARK_AQUA + "" + "" + Lang.localize(up.getUnlocalizedName() + ".name", false) + ": ");
|
||||
list.add(EnumChatFormatting.DARK_AQUA + "" + EnumChatFormatting.ITALIC + " " + up.getUpgradeItem().getDisplayName() + " + " + up.getLevelCost() + " lvs");
|
||||
list.add(EnumChatFormatting.DARK_AQUA + "" + "" + Lang.localize(up.getUnlocalizedName() + ".name", false) + ": ");
|
||||
list.add(EnumChatFormatting.DARK_AQUA + "" + EnumChatFormatting.ITALIC + " " + up.getUpgradeItem().getDisplayName() + " + " + up.getLevelCost()
|
||||
+ " lvs");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -99,6 +99,25 @@ public class EnergyUpgrade extends AbstractUpgrade {
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
public static void setPowerLevel(ItemStack item, int amount) {
|
||||
if(item == null || !itemHasAnyPowerUpgrade(item)) {
|
||||
return;
|
||||
}
|
||||
amount = Math.min(amount, getMaxEnergyStored(item));
|
||||
EnergyUpgrade eu = loadFromItem(item);
|
||||
eu.setEnergy(amount);
|
||||
eu.writeToItem(item);
|
||||
}
|
||||
|
||||
public static void setPowerFull(ItemStack item) {
|
||||
if(item == null || !itemHasAnyPowerUpgrade(item)) {
|
||||
return;
|
||||
}
|
||||
EnergyUpgrade eu = loadFromItem(item);
|
||||
eu.setEnergy(eu.getCapacity());
|
||||
eu.writeToItem(item);
|
||||
}
|
||||
|
||||
public static String getStoredEnergyString(ItemStack itemstack) {
|
||||
EnergyUpgrade up = loadFromItem(itemstack);
|
||||
|
||||
@@ -2,4 +2,6 @@ package crazypants.enderio.item.darksteel;
|
||||
|
||||
public interface IDarkSteelItem {
|
||||
|
||||
int getIngotsRequiredForFullRepair();
|
||||
|
||||
}
|
||||
@@ -2,9 +2,11 @@ package crazypants.enderio.item.darksteel;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemArmor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DamageSource;
|
||||
@@ -14,6 +16,8 @@ import net.minecraftforge.common.util.EnumHelper;
|
||||
import cofh.api.energy.IEnergyContainerItem;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.Config;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.EnderIOTab;
|
||||
@@ -74,6 +78,39 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte
|
||||
protected void init() {
|
||||
GameRegistry.registerItem(this, getUnlocalizedName());
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
|
||||
ItemStack is = new ItemStack(this);
|
||||
par3List.add(is);
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
par3List.add(is);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getIngotsRequiredForFullRepair() {
|
||||
switch (armorType) {
|
||||
case 0:
|
||||
return 5;//EnderIO.itemDarkSteelHelmet;
|
||||
case 1:
|
||||
return 8;//EnderIO.itemDarkSteelChestplate;
|
||||
case 2:
|
||||
return 7;//EnderIO.itemDarkSteelLeggings;
|
||||
case 3:
|
||||
return 4;//EnderIO.itemDarkSteelBoots;
|
||||
}
|
||||
return 4;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {
|
||||
@@ -147,7 +184,8 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack i1, ItemStack i2) {
|
||||
return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal();
|
||||
//return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal();
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -13,6 +13,8 @@ import cofh.api.energy.IEnergyContainerItem;
|
||||
import cpw.mods.fml.common.eventhandler.EventBus;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.Config;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.EnderIOTab;
|
||||
@@ -23,10 +25,12 @@ import crazypants.util.BlockCoord;
|
||||
import crazypants.util.ItemUtil;
|
||||
import crazypants.util.Lang;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemAxe;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
@@ -87,8 +91,23 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I
|
||||
setTextureName("enderIO:" + str);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getIngotsRequiredForFullRepair() {
|
||||
return 3;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
|
||||
ItemStack is = new ItemStack(this);
|
||||
par3List.add(is);
|
||||
|
||||
is = new ItemStack(this);
|
||||
EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is);
|
||||
EnergyUpgrade.setPowerFull(is);
|
||||
par3List.add(is);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isDamaged(ItemStack stack) {
|
||||
return false;
|
||||
@@ -257,7 +276,8 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack i1, ItemStack i2) {
|
||||
return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal();
|
||||
//return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal();
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -3,9 +3,11 @@ package crazypants.enderio.item.darksteel;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemPickaxe;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
@@ -14,6 +16,8 @@ import net.minecraftforge.common.ForgeHooks;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import cofh.api.energy.IEnergyContainerItem;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.Config;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.EnderIOTab;
|
||||
@@ -58,6 +62,23 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine
|
||||
setTextureName("enderIO:" + str);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
|
||||
ItemStack is = new ItemStack(this);
|
||||
par3List.add(is);
|
||||
|
||||
is = new ItemStack(this);
|
||||
EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is);
|
||||
EnergyUpgrade.setPowerFull(is);
|
||||
par3List.add(is);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getIngotsRequiredForFullRepair() {
|
||||
return 3;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isDamaged(ItemStack stack) {
|
||||
return false;
|
||||
@@ -157,7 +178,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack i1, ItemStack i2) {
|
||||
return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal();
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -2,6 +2,7 @@ package crazypants.enderio.item.darksteel;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.monster.EntityCreeper;
|
||||
@@ -10,6 +11,7 @@ import net.minecraft.entity.monster.EntitySkeleton;
|
||||
import net.minecraft.entity.monster.EntityZombie;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemSword;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
@@ -20,6 +22,8 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent;
|
||||
import cofh.api.energy.IEnergyContainerItem;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.Config;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.EnderIOTab;
|
||||
@@ -69,6 +73,23 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte
|
||||
setTextureName("enderIO:" + str);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
|
||||
ItemStack is = new ItemStack(this);
|
||||
par3List.add(is);
|
||||
|
||||
is = new ItemStack(this);
|
||||
EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is);
|
||||
EnergyUpgrade.setPowerFull(is);
|
||||
par3List.add(is);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getIngotsRequiredForFullRepair() {
|
||||
return 3;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isDamaged(ItemStack stack) {
|
||||
return false;
|
||||
@@ -233,7 +254,8 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte
|
||||
|
||||
@Override
|
||||
public boolean getIsRepairable(ItemStack i1, ItemStack i2) {
|
||||
return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal();
|
||||
//return i2 != null && i2.getItem() == EnderIO.itemAlloy && i2.getItemDamage() == Alloy.DARK_STEEL.ordinal();
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user