Skip to content

Commit

Permalink
cans cans cans, config for template blacklist
Browse files Browse the repository at this point in the history
  • Loading branch information
HbmMods committed Jul 15, 2019
1 parent ba01b39 commit a4d4aa7
Show file tree
Hide file tree
Showing 48 changed files with 578 additions and 36 deletions.
37 changes: 37 additions & 0 deletions assets/hbm/lang/de_DE.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
37 changes: 37 additions & 0 deletions assets/hbm/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Binary file added assets/hbm/textures/blocks/crate_can_bottom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/blocks/crate_can_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/blocks/crate_can_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/can_key.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_asbestos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_ass.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_bark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_beef.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_bhole.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_cheese.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_chinese.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_diesel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_fist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_fried.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_hotdogs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_jizz.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_kerosene.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_leftovers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_milk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_mystery.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_napalm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_oil.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_pashtet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_pizza.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_recursion.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/items/canned_spam.png
Binary file added assets/hbm/textures/items/canned_stew.png
Binary file added assets/hbm/textures/items/canned_tomato.png
Binary file added assets/hbm/textures/items/canned_tube.png
Binary file added assets/hbm/textures/items/canned_tuna.png
Binary file added assets/hbm/textures/items/canned_yogurt.png
8 changes: 6 additions & 2 deletions com/hbm/blocks/ModBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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());
Expand Down
108 changes: 108 additions & 0 deletions com/hbm/blocks/generic/BlockCanCrate.java
Original file line number Diff line number Diff line change
@@ -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<Item> 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);
}

}
1 change: 0 additions & 1 deletion com/hbm/blocks/generic/BlockCrate.java
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
22 changes: 22 additions & 0 deletions com/hbm/blocks/machine/SoyuzLauncher.java
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -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;
}
}

}
4 changes: 3 additions & 1 deletion com/hbm/handler/BobmazonOfferFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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<Offer> getOffers(ItemStack stack) {
Expand Down
4 changes: 2 additions & 2 deletions com/hbm/inventory/MachineRecipes.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading

0 comments on commit a4d4aa7

Please sign in to comment.