diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index af554d68b..d9cdcaed4 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -38,24 +38,17 @@ public class ModBlocks { } public static Block test_render; - public static Block test_container; public static Block test_bomb; public static Block test_bomb_advanced; public static Block test_nuke; public static final int guiID_test_nuke = 2; public static Block event_tester; - public static Block rotation_tester; public static Block obj_tester; - public static Block test_ticker; - public static Block test_missile; public static Block test_core; public static Block test_charge; - public static Block test_conductor; public static Block test_pipe; public static Block test_ct; public static Block test_rail; - public static Block test_bb_bork; - public static Block test_bb_inf; public static Block structure_anchor; public static Block ore_uranium; @@ -356,6 +349,18 @@ public class ModBlocks { public static Block concrete_asbestos_stairs; public static Block ducrete_smooth_stairs; public static Block ducrete_stairs; + public static Block brick_concrete_stairs; + public static Block brick_concrete_mossy_stairs; + public static Block brick_concrete_cracked_stairs; + public static Block brick_concrete_broken_stairs; + public static Block brick_ducrete_stairs; + public static Block reinforced_stone_stairs; + public static Block reinforced_brick_stairs; + public static Block brick_obsidian_stairs; + public static Block brick_light_stairs; + public static Block brick_compound_stairs; + public static Block brick_asbestos_stairs; + public static Block brick_fire_stairs; public static Block cmb_brick; public static Block cmb_brick_reinforced; @@ -635,13 +640,6 @@ public class ModBlocks { public static final int guiID_nuke_fstbmb = 96; public static Block bomb_multi; public static final int guiID_bomb_multi = 10; - - public static Block cel_prime; - public static final int guiID_cel_prime = 62; - public static Block cel_prime_terminal; - public static Block cel_prime_battery; - public static Block cel_prime_port; - public static Block cel_prime_tanks; public static Block heater_firebox; public static Block heater_oilburner; @@ -774,7 +772,6 @@ public class ModBlocks { public static Block cable_detector; public static Block cable_diode; public static Block machine_detector; - public static Block rf_cable; public static Block oil_duct_solid; public static Block oil_duct; public static Block gas_duct_solid; @@ -1251,20 +1248,14 @@ public class ModBlocks { public static Block volcano_core; - public static Block dummy_block_flare; - public static Block dummy_port_flare; public static Block dummy_block_drill; public static Block dummy_port_drill; public static Block dummy_block_assembler; public static Block dummy_port_assembler; - public static Block dummy_block_chemplant; - public static Block dummy_port_chemplant; public static Block dummy_block_fluidtank; public static Block dummy_port_fluidtank; public static Block dummy_block_refinery; public static Block dummy_port_refinery; - public static Block dummy_block_pumpjack; - public static Block dummy_port_pumpjack; public static Block dummy_block_turbofan; public static Block dummy_port_turbofan; public static Block dummy_block_ams_limiter; @@ -1273,8 +1264,6 @@ public class ModBlocks { public static Block dummy_port_ams_emitter; public static Block dummy_block_ams_base; public static Block dummy_port_ams_base; - public static Block dummy_block_radgen; - public static Block dummy_port_radgen; public static Block dummy_block_vault; public static Block dummy_block_blast; public static Block dummy_block_uf6; @@ -1313,23 +1302,16 @@ public class ModBlocks { private static void initializeBlock() { test_render = new TestRender(Material.rock).setBlockName("test_render").setCreativeTab(null); - test_container = new TestContainer(0).setBlockName("test_container").setCreativeTab(null); test_bomb = new TestBomb(Material.tnt).setBlockName("test_bomb").setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":test_bomb"); test_bomb_advanced = new TestBombAdvanced(Material.tnt).setBlockName("test_bomb_advanced").setCreativeTab(null); test_nuke = new TestNuke(Material.iron).setBlockName("test_nuke").setCreativeTab(null).setHardness(2.5F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":test_nuke"); event_tester = new TestEventTester(Material.iron).setBlockName("event_tester").setCreativeTab(null).setHardness(2.5F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":event_tester"); - rotation_tester = new TestRotationTester(Material.iron).setBlockName("rotation_tester").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F); obj_tester = new TestObjTester(Material.iron).setBlockName("obj_tester").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F); - test_ticker = new TestTicker(Material.iron).setBlockName("test_ticker").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":test_ticker"); - test_missile = new TestMissile(Material.iron).setBlockName("test_missile").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":test_missile"); test_core = new TestCore(Material.iron).setBlockName("test_core").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":test_core"); test_charge = new TestCharge(Material.iron).setBlockName("test_charge").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F); - test_conductor = new TestConductor(Material.iron).setBlockName("test_conductor").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":cable_neo"); test_pipe = new TestPipe(Material.iron).setBlockName("test_pipe").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":pipe_neo"); test_ct = new TestCT(Material.iron).setBlockName("test_ct").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":test_ct"); test_rail = new TestRail(Material.iron).setBlockName("test_rail").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":test_rail"); - test_bb_bork = new TestBB(Material.iron).setBlockName("test_bb_bork").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":test_bb_bork"); - test_bb_inf = new TestBB(Material.iron).setBlockName("test_bb_inf").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":test_bb_inf"); structure_anchor = new BlockGeneric(Material.iron).setBlockName("structure_anchor").setCreativeTab(null).setHardness(2.5F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":structure_anchor"); ore_uranium = new BlockOutgas(Material.rock, true, 5, true).setBlockName("ore_uranium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_uranium"); @@ -1625,15 +1607,28 @@ public class ModBlocks { concrete_slab = new BlockMultiSlab(null, Material.rock, concrete_smooth, concrete, concrete_asbestos, ducrete_smooth, ducrete).setBlockName("concrete_slab").setCreativeTab(MainRegistry.blockTab); concrete_double_slab = new BlockMultiSlab(concrete_slab, Material.rock, concrete_smooth, concrete, concrete_asbestos, ducrete_smooth, ducrete).setBlockName("concrete_double_slab").setCreativeTab(MainRegistry.blockTab); concrete_brick_slab = new BlockMultiSlab(null, Material.rock, brick_concrete, brick_concrete_mossy, brick_concrete_cracked, brick_concrete_broken, brick_ducrete).setBlockName("concrete_brick_slab").setCreativeTab(MainRegistry.blockTab); - concrete_brick_double_slab = new BlockMultiSlab(concrete_slab, Material.rock, brick_concrete, brick_concrete_mossy, brick_concrete_cracked, brick_concrete_broken, brick_ducrete).setBlockName("concrete_brick_double_slab").setCreativeTab(MainRegistry.blockTab); + concrete_brick_double_slab = new BlockMultiSlab(concrete_brick_slab, Material.rock, brick_concrete, brick_concrete_mossy, brick_concrete_cracked, brick_concrete_broken, brick_ducrete).setBlockName("concrete_brick_double_slab").setCreativeTab(MainRegistry.blockTab); brick_slab = new BlockMultiSlab(null, Material.rock, reinforced_stone, reinforced_brick, brick_obsidian, brick_light, brick_compound, brick_asbestos, brick_fire).setBlockName("brick_slab").setCreativeTab(MainRegistry.blockTab); - brick_double_slab = new BlockMultiSlab(concrete_slab, Material.rock, reinforced_stone, reinforced_brick, brick_obsidian, brick_light, brick_compound, brick_asbestos, brick_fire).setBlockName("brick_double_slab").setCreativeTab(MainRegistry.blockTab); + brick_double_slab = new BlockMultiSlab(brick_slab, Material.rock, reinforced_stone, reinforced_brick, brick_obsidian, brick_light, brick_compound, brick_asbestos, brick_fire).setBlockName("brick_double_slab").setCreativeTab(MainRegistry.blockTab); concrete_smooth_stairs = new BlockGenericStairs(concrete_smooth, 0).setBlockName("concrete_smooth_stairs").setCreativeTab(MainRegistry.blockTab); concrete_stairs = new BlockGenericStairs(concrete, 0).setBlockName("concrete_stairs").setCreativeTab(MainRegistry.blockTab); concrete_asbestos_stairs = new BlockGenericStairs(concrete_asbestos, 0).setBlockName("concrete_asbestos_stairs").setCreativeTab(MainRegistry.blockTab); ducrete_smooth_stairs = new BlockGenericStairs(ducrete_smooth, 0).setBlockName("ducrete_smooth_stairs").setCreativeTab(MainRegistry.blockTab); ducrete_stairs = new BlockGenericStairs(ducrete, 0).setBlockName("ducrete_stairs").setCreativeTab(MainRegistry.blockTab); + brick_concrete_stairs = new BlockGenericStairs(brick_concrete, 0).setBlockName("brick_concrete_stairs").setCreativeTab(MainRegistry.blockTab); + brick_concrete_mossy_stairs = new BlockGenericStairs(brick_concrete_mossy, 0).setBlockName("brick_concrete_mossy_stairs").setCreativeTab(MainRegistry.blockTab); + brick_concrete_cracked_stairs = new BlockGenericStairs(brick_concrete_cracked, 0).setBlockName("brick_concrete_cracked_stairs").setCreativeTab(MainRegistry.blockTab); + brick_concrete_broken_stairs = new BlockGenericStairs(brick_concrete_broken, 0).setBlockName("brick_concrete_broken_stairs").setCreativeTab(MainRegistry.blockTab); + brick_ducrete_stairs = new BlockGenericStairs(brick_ducrete, 0).setBlockName("brick_ducrete_stairs").setCreativeTab(MainRegistry.blockTab); + reinforced_stone_stairs = new BlockGenericStairs(reinforced_stone, 0).setBlockName("reinforced_stone_stairs").setCreativeTab(MainRegistry.blockTab); + reinforced_brick_stairs = new BlockGenericStairs(reinforced_brick, 0).setBlockName("reinforced_brick_stairs").setCreativeTab(MainRegistry.blockTab); + brick_obsidian_stairs = new BlockGenericStairs(brick_obsidian, 0).setBlockName("brick_obsidian_stairs").setCreativeTab(MainRegistry.blockTab); + brick_light_stairs = new BlockGenericStairs(brick_light, 0).setBlockName("brick_light_stairs").setCreativeTab(MainRegistry.blockTab); + brick_compound_stairs = new BlockGenericStairs(brick_compound, 0).setBlockName("brick_compound_stairs").setCreativeTab(MainRegistry.blockTab); + brick_asbestos_stairs = new BlockGenericStairs(brick_asbestos, 0).setBlockName("brick_asbestos_stairs").setCreativeTab(MainRegistry.blockTab); + brick_fire_stairs = new BlockGenericStairs(brick_fire, 0).setBlockName("brick_fire_stairs").setCreativeTab(MainRegistry.blockTab); + tile_lab = new BlockOutgas(Material.rock, false, 5, true).setBlockName("tile_lab").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(1.0F).setResistance(20.0F).setBlockTextureName(RefStrings.MODID + ":tile_lab"); tile_lab_cracked = new BlockOutgas(Material.rock, false, 5, true).setBlockName("tile_lab_cracked").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(1.0F).setResistance(20.0F).setBlockTextureName(RefStrings.MODID + ":tile_lab_cracked"); @@ -1800,12 +1795,6 @@ public class ModBlocks { nuke_n45 = new NukeN45(Material.iron).setBlockName("nuke_n45").setCreativeTab(MainRegistry.nukeTab).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":code"); nuke_fstbmb = new NukeBalefire(Material.iron, guiID_nuke_fstbmb).setBlockName("nuke_fstbmb").setCreativeTab(MainRegistry.nukeTab).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":nuke_fstbmb"); - cel_prime = new CelPrime(Material.iron).setBlockName("cel_prime").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":code"); - cel_prime_terminal = new CelPrimePart(Material.iron).setBlockName("cel_prime_terminal").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":code"); - cel_prime_battery = new CelPrimePart(Material.iron).setBlockName("cel_prime_battery").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":code"); - cel_prime_port = new CelPrimePart(Material.iron).setBlockName("cel_prime_port").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":code"); - cel_prime_tanks = new CelPrimePart(Material.iron).setBlockName("cel_prime_tanks").setCreativeTab(null).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":code"); - bomb_multi = new BombMulti(Material.iron).setBlockName("bomb_multi").setCreativeTab(MainRegistry.nukeTab).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":bomb_multi1"); //bomb_multi_large = new BombMultiLarge(Material.iron).setBlockName("bomb_multi_large").setCreativeTab(MainRegistry.tabNuke).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":bomb_multi_large"); @@ -1957,7 +1946,6 @@ public class ModBlocks { red_wire_coated = new WireCoated(Material.iron).setBlockName("red_wire_coated").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":red_wire_coated"); red_cable = new BlockCable(Material.iron).setBlockName("red_cable").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":cable_neo"); red_cable_classic = new BlockCable(Material.iron).setBlockName("red_cable_classic").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":red_cable_classic"); - rf_cable = new BlockRFCable(Material.iron).setBlockName("rf_cable").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":rf_cable_icon"); red_connector = new ConnectorRedWire(Material.iron).setBlockName("red_connector").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":red_connector"); red_pylon = new PylonRedWire(Material.iron).setBlockName("red_pylon").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":red_pylon"); red_pylon_large = new PylonLarge(Material.iron).setBlockName("red_pylon_large").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":red_pylon_large"); @@ -2356,20 +2344,14 @@ public class ModBlocks { Fluid liquidConcrete = new GenericFluid("concrete_liquid").setViscosity(2000); concrete_liquid = new GenericFiniteFluid(liquidConcrete, Material.rock, "concrete_liquid", "concrete_liquid_flowing").setQuantaPerBlock(4).setBlockName("concrete_liquid").setResistance(500F); - dummy_block_flare = new DummyBlockFlare(Material.iron, false).setBlockName("dummy_block_flare").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_aluminium"); - dummy_port_flare = new DummyBlockFlare(Material.iron, true).setBlockName("dummy_port_flare").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_aluminium"); dummy_block_drill = new DummyBlockDrill(Material.iron, false).setBlockName("dummy_block_drill").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_lead"); dummy_port_drill = new DummyBlockDrill(Material.iron, true).setBlockName("dummy_port_drill").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_lead"); dummy_block_assembler = new DummyBlockAssembler(Material.iron, false).setBlockName("dummy_block_assembler").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_port_assembler = new DummyBlockAssembler(Material.iron, true).setBlockName("dummy_port_assembler").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_block_chemplant = new BlockGeneric(Material.iron).setBlockName("dummy_block_chemplant").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_port_chemplant = new BlockGeneric(Material.iron).setBlockName("dummy_port_chemplant").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_block_fluidtank = new DummyBlockFluidTank(Material.iron, false).setBlockName("dummy_block_fluidtank").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_port_fluidtank = new DummyBlockFluidTank(Material.iron, true).setBlockName("dummy_port_fluidtank").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_block_refinery = new DummyBlockRefinery(Material.iron, false).setBlockName("dummy_block_refinery").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_titanium"); dummy_port_refinery = new DummyBlockRefinery(Material.iron, true).setBlockName("dummy_port_refinery").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_titanium"); - dummy_block_pumpjack = new BlockGeneric(Material.iron).setBlockName("dummy_block_pumpjack").setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_titanium"); - dummy_port_pumpjack = new BlockGeneric(Material.iron).setBlockName("dummy_port_pumpjack").setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_titanium"); dummy_block_turbofan = new DummyBlockTurbofan(Material.iron, false).setBlockName("dummy_block_turbofan").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_port_turbofan = new DummyBlockTurbofan(Material.iron, true).setBlockName("dummy_port_turbofan").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_block_ams_limiter = new DummyBlockAMSLimiter(Material.iron).setBlockName("dummy_block_ams_limiter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_copper"); @@ -2378,8 +2360,6 @@ public class ModBlocks { dummy_port_ams_emitter = new DummyBlockAMSEmitter(Material.iron).setBlockName("dummy_port_ams_emitter").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_copper"); dummy_block_ams_base = new DummyBlockAMSBase(Material.iron).setBlockName("dummy_block_ams_base").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_copper"); dummy_port_ams_base = new DummyBlockAMSBase(Material.iron).setBlockName("dummy_port_ams_base").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_copper"); - dummy_block_radgen = new DummyBlockRadGen(Material.iron).setBlockName("dummy_block_radgen").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_port_radgen = new DummyBlockRadGen(Material.iron).setBlockName("dummy_port_radgen").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_block_vault = new DummyBlockVault(Material.iron).setBlockName("dummy_block_vault").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_block_blast = new DummyBlockBlast(Material.iron).setBlockName("dummy_block_blast").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_block_uf6 = new DummyBlockMachine(Material.iron, guiID_uf6_tank, machine_uf6_tank, false).setBlockName("dummy_block_uf6").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_titanium"); @@ -2411,18 +2391,12 @@ public class ModBlocks { GameRegistry.registerBlock(test_nuke, test_nuke.getUnlocalizedName()); GameRegistry.registerBlock(event_tester, event_tester.getUnlocalizedName()); - GameRegistry.registerBlock(rotation_tester, rotation_tester.getUnlocalizedName()); GameRegistry.registerBlock(obj_tester, obj_tester.getUnlocalizedName()); - GameRegistry.registerBlock(test_ticker, test_ticker.getUnlocalizedName()); - GameRegistry.registerBlock(test_missile, test_missile.getUnlocalizedName()); GameRegistry.registerBlock(test_core, test_core.getUnlocalizedName()); GameRegistry.registerBlock(test_charge, test_charge.getUnlocalizedName()); - GameRegistry.registerBlock(test_conductor, test_conductor.getUnlocalizedName()); GameRegistry.registerBlock(test_pipe, test_pipe.getUnlocalizedName()); GameRegistry.registerBlock(test_ct, test_ct.getUnlocalizedName()); GameRegistry.registerBlock(test_rail, test_rail.getUnlocalizedName()); - GameRegistry.registerBlock(test_bb_bork, test_bb_bork.getUnlocalizedName()); - GameRegistry.registerBlock(test_bb_inf, test_bb_inf.getUnlocalizedName()); GameRegistry.registerBlock(structure_anchor, structure_anchor.getUnlocalizedName()); //Ores @@ -2741,6 +2715,18 @@ public class ModBlocks { GameRegistry.registerBlock(concrete_stairs, concrete_stairs.getUnlocalizedName()); GameRegistry.registerBlock(concrete_asbestos_stairs, concrete_asbestos_stairs.getUnlocalizedName()); GameRegistry.registerBlock(ducrete_smooth_stairs, ducrete_smooth_stairs.getUnlocalizedName()); + GameRegistry.registerBlock(brick_concrete_stairs, brick_concrete_stairs.getUnlocalizedName()); + GameRegistry.registerBlock(brick_concrete_mossy_stairs, brick_concrete_mossy_stairs.getUnlocalizedName()); + GameRegistry.registerBlock(brick_concrete_cracked_stairs, brick_concrete_cracked_stairs.getUnlocalizedName()); + GameRegistry.registerBlock(brick_concrete_broken_stairs, brick_concrete_broken_stairs.getUnlocalizedName()); + GameRegistry.registerBlock(brick_ducrete_stairs, brick_ducrete_stairs.getUnlocalizedName()); + GameRegistry.registerBlock(reinforced_stone_stairs, reinforced_stone_stairs.getUnlocalizedName()); + GameRegistry.registerBlock(reinforced_brick_stairs, reinforced_brick_stairs.getUnlocalizedName()); + GameRegistry.registerBlock(brick_obsidian_stairs, brick_obsidian_stairs.getUnlocalizedName()); + GameRegistry.registerBlock(brick_light_stairs, brick_light_stairs.getUnlocalizedName()); + GameRegistry.registerBlock(brick_compound_stairs, brick_compound_stairs.getUnlocalizedName()); + GameRegistry.registerBlock(brick_asbestos_stairs, brick_asbestos_stairs.getUnlocalizedName()); + GameRegistry.registerBlock(brick_fire_stairs, brick_fire_stairs.getUnlocalizedName()); GameRegistry.registerBlock(ducrete_stairs, ducrete_stairs.getUnlocalizedName()); //CMB Building Elements @@ -2929,13 +2915,6 @@ public class ModBlocks { GameRegistry.registerBlock(mine_shrap, mine_shrap.getUnlocalizedName()); GameRegistry.registerBlock(mine_fat, mine_fat.getUnlocalizedName()); - //Wot - GameRegistry.registerBlock(cel_prime, cel_prime.getUnlocalizedName()); - GameRegistry.registerBlock(cel_prime_terminal, cel_prime_terminal.getUnlocalizedName()); - GameRegistry.registerBlock(cel_prime_battery, cel_prime_battery.getUnlocalizedName()); - GameRegistry.registerBlock(cel_prime_port, cel_prime_port.getUnlocalizedName()); - GameRegistry.registerBlock(cel_prime_tanks, cel_prime_tanks.getUnlocalizedName()); - //Block Bombs GameRegistry.registerBlock(flame_war, flame_war.getUnlocalizedName()); GameRegistry.registerBlock(float_bomb, float_bomb.getUnlocalizedName()); @@ -3153,7 +3132,6 @@ public class ModBlocks { GameRegistry.registerBlock(cable_detector, cable_detector.getUnlocalizedName()); GameRegistry.registerBlock(cable_diode, ItemBlockBase.class, cable_diode.getUnlocalizedName()); GameRegistry.registerBlock(machine_detector, machine_detector.getUnlocalizedName()); - GameRegistry.registerBlock(rf_cable, rf_cable.getUnlocalizedName()); GameRegistry.registerBlock(oil_duct, oil_duct.getUnlocalizedName()); GameRegistry.registerBlock(oil_duct_solid, oil_duct_solid.getUnlocalizedName()); GameRegistry.registerBlock(gas_duct, gas_duct.getUnlocalizedName()); @@ -3411,20 +3389,14 @@ public class ModBlocks { //GameRegistry.registerBlock(concrete_liquid, concrete_liquid.getUnlocalizedName()); //Multiblock Dummy Blocks - GameRegistry.registerBlock(dummy_block_flare, dummy_block_flare.getUnlocalizedName()); - GameRegistry.registerBlock(dummy_port_flare, dummy_port_flare.getUnlocalizedName()); GameRegistry.registerBlock(dummy_block_drill, dummy_block_drill.getUnlocalizedName()); GameRegistry.registerBlock(dummy_port_drill, dummy_port_drill.getUnlocalizedName()); GameRegistry.registerBlock(dummy_block_assembler, dummy_block_assembler.getUnlocalizedName()); GameRegistry.registerBlock(dummy_port_assembler, dummy_port_assembler.getUnlocalizedName()); - GameRegistry.registerBlock(dummy_block_chemplant, dummy_block_chemplant.getUnlocalizedName()); - GameRegistry.registerBlock(dummy_port_chemplant, dummy_port_chemplant.getUnlocalizedName()); GameRegistry.registerBlock(dummy_block_fluidtank, dummy_block_fluidtank.getUnlocalizedName()); GameRegistry.registerBlock(dummy_port_fluidtank, dummy_port_fluidtank.getUnlocalizedName()); GameRegistry.registerBlock(dummy_block_refinery, dummy_block_refinery.getUnlocalizedName()); GameRegistry.registerBlock(dummy_port_refinery, dummy_port_refinery.getUnlocalizedName()); - GameRegistry.registerBlock(dummy_block_pumpjack, dummy_block_pumpjack.getUnlocalizedName()); - GameRegistry.registerBlock(dummy_port_pumpjack, dummy_port_pumpjack.getUnlocalizedName()); GameRegistry.registerBlock(dummy_block_turbofan, dummy_block_turbofan.getUnlocalizedName()); GameRegistry.registerBlock(dummy_port_turbofan, dummy_port_turbofan.getUnlocalizedName()); GameRegistry.registerBlock(dummy_block_ams_limiter, dummy_block_ams_limiter.getUnlocalizedName()); @@ -3433,8 +3405,6 @@ public class ModBlocks { GameRegistry.registerBlock(dummy_port_ams_emitter, dummy_port_ams_emitter.getUnlocalizedName()); GameRegistry.registerBlock(dummy_block_ams_base, dummy_block_ams_base.getUnlocalizedName()); GameRegistry.registerBlock(dummy_port_ams_base, dummy_port_ams_base.getUnlocalizedName()); - GameRegistry.registerBlock(dummy_block_radgen, dummy_block_radgen.getUnlocalizedName()); - GameRegistry.registerBlock(dummy_port_radgen, dummy_port_radgen.getUnlocalizedName()); GameRegistry.registerBlock(dummy_block_vault, dummy_block_vault.getUnlocalizedName()); GameRegistry.registerBlock(dummy_block_blast, dummy_block_blast.getUnlocalizedName()); GameRegistry.registerBlock(dummy_block_uf6, dummy_block_uf6.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/bomb/CelPrime.java b/src/main/java/com/hbm/blocks/bomb/CelPrime.java deleted file mode 100644 index 5c076bd16..000000000 --- a/src/main/java/com/hbm/blocks/bomb/CelPrime.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.hbm.blocks.bomb; - -import com.hbm.blocks.ModBlocks; -import com.hbm.main.MainRegistry; -import com.hbm.tileentity.bomb.TileEntityCelPrime; - -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; - -public class CelPrime extends BlockContainer { - - public CelPrime(Material p_i45386_1_) { - super(p_i45386_1_); - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileEntityCelPrime(); - } - - @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()) - { - TileEntityCelPrime entity = (TileEntityCelPrime) world.getTileEntity(x, y, z); - if(entity != null) - { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_cel_prime, world, x, y, z); - } - return true; - } else { - return false; - } - } - - @Override - public int getRenderType(){ - return -1; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { - int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - - if(i == 0) - { - world.setBlockMetadataWithNotify(x, y, z, 5, 2); - } - if(i == 1) - { - world.setBlockMetadataWithNotify(x, y, z, 3, 2); - } - if(i == 2) - { - world.setBlockMetadataWithNotify(x, y, z, 4, 2); - } - if(i == 3) - { - world.setBlockMetadataWithNotify(x, y, z, 2, 2); - } - } - -} diff --git a/src/main/java/com/hbm/blocks/bomb/CelPrimePart.java b/src/main/java/com/hbm/blocks/bomb/CelPrimePart.java deleted file mode 100644 index 7631719f1..000000000 --- a/src/main/java/com/hbm/blocks/bomb/CelPrimePart.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.hbm.blocks.bomb; - -import com.hbm.blocks.ModBlocks; -import com.hbm.tileentity.bomb.TileEntityCelPrimeBattery; -import com.hbm.tileentity.bomb.TileEntityCelPrimePort; -import com.hbm.tileentity.bomb.TileEntityCelPrimeTanks; -import com.hbm.tileentity.bomb.TileEntityCelPrimeTerminal; - -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; - -public class CelPrimePart extends BlockContainer { - - public CelPrimePart(Material p_i45386_1_) { - super(p_i45386_1_); - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - if(this == ModBlocks.cel_prime_terminal) - return new TileEntityCelPrimeTerminal(); - if(this == ModBlocks.cel_prime_battery) - return new TileEntityCelPrimeBattery(); - if(this == ModBlocks.cel_prime_port) - return new TileEntityCelPrimePort(); - if(this == ModBlocks.cel_prime_tanks) - return new TileEntityCelPrimeTanks(); - - return null; - } - - @Override - public int getRenderType(){ - return -1; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { - int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - - if(i == 0) - { - world.setBlockMetadataWithNotify(x, y, z, 5, 2); - } - if(i == 1) - { - world.setBlockMetadataWithNotify(x, y, z, 3, 2); - } - if(i == 2) - { - world.setBlockMetadataWithNotify(x, y, z, 4, 2); - } - if(i == 3) - { - world.setBlockMetadataWithNotify(x, y, z, 2, 2); - } - } -} diff --git a/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java b/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java index b94834e2f..4910221d7 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java +++ b/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java @@ -1,12 +1,19 @@ package com.hbm.blocks.generic; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; public class BlockGenericStairs extends BlockStairs { + public static List recipeGen = new ArrayList(); + public BlockGenericStairs(Block block, int meta) { super(block, meta); + this.useNeighborBrightness = true; + + recipeGen.add(new Object[] {block, meta, this}); } - } diff --git a/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java b/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java index 97c8f000d..231bb58cb 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java +++ b/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java @@ -1,5 +1,6 @@ package com.hbm.blocks.generic; +import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -17,6 +18,8 @@ import net.minecraft.world.World; public class BlockMultiSlab extends BlockSlab { + public static List recipeGen = new ArrayList(); + public Block[] slabMaterials; public Block single; @@ -24,6 +27,13 @@ public class BlockMultiSlab extends BlockSlab { super(single != null, mat); this.single = single; this.slabMaterials = slabMaterials; + this.useNeighborBrightness = true; + + if(single == null) { + for(int i = 0; i < slabMaterials.length; i++) { + recipeGen.add(new Object[] {slabMaterials[i], this, i}); + } + } } @Override @@ -41,7 +51,7 @@ public class BlockMultiSlab extends BlockSlab { @Override protected ItemStack createStackedBlock(int meta) { - return new ItemStack(Item.getItemFromBlock(single != null ? single : this), 2, meta & 7); + return new ItemStack(Item.getItemFromBlock(single != null ? single : this), 2, (meta & 7) % slabMaterials.length); } @SideOnly(Side.CLIENT) @@ -58,7 +68,7 @@ public class BlockMultiSlab extends BlockSlab { @Override public int getDamageValue(World world, int x, int y, int z) { - return super.getDamageValue(world, x, y, z) & 7; + return (super.getDamageValue(world, x, y, z) & 7) % slabMaterials.length; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockCyclotron.java b/src/main/java/com/hbm/blocks/machine/DummyBlockCyclotron.java deleted file mode 100644 index 93381f760..000000000 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockCyclotron.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hbm.blocks.machine; - -import java.util.Random; - -import com.hbm.blocks.ModBlocks; -import com.hbm.interfaces.IDummy; -import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityMachineCyclotron; - -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -public class DummyBlockCyclotron extends DummyOldBase { - - public DummyBlockCyclotron(Material p_i45386_1_, boolean port) { - super(p_i45386_1_, port); - } - - @Override - @SideOnly(Side.CLIENT) - public Item getItem(World world, int x, int y, int z) - { - return Item.getItemFromBlock(ModBlocks.machine_cyclotron); - } - - @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()) - { - TileEntity te = world.getTileEntity(x, y, z); - if(te != null && te instanceof TileEntityDummy) { - int a = ((TileEntityDummy)te).targetX; - int b = ((TileEntityDummy)te).targetY; - int c = ((TileEntityDummy)te).targetZ; - - TileEntityMachineCyclotron entity = (TileEntityMachineCyclotron) world.getTileEntity(a, b, c); - if(entity != null) - { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_cyclotron, world, a, b, c); - } - } - return true; - } else { - return false; - } - } -} diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockFlare.java b/src/main/java/com/hbm/blocks/machine/DummyBlockFlare.java deleted file mode 100644 index 760add7d0..000000000 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockFlare.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hbm.blocks.machine; - -import java.util.Random; - -import com.hbm.blocks.ModBlocks; -import com.hbm.interfaces.IDummy; -import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.oil.TileEntityMachineGasFlare; - -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -public class DummyBlockFlare extends DummyOldBase { - - public DummyBlockFlare(Material p_i45386_1_, boolean port) { - super(p_i45386_1_, port); - } - - @Override - @SideOnly(Side.CLIENT) - public Item getItem(World world, int x, int y, int z) - { - return Item.getItemFromBlock(ModBlocks.machine_flare); - } - - @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()) - { - TileEntity te = world.getTileEntity(x, y, z); - if(te != null && te instanceof TileEntityDummy) { - int a = ((TileEntityDummy)te).targetX; - int b = ((TileEntityDummy)te).targetY; - int c = ((TileEntityDummy)te).targetZ; - - TileEntityMachineGasFlare entity = (TileEntityMachineGasFlare) world.getTileEntity(a, b, c); - if(entity != null) - { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_flare, world, a, b, c); - } - } - return true; - } else { - return false; - } - } -} diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockRadGen.java b/src/main/java/com/hbm/blocks/machine/DummyBlockRadGen.java deleted file mode 100644 index 44503bc9e..000000000 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockRadGen.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.hbm.blocks.machine; - -import java.util.Random; - -import com.hbm.blocks.ModBlocks; -import com.hbm.interfaces.IDummy; -import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityMachineRadGen; - -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -public class DummyBlockRadGen extends BlockContainer implements IDummy { - - public static boolean safeBreak = false; - - public DummyBlockRadGen(Material p_i45386_1_) { - super(p_i45386_1_); - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileEntityDummy(); - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int i) - { - if(!safeBreak) { - TileEntity te = world.getTileEntity(x, y, z); - if(te != null && te instanceof TileEntityDummy) { - int a = ((TileEntityDummy)te).targetX; - int b = ((TileEntityDummy)te).targetY; - int c = ((TileEntityDummy)te).targetZ; - - //world.getBlock(a, b, c).breakBlock(world, a, b, c, block, i); - if(!world.isRemote) - world.func_147480_a(a, b, c, true); - } - } - world.removeTileEntity(x, y, z); - } - - @Override - public int getRenderType() { - return -1; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) - { - return null; - } - - @Override - @SideOnly(Side.CLIENT) - public Item getItem(World world, int x, int y, int z) - { - return Item.getItemFromBlock(ModBlocks.machine_radgen); - } - - @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()) - { - TileEntity te = world.getTileEntity(x, y, z); - if(te != null && te instanceof TileEntityDummy) { - int a = ((TileEntityDummy)te).targetX; - int b = ((TileEntityDummy)te).targetY; - int c = ((TileEntityDummy)te).targetZ; - - TileEntityMachineRadGen entity = (TileEntityMachineRadGen) world.getTileEntity(a, b, c); - if(entity != null) - { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_radgen, world, a, b, c); - } - } - return true; - } else { - return false; - } - } -} diff --git a/src/main/java/com/hbm/blocks/network/BlockCable.java b/src/main/java/com/hbm/blocks/network/BlockCable.java index ffc7c7f36..92fc65684 100644 --- a/src/main/java/com/hbm/blocks/network/BlockCable.java +++ b/src/main/java/com/hbm/blocks/network/BlockCable.java @@ -1,7 +1,6 @@ package com.hbm.blocks.network; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.test.TestConductor; import com.hbm.lib.Library; import com.hbm.tileentity.network.TileEntityCableBaseNT; @@ -23,7 +22,8 @@ public class BlockCable extends BlockContainer { public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { return new TileEntityCableBaseNT(); } - + + public static int renderID = RenderingRegistry.getNextAvailableRenderId(); public static int renderIDClassic = RenderingRegistry.getNextAvailableRenderId(); @Override @@ -32,7 +32,7 @@ public class BlockCable extends BlockContainer { if(this == ModBlocks.red_cable_classic) return renderIDClassic; - return TestConductor.renderID; + return renderID; } @Override diff --git a/src/main/java/com/hbm/blocks/test/TestBB.java b/src/main/java/com/hbm/blocks/test/TestBB.java deleted file mode 100644 index 573cc0804..000000000 --- a/src/main/java/com/hbm/blocks/test/TestBB.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hbm.blocks.test; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; - -public class TestBB extends Block { - - public TestBB(Material mat) { - super(mat); - } -} diff --git a/src/main/java/com/hbm/blocks/test/TestConductor.java b/src/main/java/com/hbm/blocks/test/TestConductor.java deleted file mode 100644 index 45c2684b0..000000000 --- a/src/main/java/com/hbm/blocks/test/TestConductor.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hbm.blocks.test; - -import com.hbm.interfaces.Untested; -import com.hbm.tileentity.network.TileEntityCableBaseNT; - -import cpw.mods.fml.client.registry.RenderingRegistry; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -/** - * Powered by satan energy! - * @author hbm - */ -@Untested -public class TestConductor extends BlockContainer { - - public TestConductor(Material p_i45386_1_) { - super(p_i45386_1_); - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileEntityCableBaseNT(); - } - - public static int renderID = RenderingRegistry.getNextAvailableRenderId(); - - @Override - public int getRenderType() { - return renderID; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } -} diff --git a/src/main/java/com/hbm/blocks/test/TestContainer.java b/src/main/java/com/hbm/blocks/test/TestContainer.java deleted file mode 100644 index 304beec6d..000000000 --- a/src/main/java/com/hbm/blocks/test/TestContainer.java +++ /dev/null @@ -1,266 +0,0 @@ -package com.hbm.blocks.test; - -import static net.minecraftforge.common.util.ForgeDirection.DOWN; - -import java.util.Iterator; -import java.util.Random; - -import com.hbm.lib.RefStrings; -import com.hbm.tileentity.deco.TileEntityTestContainer; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.BlockChest; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.passive.EntityOcelot; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryLargeChest; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; - -public class TestContainer extends BlockChest { - - public TestContainer(int p_i45397_1_) { - super(p_i45397_1_); - } - - private final Random field_149955_b = new Random(); - - //Aktiviert durch: Platzieren. Bewirkt: Rotation des Blockes in Blickrichtung - @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) - { - Block block = p_149689_1_.getBlock(p_149689_2_, p_149689_3_, p_149689_4_ - 1); - Block block1 = p_149689_1_.getBlock(p_149689_2_, p_149689_3_, p_149689_4_ + 1); - Block block2 = p_149689_1_.getBlock(p_149689_2_ - 1, p_149689_3_, p_149689_4_); - Block block3 = p_149689_1_.getBlock(p_149689_2_ + 1, p_149689_3_, p_149689_4_); - byte b0 = 0; - int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - - if (l == 0) - { - b0 = 2; - } - - if (l == 1) - { - b0 = 5; - } - - if (l == 2) - { - b0 = 3; - } - - if (l == 3) - { - b0 = 4; - } - - if (block != this && block1 != this && block2 != this && block3 != this) - { - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, b0, 3); - } - else - { - if ((block == this || block1 == this) && (b0 == 4 || b0 == 5)) - { - if (block == this) - { - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_ - 1, b0, 3); - } - else - { - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_ + 1, b0, 3); - } - - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, b0, 3); - } - - if ((block2 == this || block3 == this) && (b0 == 2 || b0 == 3)) - { - if (block2 == this) - { - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_ - 1, p_149689_3_, p_149689_4_, b0, 3); - } - else - { - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_ + 1, p_149689_3_, p_149689_4_, b0, 3); - } - - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, b0, 3); - } - } - - if (p_149689_6_.hasDisplayName()) - { - ((TileEntityTestContainer)p_149689_1_.getTileEntity(p_149689_2_, p_149689_3_, p_149689_4_)).func_145976_a(p_149689_6_.getDisplayName()); - } - } - - //Aktiviert durch: Blockupdate. Bewirkt: Verbinden zweier Kisten - @Override - public void onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_) - { - super.onNeighborBlockChange(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_, p_149695_5_); - TileEntityTestContainer tileentitychest = (TileEntityTestContainer)p_149695_1_.getTileEntity(p_149695_2_, p_149695_3_, p_149695_4_); - - if (tileentitychest != null) - { - tileentitychest.updateContainingBlockInfo(); - } - } - - //Aktiviert durch: Zerst�rung. Bewirkt: Droppt alle in ihm befindlichen Items - @Override - public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) - { - TileEntityTestContainer tileentitychest = (TileEntityTestContainer)p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_); - - if (tileentitychest != null) - { - for (int i1 = 0; i1 < tileentitychest.getSizeInventory(); ++i1) - { - ItemStack itemstack = tileentitychest.getStackInSlot(i1); - - if (itemstack != null) - { - float f = this.field_149955_b.nextFloat() * 0.8F + 0.1F; - float f1 = this.field_149955_b.nextFloat() * 0.8F + 0.1F; - EntityItem entityitem; - - for (float f2 = this.field_149955_b.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; p_149749_1_.spawnEntityInWorld(entityitem)) - { - int j1 = this.field_149955_b.nextInt(21) + 10; - - if (j1 > itemstack.stackSize) - { - j1 = itemstack.stackSize; - } - - itemstack.stackSize -= j1; - entityitem = new EntityItem(p_149749_1_, p_149749_2_ + f, p_149749_3_ + f1, p_149749_4_ + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage())); - float f3 = 0.05F; - entityitem.motionX = (float)this.field_149955_b.nextGaussian() * f3; - entityitem.motionY = (float)this.field_149955_b.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float)this.field_149955_b.nextGaussian() * f3; - - if (itemstack.hasTagCompound()) - { - entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); - } - } - } - } - - p_149749_1_.func_147453_f(p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_); - } - - super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_); - } - - //Allgemeine Inventarfunktion - @Override - public IInventory func_149951_m(World p_149951_1_, int p_149951_2_, int p_149951_3_, int p_149951_4_) - { - Object object = p_149951_1_.getTileEntity(p_149951_2_, p_149951_3_, p_149951_4_); - - if (object == null) - { - return null; - } - else if (p_149951_1_.isSideSolid(p_149951_2_, p_149951_3_ + 1, p_149951_4_, DOWN)) - { - return null; - } - else if (func_149953_o(p_149951_1_, p_149951_2_, p_149951_3_, p_149951_4_)) - { - return null; - } - else if (p_149951_1_.getBlock(p_149951_2_ - 1, p_149951_3_, p_149951_4_) == this && (p_149951_1_.isSideSolid(p_149951_2_ - 1, p_149951_3_ + 1, p_149951_4_, DOWN) || func_149953_o(p_149951_1_, p_149951_2_ - 1, p_149951_3_, p_149951_4_))) - { - return null; - } - else if (p_149951_1_.getBlock(p_149951_2_ + 1, p_149951_3_, p_149951_4_) == this && (p_149951_1_.isSideSolid(p_149951_2_ + 1, p_149951_3_ + 1, p_149951_4_, DOWN) || func_149953_o(p_149951_1_, p_149951_2_ + 1, p_149951_3_, p_149951_4_))) - { - return null; - } - else if (p_149951_1_.getBlock(p_149951_2_, p_149951_3_, p_149951_4_ - 1) == this && (p_149951_1_.isSideSolid(p_149951_2_, p_149951_3_ + 1, p_149951_4_ - 1, DOWN) || func_149953_o(p_149951_1_, p_149951_2_, p_149951_3_, p_149951_4_ - 1))) - { - return null; - } - else if (p_149951_1_.getBlock(p_149951_2_, p_149951_3_, p_149951_4_ + 1) == this && (p_149951_1_.isSideSolid(p_149951_2_, p_149951_3_ + 1, p_149951_4_ + 1, DOWN) || func_149953_o(p_149951_1_, p_149951_2_, p_149951_3_, p_149951_4_ + 1))) - { - return null; - } - else - { - if (p_149951_1_.getBlock(p_149951_2_ - 1, p_149951_3_, p_149951_4_) == this) - { - object = new InventoryLargeChest("container.testContainer", (TileEntityTestContainer)p_149951_1_.getTileEntity(p_149951_2_ - 1, p_149951_3_, p_149951_4_), (IInventory)object); - } - - if (p_149951_1_.getBlock(p_149951_2_ + 1, p_149951_3_, p_149951_4_) == this) - { - object = new InventoryLargeChest("container.testContainer", (IInventory)object, (TileEntityTestContainer)p_149951_1_.getTileEntity(p_149951_2_ + 1, p_149951_3_, p_149951_4_)); - } - - if (p_149951_1_.getBlock(p_149951_2_, p_149951_3_, p_149951_4_ - 1) == this) - { - object = new InventoryLargeChest("container.testContainer", (TileEntityTestContainer)p_149951_1_.getTileEntity(p_149951_2_, p_149951_3_, p_149951_4_ - 1), (IInventory)object); - } - - if (p_149951_1_.getBlock(p_149951_2_, p_149951_3_, p_149951_4_ + 1) == this) - { - object = new InventoryLargeChest("container.testContainer", (IInventory)object, (TileEntityTestContainer)p_149951_1_.getTileEntity(p_149951_2_, p_149951_3_, p_149951_4_ + 1)); - } - - return (IInventory)object; - } - } - - //Bewirkt, dass sich Katzen draufsetzen - private static boolean func_149953_o(World p_149953_0_, int p_149953_1_, int p_149953_2_, int p_149953_3_) - { - Iterator iterator = p_149953_0_.getEntitiesWithinAABB(EntityOcelot.class, AxisAlignedBB.getBoundingBox(p_149953_1_, p_149953_2_ + 1, p_149953_3_, p_149953_1_ + 1, p_149953_2_ + 2, p_149953_3_ + 1)).iterator(); - EntityOcelot entityocelot; - - do - { - if (!iterator.hasNext()) - { - return false; - } - - Entity entity = (Entity)iterator.next(); - entityocelot = (EntityOcelot)entity; - } - while (!entityocelot.isSitting()); - - return true; - } - - //Erzeugt ein neues Tileentity - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) - { - TileEntityTestContainer tileentitychest = new TileEntityTestContainer(); - return tileentitychest; - } - - //Registriert das Inventaricon - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister p_149651_1_) - { - this.blockIcon = p_149651_1_.registerIcon(RefStrings.MODID + ":test_container"); - } -} diff --git a/src/main/java/com/hbm/blocks/test/TestRotationTester.java b/src/main/java/com/hbm/blocks/test/TestRotationTester.java deleted file mode 100644 index 76e29c5b3..000000000 --- a/src/main/java/com/hbm/blocks/test/TestRotationTester.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hbm.blocks.test; - -import com.hbm.lib.RefStrings; -import com.hbm.tileentity.deco.TileEntityRotationTester; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; - -public class TestRotationTester extends BlockContainer { - - public TestRotationTester(Material p_i45394_1_) { - super(p_i45394_1_); - } - - @Override - public int getRenderType(){ - return -1; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - - @Override - public TileEntity createNewTileEntity(World var1, int var2) { - return new TileEntityRotationTester(); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconregister) { - this.blockIcon = iconregister.registerIcon(RefStrings.MODID + ":test_render"); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { - int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - - if(i == 0) - { - world.setBlockMetadataWithNotify(x, y, z, 2, 2); - } - if(i == 1) - { - world.setBlockMetadataWithNotify(x, y, z, 5, 2); - } - if(i == 2) - { - world.setBlockMetadataWithNotify(x, y, z, 3, 2); - } - if(i == 3) - { - world.setBlockMetadataWithNotify(x, y, z, 4, 2); - } - } - -} diff --git a/src/main/java/com/hbm/blocks/test/TestTicker.java b/src/main/java/com/hbm/blocks/test/TestTicker.java deleted file mode 100644 index c2e434ae8..000000000 --- a/src/main/java/com/hbm/blocks/test/TestTicker.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hbm.blocks.test; - -import java.util.Random; - -import com.hbm.blocks.ModBlocks; -import com.hbm.config.GeneralConfig; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.world.World; - -public class TestTicker extends Block { - - public TestTicker(Material p_i45394_1_) { - super(p_i45394_1_); - this.setTickRandomly(true); - } - - @Override - public void updateTick(World world, int x, int y, int z, Random rand) { - - if(GeneralConfig.enableVirus) { - if(world.getBlock(x + 1, y, z) != ModBlocks.test_ticker) { - world.setBlock(x + 1, y, z, ModBlocks.test_ticker); - } - - if(world.getBlock(x, y + 1, z) != ModBlocks.test_ticker) { - world.setBlock(x, y + 1, z, ModBlocks.test_ticker); - } - - if(world.getBlock(x, y, z + 1) != ModBlocks.test_ticker) { - world.setBlock(x, y, z + 1, ModBlocks.test_ticker); - } - - if(world.getBlock(x - 1, y, z) != ModBlocks.test_ticker) { - world.setBlock(x - 1, y, z, ModBlocks.test_ticker); - } - - if(world.getBlock(x, y - 1, z) != ModBlocks.test_ticker) { - world.setBlock(x, y - 1, z, ModBlocks.test_ticker); - } - - if(world.getBlock(x, y, z - 1) != ModBlocks.test_ticker) { - world.setBlock(x, y, z - 1, ModBlocks.test_ticker); - } - } - } -} diff --git a/src/main/java/com/hbm/entity/mob/EntityFBI.java b/src/main/java/com/hbm/entity/mob/EntityFBI.java index fbbd5e6e6..f0ec89070 100644 --- a/src/main/java/com/hbm/entity/mob/EntityFBI.java +++ b/src/main/java/com/hbm/entity/mob/EntityFBI.java @@ -158,7 +158,7 @@ public class EntityFBI extends EntityMob implements IRangedAttackMob { canDestroy.add(ModBlocks.machine_press); canDestroy.add(ModBlocks.machine_epress); canDestroy.add(ModBlocks.dummy_block_assembler); - canDestroy.add(ModBlocks.dummy_block_chemplant); + canDestroy.add(ModBlocks.machine_chemplant); canDestroy.add(ModBlocks.machine_crystallizer); canDestroy.add(ModBlocks.machine_turbine); canDestroy.add(ModBlocks.machine_large_turbine); diff --git a/src/main/java/com/hbm/handler/GUIHandler.java b/src/main/java/com/hbm/handler/GUIHandler.java index 3aa597ed9..a2524ec75 100644 --- a/src/main/java/com/hbm/handler/GUIHandler.java +++ b/src/main/java/com/hbm/handler/GUIHandler.java @@ -422,13 +422,6 @@ public class GUIHandler implements IGuiHandler { return null; } - case ModBlocks.guiID_cel_prime: { - if(entity instanceof TileEntityCelPrime) { - return new ContainerCelPrime(player.inventory, (TileEntityCelPrime) entity); - } - return null; - } - case ModBlocks.guiID_machine_selenium: { if(entity instanceof TileEntityMachineSeleniumEngine) { return new ContainerMachineSelenium(player.inventory, (TileEntityMachineSeleniumEngine) entity); @@ -1234,13 +1227,6 @@ public class GUIHandler implements IGuiHandler { return null; } - case ModBlocks.guiID_cel_prime: { - if(entity instanceof TileEntityCelPrime) { - return new GUICelPrime(player.inventory, (TileEntityCelPrime) entity); - } - return null; - } - case ModBlocks.guiID_machine_selenium: { if(entity instanceof TileEntityMachineSeleniumEngine) { return new GUIMachineSelenium(player.inventory, (TileEntityMachineSeleniumEngine) entity); diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java index 78c66c4ec..d9926e148 100644 --- a/src/main/java/com/hbm/lib/Library.java +++ b/src/main/java/com/hbm/lib/Library.java @@ -164,10 +164,8 @@ public class Library { return true; if((tileentity != null && (tileentity instanceof IFluidAcceptor || tileentity instanceof IFluidSource)) || - world.getBlock(x, y, z) == ModBlocks.dummy_port_flare || world.getBlock(x, y, z) == ModBlocks.dummy_port_fluidtank || world.getBlock(x, y, z) == ModBlocks.dummy_port_refinery || - world.getBlock(x, y, z) == ModBlocks.dummy_port_pumpjack || world.getBlock(x, y, z) == ModBlocks.dummy_port_turbofan || world.getBlock(x, y, z) == ModBlocks.reactor_hatch || world.getBlock(x, y, z) == ModBlocks.reactor_conductor || @@ -414,11 +412,6 @@ public class Library { { tileentity = worldObj.getTileEntity(((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetX, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetY, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetZ); } - //Gas Flare - if(block == ModBlocks.dummy_port_flare) - { - tileentity = worldObj.getTileEntity(((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetX, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetY, ((TileEntityDummy)worldObj.getTileEntity(x, y, z)).targetZ); - } //Turbofan if(block == ModBlocks.dummy_port_turbofan) { diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 9c5228c6c..598a47103 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -139,7 +139,6 @@ public class ClientProxy extends ServerProxy { //test crap ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTestRender.class, new RenderTestRender()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTestBombAdvanced.class, new RenderTestBombAdvanced()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRotationTester.class, new RenderRotationTester()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityObjTester.class, new RendererObjTester()); //deco ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoPoleSatelliteReceiver.class, new RenderPoleSatelliteReceiver()); @@ -381,7 +380,6 @@ public class ClientProxy extends ServerProxy { //test crap - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.test_container), new ItemRenderTestContainer()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.test_bomb_advanced), new ItemRenderTestBombAdvanced()); //templates MinecraftForgeClient.registerItemRenderer(ModItems.assembly_template, new ItemRenderTemplate()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 9b0c595be..98a15001b 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -2,8 +2,11 @@ package com.hbm.main; import java.util.ArrayList; import java.util.List; +import java.util.Map.Entry; import com.hbm.blocks.ModBlocks; +import com.hbm.blocks.generic.BlockGenericStairs; +import com.hbm.blocks.generic.BlockMultiSlab; import com.hbm.blocks.generic.BlockNTMFlower.EnumFlowerType; import com.hbm.config.GeneralConfig; import com.hbm.crafting.*; @@ -64,6 +67,13 @@ public class CraftingManager { } public static void AddCraftingRec() { + + for(Object[] array : BlockMultiSlab.recipeGen) { + addRecipeAuto(new ItemStack((Block) array[1], 6, (int) array[2]), new Object[] { "###", '#', (Block) array[0] }); + } + for(Object[] array : BlockGenericStairs.recipeGen) { + addRecipeAuto(new ItemStack((Block) array[2], 4), new Object[] { "# ", "## ", "###", '#', new ItemStack((Block) array[0], 1, (int) array[1]) }); + } addRecipeAuto(new ItemStack(ModItems.redstone_sword, 1), new Object[] { "R", "R", "S", 'R', REDSTONE.block(), 'S', KEY_STICK }); addRecipeAuto(new ItemStack(ModItems.big_sword, 1), new Object[] { "QIQ", "QIQ", "GSG", 'G', Items.gold_ingot, 'S', KEY_STICK, 'I', Items.iron_ingot, 'Q', Items.quartz}); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 2233bbaec..2c083f13f 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -955,6 +955,27 @@ public class MainRegistry { ignoreMappings.add("hbm:item.turret_flamer_ammo"); ignoreMappings.add("hbm:item.turret_tau_ammo"); ignoreMappings.add("hbm:item.turret_cwis_ammo"); + ignoreMappings.add("hbm:tile.cel_prime"); + ignoreMappings.add("hbm:tile.cel_prime_terminal"); + ignoreMappings.add("hbm:tile.cel_prime_battery"); + ignoreMappings.add("hbm:tile.cel_prime_port"); + ignoreMappings.add("hbm:tile.cel_prime_tanks"); + ignoreMappings.add("hbm:tile.rf_cable"); + ignoreMappings.add("hbm:tile.test_container"); + ignoreMappings.add("hbm:tile.test_bb_bork"); + ignoreMappings.add("hbm:tile.test_bb_inf"); + ignoreMappings.add("hbm:tile.test_missile"); + ignoreMappings.add("hbm:tile.rotation_tester"); + ignoreMappings.add("hbm:tile.test_ticker"); + ignoreMappings.add("hbm:tile.dummy_block_flare"); + ignoreMappings.add("hbm:tile.dummy_port_flare"); + ignoreMappings.add("hbm:tile.dummy_block_chemplant"); + ignoreMappings.add("hbm:tile.dummy_port_chemplant"); + ignoreMappings.add("hbm:tile.dummy_block_pumpjack"); + ignoreMappings.add("hbm:tile.dummy_port_pumpjack"); + ignoreMappings.add("hbm:tile.dummy_block_radgen"); + ignoreMappings.add("hbm:tile.dummy_port_radgen"); + ignoreMappings.add("hbm:tile.test_conductor"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/main/NEIConfig.java b/src/main/java/com/hbm/main/NEIConfig.java index c717ee070..b00972255 100644 --- a/src/main/java/com/hbm/main/NEIConfig.java +++ b/src/main/java/com/hbm/main/NEIConfig.java @@ -91,33 +91,25 @@ public class NEIConfig implements IConfigureNEI { API.hideItem(new ItemStack(ModItems.ams_core_thingy)); } API.hideItem(new ItemStack(ModBlocks.dummy_block_assembler)); - API.hideItem(new ItemStack(ModBlocks.dummy_block_chemplant)); API.hideItem(new ItemStack(ModBlocks.dummy_block_drill)); - API.hideItem(new ItemStack(ModBlocks.dummy_block_flare)); API.hideItem(new ItemStack(ModBlocks.dummy_block_fluidtank)); - API.hideItem(new ItemStack(ModBlocks.dummy_block_pumpjack)); API.hideItem(new ItemStack(ModBlocks.dummy_block_refinery)); API.hideItem(new ItemStack(ModBlocks.dummy_block_turbofan)); API.hideItem(new ItemStack(ModBlocks.dummy_block_ams_base)); API.hideItem(new ItemStack(ModBlocks.dummy_block_ams_emitter)); API.hideItem(new ItemStack(ModBlocks.dummy_block_ams_limiter)); - API.hideItem(new ItemStack(ModBlocks.dummy_block_radgen)); API.hideItem(new ItemStack(ModBlocks.dummy_block_vault)); API.hideItem(new ItemStack(ModBlocks.dummy_block_blast)); API.hideItem(new ItemStack(ModBlocks.dummy_block_uf6)); API.hideItem(new ItemStack(ModBlocks.dummy_block_puf6)); API.hideItem(new ItemStack(ModBlocks.dummy_port_assembler)); - API.hideItem(new ItemStack(ModBlocks.dummy_port_chemplant)); API.hideItem(new ItemStack(ModBlocks.dummy_port_drill)); - API.hideItem(new ItemStack(ModBlocks.dummy_port_flare)); API.hideItem(new ItemStack(ModBlocks.dummy_port_fluidtank)); - API.hideItem(new ItemStack(ModBlocks.dummy_port_pumpjack)); API.hideItem(new ItemStack(ModBlocks.dummy_port_refinery)); API.hideItem(new ItemStack(ModBlocks.dummy_port_turbofan)); API.hideItem(new ItemStack(ModBlocks.dummy_port_ams_base)); API.hideItem(new ItemStack(ModBlocks.dummy_port_ams_emitter)); API.hideItem(new ItemStack(ModBlocks.dummy_port_ams_limiter)); - API.hideItem(new ItemStack(ModBlocks.dummy_port_radgen)); API.hideItem(new ItemStack(ModBlocks.dummy_port_compact_launcher)); API.hideItem(new ItemStack(ModBlocks.dummy_port_launch_table)); API.hideItem(new ItemStack(ModBlocks.dummy_plate_compact_launcher)); diff --git a/src/main/java/com/hbm/render/block/RenderCable.java b/src/main/java/com/hbm/render/block/RenderCable.java index 5b3b823c9..62683e60a 100644 --- a/src/main/java/com/hbm/render/block/RenderCable.java +++ b/src/main/java/com/hbm/render/block/RenderCable.java @@ -2,7 +2,7 @@ package com.hbm.render.block; import org.lwjgl.opengl.GL11; -import com.hbm.blocks.test.TestConductor; +import com.hbm.blocks.network.BlockCable; import com.hbm.lib.Library; import com.hbm.main.ResourceManager; import com.hbm.render.util.ObjUtil; @@ -94,6 +94,6 @@ public class RenderCable implements ISimpleBlockRenderingHandler { @Override public int getRenderId() { - return TestConductor.renderID; + return BlockCable.renderID; } } diff --git a/src/main/java/com/hbm/render/item/block/ItemRenderTestContainer.java b/src/main/java/com/hbm/render/item/block/ItemRenderTestContainer.java deleted file mode 100644 index 57e75111d..000000000 --- a/src/main/java/com/hbm/render/item/block/ItemRenderTestContainer.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hbm.render.item.block; - -import com.hbm.tileentity.deco.TileEntityTestContainer; - -import net.minecraft.client.model.ModelChest; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; - -public class ItemRenderTestContainer implements IItemRenderer { - - private ModelChest chestModel; - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, - ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileEntityTestContainer(), 0.0D, 0.0D, 0.0D, 0.0F); - } - -} diff --git a/src/main/java/com/hbm/tileentity/TileMappings.java b/src/main/java/com/hbm/tileentity/TileMappings.java index 26d78aa94..b98da7dd4 100644 --- a/src/main/java/com/hbm/tileentity/TileMappings.java +++ b/src/main/java/com/hbm/tileentity/TileMappings.java @@ -32,9 +32,7 @@ public class TileMappings { put(TileEntityTestBombAdvanced.class, "tilentity_testbombadvanced"); put(TileEntityDiFurnace.class, "tilentity_diFurnace"); put(TileEntityTestNuke.class, "tilentity_testnuke"); - put(TileEntityRotationTester.class, "tilentity_rotationtester"); put(TileEntityTestRender.class, "tilentity_testrenderer"); - put(TileEntityTestContainer.class, "tilentity_testcontainer"); put(TileEntityObjTester.class, "tilentity_objtester"); put(TileEntityMachineCentrifuge.class, "tileentity_centrifuge"); put(TileEntityNukeMan.class, "tileentity_nukeman"); diff --git a/src/main/java/com/hbm/tileentity/deco/TileEntityRotationTester.java b/src/main/java/com/hbm/tileentity/deco/TileEntityRotationTester.java deleted file mode 100644 index f4e23a0b2..000000000 --- a/src/main/java/com/hbm/tileentity/deco/TileEntityRotationTester.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.hbm.tileentity.deco; - -import net.minecraft.tileentity.TileEntity; - -public class TileEntityRotationTester extends TileEntity { - - @Override - public int getBlockMetadata() - { - if (this.blockMetadata == -1) - { - this.blockMetadata = this.worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord); - } - - return this.blockMetadata; - } - -} diff --git a/src/main/java/com/hbm/tileentity/deco/TileEntityTestContainer.java b/src/main/java/com/hbm/tileentity/deco/TileEntityTestContainer.java deleted file mode 100644 index 3fde6ab7a..000000000 --- a/src/main/java/com/hbm/tileentity/deco/TileEntityTestContainer.java +++ /dev/null @@ -1,213 +0,0 @@ -package com.hbm.tileentity.deco; - -import com.hbm.blocks.test.TestContainer; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockChest; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntityChest; - -public class TileEntityTestContainer extends TileEntityChest { - - private String customName; - - private ItemStack[] chestContents = new ItemStack[9]; - - private int cachedChestType; - - public TileEntityTestContainer adjacentChestZNeg; - public TileEntityTestContainer adjacentChestXPos; - public TileEntityTestContainer adjacentChestXNeg; - public TileEntityTestContainer adjacentChestZPos; - - @Override - public String getInventoryName() - { - return this.hasCustomInventoryName() ? this.customName : "container.testContainer"; - } - - @Override - public boolean hasCustomInventoryName() - { - return this.customName != null && this.customName.length() > 0; - } - - @Override - public void func_145976_a(String p_145976_1_) - { - this.customName = p_145976_1_; - } - - @Override - public void readFromNBT(NBTTagCompound p_145839_1_) - { - super.readFromNBT(p_145839_1_); - NBTTagList nbttaglist = p_145839_1_.getTagList("Items", 10); - this.chestContents = new ItemStack[this.getSizeInventory()]; - - if (p_145839_1_.hasKey("TestContainer", 8)) - { - this.customName = p_145839_1_.getString("TestContainer"); - } - - for (int i = 0; i < nbttaglist.tagCount(); ++i) - { - NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); - int j = nbttagcompound1.getByte("Slot") & 255; - - if (j >= 0 && j < this.chestContents.length) - { - this.chestContents[j] = ItemStack.loadItemStackFromNBT(nbttagcompound1); - } - } - } - - @Override - public void writeToNBT(NBTTagCompound p_145841_1_) - { - super.writeToNBT(p_145841_1_); - NBTTagList nbttaglist = new NBTTagList(); - - for (int i = 0; i < this.chestContents.length; ++i) - { - if (this.chestContents[i] != null) - { - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - nbttagcompound1.setByte("Slot", (byte)i); - this.chestContents[i].writeToNBT(nbttagcompound1); - nbttaglist.appendTag(nbttagcompound1); - } - } - - p_145841_1_.setTag("Items", nbttaglist); - - if (this.hasCustomInventoryName()) - { - p_145841_1_.setString("TestContainer", this.customName); - } - } - - private void func_145978_a(TileEntityTestContainer p_145978_1_, int p_145978_2_) - { - if (p_145978_1_.isInvalid()) - { - this.adjacentChestChecked = false; - } - else if (this.adjacentChestChecked) - { - switch (p_145978_2_) - { - case 0: - if (this.adjacentChestZPos != p_145978_1_) - { - this.adjacentChestChecked = false; - } - - break; - case 1: - if (this.adjacentChestXNeg != p_145978_1_) - { - this.adjacentChestChecked = false; - } - - break; - case 2: - if (this.adjacentChestZNeg != p_145978_1_) - { - this.adjacentChestChecked = false; - } - - break; - case 3: - if (this.adjacentChestXPos != p_145978_1_) - { - this.adjacentChestChecked = false; - } - } - } - } - - @Override - public void checkForAdjacentChests() - { - if (!this.adjacentChestChecked) - { - this.adjacentChestChecked = true; - this.adjacentChestZNeg = null; - this.adjacentChestXPos = null; - this.adjacentChestXNeg = null; - this.adjacentChestZPos = null; - - if (this.func_145977_a(this.xCoord - 1, this.yCoord, this.zCoord)) - { - this.adjacentChestXNeg = (TileEntityTestContainer)this.worldObj.getTileEntity(this.xCoord - 1, this.yCoord, this.zCoord); - } - - if (this.func_145977_a(this.xCoord + 1, this.yCoord, this.zCoord)) - { - this.adjacentChestXPos = (TileEntityTestContainer)this.worldObj.getTileEntity(this.xCoord + 1, this.yCoord, this.zCoord); - } - - if (this.func_145977_a(this.xCoord, this.yCoord, this.zCoord - 1)) - { - this.adjacentChestZNeg = (TileEntityTestContainer)this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord - 1); - } - - if (this.func_145977_a(this.xCoord, this.yCoord, this.zCoord + 1)) - { - this.adjacentChestZPos = (TileEntityTestContainer)this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord + 1); - } - - if (this.adjacentChestZNeg != null) - { - this.adjacentChestZNeg.func_145978_a(this, 0); - } - - if (this.adjacentChestZPos != null) - { - this.adjacentChestZPos.func_145978_a(this, 2); - } - - if (this.adjacentChestXPos != null) - { - this.adjacentChestXPos.func_145978_a(this, 1); - } - - if (this.adjacentChestXNeg != null) - { - this.adjacentChestXNeg.func_145978_a(this, 3); - } - } - } - - private boolean func_145977_a(int p_145977_1_, int p_145977_2_, int p_145977_3_) - { - if (this.worldObj == null) - { - return false; - } - else - { - Block block = this.worldObj.getBlock(p_145977_1_, p_145977_2_, p_145977_3_); - return block instanceof TestContainer && ((TestContainer)block).field_149956_a == this.func_145980_j(); - } - } - - @Override - public int func_145980_j() - { - if (this.cachedChestType == -1) - { - if (this.worldObj == null || !(this.getBlockType() instanceof TestContainer)) - { - return 0; - } - - this.cachedChestType = ((BlockChest)this.getBlockType()).field_149956_a; - } - - return this.cachedChestType; - } -}