diff --git a/resources/assets/tinker/textures/items/arrow/electric_arrow_effect.png b/resources/assets/tinker/textures/items/arrow/electric_arrow_effect.png deleted file mode 100644 index c69d1d68..00000000 Binary files a/resources/assets/tinker/textures/items/arrow/electric_arrow_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/axe/electric_axe_effect.png b/resources/assets/tinker/textures/items/axe/electric_axe_effect.png deleted file mode 100644 index 01d1caeb..00000000 Binary files a/resources/assets/tinker/textures/items/axe/electric_axe_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/battleaxe/electric_battleaxe_effect.png b/resources/assets/tinker/textures/items/battleaxe/electric_battleaxe_effect.png deleted file mode 100644 index 2a7854b2..00000000 Binary files a/resources/assets/tinker/textures/items/battleaxe/electric_battleaxe_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/battlesign/electric_battlesign_effect.png b/resources/assets/tinker/textures/items/battlesign/electric_battlesign_effect.png deleted file mode 100644 index b7bb3e3e..00000000 Binary files a/resources/assets/tinker/textures/items/battlesign/electric_battlesign_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/broadsword/electric_sword_effect.png b/resources/assets/tinker/textures/items/broadsword/electric_sword_effect.png deleted file mode 100644 index 189434d7..00000000 Binary files a/resources/assets/tinker/textures/items/broadsword/electric_sword_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/chisel/electric_chisel_effect.png b/resources/assets/tinker/textures/items/chisel/electric_chisel_effect.png deleted file mode 100644 index 75738d43..00000000 Binary files a/resources/assets/tinker/textures/items/chisel/electric_chisel_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/cleaver/electric_cleaver_effect.png b/resources/assets/tinker/textures/items/cleaver/electric_cleaver_effect.png deleted file mode 100644 index 3ac31578..00000000 Binary files a/resources/assets/tinker/textures/items/cleaver/electric_cleaver_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/cutlass/electric_cutlass_effect.png b/resources/assets/tinker/textures/items/cutlass/electric_cutlass_effect.png deleted file mode 100644 index ee31bf4d..00000000 Binary files a/resources/assets/tinker/textures/items/cutlass/electric_cutlass_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/dagger/electric_dagger_effect.png b/resources/assets/tinker/textures/items/dagger/electric_dagger_effect.png deleted file mode 100644 index 4bbeec8d..00000000 Binary files a/resources/assets/tinker/textures/items/dagger/electric_dagger_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/excavator/electric_excavator_effect.png b/resources/assets/tinker/textures/items/excavator/electric_excavator_effect.png deleted file mode 100644 index 3500b50e..00000000 Binary files a/resources/assets/tinker/textures/items/excavator/electric_excavator_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/frypan/electric_frypan_effect.png b/resources/assets/tinker/textures/items/frypan/electric_frypan_effect.png deleted file mode 100644 index bad24664..00000000 Binary files a/resources/assets/tinker/textures/items/frypan/electric_frypan_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/hammer/electric_hammer_effect.png b/resources/assets/tinker/textures/items/hammer/electric_hammer_effect.png deleted file mode 100644 index 5a706d37..00000000 Binary files a/resources/assets/tinker/textures/items/hammer/electric_hammer_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/longsword/electric_longsword_effect.png b/resources/assets/tinker/textures/items/longsword/electric_longsword_effect.png deleted file mode 100644 index 6b72e0a3..00000000 Binary files a/resources/assets/tinker/textures/items/longsword/electric_longsword_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/lumberaxe/electric_lumberaxe_effect.png b/resources/assets/tinker/textures/items/lumberaxe/electric_lumberaxe_effect.png deleted file mode 100644 index 52c0f79a..00000000 Binary files a/resources/assets/tinker/textures/items/lumberaxe/electric_lumberaxe_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/mattock/electric_mattock_effect.png b/resources/assets/tinker/textures/items/mattock/electric_mattock_effect.png deleted file mode 100644 index 03c4a674..00000000 Binary files a/resources/assets/tinker/textures/items/mattock/electric_mattock_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/pickaxe/electric_pickaxe_effect.png b/resources/assets/tinker/textures/items/pickaxe/electric_pickaxe_effect.png deleted file mode 100644 index 03c4a674..00000000 Binary files a/resources/assets/tinker/textures/items/pickaxe/electric_pickaxe_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/pickmattock/electric_pickmattock_effect.png b/resources/assets/tinker/textures/items/pickmattock/electric_pickmattock_effect.png deleted file mode 100644 index 03c4a674..00000000 Binary files a/resources/assets/tinker/textures/items/pickmattock/electric_pickmattock_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/rapier/electric_rapier_effect.png b/resources/assets/tinker/textures/items/rapier/electric_rapier_effect.png deleted file mode 100644 index 45448b79..00000000 Binary files a/resources/assets/tinker/textures/items/rapier/electric_rapier_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/scythe/electric_scythe_effect.png b/resources/assets/tinker/textures/items/scythe/electric_scythe_effect.png deleted file mode 100644 index f2199f51..00000000 Binary files a/resources/assets/tinker/textures/items/scythe/electric_scythe_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect.png b/resources/assets/tinker/textures/items/shortbow/electric_bow_effect.png deleted file mode 100644 index 89bc383f..00000000 Binary files a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_1.png b/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_1.png deleted file mode 100644 index 89bc383f..00000000 Binary files a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_1.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_2.png b/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_2.png deleted file mode 100644 index 89bc383f..00000000 Binary files a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_2.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_3.png b/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_3.png deleted file mode 100644 index 41acfc3e..00000000 Binary files a/resources/assets/tinker/textures/items/shortbow/electric_bow_effect_3.png and /dev/null differ diff --git a/resources/assets/tinker/textures/items/shovel/electric_shovel_effect.png b/resources/assets/tinker/textures/items/shovel/electric_shovel_effect.png deleted file mode 100644 index 772f952c..00000000 Binary files a/resources/assets/tinker/textures/items/shovel/electric_shovel_effect.png and /dev/null differ diff --git a/src/api/java/ic2/api/item/IBoxable.java b/src/api/java/ic2/api/item/IBoxable.java deleted file mode 100644 index 6214662c..00000000 --- a/src/api/java/ic2/api/item/IBoxable.java +++ /dev/null @@ -1,14 +0,0 @@ -package ic2.api.item; - -import net.minecraft.item.ItemStack; - -public interface IBoxable -{ - /** - * Determine whether an item can be stored in a toolbox or not. - * - * @param itemstack item to be stored - * @return Whether to store the item in the toolbox or not - */ - public abstract boolean canBeStoredInToolbox (ItemStack itemstack); -} diff --git a/src/api/java/ic2/api/item/ICustomElectricItem.java b/src/api/java/ic2/api/item/ICustomElectricItem.java deleted file mode 100644 index a65b4b29..00000000 --- a/src/api/java/ic2/api/item/ICustomElectricItem.java +++ /dev/null @@ -1,68 +0,0 @@ -package ic2.api.item; - -import net.minecraft.item.ItemStack; - -/** - * Provides the ability to store energy on the implementing item. - * - * This interface is a special version of IElectricItem which delegates the implementation of - * charge(), discharge() and canUse() to the implementing Item. - * - * The default implementation (when not using ICustomElectricItem) does the following: - * - store and retrieve the charge - * - handle charging, taking amount, tier, transfer limit, canProvideEnergy and simulate into account - * - replace item IDs if appropriate (getChargedItemId() and getEmptyItemId()) - * - update and manage the damage value for the visual charge indicator - * - * @note ICustomElectricItem must not call the ElectricItem methods charge, discharge or canUse - * - * @deprecated Use ISpecialElectricItem instead. - */ -@Deprecated -public interface ICustomElectricItem extends IElectricItem -{ - /** - * Charge an item with a specified amount of energy - * - * @param itemStack electric item's stack - * @param amount amount of energy to charge in EU - * @param tier tier of the charging device, has to be at least as high as the item to charge - * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit() - * @param simulate don't actually change the item, just determine the return value - * @return Energy transferred into the electric item - */ - public int charge (ItemStack itemStack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate); - - /** - * Discharge an item by a specified amount of energy - * - * @param itemStack electric item's stack - * @param amount amount of energy to charge in EU - * @param tier tier of the discharging device, has to be at least as high as the item to discharge - * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit() - * @param simulate don't actually discharge the item, just determine the return value - * @return Energy retrieved from the electric item - */ - public int discharge (ItemStack itemStack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate); - - /** - * Determine if the specified electric item has at least a specific amount of EU. - * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item. - * BatPacks are not taken into account. - * - * @param itemStack electric item's stack - * @param amount minimum amount of energy required - * @return true if there's enough energy - */ - public boolean canUse (ItemStack itemStack, int amount); - - /** - * Determine whether to show the charge tool tip with NEI or other means. - * - * Return false if IC2's handler is incompatible, you want to implement your own or you don't - * want to display the charge at all. - * - * @return true to show the tool tip (x/y EU) - */ - public boolean canShowChargeToolTip (ItemStack itemStack); -} diff --git a/src/api/java/ic2/api/item/IElectricItem.java b/src/api/java/ic2/api/item/IElectricItem.java deleted file mode 100644 index 2b7fcce7..00000000 --- a/src/api/java/ic2/api/item/IElectricItem.java +++ /dev/null @@ -1,54 +0,0 @@ -package ic2.api.item; - -import net.minecraft.item.ItemStack; - -/** - * Provides the ability to store energy on the implementing item. - * - * The item should have a maximum damage of 13. - */ -public interface IElectricItem -{ - /** - * Determine if the item can be used in a machine or as an armor part to supply energy. - * - * @return Whether the item can supply energy - */ - boolean canProvideEnergy (ItemStack itemStack); - - /** - * Get the item ID to use for a charge energy greater than 0. - * - * @return Item ID to use - */ - int getChargedItemId (ItemStack itemStack); - - /** - * Get the item ID to use for a charge energy of 0. - * - * @return Item ID to use - */ - int getEmptyItemId (ItemStack itemStack); - - /** - * Get the item's maximum charge energy in EU. - * - * @return Maximum charge energy - */ - int getMaxCharge (ItemStack itemStack); - - /** - * Get the item's tier, lower tiers can't send energy to higher ones. - * Batteries are Tier 1, Energy Crystals are Tier 2, Lapotron Crystals are Tier 3. - * - * @return Item's tier - */ - int getTier (ItemStack itemStack); - - /** - * Get the item's transfer limit in EU per transfer operation. - * - * @return Transfer limit - */ - int getTransferLimit (ItemStack itemStack); -} diff --git a/src/api/java/ic2/api/item/IElectricItemManager.java b/src/api/java/ic2/api/item/IElectricItemManager.java deleted file mode 100644 index cdfb49e5..00000000 --- a/src/api/java/ic2/api/item/IElectricItemManager.java +++ /dev/null @@ -1,93 +0,0 @@ -package ic2.api.item; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; - -/** - * This interface specifies a manager to handle the various tasks for electric items. - * - * The default implementation does the following: - * - store and retrieve the charge - * - handle charging, taking amount, tier, transfer limit, canProvideEnergy and simulate into account - * - replace item IDs if appropriate (getChargedItemId() and getEmptyItemId()) - * - update and manage the damage value for the visual charge indicator - * - * @note If you're implementing your own variant (ISpecialElectricItem), you can delegate to the - * default implementations through ElectricItem.rawManager. The default implementation is designed - * to minimize its dependency on its own constraints/structure and delegates most work back to the - * more atomic features in the gateway manager. - */ -public interface IElectricItemManager -{ - /** - * Charge an item with a specified amount of energy - * - * @param itemStack electric item's stack - * @param amount amount of energy to charge in EU - * @param tier tier of the charging device, has to be at least as high as the item to charge - * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit() - * @param simulate don't actually change the item, just determine the return value - * @return Energy transferred into the electric item - */ - int charge (ItemStack itemStack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate); - - /** - * Discharge an item by a specified amount of energy - * - * @param itemStack electric item's stack - * @param amount amount of energy to charge in EU - * @param tier tier of the discharging device, has to be at least as high as the item to discharge - * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit() - * @param simulate don't actually discharge the item, just determine the return value - * @return Energy retrieved from the electric item - */ - int discharge (ItemStack itemStack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate); - - /** - * Determine the charge level for the specified item - * - * @param itemStack ItemStack containing the electric item - * @return charge level in EU - */ - int getCharge (ItemStack itemStack); - - /** - * Determine if the specified electric item has at least a specific amount of EU. - * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item. - * BatPacks are not taken into account. - * - * @param itemStack electric item's stack - * @param amount minimum amount of energy required - * @return true if there's enough energy - */ - boolean canUse (ItemStack itemStack, int amount); - - /** - * Try to retrieve a specific amount of energy from an Item, and if applicable, a BatPack. - * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item. - * - * @param itemStack electric item's stack - * @param amount amount of energy to discharge in EU - * @param entity entity holding the item - * @return true if the operation succeeded - */ - boolean use (ItemStack itemStack, int amount, EntityLivingBase entity); - - /** - * Charge an item from the BatPack a player is wearing. - * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item. - * use() already contains this functionality. - * - * @param itemStack electric item's stack - * @param entity entity holding the item - */ - void chargeFromArmor (ItemStack itemStack, EntityLivingBase entity); - - /** - * Get the tool tip to display for electric items. - * - * @param itemStack ItemStack to determine the tooltip for - * @return tool tip string or null for none - */ - String getToolTip (ItemStack itemStack); -} diff --git a/src/api/java/ic2/api/item/ISpecialElectricItem.java b/src/api/java/ic2/api/item/ISpecialElectricItem.java deleted file mode 100644 index 86916eef..00000000 --- a/src/api/java/ic2/api/item/ISpecialElectricItem.java +++ /dev/null @@ -1,14 +0,0 @@ -package ic2.api.item; - -import net.minecraft.item.ItemStack; - -public interface ISpecialElectricItem extends IElectricItem -{ - /** - * Supply a custom IElectricItemManager. - * - * @param itemStack ItemStack to get the manager for - * @return IElectricItemManager instance - */ - IElectricItemManager getManager (ItemStack itemStack); -} diff --git a/src/api/java/ic2/api/item/Items.java b/src/api/java/ic2/api/item/Items.java deleted file mode 100644 index 1b7ed558..00000000 --- a/src/api/java/ic2/api/item/Items.java +++ /dev/null @@ -1,609 +0,0 @@ -package ic2.api.item; - -import net.minecraft.item.ItemStack; - -/** - * Provides access to IC2 blocks and items. - * - * Some items can be acquired through the ore dictionary which is the recommended way. - * The items are initialized while IC2 is being loaded - try to use ModsLoaded() or load your mod after IC2. - * Some blocks/items can be disabled by a config setting, so it's recommended to check if they're null first. - * - * Getting the associated Block/Item for an ItemStack x: - * Blocks: Block.blocksList[x.itemID] - * Items: x.getItem() - */ -public final class Items -{ - /** - * Get an ItemStack for a specific item name, example: Items.getItem("resin") - * See the list below for item names. - * Make sure to copy() the ItemStack if you want to modify it. - * - * @param name item name - * @return The item or null if the item does not exist or an error occurred - */ - public static ItemStack getItem (String name) - { - try - { - if (Ic2Items == null) - Ic2Items = Class.forName(getPackage() + ".core.Ic2Items"); - - Object ret = Ic2Items.getField(name).get(null); - - if (ret instanceof ItemStack) - { - return (ItemStack) ret; - } - else - { - return null; - } - } - catch (Exception e) - { - System.out.println("IC2 API: Call getItem failed for " + name); - - return null; - } - } - - /* Possible values: - - // ores - copperOre; // Copper Ore block, currently not meta sensitive, meta in ItemStack set to 0, ore dictionary: oreCopper, null with enableWorldGenOreCopper=false - tinOre; // Tin Ore block, currently not meta sensitive, meta in ItemStack set to 0, ore dictionary: oreTin, null with enableWorldGenOreTin=false - uraniumOre; // Tin Ore block, currently not meta sensitive, meta in ItemStack set to 0, ore dictionary: oreUranium, null with enableWorldGenOreUranium=false - leadOre; // Lead Ore Block, currently not meta sensitive, meta in ItemStack set to 0, ore dictionary: oreLead, null with enableWorldGenOreLead=false - - // rubber related - - Rubber wood block, meta reflects the state, meta in ItemStack set to 0, ore dictionary: woodRubber (with meta 0), null with enableWorldGenTreeRubber=false - dropped (as an item) -> metadata 0 - block, no resin spot -> metadata 0 or 1 - block, wet resin spot -> metadata 2-5 (according to the side) - block, dry resin spot -> metadata 8-11 (wet state + 6) - - rubberWood; - rubberLeaves; // Rubber Leaves block, currently not meta sensitive, meta in ItemStack set to 0, null with enableWorldGenTreeRubber=false - rubberSapling; // Rubber Sapling block, currently not meta sensitive, meta in ItemStack set to 0, null with enableWorldGenTreeRubber=false - resinSheet; // Resin Sheet block, currently not meta sensitive - rubberTrampoline; // Rubber Trampoline block, meta reflects internal state, meta in ItemStack set to 0 - - // building/storage - ironFence; // Iron Fence block, currently not meta sensitive - - reinforcedStone; // Reinforced Stone block, currently not meta sensitive - reinforcedGlass; // Reinforced Glass block, currently not meta sensitive - reinforcedDoorBlock; // Reinforced Door block, meta reflects the state (see vanilla doors), meta in ItemStack set to 0 - - constructionreinforcedFoam; // Construction Reinforced Foam block, currently not meta sensitive - constructionFoam; // Construction Foam block, currently not meta sensitive - constructionFoamWall; // Construction Foam Wall block, meta = color, implements IPaintableBlock - scaffold; // Scaffold block, meta reflects internal physical model data - ironScaffold; // Scaffold block, meta reflects internal physical model data - - bronzeBlock; // Bronze block, meta sensitive - copperBlock; // Copper block, meta sensitive - tinBlock; // Tin block, meta sensitive - uraniumBlock; // Uranium block, meta sensitive - leadBlock; // Uranium block, meta sensitive - - // cables (when placed as a block, inventory items are different; TE implements IEnergyConductor) - - copperCableBlock; // Copper Cable block, meta sensitive - insulatedCopperCableBlock; // Insulated Copper Cable block, meta sensitive - - goldCableBlock; // Gold Cable block, meta sensitive - insulatedGoldCableBlock; // Insulated Gold Cable block, meta sensitive - doubleInsulatedGoldCableBlock; // Double Insulated Gold Cable block, meta sensitive - - ironCableBlock; // Iron Cable block, meta sensitive - insulatedIronCableBlock; // Insulated Iron Cable block, meta sensitive - doubleInsulatedIronCableBlock; // Double Insulated Iron Cable block, meta sensitive - trippleInsulatedIronCableBlock; // Tripple Insulated Iron Cable block, meta sensitive - - glassFiberCableBlock; // Glass Fiber Cable block, meta sensitive - - tinCableBlock; // Tin Cable block, meta sensitive - insulatedtinCableBlock; // Insulated Tin Cable item, meta sensitive - detectorCableBlock; // Detector Cable block, meta sensitive - splitterCableBlock; // Splitter Cable block, meta sensitive - - // generators + related (TE implements IEnergySource ex. reactorChamber) - - generator; // Generator block, meta sensitive - geothermalGenerator; // Geothermal Generator block, meta sensitive - waterMill; // Water Mill block, meta sensitive - solarPanel; // Solar Panel block, meta sensitive - windMill; // Wind Mill block, meta sensitive - nuclearReactor; // Nuclear Reactor block, meta sensitive - reactorChamber; // Reactor Chamber block, currently not meta sensitive - RTGenerator; // Radioisotope Thermoelectric Generator block, meta sensitive - semifluidGenerator; // Semifluid Generator block, meta sensitive - - - // energy storages (TE implements IEnergySource and IEnergyConductor) - - batBox; // BatBox block, meta sensitive - cesuUnit; // CESU Unit block, meta sensitive - mfeUnit; // MFE Unit block, meta sensitive - mfsUnit; // MFS Unit block, meta sensitive - - // transformers (TE implements IEnergySource and IEnergyConductor) - - lvTransformer; // LV Transformer block, meta sensitive - mvTransformer; // MV Transformer block, meta sensitive - hvTransformer; // HV Transformer block, meta sensitive - evTransformer; // EV Transformer block, meta sensitive - - // machines + related (TE implements IEnergySink ex. machine, miningPipe, miningPipeTip) - - machine; // Machine block, meta sensitive - advancedMachine; // Advanced Machine block, meta sensitive - - ironFurnace; // Iron Furnace block, meta sensitive - electroFurnace; // Electro Furnace block, meta sensitive - macerator; // Macerator block, meta sensitive - extractor; // Extractor block, meta sensitive - compressor; // Compressor block, meta sensitive - canner; // Canner block, meta sensitive - miner; // Miner block, meta sensitive - pump; // Pump block, meta sensitive - magnetizer; // Magnetizer block, meta sensitive - electrolyzer; // Electrolyzer block, meta sensitive - recycler; // Recycler block, meta sensitive - inductionFurnace; // Induction Furnace block, meta sensitive - massFabricator; // Mass Fabricator block, meta sensitive - terraformer; // Terraformer block, meta sensitive - teleporter; // Teleporter block, meta sensitive - teslaCoil; // Tesla Coil block, meta sensitive - luminator; // Passive (dark) Luminator block, meta = facing - activeLuminator; // Active (bright) Luminator block, meta = facing - centrifuge; // Centrifuge block, meta sensitive - metalformer; // MetalFormer block ,meta sensitive - orewashingplant; // Ore Wasching Plant,Meta sensitive - patternstorage; // Pattern Storage,Meta sensitive - scanner; // Scanner,Meta sensitive - replicator; // Replicator,Meta sensitive - - miningPipe; // Mining Pipe block, currently not meta sensitive, meta in ItemStack set to 0 - miningPipeTip; // Mining Pipe Tip block, currently not meta sensitive, meta in ItemStack set to 0 - - - // personal blocks - - personalSafe; // Personal Safe block, meta sensitive - tradeOMat; // Trade-O-Mat block, meta sensitive - energyOMat; // Energy-O-Mat block, meta sensitive - - // explosives - - industrialTnt; // Industrial TNT block, currently not meta sensitive - nuke; // Nuke block, currently not meta sensitive - dynamiteStick; // Dynamite Stick block, meta = placement, meta in ItemStack set to 0 - dynamiteStickWithRemote; // Dynamite Stick with Remote block, meta = placement, meta in ItemStack set to 0 - - // Agriculture Stuff - - crop; // Crop Block, empty, not meta sensitive - cropmatron; // Cropmatron machien block, meta sensititve - - // ----- items ----- - - // rubber + related - resin; // Resin item, currently not meta sensitive - rubber; // Rubber item, currently not meta sensitive, ore dictionary: itemRubber - - FluidCell; - - // Lithium -> Tritium - - reactorLithiumCell; // LithiumCell use in Reaktor, , meta = damage value - TritiumCell; // Tritium, currently not meta sensitive - - // Nuclear Fuel - - UranFuel; // , currently not meta sensitive - MOXFuel; // , currently not meta sensitive - Plutonium; // , currently not meta sensitive - smallPlutonium; // , currently not meta sensitive - Uran235; // , currently not meta sensitive - smallUran235; // , currently not meta sensitive - Uran238; // , currently not meta sensitive - - reactorDepletedUraniumSimple; // Depleted Uranium Cell items, currently not meta sensitive - reactorDepletedUraniumDual; - reactorDepletedUraniumQuad; - reactorDepletedMOXSimple; // Depleted MOX Cell items, currently not meta sensitive - reactorDepletedMOXDual; - reactorDepletedMOXQuad; - reactorMOXSimple; // Depleted MOX Cell items, currently not meta sensitive - reactorMOXDual; - reactorMOXQuad; - RTGPellets; - - - // Recipe Parts - - coil; // Coil, meta sensitive - elemotor; // electric motor, meta sensitive - powerunit; // Item Power Unit, meta sensitive - powerunitsmall; // Item Power Unit, meta sensitive - - - // ItemCasing - - casingcopper; // Copper ItemCasing, meta sensitive - casingtin; // Tin ItemCasing, meta sensitive - casingbronze; // Bronze ItemCasing, meta sensitive - casinggold; // Gold ItemCasing, meta sensitive - casingiron; // Iron ItemCasing, meta sensitive - @Deprecated - casingadviron; // Refined Iron ItemCasing, meta sensitive - casinglead; // Lead ItemCasing, meta sensitive - - // Crushed Ore - crushedIronOre; // Crushed Iron Ore, meta sensitive - crushedCopperOre; // Crushed Copper Ore, meta sensitive - crushedGoldOre; // Crushed Gold Ore, meta sensitive - crushedTinOre; // Crushed Tin Ore, meta sensitive - crushedUraniumOre; // Crushed Uranium Ore, meta sensitive - crushedSilverOre; // Crushed Silver Ore, meta sensitive - crushedLeadOre; // Crushed Lead Ore, meta sensitive - - - //Purify Crushed Ore - purifiedCrushedIronOre; // Purify Crushed Iron Ore, meta sensitive - purifiedCrushedCopperOre; // Purify Crushed Copper Ore, meta sensitive - purifiedCrushedGoldOre; // Purify Crushed Gold Ore, meta sensitive - purifiedCrushedTinOre; // Purify Crushed Tin Ore, meta sensitive - purifiedCrushedUraniumOre; // Purify Crushed Uranium Ore, meta sensitive - purifiedCrushedSilverOre; // Purify Crushed Silver Ore, meta sensitive - purifiedCrushedLeadOre; // Purify Crushed Lead Ore, meta sensitive - - // dusts - stoneDust; - bronzeDust; // Bronze Dust item, meta sensitive, ore dictionary: dustBronze - clayDust; // Clay Dust item, meta sensitive, ore dictionary: dustClay - coalDust; // Coal Dust item, meta sensitive, ore dictionary: dustCoal - copperDust; // Copper Dust item, meta sensitive, ore dictionary: dustCopper - goldDust; // Gold Dust item, meta sensitive, ore dictionary: dustGold - ironDust; // Iron Dust item, meta sensitive, ore dictionary: dustIron - silverDust; // Silver Dust item, meta sensitive, ore dictionary: dustSilver - tinDust; // Tin Dust item, meta sensitive, ore dictionary: dustTin - hydratedCoalDust; // Hydrated Coal Dust item, meta sensitive - leadDust; // Lead Dust item, meta sensitive, ore dictionary: dustLead - obsidianDust; // Obsidian Dust item, meta sensitive, ore dictionary: dustObsidian - lapiDust; // Lapi Dust item, meta sensitive, ore dictionary: dustLapi - sulfurDust; // Sulfur Dust item, meta sensitive, ore dictionary: dustSulfur - lithiumDust; // Lithium dust, meta sensitive, ore dictionary: dustLithium - - // small dusts - - smallIronDust; // Small Iron Dust item, meta sensitive - smallCopperDust; // Small Copper Dust item, meta sensitive - smallGoldDust; // Small Gold Dust item, meta sensitive - smallTinDust; // Small Tin Dust item, meta sensitive - smallSilverDust; // Small Silver Dust item, meta sensitive - smallLeadDust; // Small Lead Dust item, meta sensitive - smallSulfurDust; // Small Sulfur Dust item, meta sensitive - smallLithiumDust; // Small Lithium Dust item, meta sensitive - - - // ingots - @Deprecated - refinedIronIngot; // Refined Iron Ingot item, currently not meta sensitive, ore dictionary: ingotRefinedIron - copperIngot; // Copper Ingot item, currently not meta sensitive, ore dictionary: ingotCopper - tinIngot; // Tin Ingot item, currently not meta sensitive, ore dictionary: ingotTin - bronzeIngot; // Bronze Ingot item, currently not meta sensitive, ore dictionary: ingotBronze - mixedMetalIngot; // Mixed Metal Ingot item, currently not meta sensitive - leadIngot; // Lead Ingot item, currently not meta sensitive - - - // tools/weapons (without electric tools) - treetap; // Treetap item, meta = damage value - wrench; // Wrench item, meta = damage value - cutter; // Insulation Cutter item, meta = damage value - constructionFoamSprayer; // Construction Foam Sprayer item, meta = charges (as of v1.45) - - bronzePickaxe; // Bronze Pickaxe item, meta = damage value - bronzeAxe; // Bronze Axe item, meta = damage value - bronzeSword; // Bronze Sword item, meta = damage value - bronzeShovel; // Bronze Shovel item, meta = damage value - bronzeHoe; // Bronze Hoe item, meta = damage value - - ForgeHammer; // Refine Iron Hammer item, meta = damage value - - // el. tools/devices/weapons - miningDrill; // Mining Drill item, meta = damage value for charge level - diamondDrill; // Diamond Tipped Mining Drill item, meta = damage value for charge level - chainsaw; // Chainsaw item, meta = damage value for charge level - electricWrench; // Electric Wrench item, meta = damage value for charge level - electricTreetap; // Electric Treetap item, meta = damage value for charge level - miningLaser; // Mining Laser item, meta = damage value for charge level - - ecMeter; // EC-Mater item, meta = itemdata db index (as of v1.45) - odScanner; // Ore Density Scanner item, meta = damage value for charge level - ovScanner; // Ore Value Scanner item, meta = damage value for charge level - obscurator; // Obscurator item, meta = damage value for charge level - - frequencyTransmitter; // Frequency Transmitter item, meta = itemdata db index (as of v1.45) - - nanoSaber; // Idle Nano Saber item, meta = damage value for charge level - enabledNanoSaber; // Enabled Nano Saber item, meta = damage value for charge level - - toolbox; // Open/Empty toolbox, meta = Open (0) / Closed (1) - - // armor/wearable - hazmatHelmet; // Hazmat Helmet item, meta = damage value - hazmatChestplate; // Hazmat Chestplate item, meta = damage value - hazmatLeggings; // Hazmat Leggings item, meta = damage value - hazmatBoots; // Hazmat Boots item, meta = damage value - - bronzeHelmet; // Bronze Helmet Armor item, meta = damage value - bronzeChestplate; // Bronze Chestplate Armor item, meta = damage value - bronzeLeggings; // Bronze Leggings Armor item, meta = damage value - bronzeBoots; // Bronze Boots Armor item, meta = damage value - - compositeArmor; // Composite Armor item, meta = damage value for charge level - - nanoHelmet; // Nano Helmet Armor item, meta = damage value for charge level - nanoBodyarmor; // Nano Bodyarmor item, meta = damage value for charge level - nanoLeggings; // Nano Leggings Armor item, meta = damage value for charge level - nanoBoots; // Nano Boots Armor item, meta = damage value for charge level - - quantumHelmet; // Quantum Helmet Armor item, meta = damage value for charge level - quantumBodyarmor; // Quantum Bodyarmor item, meta = damage value for charge level - quantumLeggings; // Quantum Leggings Armor item, meta = damage value for charge level - quantumBoots; // Quantum Boots Armor item, meta = damage value for charge level - - jetpack; // Jetpack item, meta = damage value for fuel level - electricJetpack; // Electric Jetpack item, meta = damage value for charge level - - batPack; // BatPack item, meta = damage value for charge level - advbatPack; // Adv.BatPack item, meta = damage value for charge level - lapPack; // LapPack item, meta = damage value for charge level - energyPack; // EnergyPack item, meta = damage value for charge level - - cfPack; // CF Pack item, meta = charges (as of v1.45) - solarHelmet; // Solar Helmet, currently not meta sensitive - staticBoots; // Static Boots, currently not meta sensitive - nightvisionGoggles; // Nightvision Goggles, meta = damage value for charge level - - // batteries - reBattery; // Empty RE Battery item, currently not meta sensitive - chargedReBattery; // RE Battery item, meta = damage value for charge level - advBattery; // Adv Batteryitem, meta = damage value for charge level - energyCrystal; // Energy Crystal item, meta = damage value for charge level - lapotronCrystal; // Lapotron Crystal item, meta = damage value for charge level - suBattery; // SU Battery item, meta = damage value for charge level - - // cables - copperCableItem; // Copper Cable item, meta sensitive - insulatedCopperCableItem; // Insulated Copper Cable item, meta sensitive - - goldCableItem; // Gold Cable item, meta sensitive - insulatedGoldCableItem; // Insulated Gold Cable item, meta sensitive - - @Deprecated - doubleInsulatedGoldCableItem; // Double Insulated Gold Cable item, meta sensitive - - ironCableItem; // Iron Cable item, meta sensitive - insulatedIronCableItem; // Insulated Iron Cable item, meta sensitive - - @Deprecated - doubleInsulatedIronCableItem; // Double Insulated Iron Cable item, meta sensitive - @Deprecated - trippleInsulatedIronCableItem; // Tripple Insulated Iron Cable item, meta sensitive - insulatedTinCableItem; - glassFiberCableItem; // Glass Fiber Cable item, meta sensitive - tinCableItem; // Tin Cable item, meta sensitive - - - detectorCableItem; // Detector Cable item, meta sensitive - splitterCableItem; // Splitter Cable item, meta sensitive - - // cells/containers (without reactor components) - - cell; // Empty Cell item, meta sensitive - lavaCell; // Lava Cell item, meta sensitive - waterCell; // Water Cell item, meta sensitive - UuMatterCell; // UUMatter Cell item, meta sensitive - CFCell; // constructionFoam Cell item, meta sensitive - - - fuelRod; // Empy Fuel Rod item, currently not meta sensitive - hydratedCoalCell; // Hydrated Coal Cell item, currently not meta sensitive - bioCell; // Bio Cell item, currently not meta sensitive - coalfuelCell; // Coalfuel Cell item, currently not meta sensitive - biofuelCell; // Biofuel Cell item, currently not meta sensitive - electrolyzedWaterCell; // Electrolyzed Water Cell item, currently not meta sensitive - airCell; // Compressed Air item, currently not meta sensitive - - fuelCan; // Empty Fuel Can item, currently not meta sensitive - filledFuelCan; // Fuel Can item, meta = fuel value (as of v1.45) - - tinCan; // Empty Tin Can item, currently not meta sensitive - filledTinCan; // Filled Tin Can item, currently not meta sensitive - - // reactor components - reactorUraniumSimple; // Uranium Cell items, meta = consumed uranium ticks - reactorUraniumDual; - reactorUraniumQuad; - - reactorCoolantSimple; - reactorCoolantTriple ; // Coolant Cell item, NBT for heat-storage, meta is 0-10000 for display - reactorCoolantSix; - - reactorPlating; // Integrated Reactor Plating item, currently not meta sensitive - reactorPlatingHeat; - reactorPlatingExplosive; - - reactorHeatSwitch; // Integrated Heat Disperser item, NBT for heat-storage, meta is 0-10000 for display - reactorHeatSwitchCore; - reactorHeatSwitchSpread; - reactorHeatSwitchDiamond; - - reactorVent; // Heat Venting component, NBT for heat-storage, meta is 0-10000 for display - reactorVentCore; - reactorVentGold; - reactorVentSpread;// Special: Does not store heat - reactorVentDiamond; - - reactorReflector; // Increase efficiency without additional ticks, NBT for heat-storage, meta is 0-10000 for display - reactorReflectorThick; // Increase efficiency without additional ticks, NBT for heat-storage, meta is 0-10000 for display - reactorCondensator; // Consumes redstone to absorb heat, NBT for storage, meta is 0-10000 for display - reactorCondensatorLap; // Consumes redstone/lapis to absorb heat, mNBT for storage, meta is 0-10000 for display - - // terraformer blueprints - terraformerBlueprint; // Empty Terraformer Blueprint item, currently not meta sensitive - cultivationTerraformerBlueprint; // Cultivation Terraformer Blueprint item, currently not meta sensitive - irrigationTerraformerBlueprint; // Irrigation Terraformer Blueprint item, currently not meta sensitive - chillingTerraformerBlueprint; // Chilling Terraformer Blueprint item, currently not meta sensitive - desertificationTerraformerBlueprint; // Desertification Terraformer Blueprint item, currently not meta sensitive - flatificatorTerraformerBlueprint; // Flatificator Terraformer Blueprint item, currently not meta sensitive - mushroomTerraformerBlueprint; // Mushroom Terraformer Blueprint item, currently not meta sensitive - - // diamond chain - coalBall; // Coal Ball item, currently not meta sensitive - compressedCoalBall; // Compressed Coal Ball item, currently not meta sensitive - coalChunk; // Coal Chunk item, currently not meta sensitive - industrialDiamond; // Industrial Diamond item, currently not meta sensitive, DEPRECATED - - // recycler chain - scrap; // Scrap item, currently not meta sensitive - scrapBox; // Scrap Box item, currently not meta sensitive - - // fuel production chain - hydratedCoalClump; // Hydrated Coal Clump item, currently not meta sensitive - plantBall; // Plant Ball item, currently not meta sensitive - compressedPlantBall; // Compressed Plant Ball item, currently not meta sensitive - - // painting - painter; // Painter item, currently not meta sensitive - - blackPainter; // Black Painter item, meta = damage value - redPainter; // Red Painter item, meta = damage value - greenPainter; // Green Painter item, meta = damage value - brownPainter; // Brown Painter item, meta = damage value - bluePainter; // Blue Painter item, meta = damage value - purplePainter; // Purple Painter item, meta = damage value - cyanPainter; // Cyan Painter item, meta = damage value - lightGreyPainter; // Light Grey Painter item, meta = damage value - darkGreyPainter; // Dark Grey Painter item, meta = damage value - pinkPainter; // Pink Painter item, meta = damage value - limePainter; // Lime Painter item, meta = damage value - yellowPainter; // Yellow Painter item, meta = damage value - cloudPainter; // Cloud Painter item, meta = damage value - magentaPainter; // Magenta Painter item, meta = damage value - orangePainter; // Orange Painter item, meta = damage value - whitePainter; // White Painter item, meta = damage value - - // explosives + related - dynamite; // Throwable Dynamite item, currently not meta sensitive - stickyDynamite; // Throwable Sticky Dynamite item, currently not meta sensitive - - remote; // Dynamite Remote item, currently not meta sensitive - - // misc intermediate recipe ingredients - electronicCircuit; // Electronic Circuit item, currently not meta sensitive - advancedCircuit; // Advanced Circuit item, currently not meta sensitive - - advancedAlloy; // Advanced Alloy item, currently not meta sensitive - - carbonFiber; // Raw Carbon Fiber item, currently not meta sensitive - carbonMesh; // Raw Carbon Mesh item, currently not meta sensitive - carbonPlate; // Carbon Plate item, currently not meta sensitive - - matter; // UUA item, currently not meta sensitive - iridiumOre; // Iridium Ore item, currently not meta sensitive - iridiumPlate; // Iridium Plate item, currently not meta sensitive - - - // Metal Plates - - platecopper; // Metal plate item, meta sensitive - platetin; // Metal plate item, meta sensitive - platebronze; // Metal plate item, meta sensitive - plategold; // Metal plate item, meta sensitive - plateiron; // Metal plate item, meta sensitive - platelead; // Metal plate item, meta sensitive - platelapi; // Metal plate item, meta sensitive - plateobsidian; // Metal plate item, meta sensitive - plateadviron; // Metal plate item, meta sensitive - - // Metal Dense Plates - denseplatecopper; // Metal dense plate item, meta sensitive - denseplatetin; // Metal dense plate item, meta sensitive - denseplatebronze; // Metal dense plate item, meta sensitive - denseplategold; // Metal dense plate item, meta sensitive - denseplateiron; // Metal dense plate item, meta sensitive - @Deprecated - denseplateadviron; // Metal dense plate item, meta sensitive - denseplatelead; // Metal dense plate item, meta sensitive - denseplatelapi; // Metal dense plate item, meta sensitive - denseplateobsidian; // Metal dense plate item, meta sensitive - - - - // upgrade modules - overclockerUpgrade; // overclocker upgrade item, meta sensitive - transformerUpgrade; // transformer upgrade item, meta sensitive - energyStorageUpgrade; // energy storage upgrade item, meta sensitive - ejectorUpgrade; // ejector upgrade item, meta sensitive - - // misc - coin; // Coin item, currently not meta sensitive - reinforcedDoor; // Reinforced Door item, currently not meta sensitive - constructionFoamPowder; // Construction Foam Powder item, currently not meta sensitive - grinPowder; // Poisonous ingrident, currently not meta sensitive - debug; // Debug item, currently not meta sensitive - boatCarbon; // Carbon Fiber Canoe item, meta sensitive - boatRubber; // Rubber Dinghy item, meta sensitive - boatRubberBroken; // Damaged Rubber Dinghy item, meta sensitive - boatElectric; // Electric Boat item, meta sensitive - - //Agriculture - cropSeed; // Crop seeds, stuff stored in NBT, don't use for crafting recipes! - cropnalyzer; // Cropnalyzer handheld device - fertilizer; // Basic IC2Item, used to provide nutrients toCropBlocks - hydratingCell; // Cell used to hydrate Crops, meta = Content, 0= Full, 9999 = Near empty - electricHoe; // Electric Hoe, Metadata indicates charge level - terraWart; // Mystic opposite of NEtherWart, cures StatusEffects, simply consumeable - weedEx; // Spraying can of WEED-EX, meta indicates usages left - - //Boozeception - mugEmpty; // Simple stone mug - coffeeBeans; // Harvested CoffeeBeans - coffeePowder; // Processed Coffee Beans, used to craft drinkable Coffee - mugCoffee; // Mug of Coffee, Meta indicates status 0 = cold, 1 = Normal, 2 = Sugar'd - hops; // Hops, harvested freshly from crop - barrel; // Carried Barrel, metadata encrypts the information about the liquid inside - blockBarrel; // Unobtainable "placed barrel", TileEntity controlling the Fermentation process - mugBooze; // Mug filled with booze, metadata encrypts the information about the liquid inside - - */ - - /** - * Get the base IC2 package name, used internally. - * - * @return IC2 package name, if unable to be determined defaults to ic2 - */ - private static String getPackage () - { - Package pkg = Items.class.getPackage(); - - if (pkg != null) - { - String packageName = pkg.getName(); - - return packageName.substring(0, packageName.length() - ".api.item".length()); - } - - return "ic2"; - } - - private static Class Ic2Items; -} diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index f2bac884..49e015b8 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -261,7 +261,6 @@ public class TContent implements IFuelHandler public static Item oreBerries; //Tool modifiers - public static ModElectric modE; public static ModFlux modF; public static ModLapis modL; @@ -1523,8 +1522,6 @@ public class TContent implements IFuelHandler tb.registerToolMod(new ModDurability(new ItemStack[] { diamond }, 0, 500, 0f, 3, "Diamond", "\u00a7bDurability +500", "\u00a7b")); tb.registerToolMod(new ModDurability(new ItemStack[] { new ItemStack(Item.emerald) }, 1, 0, 0.5f, 2, "Emerald", "\u00a72Durability +50%", "\u00a72")); - modE = new ModElectric(); - tb.registerToolMod(modE); modF = new ModFlux(); tb.registerToolMod(modF); @@ -2246,27 +2243,6 @@ public class TContent implements IFuelHandler { modF.batteries.add(basicCell); } - /* IC2 */ - - //ItemStack reBattery = ic2.api.item.Items.getItem("reBattery"); - Object reBattery = getStaticItem("reBattery", "ic2.core.Ic2Items"); - if (reBattery != null) - { - modE.batteries.add((ItemStack) reBattery); - } - //ItemStack chargedReBattery = ic2.api.item.Items.getItem("chargedReBattery"); - Object chargedReBattery = getStaticItem("chargedReBattery", "ic2.core.Ic2Items"); - if (chargedReBattery != null) - { - modE.batteries.add((ItemStack) chargedReBattery); - } - //ItemStack electronicCircuit = ic2.api.item.Items.getItem("electronicCircuit"); - Object electronicCircuit = getStaticItem("electronicCircuit", "ic2.core.Ic2Items"); - if (electronicCircuit != null) - modE.circuits.add((ItemStack) electronicCircuit); - - if (chargedReBattery != null && electronicCircuit != null) - TConstructClientRegistry.registerManualModifier("electricmod", ironpick.copy(), (ItemStack) chargedReBattery, (ItemStack) electronicCircuit); /* Thaumcraft */ Object obj = getStaticItem("itemResource", "thaumcraft.common.config.ConfigItems"); diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java index 0162d97e..655e38ae 100644 --- a/src/main/java/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -174,24 +174,24 @@ public class Arrow extends ToolCore return; NBTTagCompound tags = stack.getTagCompound(); - if (tags.hasKey("charge")) + if (tags.hasKey("Energy")) { String color = ""; //double joules = this.getJoules(stack); - int power = tags.getInteger("charge"); + int power = tags.getInteger("Energy"); if (power != 0) { - if (power <= this.getMaxCharge(stack) / 3) + if (power <= this.getMaxEnergyStored(stack) / 3) color = "\u00a74"; - else if (power > this.getMaxCharge(stack) * 2 / 3) + else if (power > this.getMaxEnergyStored(stack) * 2 / 3) color = "\u00a72"; else color = "\u00a76"; } - String charge = new StringBuilder().append(color).append(tags.getInteger("charge")).append("/").append(getMaxCharge(stack)).append(" EU").toString(); - list.add(charge); + String energy = new StringBuilder().append(color).append(tags.getInteger("Energy")).append("/").append(getMaxEnergyStored(stack)).append(" RF").toString(); + list.add(energy); } if (tags.hasKey("InfiTool")) { diff --git a/src/main/java/tconstruct/items/tools/Shortbow.java b/src/main/java/tconstruct/items/tools/Shortbow.java index 3df3735c..30462825 100644 --- a/src/main/java/tconstruct/items/tools/Shortbow.java +++ b/src/main/java/tconstruct/items/tools/Shortbow.java @@ -100,24 +100,24 @@ public class Shortbow extends BowBase return; NBTTagCompound tags = stack.getTagCompound(); - if (tags.hasKey("charge")) + if (tags.hasKey("Energy")) { String color = ""; //double joules = this.getJoules(stack); - int power = tags.getInteger("charge"); + int power = tags.getInteger("Energy"); if (power != 0) { - if (power <= this.getMaxCharge(stack) / 3) + if (power <= this.getMaxEnergyStored(stack) / 3) color = "\u00a74"; - else if (power > this.getMaxCharge(stack) * 2 / 3) + else if (power > this.getMaxEnergyStored(stack) * 2 / 3) color = "\u00a72"; else color = "\u00a76"; } - String charge = new StringBuilder().append(color).append(tags.getInteger("charge")).append("/").append(getMaxCharge(stack)).append(" EU").toString(); - list.add(charge); + String energy = new StringBuilder().append(color).append(tags.getInteger("Energy")).append("/").append(getMaxEnergyStored(stack)).append(" RF").toString(); + list.add(energy); } if (tags.hasKey("InfiTool")) { diff --git a/src/main/java/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java index 108c174d..03ba0f05 100644 --- a/src/main/java/tconstruct/library/armor/ArmorCore.java +++ b/src/main/java/tconstruct/library/armor/ArmorCore.java @@ -1,6 +1,6 @@ package tconstruct.library.armor; -import ic2.api.item.*; +import tconstruct.library.util.MathUtils; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.IBehaviorDispenseItem; import net.minecraft.entity.*; @@ -10,12 +10,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; +import cofh.api.energy.IEnergyContainerItem; /** * NBTTags * Main tag - InfiArmor */ -public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem, IBoxable, ISpecialArmor +public abstract class ArmorCore extends ItemArmor implements IEnergyContainerItem, ISpecialArmor { public static final String SET_NAME = "InfiArmor"; @@ -23,6 +24,11 @@ public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem private static final IBehaviorDispenseItem dispenserBehavior = new BehaviorDispenseArmorCopy(); public final int baseProtection; + //TE power constants -- TODO grab these from the items added + protected int capacity = 400000; + protected int maxReceive = 75; + protected int maxExtract = 75; + public ArmorCore(int par1, int baseProtection, EnumArmorPart part) { super(par1, EnumArmorMaterial.CHAIN, 0, 0); @@ -94,19 +100,19 @@ public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem data = tags.getCompoundTag(SET_NAME); - if (tags.hasKey("charge")) + if (tags.hasKey("Energy")) { - int charge = tags.getInteger("charge"); - if (charge > damage) + int energy = tags.getInteger("Energy"); + if (energy > damage) { - charge -= damage; - tags.setInteger("charge", charge); + energy -= damage; + tags.setInteger("Energy", energy); return; } else { - damage -= charge; - tags.setInteger("charge", 0); + damage -= energy; + tags.setInteger("Energy", 0); int dmg = data.getInteger("Damage"); dmg += damage; data.setInteger("Damage", dmg); @@ -121,143 +127,81 @@ public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem } } - /* - * IC2 API support - */ - - @Override - public boolean canBeStoredInToolbox (ItemStack stack) + //TE support section -- from COFH core API reference section + public void setMaxTransfer (int maxTransfer) { - return true; + setMaxReceive(maxTransfer); + setMaxExtract(maxTransfer); + } + + public void setMaxReceive (int maxReceive) + { + this.maxReceive = maxReceive; + } + + public void setMaxExtract (int maxExtract) + { + this.maxExtract = maxExtract; + } + + /* IEnergyContainerItem */ + @Override + public int receiveEnergy (ItemStack container, int maxReceive, boolean simulate) + { + NBTTagCompound tags = container.getTagCompound(); + if (tags == null || !tags.hasKey("Energy")) + return 0; + int energy = tags.getInteger("Energy"); + int energyReceived = MathUtils.minInt(capacity - energy, MathUtils.minInt(this.maxReceive, maxReceive)); + if (!simulate) + { + energy += energyReceived; + tags.setInteger("Energy", energy); + container.setItemDamage(1 + (getMaxEnergyStored(container) - energy) * (container.getMaxDamage() - 2) / getMaxEnergyStored(container)); + + } + return energyReceived; } @Override - public boolean canProvideEnergy (ItemStack stack) + public int extractEnergy (ItemStack container, int maxExtract, boolean simulate) { - NBTTagCompound tags = stack.getTagCompound(); - - return tags.hasKey("charge"); - } - - @Override - public int getChargedItemId (ItemStack stack) - { - return this.itemID; - } - - @Override - public int getEmptyItemId (ItemStack stack) - { - return this.itemID; - } - - @Override - public int getMaxCharge (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - return tags.hasKey("charge") ? 10000 : 0; - } - - @Override - public int getTier (ItemStack stack) - { - return 0; - } - - @Override - public int getTransferLimit (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - - return tags.hasKey("charge") ? 32 : 0; - } - - @Override - public int charge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) + NBTTagCompound tags = container.getTagCompound(); + if (tags == null || !tags.hasKey("Energy")) { return 0; } - - if (amount > 0) + int energy = tags.getInteger("Energy"); + int energyExtracted = MathUtils.minInt(energy, MathUtils.minInt(this.maxExtract, maxExtract)); + if (!simulate) { - if (amount > getTransferLimit(stack) && !ignoreTransferLimit) - { - amount = getTransferLimit(stack); - } + energy -= energyExtracted; + tags.setInteger("Energy", energy); + container.setItemDamage(1 + (getMaxEnergyStored(container) - energy) * (container.getMaxDamage() - 1) / getMaxEnergyStored(container)); - int charge = tags.getInteger("charge"); - - if (amount > getMaxCharge(stack)) - { - amount = getMaxCharge(stack); - } - - charge += amount; - - if (!simulate) - { - tags.setInteger("charge", charge); - stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 2) / getMaxCharge(stack)); - } - return amount; } - - else - return 0; + return energyExtracted; } @Override - public int discharge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) + public int getEnergyStored (ItemStack container) { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) + NBTTagCompound tags = container.getTagCompound(); + if (tags == null || !tags.hasKey("Energy")) { return 0; } - - if (amount > 0) - { - if (amount > getTransferLimit(stack)) - { - amount = getTransferLimit(stack); - } - - int charge = tags.getInteger("charge"); - - if (amount > charge) - { - amount = charge; - } - - charge -= amount; - - if (!simulate) - { - tags.setInteger("charge", charge); - stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 1) / getMaxCharge(stack)); - } - - return charge; - } - - else + return tags.getInteger("Energy"); + } + @Override + public int getMaxEnergyStored (ItemStack container) + { + NBTTagCompound tags = container.getTagCompound(); + if (tags == null || !tags.hasKey("Energy")) return 0; + return capacity; } - - @Override - public boolean canUse (ItemStack stack, int amount) - { - return false; - } - - @Override - public boolean canShowChargeToolTip (ItemStack stack) - { - return false; - } + //end of TE support section // Vanilla overrides public boolean isItemTool (ItemStack par1ItemStack) @@ -300,12 +244,12 @@ public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem return 0; } - if (tags.hasKey("charge")) + if (tags.hasKey("Energy")) { - int charge = tags.getInteger("charge"); - if (charge > 0) + int energy = tags.getInteger("Energy"); + if (energy > 0) { - return this.getMaxCharge(stack); + return this.getMaxEnergyStored(stack); } } @@ -320,12 +264,12 @@ public abstract class ArmorCore extends ItemArmor implements ICustomElectricItem return 0; } - if (tags.hasKey("charge")) + if (tags.hasKey("Energy")) { - int charge = tags.getInteger("charge"); - if (charge > 0) + int energy = tags.getInteger("Energy"); + if (energy > 0) { - return this.getMaxCharge(stack) - charge; + return this.getMaxEnergyStored(stack) - energy; } } diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index af8390cf..131a4c2b 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -1,8 +1,5 @@ package tconstruct.library.tools; -import ic2.api.item.ICustomElectricItem; -import ic2.api.item.IElectricItem; - import java.util.Iterator; import java.util.List; import java.util.Random; @@ -389,16 +386,11 @@ public class AbilityHelper public static boolean damageElectricTool (ItemStack stack, NBTTagCompound tags, Entity entity) { - if (tags.hasKey("charge") || tags.hasKey("Energy")) + if (tags.hasKey("Energy")) { NBTTagCompound toolTag = stack.getTagCompound().getCompoundTag("InfiTool"); - int charge = -1; int energy = -1; - if (tags.hasKey("charge")) - { - charge = tags.getInteger("charge"); - } if (tags.hasKey("Energy")) { energy = tags.getInteger("Energy"); @@ -430,22 +422,6 @@ public class AbilityHelper float bonusLog = (float) Math.log(durability / 72f + 1) * 2 * stonebound; trueSpeed += bonusLog; trueSpeed *= 6; - if (charge > 0) - { - if (charge < trueSpeed) - { - if (charge > 0) - tags.setInteger("charge", 0); - return false; - } - - charge -= trueSpeed; - ToolCore tool = (ToolCore) stack.getItem(); - stack.setItemDamage(1 + (tool.getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 1) / tool.getMaxCharge(stack)); - tags.setInteger("charge", charge); - if (entity instanceof EntityPlayer) - chargeFromArmor(stack, (EntityPlayer) entity); - } if (energy > 0) { if (energy < trueSpeed) @@ -468,98 +444,6 @@ public class AbilityHelper } } - static void chargeFromArmor (ItemStack stack, EntityPlayer player) - { - boolean inContainer = false; - - for (int armorIter = 0; armorIter < 4; ++armorIter) - { - ItemStack armor = player.inventory.armorInventory[armorIter]; - - if (armor != null && armor.getItem() instanceof IElectricItem) - { - IElectricItem electricArmor = (IElectricItem) armor.getItem(); - ToolCore tool = (ToolCore) stack.getItem(); - - if (electricArmor.canProvideEnergy(stack) && electricArmor.getTier(stack) >= ((IElectricItem) stack.getItem()).getTier(stack)) - { - int chargeAmount = tool.charge(stack, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true); - chargeAmount = discharge(armor, chargeAmount, Integer.MAX_VALUE, true, false); - - if (chargeAmount > 0) - { - tool.charge(stack, chargeAmount, Integer.MAX_VALUE, true, false); - inContainer = true; - } - } - } - } - - if (inContainer) - { - player.openContainer.detectAndSendChanges(); - } - } - - public static int discharge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) - { - IElectricItem ielectricitem = (IElectricItem) stack.getItem(); - - if (ielectricitem instanceof ICustomElectricItem) - { - return ((ICustomElectricItem) ielectricitem).discharge(stack, amount, tier, ignoreTransferLimit, simulate); - } - else if (amount >= 0 && stack.stackSize <= 1 && ielectricitem.getTier(stack) <= tier) - { - if (amount > ielectricitem.getTransferLimit(stack) && !ignoreTransferLimit) - { - amount = ielectricitem.getTransferLimit(stack); - } - - NBTTagCompound tags = stack.getTagCompound(); - int charge = tags.getInteger("charge"); - - if (amount > charge) - { - amount = charge; - } - - charge -= amount; - - if (!simulate) - { - tags.setInteger("charge", charge); - stack.itemID = charge > 0 ? ielectricitem.getChargedItemId(stack) : ielectricitem.getEmptyItemId(stack); - - if (stack.getItem() instanceof IElectricItem) - { - ielectricitem = (IElectricItem) stack.getItem(); - - if (stack.getMaxDamage() > 2) - { - if (stack.getItemDamage() + 1 < stack.getMaxDamage()) - stack.setItemDamage(1 + (ielectricitem.getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 2) / ielectricitem.getMaxCharge(stack)); - } - else - { - stack.setItemDamage(0); - } - } - else - { - stack.setItemDamage(0); - } - } - - return amount; - } - else - { - return 0; - } - - } - public static void breakTool (ItemStack stack, NBTTagCompound tags, Entity entity) { tags.getCompoundTag("InfiTool").setBoolean("Broken", true); diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index f70c7f94..647a076b 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -1,8 +1,5 @@ package tconstruct.library.tools; -import ic2.api.item.IBoxable; -import ic2.api.item.ICustomElectricItem; - import java.lang.reflect.Field; import java.util.HashMap; import java.util.Iterator; @@ -60,9 +57,9 @@ import cpw.mods.fml.relauncher.SideOnly; * @see ToolMod */ -public abstract class ToolCore extends Item implements IEnergyContainerItem, ICustomElectricItem, IBoxable, IBattlegearWeapon +public abstract class ToolCore extends Item implements IEnergyContainerItem, IBattlegearWeapon { - //TE power constants -- TODO grab these from the + //TE power constants -- TODO grab these from the items added protected int capacity = 400000; protected int maxReceive = 75; protected int maxExtract = 75; @@ -341,25 +338,6 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, ICu return; NBTTagCompound tags = stack.getTagCompound(); - if (tags.hasKey("charge")) - { - String color = ""; - //double joules = this.getJoules(stack); - int power = tags.getInteger("charge"); - - if (power != 0) - { - if (power <= this.getMaxCharge(stack) / 3) - color = "\u00a74"; - else if (power > this.getMaxCharge(stack) * 2 / 3) - color = "\u00a72"; - else - color = "\u00a76"; - } - - String charge = new StringBuilder().append(color).append(tags.getInteger("charge")).append("/").append(getMaxCharge(stack)).append(" EU").toString(); - list.add(charge); - } if (tags.hasKey("Energy")) { String color = ""; @@ -843,13 +821,6 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, ICu { return 0; } - - if (tags.hasKey("charge")) - { - int charge = tags.getInteger("charge"); - if (charge > 0) - return this.getMaxCharge(stack); - } if (tags.hasKey("Energy")) { int energy = tags.getInteger("Energy"); @@ -866,13 +837,6 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, ICu { return 0; } - - if (tags.hasKey("charge")) - { - int charge = tags.getInteger("charge"); - if (charge > 0) - return getMaxCharge(stack) - charge; - } if (tags.hasKey("Energy")) { int energy = tags.getInteger("Energy"); @@ -882,142 +846,7 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, ICu return tags.getCompoundTag("InfiTool").getInteger("Damage"); } - /* IC2 Support - * Every tool can be an electric tool if you modify it right - */ - @Override - public boolean canBeStoredInToolbox (ItemStack stack) - { - return true; - } - @Override - public boolean canProvideEnergy (ItemStack stack) - { - return false; - /*NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - return false; - - return true;*/ - } - - @Override - public int getChargedItemId (ItemStack stack) - { - return this.itemID; - } - - @Override - public int getEmptyItemId (ItemStack stack) - { - return this.itemID; - } - - @Override - public int getMaxCharge (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - return 0; - - return 10000; - } - - @Override - public int getTier (ItemStack itemStack) - { - return 0; - } - - @Override - public int getTransferLimit (ItemStack stack) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - return 0; - - return 32; - } - - @Override - public int charge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) - { - NBTTagCompound tags = stack.getTagCompound(); - if (!tags.hasKey("charge")) - return 0; - - if (amount > 0) - { - if (amount > getTransferLimit(stack) && !ignoreTransferLimit) - { - amount = getTransferLimit(stack); - } - - int charge = tags.getInteger("charge"); - - if (amount > getMaxCharge(stack) - charge) - { - amount = getMaxCharge(stack) - charge; - } - - charge += amount; - - if (!simulate) - { - tags.setInteger("charge", charge); - stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 2) / getMaxCharge(stack)); - } - - return amount; - } - - else - return 0; - } - - @Override - public int discharge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) - { - NBTTagCompound tags = stack.getTagCompound(); - if (tags == null || !tags.hasKey("charge")) - return 0; - - if (amount > 0) - { - if (amount > getTransferLimit(stack) && !ignoreTransferLimit) - { - amount = getTransferLimit(stack); - } - int charge = tags.getInteger("charge"); - - if (amount > charge) - { - amount = charge; - } - charge -= amount; - if (!simulate) - { - tags.setInteger("charge", charge); - stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 1) / getMaxCharge(stack)); - } - return amount; - } - else - return 0; - } - - @Override - public boolean canShowChargeToolTip (ItemStack itemStack) - { - return false; - } - - @Override - public boolean canUse (ItemStack itemStack, int amount) - { - return false; - } /* Battlegear support, IBattlegearWeapon */ diff --git a/src/main/java/tconstruct/modifiers/ModElectric.java b/src/main/java/tconstruct/modifiers/ModElectric.java deleted file mode 100644 index 309be061..00000000 --- a/src/main/java/tconstruct/modifiers/ModElectric.java +++ /dev/null @@ -1,87 +0,0 @@ -package tconstruct.modifiers; - -import ic2.api.item.IElectricItem; - -import java.util.ArrayList; - -import tconstruct.library.tools.ToolCore; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -/* IC2 support */ - -public class ModElectric extends ModBoolean -{ - public ArrayList circuits = new ArrayList(); - public ArrayList batteries = new ArrayList(); - - public ModElectric() - { - super(new ItemStack[0], 9, "Electric", "\u00a7e", ""); - } - - @Override - public boolean matches (ItemStack[] input, ItemStack tool) - { - if (input[0] == null || input[1] == null) - return false; - - boolean circuit = false; - boolean battery = false; - - for (ItemStack stack : circuits) - { - if (stack.isItemEqual(input[0]) || stack.isItemEqual(input[1])) - circuit = true; - } - - for (ItemStack stack : batteries) - { - if (stack.itemID == input[0].itemID && input[0].getItem() instanceof IElectricItem) - { - battery = true; - } - if (stack.itemID == input[1].itemID && input[1].getItem() instanceof IElectricItem) - { - battery = true; - } - } - return circuit && battery && canModify(tool, input); - } - - /*@Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { - NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - if (!tags.hasKey(key)) - return tags.getInteger("Modifiers") > 0; - - return false; - }*/ - - @Override - public void modify (ItemStack[] input, ItemStack tool) - { - NBTTagCompound tags = tool.getTagCompound(); - - if (!tags.hasKey(key)) - { - tags.setBoolean(key, true); - - int modifiers = tags.getCompoundTag("InfiTool").getInteger("Modifiers"); - modifiers -= 1; - tags.getCompoundTag("InfiTool").setInteger("Modifiers", modifiers); - int charge = 0; - if (input[0].getItem() instanceof IElectricItem && input[0].hasTagCompound()) - charge = input[0].getTagCompound().getInteger("charge"); - if (input[1].getItem() instanceof IElectricItem && input[1].hasTagCompound()) - charge = input[1].getTagCompound().getInteger("charge"); - tags.setInteger("charge", charge); - tags.setInteger(key, 1); - addModifierTip(tool, "\u00a7eElectric"); - ToolCore toolcore = (ToolCore) tool.getItem(); - tool.setItemDamage(1 + (toolcore.getMaxCharge(tool) - charge) * (tool.getMaxDamage() - 1) / toolcore.getMaxCharge(tool)); - } - } -} diff --git a/src/main/java/tconstruct/util/TEventHandler.java b/src/main/java/tconstruct/util/TEventHandler.java index 9cc61b06..272f438f 100644 --- a/src/main/java/tconstruct/util/TEventHandler.java +++ b/src/main/java/tconstruct/util/TEventHandler.java @@ -532,13 +532,8 @@ public class TEventHandler @ForgeSubscribe public void registerOre (OreRegisterEvent evt) { - if (evt.Name == "battery") - TConstruct.content.modE.batteries.add(evt.Ore); - - else if (evt.Name == "basicCircuit") - TConstruct.content.modE.circuits.add(evt.Ore); - - else if (evt.Name == "crystalQuartz") + + if (evt.Name == "crystalQuartz") { ToolBuilder.instance.registerToolMod(new ModAttack("Quartz", new ItemStack[] { evt.Ore }, 11, 2)); }