diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index c61e2d681f..8e43c5506d 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -331,6 +331,7 @@ tile.crate_weapon.name=Waffenkiste tile.crate_lead.name=Gefahrenstoffkiste tile.crate_metal.name=Maschinenkiste tile.crate_red.name=Rote Kiste +tile.crate_can.name=Konservenkiste tile.marker_structure.name=Multiblock-Strukturvorlage tile.struct_launcher.name=Startrampe-Komponentenblock @@ -656,6 +657,8 @@ item.nugget_dineutronium.name=Dineutroniumnugget item.ingot_starmetal.name=Sternenmetallbarren item.ingot_saturnite.name=Saturnitbarren item.plate_saturnite.name=Saturnitplatte +item.ingot_fiberglass.name=Fiberglasstafel +item.ingot_asbestos.name=Asbestplatte item.solid_fuel.name=Festbrennstoff item.rocket_fuel.name=Festbrennstoff (Raketentreibstoff) @@ -757,6 +760,8 @@ tile.block_verticium.name=Verticiumblock tile.block_desh.name=Verstärketer Deshblock tile.block_yellowcake.name=Yellowcakeblock tile.block_starmetal.name=Sternenmetallblock +tile.block_fiberglass.name=Fiberglasrolle +tile.block_asbestos.name=Asbestblock tile.ore_aluminium.name=Aluminiumerz tile.ore_copper.name=Kupfererz @@ -810,6 +815,7 @@ tile.deco_aluminium.name=Aluminium-Dekoblock tile.deco_steel.name=Stahl-Dekoblock tile.deco_lead.name=Blei-Dekoblock tile.deco_beryllium.name=Beryllium-Dekoblock +tile.deco_asbestos.name=Asbestdach tile.hazmat.name=Strahlenschutzstoff-Block @@ -1330,6 +1336,7 @@ item.loops.name=Lüüps item.loop_stew.name=Informatiker-Frühstück item.fooditem.name=lebensmittel item.twinkie.name=Twinkie +item.twinkie.name=Sandwich mit Fernsehrauschen garniert tile.frozen_grass.name=Gefrorenes Gras tile.frozen_dirt.name=Gefrorene Erde @@ -2087,6 +2094,8 @@ item.can_redbomb.name='Red Bomb' Energy-Drink item.can_mrsugar.name='Dr. Sugar' Softdrink item.can_overcharge.name=Overcharge Delirium XT item.can_luna.name=Black Mesa Luna - Dark Cola +item.can_bepis.name=Bepis +item.can_breen.name=Dr>Breens Private Reserve item.bottle_empty.name=Leere bombenförmige Glasflasche item.bottle_nuka.name=Nuka-Cola Flasche item.bottle_cherry.name=Nuka-Cherry Flasche @@ -2109,6 +2118,34 @@ item.cap_fritz.name=Fritz-Kola Kronkorken item.cap_sunset.name=Sunset Sarsaparilla Kronkorken item.cap_star.name=Sunset Sarsaparilla Sternkronkorken item.ring_pull.name=Dosenring +item.canned_beef.name=Konservendose (Rindfleisch) +item.canned_tuna.name=Konservendose (Tunfisch) +item.canned_mystery.name=Konservendose (Mysteriöses Fleisch) +item.canned_pashtet.name=Паштет +item.canned_cheese.name=Konservendose (Schmelzkäse) +item.canned_jizz.name=Konservendose (FlimFlam Industries Hengstmilch™) +item.canned_milk.name=Konservendose (Kondensmilch) +item.canned_ass.name=Konservendose (Esel) +item.canned_pizza.name=Konservendose (Salamipizza) +item.canned_tube.name=Tube (Astronautenessen) +item.canned_tomato.name=Konservendose (Tomatensuppe) +item.canned_asbestos.name=Konservendose (Asbestdämmung) +item.canned_bhole.name=Konservendose (Schwarzes Loch) +item.canned_hotdogs.name=Konservendose (Hotdogs) +item.canned_leftovers.name=Konservendose (Reste) +item.canned_yogurt.name=Konservendose (Jogurt) +item.canned_stew.name=Konservendose ("Pilzsuppe") +item.canned_chinese.name=Konservendose (Chinesisch) +item.canned_oil.name=Konservendose (Motoröl) +item.canned_fist.name=Konservendose (Faust) +item.canned_spam.name=Konservendose (Spam) +item.canned_fried.name=Konservendose (Fried Chicken) +item.canned_napalm.name=Konservendose (Napalm) +item.canned_diesel.name=Konservendose (Diesel) +item.canned_kerosene.name=Konservendose (Kerosin) +item.canned_recursion.name=Konservendose (Rekursion) +item.canned_bark.name=Konservendose (Geräucherte Kiefernrinde) +item.can_key.name=Dosenschlüssel item.canteen_13.name=Vault 13 Kantine item.canteen_vodka.name=Stylischer Flachmann diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 882e21cd3d..3d1fb033b7 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -331,6 +331,7 @@ tile.crate_weapon.name=Weapon Crate tile.crate_lead.name=Hazmat Crate tile.crate_metal.name=Machine Crate tile.crate_red.name=Red Crate +tile.crate_can.name=Conserve Crate tile.marker_structure.name=Multiblock Structure Marker tile.struct_launcher.name=Launch Pad Component Block @@ -656,6 +657,8 @@ item.nugget_dineutronium.name=Dineutronium Nugget item.ingot_starmetal.name=Starmetal Ingot item.ingot_saturnite.name=Saturnite Ingot item.plate_saturnite.name=Saturnite Plate +item.ingot_fiberglass.name=Fiberglass Bar +item.ingot_asbestos.name=Asbestos Sheet item.solid_fuel.name=Solid Fuel item.rocket_fuel.name=Solid Fuel (Rocket Propellant) @@ -757,6 +760,8 @@ tile.block_verticium.name=Block of Verticium tile.block_desh.name=Reinforced Block of Desh tile.block_yellowcake.name=Block of Yellowcake tile.block_starmetal.name=Block of Starmetal +tile.block_fiberglass.name=Roll of Fiberglass +tile.block_asbestos.name=Block of Asbestos tile.ore_aluminium.name=Aluminium Ore tile.ore_copper.name=Copper Ore @@ -810,6 +815,7 @@ tile.deco_aluminium.name=Aluminium Deco Block tile.deco_steel.name=Steel Deco Block tile.deco_lead.name=Lead Deco Block tile.deco_beryllium.name=Beryllium Deco Block +tile.deco_asbestos.name=Asbestos Roof tile.hazmat.name=Hazmat Cloth Block @@ -1330,6 +1336,7 @@ item.loops.name=Lööps item.loop_stew.name=IT Breakfast item.fooditem.name=food item item.twinkie.name=Twinkie +item.static_sandwich.name=Sandwich Garnished with TV Static tile.frozen_grass.name=Frozen Grass tile.frozen_dirt.name=Frozen Dirt @@ -2087,6 +2094,8 @@ item.can_redbomb.name='Red Bomb' Energy Drink item.can_mrsugar.name='Dr. Sugar' Soft Drink item.can_overcharge.name=Overcharge Delirium XT item.can_luna.name=Black Mesa Luna - Dark Cola +item.can_bepis.name=Bepis +item.can_breen.name=Dr>Breens Private Reserve item.bottle_empty.name=Empty Bomb-Shaped Bottle item.bottle_nuka.name=Bottle of Nuka Cola item.bottle_cherry.name=Bottle of Nuka Cherry @@ -2109,6 +2118,34 @@ item.cap_fritz.name=Fritz Cola Bottle Cap item.cap_sunset.name=Sunset Sarsaparilla Bottle Cap item.cap_star.name=Sunset Sarsaparilla Star Cap item.ring_pull.name=Ring Pull +item.canned_beef.name=Canned Beef +item.canned_tuna.name=Canned Tuna +item.canned_mystery.name=Canned Mystery Meat +item.canned_pashtet.name=Паштет +item.canned_cheese.name=Canned Melted Cheese +item.canned_jizz.name=FlimFlam Industries Canned Stallion Milk™ +item.canned_milk.name=Canned Evaporated Milk +item.canned_ass.name=Canned Ass +item.canned_pizza.name=Canned Pepperoni Pizza +item.canned_tube.name=Astronaut Food Tube +item.canned_tomato.name=Canned Tomato Soup +item.canned_asbestos.name=Canned Asbestos +item.canned_bhole.name=Canned Black Hole +item.canned_hotdogs.name=Canned Hotdogs +item.canned_leftovers.name=Leftover Conserve +item.canned_yogurt.name=Canned Yogurt +item.canned_stew.name=Canned "Mushroom Stew" +item.canned_chinese.name=Canned Chinese Food +item.canned_oil.name=Canned Engine Oil +item.canned_fist.name=Canned Fist +item.canned_spam.name=Canned Spam +item.canned_fried.name=Canned Fried Chicken +item.canned_napalm.name=Canned Napalm +item.canned_diesel.name=Canned Diesel +item.canned_kerosene.name=Canned Kerosene +item.canned_recursion.name=Canned Recursion +item.canned_bark.name=Canned Pine Bark Jerky +item.can_key.name=Winding Key item.canteen_13.name=Vault 13 Canteen item.canteen_vodka.name=Stylish Flask diff --git a/assets/hbm/textures/blocks/crate_can_bottom.png b/assets/hbm/textures/blocks/crate_can_bottom.png new file mode 100644 index 0000000000..46302b16d4 Binary files /dev/null and b/assets/hbm/textures/blocks/crate_can_bottom.png differ diff --git a/assets/hbm/textures/blocks/crate_can_side.png b/assets/hbm/textures/blocks/crate_can_side.png new file mode 100644 index 0000000000..35c3461876 Binary files /dev/null and b/assets/hbm/textures/blocks/crate_can_side.png differ diff --git a/assets/hbm/textures/blocks/crate_can_top.png b/assets/hbm/textures/blocks/crate_can_top.png new file mode 100644 index 0000000000..fceb558d55 Binary files /dev/null and b/assets/hbm/textures/blocks/crate_can_top.png differ diff --git a/assets/hbm/textures/items/can_key.png b/assets/hbm/textures/items/can_key.png new file mode 100644 index 0000000000..285fd558c3 Binary files /dev/null and b/assets/hbm/textures/items/can_key.png differ diff --git a/assets/hbm/textures/items/canned_asbestos.png b/assets/hbm/textures/items/canned_asbestos.png new file mode 100644 index 0000000000..82259b6e08 Binary files /dev/null and b/assets/hbm/textures/items/canned_asbestos.png differ diff --git a/assets/hbm/textures/items/canned_ass.png b/assets/hbm/textures/items/canned_ass.png new file mode 100644 index 0000000000..7f5d7df18d Binary files /dev/null and b/assets/hbm/textures/items/canned_ass.png differ diff --git a/assets/hbm/textures/items/canned_bark.png b/assets/hbm/textures/items/canned_bark.png new file mode 100644 index 0000000000..b9bc61e311 Binary files /dev/null and b/assets/hbm/textures/items/canned_bark.png differ diff --git a/assets/hbm/textures/items/canned_beef.png b/assets/hbm/textures/items/canned_beef.png new file mode 100644 index 0000000000..d2fa7692e6 Binary files /dev/null and b/assets/hbm/textures/items/canned_beef.png differ diff --git a/assets/hbm/textures/items/canned_bhole.png b/assets/hbm/textures/items/canned_bhole.png new file mode 100644 index 0000000000..6899f6b411 Binary files /dev/null and b/assets/hbm/textures/items/canned_bhole.png differ diff --git a/assets/hbm/textures/items/canned_cheese.png b/assets/hbm/textures/items/canned_cheese.png new file mode 100644 index 0000000000..7d4a814492 Binary files /dev/null and b/assets/hbm/textures/items/canned_cheese.png differ diff --git a/assets/hbm/textures/items/canned_chinese.png b/assets/hbm/textures/items/canned_chinese.png new file mode 100644 index 0000000000..2cbb668308 Binary files /dev/null and b/assets/hbm/textures/items/canned_chinese.png differ diff --git a/assets/hbm/textures/items/canned_diesel.png b/assets/hbm/textures/items/canned_diesel.png new file mode 100644 index 0000000000..ff43124384 Binary files /dev/null and b/assets/hbm/textures/items/canned_diesel.png differ diff --git a/assets/hbm/textures/items/canned_fist.png b/assets/hbm/textures/items/canned_fist.png new file mode 100644 index 0000000000..ab4c2c9ad6 Binary files /dev/null and b/assets/hbm/textures/items/canned_fist.png differ diff --git a/assets/hbm/textures/items/canned_fried.png b/assets/hbm/textures/items/canned_fried.png new file mode 100644 index 0000000000..b4e716fca1 Binary files /dev/null and b/assets/hbm/textures/items/canned_fried.png differ diff --git a/assets/hbm/textures/items/canned_hotdogs.png b/assets/hbm/textures/items/canned_hotdogs.png new file mode 100644 index 0000000000..f3adaf15b7 Binary files /dev/null and b/assets/hbm/textures/items/canned_hotdogs.png differ diff --git a/assets/hbm/textures/items/canned_jizz.png b/assets/hbm/textures/items/canned_jizz.png new file mode 100644 index 0000000000..e86e512968 Binary files /dev/null and b/assets/hbm/textures/items/canned_jizz.png differ diff --git a/assets/hbm/textures/items/canned_kerosene.png b/assets/hbm/textures/items/canned_kerosene.png new file mode 100644 index 0000000000..29999c383b Binary files /dev/null and b/assets/hbm/textures/items/canned_kerosene.png differ diff --git a/assets/hbm/textures/items/canned_leftovers.png b/assets/hbm/textures/items/canned_leftovers.png new file mode 100644 index 0000000000..8f81ca192a Binary files /dev/null and b/assets/hbm/textures/items/canned_leftovers.png differ diff --git a/assets/hbm/textures/items/canned_milk.png b/assets/hbm/textures/items/canned_milk.png new file mode 100644 index 0000000000..ca48e0072f Binary files /dev/null and b/assets/hbm/textures/items/canned_milk.png differ diff --git a/assets/hbm/textures/items/canned_mystery.png b/assets/hbm/textures/items/canned_mystery.png new file mode 100644 index 0000000000..47a3e4b171 Binary files /dev/null and b/assets/hbm/textures/items/canned_mystery.png differ diff --git a/assets/hbm/textures/items/canned_napalm.png b/assets/hbm/textures/items/canned_napalm.png new file mode 100644 index 0000000000..272b141d31 Binary files /dev/null and b/assets/hbm/textures/items/canned_napalm.png differ diff --git a/assets/hbm/textures/items/canned_oil.png b/assets/hbm/textures/items/canned_oil.png new file mode 100644 index 0000000000..c806f80a32 Binary files /dev/null and b/assets/hbm/textures/items/canned_oil.png differ diff --git a/assets/hbm/textures/items/canned_pashtet.png b/assets/hbm/textures/items/canned_pashtet.png new file mode 100644 index 0000000000..ab9eb7edec Binary files /dev/null and b/assets/hbm/textures/items/canned_pashtet.png differ diff --git a/assets/hbm/textures/items/canned_pizza.png b/assets/hbm/textures/items/canned_pizza.png new file mode 100644 index 0000000000..e8817bb811 Binary files /dev/null and b/assets/hbm/textures/items/canned_pizza.png differ diff --git a/assets/hbm/textures/items/canned_recursion.png b/assets/hbm/textures/items/canned_recursion.png new file mode 100644 index 0000000000..cdf6c42972 Binary files /dev/null and b/assets/hbm/textures/items/canned_recursion.png differ diff --git a/assets/hbm/textures/items/canned_spam.png b/assets/hbm/textures/items/canned_spam.png new file mode 100644 index 0000000000..1d15ca472d Binary files /dev/null and b/assets/hbm/textures/items/canned_spam.png differ diff --git a/assets/hbm/textures/items/canned_stew.png b/assets/hbm/textures/items/canned_stew.png new file mode 100644 index 0000000000..c9db0ce583 Binary files /dev/null and b/assets/hbm/textures/items/canned_stew.png differ diff --git a/assets/hbm/textures/items/canned_tomato.png b/assets/hbm/textures/items/canned_tomato.png new file mode 100644 index 0000000000..3207b8fc8a Binary files /dev/null and b/assets/hbm/textures/items/canned_tomato.png differ diff --git a/assets/hbm/textures/items/canned_tube.png b/assets/hbm/textures/items/canned_tube.png new file mode 100644 index 0000000000..f1ebc86371 Binary files /dev/null and b/assets/hbm/textures/items/canned_tube.png differ diff --git a/assets/hbm/textures/items/canned_tuna.png b/assets/hbm/textures/items/canned_tuna.png new file mode 100644 index 0000000000..ec5b5d9da6 Binary files /dev/null and b/assets/hbm/textures/items/canned_tuna.png differ diff --git a/assets/hbm/textures/items/canned_yogurt.png b/assets/hbm/textures/items/canned_yogurt.png new file mode 100644 index 0000000000..216bf9f3d5 Binary files /dev/null and b/assets/hbm/textures/items/canned_yogurt.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index c0d25380ad..2f8a1a7413 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -235,6 +235,7 @@ public static void mainRegistry() public static Block crate_lead; public static Block crate_metal; public static Block crate_red; + public static Block crate_can; public static Block boxcar; public static Block boat; @@ -550,6 +551,7 @@ public static void mainRegistry() public static final int guiID_launch_table = 84; public static Block soyuz_launcher; + public static final int guiID_soyuz_launcher = 85; public static Block machine_radar; public static final int guiID_radar = 59; @@ -1112,11 +1114,12 @@ private static void initializeBlock() { rail_highspeed = new RailHighspeed().setBlockName("rail_highspeed").setHardness(5.0F).setResistance(10.0F).setCreativeTab(CreativeTabs.tabTransport).setBlockTextureName(RefStrings.MODID + ":rail_highspeed"); rail_booster = new RailBooster().setBlockName("rail_booster").setHardness(5.0F).setResistance(10.0F).setCreativeTab(CreativeTabs.tabTransport).setBlockTextureName(RefStrings.MODID + ":rail_booster"); - crate = new BlockCrate(Material.iron).setBlockName("crate").setStepSound(Block.soundTypeWood).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.consumableTab).setBlockTextureName(RefStrings.MODID + ":crate"); - crate_weapon = new BlockCrate(Material.iron).setBlockName("crate_weapon").setStepSound(Block.soundTypeWood).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.consumableTab).setBlockTextureName(RefStrings.MODID + ":crate_weapon"); + crate = new BlockCrate(Material.wood).setBlockName("crate").setStepSound(Block.soundTypeWood).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.consumableTab).setBlockTextureName(RefStrings.MODID + ":crate"); + crate_weapon = new BlockCrate(Material.wood).setBlockName("crate_weapon").setStepSound(Block.soundTypeWood).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.consumableTab).setBlockTextureName(RefStrings.MODID + ":crate_weapon"); crate_lead = new BlockCrate(Material.iron).setBlockName("crate_lead").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.consumableTab).setBlockTextureName(RefStrings.MODID + ":crate_lead"); crate_metal = new BlockCrate(Material.iron).setBlockName("crate_metal").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.consumableTab).setBlockTextureName(RefStrings.MODID + ":crate_metal"); crate_red = new BlockCrate(Material.iron).setBlockName("crate_red").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":crate_red"); + crate_can = new BlockCanCrate(Material.wood).setBlockName("crate_can").setStepSound(Block.soundTypeWood).setHardness(1.0F).setResistance(2.5F).setCreativeTab(MainRegistry.consumableTab); crate_iron = new BlockStorageCrate(Material.iron).setBlockName("crate_iron").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); crate_steel = new BlockStorageCrate(Material.iron).setBlockName("crate_steel").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); safe = new BlockStorageCrate(Material.iron).setBlockName("safe").setStepSound(Block.soundTypeMetal).setHardness(7.5F).setResistance(10000.0F).setCreativeTab(MainRegistry.machineTab); @@ -1729,6 +1732,7 @@ private static void registerBlock() { GameRegistry.registerBlock(crate_lead, crate_lead.getUnlocalizedName()); GameRegistry.registerBlock(crate_metal, crate_metal.getUnlocalizedName()); GameRegistry.registerBlock(crate_red, crate_red.getUnlocalizedName()); + GameRegistry.registerBlock(crate_can, crate_can.getUnlocalizedName()); //ElB GameRegistry.registerBlock(statue_elb, statue_elb.getUnlocalizedName()); diff --git a/com/hbm/blocks/generic/BlockCanCrate.java b/com/hbm/blocks/generic/BlockCanCrate.java new file mode 100644 index 0000000000..95176c6fab --- /dev/null +++ b/com/hbm/blocks/generic/BlockCanCrate.java @@ -0,0 +1,108 @@ +package com.hbm.blocks.generic; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import com.hbm.items.ModItems; +import com.hbm.lib.RefStrings; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class BlockCanCrate extends Block { + + @SideOnly(Side.CLIENT) + private IIcon iconTop; + @SideOnly(Side.CLIENT) + private IIcon iconBottom; + + public BlockCanCrate(Material p_i45394_1_) { + super(p_i45394_1_); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":crate_can_top"); + this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":crate_can_bottom"); + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":crate_can_side"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) { + return side == 0 ? this.iconBottom : (side == 1 ? this.iconTop : this.blockIcon); + } + + + @Override + 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(world.isRemote) + { + player.addChatMessage(new ChatComponentText("The one crate you are allowed to smash!")); + } + + return true; + } + + @Override + public Item getItemDropped(int i, Random rand, int j) { + + List items = new ArrayList(); + items.add(ModItems.canned_beef); + items.add(ModItems.canned_tuna); + items.add(ModItems.canned_mystery); + items.add(ModItems.canned_pashtet); + items.add(ModItems.canned_cheese); + items.add(ModItems.canned_jizz); + items.add(ModItems.canned_milk); + items.add(ModItems.canned_ass); + items.add(ModItems.canned_pizza); + items.add(ModItems.canned_tomato); + items.add(ModItems.canned_tube); + items.add(ModItems.canned_asbestos); + items.add(ModItems.canned_bhole); + items.add(ModItems.canned_hotdogs); + items.add(ModItems.canned_leftovers); + items.add(ModItems.canned_yogurt); + items.add(ModItems.canned_stew); + items.add(ModItems.canned_chinese); + items.add(ModItems.canned_oil); + items.add(ModItems.canned_fist); + items.add(ModItems.canned_spam); + items.add(ModItems.canned_fried); + items.add(ModItems.canned_napalm); + items.add(ModItems.canned_diesel); + items.add(ModItems.canned_kerosene); + items.add(ModItems.canned_recursion); + items.add(ModItems.canned_bark); + items.add(ModItems.can_smart); + items.add(ModItems.can_creature); + items.add(ModItems.can_redbomb); + items.add(ModItems.can_mrsugar); + items.add(ModItems.can_overcharge); + items.add(ModItems.can_luna); + items.add(ModItems.can_breen); + items.add(ModItems.can_bepis); + + return items.get(rand.nextInt(items.size())); + } + + @Override + public int quantityDropped(Random rand) { + + return 5 + rand.nextInt(4); + } + +} diff --git a/com/hbm/blocks/generic/BlockCrate.java b/com/hbm/blocks/generic/BlockCrate.java index 89f10173e7..ba486c7b94 100644 --- a/com/hbm/blocks/generic/BlockCrate.java +++ b/com/hbm/blocks/generic/BlockCrate.java @@ -34,7 +34,6 @@ public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) return null; } - @Override 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)) diff --git a/com/hbm/blocks/machine/SoyuzLauncher.java b/com/hbm/blocks/machine/SoyuzLauncher.java index 64868b9994..fe1ed1736c 100644 --- a/com/hbm/blocks/machine/SoyuzLauncher.java +++ b/com/hbm/blocks/machine/SoyuzLauncher.java @@ -1,9 +1,13 @@ package com.hbm.blocks.machine; +import com.hbm.blocks.ModBlocks; +import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntitySoyuzLauncher; +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -32,5 +36,23 @@ public boolean isOpaqueCube() { public boolean renderAsNormalBlock() { return false; } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + if(world.isRemote) + { + return true; + } else if(!player.isSneaking()) + { + TileEntitySoyuzLauncher entity = (TileEntitySoyuzLauncher) world.getTileEntity(x, y, z); + if(entity != null) + { + FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_soyuz_launcher, world, x, y, z); + } + return true; + } else { + return false; + } + } } diff --git a/com/hbm/handler/BobmazonOfferFactory.java b/com/hbm/handler/BobmazonOfferFactory.java index 6811347f80..f9f17707ca 100644 --- a/com/hbm/handler/BobmazonOfferFactory.java +++ b/com/hbm/handler/BobmazonOfferFactory.java @@ -133,7 +133,8 @@ public static void init() { weapons.add(new Offer(new ItemStack(ModItems.ammo_20gauge_flechette, 6), Requirement.OIL, 22)); weapons.add(new Offer(new ItemStack(ModItems.grenade_if_generic, 3), Requirement.CHEMICS, 15)); weapons.add(new Offer(new ItemStack(ModItems.grenade_if_he, 3), Requirement.CHEMICS, 25)); - + + tools.add(new Offer(new ItemStack(ModBlocks.crate_can, 1), Requirement.STEEL, 20)); tools.add(new Offer(new ItemStack(ModBlocks.machine_keyforge), Requirement.STEEL, 10)); tools.add(new Offer(new ItemStack(ModBlocks.machine_telelinker), Requirement.CHEMICS, 35)); tools.add(new Offer(new ItemStack(ModBlocks.machine_satlinker), Requirement.CHEMICS, 50)); @@ -189,6 +190,7 @@ public static void init() { special.add(new Offer(new ItemStack(ModItems.loot_10, 1), Requirement.STEEL, 5)); special.add(new Offer(new ItemStack(ModItems.loot_15, 1), Requirement.STEEL, 5)); special.add(new Offer(new ItemStack(ModItems.loot_misc, 1), Requirement.STEEL, 5)); + special.add(new Offer(new ItemStack(ModBlocks.crate_can, 1), Requirement.STEEL, 2)); } public static List getOffers(ItemStack stack) { diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index ae447bc4d6..98a9b65379 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -5177,10 +5177,10 @@ public static FluidStack[] getFluidInputFromTempate(ItemStack stack) { input[0] = new FluidStack(600, FluidType.PETROLEUM); break; case SF_BIOGAS: - input[0] = new FluidStack(400, FluidType.BIOGAS); + input[0] = new FluidStack(3500, FluidType.BIOGAS); break; case SF_BIOFUEL: - input[0] = new FluidStack(300, FluidType.BIOFUEL); + input[0] = new FluidStack(1500, FluidType.BIOFUEL); break; case POLYMER: input[0] = new FluidStack(600, FluidType.PETROLEUM); diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 8a3bffc82f..e8354b14ab 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -614,6 +614,8 @@ public static void mainRegistry() public static Item can_mrsugar; public static Item can_overcharge; public static Item can_luna; + public static Item can_bepis; + public static Item can_breen; public static Item bottle_empty; public static Item bottle_nuka; public static Item bottle_cherry; @@ -636,6 +638,34 @@ public static void mainRegistry() public static Item cap_sunset; public static Item cap_star; public static Item ring_pull; + public static Item canned_beef; + public static Item canned_tuna; + public static Item canned_mystery; + public static Item canned_pashtet; + public static Item canned_cheese; + public static Item canned_jizz; + public static Item canned_milk; + public static Item canned_ass; + public static Item canned_pizza; + public static Item canned_tube; + public static Item canned_tomato; + public static Item canned_asbestos; + public static Item canned_bhole; + public static Item canned_hotdogs; + public static Item canned_leftovers; + public static Item canned_yogurt; + public static Item canned_stew; + public static Item canned_chinese; + public static Item canned_oil; + public static Item canned_fist; + public static Item canned_spam; + public static Item canned_fried; + public static Item canned_napalm; + public static Item canned_diesel; + public static Item canned_kerosene; + public static Item canned_recursion; + public static Item canned_bark; + public static Item can_key; public static Item rod_empty; public static Item rod_uranium; @@ -2288,6 +2318,8 @@ public static void initializeItem() can_mrsugar = new ItemEnergy().setUnlocalizedName("can_mrsugar").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_mrsugar"); can_overcharge = new ItemEnergy().setUnlocalizedName("can_overcharge").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_overcharge"); can_luna = new ItemEnergy().setUnlocalizedName("can_luna").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_luna"); + can_bepis = new ItemEnergy().setUnlocalizedName("can_bepis").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_bepis");; + can_breen = new ItemEnergy().setUnlocalizedName("can_breen").setContainerItem(ModItems.can_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_breen"); bottle_empty = new Item().setUnlocalizedName("bottle_empty").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bottle_empty"); bottle_nuka = new ItemEnergy().setUnlocalizedName("bottle_nuka").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bottle_nuka"); bottle_cherry = new ItemEnergy().setUnlocalizedName("bottle_cherry").setContainerItem(ModItems.bottle_empty).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bottle_cherry"); @@ -2311,6 +2343,36 @@ public static void initializeItem() cap_star = new Item().setUnlocalizedName("cap_star").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_star"); ring_pull = new Item().setUnlocalizedName("ring_pull").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":ring_pull"); + canned_beef = new ItemLemon(8, 5, false).setUnlocalizedName("canned_beef").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_beef"); + canned_tuna = new ItemLemon(4, 5, false).setUnlocalizedName("canned_tuna").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_tuna"); + canned_mystery = new ItemLemon(6, 5, false).setUnlocalizedName("canned_mystery").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_mystery"); + canned_pashtet = new ItemLemon(4, 5, false).setUnlocalizedName("canned_pashtet").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_pashtet"); + canned_cheese = new ItemLemon(3, 5, false).setUnlocalizedName("canned_cheese").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_cheese"); + canned_jizz = new ItemLemon(15, 5, false).setUnlocalizedName("canned_jizz").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_jizz"); + canned_milk = new ItemLemon(5, 5, false).setUnlocalizedName("canned_milk").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_milk"); + canned_ass = new ItemLemon(6, 5, false).setUnlocalizedName("canned_ass").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_ass"); + canned_pizza = new ItemLemon(8, 5, false).setUnlocalizedName("canned_pizza").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_pizza"); + canned_tube = new ItemLemon(2, 5, false).setUnlocalizedName("canned_tube").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_tube"); + canned_tomato = new ItemLemon(4, 5, false).setUnlocalizedName("canned_tomato").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_tomato"); + canned_asbestos = new ItemLemon(7, 5, false).setUnlocalizedName("canned_asbestos").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_asbestos"); + canned_bhole = new ItemLemon(10, 5, false).setUnlocalizedName("canned_bhole").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_bhole"); + canned_hotdogs = new ItemLemon(5, 5, false).setUnlocalizedName("canned_hotdogs").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_hotdogs"); + canned_leftovers = new ItemLemon(1, 5, false).setUnlocalizedName("canned_leftovers").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_leftovers"); + canned_yogurt = new ItemLemon(3, 5, false).setUnlocalizedName("canned_yogurt").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_yogurt"); + canned_stew = new ItemLemon(5, 5, false).setUnlocalizedName("canned_stew").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_stew"); + canned_chinese = new ItemLemon(6, 5, false).setUnlocalizedName("canned_chinese").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_chinese"); + canned_oil = new ItemLemon(3, 5, false).setUnlocalizedName("canned_oil").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_oil"); + canned_fist = new ItemLemon(6, 5, false).setUnlocalizedName("canned_fist").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_fist"); + canned_spam = new ItemLemon(8, 5, false).setUnlocalizedName("canned_spam").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_spam"); + canned_fried = new ItemLemon(10, 5, false).setUnlocalizedName("canned_fried").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_fried"); + canned_napalm = new ItemLemon(6, 5, false).setUnlocalizedName("canned_napalm").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_napalm"); + canned_diesel = new ItemLemon(6, 5, false).setUnlocalizedName("canned_diesel").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_diesel"); + canned_kerosene = new ItemLemon(6, 5, false).setUnlocalizedName("canned_kerosene").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_kerosene"); + canned_recursion = new ItemLemon(1, 5, false).setUnlocalizedName("canned_recursion").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_recursion"); + canned_bark = new ItemLemon(2, 5, false).setUnlocalizedName("canned_bark").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canned_bark"); + can_key = new Item().setUnlocalizedName("can_key").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":can_key"); + + recycled_ground = new Item().setUnlocalizedName("recycled_ground").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_ground"); recycled_rock = new Item().setUnlocalizedName("recycled_rock").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_rock"); recycled_metal = new Item().setUnlocalizedName("recycled_metal").setCreativeTab(null).setTextureName(RefStrings.MODID + ":recycled_metal"); @@ -4865,6 +4927,8 @@ private static void registerItem() { GameRegistry.registerItem(can_mrsugar, can_mrsugar.getUnlocalizedName()); GameRegistry.registerItem(can_overcharge, can_overcharge.getUnlocalizedName()); GameRegistry.registerItem(can_luna, can_luna.getUnlocalizedName()); + GameRegistry.registerItem(can_bepis, can_bepis.getUnlocalizedName()); + GameRegistry.registerItem(can_breen, can_breen.getUnlocalizedName()); //Cola GameRegistry.registerItem(bottle_empty, bottle_empty.getUnlocalizedName()); @@ -4881,6 +4945,35 @@ private static void registerItem() { GameRegistry.registerItem(bottle2_sunset, bottle2_sunset.getUnlocalizedName()); GameRegistry.registerItem(bottle_opener, bottle_opener.getUnlocalizedName()); + //Canned Food + GameRegistry.registerItem(canned_beef, canned_beef.getUnlocalizedName()); + GameRegistry.registerItem(canned_tuna, canned_tuna.getUnlocalizedName()); + GameRegistry.registerItem(canned_mystery, canned_mystery.getUnlocalizedName()); + GameRegistry.registerItem(canned_pashtet, canned_pashtet.getUnlocalizedName()); + GameRegistry.registerItem(canned_cheese, canned_cheese.getUnlocalizedName()); + GameRegistry.registerItem(canned_jizz, canned_jizz.getUnlocalizedName()); + GameRegistry.registerItem(canned_milk, canned_milk.getUnlocalizedName()); + GameRegistry.registerItem(canned_ass, canned_ass.getUnlocalizedName()); + GameRegistry.registerItem(canned_pizza, canned_pizza.getUnlocalizedName()); + GameRegistry.registerItem(canned_tube, canned_tube.getUnlocalizedName()); + GameRegistry.registerItem(canned_tomato, canned_tomato.getUnlocalizedName()); + GameRegistry.registerItem(canned_asbestos, canned_asbestos.getUnlocalizedName()); + GameRegistry.registerItem(canned_bhole, canned_bhole.getUnlocalizedName()); + GameRegistry.registerItem(canned_hotdogs, canned_hotdogs.getUnlocalizedName()); + GameRegistry.registerItem(canned_leftovers, canned_leftovers.getUnlocalizedName()); + GameRegistry.registerItem(canned_yogurt, canned_yogurt.getUnlocalizedName()); + GameRegistry.registerItem(canned_stew, canned_stew.getUnlocalizedName()); + GameRegistry.registerItem(canned_chinese, canned_chinese.getUnlocalizedName()); + GameRegistry.registerItem(canned_oil, canned_oil.getUnlocalizedName()); + GameRegistry.registerItem(canned_fist, canned_fist.getUnlocalizedName()); + GameRegistry.registerItem(canned_spam, canned_spam.getUnlocalizedName()); + GameRegistry.registerItem(canned_fried, canned_fried.getUnlocalizedName()); + GameRegistry.registerItem(canned_napalm, canned_napalm.getUnlocalizedName()); + GameRegistry.registerItem(canned_diesel, canned_diesel.getUnlocalizedName()); + GameRegistry.registerItem(canned_kerosene, canned_kerosene.getUnlocalizedName()); + GameRegistry.registerItem(canned_recursion, canned_recursion.getUnlocalizedName()); + GameRegistry.registerItem(canned_bark, canned_bark.getUnlocalizedName()); + //Money GameRegistry.registerItem(cap_nuka, cap_nuka.getUnlocalizedName()); GameRegistry.registerItem(cap_quantum, cap_quantum.getUnlocalizedName()); @@ -4891,6 +4984,7 @@ private static void registerItem() { GameRegistry.registerItem(cap_sunset, cap_sunset.getUnlocalizedName()); GameRegistry.registerItem(cap_star, cap_star.getUnlocalizedName()); GameRegistry.registerItem(ring_pull, ring_pull.getUnlocalizedName()); + GameRegistry.registerItem(can_key, can_key.getUnlocalizedName()); //Chaos GameRegistry.registerItem(chocolate_milk, chocolate_milk.getUnlocalizedName()); diff --git a/com/hbm/items/food/ItemEnergy.java b/com/hbm/items/food/ItemEnergy.java index 895ffa5993..da324d425c 100644 --- a/com/hbm/items/food/ItemEnergy.java +++ b/com/hbm/items/food/ItemEnergy.java @@ -66,6 +66,15 @@ public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 30 * 20, 1)); player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 30 * 20, 2)); } + if(this == ModItems.can_bepis) + { + player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 30 * 20, 3)); + player.addPotionEffect(new PotionEffect(Potion.resistance.id, 30 * 20, 3)); + } + if(this == ModItems.can_breen) + { + player.addPotionEffect(new PotionEffect(Potion.confusion.id, 30 * 20, 0)); + } if(this == ModItems.chocolate_milk) { ExplosionLarge.explode(world, player.posX, player.posY, player.posZ, 50, true, false, false); @@ -153,7 +162,8 @@ public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) { if(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || - this == ModItems.can_smart || this == ModItems.can_luna) { + this == ModItems.can_smart || this == ModItems.can_luna || + this == ModItems.can_bepis || this == ModItems.can_breen) { player.inventory.addItemStackToInventory(new ItemStack(ModItems.ring_pull)); if (stack.stackSize <= 0) { @@ -260,7 +270,8 @@ public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, Entity if(!(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart || this == ModItems.chocolate_milk || - this == ModItems.can_luna)) + this == ModItems.can_luna || this == ModItems.can_bepis || + this == ModItems.can_breen)) if(!p_77659_3_.inventory.hasItem(ModItems.bottle_opener)) return p_77659_1_; @@ -297,6 +308,15 @@ public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List l { list.add("Contains actual selenium and star metal. Tastes like night."); } + if(this == ModItems.can_bepis) + { + list.add("beppp"); + } + if(this == ModItems.can_breen) + { + list.add("Don't drink the water. They put something in it, to make you forget."); + list.add("I don't even know how I got here."); + } if(this == ModItems.chocolate_milk) { list.add("Regular chocolate milk. Safe to drink."); diff --git a/com/hbm/items/food/ItemLemon.java b/com/hbm/items/food/ItemLemon.java index aeeb6094da..656a015f0a 100644 --- a/com/hbm/items/food/ItemLemon.java +++ b/com/hbm/items/food/ItemLemon.java @@ -2,10 +2,12 @@ import java.util.List; +import com.hbm.entity.effect.EntityVortex; import com.hbm.items.ModItems; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -69,6 +71,132 @@ public void addInformation(ItemStack itemstack, EntityPlayer player, List list, if(this == ModItems.twinkie) { list.add("Expired 600 years ago!"); } + + if(this == ModItems.canned_beef) { + list.add("A few centuries ago, a cow died for this."); + } + + if(this == ModItems.canned_tuna) { + list.add("I can't tell if that's actually tuna or dried cement."); + } + + if(this == ModItems.canned_mystery) { + list.add("What's inside? Only one way to find out!"); + } + + if(this == ModItems.canned_pashtet) { + list.add("услуги перевода недоступны!"); + } + + if(this == ModItems.canned_cheese) { + list.add("Is it cheese? Is it rubber cement? Who knows, who cares."); + } + + if(this == ModItems.canned_milk) { + list.add("Milk 2: More solid than ever before!"); + } + + if(this == ModItems.canned_ass) { + list.add("100% quality donkey meat!*"); + } + + if(this == ModItems.canned_pizza) { + list.add("A crime against humanity."); + } + + if(this == ModItems.canned_tube) { + list.add("Tasty mush."); + } + + if(this == ModItems.canned_tomato) { + list.add("Who wants some thick red paste?"); + } + + if(this == ModItems.canned_asbestos) { + list.add("TASTE the asbestosis!"); + } + + if(this == ModItems.canned_bhole) { + list.add("Singularity is yum yum in my tum tum!"); + } + + if(this == ModItems.canned_jizz) { + list.add("Wait wh-"); + } + + if(this == ModItems.canned_hotdogs) { + list.add("Not to be confused with cool cats."); + } + + if(this == ModItems.canned_leftovers) { + list.add("ur 2 slow"); + } + + if(this == ModItems.canned_yogurt) { + list.add("Probably spoiled, but whatever."); + } + + if(this == ModItems.canned_stew) { + list.add("..."); + } + + if(this == ModItems.canned_chinese) { + list.add("In China, Chineese food is just called food."); + } + + if(this == ModItems.canned_oil) { + list.add("It makes motors go, so why not humans?"); + } + + if(this == ModItems.canned_fist) { + list.add("Yowser!"); + } + + if(this == ModItems.canned_spam) { + list.add("The three-and-a-half-minute sketch is set in the fictional Green Midget Cafe in Bromley."); + list.add("An argument develops between the waitress, who recites a menu in which nearly"); + list.add("every dish contains Spam, and Mrs. Bun, who does not like Spam. She asks for a"); + list.add("dish without Spam, much to the amazement of her Spam-loving husband. The waitress"); + list.add("responds to this request with disgust. Mr. Bun offers to take her Spam instead,"); + list.add("and asks for a dish containing a lot of Spam and baked beans. The waitress says"); + list.add("no since they are out of baked beans; when Mr. Bun asks for a substitution of Spam,"); + list.add("the waitress again responds with disgust. At several points, a group of Vikings in"); + list.add("the restaurant interrupts conversation by loudly singing about Spam."); + list.add("The irate waitress orders them to shut up, but they resume singing more loudly."); + list.add("A Hungarian tourist comes to the counter, trying to order by using a wholly"); + list.add("inaccurate Hungarian/English phrasebook (a reference to a previous sketch)."); + list.add("He is rapidly escorted away by a police constable. The sketch abruptly cuts to a"); + list.add("historian in a television studio talking about the origin of the Vikings in the café."); + list.add("As he goes on, he begins to increasingly insert the word \"Spam\" into every"); + list.add("sentence, and the backdrop is raised to reveal the restaurant set behind."); + list.add("The historian joins the Vikings in their song, and Mr. and Mrs. Bun are lifted by"); + list.add("wires out of the scene while the singing continues. In the original televised performance,"); + list.add("the closing credits begin to scroll with the singing still audible in the background."); + } + + if(this == ModItems.canned_fried) { + list.add("Even the can is deep fried!"); + } + + if(this == ModItems.canned_napalm) { + list.add("I love the smell of old memes in the morning!"); + } + + if(this == ModItems.canned_diesel) { + list.add("I'm slowly running out of jokes for these."); + } + + if(this == ModItems.canned_kerosene) { + list.add("Just imagine a witty line here."); + } + + if(this == ModItems.canned_recursion) { + list.add("Canned Recursion"); + } + + if(this == ModItems.canned_bark) { + list.add("Extra cronchy!"); + } } @@ -91,15 +219,55 @@ protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 60 * 20, 1)); player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 20 * 20, 2)); } + + if(this == ModItems.canned_beef || + this == ModItems.canned_tuna || + this == ModItems.canned_mystery || + this == ModItems.canned_pashtet || + this == ModItems.canned_cheese || + this == ModItems.canned_jizz || + this == ModItems.canned_milk || + this == ModItems.canned_ass || + this == ModItems.canned_pizza || + this == ModItems.canned_tomato || + this == ModItems.canned_asbestos || + this == ModItems.canned_bhole || + this == ModItems.canned_hotdogs || + this == ModItems.canned_yogurt || + this == ModItems.canned_stew || + this == ModItems.canned_chinese || + this == ModItems.canned_oil || + this == ModItems.canned_fist || + this == ModItems.canned_spam || + this == ModItems.canned_fried || + this == ModItems.canned_napalm || + this == ModItems.canned_diesel || + this == ModItems.canned_kerosene || + this == ModItems.canned_recursion || + this == ModItems.canned_bark) + player.inventory.addItemStackToInventory(new ItemStack(ModItems.can_key)); + + if(this == ModItems.canned_recursion && world.rand.nextInt(10) > 0) + player.inventory.addItemStackToInventory(new ItemStack(ModItems.canned_recursion)); } - public ItemStack onEaten(ItemStack p_77654_1_, World p_77654_2_, EntityPlayer p_77654_3_) + public ItemStack onEaten(ItemStack stack, World worldObj, EntityPlayer player) { - ItemStack sta = super.onEaten(p_77654_1_, p_77654_2_, p_77654_3_); + ItemStack sta = super.onEaten(stack, worldObj, player); if(this == ModItems.loop_stew) return new ItemStack(Items.bowl); + + + if (this == ModItems.canned_bhole && !worldObj.isRemote) { + EntityVortex vortex = new EntityVortex(worldObj, 0.5F); + vortex.posX = player.posX; + vortex.posY = player.posY; + vortex.posZ = player.posZ; + worldObj.spawnEntityInWorld(vortex); + } + return sta; } diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 8c6ef32802..3983a08570 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (3182)"; + public static final String VERSION = "1.0.27 BETA (3200)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index a63ff4c427..5114f629ba 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -38,6 +38,7 @@ import cpw.mods.fml.common.Mod.Metadata; import cpw.mods.fml.common.ModMetadata; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Random; @@ -533,6 +534,7 @@ public void PreLoad(FMLPreInitializationEvent PreEvent) GameRegistry.registerTileEntity(TileEntityMultiblock.class, "tileentity_multi_core"); GameRegistry.registerTileEntity(TileEntityChlorineSeal.class, "tileentity_chlorine_seal"); GameRegistry.registerTileEntity(TileEntityCableSwitch.class, "tileentity_he_switch"); + GameRegistry.registerTileEntity(TileEntitySoyuzLauncher.class, "tileentity_soyuz_launcher"); EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true); EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true); @@ -1496,6 +1498,8 @@ public static void PostLoad(FMLPostInitializationEvent PostEvent) proxy.registerMissileItems(); } + public static List templateBlacklist = new ArrayList(); + @EventHandler public void preInit(FMLPreInitializationEvent event) { @@ -1745,24 +1749,15 @@ public void preInit(FMLPreInitializationEvent event) ciwsHitrate = propRadarAltitude.getInt(); final String CATEGORY_POTION = "08_potion_effects"; - Property propTaintID = config.get(CATEGORY_POTION, "8.00_taintPotionID", 62); - propTaintID.comment = "What potion ID the taint effect will have"; - taintID = propTaintID.getInt(); - Property propRadiationID = config.get(CATEGORY_POTION, "8.01_radiationPotionID", 63); - propRadiationID.comment = "What potion ID the radiation effect will have"; - radiationID = propRadiationID.getInt(); - Property propBangID = config.get(CATEGORY_POTION, "8.02_bangPotionID", 64); - propBangID.comment = "What potion ID the B93 timebomb effect will have"; - bangID = propBangID.getInt(); - Property propMutationID = config.get(CATEGORY_POTION, "8.03_mutationPotionID", 65); - propMutationID.comment = "What potion ID the taint mutation effect will have"; - mutationID = propMutationID.getInt(); - Property propRadxID = config.get(CATEGORY_POTION, "8.04_radxPotionID", 66); - propRadxID.comment = "What potion ID the Rad-X effect will have"; - radxID = propRadxID.getInt(); - Property propLeadID = config.get(CATEGORY_POTION, "8.05_leadPotionID", 67); - propLeadID.comment = "What potion ID the lead poisoning effect will have"; - leadID = propLeadID.getInt(); + taintID = createConfigInt(config, CATEGORY_POTION, "8.00_taintPotionID", "What potion ID the taint effect will have", 62); + radiationID = createConfigInt(config, CATEGORY_POTION, "8.01_radiationPotionID", "What potion ID the radiation effect will have", 63); + bangID = createConfigInt(config, CATEGORY_POTION, "8.02_bangPotionID", "What potion ID the B93 timebomb effect will have", 64); + mutationID = createConfigInt(config, CATEGORY_POTION, "8.03_mutationPotionID", "What potion ID the taint mutation effect will have", 65); + radxID = createConfigInt(config, CATEGORY_POTION, "8.04_radxPotionID", "What potion ID the Rad-X effect will have", 66); + leadID = createConfigInt(config, CATEGORY_POTION, "8.05_leadPotionID", "What potion ID the lead poisoning effect will have", 67); + + final String CATEGORY_MACHINE = "09_machines"; + templateBlacklist = Arrays.asList(createConfigStringList(config, CATEGORY_MACHINE, "9.00_templateBlacklist", "Which machine templates should be prohibited from being created (args: enum names)")); config.save(); @@ -1801,4 +1796,18 @@ private static int setDef(int value, int def) { return value; } + + private static int createConfigInt(Configuration config, String category, String name, String comment, int def) { + + Property prop = config.get(category, name, def); + prop.comment = comment; + return prop.getInt(); + } + + private static String[] createConfigStringList(Configuration config, String category, String name, String comment) { + + Property prop = config.get(category, name, new String[] { "PLACEHOLDER" } ); + prop.comment = comment; + return prop.getStringList(); + } } diff --git a/com/hbm/packet/ItemBobmazonPacket.java b/com/hbm/packet/ItemBobmazonPacket.java index 479bb5ffb9..d81f1b355c 100644 --- a/com/hbm/packet/ItemBobmazonPacket.java +++ b/com/hbm/packet/ItemBobmazonPacket.java @@ -121,7 +121,7 @@ public IMessage onMessage(ItemBobmazonPacket m, MessageContext ctx) { } } else { - p.addChatMessage(new ChatComponentText("[BOBMAZON] Requirements not met!")); + p.addChatMessage(new ChatComponentText("[BOBMAZON] Achievement requirement not met!")); } return null; diff --git a/com/hbm/packet/ItemFolderPacket.java b/com/hbm/packet/ItemFolderPacket.java index 54fa7e4f56..a7c29d7394 100644 --- a/com/hbm/packet/ItemFolderPacket.java +++ b/com/hbm/packet/ItemFolderPacket.java @@ -2,11 +2,15 @@ import java.util.List; +import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.items.ModItems; import com.hbm.items.tool.ItemAssemblyTemplate; +import com.hbm.items.tool.ItemAssemblyTemplate.EnumAssemblyTemplate; import com.hbm.items.tool.ItemCassette; import com.hbm.items.tool.ItemChemistryTemplate; +import com.hbm.items.tool.ItemChemistryTemplate.EnumChemistryTemplate; import com.hbm.items.tool.ItemFluidIdentifier; +import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineAssembler; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -19,6 +23,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; public class ItemFolderPacket implements IMessage { @@ -63,6 +68,14 @@ public IMessage onMessage(ItemFolderPacket m, MessageContext ctx) { } if(stack.getItem() instanceof ItemFluidIdentifier) { + + FluidType enumeration = FluidType.getEnum(m.meta); + + if(MainRegistry.templateBlacklist.contains(enumeration.getName())) { + p.addChatMessage(new ChatComponentText("This item appears to be blacklisted.")); + return null; + } + if(p.inventory.hasItem(ModItems.plate_iron) && p.inventory.hasItem(Items.dye)) { p.inventory.consumeInventoryItem(ModItems.plate_iron); p.inventory.consumeInventoryItem(Items.dye); @@ -71,6 +84,14 @@ public IMessage onMessage(ItemFolderPacket m, MessageContext ctx) { } } if(stack.getItem() instanceof ItemAssemblyTemplate) { + + EnumAssemblyTemplate enumeration = EnumAssemblyTemplate.getEnum(m.meta); + + if(MainRegistry.templateBlacklist.contains(enumeration.getName())) { + p.addChatMessage(new ChatComponentText("This item appears to be blacklisted.")); + return null; + } + if(p.inventory.hasItem(Items.paper) && p.inventory.hasItem(Items.dye)) { p.inventory.consumeInventoryItem(Items.paper); p.inventory.consumeInventoryItem(Items.dye); @@ -79,6 +100,14 @@ public IMessage onMessage(ItemFolderPacket m, MessageContext ctx) { } } if(stack.getItem() instanceof ItemChemistryTemplate) { + + EnumChemistryTemplate enumeration = EnumChemistryTemplate.getEnum(m.meta); + + if(MainRegistry.templateBlacklist.contains(enumeration.getName())) { + p.addChatMessage(new ChatComponentText("This item appears to be blacklisted.")); + return null; + } + if(p.inventory.hasItem(Items.paper) && p.inventory.hasItem(Items.dye)) { p.inventory.consumeInventoryItem(Items.paper); p.inventory.consumeInventoryItem(Items.dye); diff --git a/com/hbm/render/misc/SoyuzLauncherPronter.java b/com/hbm/render/misc/SoyuzLauncherPronter.java index 6c55f2b1f4..8ddd9396b5 100644 --- a/com/hbm/render/misc/SoyuzLauncherPronter.java +++ b/com/hbm/render/misc/SoyuzLauncherPronter.java @@ -11,6 +11,8 @@ public class SoyuzLauncherPronter { public static void prontLauncher() { + + int rot = 0;//(int) (System.currentTimeMillis() / 20 % 45); GL11.glPushMatrix(); GL11.glEnable(GL11.GL_CULL_FACE); @@ -25,14 +27,24 @@ public static void prontLauncher() { tex.bindTexture(ResourceManager.soyuz_launcher_tower_base_tex); ResourceManager.soyuz_launcher_tower_base.renderAll(); - tex.bindTexture(ResourceManager.soyuz_launcher_tower_tex); - ResourceManager.soyuz_launcher_tower.renderAll(); + GL11.glPushMatrix(); + tex.bindTexture(ResourceManager.soyuz_launcher_tower_tex); + GL11.glTranslated(0, 5.5, 5.5); + GL11.glRotated(rot, 1, 0, 0); + GL11.glTranslated(0, -5.5, -5.5); + ResourceManager.soyuz_launcher_tower.renderAll(); + GL11.glPopMatrix(); tex.bindTexture(ResourceManager.soyuz_launcher_support_base_tex); ResourceManager.soyuz_launcher_support_base.renderAll(); - tex.bindTexture(ResourceManager.soyuz_launcher_support_tex); - ResourceManager.soyuz_launcher_support.renderAll(); + GL11.glPushMatrix(); + tex.bindTexture(ResourceManager.soyuz_launcher_support_tex); + GL11.glTranslated(0, 5.5, -6.5); + GL11.glRotated(rot, -1, 0, 0); + GL11.glTranslated(0, -5.5, 6.5); + ResourceManager.soyuz_launcher_support.renderAll(); + GL11.glPopMatrix(); GL11.glPopMatrix(); } diff --git a/com/hbm/tileentity/bomb/TileEntityTurretBase.java b/com/hbm/tileentity/bomb/TileEntityTurretBase.java index b10d32ddea..976aff93f6 100644 --- a/com/hbm/tileentity/bomb/TileEntityTurretBase.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretBase.java @@ -6,6 +6,7 @@ import com.hbm.blocks.bomb.TurretBase; import com.hbm.entity.logic.EntityBomber; import com.hbm.entity.missile.EntityMissileBaseAdvanced; +import com.hbm.entity.missile.EntityMissileCustom; import com.hbm.items.tool.ItemTurretBiometry; import com.hbm.lib.Library; import com.hbm.packet.LoopedSoundPacket; @@ -103,10 +104,10 @@ public void updateEntity() { } private boolean isInSight(Entity e) { - if(!(e instanceof EntityLivingBase) && !(e instanceof EntityMissileBaseAdvanced) && !(e instanceof EntityBomber)) + if(!(e instanceof EntityLivingBase) && !(e instanceof EntityMissileBaseAdvanced) && !(e instanceof EntityBomber) && !(e instanceof EntityMissileCustom)) return false; - if(this instanceof TileEntityTurretCIWS && !(e instanceof EntityMissileBaseAdvanced) && !(e instanceof EntityBomber)) + if(this instanceof TileEntityTurretCIWS && !(e instanceof EntityMissileBaseAdvanced) && !(e instanceof EntityBomber) && !(e instanceof EntityMissileCustom)) return false; if(e instanceof EntityPlayer && players.contains((((EntityPlayer)e).getUniqueID().toString())))