From 4a291087ad8fa74ef0e2d3d8da262467dd2bb466 Mon Sep 17 00:00:00 2001 From: Gig Date: Mon, 13 Apr 2015 18:43:31 +0100 Subject: [PATCH 1/4] Added omnitool --- src/main/java/techreborn/init/ModItems.java | 4 + src/main/java/techreborn/init/ModRecipes.java | 2 +- .../techreborn/items/tools/ItemOmniTool.java | 180 ++++++++++++++++++ .../assets/techreborn/lang/en_US.lang | 1 + 4 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 src/main/java/techreborn/items/tools/ItemOmniTool.java diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 09bd5a337..cd1366fac 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -13,6 +13,7 @@ import techreborn.items.ItemIngots; import techreborn.items.ItemParts; import techreborn.items.tools.ItemLapotronPack; import techreborn.items.tools.ItemLithiumBatpack; +import techreborn.items.tools.ItemOmniTool; import techreborn.items.tools.ItemRockCutter; import techreborn.util.LogHelper; import cpw.mods.fml.common.registry.GameRegistry; @@ -26,6 +27,7 @@ public class ModItems { public static Item rockCutter; public static Item lithiumBatpack; public static Item lapotronpack; + public static Item omniTool; public static void init() { @@ -43,6 +45,8 @@ public class ModItems { GameRegistry.registerItem(lithiumBatpack, "lithiumBatpack"); lapotronpack = new ItemLapotronPack(ArmorMaterial.DIAMOND, 7, 1); GameRegistry.registerItem(lapotronpack, "lapotronPack"); + omniTool = new ItemOmniTool(ToolMaterial.EMERALD); + GameRegistry.registerItem(omniTool, "omniTool"); LogHelper.info("TechReborns Items Loaded"); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 4233c188e..7eeea16ab 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -218,7 +218,7 @@ public class ModRecipes { CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots,9,14), "blockPlatinum"); CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots,9,15), "blockNickel"); CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.ingots,9,16), "blockInvar"); - CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.rockCutter), Items.apple); + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.rockCutter,1,27), Items.apple); LogHelper.info("Shapless Recipes Added"); diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java new file mode 100644 index 000000000..41fed9632 --- /dev/null +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -0,0 +1,180 @@ +package techreborn.items.tools; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import techreborn.client.TechRebornCreativeTab; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemPickaxe; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.world.World; +import net.minecraftforge.event.ForgeEventFactory; + +public class ItemOmniTool extends ItemPickaxe implements IElectricItem{ + + public int maxCharge = 20000; + public int cost = 100; + public int hitCost = 125; + + public ItemOmniTool(ToolMaterial toolMaterial) + { + super(toolMaterial); + efficiencyOnProperMaterial = 13F; + setCreativeTab(TechRebornCreativeTab.instance); + setMaxStackSize(1); + setMaxDamage(200); + setUnlocalizedName("techreborn.omniTool"); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) + { + this.itemIcon = iconRegister.registerIcon("techreborn:" + "omnitool"); + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) + { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) + { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true,false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) + { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } + + @Override + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) + { + ElectricItem.manager.use(stack, cost, entityLiving); + return true; + } + + @Override + public boolean canHarvestBlock(Block block, ItemStack stack) + { + return Items.diamond_axe.canHarvestBlock(block, stack) || Items.diamond_sword.canHarvestBlock(block, stack) || Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack) || Items.shears.canHarvestBlock(block, stack); + } + + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta) + { + if (!ElectricItem.manager.canUse(stack, cost)) + { + return 5.0F; + } + + if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F || Items.shears.getDigSpeed(stack, block, meta) > 1.0F) + { + return efficiencyOnProperMaterial; + } else { + return super.getDigSpeed(stack, block, meta); + } + } + + @Override + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) + { + if (ElectricItem.manager.use(itemstack, hitCost, attacker)) + { + entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 8F); + } + return false; + } + + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) + { + for (int i = 0; i < player.inventory.mainInventory.length; i++) { + ItemStack torchStack = player.inventory.mainInventory[i]; + if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) + { + continue; + } + Item item = torchStack.getItem(); + if (!(item instanceof ItemBlock)) + { + continue; + } + int oldMeta = torchStack.getItemDamage(); + int oldSize = torchStack.stackSize; + boolean result = torchStack.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset); + if (player.capabilities.isCreativeMode) + { + torchStack.setItemDamage(oldMeta); + torchStack.stackSize = oldSize; + } else if (torchStack.stackSize <= 0) + { + ForgeEventFactory.onPlayerDestroyItem(player, torchStack); + player.inventory.mainInventory[i] = null; + } + if (result) + { + return true; + } + } + + return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); + } + + @Override + public boolean isRepairable() + { + return false; + } + + @Override + public Item getChargedItem(ItemStack itemStack) + { + return this; + } + + @Override + public Item getEmptyItem(ItemStack itemStack) + { + return this; + } + + @Override + public boolean canProvideEnergy(ItemStack itemStack) + { + return false; + } + + @Override + public double getMaxCharge(ItemStack itemStack) + { + return maxCharge; + } + + @Override + public int getTier(ItemStack itemStack) + { + return 2; + } + + @Override + public double getTransferLimit(ItemStack itemStack) + { + return 200; + } + +} diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 892230ca4..bc6644949 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -149,6 +149,7 @@ item.techreborn.part.BrassMachineHull.name=Brass Machine Hull item.techreborn.rockcutter.name=Rockcutter item.techreborn.lithiumbatpack.name=lithium Batpack item.techreborn.lapotronpack.name=Lapotron Pack +item.techreborn.omniTool=Omni tool From 82a760a56478d5bd8780403cb04f77755f1e1f66 Mon Sep 17 00:00:00 2001 From: Gig Date: Mon, 13 Apr 2015 18:51:39 +0100 Subject: [PATCH 2/4] whoops --- src/main/resources/assets/techreborn/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 80f2563ad..9e7a12044 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -150,7 +150,7 @@ item.techreborn.part.BrassMachineHull.name=Brass Machine Hull item.techreborn.rockcutter.name=Rockcutter item.techreborn.lithiumbatpack.name=lithium Batpack item.techreborn.lapotronpack.name=Lapotron Pack -item.techreborn.omniTool=Omni tool +item.techreborn.omniTool.name=Omni tool From dbb6a9edf2e8b8df3257cfc850dd060a50dd222d Mon Sep 17 00:00:00 2001 From: Gig Date: Mon, 13 Apr 2015 19:08:17 +0100 Subject: [PATCH 3/4] Added advanced drill Added TorchHelper.class --- src/main/java/techreborn/init/ModItems.java | 4 + .../items/tools/ItemAdvancedDrill.java | 140 ++++++++++++++++++ .../techreborn/items/tools/ItemOmniTool.java | 32 +--- .../java/techreborn/util/TorchHelper.java | 36 +++++ .../assets/techreborn/lang/en_US.lang | 1 + 5 files changed, 183 insertions(+), 30 deletions(-) create mode 100644 src/main/java/techreborn/items/tools/ItemAdvancedDrill.java create mode 100644 src/main/java/techreborn/util/TorchHelper.java diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index cd1366fac..3ccdc1cce 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -11,6 +11,7 @@ import techreborn.items.ItemDusts; import techreborn.items.ItemGems; import techreborn.items.ItemIngots; import techreborn.items.ItemParts; +import techreborn.items.tools.ItemAdvancedDrill; import techreborn.items.tools.ItemLapotronPack; import techreborn.items.tools.ItemLithiumBatpack; import techreborn.items.tools.ItemOmniTool; @@ -28,6 +29,7 @@ public class ModItems { public static Item lithiumBatpack; public static Item lapotronpack; public static Item omniTool; + public static Item advancedDrill; public static void init() { @@ -47,6 +49,8 @@ public class ModItems { GameRegistry.registerItem(lapotronpack, "lapotronPack"); omniTool = new ItemOmniTool(ToolMaterial.EMERALD); GameRegistry.registerItem(omniTool, "omniTool"); + advancedDrill = new ItemAdvancedDrill(); + GameRegistry.registerItem(advancedDrill, "advancedDrill"); LogHelper.info("TechReborns Items Loaded"); diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java new file mode 100644 index 000000000..e76dfbb31 --- /dev/null +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -0,0 +1,140 @@ +package techreborn.items.tools; + +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; + +import java.util.List; + +import mcp.mobius.waila.api.impl.ConfigHandler; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemPickaxe; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.event.ForgeEventFactory; +import techreborn.client.TechRebornCreativeTab; +import techreborn.util.TorchHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ItemAdvancedDrill extends ItemPickaxe implements IElectricItem{ + + public int maxCharge = 60000; + public int cost = 250;; + public int tier = 2; + public double transferLimit = 100; + + public ItemAdvancedDrill() + { + super(ToolMaterial.EMERALD); + efficiencyOnProperMaterial = 20F; + setCreativeTab(TechRebornCreativeTab.instance); + setMaxStackSize(1); + setMaxDamage(240); + setUnlocalizedName("techreborn.advancedDrill"); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) + { + this.itemIcon = iconRegister.registerIcon("techreborn:" + "advancedDrill"); + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) + { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) + { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) + { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } + + @Override + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) + { + ElectricItem.manager.use(stack, cost, entityLiving); + return true; + } + + @Override + public boolean canHarvestBlock(Block block, ItemStack stack) { + return Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack); + } + + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (!ElectricItem.manager.canUse(stack, cost)) + { + return 4.0F; + } + + if (Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F) + { + return efficiencyOnProperMaterial; + } else { + return super.getDigSpeed(stack, block, meta); + } + } + + @Override + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1) + { + return true; + } + + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) + { + return TorchHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); + } + + @Override + public boolean isRepairable() { + return false; + } + + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return false; + } + + @Override + public double getMaxCharge(ItemStack itemStack) { + return maxCharge; + } + + @Override + public int getTier(ItemStack itemStack) { + return tier; + } + + @Override + public double getTransferLimit(ItemStack itemStack) { + return transferLimit; + } + + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } + + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } +} diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 41fed9632..6bd670966 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -7,6 +7,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import techreborn.client.TechRebornCreativeTab; +import techreborn.util.TorchHelper; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -103,36 +104,7 @@ public class ItemOmniTool extends ItemPickaxe implements IElectricItem{ @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { - for (int i = 0; i < player.inventory.mainInventory.length; i++) { - ItemStack torchStack = player.inventory.mainInventory[i]; - if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) - { - continue; - } - Item item = torchStack.getItem(); - if (!(item instanceof ItemBlock)) - { - continue; - } - int oldMeta = torchStack.getItemDamage(); - int oldSize = torchStack.stackSize; - boolean result = torchStack.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset); - if (player.capabilities.isCreativeMode) - { - torchStack.setItemDamage(oldMeta); - torchStack.stackSize = oldSize; - } else if (torchStack.stackSize <= 0) - { - ForgeEventFactory.onPlayerDestroyItem(player, torchStack); - player.inventory.mainInventory[i] = null; - } - if (result) - { - return true; - } - } - - return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); + return TorchHelper.placeTorch(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); } @Override diff --git a/src/main/java/techreborn/util/TorchHelper.java b/src/main/java/techreborn/util/TorchHelper.java new file mode 100644 index 000000000..0725e9c30 --- /dev/null +++ b/src/main/java/techreborn/util/TorchHelper.java @@ -0,0 +1,36 @@ +package techreborn.util; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.event.ForgeEventFactory; + +public class TorchHelper { + + public static boolean placeTorch(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) + { + for (int i = 0; i < player.inventory.mainInventory.length; i++) + { + ItemStack torchStack = player.inventory.mainInventory[i]; + if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) continue; + Item item = torchStack.getItem(); + if (!(item instanceof ItemBlock)) continue; + int oldMeta = torchStack.getItemDamage(); + int oldSize = torchStack.stackSize; + boolean result = torchStack.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset); + if (player.capabilities.isCreativeMode) + { + torchStack.setItemDamage(oldMeta); + torchStack.stackSize = oldSize; + } else if (torchStack.stackSize <= 0) + { + ForgeEventFactory.onPlayerDestroyItem(player, torchStack); + player.inventory.mainInventory[i] = null; + } + if (result) return true; + } + return false; + } +} diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 9e7a12044..666469e51 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -151,6 +151,7 @@ item.techreborn.rockcutter.name=Rockcutter item.techreborn.lithiumbatpack.name=lithium Batpack item.techreborn.lapotronpack.name=Lapotron Pack item.techreborn.omniTool.name=Omni tool +item.techreborn.advancedDrill.name=Advanced Drill From 6dec53208eddbcb37bba118aeb5854bbd3e63bfa Mon Sep 17 00:00:00 2001 From: Gig Date: Mon, 13 Apr 2015 19:50:35 +0100 Subject: [PATCH 4/4] More Configs!!!!! --- .../techreborn/config/ConfigTechReborn.java | 25 +++++++++++++++++++ .../items/tools/ItemAdvancedDrill.java | 3 ++- .../items/tools/ItemLapotronPack.java | 3 ++- .../items/tools/ItemLithiumBatpack.java | 5 ++-- .../techreborn/items/tools/ItemOmniTool.java | 3 ++- .../items/tools/ItemRockCutter.java | 3 ++- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index 5d97a5ad3..097eae4ef 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -26,6 +26,11 @@ public class ConfigTechReborn { //Power public static int ThermalGenertaorOutput; + public static int AdvancedDrillCharge; + public static int LapotronPackCharge; + public static int LithiumBatpackCharge; + public static int OmniToolCharge; + public static int RockCutterCharge; //Crafting public static boolean ExpensiveMacerator; @@ -128,6 +133,26 @@ public class ConfigTechReborn { "Thermal Generator Power", 30, "The amount of power that the thermal generator makes for 1mb of lava") .getInt(); + AdvancedDrillCharge = config.get(CATEGORY_POWER, + "Advanced drill max charge", 60000, + "The amount of power that the anvanced drill can hold") + .getInt(); + LapotronPackCharge = config.get(CATEGORY_POWER, + "Lapotron Pack max charge", 100000000, + "The amount of power that the Lapotron Pack can hold") + .getInt(); + LithiumBatpackCharge = config.get(CATEGORY_POWER, + "Lithium Batpack max charge", 4000000, + "The amount of power that the Lithium Batpack can hold") + .getInt(); + OmniToolCharge = config.get(CATEGORY_POWER, + "OmniTool max charge", 20000, + "The amount of power that the OmniTool can hold") + .getInt(); + RockCutterCharge = config.get(CATEGORY_POWER, + "RockCutter max charge", 10000, + "The amount of power that the RockCutter can hold") + .getInt(); //Crafting diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java index e76dfbb31..4aae67934 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -19,13 +19,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; import techreborn.client.TechRebornCreativeTab; +import techreborn.config.ConfigTechReborn; import techreborn.util.TorchHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class ItemAdvancedDrill extends ItemPickaxe implements IElectricItem{ - public int maxCharge = 60000; + public static final int maxCharge = ConfigTechReborn.AdvancedDrillCharge; public int cost = 250;; public int tier = 2; public double transferLimit = 100; diff --git a/src/main/java/techreborn/items/tools/ItemLapotronPack.java b/src/main/java/techreborn/items/tools/ItemLapotronPack.java index b51de64db..80ad1ad34 100644 --- a/src/main/java/techreborn/items/tools/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/tools/ItemLapotronPack.java @@ -7,6 +7,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import techreborn.client.TechRebornCreativeTab; +import techreborn.config.ConfigTechReborn; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -16,7 +17,7 @@ import net.minecraft.item.ItemStack; public class ItemLapotronPack extends ItemArmor implements IElectricItem{ - public int maxCharge = 100000000; + public static final int maxCharge = ConfigTechReborn.LapotronPackCharge; public int tier = 3; public double transferLimit = 100000; diff --git a/src/main/java/techreborn/items/tools/ItemLithiumBatpack.java b/src/main/java/techreborn/items/tools/ItemLithiumBatpack.java index b5b0cee63..4d2ad8776 100644 --- a/src/main/java/techreborn/items/tools/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/tools/ItemLithiumBatpack.java @@ -11,14 +11,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import techreborn.client.TechRebornCreativeTab; +import techreborn.config.ConfigTechReborn; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class ItemLithiumBatpack extends ItemArmor implements IElectricItem{ - public int maxCharge = 40000000; + public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge; public int tier = 3; - public double transferLimit = 100000; + public double transferLimit = 10000; public ItemLithiumBatpack(ArmorMaterial armorMaterial, int par3, int par4) { diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 6bd670966..2878a2c88 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -7,6 +7,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import techreborn.client.TechRebornCreativeTab; +import techreborn.config.ConfigTechReborn; import techreborn.util.TorchHelper; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; @@ -24,7 +25,7 @@ import net.minecraftforge.event.ForgeEventFactory; public class ItemOmniTool extends ItemPickaxe implements IElectricItem{ - public int maxCharge = 20000; + public static final int maxCharge = ConfigTechReborn.OmniToolCharge; public int cost = 100; public int hitCost = 125; diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index e50a36ff6..6c503aa90 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -15,12 +15,13 @@ import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import techreborn.client.TechRebornCreativeTab; +import techreborn.config.ConfigTechReborn; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class ItemRockCutter extends ItemPickaxe implements IElectricItem{ - public int maxCharge = 10000; + public static final int maxCharge = ConfigTechReborn.RockCutterCharge; public int cost = 500; public int tier = 2;