diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index cd15ba556..2bfb261ed 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -272,6 +272,7 @@ public class ModBlocks { public static Block deco_rbmk_smooth; public static Block deco_loot; + public static Block bobblehead; public static Block hazmat; @@ -1439,6 +1440,7 @@ public class ModBlocks { deco_rbmk_smooth = new BlockGeneric(Material.iron).setBlockName("deco_rbmk_smooth").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":rbmk/rbmk_top"); deco_loot = new BlockLoot().setBlockName("deco_loot").setCreativeTab(null).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":block_steel"); + bobblehead = new BlockBobble().setBlockName("bobblehead").setCreativeTab(null).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":block_steel"); hazmat = new BlockGeneric(Material.cloth).setBlockName("hazmat").setStepSound(Block.soundTypeCloth).setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":hazmat"); gravel_obsidian = new BlockFalling(Material.iron).setBlockName("gravel_obsidian").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":gravel_obsidian"); @@ -2422,6 +2424,7 @@ public class ModBlocks { GameRegistry.registerBlock(deco_beryllium, deco_beryllium.getUnlocalizedName()); GameRegistry.registerBlock(deco_asbestos, deco_asbestos.getUnlocalizedName()); GameRegistry.registerBlock(deco_loot, deco_loot.getUnlocalizedName()); + GameRegistry.registerBlock(bobblehead, bobblehead.getUnlocalizedName()); GameRegistry.registerBlock(hazmat, hazmat.getUnlocalizedName()); GameRegistry.registerBlock(deco_rbmk, deco_rbmk.getUnlocalizedName()); GameRegistry.registerBlock(deco_rbmk_smooth, deco_rbmk_smooth.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/generic/BlockBobble.java b/src/main/java/com/hbm/blocks/generic/BlockBobble.java new file mode 100644 index 000000000..43b4875a9 --- /dev/null +++ b/src/main/java/com/hbm/blocks/generic/BlockBobble.java @@ -0,0 +1,59 @@ +package com.hbm.blocks.generic; + +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +public class BlockBobble extends BlockContainer { + + public BlockBobble() { + super(Material.iron); + } + + @Override + public int getRenderType() { + return -1; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F); + } + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + this.setBlockBoundsBasedOnState(world, x, y, z); + return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ); + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return new TileEntityBobble(); + } + + public static class TileEntityBobble extends TileEntity { + + } + + public static enum BobbleType { + + NONE; + + public String name; + public String contribution; + public String inscription; + } +} diff --git a/src/main/java/com/hbm/blocks/generic/BlockLoot.java b/src/main/java/com/hbm/blocks/generic/BlockLoot.java index 90050a4e2..edda47f8d 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockLoot.java +++ b/src/main/java/com/hbm/blocks/generic/BlockLoot.java @@ -3,21 +3,13 @@ package com.hbm.blocks.generic; import java.util.ArrayList; import java.util.List; -import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.generic.BlockLoot.TileEntityLoot; -import com.hbm.items.ModItems; -import com.hbm.main.MainRegistry; -import com.hbm.tileentity.bomb.TileEntityBombMulti; -import com.hbm.util.LootGenerator; import com.hbm.util.Tuple.Quartet; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; 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.network.NetworkManager; diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index f89c1d9da..5fd9b1556 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -10,7 +10,6 @@ import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.WeightedRandomChestContent; @@ -72,16 +71,7 @@ import com.hbm.hazard.HazardRegistry; import com.hbm.hazard.HazardSystem; import com.hbm.interfaces.IItemHazard; import com.hbm.inventory.*; -import com.hbm.inventory.recipes.AssemblerRecipes; -import com.hbm.inventory.recipes.BreederRecipes; -import com.hbm.inventory.recipes.CentrifugeRecipes; -import com.hbm.inventory.recipes.CrystallizerRecipes; -import com.hbm.inventory.recipes.CyclotronRecipes; -import com.hbm.inventory.recipes.HadronRecipes; -import com.hbm.inventory.recipes.MagicRecipes; -import com.hbm.inventory.recipes.RefineryRecipes; -import com.hbm.inventory.recipes.SILEXRecipes; -import com.hbm.inventory.recipes.ShredderRecipes; +import com.hbm.inventory.recipes.*; import com.hbm.inventory.recipes.anvil.AnvilRecipes; import com.hbm.items.ModItems; import com.hbm.lib.HbmWorld; @@ -887,6 +877,7 @@ public class MainRegistry { MagicRecipes.register(); SILEXRecipes.register(); AnvilRecipes.register(); + PressRecipes.register(); RefineryRecipes.registerFractions(); TileEntityNukeCustom.registerBombItems(); diff --git a/src/main/java/com/hbm/tileentity/TileMappings.java b/src/main/java/com/hbm/tileentity/TileMappings.java index 782f0e5c1..a5cbf2605 100644 --- a/src/main/java/com/hbm/tileentity/TileMappings.java +++ b/src/main/java/com/hbm/tileentity/TileMappings.java @@ -2,6 +2,7 @@ package com.hbm.tileentity; import java.util.HashMap; +import com.hbm.blocks.generic.BlockBobble.TileEntityBobble; import com.hbm.blocks.generic.BlockLoot.TileEntityLoot; import com.hbm.tileentity.bomb.*; import com.hbm.tileentity.conductor.*; @@ -194,6 +195,7 @@ public class TileMappings { map.put(TileEntitySpacer.class, "tileentity_fraction_spacer"); map.put(TileEntityLoot.class, "tileentity_ntm_loot"); + map.put(TileEntityBobble.class, "tileentity_ntm_bobblehead"); putBombs(); putTurrets();