diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 32c64a20d..eb650e81b 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -79,6 +79,8 @@ tile.therm_exo.name=Exothermische Bombe tile.crashed_bomb.name=Blindgänger +tile.crate.name=Vorratskiste + tile.machine_difurnace_off.name=Legierungshochofen tile.machine_difurnace_on.name=Legierungshochofen container.diFurnace=Legierungshochofen @@ -116,6 +118,8 @@ tile.machine_schrabidium_transmutator.name=Schrabidium-Transmutationsgerät container.machine_schrabidium_transmutator=Schrabidium-Transmutationsgerät tile.machine_diesel.name=Dieselgenerator container.machineDiesel=Dieselgenerator +tile.machine_shredder.name=Shredder +container.machineShredder=Shredder tile.factory_titanium_hull.name=Einfache Fabrikshülle tile.factory_titanium_furnace.name=Einfache Fabrikzugriffsluke @@ -275,6 +279,15 @@ tile.ore_lead.name=Bleierz item.powder_lead.name=Bleistaub item.powder_neptunium.name=Neptuniumstaub item.powder_schrabidium.name=Schrabidiumstaub +item.powder_iron.name=Eisenstaub +item.powder_gold.name=Goldstaub +item.powder_aluminium.name=Aluminiumstaub +item.powder_beryllium.name=Berylliumstaub +item.powder_copper.name=Kupferstaub +item.powder_titanium.name=Titanstaub +item.powder_tungsten.name=Wolframstaub +item.powder_uranium.name=Uranstaub +item.dust.name=Staub item.battery_generic.name=Batterie item.battery_advanced.name=Fortgeschrittene Batterie @@ -413,6 +426,7 @@ tile.waste_planks.name=Verkohlte Holzbretter item.trinitite.name=Trinitit item.nuclear_waste.name=Atommüll +item.scrap.name=Schrott item.ingot_uranium_fuel.name=Urankernbrennstoffbarren item.ingot_plutonium_fuel.name=Plutoniumkernbrennstoffbarren @@ -517,6 +531,14 @@ item.gun_xvl1456_ammo.name=Kiste mit erschöpftem Uran-235 item.gun_osipr_ammo.name=Dunker Energiepuls-Plug item.gun_osipr_ammo2.name=Combine Ball +item.clip_revolver_iron.name=Box voll Eisenkugeln +item.clip_revolver.name=.357 Magnum Patronen +item.clip_revolver_gold.name=Schatulle mit goldenen Patronen +item.clip_revolver_schrabidium.name=Schrabidium-Muntionsbehälter +item.clip_rpg.name=Raketenbehälter +item.clip_xvl1456.name=Große Isotopenbox +item.clip_osipr.name=AR2 Magazin + tile.block_schrabidium.name=Schrabidiumblock item.plate_gold.name=Goldplatte @@ -583,6 +605,7 @@ item.schrabidium_shovel.name=Schrabidiumschaufel item.schrabidium_hoe.name=Schrabidiumfeldhacke item.chainsaw.name=Kettensäge +item.crowbar.name=Mk.V Kistenöffnungsapparat "Brechstange" item.mask_of_infamy.name=Maske der Schande @@ -651,6 +674,7 @@ item.thruster_large.name=Großes Raketentriebwerk item.wand_k.name=Konstruktions-Zauberstab item.wand_s.name=Struktur-Zauberstab +item.wand_d.name=Debug-Zauberstab item.steel_helmet.name=Stahlhelm item.steel_plate.name=Stahlbrustpanzer @@ -733,4 +757,13 @@ item.can_empty.name=Leere Dose item.can_smart.name='Smart' Energy-Drink item.can_creature.name='Creature' Energy-Drink item.can_redbomb.name='Red Bomb' Energy-Drink -item.can_mrsugar.name='Dr. Sugar' Softdrink \ No newline at end of file +item.can_mrsugar.name='Dr. Sugar' Softdrink + +item.blades_aluminium.name=Aluminiumsägeblatt +item.blades_gold.name=Goldenes Sägeblatt +item.blades_iron.name=Eisensägeblatt +item.blades_steel.name=Stahlsägeblatt +item.blades_titanium.name=Titansägeblatt +item.blades_advanced_alloy.name=Fortgeschrittenes Sägeblatt +item.blades_combine_steel.name=CMB-Sägeblatt +item.blades_schrabidium.name=Schrabidiumsägeblatt \ No newline at end of file diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 00bb3d49c..081351e09 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -79,6 +79,8 @@ tile.therm_exo.name=Exothermic Bomb tile.crashed_bomb.name=Dud +tile.crate.name=Supply Crate + tile.machine_difurnace_off.name=Alloy Furnace tile.machine_difurnace_on.name=Alloy Furnace container.diFurnace=Alloy Furnace @@ -116,6 +118,8 @@ tile.machine_schrabidium_transmutator.name=Schrabidium Transmutation Device container.machine_schrabidium_transmutator=Schrabidium Transmutation Device tile.machine_diesel.name=Diesel Generator container.machineDiesel=Diesel Generator +tile.machine_shredder.name=Shredder +container.machineShredder=Shredder tile.factory_titanium_hull.name=Basic Factory Casing tile.factory_titanium_furnace.name=Basic Factory Access Hatch @@ -275,6 +279,15 @@ tile.ore_lead.name=Lead Ore item.powder_lead.name=Lead Powder item.powder_neptunium.name=Neptunium Powder item.powder_schrabidium.name=Schrabidium Powder +item.powder_iron.name=Iron Powder +item.powder_gold.name=Gold Powder +item.powder_aluminium.name=Aluminium Powder +item.powder_beryllium.name=Beryllium Powder +item.powder_copper.name=Copper Powder +item.powder_titanium.name=Titanium Powder +item.powder_tungsten.name=Tungsten Powder +item.powder_uranium.name=Uranium Powder +item.dust.name=Dust item.battery_generic.name=Battery item.battery_advanced.name=Advanced Battery @@ -413,6 +426,7 @@ tile.waste_planks.name=Charred Wooden Planks item.trinitite.name=Trinitite item.nuclear_waste.name=Nuclear Waste +item.scrap.name=Scrap item.ingot_uranium_fuel.name=Ingot of Uranium Fuel item.ingot_plutonium_fuel.name=Ingot of Plutonium Fuel @@ -517,6 +531,14 @@ item.gun_xvl1456_ammo.name=Depleted Uranium-235 Box item.gun_osipr_ammo.name=Dark Energy Pulse Plug item.gun_osipr_ammo2.name=Combine Ball +item.clip_revolver_iron.name=Box of Iron Rounds +item.clip_revolver.name=Box of .357 Rounds +item.clip_revolver_gold.name=Small Coffer of Golden Bullets +item.clip_revolver_schrabidium.name=Schrabidium Ammo Container +item.clip_rpg.name=Rocket Container +item.clip_xvl1456.name=Large Isotope Box +item.clip_osipr.name=AR2 Magazine + tile.block_schrabidium.name=Block of Schrabidium item.plate_gold.name=Gold Plate @@ -583,6 +605,7 @@ item.schrabidium_shovel.name=Schrabidium Shovel item.schrabidium_hoe.name=Schrabidium Hoe item.chainsaw.name=Chainsaw +item.crowbar.name=Mk.V Crate Opening Device "Crowbar" item.mask_of_infamy.name=Mask of Infamy @@ -651,6 +674,7 @@ item.thruster_large.name=Large Thruster item.wand_k.name=Construction Wand item.wand_s.name=Structure Wand +item.wand_d.name=Debug Wand item.steel_helmet.name=Steel Helmet item.steel_plate.name=Steel Chestplate @@ -733,4 +757,13 @@ item.can_empty.name=Empty Can item.can_smart.name='Smart' Energy Drink item.can_creature.name='Creature' Energy Drink item.can_redbomb.name='Red Bomb' Energy Drink -item.can_mrsugar.name='Dr. Sugar' Soft Drink \ No newline at end of file +item.can_mrsugar.name='Dr. Sugar' Soft Drink + +item.blades_aluminium.name=Aluminium Shredder Blades +item.blades_gold.name=Golden Shredder Blades +item.blades_iron.name=Iron Shredder Blades +item.blades_steel.name=Steel Shredder Blades +item.blades_titanium.name=Titanium Shredder Blades +item.blades_advanced_alloy.name=Advanced Shredder Blades +item.blades_combine_steel.name=CMB Shredder Blades +item.blades_schrabidium.name=Schrabidium Shredder Blades \ No newline at end of file diff --git a/assets/hbm/textures/blocks/crate.png b/assets/hbm/textures/blocks/crate.png new file mode 100644 index 000000000..aa552c605 Binary files /dev/null and b/assets/hbm/textures/blocks/crate.png differ diff --git a/assets/hbm/textures/blocks/flame_war.png b/assets/hbm/textures/blocks/flame_war.png index aa552c605..8485b9185 100644 Binary files a/assets/hbm/textures/blocks/flame_war.png and b/assets/hbm/textures/blocks/flame_war.png differ diff --git a/assets/hbm/textures/blocks/machine_shredder_bottom.png b/assets/hbm/textures/blocks/machine_shredder_bottom.png new file mode 100644 index 000000000..e918f6ab3 Binary files /dev/null and b/assets/hbm/textures/blocks/machine_shredder_bottom.png differ diff --git a/assets/hbm/textures/blocks/machine_shredder_front.png b/assets/hbm/textures/blocks/machine_shredder_front.png new file mode 100644 index 000000000..faaaad21f Binary files /dev/null and b/assets/hbm/textures/blocks/machine_shredder_front.png differ diff --git a/assets/hbm/textures/blocks/machine_shredder_side.png b/assets/hbm/textures/blocks/machine_shredder_side.png new file mode 100644 index 000000000..9988a5648 Binary files /dev/null and b/assets/hbm/textures/blocks/machine_shredder_side.png differ diff --git a/assets/hbm/textures/blocks/machine_shredder_top.png b/assets/hbm/textures/blocks/machine_shredder_top.png new file mode 100644 index 000000000..7bba157a6 Binary files /dev/null and b/assets/hbm/textures/blocks/machine_shredder_top.png differ diff --git a/assets/hbm/textures/gui/gui_shredder.png b/assets/hbm/textures/gui/gui_shredder.png index 28d3593ff..34e2e4ea5 100644 Binary files a/assets/hbm/textures/gui/gui_shredder.png and b/assets/hbm/textures/gui/gui_shredder.png differ diff --git a/assets/hbm/textures/items/blades_aluminium.png b/assets/hbm/textures/items/blades_aluminium.png new file mode 100644 index 000000000..f1f53ab70 Binary files /dev/null and b/assets/hbm/textures/items/blades_aluminium.png differ diff --git a/assets/hbm/textures/items/blades_combine_steel.png b/assets/hbm/textures/items/blades_combine_steel.png new file mode 100644 index 000000000..f6e964f42 Binary files /dev/null and b/assets/hbm/textures/items/blades_combine_steel.png differ diff --git a/assets/hbm/textures/items/blades_gold.png b/assets/hbm/textures/items/blades_gold.png new file mode 100644 index 000000000..5328adf7c Binary files /dev/null and b/assets/hbm/textures/items/blades_gold.png differ diff --git a/assets/hbm/textures/items/blades_iron.png b/assets/hbm/textures/items/blades_iron.png new file mode 100644 index 000000000..4b159379d Binary files /dev/null and b/assets/hbm/textures/items/blades_iron.png differ diff --git a/assets/hbm/textures/items/blades_schrabidium.png b/assets/hbm/textures/items/blades_schrabidium.png new file mode 100644 index 000000000..59753bef8 Binary files /dev/null and b/assets/hbm/textures/items/blades_schrabidium.png differ diff --git a/assets/hbm/textures/items/clip_osipr.png b/assets/hbm/textures/items/clip_osipr.png new file mode 100644 index 000000000..203f928ae Binary files /dev/null and b/assets/hbm/textures/items/clip_osipr.png differ diff --git a/assets/hbm/textures/items/clip_revolver.png b/assets/hbm/textures/items/clip_revolver.png new file mode 100644 index 000000000..f2d1235a2 Binary files /dev/null and b/assets/hbm/textures/items/clip_revolver.png differ diff --git a/assets/hbm/textures/items/clip_revolver_gold.png b/assets/hbm/textures/items/clip_revolver_gold.png new file mode 100644 index 000000000..ceb691e34 Binary files /dev/null and b/assets/hbm/textures/items/clip_revolver_gold.png differ diff --git a/assets/hbm/textures/items/clip_revolver_iron.png b/assets/hbm/textures/items/clip_revolver_iron.png new file mode 100644 index 000000000..d04f865bd Binary files /dev/null and b/assets/hbm/textures/items/clip_revolver_iron.png differ diff --git a/assets/hbm/textures/items/clip_revolver_schrabidium.png b/assets/hbm/textures/items/clip_revolver_schrabidium.png new file mode 100644 index 000000000..6957b328f Binary files /dev/null and b/assets/hbm/textures/items/clip_revolver_schrabidium.png differ diff --git a/assets/hbm/textures/items/clip_rpg.png b/assets/hbm/textures/items/clip_rpg.png new file mode 100644 index 000000000..804ae9d38 Binary files /dev/null and b/assets/hbm/textures/items/clip_rpg.png differ diff --git a/assets/hbm/textures/items/clip_xvl1456.png b/assets/hbm/textures/items/clip_xvl1456.png new file mode 100644 index 000000000..d705aa680 Binary files /dev/null and b/assets/hbm/textures/items/clip_xvl1456.png differ diff --git a/assets/hbm/textures/items/dust.png b/assets/hbm/textures/items/dust.png new file mode 100644 index 000000000..8dcb2cf6e Binary files /dev/null and b/assets/hbm/textures/items/dust.png differ diff --git a/assets/hbm/textures/items/powder_aluminium.png b/assets/hbm/textures/items/powder_aluminium.png new file mode 100644 index 000000000..35742891f Binary files /dev/null and b/assets/hbm/textures/items/powder_aluminium.png differ diff --git a/assets/hbm/textures/items/powder_beryllium.png b/assets/hbm/textures/items/powder_beryllium.png new file mode 100644 index 000000000..77e0df52d Binary files /dev/null and b/assets/hbm/textures/items/powder_beryllium.png differ diff --git a/assets/hbm/textures/items/powder_coal.png b/assets/hbm/textures/items/powder_coal.png new file mode 100644 index 000000000..fc507721a Binary files /dev/null and b/assets/hbm/textures/items/powder_coal.png differ diff --git a/assets/hbm/textures/items/powder_copper.png b/assets/hbm/textures/items/powder_copper.png new file mode 100644 index 000000000..e6955b2b1 Binary files /dev/null and b/assets/hbm/textures/items/powder_copper.png differ diff --git a/assets/hbm/textures/items/powder_diamond.png b/assets/hbm/textures/items/powder_diamond.png new file mode 100644 index 000000000..230258c61 Binary files /dev/null and b/assets/hbm/textures/items/powder_diamond.png differ diff --git a/assets/hbm/textures/items/powder_gold.png b/assets/hbm/textures/items/powder_gold.png new file mode 100644 index 000000000..8f9a1525e Binary files /dev/null and b/assets/hbm/textures/items/powder_gold.png differ diff --git a/assets/hbm/textures/items/powder_iron.png b/assets/hbm/textures/items/powder_iron.png new file mode 100644 index 000000000..a97dd5dd6 Binary files /dev/null and b/assets/hbm/textures/items/powder_iron.png differ diff --git a/assets/hbm/textures/items/powder_titanium.png b/assets/hbm/textures/items/powder_titanium.png new file mode 100644 index 000000000..6502fba87 Binary files /dev/null and b/assets/hbm/textures/items/powder_titanium.png differ diff --git a/assets/hbm/textures/items/powder_tungsten.png b/assets/hbm/textures/items/powder_tungsten.png new file mode 100644 index 000000000..65bb0342b Binary files /dev/null and b/assets/hbm/textures/items/powder_tungsten.png differ diff --git a/assets/hbm/textures/items/powder_uranium.png b/assets/hbm/textures/items/powder_uranium.png new file mode 100644 index 000000000..833a87b09 Binary files /dev/null and b/assets/hbm/textures/items/powder_uranium.png differ diff --git a/com/hbm/blocks/Crate.java b/com/hbm/blocks/Crate.java new file mode 100644 index 000000000..696d29794 --- /dev/null +++ b/com/hbm/blocks/Crate.java @@ -0,0 +1,166 @@ +package com.hbm.blocks; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import com.hbm.items.ModItems; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatComponentText; +import net.minecraft.world.World; + +public class Crate extends Block { + + protected Crate(Material p_i45394_1_) { + super(p_i45394_1_); + } + + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) + { + return null; + } + + + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) { + if(player.getHeldItem() != null && player.getHeldItem().getItem().equals(ModItems.crowbar)) + { + dropItems(world, x, y, z); + world.setBlockToAir(x, y, z); + return true; + } else { + if(world.isRemote) + { + player.addChatMessage(new ChatComponentText("I'll need a crate opening device to get the loot, smashing the whole thing won't work...")); + } + } + + return false; + } + + public void dropItems(World world, int x, int y, int z) { + Random rand = new Random(); + List list = new ArrayList(); + + switch(rand.nextInt(23)) { + case 0: + list.add(ModItems.clip_revolver_iron); + list.add(ModItems.clip_revolver_iron); + break; + case 1: + list.add(ModItems.clip_revolver_iron); + list.add(ModItems.syringe_metal_stimpak); + list.add(ModItems.syringe_metal_stimpak); + break; + case 2: + list.add(ModItems.clip_revolver); + list.add(ModItems.syringe_metal_stimpak); + break; + case 3: + list.add(ModItems.clip_osipr); + list.add(ModItems.syringe_metal_stimpak); + break; + case 4: + list.add(ModItems.clip_osipr); + list.add(ModItems.clip_osipr); + list.add(ModItems.syringe_metal_stimpak); + break; + case 5: + list.add(ModItems.clip_revolver_iron); + list.add(ModItems.clip_revolver); + break; + case 6: + list.add(ModItems.clip_revolver_iron); + list.add(ModItems.clip_revolver_iron); + list.add(ModItems.clip_revolver); + break; + case 7: + list.add(ModItems.clip_revolver_iron); + list.add(ModItems.clip_osipr); + break; + case 8: + list.add(ModItems.clip_revolver_gold); + list.add(ModItems.syringe_metal_stimpak); + break; + case 9: + list.add(ModItems.clip_revolver_gold); + list.add(ModItems.clip_revolver_gold); + list.add(ModItems.syringe_metal_stimpak); + break; + case 10: + list.add(ModItems.clip_revolver_schrabidium); + break; + case 11: + list.add(ModItems.clip_xvl1456); + break; + case 12: + list.add(ModItems.clip_xvl1456); + list.add(ModItems.clip_xvl1456); + break; + case 13: + list.add(ModItems.clip_xvl1456); + list.add(ModItems.syringe_metal_stimpak); + break; + case 14: + list.add(ModItems.clip_osipr); + list.add(ModItems.clip_osipr); + list.add(ModItems.syringe_metal_stimpak); + break; + case 15: + list.add(ModItems.clip_osipr); + list.add(ModItems.syringe_metal_stimpak); + list.add(ModItems.syringe_metal_stimpak); + break; + case 16: + list.add(ModItems.clip_revolver_gold); + list.add(ModItems.clip_revolver_gold); + break; + case 17: + list.add(ModItems.clip_rpg); + list.add(ModItems.clip_rpg); + break; + case 18: + list.add(ModItems.clip_rpg); + list.add(ModItems.syringe_metal_stimpak); + break; + case 19: + list.add(ModItems.clip_rpg); + list.add(ModItems.clip_revolver_iron); + list.add(ModItems.syringe_metal_stimpak); + case 20: + list.add(ModItems.clip_rpg); + list.add(ModItems.clip_revolver); + list.add(ModItems.syringe_metal_stimpak); + break; + case 21: + list.add(ModItems.syringe_metal_stimpak); + list.add(ModItems.syringe_metal_stimpak); + break; + case 22: + list.add(ModItems.syringe_metal_stimpak); + list.add(ModItems.syringe_metal_stimpak); + list.add(ModItems.syringe_metal_stimpak); + break; + } + + for(Item stack : list) { + float f = rand.nextFloat() * 0.8F + 0.1F; + float f1 = rand.nextFloat() * 0.8F + 0.1F; + float f2 = rand.nextFloat() * 0.8F + 0.1F; + EntityItem entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(stack)); + + float f3 = 0.05F; + entityitem.motionX = (float)rand.nextGaussian() * f3; + entityitem.motionY = (float)rand.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float)rand.nextGaussian() * f3; + if(!world.isRemote) + world.spawnEntityInWorld(entityitem); + } + } +} diff --git a/com/hbm/blocks/MachineShredder.java b/com/hbm/blocks/MachineShredder.java index 89f375b7a..7e5a98b75 100644 --- a/com/hbm/blocks/MachineShredder.java +++ b/com/hbm/blocks/MachineShredder.java @@ -35,10 +35,10 @@ public class MachineShredder extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_bottom"); - this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_top"); - this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_side"); - this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_front"); + this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_bottom"); + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_top"); + this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_side"); + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_front"); } @Override diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 8d3db5c18..ea9a81e50 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -113,6 +113,8 @@ public class ModBlocks { public static Block red_barrel; public static Block yellow_barrel; public static Block crashed_balefire; + + public static Block crate; public static Block nuke_gadget; public static final int guiID_nuke_gadget = 3; @@ -482,6 +484,8 @@ public class ModBlocks { launch_pad_mirv = new LaunchPad(Material.iron).setBlockName("launch_pad_mirv").setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":launch_pad"); book_guide = new Guide(Material.iron).setBlockName("book_guide").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke); + + crate = new Crate(Material.iron).setBlockName("crate").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":crate"); machine_schrabidium_transmutator = new MachineSchrabidiumTransmutator(Material.iron).setBlockName("machine_schrabidium_transmutator").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock); @@ -696,6 +700,9 @@ public class ModBlocks { //Guide GameRegistry.registerBlock(book_guide, book_guide.getUnlocalizedName()); + //Crate + GameRegistry.registerBlock(crate, crate.getUnlocalizedName()); + //ElB GameRegistry.registerBlock(statue_elb, statue_elb.getUnlocalizedName()); GameRegistry.registerBlock(statue_elb_g, statue_elb_g.getUnlocalizedName()); diff --git a/com/hbm/blocks/TileEntityMachineElectricFurnace.java b/com/hbm/blocks/TileEntityMachineElectricFurnace.java index 958264812..f64aee638 100644 --- a/com/hbm/blocks/TileEntityMachineElectricFurnace.java +++ b/com/hbm/blocks/TileEntityMachineElectricFurnace.java @@ -217,8 +217,8 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid { return false; } - //ItemStack itemStack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[1]); - ItemStack itemStack = MachineRecipes.getShredderResult(this.slots[1]); + ItemStack itemStack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[1]); + //ItemStack itemStack = MachineRecipes.getShredderResult(this.slots[1]); if(itemStack == null) { return false; @@ -242,8 +242,8 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid private void processItem() { if(canProcess()) { - //ItemStack itemStack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[1]); - ItemStack itemStack = MachineRecipes.getShredderResult(this.slots[1]); + ItemStack itemStack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[1]); + //ItemStack itemStack = MachineRecipes.getShredderResult(this.slots[1]); if(slots[2] == null) { diff --git a/com/hbm/blocks/TileEntityMachineShredder.java b/com/hbm/blocks/TileEntityMachineShredder.java index 28b07e30a..ee239cbe0 100644 --- a/com/hbm/blocks/TileEntityMachineShredder.java +++ b/com/hbm/blocks/TileEntityMachineShredder.java @@ -34,9 +34,9 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven public static final int maxPower = 10000; public static final int processingSpeed = 60; - private static final int[] slots_top = new int[] {0}; - private static final int[] slots_bottom = new int[] {1, 2}; - private static final int[] slots_side = new int[] {2}; + private static final int[] slots_top = new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8}; + private static final int[] slots_bottom = new int[] {9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}; + private static final int[] slots_side = new int[] {27, 28, 29}; private String customName; @@ -77,7 +77,7 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven @Override public String getInventoryName() { - return this.hasCustomInventoryName() ? this.customName : "container.machineDiesel"; + return this.hasCustomInventoryName() ? this.customName : "container.machineShredder"; } @Override @@ -113,10 +113,9 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven @Override public boolean isItemValidForSlot(int i, ItemStack stack) { if(i == 0) - if(stack.getItem() == ModItems.canister_fuel || stack.getItem() == Item.getItemFromBlock(ModBlocks.red_barrel)) return true; if(i == 2) - if(stack.getItem() instanceof ItemBattery) + if(stack.getItem() instanceof ItemBattery || stack.getItem() instanceof ItemBlades) return true; return false; @@ -195,11 +194,10 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven @Override public boolean canExtractItem(int i, ItemStack itemStack, int j) { - if(i == 1) - if(itemStack.getItem() == ModItems.canister_empty || itemStack.getItem() == ModItems.tank_steel) + if(i >= 9 && i <= 28) return true; - if(i == 2) - if(itemStack.getItemDamage() == 0) + if(i >= 27 && i <= 29) + if(itemStack.getItemDamage() == itemStack.getMaxDamage()) return true; return false; @@ -239,6 +237,12 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven this.processItem(); flag1 = true; } + if(soundCycle == 0) + this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "minecart.base", 1.0F, 0.75F); + soundCycle++; + + if(soundCycle >= 50) + soundCycle = 0; }else{ progress = 0; } @@ -438,4 +442,38 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven public int getMaxPower() { return this.maxPower; } + + public int getGearLeft() { + + if(slots[27] != null && slots[27].getItem() instanceof ItemBlades) + { + if(slots[27].getItemDamage() < slots[27].getItem().getMaxDamage()/2) + { + return 1; + } else if(slots[27].getItemDamage() != slots[27].getItem().getMaxDamage()) { + return 2; + } else { + return 3; + } + } + + return 0; + } + + public int getGearRight() { + + if(slots[28] != null && slots[28].getItem() instanceof ItemBlades) + { + if(slots[28].getItemDamage() < slots[28].getItem().getMaxDamage()/2) + { + return 1; + } else if(slots[28].getItemDamage() != slots[28].getItem().getMaxDamage()) { + return 2; + } else { + return 3; + } + } + + return 0; + } } diff --git a/com/hbm/entity/EntityCombineBall.java b/com/hbm/entity/EntityCombineBall.java index fc8ca7c44..11298d57b 100644 --- a/com/hbm/entity/EntityCombineBall.java +++ b/com/hbm/entity/EntityCombineBall.java @@ -569,4 +569,15 @@ public class EntityCombineBall extends Entity implements IProjectile byte b0 = this.dataWatcher.getWatchableObjectByte(16); return (b0 & 1) != 0; } + + @Override + @SideOnly(Side.CLIENT) + public int getBrightnessForRender(float p_70070_1_) { + return super.getBrightnessForRender(p_70070_1_); + } + + @Override + public float getBrightness(float p_70013_1_) { + return super.getBrightness(p_70013_1_); + } } \ No newline at end of file diff --git a/com/hbm/gui/ContainerMachineShredder.java b/com/hbm/gui/ContainerMachineShredder.java index edac45170..237945c81 100644 --- a/com/hbm/gui/ContainerMachineShredder.java +++ b/com/hbm/gui/ContainerMachineShredder.java @@ -14,6 +14,7 @@ public class ContainerMachineShredder extends Container { private TileEntityMachineShredder diFurnace; private int power; + private int progress; public ContainerMachineShredder(InventoryPlayer invPlayer, TileEntityMachineShredder tedf) { power = 0; @@ -69,6 +70,7 @@ public class ContainerMachineShredder extends Container { public void addCraftingToCrafters(ICrafting crafting) { super.addCraftingToCrafters(crafting); crafting.sendProgressBarUpdate(this, 0, this.diFurnace.power); + crafting.sendProgressBarUpdate(this, 1, this.diFurnace.progress); } @Override @@ -82,16 +84,17 @@ public class ContainerMachineShredder extends Container { ItemStack var5 = var4.getStack(); var3 = var5.copy(); - if (par2 <= 2) { - if (!this.mergeItemStack(var5, 3, this.inventorySlots.size(), true)) + if (par2 <= 29) { + if (!this.mergeItemStack(var5, 30, this.inventorySlots.size(), true)) { return null; } } - else if (!this.mergeItemStack(var5, 0, 1, false)) + else { - if (!this.mergeItemStack(var5, 2, 3, false)) - return null; + if (!this.mergeItemStack(var5, 0, 9, false)) + if (!this.mergeItemStack(var5, 27, 30, false)) + return null; } if (var5.stackSize == 0) @@ -124,9 +127,15 @@ public class ContainerMachineShredder extends Container { { par1.sendProgressBarUpdate(this, 0, this.diFurnace.power); } + + if(this.progress != this.diFurnace.progress) + { + par1.sendProgressBarUpdate(this, 1, this.diFurnace.progress); + } } - + this.power = this.diFurnace.power; + this.progress = this.diFurnace.progress; } @Override @@ -135,5 +144,9 @@ public class ContainerMachineShredder extends Container { { diFurnace.power = j; } + if(i == 1) + { + diFurnace.progress = j; + } } } diff --git a/com/hbm/gui/GUIMachineShredder.java b/com/hbm/gui/GUIMachineShredder.java index 11a54e4c1..6710f66ed 100644 --- a/com/hbm/gui/GUIMachineShredder.java +++ b/com/hbm/gui/GUIMachineShredder.java @@ -40,8 +40,45 @@ public class GUIMachineShredder extends GuiContainer { drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); if(diFurnace.power > 0) { - int i = diFurnace.getPowerScaled(52); - //drawTexturedModalRect(guiLeft + 152, guiTop + 69 - i, 176, 52 - i, 16, i); + int i = diFurnace.getPowerScaled(88); + drawTexturedModalRect(guiLeft + 8, guiTop + 106 - i, 176, 160 - i, 16, i); } + + if(diFurnace.getGearLeft() != 0) + { + int i = diFurnace.getGearLeft(); + if(i == 1) + { + drawTexturedModalRect(guiLeft + 43, guiTop + 71, 176, 0, 18, 18); + } + if(i == 2) + { + drawTexturedModalRect(guiLeft + 43, guiTop + 71, 176, 18, 18, 18); + } + if(i == 3) + { + drawTexturedModalRect(guiLeft + 43, guiTop + 71, 176, 36, 18, 18); + } + } + + if(diFurnace.getGearRight() != 0) + { + int i = diFurnace.getGearRight(); + if(i == 1) + { + drawTexturedModalRect(guiLeft + 79, guiTop + 71, 194, 0, 18, 18); + } + if(i == 2) + { + drawTexturedModalRect(guiLeft + 79, guiTop + 71, 194, 18, 18, 18); + } + if(i == 3) + { + drawTexturedModalRect(guiLeft + 79, guiTop + 71, 194, 36, 18, 18); + } + } + + int j1 = diFurnace.getDiFurnaceProgressScaled(34); + drawTexturedModalRect(guiLeft + 63, guiTop + 89, 176, 54, j1 + 1, 18); } } diff --git a/com/hbm/gui/MachineRecipes.java b/com/hbm/gui/MachineRecipes.java index 6755d013f..e7fac99c3 100644 --- a/com/hbm/gui/MachineRecipes.java +++ b/com/hbm/gui/MachineRecipes.java @@ -600,7 +600,7 @@ public class MachineRecipes { setRecipe(theWholeThing.get(i).item, new ItemStack(ModItems.scrap)); } } else if (s.length() > 4 && s.substring(0, 4).equals("dust")) { - setRecipe(theWholeThing.get(i).item, theWholeThing.get(i).item); + setRecipe(theWholeThing.get(i).item, new ItemStack(ModItems.dust)); } else { setRecipe(theWholeThing.get(i).item, new ItemStack(ModItems.scrap)); } @@ -640,6 +640,21 @@ public class MachineRecipes { recipes.add(recipe); } + public void overridePreSetRecipe(ItemStack inp, ItemStack outp) { + for(int i = 0; i < recipes.size(); i++) + { + if(recipes.get(i) != null && + recipes.get(i).input != null && + recipes.get(i).input.getItem() != null && + recipes.get(i).output != null && + inp != null && + inp.getItem() != null && + outp != null && + recipes.get(i).input.getItem().equals(inp.getItem())) + recipes.get(i).output = outp; + } + } + public void PrintRecipes() { /*for(int i = 0; i < recipes.size(); i++) { System.out.println("Recipe #" + i + ", " + recipes.get(i).input + " - " + recipes.get(i).output); @@ -656,7 +671,7 @@ public class MachineRecipes { }*/ - /*for (int j = 0; j < recipes.size(); j++) { + for (int j = 0; j < recipes.size(); j++) { if (recipes.get(j) != null && recipes.get(j).input != null && recipes.get(j).output != null && recipes.get(j).input.getItem() != null && recipes.get(j).output.getItem() != null) System.out.println(recipes.get(j).input + " | " + recipes.get(j).output); @@ -664,7 +679,7 @@ public class MachineRecipes { System.out.println(recipes.get(j)); } - System.out.println("TWT: " + theWholeThing.size() + ", REC: " + recipes.size());*/ + System.out.println("TWT: " + theWholeThing.size() + ", REC: " + recipes.size()); } } diff --git a/com/hbm/handler/FuelHandler.java b/com/hbm/handler/FuelHandler.java new file mode 100644 index 000000000..0a313a78c --- /dev/null +++ b/com/hbm/handler/FuelHandler.java @@ -0,0 +1,23 @@ +package com.hbm.handler; + +import com.hbm.items.ModItems; + +import cpw.mods.fml.common.IFuelHandler; +import net.minecraft.item.ItemStack; + +public class FuelHandler implements IFuelHandler { + + @Override + public int getBurnTime(ItemStack fuel) { + + if(fuel.getItem().equals(ModItems.canister_fuel)) + return 32000; + if(fuel.getItem().equals(ModItems.scrap)) + return 4000; + if(fuel.getItem().equals(ModItems.powder_fire)) + return 20000; + + return 0; + } + +} diff --git a/com/hbm/items/ArmorT45.java b/com/hbm/items/ArmorT45.java index 50d0e0dfe..080db607d 100644 --- a/com/hbm/items/ArmorT45.java +++ b/com/hbm/items/ArmorT45.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; +import net.minecraft.util.EntityDamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.item.ItemArmor; @@ -137,7 +138,7 @@ public class ArmorT45 extends ItemArmor implements ISpecialArmor { if(source.isExplosion()) return new ArmorProperties(1, 1, MathHelper.floor_double(10)); } - return new ArmorProperties(1, 1, MathHelper.floor_double(3)); + return new ArmorProperties(1, 1, MathHelper.floor_double(15)); } @Override diff --git a/com/hbm/items/ItemClip.java b/com/hbm/items/ItemClip.java new file mode 100644 index 000000000..ffef4713f --- /dev/null +++ b/com/hbm/items/ItemClip.java @@ -0,0 +1,90 @@ +package com.hbm.items; + +import com.hbm.blocks.ModBlocks; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; + +public class ItemClip extends Item { + + public ItemClip() + { + this.setMaxDamage(1); + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + stack.stackSize--; + if(stack.stackSize <= 0) + stack.damageItem(5, player); + + if(this == ModItems.clip_revolver_iron) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_iron_ammo, 20))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_revolver_iron_ammo, 20), false); + } + } + + if(this == ModItems.clip_revolver) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_ammo, 12))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_revolver_ammo, 12), false); + } + } + + if(this == ModItems.clip_revolver_gold) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_gold_ammo, 4))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_revolver_gold_ammo, 4), false); + } + } + + if(this == ModItems.clip_revolver_schrabidium) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_schrabidium_ammo, 2))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_revolver_schrabidium_ammo, 2), false); + } + } + + if(this == ModItems.clip_rpg) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 3))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_rpg_ammo, 3), false); + } + } + + if(this == ModItems.clip_osipr) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_osipr_ammo, 30))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_osipr_ammo, 30), false); + } + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_osipr_ammo2, 1))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_osipr_ammo2, 1), false); + } + } + + if(this == ModItems.clip_xvl1456) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_xvl1456_ammo, 60))) + { + player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_xvl1456_ammo, 60), false); + } + } + + return stack; + + } +} diff --git a/com/hbm/items/ItemCustomLore.java b/com/hbm/items/ItemCustomLore.java index d0d4dbf0e..a194398f3 100644 --- a/com/hbm/items/ItemCustomLore.java +++ b/com/hbm/items/ItemCustomLore.java @@ -320,6 +320,11 @@ public class ItemCustomLore extends Item { list.add("Not actual cake, but great"); list.add("universal fusion fuel!"); } + + if(this == ModItems.dust) + { + list.add("I hate dust!"); + } } @Override diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 0cb53621b..14b99dcc3 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -101,6 +101,16 @@ public class ModItems { public static Item powder_lead; public static Item powder_neptunium; public static Item powder_schrabidium; + + public static Item powder_aluminium; + public static Item powder_beryllium; + public static Item powder_copper; + public static Item powder_gold; + public static Item powder_iron; + public static Item powder_titanium; + public static Item powder_tungsten; + public static Item powder_uranium; + public static Item dust; public static Item coil_copper; public static Item coil_copper_torus; @@ -179,9 +189,14 @@ public class ModItems { public static Item chopper_blades; public static Item combine_scrap; + public static Item blades_gold; + public static Item blades_aluminium; + public static Item blades_iron; public static Item blades_steel; public static Item blades_titanium; public static Item blades_advanced_alloy; + public static Item blades_combine_steel; + public static Item blades_schrabidium; public static Item pellet_rtg; public static Item tritium_deuterium_cake; @@ -542,6 +557,14 @@ public class ModItems { public static Item missile_kit; public static Item t45_kit; public static Item euphemium_kit; + + public static Item clip_revolver_iron; + public static Item clip_revolver; + public static Item clip_revolver_gold; + public static Item clip_revolver_schrabidium; + public static Item clip_rpg; + public static Item clip_osipr; + public static Item clip_xvl1456; public static Item igniter; public static Item detonator; @@ -656,6 +679,15 @@ public class ModItems { powder_lead = new Item().setUnlocalizedName("powder_lead").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lead"); powder_neptunium = new Item().setUnlocalizedName("powder_neptunium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_neptunium"); powder_schrabidium = new ItemCustomLore().setUnlocalizedName("powder_schrabidium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_schrabidium"); + powder_aluminium = new Item().setUnlocalizedName("powder_aluminium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_aluminium"); + powder_beryllium = new Item().setUnlocalizedName("powder_beryllium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_beryllium"); + powder_copper = new Item().setUnlocalizedName("powder_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_copper"); + powder_gold = new Item().setUnlocalizedName("powder_gold").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_gold"); + powder_iron = new Item().setUnlocalizedName("powder_iron").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_iron"); + powder_titanium = new Item().setUnlocalizedName("powder_titanium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_titanium"); + powder_tungsten = new Item().setUnlocalizedName("powder_tungsten").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_tungsten"); + powder_uranium = new Item().setUnlocalizedName("powder_uranium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_uranium"); + dust = new ItemCustomLore().setUnlocalizedName("dust").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":dust"); coil_copper = new Item().setUnlocalizedName("coil_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":coil_copper"); coil_copper_torus = new Item().setUnlocalizedName("coil_copper_torus").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":coil_copper_torus"); @@ -751,9 +783,14 @@ public class ModItems { inf_sulfur = new Item().setUnlocalizedName("inf_sulfur").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_sulfur"); inf_diesel = new Item().setUnlocalizedName("inf_diesel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_diesel"); - blades_steel = new ItemBlades(12000).setUnlocalizedName("blades_steel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_steel"); - blades_titanium = new ItemBlades(42000).setUnlocalizedName("blades_titanium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_titanium"); - blades_advanced_alloy = new ItemBlades(72000).setUnlocalizedName("blades_advanced_alloy").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_advanced_alloy"); + blades_aluminium = new ItemBlades(1 * 1200).setUnlocalizedName("blades_aluminium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_aluminium"); + blades_gold = new ItemBlades(5 * 1200).setUnlocalizedName("blades_gold").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_gold"); + blades_iron = new ItemBlades(10 * 1200).setUnlocalizedName("blades_iron").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_iron"); + blades_steel = new ItemBlades(20 * 1200).setUnlocalizedName("blades_steel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_steel"); + blades_titanium = new ItemBlades(35 * 1200).setUnlocalizedName("blades_titanium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_titanium"); + blades_advanced_alloy = new ItemBlades(50 * 1200).setUnlocalizedName("blades_advanced_alloy").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_advanced_alloy"); + blades_combine_steel = new ItemBlades(90 * 1200).setUnlocalizedName("blades_combine_steel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_combine_steel"); + blades_schrabidium = new ItemBlades(120 * 1200).setUnlocalizedName("blades_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":blades_schrabidium"); canister_empty = new ItemCustomLore().setUnlocalizedName("canister_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":canister_empty"); canister_fuel = new ItemCustomLore().setUnlocalizedName("canister_fuel").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.canister_empty).setTextureName(RefStrings.MODID + ":canister_fuel"); @@ -1004,6 +1041,14 @@ public class ModItems { missile_kit = new ItemStarterKit().setUnlocalizedName("missile_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":missile_kit"); t45_kit = new ItemStarterKit().setUnlocalizedName("t45_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":t45_kit"); euphemium_kit = new ItemStarterKit().setUnlocalizedName("euphemium_kit").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":code"); + + clip_revolver_iron = new ItemClip().setUnlocalizedName("clip_revolver_iron").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_iron"); + clip_revolver = new ItemClip().setUnlocalizedName("clip_revolver").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver"); + clip_revolver_gold = new ItemClip().setUnlocalizedName("clip_revolver_gold").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_gold"); + clip_revolver_schrabidium = new ItemClip().setUnlocalizedName("clip_revolver_schrabidium").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_schrabidium"); + clip_rpg = new ItemClip().setUnlocalizedName("clip_rpg").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_rpg"); + clip_osipr = new ItemClip().setUnlocalizedName("clip_osipr").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_osipr"); + clip_xvl1456 = new ItemClip().setUnlocalizedName("clip_xvl1456").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_xvl1456"); ingot_euphemium = new ItemCustomLore().setUnlocalizedName("ingot_euphemium").setTextureName(RefStrings.MODID + ":ingot_euphemium"); nugget_euphemium = new ItemCustomLore().setUnlocalizedName("nugget_euphemium").setTextureName(RefStrings.MODID + ":nugget_euphemium"); @@ -1167,9 +1212,18 @@ public class ModItems { GameRegistry.registerItem(sulfur, sulfur.getUnlocalizedName()); GameRegistry.registerItem(niter, niter.getUnlocalizedName()); GameRegistry.registerItem(fluorite, fluorite.getUnlocalizedName()); - GameRegistry.registerItem(powder_lead, powder_lead.getUnlocalizedName()); + GameRegistry.registerItem(powder_iron, powder_iron.getUnlocalizedName()); + GameRegistry.registerItem(powder_gold, powder_gold.getUnlocalizedName()); + GameRegistry.registerItem(powder_uranium, powder_uranium.getUnlocalizedName()); GameRegistry.registerItem(powder_neptunium, powder_neptunium.getUnlocalizedName()); + GameRegistry.registerItem(powder_titanium, powder_titanium.getUnlocalizedName()); + GameRegistry.registerItem(powder_copper, powder_copper.getUnlocalizedName()); + GameRegistry.registerItem(powder_tungsten, powder_tungsten.getUnlocalizedName()); + GameRegistry.registerItem(powder_aluminium, powder_aluminium.getUnlocalizedName()); + GameRegistry.registerItem(powder_lead, powder_lead.getUnlocalizedName()); + GameRegistry.registerItem(powder_beryllium, powder_beryllium.getUnlocalizedName()); GameRegistry.registerItem(powder_schrabidium, powder_schrabidium.getUnlocalizedName()); + GameRegistry.registerItem(dust, dust.getUnlocalizedName()); //Powders GameRegistry.registerItem(powder_fire, powder_fire.getUnlocalizedName()); @@ -1356,9 +1410,14 @@ public class ModItems { GameRegistry.registerItem(titanium_filter, titanium_filter.getUnlocalizedName()); //Shredder Blades + GameRegistry.registerItem(blades_aluminium, blades_aluminium.getUnlocalizedName()); + GameRegistry.registerItem(blades_gold, blades_gold.getUnlocalizedName()); + GameRegistry.registerItem(blades_iron, blades_iron.getUnlocalizedName()); GameRegistry.registerItem(blades_steel, blades_steel.getUnlocalizedName()); GameRegistry.registerItem(blades_titanium, blades_titanium.getUnlocalizedName()); GameRegistry.registerItem(blades_advanced_alloy, blades_advanced_alloy.getUnlocalizedName()); + GameRegistry.registerItem(blades_combine_steel, blades_combine_steel.getUnlocalizedName()); + GameRegistry.registerItem(blades_schrabidium, blades_schrabidium.getUnlocalizedName()); //Fuelrods GameRegistry.registerItem(rod_empty, rod_empty.getUnlocalizedName()); @@ -1484,25 +1543,36 @@ public class ModItems { //Guns GameRegistry.registerItem(gun_revolver_iron, gun_revolver_iron.getUnlocalizedName()); - GameRegistry.registerItem(gun_revolver_iron_ammo, gun_revolver_iron_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver, gun_revolver.getUnlocalizedName()); - GameRegistry.registerItem(gun_revolver_ammo, gun_revolver_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_gold, gun_revolver_gold.getUnlocalizedName()); - GameRegistry.registerItem(gun_revolver_gold_ammo, gun_revolver_gold_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_schrabidium, gun_revolver_schrabidium.getUnlocalizedName()); - GameRegistry.registerItem(gun_revolver_schrabidium_ammo, gun_revolver_schrabidium_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_cursed, gun_revolver_cursed.getUnlocalizedName()); - GameRegistry.registerItem(gun_revolver_cursed_ammo, gun_revolver_cursed_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_rpg, gun_rpg.getUnlocalizedName()); - GameRegistry.registerItem(gun_rpg_ammo, gun_rpg_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_fatman, gun_fatman.getUnlocalizedName()); - GameRegistry.registerItem(gun_fatman_ammo, gun_fatman_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_xvl1456, gun_xvl1456.getUnlocalizedName()); - GameRegistry.registerItem(gun_xvl1456_ammo, gun_xvl1456_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_osipr, gun_osipr.getUnlocalizedName()); + GameRegistry.registerItem(gun_zomg, gun_zomg.getUnlocalizedName()); + + //Ammo + GameRegistry.registerItem(gun_revolver_iron_ammo, gun_revolver_iron_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_revolver_ammo, gun_revolver_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_revolver_gold_ammo, gun_revolver_gold_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_revolver_schrabidium_ammo, gun_revolver_schrabidium_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_revolver_cursed_ammo, gun_revolver_cursed_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_rpg_ammo, gun_rpg_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_fatman_ammo, gun_fatman_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_xvl1456_ammo, gun_xvl1456_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_osipr_ammo, gun_osipr_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_osipr_ammo2, gun_osipr_ammo2.getUnlocalizedName()); - GameRegistry.registerItem(gun_zomg, gun_zomg.getUnlocalizedName()); + + //Clips + GameRegistry.registerItem(clip_revolver_iron, clip_revolver_iron.getUnlocalizedName()); + GameRegistry.registerItem(clip_revolver, clip_revolver.getUnlocalizedName()); + GameRegistry.registerItem(clip_revolver_gold, clip_revolver_gold.getUnlocalizedName()); + GameRegistry.registerItem(clip_revolver_schrabidium, clip_revolver_schrabidium.getUnlocalizedName()); + GameRegistry.registerItem(clip_rpg, clip_rpg.getUnlocalizedName()); + GameRegistry.registerItem(clip_xvl1456, clip_xvl1456.getUnlocalizedName()); + GameRegistry.registerItem(clip_osipr, clip_osipr.getUnlocalizedName()); //Grenades GameRegistry.registerItem(grenade_generic, grenade_generic.getUnlocalizedName()); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 26e47a629..6e9350b0a 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -2,6 +2,8 @@ package com.hbm.main; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; @@ -119,6 +121,7 @@ import com.hbm.entity.EntitySchrab; import com.hbm.entity.EntityTestMissile; import com.hbm.gui.MachineRecipes; import com.hbm.gui.MachineRecipes.ShredderRecipe; +import com.hbm.handler.FuelHandler; import com.hbm.items.ModItems; import com.hbm.lib.HbmWorld; import com.hbm.lib.Library; @@ -223,6 +226,7 @@ public class MainRegistry CraftingManager.mainRegistry(); proxy.registerRenderInfo(); HbmWorld.mainRegistry(); + GameRegistry.registerFuelHandler(new FuelHandler()); Library.superuser.add("192af5d7-ed0f-48d8-bd89-9d41af8524f8"); @@ -400,6 +404,14 @@ public class MainRegistry OreDictionary.registerOre("plateIron", ModItems.plate_iron); OreDictionary.registerOre("plateGold", ModItems.plate_gold); OreDictionary.registerOre("plateAdvanced", ModItems.plate_advanced_alloy); + OreDictionary.registerOre("dustIron", ModItems.powder_iron); + OreDictionary.registerOre("dustGold", ModItems.powder_gold); + OreDictionary.registerOre("dustUranium", ModItems.powder_uranium); + OreDictionary.registerOre("dustTitanium", ModItems.powder_titanium); + OreDictionary.registerOre("dustTungsten", ModItems.powder_tungsten); + OreDictionary.registerOre("dustCopper", ModItems.powder_copper); + OreDictionary.registerOre("dustBeryllium", ModItems.powder_beryllium); + OreDictionary.registerOre("dustAluminum", ModItems.powder_aluminium); OreDictionary.registerOre("oreUranium", ModBlocks.ore_uranium); OreDictionary.registerOre("oreTitanium", ModBlocks.ore_titanium); @@ -412,6 +424,7 @@ public class MainRegistry OreDictionary.registerOre("oreAluminum", ModBlocks.ore_aluminium); OreDictionary.registerOre("oreFluorite", ModBlocks.ore_fluorite); OreDictionary.registerOre("oreLead", ModBlocks.ore_lead); + OreDictionary.registerOre("oreBeryllium", ModBlocks.ore_beryllium); OreDictionary.registerOre("blockUranium", ModBlocks.block_uranium); OreDictionary.registerOre("blockTitanium", ModBlocks.block_titanium); @@ -424,6 +437,7 @@ public class MainRegistry OreDictionary.registerOre("blockFluorite", ModBlocks.block_fluorite); OreDictionary.registerOre("blockSteel", ModBlocks.block_steel); OreDictionary.registerOre("blockLead", ModBlocks.block_lead); + OreDictionary.registerOre("blockBeryllium", ModBlocks.block_beryllium); } @EventHandler @@ -434,9 +448,12 @@ public class MainRegistry recipes.registerEverythingImSrs(); recipes.addRecipes(); + + recipes.overridePreSetRecipe(new ItemStack(ModItems.scrap), new ItemStack(ModItems.dust)); + recipes.overridePreSetRecipe(new ItemStack(ModItems.dust), new ItemStack(ModItems.dust)); + recipes.overridePreSetRecipe(new ItemStack(Blocks.glowstone), new ItemStack(Items.glowstone_dust, 4)); - //if(MainRegistry.enableDebugMode) - recipes.PrintRecipes(); + recipes.PrintRecipes(); } @EventHandler