From d5c6411c00ab3a16e90b099b3037c62d35690422 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sat, 20 May 2017 21:13:11 +0200 Subject: [PATCH] Crafting recipes, removed unnecessary battery code duplikates --- assets/hbm/lang/de_DE.lang | 6 ++ assets/hbm/lang/en_US.lang | 6 ++ assets/hbm/sounds.json | 1 + assets/hbm/sounds/block/shutdown.ogg | Bin 0 -> 19992 bytes assets/hbm/textures/blocks/cyclotron.png | Bin 0 -> 234 bytes assets/hbm/textures/items/bolt_dura_steel.png | Bin 0 -> 182 bytes com/hbm/items/ModItems.java | 17 ++++- com/hbm/lib/Library.java | 70 ++++++++++++++++++ com/hbm/main/CraftingManager.java | 19 +++++ com/hbm/main/MainRegistry.java | 5 ++ com/hbm/tileentity/TileEntityFWatzCore.java | 28 +------ .../TileEntityFusionMultiblock.java | 27 +------ com/hbm/tileentity/TileEntityLaunchPad.java | 37 +-------- .../tileentity/TileEntityMachineBattery.java | 34 ++------- .../TileEntityMachineCMBFactory.java | 37 +-------- com/hbm/tileentity/TileEntityMachineCoal.java | 27 +------ .../TileEntityMachineCyclotron.java | 15 ++++ .../TileEntityMachineDeuterium.java | 37 +-------- .../tileentity/TileEntityMachineDiesel.java | 27 +------ .../TileEntityMachineElectricFurnace.java | 36 +-------- .../TileEntityMachineGenerator.java | 27 +------ .../TileEntityMachineIGenerator.java | 26 +------ ...eEntityMachineSchrabidiumTransmutator.java | 38 +--------- .../tileentity/TileEntityMachineShredder.java | 35 +-------- .../TileEntityReactorMultiblock.java | 27 +------ com/hbm/tileentity/TileEntityWatzCore.java | 26 +------ 26 files changed, 172 insertions(+), 436 deletions(-) create mode 100644 assets/hbm/sounds/block/shutdown.ogg create mode 100644 assets/hbm/textures/blocks/cyclotron.png create mode 100644 assets/hbm/textures/items/bolt_dura_steel.png diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index a4bac11bc..f2ce2dc12 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -260,6 +260,7 @@ item.plate_mixed.name=Gemischte Platte item.plate_paa.name=PaA-Legierungsplatte item.ingot_dura_steel.name=Schnellarbeitsstahlbarren item.ingot_polymer.name=Polymerbarren +item.bolt_dura_steel.name=Schnellarbeitsstahlbolzen item.ingot_australium.name=Australiumbarren item.ingot_weidanium.name=Weidaniumbarren @@ -620,6 +621,7 @@ item.grenade_aschrab.name=Werfbare Antischrabidiumzelle item.grenade_nuke.name=Mark VI Bohrgranate item.grenade_nuclear.name=Nuka-Granate item.grenade_zomg.name=Negativenergie-Paarvernichtungsgranate +item.grenade_black_hole.name=Schwarzes-Loch-Granate item.ullapool_caber.name=Ullapool'sche Stiel item.rod_uranium_fuel.name=Urankernbrennstoffzelle @@ -948,6 +950,10 @@ item.cmb_pickaxe.name=CMB-Stahlspitzhacke item.cmb_axe.name=CMB-Stahlaxt item.cmb_shovel.name=CMB-Stahlschaufel item.cmb_hoe.name=CMB-Stahlfeldhacke +item.elec_sword.name=Elektroimpulswaffe +item.elec_pickaxe.name=Schlagbohrmaschine +item.elec_axe.name=Elektrische Kettensäge +item.elec_shovel.name=Spiralbohrer tile.red_cable.name=Rotes Kupferkabel tile.block_meteor.name=Meteoritenblock diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 39f682930..549948f13 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -260,6 +260,7 @@ item.plate_mixed.name=Mixed Plate item.plate_paa.name=PaA Alloy Plate item.ingot_dura_steel.name=High-Speed Steel Ingot item.ingot_polymer.name=Polymer Ingot +item.bolt_dura_steel.name=High-Speed Steel Bolt item.ingot_australium.name=Australium Ingot item.ingot_weidanium.name=Weidanium Ingot @@ -620,6 +621,7 @@ item.grenade_aschrab.name=Tossable Antischrabidium Cell item.grenade_nuke.name=Mark VI Drill Grenade item.grenade_nuclear.name=Nuka Grenade item.grenade_zomg.name=Negative Energy Pair Annihilation Grenade +item.grenade_black_hole.name=Black Hole Grenade item.ullapool_caber.name=Ullapool Caber item.rod_uranium_fuel.name=Uranium Fuel Rod @@ -948,6 +950,10 @@ item.cmb_pickaxe.name=CMB Steel Pickaxe item.cmb_axe.name=CMB Steel Axe item.cmb_shovel.name=CMB Steel Shovel item.cmb_hoe.name=CMB Steel Hoe +item.elec_sword.name=Stunstick +item.elec_pickaxe.name=Impact Drill +item.elec_axe.name=Electric Chainsaw +item.elec_shovel.name=Spiral Drill tile.red_cable.name=Red Copper Cable tile.block_meteor.name=Meteor Block diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index ffe3472de..6da239b82 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -5,6 +5,7 @@ "misc.nullMine": {"category": "player", "sounds": [{"name": "misc/null", "stream": false}]}, "block.crateBreak": {"category": "block", "sounds": ["block/crateBreak1", "block/crateBreak2", "block/crateBreak3", "block/crateBreak4", "block/crateBreak5"]}, + "block.shutdown": {"category": "block", "sounds": [{"name": "block/shutdown", "stream": false}]}, "item.techBleep": {"category": "player", "sounds": [{"name": "tool/techBleep", "stream": false}]}, "item.techBoop": {"category": "player", "sounds": [{"name": "tool/techBoop", "stream": false}]}, diff --git a/assets/hbm/sounds/block/shutdown.ogg b/assets/hbm/sounds/block/shutdown.ogg new file mode 100644 index 0000000000000000000000000000000000000000..b82612c7538454f241a6c9a599743a49bf30cdbf GIT binary patch literal 19992 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 G;r{|xo)J?3 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/cyclotron.png b/assets/hbm/textures/blocks/cyclotron.png new file mode 100644 index 0000000000000000000000000000000000000000..a48415602407e39119a69db2055d96945591cc5d GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfwW%$vPc!T?aU`_RgIVa26X-o+O5&$m*g~ad*GqpDvAv3g-KJR*Z%!~ zZ^xs;xh8iQ7=pa+syx5*`d;-h`|P*9NlHSNs~T0qc#oCvrm;u;y5!)czx2=j#;JKy z5ic3KtzR6!!uRs?uf6B3A8&3dUiU7W*M-IKm}l|C4#gJFD-9hzyYDaxGAeZ~5`4sQ f>)Ur_nPcL*zuZ`6X?}bPbS#6XtDnm{r-UW|{Xtx3 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/bolt_dura_steel.png b/assets/hbm/textures/items/bolt_dura_steel.png new file mode 100644 index 0000000000000000000000000000000000000000..0a9b547ca438a0ba579142d568ed8eb43fd53de3 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_generic && slots[index].getItemDamage() > 0) + { + power -= 100; + slots[index].setItemDamage(slots[index].getItemDamage() - 1); + } + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced && slots[index].getItemDamage() > 0) + { + power -= 100; + slots[index].setItemDamage(slots[index].getItemDamage() - 1); + } + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium && slots[index].getItemDamage() > 0) + { + power -= 100; + slots[index].setItemDamage(slots[index].getItemDamage() - 1); + } + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.factory_core_titanium && slots[index].getItemDamage() > 0) + { + power -= 100; + slots[index].setItemDamage(slots[index].getItemDamage() - 1); + } + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.factory_core_advanced && slots[index].getItemDamage() > 0) + { + power -= 100; + slots[index].setItemDamage(slots[index].getItemDamage() - 1); + } + return power; + } + + public static int chargeTEFromItems(ItemStack[] slots, int index, int power, int maxPower) { + + if(slots[index] != null && slots[index].getItem() == ModItems.battery_creative) + { + power = maxPower; + } + + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_generic && slots[index].getItemDamage() < 50) + { + power += 100; + slots[index].setItemDamage(slots[index].getItemDamage() + 1); + } + + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced && slots[index].getItemDamage() < 200) + { + power += 100; + slots[index].setItemDamage(slots[index].getItemDamage() + 1); + } + + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium && slots[index].getItemDamage() < 10000) + { + power += 100; + slots[index].setItemDamage(slots[index].getItemDamage() + 1); + } + + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.fusion_core && slots[index].getItemDamage() < 5000) + { + power += 100; + slots[index].setItemDamage(slots[index].getItemDamage() + 1); + } + + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.energy_core && slots[index].getItemDamage() < 5000) + { + power += 100; + slots[index].setItemDamage(slots[index].getItemDamage() + 1); + } + return power; + } } diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 65c279182..410f75be0 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -48,6 +48,11 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.hazmat_cloth, 8), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', Items.leather, 'C', "dustLead" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.filter_coal, 1), new Object[] { "SCS", "CPC", "SCS", 'S', Items.string, 'P', Items.paper, 'C', "dustCoal" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.plate_mixed, 3), new Object[] { "ANA", "NCN", "ANA", 'A', ModItems.plate_advanced_alloy, 'N', "plateDenseLead", 'C', ModItems.plate_combine_steel })); + GameRegistry.addRecipe(new ItemStack(ModItems.bolt_dura_steel, 4), new Object[] { "D", "D", 'D', ModItems.ingot_dura_steel}); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.magnet_dee, 1), new Object[] { "SMM", "M M", "MMT", 'S', "ingotSteel", 'M', ModBlocks.fusion_conductor, 'T', ModItems.coil_advanced_torus })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.magnet_circular, 2), new Object[] { "PSP", "MMM", "PSP", 'S', "ingotSteel", 'M', ModBlocks.fusion_conductor, 'P', "plateAdvanced" })); + GameRegistry.addRecipe(new ItemStack(ModItems.cyclotron_tower, 1), new Object[] { "CDC", "CDC", "CDC", 'C', ModItems.magnet_circular, 'D', ModItems.magnet_dee }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_aluminium, 1), new Object[] { "RAR", "ASA", "RAR", 'S', "plateSteel", 'R', "dustRedstone", 'A', ModItems.wire_aluminium })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_copper, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.circuit_aluminium, 'R', "dustNetherQuartz", 'A', ModItems.wire_copper })); @@ -320,6 +325,12 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nuclear_waste, 8), new Object[] { ModItems.rod_dual_schrabidium_fuel_depleted }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nuclear_waste, 16), new Object[] { ModItems.rod_quad_schrabidium_fuel_depleted }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_lithium), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustLithium" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_beryllium), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustBeryllium" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_carbon), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustCoal" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_copper), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustCopper" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.part_plutonium), new Object[] { "P", "D", "P", 'P', "plateSteel", 'D', "dustPlutonium" })); + if(false) GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_euphemium, 1, 34), new Object[] { ModItems.rod_quad_euphemium }); GameRegistry.addRecipe(new ItemStack(ModItems.ingot_euphemium, 1, 34), new Object[] { "###", "###", "###", '#', new ItemStack(ModItems.nugget_euphemium, 1, 34) }); @@ -454,6 +465,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_combine_factory), 1), new Object[] { "HCH", "STS", "RFR", 'H', ModItems.tank_steel, 'C', ModItems.coil_advanced_torus, 'S', "plateSteel", 'T', ModBlocks.block_magnetized_tungsten, 'R', ModItems.wire_red_copper, 'F', Item.getItemFromBlock(ModBlocks.machine_difurnace_off) })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_teleporter), 1), new Object[] { "PTP", "FKF", "BBB", 'P', "plateTitanium", 'T', ModItems.telepad, 'F', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'K', ModItems.entanglement_kit, 'B', Item.getItemFromBlock(ModBlocks.machine_battery) })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_rtg_grey), 1), new Object[] { "UPU", "UWU", "UPU", 'P', "plateSteel", 'U', ModItems.rtg_unit, 'W', ModBlocks.red_wire_coated })); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_cyclotron), 1), new Object[] { "PTP", "PCP", "WBW", 'P', ModItems.board_copper, 'T', ModItems.cyclotron_tower, 'C', ModBlocks.fusion_core, 'W', ModBlocks.red_wire_coated, 'B', ModBlocks.machine_battery }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 1), new Object[] { "PIP", "I I", "PIP", 'P', "plateTitanium", 'I', "ingotTitanium" })); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_furnace), 1), new Object[] { "HMH", "MFM", "HMH", 'H', Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 'M', ModItems.motor, 'F', Item.getItemFromBlock(Blocks.furnace) }); @@ -481,6 +493,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.screwdriver, 1), new Object[] { " I", " I ", "S ", 'S', "ingotSteel", 'I', "ingotIron" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.overfuse, 1), new Object[] { ModItems.screwdriver, "dustNeptunium", ModItems.powder_iodine, ModItems.powder_thorium, ModItems.powder_astatine, ModItems.powder_neodymium, ModItems.board_copper, ModItems.black_hole, ModItems.powder_caesium })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.overfuse, 1), new Object[] { ModItems.screwdriver, ModItems.powder_strontium, ModItems.powder_bromine, ModItems.powder_cobalt, ModItems.powder_tennessine, ModItems.powder_niobium, ModItems.board_copper, ModItems.black_hole, ModItems.powder_cerium })); + GameRegistry.addRecipe(new ItemStack(ModItems.crystal_energy, 1), new Object[] { "EEE", "EGE", "EEE", 'E', ModItems.powder_power, 'G', Items.glowstone_dust }); + GameRegistry.addRecipe(new ItemStack(ModItems.pellet_coolant, 1), new Object[] { "CRC", "RBR", "CRC", 'C', ModItems.powder_ice, 'R', ModItems.rod_quad_coolant, 'B', ModBlocks.block_niter }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.thermo_element, 1), new Object[] { "GRG", "APA", "GRG", 'P', "plateSteel", 'G', Items.gold_nugget, 'R', ModItems.wire_red_copper, 'A', ModItems.wire_aluminium })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.limiter, 1), new Object[] { "SC", "SC", "LS", 'S', "plateSteel", 'C', ModItems.circuit_copper, 'L', "plateLead" })); @@ -627,6 +641,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.grenade_mk2, 2), new Object[] { " G ", "SGS", " S ", 'G', ModItems.grenade_strong, 'S', Items.gunpowder }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_pulse, 4), new Object[] { "WPW", "WSW", "SMS", 'W', ModItems.wire_red_copper, 'P', "plateIron", 'S', "plateSteel", 'M', ModItems.magnetron })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.grenade_lemon, 1), new Object[] { ModItems.lemon, ModItems.grenade_strong })); + GameRegistry.addRecipe(new ItemStack(ModItems.grenade_black_hole, 1), new Object[] { " C ", "PBP", "PCP", 'C', ModItems.coil_advanced_alloy, 'P', ModItems.ingot_polymer, 'B', ModItems.black_hole }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.gun_moist_nugget, 12), new Object[] { Items.bread, Items.wheat, Items.cooked_chicken, Items.egg }); GameRegistry.addRecipe(new ItemStack(ModItems.bomb_waffle, 1), new Object[] { "WEW", "MPM", "WEW", 'W', Items.wheat, 'E', Items.egg, 'M', Items.milk_bucket, 'P', ModItems.man_core }); @@ -792,6 +807,10 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.cmb_axe, 1), new Object[] { "II", "IS", " S", 'I', ModItems.ingot_combine_steel, 'S', Items.stick }); GameRegistry.addRecipe(new ItemStack(ModItems.cmb_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_combine_steel, 'S', Items.stick }); GameRegistry.addRecipe(new ItemStack(ModItems.cmb_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_combine_steel, 'S', Items.stick }); + GameRegistry.addRecipe(new ItemStack(ModItems.elec_sword, 1), new Object[] { "RPR", "RPR", " B ", 'P', ModItems.ingot_polymer, 'D', ModItems.ingot_dura_steel, 'R', ModItems.bolt_dura_steel, 'M', ModItems.motor, 'B', ModItems.battery_generic }); + GameRegistry.addRecipe(new ItemStack(ModItems.elec_pickaxe, 1), new Object[] { "RDM", " PB", " P ", 'P', ModItems.ingot_polymer, 'D', ModItems.ingot_dura_steel, 'R', ModItems.bolt_dura_steel, 'M', ModItems.motor, 'B', ModItems.battery_generic }); + GameRegistry.addRecipe(new ItemStack(ModItems.elec_axe, 1), new Object[] { " DP", "RRM", " PB", 'P', ModItems.ingot_polymer, 'D', ModItems.ingot_dura_steel, 'R', ModItems.bolt_dura_steel, 'M', ModItems.motor, 'B', ModItems.battery_generic }); + GameRegistry.addRecipe(new ItemStack(ModItems.elec_shovel, 1), new Object[] { " P", "RRM", " B", 'P', ModItems.ingot_polymer, 'D', ModItems.ingot_dura_steel, 'R', ModItems.bolt_dura_steel, 'M', ModItems.motor, 'B', ModItems.battery_generic }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chainsaw, 1), new Object[] { "TTG", "SSM", 'T', "plateIron", 'S', "plateSteel", 'M', ModItems.motor, 'G', ModItems.circuit_gold })); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index ddbd67cc9..dde922701 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -194,6 +194,7 @@ public class MainRegistry public static ToolMaterial enumToolMaterialTitanium = EnumHelper.addToolMaterial("TITANIUM", 3, 750, 9.0F, 2.5F, 15); public static ToolMaterial enumToolMaterialAlloy= EnumHelper.addToolMaterial("ALLOY", 3, 2000, 15.0F, 5.0F, 5); public static ToolMaterial enumToolMaterialCmb = EnumHelper.addToolMaterial("CMB", 3, 8500, 40.0F, 55F, 100); + public static ToolMaterial enumToolMaterialElec = EnumHelper.addToolMaterial("ELEC", 3, 4700, 30.0F, 12.0F, 2); public static ToolMaterial enumToolMaterialSaw = EnumHelper.addToolMaterial("SAW", 2, 750, 2.0F, 3.5F, 25); public static ToolMaterial enumToolMaterialBat = EnumHelper.addToolMaterial("BAT", 0, 500, 1.5F, 3F, 25); @@ -497,6 +498,8 @@ public class MainRegistry OreDictionary.registerOre("ingotUnobtainium", ModItems.ingot_unobtainium); OreDictionary.registerOre("ingotDaffergon", ModItems.ingot_daffergon); OreDictionary.registerOre("ingotVerticium", ModItems.ingot_verticium); + OreDictionary.registerOre("ingotDuraSteel", ModItems.ingot_dura_steel); + OreDictionary.registerOre("ingotPolymer", ModItems.ingot_polymer); OreDictionary.registerOre("ingotLanthanium", ModItems.ingot_lanthanium); OreDictionary.registerOre("ingotActinium", ModItems.ingot_actinium); OreDictionary.registerOre("dustFluorite", ModItems.fluorite); @@ -561,6 +564,8 @@ public class MainRegistry OreDictionary.registerOre("dustUnobtainium", ModItems.powder_unobtainium); OreDictionary.registerOre("dustDaffergon", ModItems.powder_daffergon); OreDictionary.registerOre("dustVerticium", ModItems.powder_verticium); + OreDictionary.registerOre("dustDuraSteel", ModItems.powder_dura_steel); + OreDictionary.registerOre("dustPolymer", ModItems.powder_polymer); OreDictionary.registerOre("dustLanthanium", ModItems.powder_lanthanium); OreDictionary.registerOre("dustActinium", ModItems.powder_actinium); diff --git a/com/hbm/tileentity/TileEntityFWatzCore.java b/com/hbm/tileentity/TileEntityFWatzCore.java index 30488cce8..2a0e3a9c7 100644 --- a/com/hbm/tileentity/TileEntityFWatzCore.java +++ b/com/hbm/tileentity/TileEntityFWatzCore.java @@ -349,31 +349,9 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, if(power > maxPower) power = maxPower; - if(power - 100 >= 0 && slots[0] != null && slots[0].getItem() == ModItems.battery_generic && slots[0].getItemDamage() > 0) - { - power -= 100; - slots[0].setItemDamage(slots[0].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[0] != null && slots[0].getItem() == ModItems.battery_advanced && slots[0].getItemDamage() > 0) - { - power -= 100; - slots[0].setItemDamage(slots[0].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[0] != null && slots[0].getItem() == ModItems.battery_schrabidium && slots[0].getItemDamage() > 0) - { - power -= 100; - slots[0].setItemDamage(slots[0].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[0] != null && slots[0].getItem() == ModItems.factory_core_titanium && slots[0].getItemDamage() > 0) - { - power -= 100; - slots[0].setItemDamage(slots[0].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[0] != null && slots[0].getItem() == ModItems.factory_core_advanced && slots[0].getItemDamage() > 0) - { - power -= 100; - slots[0].setItemDamage(slots[0].getItemDamage() - 1); - } + power = Library.chargeItemsFromTE(slots, 0, power, maxPower); + + if(amat + 1000000 <= maxAmat && slots[3] != null && slots[3].getItem() == ModItems.cell_antimatter) { this.slots[3].stackSize--; diff --git a/com/hbm/tileentity/TileEntityFusionMultiblock.java b/com/hbm/tileentity/TileEntityFusionMultiblock.java index b16698d98..d788b76a9 100644 --- a/com/hbm/tileentity/TileEntityFusionMultiblock.java +++ b/com/hbm/tileentity/TileEntityFusionMultiblock.java @@ -1122,31 +1122,8 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve { emptyPlasma(); } - if(power - 100 >= 0 && slots[1] != null && slots[1].getItem() == ModItems.battery_generic && slots[1].getItemDamage() > 0) - { - power -= 100; - slots[1].setItemDamage(slots[1].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[1] != null && slots[1].getItem() == ModItems.battery_advanced && slots[1].getItemDamage() > 0) - { - power -= 100; - slots[1].setItemDamage(slots[1].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[1] != null && slots[1].getItem() == ModItems.battery_schrabidium && slots[1].getItemDamage() > 0) - { - power -= 100; - slots[1].setItemDamage(slots[1].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[1] != null && slots[1].getItem() == ModItems.factory_core_titanium && slots[1].getItemDamage() > 0) - { - power -= 100; - slots[1].setItemDamage(slots[1].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[1] != null && slots[1].getItem() == ModItems.factory_core_advanced && slots[1].getItemDamage() > 0) - { - power -= 100; - slots[1].setItemDamage(slots[1].getItemDamage() - 1); - } + + power = Library.chargeItemsFromTE(slots, 1, power, maxPower); } } diff --git a/com/hbm/tileentity/TileEntityLaunchPad.java b/com/hbm/tileentity/TileEntityLaunchPad.java index a04e00afc..1e8ca87a8 100644 --- a/com/hbm/tileentity/TileEntityLaunchPad.java +++ b/com/hbm/tileentity/TileEntityLaunchPad.java @@ -4,6 +4,7 @@ import com.hbm.blocks.bomb.LaunchPad; import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.items.ModItems; +import com.hbm.lib.Library; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -194,41 +195,9 @@ public class TileEntityLaunchPad extends TileEntity implements ISidedInventory, @Override public void updateEntity() { + - if(/*power + 100 <= maxPower && */slots[2] != null && slots[2].getItem() == ModItems.battery_creative) - { - power = maxPower; - } - - if(power + 100 <= maxPower && slots[2] != null && slots[2].getItem() == ModItems.battery_generic && slots[2].getItemDamage() < 50) - { - power += 100; - slots[2].setItemDamage(slots[2].getItemDamage() + 1); - } - - if(power + 100 <= maxPower && slots[2] != null && slots[2].getItem() == ModItems.battery_advanced && slots[2].getItemDamage() < 200) - { - power += 100; - slots[2].setItemDamage(slots[2].getItemDamage() + 1); - } - - if(power + 100 <= maxPower && slots[2] != null && slots[2].getItem() == ModItems.battery_schrabidium && slots[2].getItemDamage() < 10000) - { - power += 100; - slots[2].setItemDamage(slots[2].getItemDamage() + 1); - } - - if(power + 100 <= maxPower && slots[2] != null && slots[2].getItem() == ModItems.fusion_core && slots[2].getItemDamage() < 5000) - { - power += 100; - slots[2].setItemDamage(slots[2].getItemDamage() + 1); - } - - if(power + 100 <= maxPower && slots[2] != null && slots[2].getItem() == ModItems.energy_core && slots[2].getItemDamage() < 5000) - { - power += 100; - slots[2].setItemDamage(slots[2].getItemDamage() + 1); - } + power = Library.chargeTEFromItems(slots, 2, power, maxPower); this.preState = this.state; diff --git a/com/hbm/tileentity/TileEntityMachineBattery.java b/com/hbm/tileentity/TileEntityMachineBattery.java index 48d426abe..432b4f941 100644 --- a/com/hbm/tileentity/TileEntityMachineBattery.java +++ b/com/hbm/tileentity/TileEntityMachineBattery.java @@ -206,34 +206,12 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent if(age == 9 || age == 19) ffgeuaInit(); } - - if(power - 100 >= 0 && slots[1] != null && slots[1].getItem() == ModItems.battery_generic && slots[1].getItemDamage() > 0) - { - power -= 100; - slots[1].setItemDamage(slots[1].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[1] != null && slots[1].getItem() == ModItems.battery_advanced && slots[1].getItemDamage() > 0) - { - power -= 100; - slots[1].setItemDamage(slots[1].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[1] != null && slots[1].getItem() == ModItems.battery_schrabidium && slots[1].getItemDamage() > 0) - { - power -= 100; - slots[1].setItemDamage(slots[1].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[1] != null && slots[1].getItem() == ModItems.factory_core_titanium && slots[1].getItemDamage() > 0) - { - power -= 100; - slots[1].setItemDamage(slots[1].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[1] != null && slots[1].getItem() == ModItems.factory_core_advanced && slots[1].getItemDamage() > 0) - { - power -= 100; - slots[1].setItemDamage(slots[1].getItemDamage() - 1); - } - if(slots[0] != null && slots[0].getItem() == ModItems.battery_creative) + power = Library.chargeTEFromItems(slots, 0, power, maxPower); + + power = Library.chargeItemsFromTE(slots, 1, power, maxPower); + + /*if(slots[0] != null && slots[0].getItem() == ModItems.battery_creative) { power = maxPower; } @@ -266,7 +244,7 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent { power += 100; slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } + }*/ } @Override diff --git a/com/hbm/tileentity/TileEntityMachineCMBFactory.java b/com/hbm/tileentity/TileEntityMachineCMBFactory.java index 782478506..6e77e023f 100644 --- a/com/hbm/tileentity/TileEntityMachineCMBFactory.java +++ b/com/hbm/tileentity/TileEntityMachineCMBFactory.java @@ -3,6 +3,7 @@ package com.hbm.tileentity; import com.hbm.interfaces.IConsumer; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; +import com.hbm.lib.Library; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -278,40 +279,8 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv public void updateEntity() { if (!worldObj.isRemote) { - - if (slots[0] != null && slots[0].getItem() == ModItems.battery_creative) { - power = maxPower; - } - - if (power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.battery_generic - && slots[0].getItemDamage() < 50) { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } - - if (power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.battery_advanced - && slots[0].getItemDamage() < 200) { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } - - if (power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.battery_schrabidium - && slots[0].getItemDamage() < 1000) { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } - - if (power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.fusion_core - && slots[0].getItemDamage() < 5000) { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } - - if (power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.energy_core - && slots[0].getItemDamage() < 5000) { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } + + power = Library.chargeTEFromItems(slots, 0, power, maxPower); if(waste + 500 <= maxFill && slots[2] != null && slots[2].getItem() == ModItems.bucket_mud) { waste += 500; diff --git a/com/hbm/tileentity/TileEntityMachineCoal.java b/com/hbm/tileentity/TileEntityMachineCoal.java index 40bd731d6..dc229532f 100644 --- a/com/hbm/tileentity/TileEntityMachineCoal.java +++ b/com/hbm/tileentity/TileEntityMachineCoal.java @@ -274,31 +274,8 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory } //Battery Item - if(power - 100 >= 0 && slots[2] != null && slots[2].getItem() == ModItems.battery_generic && slots[2].getItemDamage() > 0) - { - power -= 100; - slots[2].setItemDamage(slots[2].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[2] != null && slots[2].getItem() == ModItems.battery_advanced && slots[2].getItemDamage() > 0) - { - power -= 100; - slots[2].setItemDamage(slots[2].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[2] != null && slots[2].getItem() == ModItems.battery_schrabidium && slots[2].getItemDamage() > 0) - { - power -= 100; - slots[2].setItemDamage(slots[2].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[2] != null && slots[2].getItem() == ModItems.factory_core_titanium && slots[2].getItemDamage() > 0) - { - power -= 100; - slots[2].setItemDamage(slots[2].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[2] != null && slots[2].getItem() == ModItems.factory_core_advanced && slots[2].getItemDamage() > 0) - { - power -= 100; - slots[2].setItemDamage(slots[2].getItemDamage() - 1); - } + + power = Library.chargeItemsFromTE(slots, 2, power, maxPower); boolean flag = this.burnTime > 0; boolean flag1 = false; diff --git a/com/hbm/tileentity/TileEntityMachineCyclotron.java b/com/hbm/tileentity/TileEntityMachineCyclotron.java index 672c9d7b6..bdc10d9ef 100644 --- a/com/hbm/tileentity/TileEntityMachineCyclotron.java +++ b/com/hbm/tileentity/TileEntityMachineCyclotron.java @@ -247,6 +247,10 @@ public class TileEntityMachineCyclotron extends TileEntity implements ISidedInve slots[7] = null; } + if(getCoolantTicksLeft() == 100) { + this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.shutdown", 10.0F, 1.0F); + } + if(getHeatLevel() == 1) { ExplosionChaos.flameDeath(worldObj, this.xCoord, this.yCoord, zCoord, 15); } @@ -318,6 +322,8 @@ public class TileEntityMachineCyclotron extends TileEntity implements ISidedInve } else { progress = 0; } + + power = Library.chargeItemsFromTE(slots, 9, power, maxPower); } } @@ -483,6 +489,15 @@ public class TileEntityMachineCyclotron extends TileEntity implements ISidedInve return 4; } + public int getCoolantTicksLeft() { + if(slots[7] != null && slots[7].getItem() == ModItems.pellet_coolant) { + int i = slots[7].getMaxDamage() - slots[7].getItemDamage(); + return i; + } + + return 0; + } + public boolean isPart(ItemStack stack) { if(stack != null) { if(stack.getItem() == ModItems.part_lithium) diff --git a/com/hbm/tileentity/TileEntityMachineDeuterium.java b/com/hbm/tileentity/TileEntityMachineDeuterium.java index c26b526e0..b09496976 100644 --- a/com/hbm/tileentity/TileEntityMachineDeuterium.java +++ b/com/hbm/tileentity/TileEntityMachineDeuterium.java @@ -4,6 +4,7 @@ import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; +import com.hbm.lib.Library; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -322,40 +323,8 @@ public class TileEntityMachineDeuterium extends TileEntity implements ISidedInve if (slots[1] != null && slots[1].getItem() == ModItems.inf_water) { water = maxFill; } - - if (/* power + 100 <= maxPower && */slots[0] != null && slots[0].getItem() == ModItems.battery_creative) { - power = maxPower; - } - - if (power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.battery_generic - && slots[0].getItemDamage() < 50) { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } - - if (power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.battery_advanced - && slots[0].getItemDamage() < 200) { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } - - if (power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.battery_schrabidium - && slots[0].getItemDamage() < 1000) { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } - - if (power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.fusion_core - && slots[0].getItemDamage() < 5000) { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } - - if (power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.energy_core - && slots[0].getItemDamage() < 5000) { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } + + power = Library.chargeTEFromItems(slots, 0, power, maxPower); if (canProcess()) { process(); diff --git a/com/hbm/tileentity/TileEntityMachineDiesel.java b/com/hbm/tileentity/TileEntityMachineDiesel.java index e11a55641..48986c5a3 100644 --- a/com/hbm/tileentity/TileEntityMachineDiesel.java +++ b/com/hbm/tileentity/TileEntityMachineDiesel.java @@ -295,31 +295,8 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento } // Battery Item - if (power - 100 >= 0 && slots[2] != null && slots[2].getItem() == ModItems.battery_generic - && slots[2].getItemDamage() > 0) { - power -= 100; - slots[2].setItemDamage(slots[2].getItemDamage() - 1); - } - if (power - 100 >= 0 && slots[2] != null && slots[2].getItem() == ModItems.battery_advanced - && slots[2].getItemDamage() > 0) { - power -= 100; - slots[2].setItemDamage(slots[2].getItemDamage() - 1); - } - if (power - 100 >= 0 && slots[2] != null && slots[2].getItem() == ModItems.battery_schrabidium - && slots[2].getItemDamage() > 0) { - power -= 100; - slots[2].setItemDamage(slots[2].getItemDamage() - 1); - } - if (power - 100 >= 0 && slots[2] != null && slots[2].getItem() == ModItems.factory_core_titanium - && slots[2].getItemDamage() > 0) { - power -= 100; - slots[2].setItemDamage(slots[2].getItemDamage() - 1); - } - if (power - 100 >= 0 && slots[2] != null && slots[2].getItem() == ModItems.factory_core_advanced - && slots[2].getItemDamage() > 0) { - power -= 100; - slots[2].setItemDamage(slots[2].getItemDamage() - 1); - } + + power = Library.chargeItemsFromTE(slots, 2, power, maxPower); generate(); } diff --git a/com/hbm/tileentity/TileEntityMachineElectricFurnace.java b/com/hbm/tileentity/TileEntityMachineElectricFurnace.java index 401d46a67..c912571b7 100644 --- a/com/hbm/tileentity/TileEntityMachineElectricFurnace.java +++ b/com/hbm/tileentity/TileEntityMachineElectricFurnace.java @@ -6,6 +6,7 @@ import com.hbm.interfaces.IConsumer; import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; +import com.hbm.lib.Library; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -306,40 +307,7 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid } } - if(/*power + 100 <= maxPower && */slots[0] != null && slots[0].getItem() == ModItems.battery_creative) - { - power = maxPower; - } - - if(power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.battery_generic && slots[0].getItemDamage() < 50) - { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } - - if(power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.battery_advanced && slots[0].getItemDamage() < 200) - { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } - - if(power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.battery_schrabidium && slots[0].getItemDamage() < 10000) - { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } - - if(power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.fusion_core && slots[0].getItemDamage() < 5000) - { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } - - if(power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.energy_core && slots[0].getItemDamage() < 5000) - { - power += 100; - slots[0].setItemDamage(slots[0].getItemDamage() + 1); - } + power = Library.chargeTEFromItems(slots, 0, power, maxPower); if(flag1) { diff --git a/com/hbm/tileentity/TileEntityMachineGenerator.java b/com/hbm/tileentity/TileEntityMachineGenerator.java index ff84b2f11..c69e1e7a3 100644 --- a/com/hbm/tileentity/TileEntityMachineGenerator.java +++ b/com/hbm/tileentity/TileEntityMachineGenerator.java @@ -574,31 +574,8 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve } //Batteries - if(power - 100 >= 0 && slots[11] != null && slots[11].getItem() == ModItems.battery_generic && slots[11].getItemDamage() > 0) - { - power -= 100; - slots[11].setItemDamage(slots[11].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[11] != null && slots[11].getItem() == ModItems.battery_advanced && slots[11].getItemDamage() > 0) - { - power -= 100; - slots[11].setItemDamage(slots[11].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[11] != null && slots[11].getItem() == ModItems.battery_schrabidium && slots[11].getItemDamage() > 0) - { - power -= 100; - slots[11].setItemDamage(slots[11].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[11] != null && slots[11].getItem() == ModItems.factory_core_titanium && slots[11].getItemDamage() > 0) - { - power -= 100; - slots[11].setItemDamage(slots[11].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[11] != null && slots[11].getItem() == ModItems.factory_core_advanced && slots[11].getItemDamage() > 0) - { - power -= 100; - slots[11].setItemDamage(slots[11].getItemDamage() - 1); - } + + power = Library.chargeItemsFromTE(slots, 11, power, powerMax); } public void attemptPower(int i) { diff --git a/com/hbm/tileentity/TileEntityMachineIGenerator.java b/com/hbm/tileentity/TileEntityMachineIGenerator.java index 559440f38..39ba3c067 100644 --- a/com/hbm/tileentity/TileEntityMachineIGenerator.java +++ b/com/hbm/tileentity/TileEntityMachineIGenerator.java @@ -455,31 +455,7 @@ public class TileEntityMachineIGenerator extends TileEntity implements ISidedInv } public void doBatteryTask() { - if(power - 100 >= 0 && slots[15] != null && slots[15].getItem() == ModItems.battery_generic && slots[15].getItemDamage() > 0) - { - power -= 100; - slots[15].setItemDamage(slots[15].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[15] != null && slots[15].getItem() == ModItems.battery_advanced && slots[15].getItemDamage() > 0) - { - power -= 100; - slots[15].setItemDamage(slots[15].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[15] != null && slots[15].getItem() == ModItems.battery_schrabidium && slots[15].getItemDamage() > 0) - { - power -= 100; - slots[15].setItemDamage(slots[15].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[15] != null && slots[15].getItem() == ModItems.factory_core_titanium && slots[15].getItemDamage() > 0) - { - power -= 100; - slots[15].setItemDamage(slots[15].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[15] != null && slots[15].getItem() == ModItems.factory_core_advanced && slots[15].getItemDamage() > 0) - { - power -= 100; - slots[15].setItemDamage(slots[15].getItemDamage() - 1); - } + power = Library.chargeItemsFromTE(slots, 15, power, maxPower); } public int canLocateThermalElement() { diff --git a/com/hbm/tileentity/TileEntityMachineSchrabidiumTransmutator.java b/com/hbm/tileentity/TileEntityMachineSchrabidiumTransmutator.java index 76c91960e..2758f1e4f 100644 --- a/com/hbm/tileentity/TileEntityMachineSchrabidiumTransmutator.java +++ b/com/hbm/tileentity/TileEntityMachineSchrabidiumTransmutator.java @@ -5,6 +5,7 @@ import java.util.Random; import com.hbm.interfaces.IConsumer; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; +import com.hbm.lib.Library; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; @@ -264,40 +265,8 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntity impleme public void updateEntity() { if (!worldObj.isRemote) { - if (slots[3] != null && slots[3].getItem() == ModItems.battery_creative) { - power = maxPower; - } - - if (power + 100 <= maxPower && slots[3] != null && slots[3].getItem() == ModItems.battery_generic - && slots[3].getItemDamage() < 50) { - power += 100; - slots[3].setItemDamage(slots[3].getItemDamage() + 1); - } - - if (power + 100 <= maxPower && slots[3] != null && slots[3].getItem() == ModItems.battery_advanced - && slots[3].getItemDamage() < 200) { - power += 100; - slots[3].setItemDamage(slots[3].getItemDamage() + 1); - } - - if (power + 100 <= maxPower && slots[3] != null && slots[3].getItem() == ModItems.battery_schrabidium - && slots[3].getItemDamage() < 10000) { - power += 100; - slots[3].setItemDamage(slots[3].getItemDamage() + 1); - } - - if (power + 100 <= maxPower && slots[3] != null && slots[3].getItem() == ModItems.fusion_core - && slots[3].getItemDamage() < 5000) { - power += 100; - slots[3].setItemDamage(slots[3].getItemDamage() + 1); - } - - if (power + 100 <= maxPower && slots[3] != null && slots[3].getItem() == ModItems.energy_core - && slots[3].getItemDamage() < 5000) { - power += 100; - slots[3].setItemDamage(slots[3].getItemDamage() + 1); - } - } + + power = Library.chargeTEFromItems(slots, 3, power, maxPower); if (canProcess()) { @@ -307,6 +276,7 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntity impleme } else { process = 0; } + } } @Override diff --git a/com/hbm/tileentity/TileEntityMachineShredder.java b/com/hbm/tileentity/TileEntityMachineShredder.java index 70e08b6b8..e53582677 100644 --- a/com/hbm/tileentity/TileEntityMachineShredder.java +++ b/com/hbm/tileentity/TileEntityMachineShredder.java @@ -260,40 +260,7 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven } } - if(/*power + 100 <= maxPower && */slots[29] != null && slots[29].getItem() == ModItems.battery_creative) - { - power = maxPower; - } - - if(power + 100 <= maxPower && slots[29] != null && slots[29].getItem() == ModItems.battery_generic && slots[29].getItemDamage() < 50) - { - power += 100; - slots[29].setItemDamage(slots[29].getItemDamage() + 1); - } - - if(power + 100 <= maxPower && slots[29] != null && slots[29].getItem() == ModItems.battery_advanced && slots[29].getItemDamage() < 200) - { - power += 100; - slots[29].setItemDamage(slots[29].getItemDamage() + 1); - } - - if(power + 100 <= maxPower && slots[29] != null && slots[29].getItem() == ModItems.battery_schrabidium && slots[29].getItemDamage() < 10000) - { - power += 100; - slots[29].setItemDamage(slots[29].getItemDamage() + 1); - } - - if(power + 100 <= maxPower && slots[29] != null && slots[29].getItem() == ModItems.fusion_core && slots[29].getItemDamage() < 5000) - { - power += 100; - slots[29].setItemDamage(slots[29].getItemDamage() + 1); - } - - if(power + 100 <= maxPower && slots[29] != null && slots[29].getItem() == ModItems.energy_core && slots[29].getItemDamage() < 5000) - { - power += 100; - slots[29].setItemDamage(slots[29].getItemDamage() + 1); - } + power = Library.chargeTEFromItems(slots, 29, power, maxPower); if(flag1) { diff --git a/com/hbm/tileentity/TileEntityReactorMultiblock.java b/com/hbm/tileentity/TileEntityReactorMultiblock.java index b43c52cac..33a5e041b 100644 --- a/com/hbm/tileentity/TileEntityReactorMultiblock.java +++ b/com/hbm/tileentity/TileEntityReactorMultiblock.java @@ -589,31 +589,8 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv } //Batteries - if(power - 100 >= 0 && slots[32] != null && slots[32].getItem() == ModItems.battery_generic && slots[32].getItemDamage() > 0) - { - power -= 100; - slots[32].setItemDamage(slots[32].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[32] != null && slots[32].getItem() == ModItems.battery_advanced && slots[32].getItemDamage() > 0) - { - power -= 100; - slots[32].setItemDamage(slots[32].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[32] != null && slots[32].getItem() == ModItems.battery_schrabidium && slots[32].getItemDamage() > 0) - { - power -= 100; - slots[32].setItemDamage(slots[32].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[32] != null && slots[32].getItem() == ModItems.factory_core_titanium && slots[32].getItemDamage() > 0) - { - power -= 100; - slots[32].setItemDamage(slots[32].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[32] != null && slots[32].getItem() == ModItems.factory_core_advanced && slots[32].getItemDamage() > 0) - { - power -= 100; - slots[32].setItemDamage(slots[32].getItemDamage() - 1); - } + + power = Library.chargeItemsFromTE(slots, 32, power, maxPower); } } diff --git a/com/hbm/tileentity/TileEntityWatzCore.java b/com/hbm/tileentity/TileEntityWatzCore.java index 6d0310b3a..78e60cc18 100644 --- a/com/hbm/tileentity/TileEntityWatzCore.java +++ b/com/hbm/tileentity/TileEntityWatzCore.java @@ -564,31 +564,7 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I if(waste > wasteMax) emptyWaste(); - if(power - 100 >= 0 && slots[37] != null && slots[37].getItem() == ModItems.battery_generic && slots[37].getItemDamage() > 0) - { - power -= 100; - slots[37].setItemDamage(slots[37].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[37] != null && slots[37].getItem() == ModItems.battery_advanced && slots[37].getItemDamage() > 0) - { - power -= 100; - slots[37].setItemDamage(slots[37].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[37] != null && slots[37].getItem() == ModItems.battery_schrabidium && slots[37].getItemDamage() > 0) - { - power -= 100; - slots[37].setItemDamage(slots[37].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[37] != null && slots[37].getItem() == ModItems.factory_core_titanium && slots[37].getItemDamage() > 0) - { - power -= 100; - slots[37].setItemDamage(slots[37].getItemDamage() - 1); - } - if(power - 100 >= 0 && slots[37] != null && slots[37].getItem() == ModItems.factory_core_advanced && slots[37].getItemDamage() > 0) - { - power -= 100; - slots[37].setItemDamage(slots[37].getItemDamage() - 1); - } + power = Library.chargeItemsFromTE(slots, 37, power, maxPower); if(waste - 2500000 >= 0 && slots[36] != null && slots[36].getItem() == ModItems.tank_waste && slots[36].getItemDamage() < 8) {