diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index a78ad8f45..2e25c807f 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -43,7 +43,6 @@ public class ModBlocks { 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 obj_tester; public static Block test_core; @@ -615,10 +614,8 @@ public class ModBlocks { public static Block sat_resonator; public static Block sat_dock; - public static final int guiID_dock = 80; - + public static Block soyuz_capsule; - public static final int guiID_capsule = 93; public static Block crate_iron; public static Block crate_steel; @@ -628,32 +625,19 @@ public class ModBlocks { public static Block mass_storage; public static Block nuke_gadget; - public static final int guiID_nuke_gadget = 3; public static Block nuke_boy; - public static final int guiID_nuke_boy = 4; public static Block nuke_man; - public static final int guiID_nuke_man = 6; public static Block nuke_mike; - public static final int guiID_nuke_mike = 11; public static Block nuke_tsar; - public static final int guiID_nuke_tsar = 12; public static Block nuke_fleija; - public static final int guiID_nuke_fleija = 17; public static Block nuke_prototype; - public static final int guiID_nuke_prototype = 23; public static Block nuke_custom; - public static final int guiID_nuke_custom = 37; public static Block nuke_solinium; - public static final int guiID_nuke_solinium = 60; public static Block nuke_n2; - public static final int guiID_nuke_n2 = 61; public static Block nuke_n45; - public static final int guiID_nuke_n45 = 77; public static Block nuke_fstbmb; - public static final int guiID_nuke_fstbmb = 96; public static Block bomb_multi; - public static final int guiID_bomb_multi = 10; - + public static Block heater_firebox; public static Block heater_oven; public static Block heater_oilburner; @@ -679,48 +663,35 @@ public class ModBlocks { public static Block machine_difurnace_on; public static Block machine_difurnace_rtg_off; public static Block machine_difurnace_rtg_on; - public static final int guiID_test_difurnace = 1; - public static final int guiID_rtg_difurnace = 125; + //public static final int guiID_test_difurnace = 1; historical public static Block machine_centrifuge; - public static final int guiID_centrifuge = 5; public static Block machine_gascent; - public static final int guiID_gascent = 71; - + public static Block machine_fel; - public static final int guiID_fel = 110; public static Block machine_silex; - public static final int guiID_silex = 109; public static Block machine_crystallizer; - public static final int guiID_crystallizer = 94; public static Block machine_uf6_tank; - public static final int guiID_uf6_tank = 7; public static Block machine_puf6_tank; - public static final int guiID_puf6_tank = 8; public static Block machine_reactor_breeding; - public static final int guiID_reactor_breeding = 9; public static Block machine_nuke_furnace_off; public static Block machine_nuke_furnace_on; - public static final int guiID_nuke_furnace = 13; public static Block machine_rtg_furnace_off; public static Block machine_rtg_furnace_on; - public static final int guiID_rtg_furnace = 14; - + public static Block machine_generator; public static Block machine_industrial_generator; - public static final int guiID_machine_industrial_generator = 39; - + public static Block machine_cyclotron; - public static final int guiID_machine_cyclotron = 41; - + public static Block hadron_plating; public static Block hadron_plating_blue; public static Block hadron_plating_black; @@ -747,35 +718,28 @@ public class ModBlocks { public static Block hadron_analysis_glass; public static Block hadron_access; public static Block hadron_core; - public static final int guiID_hadron = 101; public static Block machine_electric_furnace_off; public static Block machine_electric_furnace_on; - public static final int guiID_electric_furnace = 16; - + public static Block machine_microwave; - public static final int guiID_microwave = 97; public static Block machine_arc_furnace_off; public static Block machine_arc_furnace_on; - public static final int guiID_machine_arc = 82; - + //public static Block machine_deuterium; - public static final int guiID_machine_deuterium = 20; - + public static Block machine_battery_potato; public static Block machine_battery; public static Block machine_lithium_battery; public static Block machine_schrabidium_battery; public static Block machine_dineutronium_battery; public static Block machine_fensu; - public static final int guiID_machine_battery = 21; public static final int guiID_machine_fensu = 99; public static Block machine_coal_off; public static Block machine_coal_on; - public static final int guiID_machine_coal = 22; - + public static Block red_wire_coated; public static Block red_cable; public static Block red_cable_classic; @@ -832,8 +796,7 @@ public class ModBlocks { public static Block barrel_steel; public static Block barrel_tcalloy; public static Block barrel_antimatter; - public static final int guiID_barrel = 92; - + public static Block machine_transformer; public static Block machine_transformer_20; public static Block machine_transformer_dnt; @@ -869,8 +832,7 @@ public class ModBlocks { public static Block reactor_inserter; public static Block reactor_conductor; public static Block reactor_computer; - public static final int guiID_reactor_multiblock = 26; - + public static Block fusion_conductor; public static Block fusion_center; public static Block fusion_motor; @@ -880,9 +842,7 @@ public class ModBlocks { public static Block plasma; public static Block iter; - public static final int guiID_iter = 98; public static Block plasma_heater; - public static final int guiID_plasma_heater = 99; public static Block watz; public static final int guiID_watz = 98; @@ -894,8 +854,7 @@ public class ModBlocks { public static Block watz_hatch; public static Block watz_conductor; public static Block watz_core; - public static final int guiID_watz_multiblock = 32; - + public static Block fwatz_conductor; public static Block fwatz_cooler; public static Block fwatz_tank; @@ -904,50 +863,37 @@ public class ModBlocks { public static Block fwatz_computer; public static Block fwatz_core; public static Block fwatz_plasma; - public static final int guiID_fwatz_multiblock = 33; public static Block balefire; public static Block fire_digamma; public static Block digamma_matter; public static Block ams_base; - public static final int guiID_ams_base = 54; public static Block ams_emitter; - public static final int guiID_ams_emitter = 55; public static Block ams_limiter; - public static final int guiID_ams_limiter = 56; - + public static Block dfc_emitter; - public static final int guiID_dfc_emitter = 87; public static Block dfc_injector; - public static final int guiID_dfc_injector = 90; public static Block dfc_receiver; - public static final int guiID_dfc_receiver = 88; public static Block dfc_stabilizer; - public static final int guiID_dfc_stabilizer = 91; public static Block dfc_core; - public static final int guiID_dfc_core = 89; - + public static Block machine_converter_he_rf; public static final int guiID_converter_he_rf = 28; public static Block machine_converter_rf_he; public static Block machine_schrabidium_transmutator; - public static final int guiID_schrabidium_transmutator = 30; - + public static Block machine_diesel; - public static final int guiID_machine_diesel = 31; public static Block machine_combustion_engine; public static Block machine_shredder; - public static final int guiID_machine_shredder = 34; public static Block machine_shredder_large; public static final int guiID_machine_shredder_large = 76; public static Block machine_combine_factory; - public static final int guiID_combine_factory = 35; - + public static Block machine_teleporter; public static Block teleanchor; public static Block field_disturber; @@ -956,7 +902,6 @@ public class ModBlocks { public static final int guiID_machine_reix_mainframe = 38; public static Block machine_rtg_grey; - public static final int guiID_machine_rtg = 42; //public static Block machine_rtg_red; //public static Block machine_rtg_orange; //public static Block machine_rtg_yellow; @@ -973,33 +918,26 @@ public class ModBlocks { public static Block machine_well; public static Block oil_pipe; - public static final int guiID_machine_well = 40; public static Block machine_pumpjack; public static Block machine_fracking_tower; public static Block machine_flare; - public static final int guiID_machine_flare = 44; - + public static Block machine_refinery; - public static final int guiID_machine_refinery = 43; - + public static Block machine_fraction_tower; public static Block fraction_spacer; public static Block machine_catalytic_cracker; public static Block machine_boiler_off; public static Block machine_boiler_on; - public static final int guiID_machine_boiler = 72; - + public static Block machine_boiler_electric_off; public static Block machine_boiler_electric_on; - public static final int guiID_machine_boiler_electric = 73; - + public static Block machine_steam_engine; public static Block machine_turbine; - public static final int guiID_machine_turbine = 74; public static Block machine_large_turbine; - public static final int guiID_machine_large_turbine = 100; public static Block machine_deuterium_extractor; public static Block machine_deuterium_tower; @@ -1019,21 +957,17 @@ public class ModBlocks { public static Block machine_drill; public static Block drill_pipe; - public static final int guiID_machine_drill = 45; public static Block machine_excavator; public static Block machine_autosaw; public static Block machine_mining_laser; public static Block barricade; // a sand bag that drops nothing, for automated walling purposes - public static final int guiID_mining_laser = 95; - + public static Block machine_assembler; - public static final int guiID_machine_assembler = 48; public static Block machine_assemfac; public static Block machine_chemplant; - public static final int guiID_machine_chemplant = 49; public static Block machine_chemfac; public static Block machine_mixer; @@ -1042,74 +976,52 @@ public class ModBlocks { public static Block machine_orbus; public static Block launch_pad; - public static final int guiID_launch_pad = 19; - + public static Block machine_missile_assembly; - public static final int guiID_missile_assembly = 83; - + public static Block compact_launcher; - public static final int guiID_compact_launcher = 85; - + public static Block launch_table; - public static final int guiID_launch_table = 84; - + public static Block soyuz_launcher; - public static final int guiID_soyuz_launcher = 86; - + public static Block machine_radar; - public static final int guiID_radar = 59; - + public static Block machine_turbofan; - public static final int guiID_machine_turbofan = 52; public static Block machine_turbinegas; public static Block machine_selenium; - public static final int guiID_machine_selenium = 63; - + public static Block press_preheater; public static Block machine_press; - public static final int guiID_machine_press = 53; public static Block machine_epress; - public static final int guiID_machine_epress = 81; - + public static Block machine_siren; - public static final int guiID_siren = 57; - + public static Block machine_radgen; - public static final int guiID_radgen = 58; - + public static Block machine_satlinker; - public static final int guiID_satlinker = 64; public static Block machine_keyforge; - public static final int guiID_keyforge = 67; - + public static Block machine_armor_table; - public static final int guiID_armor_table = 102; - + public static Block reactor_research; - public static final int guiID_reactor_research = 65; public static Block reactor_zirnox; - public static final int guiID_reactor_zirnox = 124; public static Block zirnox_destroyed; public static Block machine_controller; - public static final int guiID_machine_controller = 78; - + public static Block machine_spp_bottom; public static Block machine_spp_top; public static Block radiobox; - public static final int guiID_radiobox = 66; public static Block radiorec; public static Block machine_forcefield; - public static final int guiID_forcefield = 75; - + public static Block machine_waste_drum; - public static final int guiID_waste_drum = 79; public static Block machine_storage_drum; - public static final int guiID_storage_drum = 118; - + public static Block machine_autocrafter; public static Block anvil_iron; @@ -1123,27 +1035,17 @@ public class ModBlocks { public static Block anvil_dnt; public static Block anvil_osmiridium; public static Block anvil_murky; - public static final int guiID_anvil = 121; - + public static Block turret_chekhov; - public static final int guiID_chekhov = 104; public static Block turret_friendly; - public static final int guiID_friendly = 107; public static Block turret_jeremy; - public static final int guiID_jeremy = 105; public static Block turret_tauon; - public static final int guiID_tauon = 106; public static Block turret_richard; - public static final int guiID_richard = 108; public static Block turret_howard; - public static final int guiID_howard = 112; public static Block turret_howard_damaged; public static Block turret_maxwell; - public static final int guiID_maxwell = 120; public static Block turret_fritz; - public static final int guiID_fritz = 122; public static Block turret_brandon; - public static final int guiID_brandon = 122; public static Block turret_arty; public static Block turret_himars; public static Block turret_sentry; @@ -1166,13 +1068,6 @@ public class ModBlocks { public static Block rbmk_heater; public static Block rbmk_console; public static Block rbmk_crane_console; - public static final int guiID_rbmk_rod = 113; - public static final int guiID_rbmk_boiler = 114; - public static final int guiID_rbmk_control = 115; - public static final int guiID_rbmk_control_auto = 116; - public static final int guiID_rbmk_console = 117; - public static final int guiID_rbmk_outgasser = 119; - public static final int guiID_rbmk_storage = 123; public static Block rbmk_loader; public static Block rbmk_steam_inlet; public static Block rbmk_steam_outlet; @@ -1819,7 +1714,7 @@ public class ModBlocks { nuke_solinium = new NukeSolinium(Material.iron).setBlockName("nuke_solinium").setCreativeTab(MainRegistry.nukeTab).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":nuke_solinium"); nuke_n2 = new NukeN2(Material.iron).setBlockName("nuke_n2").setCreativeTab(MainRegistry.nukeTab).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":nuke_n2"); 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"); + nuke_fstbmb = new NukeBalefire(Material.iron).setBlockName("nuke_fstbmb").setCreativeTab(MainRegistry.nukeTab).setHardness(5.0F).setResistance(6000.0F).setBlockTextureName(RefStrings.MODID + ":nuke_fstbmb"); 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"); @@ -2299,7 +2194,7 @@ public class ModBlocks { machine_deaerator = new MachineDeaerator(Material.iron).setBlockName("machine_deaerator").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel_machine"); machine_waste_drum = new WasteDrum(Material.iron).setBlockName("machine_waste_drum").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":waste_drum"); - machine_storage_drum = new StorageDrum(Material.iron, guiID_storage_drum).setBlockName("machine_storage_drum").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_storage_drum"); + machine_storage_drum = new StorageDrum(Material.iron).setBlockName("machine_storage_drum").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_storage_drum"); machine_schrabidium_transmutator = new MachineSchrabidiumTransmutator(Material.iron).setBlockName("machine_schrabidium_transmutator").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.machineTab); @@ -2399,13 +2294,13 @@ public class ModBlocks { 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_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"); - dummy_block_puf6 = new DummyBlockMachine(Material.iron, guiID_puf6_tank, machine_puf6_tank, false).setBlockName("dummy_block_puf6").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_plate_compact_launcher = new DummyBlockMachine(Material.iron, guiID_compact_launcher, compact_launcher, false).setBounds(0, 16, 0, 16, 16, 16).setBlockName("dummy_plate_compact_launcher").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_port_compact_launcher = new DummyBlockMachine(Material.iron, guiID_compact_launcher, compact_launcher, true).setBlockName("dummy_port_compact_launcher").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_plate_launch_table = new DummyBlockMachine(Material.iron, guiID_launch_table, launch_table, false).setBounds(0, 16, 0, 16, 16, 16).setBlockName("dummy_plate_launch_table").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_port_launch_table = new DummyBlockMachine(Material.iron, guiID_launch_table, launch_table, true).setBlockName("dummy_port_launch_table").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_plate_cargo = new DummyBlockMachine(Material.iron, guiID_dock, sat_dock, false).setBounds(0, 0, 0, 16, 8, 16).setBlockName("dummy_plate_cargo").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); + dummy_block_uf6 = new DummyBlockMachine(Material.iron, machine_uf6_tank, false).setBlockName("dummy_block_uf6").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_titanium"); + dummy_block_puf6 = new DummyBlockMachine(Material.iron, machine_puf6_tank, false).setBlockName("dummy_block_puf6").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); + dummy_plate_compact_launcher = new DummyBlockMachine(Material.iron, compact_launcher, false).setBounds(0, 16, 0, 16, 16, 16).setBlockName("dummy_plate_compact_launcher").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); + dummy_port_compact_launcher = new DummyBlockMachine(Material.iron, compact_launcher, true).setBlockName("dummy_port_compact_launcher").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); + dummy_plate_launch_table = new DummyBlockMachine(Material.iron, launch_table, false).setBounds(0, 16, 0, 16, 16, 16).setBlockName("dummy_plate_launch_table").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); + dummy_port_launch_table = new DummyBlockMachine(Material.iron, launch_table, true).setBlockName("dummy_port_launch_table").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); + dummy_plate_cargo = new DummyBlockMachine(Material.iron, sat_dock, false).setBounds(0, 0, 0, 16, 8, 16).setBlockName("dummy_plate_cargo").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); ntm_dirt = new BlockNTMDirt().setBlockName("ntm_dirt").setHardness(0.5F).setStepSound(Block.soundTypeGravel).setCreativeTab(null).setBlockTextureName("dirt"); diff --git a/src/main/java/com/hbm/blocks/bomb/BombMulti.java b/src/main/java/com/hbm/blocks/bomb/BombMulti.java index 5323548a1..b6496f164 100644 --- a/src/main/java/com/hbm/blocks/bomb/BombMulti.java +++ b/src/main/java/com/hbm/blocks/bomb/BombMulti.java @@ -99,7 +99,7 @@ public class BombMulti extends BlockContainer implements IBomb { } else if(!player.isSneaking()) { TileEntityBombMulti entity = (TileEntityBombMulti) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_bomb_multi, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/bomb/CompactLauncher.java b/src/main/java/com/hbm/blocks/bomb/CompactLauncher.java index 7b6774682..10f7547aa 100644 --- a/src/main/java/com/hbm/blocks/bomb/CompactLauncher.java +++ b/src/main/java/com/hbm/blocks/bomb/CompactLauncher.java @@ -63,7 +63,7 @@ public class CompactLauncher extends BlockContainer implements IMultiblock, IBom } else if(!player.isSneaking()) { TileEntityCompactLauncher entity = (TileEntityCompactLauncher) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_compact_launcher, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/bomb/LaunchPad.java b/src/main/java/com/hbm/blocks/bomb/LaunchPad.java index b73c26c91..675fbfd38 100644 --- a/src/main/java/com/hbm/blocks/bomb/LaunchPad.java +++ b/src/main/java/com/hbm/blocks/bomb/LaunchPad.java @@ -102,7 +102,7 @@ public class LaunchPad extends BlockContainer implements IBomb { } else if(!player.isSneaking()) { TileEntityLaunchPad entity = (TileEntityLaunchPad) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_launch_pad, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/bomb/LaunchTable.java b/src/main/java/com/hbm/blocks/bomb/LaunchTable.java index a90cf06e1..3170cea1c 100644 --- a/src/main/java/com/hbm/blocks/bomb/LaunchTable.java +++ b/src/main/java/com/hbm/blocks/bomb/LaunchTable.java @@ -62,7 +62,7 @@ public class LaunchTable extends BlockContainer implements IMultiblock, IBomb { } else if(!player.isSneaking()) { TileEntityLaunchTable entity = (TileEntityLaunchTable) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_launch_table, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/bomb/NukeBalefire.java b/src/main/java/com/hbm/blocks/bomb/NukeBalefire.java index fce8daf16..17d8f82a9 100644 --- a/src/main/java/com/hbm/blocks/bomb/NukeBalefire.java +++ b/src/main/java/com/hbm/blocks/bomb/NukeBalefire.java @@ -11,8 +11,8 @@ import net.minecraft.world.World; public class NukeBalefire extends BlockMachineBase implements IBomb { - public NukeBalefire(Material mat, int guiID) { - super(mat, guiID); + public NukeBalefire(Material mat) { + super(mat, 0); rotatable = true; } diff --git a/src/main/java/com/hbm/blocks/bomb/NukeBoy.java b/src/main/java/com/hbm/blocks/bomb/NukeBoy.java index daa890a18..01673e12d 100644 --- a/src/main/java/com/hbm/blocks/bomb/NukeBoy.java +++ b/src/main/java/com/hbm/blocks/bomb/NukeBoy.java @@ -96,7 +96,7 @@ public class NukeBoy extends BlockContainer implements IBomb { } else if(!player.isSneaking()) { TileEntityNukeBoy entity = (TileEntityNukeBoy) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_nuke_boy, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/bomb/NukeCustom.java b/src/main/java/com/hbm/blocks/bomb/NukeCustom.java index 0d6d4876f..a00b74d56 100644 --- a/src/main/java/com/hbm/blocks/bomb/NukeCustom.java +++ b/src/main/java/com/hbm/blocks/bomb/NukeCustom.java @@ -111,7 +111,7 @@ public class NukeCustom extends BlockContainer implements IBomb { TileEntityNukeCustom entity = (TileEntityNukeCustom) world.getTileEntity(x, y, z); if (entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_nuke_custom, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; diff --git a/src/main/java/com/hbm/blocks/bomb/NukeFleija.java b/src/main/java/com/hbm/blocks/bomb/NukeFleija.java index 1ced0fc04..053d61349 100644 --- a/src/main/java/com/hbm/blocks/bomb/NukeFleija.java +++ b/src/main/java/com/hbm/blocks/bomb/NukeFleija.java @@ -96,7 +96,7 @@ public class NukeFleija extends BlockContainer implements IBomb { } else if(!player.isSneaking()) { TileEntityNukeFleija entity = (TileEntityNukeFleija) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_nuke_fleija, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/bomb/NukeGadget.java b/src/main/java/com/hbm/blocks/bomb/NukeGadget.java index 97e1d0e14..9c555b132 100644 --- a/src/main/java/com/hbm/blocks/bomb/NukeGadget.java +++ b/src/main/java/com/hbm/blocks/bomb/NukeGadget.java @@ -103,7 +103,7 @@ public class NukeGadget extends BlockContainer implements IBomb { } else if (!player.isSneaking()) { TileEntityNukeGadget entity = (TileEntityNukeGadget) world.getTileEntity(x, y, z); if (entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_nuke_gadget, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/bomb/NukeMan.java b/src/main/java/com/hbm/blocks/bomb/NukeMan.java index 54044c941..9f8a8b941 100644 --- a/src/main/java/com/hbm/blocks/bomb/NukeMan.java +++ b/src/main/java/com/hbm/blocks/bomb/NukeMan.java @@ -97,7 +97,7 @@ public class NukeMan extends BlockContainer implements IBomb { } else if(!player.isSneaking()) { TileEntityNukeMan entity = (TileEntityNukeMan) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_nuke_man, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/bomb/NukeMike.java b/src/main/java/com/hbm/blocks/bomb/NukeMike.java index a42f34985..cb6d476cf 100644 --- a/src/main/java/com/hbm/blocks/bomb/NukeMike.java +++ b/src/main/java/com/hbm/blocks/bomb/NukeMike.java @@ -98,7 +98,7 @@ public class NukeMike extends BlockContainer implements IBomb { } else if(!player.isSneaking()) { TileEntityNukeMike entity = (TileEntityNukeMike) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_nuke_mike, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/bomb/NukeN2.java b/src/main/java/com/hbm/blocks/bomb/NukeN2.java index b4b23849d..a01f83d25 100644 --- a/src/main/java/com/hbm/blocks/bomb/NukeN2.java +++ b/src/main/java/com/hbm/blocks/bomb/NukeN2.java @@ -94,7 +94,7 @@ public class NukeN2 extends BlockContainer implements IBomb { } else if(!player.isSneaking()) { TileEntityNukeN2 entity = (TileEntityNukeN2) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_nuke_n2, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/bomb/NukeN45.java b/src/main/java/com/hbm/blocks/bomb/NukeN45.java index a6d2ca3ce..df47fae70 100644 --- a/src/main/java/com/hbm/blocks/bomb/NukeN45.java +++ b/src/main/java/com/hbm/blocks/bomb/NukeN45.java @@ -85,7 +85,7 @@ public class NukeN45 extends BlockContainer implements IBomb { } else if(!player.isSneaking()) { TileEntityNukeN45 entity = (TileEntityNukeN45) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_nuke_n45, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/bomb/NukePrototype.java b/src/main/java/com/hbm/blocks/bomb/NukePrototype.java index 990f7b36c..71c0a3746 100644 --- a/src/main/java/com/hbm/blocks/bomb/NukePrototype.java +++ b/src/main/java/com/hbm/blocks/bomb/NukePrototype.java @@ -106,7 +106,7 @@ public class NukePrototype extends BlockContainer implements IBomb { } else if(!player.isSneaking()) { TileEntityNukePrototype entity = (TileEntityNukePrototype) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_nuke_prototype, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/bomb/NukeSolinium.java b/src/main/java/com/hbm/blocks/bomb/NukeSolinium.java index c383523b8..d9236c221 100644 --- a/src/main/java/com/hbm/blocks/bomb/NukeSolinium.java +++ b/src/main/java/com/hbm/blocks/bomb/NukeSolinium.java @@ -94,7 +94,7 @@ public class NukeSolinium extends BlockContainer implements IBomb { } else if(!player.isSneaking()) { TileEntityNukeSolinium entity = (TileEntityNukeSolinium) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_nuke_solinium, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/bomb/NukeTsar.java b/src/main/java/com/hbm/blocks/bomb/NukeTsar.java index 3cb6a1fe6..51514ced2 100644 --- a/src/main/java/com/hbm/blocks/bomb/NukeTsar.java +++ b/src/main/java/com/hbm/blocks/bomb/NukeTsar.java @@ -96,7 +96,7 @@ public class NukeTsar extends BlockContainer implements IBomb { } else if(!player.isSneaking()) { TileEntityNukeTsar entity = (TileEntityNukeTsar) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_nuke_tsar, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/generic/BlockBobble.java b/src/main/java/com/hbm/blocks/generic/BlockBobble.java index 72f9a7bf2..51c0b0e6a 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockBobble.java +++ b/src/main/java/com/hbm/blocks/generic/BlockBobble.java @@ -3,9 +3,11 @@ package com.hbm.blocks.generic; import java.util.List; import java.util.Random; +import com.hbm.inventory.gui.GUIScreenBobble; import com.hbm.items.ModItems; import com.hbm.items.special.ItemPlasticScrap.ScrapType; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; @@ -13,10 +15,12 @@ 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.client.gui.GuiScreen; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -30,7 +34,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class BlockBobble extends BlockContainer { +public class BlockBobble extends BlockContainer implements IGUIProvider { public BlockBobble() { super(Material.iron); @@ -89,7 +93,7 @@ public class BlockBobble extends BlockContainer { public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if(world.isRemote) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModItems.guiID_item_bobble, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); return true; } else { @@ -206,4 +210,15 @@ public class BlockBobble extends BlockContainer { this.scrap = scrap; } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIScreenBobble((TileEntityBobble) world.getTileEntity(x, y, z)); + } } diff --git a/src/main/java/com/hbm/blocks/generic/BlockSnowglobe.java b/src/main/java/com/hbm/blocks/generic/BlockSnowglobe.java index c94771004..3964decd6 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockSnowglobe.java +++ b/src/main/java/com/hbm/blocks/generic/BlockSnowglobe.java @@ -5,6 +5,7 @@ import java.util.Random; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; import com.hbm.wiaj.WorldInAJar; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; @@ -13,11 +14,13 @@ 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.client.gui.GuiScreen; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -88,7 +91,7 @@ public class BlockSnowglobe extends BlockContainer { public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if(world.isRemote) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModItems.guiID_item_snowglobe, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/BlockAMSBase.java b/src/main/java/com/hbm/blocks/machine/BlockAMSBase.java index b5b81d8b3..082d0f962 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockAMSBase.java +++ b/src/main/java/com/hbm/blocks/machine/BlockAMSBase.java @@ -37,7 +37,7 @@ public class BlockAMSBase extends BlockContainer implements IMultiblock { TileEntityAMSBase entity = (TileEntityAMSBase) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_ams_base, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/BlockAMSEmitter.java b/src/main/java/com/hbm/blocks/machine/BlockAMSEmitter.java index f3b55ed50..ae627fa60 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockAMSEmitter.java +++ b/src/main/java/com/hbm/blocks/machine/BlockAMSEmitter.java @@ -52,7 +52,7 @@ public class BlockAMSEmitter extends BlockContainer implements IMultiblock { TileEntityAMSEmitter entity = (TileEntityAMSEmitter) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_ams_emitter, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/BlockAMSLimiter.java b/src/main/java/com/hbm/blocks/machine/BlockAMSLimiter.java index bd4581e73..234fc9cfa 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockAMSLimiter.java +++ b/src/main/java/com/hbm/blocks/machine/BlockAMSLimiter.java @@ -53,7 +53,7 @@ public class BlockAMSLimiter extends BlockContainer implements IMultiblock { TileEntityAMSLimiter entity = (TileEntityAMSLimiter) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_ams_limiter, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/BlockArmorTable.java b/src/main/java/com/hbm/blocks/machine/BlockArmorTable.java index 6a040bbda..ef92cb244 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockArmorTable.java +++ b/src/main/java/com/hbm/blocks/machine/BlockArmorTable.java @@ -1,20 +1,24 @@ package com.hbm.blocks.machine; -import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.container.ContainerArmorTable; +import com.hbm.inventory.gui.GUIArmorTable; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; 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.material.Material; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.util.IIcon; import net.minecraft.world.World; -public class BlockArmorTable extends Block { +public class BlockArmorTable extends Block implements IGUIProvider { @SideOnly(Side.CLIENT) private IIcon iconTop; @@ -47,11 +51,22 @@ public class BlockArmorTable extends Block { return true; } else if(!player.isSneaking()) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_armor_table, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); return true; } return false; } + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerArmorTable(player.inventory); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIArmorTable(player.inventory); + } + } diff --git a/src/main/java/com/hbm/blocks/machine/BlockFluidBarrel.java b/src/main/java/com/hbm/blocks/machine/BlockFluidBarrel.java index dc1e5a7da..c5e6e063a 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockFluidBarrel.java +++ b/src/main/java/com/hbm/blocks/machine/BlockFluidBarrel.java @@ -69,7 +69,7 @@ public class BlockFluidBarrel extends BlockContainer implements ITooltipProvider return true; } else if(!player.isSneaking()) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_barrel, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/BlockHadronAccess.java b/src/main/java/com/hbm/blocks/machine/BlockHadronAccess.java index 42f30bf87..9b8667f15 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockHadronAccess.java +++ b/src/main/java/com/hbm/blocks/machine/BlockHadronAccess.java @@ -68,7 +68,7 @@ public class BlockHadronAccess extends BlockContainer { for(int i = 1; i < 3; i++) { if(world.getBlock(x + dir.offsetX * i, y + dir.offsetY * i, z + dir.offsetZ * i) == ModBlocks.hadron_core) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_hadron, world, x + dir.offsetX * i, y + dir.offsetY * i, z + dir.offsetZ * i); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x + dir.offsetX * i, y + dir.offsetY * i, z + dir.offsetZ * i); } //System.out.println(world.getBlock(x + dir.offsetX * i, y + dir.offsetY * i, z + dir.offsetZ * i).getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/machine/BlockHadronCore.java b/src/main/java/com/hbm/blocks/machine/BlockHadronCore.java index 8c54b0a4e..385725c33 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockHadronCore.java +++ b/src/main/java/com/hbm/blocks/machine/BlockHadronCore.java @@ -75,7 +75,7 @@ public class BlockHadronCore extends BlockContainer { TileEntityHadron entity = (TileEntityHadron) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_hadron, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; diff --git a/src/main/java/com/hbm/blocks/machine/CoreComponent.java b/src/main/java/com/hbm/blocks/machine/CoreComponent.java index c81fbc18f..c9fa9d28c 100644 --- a/src/main/java/com/hbm/blocks/machine/CoreComponent.java +++ b/src/main/java/com/hbm/blocks/machine/CoreComponent.java @@ -65,18 +65,7 @@ public class CoreComponent extends BlockContainer { if(world.isRemote) { return true; } else if(!player.isSneaking()) { - - if(this == ModBlocks.dfc_emitter) - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_dfc_emitter, world, x, y, z); - - if(this == ModBlocks.dfc_receiver) - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_dfc_receiver, world, x, y, z); - - if(this == ModBlocks.dfc_injector) - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_dfc_injector, world, x, y, z); - - if(this == ModBlocks.dfc_stabilizer) - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_dfc_stabilizer, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); return true; diff --git a/src/main/java/com/hbm/blocks/machine/CoreCore.java b/src/main/java/com/hbm/blocks/machine/CoreCore.java index 61f5a70ea..64cf4edac 100644 --- a/src/main/java/com/hbm/blocks/machine/CoreCore.java +++ b/src/main/java/com/hbm/blocks/machine/CoreCore.java @@ -44,7 +44,7 @@ public class CoreCore extends BlockContainer { return true; } else if(!player.isSneaking()) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_dfc_core, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockAMSBase.java b/src/main/java/com/hbm/blocks/machine/DummyBlockAMSBase.java index 302dbaaf0..92e1ffdc3 100644 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockAMSBase.java +++ b/src/main/java/com/hbm/blocks/machine/DummyBlockAMSBase.java @@ -94,7 +94,7 @@ public class DummyBlockAMSBase extends BlockContainer implements IDummy { TileEntityAMSBase entity = (TileEntityAMSBase) world.getTileEntity(a, b, c); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_ams_base, world, a, b, c); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, a, b, c); } } return true; diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockAMSEmitter.java b/src/main/java/com/hbm/blocks/machine/DummyBlockAMSEmitter.java index 356fb7070..a6d6f40d6 100644 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockAMSEmitter.java +++ b/src/main/java/com/hbm/blocks/machine/DummyBlockAMSEmitter.java @@ -94,7 +94,7 @@ public class DummyBlockAMSEmitter extends BlockContainer implements IDummy { TileEntityAMSEmitter entity = (TileEntityAMSEmitter) world.getTileEntity(a, b, c); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_ams_emitter, world, a, b, c); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, a, b, c); } } return true; diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockAMSLimiter.java b/src/main/java/com/hbm/blocks/machine/DummyBlockAMSLimiter.java index cb92d3014..330756b58 100644 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockAMSLimiter.java +++ b/src/main/java/com/hbm/blocks/machine/DummyBlockAMSLimiter.java @@ -94,7 +94,7 @@ public class DummyBlockAMSLimiter extends BlockContainer implements IDummy { TileEntityAMSLimiter entity = (TileEntityAMSLimiter) world.getTileEntity(a, b, c); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_ams_limiter, world, a, b, c); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, a, b, c); } } return true; diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockAssembler.java b/src/main/java/com/hbm/blocks/machine/DummyBlockAssembler.java index 9eacde4da..18ae7e8d8 100644 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockAssembler.java +++ b/src/main/java/com/hbm/blocks/machine/DummyBlockAssembler.java @@ -43,7 +43,7 @@ public class DummyBlockAssembler extends DummyOldBase { TileEntityMachineAssembler entity = (TileEntityMachineAssembler) world.getTileEntity(a, b, c); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_assembler, world, a, b, c); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, a, b, c); } } return true; diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockDrill.java b/src/main/java/com/hbm/blocks/machine/DummyBlockDrill.java index f7cc8103e..752120244 100644 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockDrill.java +++ b/src/main/java/com/hbm/blocks/machine/DummyBlockDrill.java @@ -49,7 +49,7 @@ public class DummyBlockDrill extends DummyOldBase { TileEntityMachineMiningDrill entity = (TileEntityMachineMiningDrill) world.getTileEntity(a, b, c); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_drill, world, a, b, c); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, a, b, c); } } return true; diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockMachine.java b/src/main/java/com/hbm/blocks/machine/DummyBlockMachine.java index 5eb0fbfd0..c0beb19c7 100644 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockMachine.java +++ b/src/main/java/com/hbm/blocks/machine/DummyBlockMachine.java @@ -17,7 +17,6 @@ import net.minecraft.world.World; public class DummyBlockMachine extends DummyOldBase { - private int id; private Block drop; float oX = 0; float oY = 0; @@ -30,9 +29,8 @@ public class DummyBlockMachine extends DummyOldBase { super(p_i45386_1_, port); } - public DummyBlockMachine(Material mat, int id, Block drop, boolean port) { + public DummyBlockMachine(Material mat, Block drop, boolean port) { super(mat, port); - this.id = id; this.drop = drop; } @@ -66,7 +64,7 @@ public class DummyBlockMachine extends DummyOldBase { int c = ((TileEntityDummy) te).targetZ; if(te != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, id, world, a, b, c); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, a, b, c); } } return true; diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockRefinery.java b/src/main/java/com/hbm/blocks/machine/DummyBlockRefinery.java index dc628a351..8855b9a1e 100644 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockRefinery.java +++ b/src/main/java/com/hbm/blocks/machine/DummyBlockRefinery.java @@ -48,7 +48,7 @@ public class DummyBlockRefinery extends DummyOldBase { TileEntityMachineRefinery entity = (TileEntityMachineRefinery) world.getTileEntity(a, b, c); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_refinery, world, a, b, c); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, a, b, c); } } return true; diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockTurbofan.java b/src/main/java/com/hbm/blocks/machine/DummyBlockTurbofan.java index 0b6b66d9a..ecbdf99e1 100644 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockTurbofan.java +++ b/src/main/java/com/hbm/blocks/machine/DummyBlockTurbofan.java @@ -43,7 +43,7 @@ public class DummyBlockTurbofan extends DummyOldBase { TileEntityMachineTurbofan entity = (TileEntityMachineTurbofan) world.getTileEntity(a, b, c); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_turbofan, world, a, b, c); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, a, b, c); } } return true; diff --git a/src/main/java/com/hbm/blocks/machine/FWatzHatch.java b/src/main/java/com/hbm/blocks/machine/FWatzHatch.java index 2f5f07619..4e9330356 100644 --- a/src/main/java/com/hbm/blocks/machine/FWatzHatch.java +++ b/src/main/java/com/hbm/blocks/machine/FWatzHatch.java @@ -99,7 +99,7 @@ public class FWatzHatch extends Block implements IFluidConnectorBlock { { if(((TileEntityFWatzCore)world.getTileEntity(x, y + 11, z + 9)).isStructureValid(world)) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_fwatz_multiblock, world, x, y + 11, z + 9); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y + 11, z + 9); } else { player.addChatMessage(new ChatComponentText("[Fusionary Watz Plant] Error: Reactor Structure not valid!")); } @@ -113,7 +113,7 @@ public class FWatzHatch extends Block implements IFluidConnectorBlock { { if(((TileEntityFWatzCore)world.getTileEntity(x, y + 11, z - 9)).isStructureValid(world)) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_fwatz_multiblock, world, x, y + 11, z - 9); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y + 11, z - 9); } else { player.addChatMessage(new ChatComponentText("[Fusionary Watz Plant] Error: Reactor Structure not valid!")); } @@ -127,7 +127,7 @@ public class FWatzHatch extends Block implements IFluidConnectorBlock { { if(((TileEntityFWatzCore)world.getTileEntity(x + 9, y + 11, z)).isStructureValid(world)) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_fwatz_multiblock, world, x + 9, y + 11, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x + 9, y + 11, z); } else { player.addChatMessage(new ChatComponentText("[Fusionary Watz Plant] Error: Reactor Structure not valid!")); } @@ -141,7 +141,7 @@ public class FWatzHatch extends Block implements IFluidConnectorBlock { { if(((TileEntityFWatzCore)world.getTileEntity(x - 9, y + 11, z)).isStructureValid(world)) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_fwatz_multiblock, world, x - 9, y + 11, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x - 9, y + 11, z); } else { player.addChatMessage(new ChatComponentText("[Fusionary Watz Plant] Error: Reactor Structure not valid!")); } diff --git a/src/main/java/com/hbm/blocks/machine/MachineArcFurnace.java b/src/main/java/com/hbm/blocks/machine/MachineArcFurnace.java index c34eff6d0..64404c6a4 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineArcFurnace.java +++ b/src/main/java/com/hbm/blocks/machine/MachineArcFurnace.java @@ -159,7 +159,7 @@ public class MachineArcFurnace extends BlockContainer { TileEntityMachineArcFurnace entity = (TileEntityMachineArcFurnace) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_arc, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineBattery.java b/src/main/java/com/hbm/blocks/machine/MachineBattery.java index 73293ddda..5aa2f11e0 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineBattery.java +++ b/src/main/java/com/hbm/blocks/machine/MachineBattery.java @@ -164,7 +164,7 @@ public class MachineBattery extends BlockContainer implements ILookOverlay, IPer } else if(!player.isSneaking()) { TileEntityMachineBattery entity = (TileEntityMachineBattery) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_battery, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineBigAssTank9000.java b/src/main/java/com/hbm/blocks/machine/MachineBigAssTank9000.java index af50f4738..7e36712d9 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineBigAssTank9000.java +++ b/src/main/java/com/hbm/blocks/machine/MachineBigAssTank9000.java @@ -87,7 +87,7 @@ public class MachineBigAssTank9000 extends BlockDummyable implements IPersistent if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_barrel, world, pos[0], pos[1], pos[2]); //we can do this because nobody is stopping me from doing this + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); //we can do this because nobody is stopping me from doing this return true; } else { return true; diff --git a/src/main/java/com/hbm/blocks/machine/MachineBoiler.java b/src/main/java/com/hbm/blocks/machine/MachineBoiler.java index 4006d092d..24bd24f16 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineBoiler.java +++ b/src/main/java/com/hbm/blocks/machine/MachineBoiler.java @@ -159,7 +159,7 @@ public class MachineBoiler extends BlockContainer { TileEntityMachineBoiler entity = (TileEntityMachineBoiler) te; if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_boiler, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } } @@ -168,7 +168,7 @@ public class MachineBoiler extends BlockContainer { TileEntityMachineBoilerElectric entity = (TileEntityMachineBoilerElectric) te; if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_boiler_electric, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } } return true; diff --git a/src/main/java/com/hbm/blocks/machine/MachineCMBFactory.java b/src/main/java/com/hbm/blocks/machine/MachineCMBFactory.java index df50eb618..c512187d7 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineCMBFactory.java +++ b/src/main/java/com/hbm/blocks/machine/MachineCMBFactory.java @@ -70,7 +70,7 @@ public class MachineCMBFactory extends BlockContainer { TileEntityMachineCMBFactory entity = (TileEntityMachineCMBFactory) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_combine_factory, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineCentrifuge.java b/src/main/java/com/hbm/blocks/machine/MachineCentrifuge.java index 38584888d..eae468a93 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineCentrifuge.java +++ b/src/main/java/com/hbm/blocks/machine/MachineCentrifuge.java @@ -43,7 +43,7 @@ public class MachineCentrifuge extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_centrifuge, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/blocks/machine/MachineChemplant.java b/src/main/java/com/hbm/blocks/machine/MachineChemplant.java index bd7d2fcd2..b446392a5 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineChemplant.java +++ b/src/main/java/com/hbm/blocks/machine/MachineChemplant.java @@ -36,7 +36,7 @@ public class MachineChemplant extends BlockDummyable { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - return this.standardOpenBehavior(world, x, y, z, player, ModBlocks.guiID_machine_chemplant); + return this.standardOpenBehavior(world, x, y, z, player, 0); } @Override diff --git a/src/main/java/com/hbm/blocks/machine/MachineCoal.java b/src/main/java/com/hbm/blocks/machine/MachineCoal.java index 4a514f21f..5a56ecf5a 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineCoal.java +++ b/src/main/java/com/hbm/blocks/machine/MachineCoal.java @@ -133,7 +133,7 @@ public class MachineCoal extends BlockContainer { TileEntityMachineCoal entity = (TileEntityMachineCoal) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_coal, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineCrystallizer.java b/src/main/java/com/hbm/blocks/machine/MachineCrystallizer.java index 198c320a0..9ddb76d2d 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineCrystallizer.java +++ b/src/main/java/com/hbm/blocks/machine/MachineCrystallizer.java @@ -56,7 +56,7 @@ public class MachineCrystallizer extends BlockDummyable { TileEntityMachineCrystallizer entity = (TileEntityMachineCrystallizer) world.getTileEntity(pos[0], pos[1], pos[2]); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_crystallizer, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineCyclotron.java b/src/main/java/com/hbm/blocks/machine/MachineCyclotron.java index 7ca40d18f..3cbfc2c66 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineCyclotron.java +++ b/src/main/java/com/hbm/blocks/machine/MachineCyclotron.java @@ -58,7 +58,7 @@ public class MachineCyclotron extends BlockDummyable { } } - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_cyclotron, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/blocks/machine/MachineDeuterium.java b/src/main/java/com/hbm/blocks/machine/MachineDeuterium.java index d29119daf..32a22e913 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineDeuterium.java +++ b/src/main/java/com/hbm/blocks/machine/MachineDeuterium.java @@ -69,7 +69,7 @@ public class MachineDeuterium extends BlockContainer { TileEntityMachineDeuterium entity = (TileEntityMachineDeuterium) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_deuterium, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineDiFurnace.java b/src/main/java/com/hbm/blocks/machine/MachineDiFurnace.java index 3dd70b977..5ffd9e702 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineDiFurnace.java +++ b/src/main/java/com/hbm/blocks/machine/MachineDiFurnace.java @@ -136,7 +136,7 @@ public class MachineDiFurnace extends BlockContainer { TileEntityDiFurnace entity = (TileEntityDiFurnace) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_test_difurnace, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineDiFurnaceRTG.java b/src/main/java/com/hbm/blocks/machine/MachineDiFurnaceRTG.java index 0ad34feff..d7e27a52f 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineDiFurnaceRTG.java +++ b/src/main/java/com/hbm/blocks/machine/MachineDiFurnaceRTG.java @@ -123,7 +123,7 @@ public class MachineDiFurnaceRTG extends BlockContainer { } else if(!player.isSneaking()) { TileEntityDiFurnaceRTG entity = (TileEntityDiFurnaceRTG) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_rtg_difurnace, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineDiesel.java b/src/main/java/com/hbm/blocks/machine/MachineDiesel.java index a08b4b6d1..94d092009 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineDiesel.java +++ b/src/main/java/com/hbm/blocks/machine/MachineDiesel.java @@ -82,7 +82,7 @@ public class MachineDiesel extends BlockContainer implements ITooltipProvider { TileEntityMachineDiesel entity = (TileEntityMachineDiesel) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_diesel, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineEPress.java b/src/main/java/com/hbm/blocks/machine/MachineEPress.java index a4bf7b094..3d5bfbe79 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineEPress.java +++ b/src/main/java/com/hbm/blocks/machine/MachineEPress.java @@ -138,7 +138,7 @@ public class MachineEPress extends BlockContainer { TileEntityMachineEPress entity = (TileEntityMachineEPress) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_epress, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineElectricFurnace.java b/src/main/java/com/hbm/blocks/machine/MachineElectricFurnace.java index a99f30c3c..01fad01e3 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineElectricFurnace.java +++ b/src/main/java/com/hbm/blocks/machine/MachineElectricFurnace.java @@ -140,7 +140,7 @@ public class MachineElectricFurnace extends BlockContainer { TileEntityMachineElectricFurnace entity = (TileEntityMachineElectricFurnace) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_electric_furnace, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineFEL.java b/src/main/java/com/hbm/blocks/machine/MachineFEL.java index 7f558e973..5a4f51f64 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineFEL.java +++ b/src/main/java/com/hbm/blocks/machine/MachineFEL.java @@ -54,7 +54,7 @@ public class MachineFEL extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_fel, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/blocks/machine/MachineFENSU.java b/src/main/java/com/hbm/blocks/machine/MachineFENSU.java index 1acebe7e4..51e4154e2 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineFENSU.java +++ b/src/main/java/com/hbm/blocks/machine/MachineFENSU.java @@ -62,7 +62,7 @@ public class MachineFENSU extends BlockDummyable implements ILookOverlay, IPersi TileEntityMachineFENSU entity = (TileEntityMachineFENSU) world.getTileEntity(pos[0], pos[1], pos[2]); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_battery, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineForceField.java b/src/main/java/com/hbm/blocks/machine/MachineForceField.java index 553fcf646..b90553f92 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineForceField.java +++ b/src/main/java/com/hbm/blocks/machine/MachineForceField.java @@ -54,7 +54,7 @@ public class MachineForceField extends BlockContainer { if(world.isRemote) { return true; } else if(!player.isSneaking()) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_forcefield, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); return true; } else { return true; diff --git a/src/main/java/com/hbm/blocks/machine/MachineFrackingTower.java b/src/main/java/com/hbm/blocks/machine/MachineFrackingTower.java index 2eba48172..8a1244a76 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineFrackingTower.java +++ b/src/main/java/com/hbm/blocks/machine/MachineFrackingTower.java @@ -84,7 +84,7 @@ public class MachineFrackingTower extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_well, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return true; diff --git a/src/main/java/com/hbm/blocks/machine/MachineGasCent.java b/src/main/java/com/hbm/blocks/machine/MachineGasCent.java index eb011a64a..6dcbc4299 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineGasCent.java +++ b/src/main/java/com/hbm/blocks/machine/MachineGasCent.java @@ -59,7 +59,7 @@ public class MachineGasCent extends BlockDummyable implements IMultiblock { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_gascent, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/blocks/machine/MachineGasFlare.java b/src/main/java/com/hbm/blocks/machine/MachineGasFlare.java index 8aa2f243e..d9d489457 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineGasFlare.java +++ b/src/main/java/com/hbm/blocks/machine/MachineGasFlare.java @@ -32,7 +32,7 @@ public class MachineGasFlare extends BlockDummyable implements ITooltipProvider @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - return this.standardOpenBehavior(world, x, y, z, player, ModBlocks.guiID_machine_flare); + return this.standardOpenBehavior(world, x, y, z, player, 0); } @Override diff --git a/src/main/java/com/hbm/blocks/machine/MachineIGenerator.java b/src/main/java/com/hbm/blocks/machine/MachineIGenerator.java index 0ae997ab2..b1e5a425f 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineIGenerator.java +++ b/src/main/java/com/hbm/blocks/machine/MachineIGenerator.java @@ -61,7 +61,7 @@ public class MachineIGenerator extends BlockDummyable { TileEntityMachineIGenerator gen = (TileEntityMachineIGenerator)world.getTileEntity(pos[0], pos[1], pos[2]); if(gen != null) - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_industrial_generator, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineITER.java b/src/main/java/com/hbm/blocks/machine/MachineITER.java index ea3cc0393..98b8f30e3 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineITER.java +++ b/src/main/java/com/hbm/blocks/machine/MachineITER.java @@ -67,7 +67,7 @@ public class MachineITER extends BlockDummyable { TileEntityITER entity = (TileEntityITER) world.getTileEntity(pos[0], pos[1], pos[2]); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_iter, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineKeyForge.java b/src/main/java/com/hbm/blocks/machine/MachineKeyForge.java index 8fbc752a0..805f6183a 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineKeyForge.java +++ b/src/main/java/com/hbm/blocks/machine/MachineKeyForge.java @@ -67,7 +67,7 @@ public class MachineKeyForge extends BlockContainer { TileEntityMachineKeyForge entity = (TileEntityMachineKeyForge) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_keyforge, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineLargeTurbine.java b/src/main/java/com/hbm/blocks/machine/MachineLargeTurbine.java index dfa8d83d6..75b8a26a4 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineLargeTurbine.java +++ b/src/main/java/com/hbm/blocks/machine/MachineLargeTurbine.java @@ -59,7 +59,7 @@ public class MachineLargeTurbine extends BlockDummyable implements ITooltipProvi if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_large_turbine, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return true; diff --git a/src/main/java/com/hbm/blocks/machine/MachineMicrowave.java b/src/main/java/com/hbm/blocks/machine/MachineMicrowave.java index 89cf34604..99e49f8de 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineMicrowave.java +++ b/src/main/java/com/hbm/blocks/machine/MachineMicrowave.java @@ -10,7 +10,7 @@ import net.minecraft.world.World; public class MachineMicrowave extends BlockMachineBase { public MachineMicrowave(Material mat) { - super(mat, ModBlocks.guiID_microwave); + super(mat, 0); this.rotatable = true; } diff --git a/src/main/java/com/hbm/blocks/machine/MachineMiningLaser.java b/src/main/java/com/hbm/blocks/machine/MachineMiningLaser.java index 50baa0568..f241392a4 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineMiningLaser.java +++ b/src/main/java/com/hbm/blocks/machine/MachineMiningLaser.java @@ -61,7 +61,7 @@ public class MachineMiningLaser extends BlockDummyable implements ITooltipProvid if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_mining_laser, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return true; diff --git a/src/main/java/com/hbm/blocks/machine/MachineMissileAssembly.java b/src/main/java/com/hbm/blocks/machine/MachineMissileAssembly.java index 4fa4d4e3d..1f4d1b9d6 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineMissileAssembly.java +++ b/src/main/java/com/hbm/blocks/machine/MachineMissileAssembly.java @@ -57,7 +57,7 @@ public class MachineMissileAssembly extends BlockContainer { TileEntityMachineMissileAssembly entity = (TileEntityMachineMissileAssembly) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_missile_assembly, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineNukeFurnace.java b/src/main/java/com/hbm/blocks/machine/MachineNukeFurnace.java index 84312e7f0..32683247e 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineNukeFurnace.java +++ b/src/main/java/com/hbm/blocks/machine/MachineNukeFurnace.java @@ -137,7 +137,7 @@ public class MachineNukeFurnace extends BlockContainer { TileEntityNukeFurnace entity = (TileEntityNukeFurnace) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_nuke_furnace, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineOilWell.java b/src/main/java/com/hbm/blocks/machine/MachineOilWell.java index c896c5497..03000400a 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineOilWell.java +++ b/src/main/java/com/hbm/blocks/machine/MachineOilWell.java @@ -58,7 +58,7 @@ public class MachineOilWell extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_well, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return true; diff --git a/src/main/java/com/hbm/blocks/machine/MachineOrbus.java b/src/main/java/com/hbm/blocks/machine/MachineOrbus.java index 17e5004e7..0daff7a76 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineOrbus.java +++ b/src/main/java/com/hbm/blocks/machine/MachineOrbus.java @@ -60,7 +60,7 @@ public class MachineOrbus extends BlockDummyable implements IPersistentInfoProvi if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_barrel, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return true; diff --git a/src/main/java/com/hbm/blocks/machine/MachinePlasmaHeater.java b/src/main/java/com/hbm/blocks/machine/MachinePlasmaHeater.java index 49d3c568d..08c7f164f 100644 --- a/src/main/java/com/hbm/blocks/machine/MachinePlasmaHeater.java +++ b/src/main/java/com/hbm/blocks/machine/MachinePlasmaHeater.java @@ -60,7 +60,7 @@ public class MachinePlasmaHeater extends BlockDummyable { TileEntityMachinePlasmaHeater entity = (TileEntityMachinePlasmaHeater) world.getTileEntity(pos[0], pos[1], pos[2]); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_plasma_heater, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachinePress.java b/src/main/java/com/hbm/blocks/machine/MachinePress.java index f1eea2680..197933d8b 100644 --- a/src/main/java/com/hbm/blocks/machine/MachinePress.java +++ b/src/main/java/com/hbm/blocks/machine/MachinePress.java @@ -114,7 +114,7 @@ public class MachinePress extends BlockContainer { TileEntityMachinePress entity = (TileEntityMachinePress) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_press, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachinePuF6Tank.java b/src/main/java/com/hbm/blocks/machine/MachinePuF6Tank.java index 280ce1519..4826057f4 100644 --- a/src/main/java/com/hbm/blocks/machine/MachinePuF6Tank.java +++ b/src/main/java/com/hbm/blocks/machine/MachinePuF6Tank.java @@ -157,7 +157,7 @@ public class MachinePuF6Tank extends BlockContainer implements IMultiblock { TileEntityMachinePuF6Tank entity = (TileEntityMachinePuF6Tank) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_puf6_tank, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachinePumpjack.java b/src/main/java/com/hbm/blocks/machine/MachinePumpjack.java index 6fd762136..908ab1514 100644 --- a/src/main/java/com/hbm/blocks/machine/MachinePumpjack.java +++ b/src/main/java/com/hbm/blocks/machine/MachinePumpjack.java @@ -71,7 +71,7 @@ public class MachinePumpjack extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_well, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return true; diff --git a/src/main/java/com/hbm/blocks/machine/MachineRTG.java b/src/main/java/com/hbm/blocks/machine/MachineRTG.java index 96cbaa1b4..2b3d14099 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineRTG.java +++ b/src/main/java/com/hbm/blocks/machine/MachineRTG.java @@ -64,7 +64,7 @@ public class MachineRTG extends BlockContainer { TileEntityMachineRTG entity = (TileEntityMachineRTG) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_rtg, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } } return true; diff --git a/src/main/java/com/hbm/blocks/machine/MachineRadGen.java b/src/main/java/com/hbm/blocks/machine/MachineRadGen.java index 39bc72bfb..b61b130c3 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineRadGen.java +++ b/src/main/java/com/hbm/blocks/machine/MachineRadGen.java @@ -52,7 +52,7 @@ public class MachineRadGen extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_radgen, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/blocks/machine/MachineRadar.java b/src/main/java/com/hbm/blocks/machine/MachineRadar.java index 12482cdf6..e5ed1f5f8 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineRadar.java +++ b/src/main/java/com/hbm/blocks/machine/MachineRadar.java @@ -57,7 +57,7 @@ public class MachineRadar extends BlockContainer { TileEntityMachineRadar entity = (TileEntityMachineRadar) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_radar, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineReactorBreeding.java b/src/main/java/com/hbm/blocks/machine/MachineReactorBreeding.java index 3707597d3..5958f2b86 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineReactorBreeding.java +++ b/src/main/java/com/hbm/blocks/machine/MachineReactorBreeding.java @@ -42,7 +42,7 @@ public class MachineReactorBreeding extends BlockDummyable { TileEntityMachineReactorBreeding entity = (TileEntityMachineReactorBreeding) world.getTileEntity(pos[0], pos[1], pos[2]); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_reactor_breeding, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineReactorControl.java b/src/main/java/com/hbm/blocks/machine/MachineReactorControl.java index f4e4334ae..b29cdc7c5 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineReactorControl.java +++ b/src/main/java/com/hbm/blocks/machine/MachineReactorControl.java @@ -204,7 +204,7 @@ public class MachineReactorControl extends BlockContainer { TileEntityReactorControl entity = (TileEntityReactorControl) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_controller, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineRefinery.java b/src/main/java/com/hbm/blocks/machine/MachineRefinery.java index 9d843c843..8cb272b62 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineRefinery.java +++ b/src/main/java/com/hbm/blocks/machine/MachineRefinery.java @@ -63,7 +63,7 @@ public class MachineRefinery extends BlockDummyable implements IPersistentInfoPr if(tank.hasExploded) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_refinery, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return true; diff --git a/src/main/java/com/hbm/blocks/machine/MachineRtgFurnace.java b/src/main/java/com/hbm/blocks/machine/MachineRtgFurnace.java index 45239eba1..6a8e280fb 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineRtgFurnace.java +++ b/src/main/java/com/hbm/blocks/machine/MachineRtgFurnace.java @@ -139,7 +139,7 @@ public class MachineRtgFurnace extends BlockContainer { TileEntityRtgFurnace entity = (TileEntityRtgFurnace) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_rtg_furnace, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineSILEX.java b/src/main/java/com/hbm/blocks/machine/MachineSILEX.java index 6031babcd..adfac31a2 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineSILEX.java +++ b/src/main/java/com/hbm/blocks/machine/MachineSILEX.java @@ -51,7 +51,7 @@ public class MachineSILEX extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_silex, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/blocks/machine/MachineSatDock.java b/src/main/java/com/hbm/blocks/machine/MachineSatDock.java index 684b915e3..af1cbefc4 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineSatDock.java +++ b/src/main/java/com/hbm/blocks/machine/MachineSatDock.java @@ -76,7 +76,7 @@ public class MachineSatDock extends BlockContainer implements IMultiblock { TileEntityMachineSatDock entity = (TileEntityMachineSatDock) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_dock, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineSatLinker.java b/src/main/java/com/hbm/blocks/machine/MachineSatLinker.java index 602608748..62eb931c6 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineSatLinker.java +++ b/src/main/java/com/hbm/blocks/machine/MachineSatLinker.java @@ -65,7 +65,7 @@ public class MachineSatLinker extends BlockContainer { TileEntityMachineSatLinker entity = (TileEntityMachineSatLinker) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_satlinker, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineSchrabidiumTransmutator.java b/src/main/java/com/hbm/blocks/machine/MachineSchrabidiumTransmutator.java index f3434360a..aebb65c24 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineSchrabidiumTransmutator.java +++ b/src/main/java/com/hbm/blocks/machine/MachineSchrabidiumTransmutator.java @@ -69,7 +69,7 @@ public class MachineSchrabidiumTransmutator extends BlockContainer { TileEntityMachineSchrabidiumTransmutator entity = (TileEntityMachineSchrabidiumTransmutator) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_schrabidium_transmutator, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineSeleniumEngine.java b/src/main/java/com/hbm/blocks/machine/MachineSeleniumEngine.java index d7191f58b..50b26e53c 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineSeleniumEngine.java +++ b/src/main/java/com/hbm/blocks/machine/MachineSeleniumEngine.java @@ -121,7 +121,7 @@ public class MachineSeleniumEngine extends BlockContainer implements ITooltipPro } else if(!player.isSneaking()) { TileEntityMachineSeleniumEngine entity = (TileEntityMachineSeleniumEngine) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_selenium, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineShredder.java b/src/main/java/com/hbm/blocks/machine/MachineShredder.java index 56951162c..10eb959aa 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineShredder.java +++ b/src/main/java/com/hbm/blocks/machine/MachineShredder.java @@ -83,7 +83,7 @@ public class MachineShredder extends BlockContainer { TileEntityMachineShredder entity = (TileEntityMachineShredder) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_shredder, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineSiren.java b/src/main/java/com/hbm/blocks/machine/MachineSiren.java index d5d6ac446..8cecae509 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineSiren.java +++ b/src/main/java/com/hbm/blocks/machine/MachineSiren.java @@ -61,7 +61,7 @@ public class MachineSiren extends BlockContainer { TileEntityMachineSiren entity = (TileEntityMachineSiren) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_siren, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/MachineTurbine.java b/src/main/java/com/hbm/blocks/machine/MachineTurbine.java index a28b911f9..9c9637891 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineTurbine.java +++ b/src/main/java/com/hbm/blocks/machine/MachineTurbine.java @@ -70,7 +70,7 @@ public class MachineTurbine extends BlockContainer implements ITooltipProvider { TileEntityMachineTurbine entity = (TileEntityMachineTurbine) te; if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_turbine, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; diff --git a/src/main/java/com/hbm/blocks/machine/MachineTurbofan.java b/src/main/java/com/hbm/blocks/machine/MachineTurbofan.java index f84d206df..3e83e4cf1 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineTurbofan.java +++ b/src/main/java/com/hbm/blocks/machine/MachineTurbofan.java @@ -257,7 +257,7 @@ public class MachineTurbofan extends BlockContainer implements IMultiblock, IToo }else if (!player.isSneaking()) { TileEntityMachineTurbofan entity = (TileEntityMachineTurbofan) world.getTileEntity(x, y, z); if (entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_turbofan, world, x, + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; diff --git a/src/main/java/com/hbm/blocks/machine/MachineUF6Tank.java b/src/main/java/com/hbm/blocks/machine/MachineUF6Tank.java index e0a5df63c..5f8e45d39 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineUF6Tank.java +++ b/src/main/java/com/hbm/blocks/machine/MachineUF6Tank.java @@ -157,7 +157,7 @@ public class MachineUF6Tank extends BlockContainer implements IMultiblock { TileEntityMachineUF6Tank entity = (TileEntityMachineUF6Tank) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_uf6_tank, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/NTMAnvil.java b/src/main/java/com/hbm/blocks/machine/NTMAnvil.java index e43a9815c..099748d19 100644 --- a/src/main/java/com/hbm/blocks/machine/NTMAnvil.java +++ b/src/main/java/com/hbm/blocks/machine/NTMAnvil.java @@ -6,8 +6,11 @@ import java.util.List; import com.hbm.blocks.ITooltipProvider; import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.container.ContainerAnvil; +import com.hbm.inventory.gui.GUIAnvil; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; @@ -16,9 +19,11 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; import net.minecraft.block.material.Material; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumChatFormatting; @@ -27,7 +32,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class NTMAnvil extends BlockFalling implements ITooltipProvider { +public class NTMAnvil extends BlockFalling implements ITooltipProvider, IGUIProvider { public final int tier; @@ -107,7 +112,7 @@ public class NTMAnvil extends BlockFalling implements ITooltipProvider { return true; } else if(!player.isSneaking()) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_anvil, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); return true; } @@ -164,4 +169,15 @@ public class NTMAnvil extends BlockFalling implements ITooltipProvider { public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { list.add(EnumChatFormatting.GOLD + "Tier " + tier + " Anvil"); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerAnvil(player.inventory, ((NTMAnvil)world.getBlock(x, y, z)).tier); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIAnvil(player.inventory, ((NTMAnvil)world.getBlock(x, y, z)).tier); + } } diff --git a/src/main/java/com/hbm/blocks/machine/ReactorHatch.java b/src/main/java/com/hbm/blocks/machine/ReactorHatch.java index 30fc95419..b951d3a9c 100644 --- a/src/main/java/com/hbm/blocks/machine/ReactorHatch.java +++ b/src/main/java/com/hbm/blocks/machine/ReactorHatch.java @@ -127,7 +127,7 @@ public class ReactorHatch extends Block implements IFluidConnectorBlock { { if(((TileEntityMachineReactorLarge)world.getTileEntity(x, y, z + 2)).checkBody()) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_reactor_multiblock, world, x, y, z + 2); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z + 2); } else { player.addChatMessage(new ChatComponentText("[Nuclear Reactor] Error: Reactor Structure not valid!")); } @@ -141,7 +141,7 @@ public class ReactorHatch extends Block implements IFluidConnectorBlock { { if(((TileEntityMachineReactorLarge)world.getTileEntity(x, y, z - 2)).checkBody()) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_reactor_multiblock, world, x, y, z - 2); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z - 2); } else { player.addChatMessage(new ChatComponentText("[Nuclear Reactor] Error: Reactor Structure not valid!")); } @@ -155,7 +155,7 @@ public class ReactorHatch extends Block implements IFluidConnectorBlock { { if(((TileEntityMachineReactorLarge)world.getTileEntity(x + 2, y, z)).checkBody()) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_reactor_multiblock, world, x + 2, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x + 2, y, z); } else { player.addChatMessage(new ChatComponentText("[Nuclear Reactor] Error: Reactor Structure not valid!")); } @@ -169,7 +169,7 @@ public class ReactorHatch extends Block implements IFluidConnectorBlock { { if(((TileEntityMachineReactorLarge)world.getTileEntity(x - 2, y, z)).checkBody()) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_reactor_multiblock, world, x - 2, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x - 2, y, z); } else { player.addChatMessage(new ChatComponentText("[Nuclear Reactor] Error: Reactor Structure not valid!")); } diff --git a/src/main/java/com/hbm/blocks/machine/ReactorResearch.java b/src/main/java/com/hbm/blocks/machine/ReactorResearch.java index 01bd29ffe..e41db09fc 100644 --- a/src/main/java/com/hbm/blocks/machine/ReactorResearch.java +++ b/src/main/java/com/hbm/blocks/machine/ReactorResearch.java @@ -58,7 +58,7 @@ public class ReactorResearch extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_reactor_research, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java b/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java index 275e0a36c..bde22278a 100644 --- a/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java +++ b/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java @@ -46,7 +46,7 @@ public class ReactorZirnox extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_reactor_zirnox, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/blocks/machine/SoyuzCapsule.java b/src/main/java/com/hbm/blocks/machine/SoyuzCapsule.java index aab456164..86a2f7a35 100644 --- a/src/main/java/com/hbm/blocks/machine/SoyuzCapsule.java +++ b/src/main/java/com/hbm/blocks/machine/SoyuzCapsule.java @@ -52,7 +52,7 @@ public class SoyuzCapsule extends BlockContainer { } else if(!player.isSneaking()) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_capsule, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/SoyuzLauncher.java b/src/main/java/com/hbm/blocks/machine/SoyuzLauncher.java index 63d4610f7..44aa51658 100644 --- a/src/main/java/com/hbm/blocks/machine/SoyuzLauncher.java +++ b/src/main/java/com/hbm/blocks/machine/SoyuzLauncher.java @@ -61,7 +61,7 @@ public class SoyuzLauncher extends BlockDummyable { TileEntitySoyuzLauncher entity = (TileEntitySoyuzLauncher) world.getTileEntity(pos[0], pos[1], pos[2]); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_soyuz_launcher, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/StorageDrum.java b/src/main/java/com/hbm/blocks/machine/StorageDrum.java index 7083eed48..27dda982f 100644 --- a/src/main/java/com/hbm/blocks/machine/StorageDrum.java +++ b/src/main/java/com/hbm/blocks/machine/StorageDrum.java @@ -10,8 +10,8 @@ import net.minecraft.world.World; public class StorageDrum extends BlockMachineBase { - public StorageDrum(Material mat, int guiID) { - super(mat, guiID); + public StorageDrum(Material mat) { + super(mat, 0); } @Override diff --git a/src/main/java/com/hbm/blocks/machine/WasteDrum.java b/src/main/java/com/hbm/blocks/machine/WasteDrum.java index 662a08894..84d1190a5 100644 --- a/src/main/java/com/hbm/blocks/machine/WasteDrum.java +++ b/src/main/java/com/hbm/blocks/machine/WasteDrum.java @@ -96,7 +96,7 @@ public class WasteDrum extends BlockContainer { TileEntityWasteDrum entity = (TileEntityWasteDrum) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_waste_drum, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/machine/WatzHatch.java b/src/main/java/com/hbm/blocks/machine/WatzHatch.java index b51829804..e38795122 100644 --- a/src/main/java/com/hbm/blocks/machine/WatzHatch.java +++ b/src/main/java/com/hbm/blocks/machine/WatzHatch.java @@ -96,7 +96,7 @@ public class WatzHatch extends Block implements IFluidConnectorBlock { { if(((TileEntityWatzCore)world.getTileEntity(x, y, z + 3)).isStructureValid(world)) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_watz_multiblock, world, x, y, z + 3); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z + 3); } else { player.addChatMessage(new ChatComponentText("[Watz Power Plant] Error: Reactor Structure not valid!")); } @@ -110,7 +110,7 @@ public class WatzHatch extends Block implements IFluidConnectorBlock { { if(((TileEntityWatzCore)world.getTileEntity(x, y, z - 3)).isStructureValid(world)) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_watz_multiblock, world, x, y, z - 3); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z - 3); } else { player.addChatMessage(new ChatComponentText("[Watz Power Plant] Error: Reactor Structure not valid!")); } @@ -124,7 +124,7 @@ public class WatzHatch extends Block implements IFluidConnectorBlock { { if(((TileEntityWatzCore)world.getTileEntity(x + 3, y, z)).isStructureValid(world)) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_watz_multiblock, world, x + 3, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x + 3, y, z); } else { player.addChatMessage(new ChatComponentText("[Watz Power Plant] Error: Reactor Structure not valid!")); } @@ -138,7 +138,7 @@ public class WatzHatch extends Block implements IFluidConnectorBlock { { if(((TileEntityWatzCore)world.getTileEntity(x - 3, y, z)).isStructureValid(world)) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_watz_multiblock, world, x - 3, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x - 3, y, z); } else { player.addChatMessage(new ChatComponentText("[Watz Power Plant] Error: Reactor Structure not valid!")); } diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java index 2f941e6ac..1293874a8 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBase.java @@ -56,7 +56,7 @@ public abstract class RBMKBase extends BlockDummyable implements IToolable, ILoo return 0; } - public boolean openInv(World world, int x, int y, int z, EntityPlayer player, int gui) { + public boolean openInv(World world, int x, int y, int z, EntityPlayer player) { if(world.isRemote) { return true; @@ -81,7 +81,7 @@ public abstract class RBMKBase extends BlockDummyable implements IToolable, ILoo } if(!player.isSneaking()) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, gui, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return true; diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBoiler.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBoiler.java index 3c9ab9f03..07a62af98 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBoiler.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBoiler.java @@ -26,7 +26,7 @@ public class RBMKBoiler extends RBMKBase { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - return openInv(world, x, y, z, player, ModBlocks.guiID_rbmk_boiler); + return openInv(world, x, y, z, player); } @Override diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKConsole.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKConsole.java index 316477ba9..9ed9caaa0 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKConsole.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKConsole.java @@ -89,7 +89,7 @@ public class RBMKConsole extends BlockDummyable { } if(world.isRemote) - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_rbmk_console, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); } return true; diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControl.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControl.java index edd6cdd87..1be934637 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControl.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControl.java @@ -27,7 +27,7 @@ public class RBMKControl extends RBMKBase { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - return openInv(world, x, y, z, player, ModBlocks.guiID_rbmk_control); + return openInv(world, x, y, z, player); } @Override diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControlAuto.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControlAuto.java index c60da64f6..9765e12c6 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControlAuto.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControlAuto.java @@ -20,7 +20,7 @@ public class RBMKControlAuto extends RBMKBase { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - return openInv(world, x, y, z, player, ModBlocks.guiID_rbmk_control_auto); + return openInv(world, x, y, z, player); } @Override diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKHeater.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKHeater.java index 39e26d99f..14f9615dc 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKHeater.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKHeater.java @@ -23,7 +23,7 @@ public class RBMKHeater extends RBMKBase { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - return openInv(world, x, y, z, player, 0); + return openInv(world, x, y, z, player); } @Override diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutgasser.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutgasser.java index 303fb345b..13e3c9bf2 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutgasser.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutgasser.java @@ -24,7 +24,7 @@ public class RBMKOutgasser extends RBMKBase { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - return openInv(world, x, y, z, player, ModBlocks.guiID_rbmk_outgasser); + return openInv(world, x, y, z, player); } @Override diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java index 9e43a6e35..794285b8b 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java @@ -33,7 +33,7 @@ public class RBMKRod extends RBMKBase { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { BossSpawnHandler.markFBI(player); - return openInv(world, x, y, z, player, ModBlocks.guiID_rbmk_rod); + return openInv(world, x, y, z, player); } @Override diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKStorage.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKStorage.java index a320ed12d..69ddb6521 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKStorage.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKStorage.java @@ -28,6 +28,6 @@ public class RBMKStorage extends RBMKBase { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { BossSpawnHandler.markFBI(player); - return openInv(world, x, y, z, player, ModBlocks.guiID_rbmk_storage); + return openInv(world, x, y, z, player); } } diff --git a/src/main/java/com/hbm/blocks/test/TestNuke.java b/src/main/java/com/hbm/blocks/test/TestNuke.java index 46e066b39..ddacaef88 100644 --- a/src/main/java/com/hbm/blocks/test/TestNuke.java +++ b/src/main/java/com/hbm/blocks/test/TestNuke.java @@ -117,7 +117,7 @@ public class TestNuke extends BlockContainer { TileEntityTestNuke entity = (TileEntityTestNuke) world.getTileEntity(x, y, z); if(entity != null) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_test_nuke, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } return true; } else { diff --git a/src/main/java/com/hbm/blocks/turret/TurretBrandon.java b/src/main/java/com/hbm/blocks/turret/TurretBrandon.java index 173bd2a83..012547a80 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretBrandon.java +++ b/src/main/java/com/hbm/blocks/turret/TurretBrandon.java @@ -27,6 +27,6 @@ public class TurretBrandon extends TurretBaseNT { @Override public void openGUI(World world, EntityPlayer player, int x, int y, int z) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_brandon, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } } diff --git a/src/main/java/com/hbm/blocks/turret/TurretChekhov.java b/src/main/java/com/hbm/blocks/turret/TurretChekhov.java index 5bc73f004..311891950 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretChekhov.java +++ b/src/main/java/com/hbm/blocks/turret/TurretChekhov.java @@ -60,7 +60,7 @@ public class TurretChekhov extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_chekhov, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/blocks/turret/TurretFriendly.java b/src/main/java/com/hbm/blocks/turret/TurretFriendly.java index 2918d4826..380c621ff 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretFriendly.java +++ b/src/main/java/com/hbm/blocks/turret/TurretFriendly.java @@ -59,7 +59,7 @@ public class TurretFriendly extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_friendly, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/blocks/turret/TurretFritz.java b/src/main/java/com/hbm/blocks/turret/TurretFritz.java index e3686656a..8d9f78170 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretFritz.java +++ b/src/main/java/com/hbm/blocks/turret/TurretFritz.java @@ -27,6 +27,6 @@ public class TurretFritz extends TurretBaseNT { @Override public void openGUI(World world, EntityPlayer player, int x, int y, int z) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_fritz, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } } diff --git a/src/main/java/com/hbm/blocks/turret/TurretHoward.java b/src/main/java/com/hbm/blocks/turret/TurretHoward.java index fd26fb693..0a6f9ff5a 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretHoward.java +++ b/src/main/java/com/hbm/blocks/turret/TurretHoward.java @@ -59,7 +59,7 @@ public class TurretHoward extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_howard, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/blocks/turret/TurretJeremy.java b/src/main/java/com/hbm/blocks/turret/TurretJeremy.java index 167164d16..48abc022d 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretJeremy.java +++ b/src/main/java/com/hbm/blocks/turret/TurretJeremy.java @@ -59,7 +59,7 @@ public class TurretJeremy extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_jeremy, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/blocks/turret/TurretMaxwell.java b/src/main/java/com/hbm/blocks/turret/TurretMaxwell.java index 26b36167d..593ba41b3 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretMaxwell.java +++ b/src/main/java/com/hbm/blocks/turret/TurretMaxwell.java @@ -27,6 +27,6 @@ public class TurretMaxwell extends TurretBaseNT { @Override public void openGUI(World world, EntityPlayer player, int x, int y, int z) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_maxwell, world, x, y, z); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z); } } \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/turret/TurretRichard.java b/src/main/java/com/hbm/blocks/turret/TurretRichard.java index 5526d06b2..84ac8e99c 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretRichard.java +++ b/src/main/java/com/hbm/blocks/turret/TurretRichard.java @@ -59,7 +59,7 @@ public class TurretRichard extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_richard, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/blocks/turret/TurretTauon.java b/src/main/java/com/hbm/blocks/turret/TurretTauon.java index d8925201f..d5039ca91 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretTauon.java +++ b/src/main/java/com/hbm/blocks/turret/TurretTauon.java @@ -59,7 +59,7 @@ public class TurretTauon extends BlockDummyable { if(pos == null) return false; - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_tauon, world, pos[0], pos[1], pos[2]); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, pos[0], pos[1], pos[2]); return true; } else { return false; diff --git a/src/main/java/com/hbm/entity/cart/EntityMinecartCrate.java b/src/main/java/com/hbm/entity/cart/EntityMinecartCrate.java index 1e88f0177..e02824c6f 100644 --- a/src/main/java/com/hbm/entity/cart/EntityMinecartCrate.java +++ b/src/main/java/com/hbm/entity/cart/EntityMinecartCrate.java @@ -3,24 +3,29 @@ package com.hbm.entity.cart; import java.io.IOException; import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.container.ContainerCrateSteel; +import com.hbm.inventory.gui.GUICrateSteel; import com.hbm.items.ModItems; import com.hbm.items.tool.ItemModMinecart; import com.hbm.items.tool.ItemModMinecart.EnumCartBase; import com.hbm.items.tool.ItemModMinecart.EnumMinecart; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; 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.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -public class EntityMinecartCrate extends EntityMinecartContainerBase { +public class EntityMinecartCrate extends EntityMinecartContainerBase implements IGUIProvider { public EntityMinecartCrate(World world) { super(world); @@ -40,7 +45,7 @@ public class EntityMinecartCrate extends EntityMinecartContainerBase { if(net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.minecart.MinecartInteractEvent(this, player))) return true; if(!this.worldObj.isRemote) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModItems.guiID_cart_crate, worldObj, this.getEntityId(), 0, 0); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, worldObj, this.getEntityId(), 0, 0); } return true; @@ -99,4 +104,15 @@ public class EntityMinecartCrate extends EntityMinecartContainerBase { public ItemStack getCartItem() { return ItemModMinecart.createCartItem(EnumCartBase.VANILLA, EnumMinecart.CRATE); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerCrateSteel(player.inventory, (EntityMinecartCrate)player.worldObj.getEntityByID(x)); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUICrateSteel(player.inventory, (EntityMinecartCrate) player.worldObj.getEntityByID(x)); + } } diff --git a/src/main/java/com/hbm/entity/cart/EntityMinecartDestroyer.java b/src/main/java/com/hbm/entity/cart/EntityMinecartDestroyer.java index 7c3aa7d1c..c8aa8f245 100644 --- a/src/main/java/com/hbm/entity/cart/EntityMinecartDestroyer.java +++ b/src/main/java/com/hbm/entity/cart/EntityMinecartDestroyer.java @@ -3,6 +3,8 @@ package com.hbm.entity.cart; import java.util.List; import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.container.ContainerCartDestroyer; +import com.hbm.inventory.gui.GUICartDestroyer; import com.hbm.items.ModItems; import com.hbm.items.tool.ItemModMinecart; import com.hbm.items.tool.ItemModMinecart.EnumCartBase; @@ -10,19 +12,22 @@ import com.hbm.items.tool.ItemModMinecart.EnumMinecart; import com.hbm.main.MainRegistry; import com.hbm.main.ResourceManager; import com.hbm.render.entity.item.RenderNeoCart; +import com.hbm.tileentity.IGUIProvider; 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.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -public class EntityMinecartDestroyer extends EntityMinecartContainerBase { +public class EntityMinecartDestroyer extends EntityMinecartContainerBase implements IGUIProvider { public EntityMinecartDestroyer(World world) { super(world); @@ -37,7 +42,7 @@ public class EntityMinecartDestroyer extends EntityMinecartContainerBase { if(net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.minecart.MinecartInteractEvent(this, player))) return true; if(!this.worldObj.isRemote) { - FMLNetworkHandler.openGui(player, MainRegistry.instance, ModItems.guiID_cart_destroyer, worldObj, this.getEntityId(), 0, 0); + FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, worldObj, this.getEntityId(), 0, 0); } return true; @@ -135,4 +140,15 @@ public class EntityMinecartDestroyer extends EntityMinecartContainerBase { renderer.bindTexture(ResourceManager.cart_destroyer_tex); ResourceManager.cart_destroyer.renderAll(); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerCartDestroyer(player.inventory, (EntityMinecartDestroyer)player.worldObj.getEntityByID(x)); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUICartDestroyer(player.inventory, (EntityMinecartDestroyer) player.worldObj.getEntityByID(x)); + } } diff --git a/src/main/java/com/hbm/handler/GUIHandler.java b/src/main/java/com/hbm/handler/GUIHandler.java index 4b5418218..931fedac8 100644 --- a/src/main/java/com/hbm/handler/GUIHandler.java +++ b/src/main/java/com/hbm/handler/GUIHandler.java @@ -1,38 +1,23 @@ package com.hbm.handler; -import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.generic.BlockBobble.TileEntityBobble; -import com.hbm.blocks.machine.NTMAnvil; -import com.hbm.entity.cart.EntityMinecartCrate; -import com.hbm.entity.cart.EntityMinecartDestroyer; -import com.hbm.interfaces.Spaghetti; -import com.hbm.inventory.container.*; -import com.hbm.inventory.gui.*; -import com.hbm.items.ModItems; import com.hbm.tileentity.IGUIProvider; -import com.hbm.tileentity.bomb.*; -import com.hbm.tileentity.machine.*; -import com.hbm.tileentity.machine.oil.*; -import com.hbm.tileentity.machine.rbmk.*; -import com.hbm.tileentity.machine.storage.*; -import com.hbm.tileentity.turret.*; +import cpw.mods.fml.common.network.IGuiHandler; import net.minecraft.block.Block; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import cpw.mods.fml.common.network.IGuiHandler; -@Spaghetti("ew") public class GUIHandler implements IGuiHandler { @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity entity = world.getTileEntity(x, y, z); + TileEntity tileEntity = world.getTileEntity(x, y, z); - if(entity instanceof IGUIProvider) { - return ((IGUIProvider) entity).provideContainer(ID, player, world, x, y, z); + if(tileEntity instanceof IGUIProvider) { + return ((IGUIProvider) tileEntity).provideContainer(ID, player, world, x, y, z); } Block block = world.getBlock(x, y, z); @@ -47,774 +32,25 @@ public class GUIHandler implements IGuiHandler { return ((IGUIProvider) item.getItem()).provideContainer(ID, player, world, x, y, z); } - //notice: stop doing this, unless you absolutely have to \/ + Entity entity = player.worldObj.getEntityByID(x); - if(entity instanceof TileEntityCrateIron) { return new ContainerCrateIron(player.inventory, (TileEntityCrateIron) entity); } - if(entity instanceof TileEntityCrateSteel) { return new ContainerCrateSteel(player.inventory, (TileEntityCrateSteel) entity); } - if(entity instanceof TileEntityCrateDesh) { return new ContainerCrateDesh(player.inventory, (TileEntityCrateDesh) entity); } - if(entity instanceof TileEntityCrateTungsten) { return new ContainerCrateTungsten(player.inventory, (TileEntityCrateTungsten) entity); } - if(entity instanceof TileEntitySafe) { return new ContainerSafe(player.inventory, (TileEntitySafe) entity); } - if(entity instanceof TileEntityMassStorage) { return new ContainerMassStorage(player.inventory, (TileEntityMassStorage) entity); } - - if(entity instanceof TileEntityMachineAutocrafter) { return new ContainerAutocrafter(player.inventory, (TileEntityMachineAutocrafter) entity); } - - if(entity instanceof TileEntityMachineLiquefactor) { return new ContainerLiquefactor(player.inventory, (TileEntityMachineLiquefactor) entity); } - if(entity instanceof TileEntityMachineSolidifier) { return new ContainerSolidifier(player.inventory, (TileEntityMachineSolidifier) entity); } - if(entity instanceof TileEntityMachineRadiolysis) { return new ContainerRadiolysis(player.inventory, (TileEntityMachineRadiolysis) entity); } - if(entity instanceof TileEntityMachineAssemfac) { return new ContainerAssemfac(player.inventory, (TileEntityMachineAssemfac) entity); } - if(entity instanceof TileEntityMachineChemfac) { return new ContainerChemfac(player.inventory, (TileEntityMachineChemfac) entity); } - if(entity instanceof TileEntityElectrolyser) { return new ContainerElectrolyser(player.inventory, (TileEntityElectrolyser) entity); } - - if(entity instanceof TileEntityRBMKHeater) { return new ContainerRBMKHeater(player.inventory, (TileEntityRBMKHeater) entity); } - - //notice: stop doing this completely, period \/ - - switch(ID) { - case ModBlocks.guiID_test_difurnace: { - if(entity instanceof TileEntityDiFurnace) { - return new ContainerDiFurnace(player.inventory, (TileEntityDiFurnace) entity); - } - return null; - } - - case ModBlocks.guiID_test_nuke: { - if(entity instanceof TileEntityTestNuke) { - return new ContainerTestNuke(player.inventory, (TileEntityTestNuke) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_gadget: { - if(entity instanceof TileEntityNukeGadget) { - return new ContainerNukeGadget(player.inventory, (TileEntityNukeGadget) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_boy: { - if(entity instanceof TileEntityNukeBoy) { - return new ContainerNukeBoy(player.inventory, (TileEntityNukeBoy) entity); - } - return null; - } - - case ModBlocks.guiID_centrifuge: { - if(entity instanceof TileEntityMachineCentrifuge) { - return new ContainerCentrifuge(player.inventory, (TileEntityMachineCentrifuge) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_man: { - if(entity instanceof TileEntityNukeMan) { - return new ContainerNukeMan(player.inventory, (TileEntityNukeMan) entity); - } - return null; - } - - case ModBlocks.guiID_uf6_tank: { - if(entity instanceof TileEntityMachineUF6Tank) { - return new ContainerUF6Tank(player.inventory, (TileEntityMachineUF6Tank) entity); - } - return null; - } - - case ModBlocks.guiID_puf6_tank: { - if(entity instanceof TileEntityMachinePuF6Tank) { - return new ContainerPuF6Tank(player.inventory, (TileEntityMachinePuF6Tank) entity); - } - return null; - } - - case ModBlocks.guiID_reactor_breeding: { - if(entity instanceof TileEntityMachineReactorBreeding) { - return new ContainerMachineReactorBreeding(player.inventory, (TileEntityMachineReactorBreeding) entity); - } - return null; - } - - case ModBlocks.guiID_bomb_multi: { - if(entity instanceof TileEntityBombMulti) { - return new ContainerBombMulti(player.inventory, (TileEntityBombMulti) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_mike: { - if(entity instanceof TileEntityNukeMike) { - return new ContainerNukeMike(player.inventory, (TileEntityNukeMike) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_tsar: { - if(entity instanceof TileEntityNukeTsar) { - return new ContainerNukeTsar(player.inventory, (TileEntityNukeTsar) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_furnace: { - if(entity instanceof TileEntityNukeFurnace) { - return new ContainerNukeFurnace(player.inventory, (TileEntityNukeFurnace) entity); - } - return null; - } - - case ModBlocks.guiID_rtg_furnace: { - if(entity instanceof TileEntityRtgFurnace) { - return new ContainerRtgFurnace(player.inventory, (TileEntityRtgFurnace) entity); - } - return null; - } - - case ModBlocks.guiID_electric_furnace: { - if(entity instanceof TileEntityMachineElectricFurnace) { - return new ContainerElectricFurnace(player.inventory, (TileEntityMachineElectricFurnace) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_fleija: { - if(entity instanceof TileEntityNukeFleija) { - return new ContainerNukeFleija(player.inventory, (TileEntityNukeFleija) entity); - } - return null; - } - - case ModBlocks.guiID_machine_deuterium: { - if(entity instanceof TileEntityMachineDeuterium) { - return new ContainerMachineDeuterium(player.inventory, (TileEntityMachineDeuterium) entity); - } - return null; - } - - case ModBlocks.guiID_machine_battery: { - if(entity instanceof TileEntityMachineBattery) { - return new ContainerMachineBattery(player.inventory, (TileEntityMachineBattery) entity); - } - return null; - } - - case ModBlocks.guiID_machine_coal: { - if(entity instanceof TileEntityMachineCoal) { - return new ContainerMachineCoal(player.inventory, (TileEntityMachineCoal) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_prototype: { - if(entity instanceof TileEntityNukePrototype) { - return new ContainerNukePrototype(player.inventory, (TileEntityNukePrototype) entity); - } - return null; - } - - case ModBlocks.guiID_launch_pad: { - if(entity instanceof TileEntityLaunchPad) { - return new ContainerLaunchPadTier1(player.inventory, (TileEntityLaunchPad) entity); - } - return null; - } - - case ModBlocks.guiID_reactor_multiblock: { - if(entity instanceof TileEntityMachineReactorLarge) { - return new ContainerReactorMultiblock(player.inventory, (TileEntityMachineReactorLarge) entity); - } - return null; - } - - case ModBlocks.guiID_schrabidium_transmutator: { - if(entity instanceof TileEntityMachineSchrabidiumTransmutator) { - return new ContainerMachineSchrabidiumTransmutator(player.inventory, (TileEntityMachineSchrabidiumTransmutator) entity); - } - return null; - } - - case ModBlocks.guiID_machine_diesel: { - if(entity instanceof TileEntityMachineDiesel) { - return new ContainerMachineDiesel(player.inventory, (TileEntityMachineDiesel) entity); - } - return null; - } - - case ModBlocks.guiID_watz_multiblock: { - if(entity instanceof TileEntityWatzCore) { - return new ContainerWatzCore(player.inventory, (TileEntityWatzCore) entity); - } - return null; - } - - case ModBlocks.guiID_machine_shredder: { - if(entity instanceof TileEntityMachineShredder) { - return new ContainerMachineShredder(player.inventory, (TileEntityMachineShredder) entity); - } - return null; - } - - case ModBlocks.guiID_combine_factory: { - if(entity instanceof TileEntityMachineCMBFactory) { - return new ContainerMachineCMBFactory(player.inventory, (TileEntityMachineCMBFactory) entity); - } - return null; - } - - case ModBlocks.guiID_fwatz_multiblock: { - if(entity instanceof TileEntityFWatzCore) { - return new ContainerFWatzCore(player.inventory, (TileEntityFWatzCore) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_custom: { - if(entity instanceof TileEntityNukeCustom) { - return new ContainerNukeCustom(player.inventory, (TileEntityNukeCustom) entity); - } - return null; - } - - case ModBlocks.guiID_machine_industrial_generator: { - if(entity instanceof TileEntityMachineIGenerator) { - return new ContainerIGenerator(player.inventory, (TileEntityMachineIGenerator) entity); - } - return null; - } - - case ModBlocks.guiID_machine_rtg: { - if(entity instanceof TileEntityMachineRTG) { - return new ContainerMachineRTG(player.inventory, (TileEntityMachineRTG) entity); - } - return null; - } - - case ModBlocks.guiID_machine_cyclotron: { - if(entity instanceof TileEntityMachineCyclotron) { - return new ContainerMachineCyclotron(player.inventory, (TileEntityMachineCyclotron) entity); - } - return null; - } - - case ModBlocks.guiID_machine_well: { - if(entity instanceof TileEntityOilDrillBase) { - return new ContainerMachineOilWell(player.inventory, (TileEntityOilDrillBase) entity); - } - return null; - } - - case ModBlocks.guiID_machine_refinery: { - if(entity instanceof TileEntityMachineRefinery) { - return new ContainerMachineRefinery(player.inventory, (TileEntityMachineRefinery) entity); - } - return null; - } - - case ModBlocks.guiID_machine_flare: { - if(entity instanceof TileEntityMachineGasFlare) { - return new ContainerMachineGasFlare(player.inventory, (TileEntityMachineGasFlare) entity); - } - return null; - } - - case ModBlocks.guiID_machine_drill: { - if(entity instanceof TileEntityMachineMiningDrill) { - return new ContainerMachineMiningDrill(player.inventory, (TileEntityMachineMiningDrill) entity); - } - return null; - } - - case ModBlocks.guiID_machine_assembler: { - if(entity instanceof TileEntityMachineAssembler) { - return new ContainerMachineAssembler(player.inventory, (TileEntityMachineAssembler) entity); - } - return null; - } - - case ModBlocks.guiID_machine_chemplant: { - if(entity instanceof TileEntityMachineChemplant) { - return new ContainerMachineChemplant(player.inventory, (TileEntityMachineChemplant) entity); - } - return null; - } - - case ModBlocks.guiID_machine_turbofan: { - if(entity instanceof TileEntityMachineTurbofan) { - return new ContainerMachineTurbofan(player.inventory, (TileEntityMachineTurbofan) entity); - } - return null; - } - - case ModBlocks.guiID_machine_press: { - if(entity instanceof TileEntityMachinePress) { - return new ContainerMachinePress(player.inventory, (TileEntityMachinePress) entity); - } - return null; - } - - case ModBlocks.guiID_ams_limiter: { - if(entity instanceof TileEntityAMSLimiter) { - return new ContainerAMSLimiter(player.inventory, (TileEntityAMSLimiter) entity); - } - return null; - } - - case ModBlocks.guiID_ams_emitter: { - if(entity instanceof TileEntityAMSEmitter) { - return new ContainerAMSEmitter(player.inventory, (TileEntityAMSEmitter) entity); - } - return null; - } - - case ModBlocks.guiID_ams_base: { - if(entity instanceof TileEntityAMSBase) { - return new ContainerAMSBase(player.inventory, (TileEntityAMSBase) entity); - } - return null; - } - - case ModBlocks.guiID_siren: { - if(entity instanceof TileEntityMachineSiren) { - return new ContainerMachineSiren(player.inventory, (TileEntityMachineSiren) entity); - } - return null; - } - - case ModBlocks.guiID_radgen: { - if(entity instanceof TileEntityMachineRadGen) { - return new ContainerMachineRadGen(player.inventory, (TileEntityMachineRadGen) entity); - } - return null; - } - - case ModBlocks.guiID_radar: { - if(entity instanceof TileEntityMachineRadar) { - return new ContainerMachineRadar(player.inventory, (TileEntityMachineRadar) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_solinium: { - if(entity instanceof TileEntityNukeSolinium) { - return new ContainerNukeSolinium(player.inventory, (TileEntityNukeSolinium) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_n2: { - if(entity instanceof TileEntityNukeN2) { - return new ContainerNukeN2(player.inventory, (TileEntityNukeN2) entity); - } - return null; - } - - case ModBlocks.guiID_machine_selenium: { - if(entity instanceof TileEntityMachineSeleniumEngine) { - return new ContainerMachineSelenium(player.inventory, (TileEntityMachineSeleniumEngine) entity); - } - return null; - } - - case ModBlocks.guiID_satlinker: { - if(entity instanceof TileEntityMachineSatLinker) { - return new ContainerMachineSatLinker(player.inventory, (TileEntityMachineSatLinker) entity); - } - return null; - } - - case ModBlocks.guiID_reactor_research: { - if(entity instanceof TileEntityReactorResearch) { - return new ContainerReactorResearch(player.inventory, (TileEntityReactorResearch) entity); - } - return null; - } - - case ModBlocks.guiID_radiobox: { - if(entity instanceof TileEntityRadiobox) { - return new ContainerRadiobox(player.inventory, (TileEntityRadiobox) entity); - } - return null; - } - - case ModBlocks.guiID_keyforge: { - if(entity instanceof TileEntityMachineKeyForge) { - return new ContainerMachineKeyForge(player.inventory, (TileEntityMachineKeyForge) entity); - } - return null; - } - - case ModBlocks.guiID_gascent: { - if(entity instanceof TileEntityMachineGasCent) { - return new ContainerMachineGasCent(player.inventory, (TileEntityMachineGasCent) entity); - } - return null; - } - - case ModBlocks.guiID_machine_boiler: { - if(entity instanceof TileEntityMachineBoiler) { - return new ContainerMachineBoiler(player.inventory, (TileEntityMachineBoiler) entity); - } - return null; - } - - case ModBlocks.guiID_machine_boiler_electric: { - if(entity instanceof TileEntityMachineBoilerElectric) { - return new ContainerMachineBoilerElectric(player.inventory, (TileEntityMachineBoilerElectric) entity); - } - return null; - } - - case ModBlocks.guiID_machine_turbine: { - if(entity instanceof TileEntityMachineTurbine) { - return new ContainerMachineTurbine(player.inventory, (TileEntityMachineTurbine) entity); - } - return null; - } - - case ModBlocks.guiID_forcefield: { - if(entity instanceof TileEntityForceField) { - return new ContainerForceField(player.inventory, (TileEntityForceField) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_n45: { - if(entity instanceof TileEntityNukeN45) { - return new ContainerNukeN45(player.inventory, (TileEntityNukeN45) entity); - } - return null; - } - - case ModBlocks.guiID_machine_controller: { - if(entity instanceof TileEntityReactorControl) { - return new ContainerReactorControl(player.inventory, (TileEntityReactorControl) entity); - } - return null; - } - - case ModBlocks.guiID_waste_drum: { - if(entity instanceof TileEntityWasteDrum) { - return new ContainerWasteDrum(player.inventory, (TileEntityWasteDrum) entity); - } - return null; - } - - case ModBlocks.guiID_dock: { - if(entity instanceof TileEntityMachineSatDock) { - return new ContainerSatDock(player.inventory, (TileEntityMachineSatDock) entity); - } - return null; - } - - case ModBlocks.guiID_machine_epress: { - if(entity instanceof TileEntityMachineEPress) { - return new ContainerMachineEPress(player.inventory, (TileEntityMachineEPress) entity); - } - return null; - } - - case ModBlocks.guiID_machine_arc: { - if(entity instanceof TileEntityMachineArcFurnace) { - return new ContainerMachineArcFurnace(player.inventory, (TileEntityMachineArcFurnace) entity); - } - return null; - } - - case ModBlocks.guiID_missile_assembly: { - if(entity instanceof TileEntityMachineMissileAssembly) { - return new ContainerMachineMissileAssembly(player.inventory, (TileEntityMachineMissileAssembly) entity); - } - return null; - } - - case ModBlocks.guiID_compact_launcher: { - if(entity instanceof TileEntityCompactLauncher) { - return new ContainerCompactLauncher(player.inventory, (TileEntityCompactLauncher) entity); - } - return null; - } - - case ModBlocks.guiID_launch_table: { - if(entity instanceof TileEntityLaunchTable) { - return new ContainerLaunchTable(player.inventory, (TileEntityLaunchTable) entity); - } - return null; - } - - case ModBlocks.guiID_soyuz_launcher: { - if(entity instanceof TileEntitySoyuzLauncher) { - return new ContainerSoyuzLauncher(player.inventory, (TileEntitySoyuzLauncher) entity); - } - return null; - } - - case ModBlocks.guiID_dfc_emitter: { - if(entity instanceof TileEntityCoreEmitter) { - return new ContainerCoreEmitter(player.inventory, (TileEntityCoreEmitter) entity); - } - return null; - } - - case ModBlocks.guiID_dfc_receiver: { - if(entity instanceof TileEntityCoreReceiver) { - return new ContainerCoreReceiver(player.inventory, (TileEntityCoreReceiver) entity); - } - return null; - } - - case ModBlocks.guiID_dfc_injector: { - if(entity instanceof TileEntityCoreInjector) { - return new ContainerCoreInjector(player.inventory, (TileEntityCoreInjector) entity); - } - return null; - } - - case ModBlocks.guiID_dfc_core: { - if(entity instanceof TileEntityCore) { - return new ContainerCore(player.inventory, (TileEntityCore) entity); - } - return null; - } - - case ModBlocks.guiID_dfc_stabilizer: { - if(entity instanceof TileEntityCoreStabilizer) { - return new ContainerCoreStabilizer(player.inventory, (TileEntityCoreStabilizer) entity); - } - return null; - } - - case ModBlocks.guiID_barrel: { - if(entity instanceof TileEntityBarrel) { - return new ContainerBarrel(player.inventory, (TileEntityBarrel) entity); - } - return null; - } - - case ModBlocks.guiID_capsule: { - if(entity instanceof TileEntitySoyuzCapsule) { - return new ContainerSoyuzCapsule(player.inventory, (TileEntitySoyuzCapsule) entity); - } - return null; - } - - case ModBlocks.guiID_crystallizer: { - if(entity instanceof TileEntityMachineCrystallizer) { - return new ContainerCrystallizer(player.inventory, (TileEntityMachineCrystallizer) entity); - } - return null; - } - - case ModBlocks.guiID_mining_laser: { - if(entity instanceof TileEntityMachineMiningLaser) { - return new ContainerMiningLaser(player.inventory, (TileEntityMachineMiningLaser) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_fstbmb: { - if(entity instanceof TileEntityNukeBalefire) { - return new ContainerNukeFstbmb(player.inventory, (TileEntityNukeBalefire) entity); - } - return null; - } - - case ModBlocks.guiID_microwave: { - if(entity instanceof TileEntityMicrowave) { - return new ContainerMicrowave(player.inventory, (TileEntityMicrowave) entity); - } - return null; - } - - case ModBlocks.guiID_iter: { - if(entity instanceof TileEntityITER) { - return new ContainerITER(player.inventory, (TileEntityITER) entity); - } - return null; - } - - case ModBlocks.guiID_plasma_heater: { - if(entity instanceof TileEntityMachinePlasmaHeater) { - return new ContainerPlasmaHeater(player.inventory, (TileEntityMachinePlasmaHeater) entity); - } - return null; - } - - case ModBlocks.guiID_machine_large_turbine: { - if(entity instanceof TileEntityMachineLargeTurbine) { - return new ContainerMachineLargeTurbine(player.inventory, (TileEntityMachineLargeTurbine) entity); - } - return null; - } - - case ModBlocks.guiID_hadron: { - if(entity instanceof TileEntityHadron) { - return new ContainerHadron(player.inventory, (TileEntityHadron) entity); - } - return null; - } - - case ModBlocks.guiID_armor_table: { - if(world.getBlock(x, y, z) == ModBlocks.machine_armor_table) { - return new ContainerArmorTable(player.inventory); - } - return null; - } - - case ModBlocks.guiID_chekhov: { - if(entity instanceof TileEntityTurretChekhov) { - return new ContainerTurretBase(player.inventory, (TileEntityTurretChekhov) entity); - } - return null; - } - - case ModBlocks.guiID_friendly: { - if(entity instanceof TileEntityTurretFriendly) { - return new ContainerTurretBase(player.inventory, (TileEntityTurretFriendly) entity); - } - return null; - } - - case ModBlocks.guiID_jeremy: { - if(entity instanceof TileEntityTurretJeremy) { - return new ContainerTurretBase(player.inventory, (TileEntityTurretJeremy) entity); - } - return null; - } - - case ModBlocks.guiID_tauon: { - if(entity instanceof TileEntityTurretTauon) { - return new ContainerTurretBase(player.inventory, (TileEntityTurretTauon) entity); - } - return null; - } - - case ModBlocks.guiID_richard: { - if(entity instanceof TileEntityTurretRichard) { - return new ContainerTurretBase(player.inventory, (TileEntityTurretRichard) entity); - } - return null; - } - - case ModBlocks.guiID_howard: { - if(entity instanceof TileEntityTurretHoward) { - return new ContainerTurretBase(player.inventory, (TileEntityTurretHoward) entity); - } - return null; - } - - case ModBlocks.guiID_silex: { - if(entity instanceof TileEntitySILEX) { - return new ContainerSILEX(player.inventory, (TileEntitySILEX) entity); - } - return null; - } - - case ModBlocks.guiID_fel: { - if(entity instanceof TileEntityFEL) { - return new ContainerFEL(player.inventory, (TileEntityFEL) entity); - } - return null; - } - - case ModBlocks.guiID_rbmk_rod: { - if(entity instanceof TileEntityRBMKRod) { - return new ContainerRBMKRod(player.inventory, (TileEntityRBMKRod) entity); - } - return null; - } - - case ModBlocks.guiID_rbmk_boiler: { - if(entity instanceof TileEntityRBMKBoiler) { - return new ContainerRBMKGeneric(player.inventory); - } - return null; - } - - case ModBlocks.guiID_rbmk_control: { - if(entity instanceof TileEntityRBMKControlManual) { - return new ContainerRBMKControl(player.inventory, (TileEntityRBMKControlManual) entity); - } - return null; - } - - case ModBlocks.guiID_rbmk_control_auto: { - if(entity instanceof TileEntityRBMKControlAuto) { - return new ContainerRBMKControlAuto(player.inventory, (TileEntityRBMKControlAuto) entity); - } - return null; - } - - case ModBlocks.guiID_storage_drum: { - if(entity instanceof TileEntityStorageDrum) { - return new ContainerStorageDrum(player.inventory, (TileEntityStorageDrum) entity); - } - return null; - } - - case ModBlocks.guiID_rbmk_outgasser: { - if(entity instanceof TileEntityRBMKOutgasser) { - return new ContainerRBMKOutgasser(player.inventory, (TileEntityRBMKOutgasser) entity); - } - return null; - } - - case ModBlocks.guiID_maxwell: { - if(entity instanceof TileEntityTurretMaxwell) { - return new ContainerTurretBase(player.inventory, (TileEntityTurretMaxwell) entity); - } - return null; - } - - case ModBlocks.guiID_anvil: { - if(world.getBlock(x, y, z) instanceof NTMAnvil) { - return new ContainerAnvil(player.inventory, ((NTMAnvil)world.getBlock(x, y, z)).tier); - } - return null; - } - - case ModBlocks.guiID_fritz: { - if(entity instanceof TileEntityTurretFritz) { - return new ContainerTurretBase(player.inventory, (TileEntityTurretFritz) entity); - } - return null; - } - - case ModBlocks.guiID_rbmk_storage: { - if(entity instanceof TileEntityRBMKStorage) { - return new ContainerRBMKStorage(player.inventory, (TileEntityRBMKStorage) entity); - } - return null; + if(entity != null && entity instanceof IGUIProvider) { + return ((IGUIProvider) entity).provideContainer(ID, player, world, x, y, z); } - case ModBlocks.guiID_rtg_difurnace: { - if (entity instanceof TileEntityDiFurnaceRTG) { - return new ContainerMachineDiFurnaceRTG(player.inventory, (TileEntityDiFurnaceRTG) entity); - } - return null; - } + //notice: stop doing this, unless you absolutely have to :3 - case ModBlocks.guiID_reactor_zirnox: { - if(entity instanceof TileEntityReactorZirnox) { - return new ContainerReactorZirnox(player.inventory, (TileEntityReactorZirnox) entity); - } - return null; - } - } - // NON-TE CONTAINERS - - switch(ID) { - case ModItems.guiID_item_book: return new ContainerBook(player.inventory); - case ModItems.guiID_cart_crate: return new ContainerCrateSteel(player.inventory, (EntityMinecartCrate)player.worldObj.getEntityByID(x)); - case ModItems.guiID_cart_destroyer: return new ContainerCartDestroyer(player.inventory, (EntityMinecartDestroyer)player.worldObj.getEntityByID(x)); - } + //notice: stop doing this completely, period :P return null; } @Override public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity entity = world.getTileEntity(x, y, z); + TileEntity tileEntity = world.getTileEntity(x, y, z); - if(entity instanceof IGUIProvider) { - return ((IGUIProvider) entity).provideGUI(ID, player, world, x, y, z); + if(tileEntity instanceof IGUIProvider) { + return ((IGUIProvider) tileEntity).provideGUI(ID, player, world, x, y, z); } Block block = world.getBlock(x, y, z); @@ -829,785 +65,15 @@ public class GUIHandler implements IGuiHandler { return ((IGUIProvider) item.getItem()).provideGUI(ID, player, world, x, y, z); } - //stop doing this unless you absolutely have to \/ - - if(entity instanceof TileEntityCrateIron) { return new GUICrateIron(player.inventory, (TileEntityCrateIron) entity); } - if(entity instanceof TileEntityCrateSteel) { return new GUICrateSteel(player.inventory, (TileEntityCrateSteel) entity); } - if(entity instanceof TileEntityCrateDesh) { return new GUICrateDesh(player.inventory, (TileEntityCrateDesh) entity); } - if(entity instanceof TileEntityCrateTungsten) { return new GUICrateTungsten(player.inventory, (TileEntityCrateTungsten) entity); } - if(entity instanceof TileEntitySafe) { return new GUISafe(player.inventory, (TileEntitySafe) entity); } - if(entity instanceof TileEntityMassStorage) { return new GUIMassStorage(player.inventory, (TileEntityMassStorage) entity); } + Entity entity = player.worldObj.getEntityByID(x); - if(entity instanceof TileEntityMachineAutocrafter) { return new GUIAutocrafter(player.inventory, (TileEntityMachineAutocrafter) entity); } - - if(entity instanceof TileEntityMachineLiquefactor) { return new GUILiquefactor(player.inventory, (TileEntityMachineLiquefactor) entity); } - if(entity instanceof TileEntityMachineSolidifier) { return new GUISolidifier(player.inventory, (TileEntityMachineSolidifier) entity); } - if(entity instanceof TileEntityMachineRadiolysis) { return new GUIRadiolysis(player.inventory, (TileEntityMachineRadiolysis) entity); } - if(entity instanceof TileEntityMachineAssemfac) { return new GUIAssemfac(player.inventory, (TileEntityMachineAssemfac) entity); } - if(entity instanceof TileEntityMachineChemfac) { return new GUIChemfac(player.inventory, (TileEntityMachineChemfac) entity); } - if(entity instanceof TileEntityElectrolyser) { return new GUIElectrolyser(player.inventory, (TileEntityElectrolyser) entity); } - - if(entity instanceof TileEntityRBMKHeater) { return new GUIRBMKHeater(player.inventory, (TileEntityRBMKHeater) entity); } - - //stop doing this, period \/ - - switch(ID) { - case ModBlocks.guiID_test_difurnace: { - if(entity instanceof TileEntityDiFurnace) { - return new GUIDiFurnace(player.inventory, (TileEntityDiFurnace) entity); - } - return null; - } - - case ModBlocks.guiID_test_nuke: { - if(entity instanceof TileEntityTestNuke) { - return new GUITestNuke(player.inventory, (TileEntityTestNuke) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_gadget: { - if(entity instanceof TileEntityNukeGadget) { - return new GUINukeGadget(player.inventory, (TileEntityNukeGadget) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_boy: { - if(entity instanceof TileEntityNukeBoy) { - return new GUINukeBoy(player.inventory, (TileEntityNukeBoy) entity); - } - return null; - } - - case ModBlocks.guiID_centrifuge: { - if(entity instanceof TileEntityMachineCentrifuge) { - return new GUIMachineCentrifuge(player.inventory, (TileEntityMachineCentrifuge) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_man: { - if(entity instanceof TileEntityNukeMan) { - return new GUINukeMan(player.inventory, (TileEntityNukeMan) entity); - } - return null; - } - - case ModBlocks.guiID_uf6_tank: { - if(entity instanceof TileEntityMachineUF6Tank) { - return new GUIMachineUF6Tank(player.inventory, (TileEntityMachineUF6Tank) entity); - } - return null; - } - - case ModBlocks.guiID_puf6_tank: { - if(entity instanceof TileEntityMachinePuF6Tank) { - return new GUIMachinePuF6Tank(player.inventory, (TileEntityMachinePuF6Tank) entity); - } - return null; - } - - case ModBlocks.guiID_reactor_breeding: { - if(entity instanceof TileEntityMachineReactorBreeding) { - return new GUIMachineReactorBreeding(player.inventory, (TileEntityMachineReactorBreeding) entity); - } - return null; - } - - case ModBlocks.guiID_bomb_multi: { - if(entity instanceof TileEntityBombMulti) { - return new GUIBombMulti(player.inventory, (TileEntityBombMulti) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_mike: { - if(entity instanceof TileEntityNukeMike) { - return new GUINukeMike(player.inventory, (TileEntityNukeMike) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_tsar: { - if(entity instanceof TileEntityNukeTsar) { - return new GUINukeTsar(player.inventory, (TileEntityNukeTsar) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_furnace: { - if(entity instanceof TileEntityNukeFurnace) { - return new GUINukeFurnace(player.inventory, (TileEntityNukeFurnace) entity); - } - return null; - } - - case ModBlocks.guiID_rtg_furnace: { - if(entity instanceof TileEntityRtgFurnace) { - return new GUIRtgFurnace(player.inventory, (TileEntityRtgFurnace) entity); - } - return null; - } - - case ModBlocks.guiID_electric_furnace: { - if(entity instanceof TileEntityMachineElectricFurnace) { - return new GUIMachineElectricFurnace(player.inventory, (TileEntityMachineElectricFurnace) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_fleija: { - if(entity instanceof TileEntityNukeFleija) { - return new GUINukeFleija(player.inventory, (TileEntityNukeFleija) entity); - } - return null; - } - - case ModBlocks.guiID_machine_deuterium: { - if(entity instanceof TileEntityMachineDeuterium) { - return new GUIMachineDeuterium(player.inventory, (TileEntityMachineDeuterium) entity); - } - return null; - } - - case ModBlocks.guiID_machine_battery: { - if(entity instanceof TileEntityMachineBattery) { - return new GUIMachineBattery(player.inventory, (TileEntityMachineBattery) entity); - } - return null; - } - - case ModBlocks.guiID_machine_coal: { - if(entity instanceof TileEntityMachineCoal) { - return new GUIMachineCoal(player.inventory, (TileEntityMachineCoal) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_prototype: { - if(entity instanceof TileEntityNukePrototype) { - return new GUINukePrototype(player.inventory, (TileEntityNukePrototype) entity); - } - return null; - } - - case ModBlocks.guiID_launch_pad: { - if(entity instanceof TileEntityLaunchPad) { - return new GUILaunchPadTier1(player.inventory, (TileEntityLaunchPad) entity); - } - return null; - } - - case ModBlocks.guiID_reactor_multiblock: { - if(entity instanceof TileEntityMachineReactorLarge) { - return new GUIReactorMultiblock(player.inventory, (TileEntityMachineReactorLarge) entity); - } - return null; - } - - case ModBlocks.guiID_schrabidium_transmutator: { - if(entity instanceof TileEntityMachineSchrabidiumTransmutator) { - return new GUIMachineSchrabidiumTransmutator(player.inventory, (TileEntityMachineSchrabidiumTransmutator) entity); - } - return null; - } - - case ModBlocks.guiID_machine_diesel: { - if(entity instanceof TileEntityMachineDiesel) { - return new GUIMachineDiesel(player.inventory, (TileEntityMachineDiesel) entity); - } - return null; - } - - case ModBlocks.guiID_watz_multiblock: { - if(entity instanceof TileEntityWatzCore) { - return new GUIWatzCore(player.inventory, (TileEntityWatzCore) entity); - } - return null; - } - - case ModBlocks.guiID_machine_shredder: { - if(entity instanceof TileEntityMachineShredder) { - return new GUIMachineShredder(player.inventory, (TileEntityMachineShredder) entity); - } - return null; - } - - case ModBlocks.guiID_combine_factory: { - if(entity instanceof TileEntityMachineCMBFactory) { - return new GUIMachineCMBFactory(player.inventory, (TileEntityMachineCMBFactory) entity); - } - return null; - } - - case ModBlocks.guiID_fwatz_multiblock: { - if(entity instanceof TileEntityFWatzCore) { - return new GUIFWatzCore(player.inventory, (TileEntityFWatzCore) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_custom: { - if(entity instanceof TileEntityNukeCustom) { - return new GUINukeCustom(player.inventory, (TileEntityNukeCustom) entity); - } - return null; - } - - case ModBlocks.guiID_machine_industrial_generator: { - if(entity instanceof TileEntityMachineIGenerator) { - return new GUIIGenerator(player.inventory, (TileEntityMachineIGenerator) entity); - } - return null; - } - - case ModBlocks.guiID_machine_rtg: { - if(entity instanceof TileEntityMachineRTG) { - return new GUIMachineRTG(player.inventory, (TileEntityMachineRTG) entity); - } - return null; - } - - case ModBlocks.guiID_machine_cyclotron: { - if(entity instanceof TileEntityMachineCyclotron) { - return new GUIMachineCyclotron(player.inventory, (TileEntityMachineCyclotron) entity); - } - return null; - } - - case ModBlocks.guiID_machine_well: { - if(entity instanceof TileEntityOilDrillBase) { - return new GUIMachineOilWell(player.inventory, (TileEntityOilDrillBase) entity); - } - return null; - } - - case ModBlocks.guiID_machine_refinery: { - if(entity instanceof TileEntityMachineRefinery) { - return new GUIMachineRefinery(player.inventory, (TileEntityMachineRefinery) entity); - } - return null; - } - - case ModBlocks.guiID_machine_flare: { - if(entity instanceof TileEntityMachineGasFlare) { - return new GUIMachineGasFlare(player.inventory, (TileEntityMachineGasFlare) entity); - } - return null; - } - - case ModBlocks.guiID_machine_drill: { - if(entity instanceof TileEntityMachineMiningDrill) { - return new GUIMachineMiningDrill(player.inventory, (TileEntityMachineMiningDrill) entity); - } - return null; - } - - case ModBlocks.guiID_machine_assembler: { - if(entity instanceof TileEntityMachineAssembler) { - return new GUIMachineAssembler(player.inventory, (TileEntityMachineAssembler) entity); - } - return null; - } - - case ModBlocks.guiID_machine_chemplant: { - if(entity instanceof TileEntityMachineChemplant) { - return new GUIMachineChemplant(player.inventory, (TileEntityMachineChemplant) entity); - } - return null; - } - - case ModBlocks.guiID_machine_turbofan: { - if(entity instanceof TileEntityMachineTurbofan) { - return new GUIMachineTurbofan(player.inventory, (TileEntityMachineTurbofan) entity); - } - return null; - } - - case ModBlocks.guiID_machine_press: { - if(entity instanceof TileEntityMachinePress) { - return new GUIMachinePress(player.inventory, (TileEntityMachinePress) entity); - } - return null; - } - - case ModBlocks.guiID_ams_limiter: { - if(entity instanceof TileEntityAMSLimiter) { - return new GUIAMSLimiter(player.inventory, (TileEntityAMSLimiter) entity); - } - return null; - } - - case ModBlocks.guiID_ams_emitter: { - if(entity instanceof TileEntityAMSEmitter) { - return new GUIAMSEmitter(player.inventory, (TileEntityAMSEmitter) entity); - } - return null; - } - - case ModBlocks.guiID_ams_base: { - if(entity instanceof TileEntityAMSBase) { - return new GUIAMSBase(player.inventory, (TileEntityAMSBase) entity); - } - return null; - } - - case ModBlocks.guiID_siren: { - if(entity instanceof TileEntityMachineSiren) { - return new GUIMachineSiren(player.inventory, (TileEntityMachineSiren) entity); - } - return null; - } - - case ModBlocks.guiID_radgen: { - if(entity instanceof TileEntityMachineRadGen) { - return new GUIMachineRadGen(player.inventory, (TileEntityMachineRadGen) entity); - } - return null; - } - - case ModBlocks.guiID_radar: { - if(entity instanceof TileEntityMachineRadar) { - return new GUIMachineRadar(player.inventory, (TileEntityMachineRadar) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_solinium: { - if(entity instanceof TileEntityNukeSolinium) { - return new GUINukeSolinium(player.inventory, (TileEntityNukeSolinium) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_n2: { - if(entity instanceof TileEntityNukeN2) { - return new GUINukeN2(player.inventory, (TileEntityNukeN2) entity); - } - return null; - } - - case ModBlocks.guiID_machine_selenium: { - if(entity instanceof TileEntityMachineSeleniumEngine) { - return new GUIMachineSelenium(player.inventory, (TileEntityMachineSeleniumEngine) entity); - } - return null; - } - - case ModBlocks.guiID_satlinker: { - if(entity instanceof TileEntityMachineSatLinker) { - return new GUIMachineSatLinker(player.inventory, (TileEntityMachineSatLinker) entity); - } - return null; - } - - case ModBlocks.guiID_reactor_research: { - if(entity instanceof TileEntityReactorResearch) { - return new GUIReactorResearch(player.inventory, (TileEntityReactorResearch) entity); - } - return null; - } - - case ModBlocks.guiID_keyforge: { - if(entity instanceof TileEntityMachineKeyForge) { - return new GUIMachineKeyForge(player.inventory, (TileEntityMachineKeyForge) entity); - } - return null; - } - - case ModBlocks.guiID_gascent: { - if(entity instanceof TileEntityMachineGasCent) { - return new GUIMachineGasCent(player.inventory, (TileEntityMachineGasCent) entity); - } - return null; - } - - case ModBlocks.guiID_machine_boiler: { - if(entity instanceof TileEntityMachineBoiler) { - return new GUIMachineBoiler(player.inventory, (TileEntityMachineBoiler) entity); - } - return null; - } - - case ModBlocks.guiID_machine_boiler_electric: { - if(entity instanceof TileEntityMachineBoilerElectric) { - return new GUIMachineBoilerElectric(player.inventory, (TileEntityMachineBoilerElectric) entity); - } - return null; - } - - case ModBlocks.guiID_machine_turbine: { - if(entity instanceof TileEntityMachineTurbine) { - return new GUIMachineTurbine(player.inventory, (TileEntityMachineTurbine) entity); - } - return null; - } - - case ModBlocks.guiID_forcefield: { - if(entity instanceof TileEntityForceField) { - return new GUIForceField(player.inventory, (TileEntityForceField) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_n45: { - if(entity instanceof TileEntityNukeN45) { - return new GUINukeN45(player.inventory, (TileEntityNukeN45) entity); - } - return null; - } - - case ModBlocks.guiID_machine_controller: { - if(entity instanceof TileEntityReactorControl) { - return new GUIReactorControl(player.inventory, (TileEntityReactorControl) entity); - } - return null; - } - - case ModBlocks.guiID_waste_drum: { - if(entity instanceof TileEntityWasteDrum) { - return new GUIWasteDrum(player.inventory, (TileEntityWasteDrum) entity); - } - return null; - } - - case ModBlocks.guiID_dock: { - if(entity instanceof TileEntityMachineSatDock) { - return new GUISatDock(player.inventory, (TileEntityMachineSatDock) entity); - } - return null; - } - - case ModBlocks.guiID_machine_epress: { - if(entity instanceof TileEntityMachineEPress) { - return new GUIMachineEPress(player.inventory, (TileEntityMachineEPress) entity); - } - return null; - } - - case ModBlocks.guiID_machine_arc: { - if(entity instanceof TileEntityMachineArcFurnace) { - return new GUIMachineArcFurnace(player.inventory, (TileEntityMachineArcFurnace) entity); - } - return null; - } - - case ModBlocks.guiID_missile_assembly: { - if(entity instanceof TileEntityMachineMissileAssembly) { - return new GUIMachineMissileAssembly(player.inventory, (TileEntityMachineMissileAssembly) entity); - } - return null; - } - - case ModBlocks.guiID_compact_launcher: { - if(entity instanceof TileEntityCompactLauncher) { - return new GUIMachineCompactLauncher(player.inventory, (TileEntityCompactLauncher) entity); - } - return null; - } - - case ModBlocks.guiID_launch_table: { - if(entity instanceof TileEntityLaunchTable) { - return new GUIMachineLaunchTable(player.inventory, (TileEntityLaunchTable) entity); - } - return null; - } - - case ModBlocks.guiID_soyuz_launcher: { - if(entity instanceof TileEntitySoyuzLauncher) { - return new GUISoyuzLauncher(player.inventory, (TileEntitySoyuzLauncher) entity); - } - return null; - } - - case ModBlocks.guiID_dfc_emitter: { - if(entity instanceof TileEntityCoreEmitter) { - return new GUICoreEmitter(player.inventory, (TileEntityCoreEmitter) entity); - } - return null; - } - - case ModBlocks.guiID_dfc_receiver: { - if(entity instanceof TileEntityCoreReceiver) { - return new GUICoreReceiver(player.inventory, (TileEntityCoreReceiver) entity); - } - return null; - } - - case ModBlocks.guiID_dfc_injector: { - if(entity instanceof TileEntityCoreInjector) { - return new GUICoreInjector(player.inventory, (TileEntityCoreInjector) entity); - } - return null; - } - - case ModBlocks.guiID_dfc_core: { - if(entity instanceof TileEntityCore) { - return new GUICore(player.inventory, (TileEntityCore) entity); - } - return null; - } - - case ModBlocks.guiID_dfc_stabilizer: { - if(entity instanceof TileEntityCoreStabilizer) { - return new GUICoreStabilizer(player.inventory, (TileEntityCoreStabilizer) entity); - } - return null; - } - - case ModBlocks.guiID_barrel: { - if(entity instanceof TileEntityBarrel) { - return new GUIBarrel(player.inventory, (TileEntityBarrel) entity); - } - return null; - } - - case ModBlocks.guiID_capsule: { - if(entity instanceof TileEntitySoyuzCapsule) { - return new GUISoyuzCapsule(player.inventory, (TileEntitySoyuzCapsule) entity); - } - return null; - } - - case ModBlocks.guiID_crystallizer: { - if(entity instanceof TileEntityMachineCrystallizer) { - return new GUICrystallizer(player.inventory, (TileEntityMachineCrystallizer) entity); - } - return null; - } - - case ModBlocks.guiID_mining_laser: { - if(entity instanceof TileEntityMachineMiningLaser) { - return new GUIMiningLaser(player.inventory, (TileEntityMachineMiningLaser) entity); - } - return null; - } - - case ModBlocks.guiID_nuke_fstbmb: { - if(entity instanceof TileEntityNukeBalefire) { - return new GUINukeFstbmb(player.inventory, (TileEntityNukeBalefire) entity); - } - return null; - } - - case ModBlocks.guiID_microwave: { - if(entity instanceof TileEntityMicrowave) { - return new GUIMicrowave(player.inventory, (TileEntityMicrowave) entity); - } - return null; - } - - case ModBlocks.guiID_iter: { - if(entity instanceof TileEntityITER) { - return new GUIITER(player.inventory, (TileEntityITER) entity); - } - return null; - } - - case ModBlocks.guiID_plasma_heater: { - if(entity instanceof TileEntityMachinePlasmaHeater) { - return new GUIPlasmaHeater(player.inventory, (TileEntityMachinePlasmaHeater) entity); - } - return null; - } - - case ModBlocks.guiID_machine_large_turbine: { - if(entity instanceof TileEntityMachineLargeTurbine) { - return new GUIMachineLargeTurbine(player.inventory, (TileEntityMachineLargeTurbine) entity); - } - return null; - } - - case ModBlocks.guiID_hadron: { - if(entity instanceof TileEntityHadron) { - return new GUIHadron(player.inventory, (TileEntityHadron) entity); - } - return null; - } - - case ModBlocks.guiID_armor_table: { - if(world.getBlock(x, y, z) == ModBlocks.machine_armor_table) { - return new GUIArmorTable(player.inventory); - } - return null; - } - - case ModBlocks.guiID_chekhov: { - if(entity instanceof TileEntityTurretChekhov) { - return new GUITurretChekhov(player.inventory, (TileEntityTurretChekhov) entity); - } - return null; - } - - case ModBlocks.guiID_friendly: { - if(entity instanceof TileEntityTurretFriendly) { - return new GUITurretFriendly(player.inventory, (TileEntityTurretFriendly) entity); - } - return null; - } - - case ModBlocks.guiID_jeremy: { - if(entity instanceof TileEntityTurretJeremy) { - return new GUITurretJeremy(player.inventory, (TileEntityTurretJeremy) entity); - } - return null; - } - - case ModBlocks.guiID_tauon: { - if(entity instanceof TileEntityTurretTauon) { - return new GUITurretTauon(player.inventory, (TileEntityTurretTauon) entity); - } - return null; - } - - case ModBlocks.guiID_richard: { - if(entity instanceof TileEntityTurretRichard) { - return new GUITurretRichard(player.inventory, (TileEntityTurretRichard) entity); - } - return null; - } - - case ModBlocks.guiID_howard: { - if(entity instanceof TileEntityTurretHoward) { - return new GUITurretHoward(player.inventory, (TileEntityTurretHoward) entity); - } - return null; - } - - case ModBlocks.guiID_silex: { - if(entity instanceof TileEntitySILEX) { - return new GUISILEX(player.inventory, (TileEntitySILEX) entity); - } - return null; - } - - case ModBlocks.guiID_fel: { - if(entity instanceof TileEntityFEL) { - return new GUIFEL(player.inventory, (TileEntityFEL) entity); - } - return null; - } - - case ModBlocks.guiID_rbmk_rod: { - if(entity instanceof TileEntityRBMKRod) { - return new GUIRBMKRod(player.inventory, (TileEntityRBMKRod) entity); - } - return null; - } - - case ModBlocks.guiID_rbmk_boiler: { - if(entity instanceof TileEntityRBMKBoiler) { - return new GUIRBMKBoiler(player.inventory, (TileEntityRBMKBoiler) entity); - } - return null; - } - - case ModBlocks.guiID_rbmk_control: { - if(entity instanceof TileEntityRBMKControlManual) { - return new GUIRBMKControl(player.inventory, (TileEntityRBMKControlManual) entity); - } - return null; - } - - case ModBlocks.guiID_rbmk_control_auto: { - if(entity instanceof TileEntityRBMKControlAuto) { - return new GUIRBMKControlAuto(player.inventory, (TileEntityRBMKControlAuto) entity); - } - return null; - } - - case ModBlocks.guiID_rbmk_console: { - if(entity instanceof TileEntityRBMKConsole) { - return new GUIRBMKConsole(player.inventory, (TileEntityRBMKConsole) entity); - } - return null; - } - - case ModBlocks.guiID_storage_drum: { - if(entity instanceof TileEntityStorageDrum) { - return new GUIStorageDrum(player.inventory, (TileEntityStorageDrum) entity); - } - return null; - } - - case ModBlocks.guiID_rbmk_outgasser: { - if(entity instanceof TileEntityRBMKOutgasser) { - return new GUIRBMKOutgasser(player.inventory, (TileEntityRBMKOutgasser) entity); - } - return null; - } - - case ModBlocks.guiID_maxwell: { - if(entity instanceof TileEntityTurretMaxwell) { - return new GUITurretMaxwell(player.inventory, (TileEntityTurretMaxwell) entity); - } - return null; - } - - case ModBlocks.guiID_anvil: { - if(world.getBlock(x, y, z) instanceof NTMAnvil) { - return new GUIAnvil(player.inventory, ((NTMAnvil)world.getBlock(x, y, z)).tier); - } - return null; - } - - case ModBlocks.guiID_fritz: { - if(entity instanceof TileEntityTurretFritz) { - return new GUITurretFritz(player.inventory, (TileEntityTurretFritz) entity); - } - return null; - } - - case ModBlocks.guiID_rbmk_storage: { - if(entity instanceof TileEntityRBMKStorage) { - return new GUIRBMKStorage(player.inventory, (TileEntityRBMKStorage) entity); - } - return null; + if(entity != null && entity instanceof IGUIProvider) { + return ((IGUIProvider) entity).provideGUI(ID, player, world, x, y, z); } - case ModBlocks.guiID_rtg_difurnace: { - if (entity instanceof TileEntityDiFurnaceRTG) { - return new GUIMachineDiFurnaceRTG(player.inventory, (TileEntityDiFurnaceRTG) entity); - } - return null; - } + //stop doing this unless you absolutely have to ;3 - case ModBlocks.guiID_reactor_zirnox: { - if(entity instanceof TileEntityReactorZirnox) { - return new GUIReactorZirnox(player.inventory, (TileEntityReactorZirnox) entity); - } - return null; - } - } - // ITEM GUIS - - switch(ID) { - case ModItems.guiID_item_folder: - return new GUIScreenTemplateFolder(player); - case ModItems.guiID_item_designator: - return new GUIScreenDesignator(player); - case ModItems.guiID_item_sat_interface: - return new GUIScreenSatInterface(player); - case ModItems.guiID_item_sat_coord: - return new GUIScreenSatCoord(player); - case ModItems.guiID_item_bobmazon: - if(BobmazonOfferFactory.getOffers(player.getHeldItem()) != null) - return new GUIScreenBobmazon(player, BobmazonOfferFactory.getOffers(player.getHeldItem())); - case ModItems.guiID_item_book: - return new GUIBook(player.inventory); - case ModItems.guiID_item_guide: - return new GUIScreenGuide(player); - case ModItems.guiID_item_bobble: - return new GUIScreenBobble((TileEntityBobble) world.getTileEntity(x, y, z)); - case ModItems.guiID_item_holo_image: - return new GUIScreenHolotape(); - case ModItems.guiID_item_fluid: - return new GUIScreenFluid(player); - - case ModItems.guiID_cart_crate: return new GUICrateSteel(player.inventory, (EntityMinecartCrate) player.worldObj.getEntityByID(x)); - case ModItems.guiID_cart_destroyer: return new GUICartDestroyer(player.inventory, (EntityMinecartDestroyer) player.worldObj.getEntityByID(x)); - } + //stop doing this, period >:3 return null; } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index a3df02132..8041c286e 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -2633,22 +2633,7 @@ public class ModItems { public static Item digamma_know; public static Item digamma_kauai_moho; public static Item digamma_up_on_top; - - public static final int guiID_item_folder = 1099; - public static final int guiID_item_fluid = 1100; - public static final int guiID_item_designator = 10100; - public static final int guiID_item_sat_interface = 10101; - public static final int guiID_item_bobmazon = 10103; - public static final int guiID_item_sat_coord = 10104; - public static final int guiID_item_book = 10105; - public static final int guiID_item_guide = 10106; - public static final int guiID_item_bobble = 10107; - public static final int guiID_item_holo_image = 10108; - public static final int guiID_item_snowglobe = 10109; - - public static final int guiID_cart_crate = 2000; - public static final int guiID_cart_destroyer = 2001; - + public static Item mysteryshovel; public static Item memory; diff --git a/src/main/java/com/hbm/items/machine/ItemFluidIDMulti.java b/src/main/java/com/hbm/items/machine/ItemFluidIDMulti.java index cd0664be4..dce26eb02 100644 --- a/src/main/java/com/hbm/items/machine/ItemFluidIDMulti.java +++ b/src/main/java/com/hbm/items/machine/ItemFluidIDMulti.java @@ -6,21 +6,25 @@ import java.util.Objects; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; +import com.hbm.inventory.gui.GUIScreenFluid; import com.hbm.items.IItemControlReceiver; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.PlayerInformPacket; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.conductor.TileEntityFluidDuctSimple; import com.hbm.util.ChatBuilder; import com.hbm.util.I18nUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -29,7 +33,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class ItemFluidIDMulti extends Item implements IItemFluidIdentifier, IItemControlReceiver { +public class ItemFluidIDMulti extends Item implements IItemFluidIdentifier, IItemControlReceiver, IGUIProvider { IIcon overlayIcon; @@ -46,7 +50,7 @@ public class ItemFluidIDMulti extends Item implements IItemFluidIdentifier, IIte } if(world.isRemote && player.isSneaking()) { - player.openGui(MainRegistry.instance, ModItems.guiID_item_fluid, world, 0, 0, 0); + player.openGui(MainRegistry.instance, 0, world, 0, 0, 0); } return stack; @@ -219,4 +223,15 @@ public class ItemFluidIDMulti extends Item implements IItemFluidIdentifier, IIte } } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIScreenFluid(player); + } } diff --git a/src/main/java/com/hbm/items/machine/ItemTemplateFolder.java b/src/main/java/com/hbm/items/machine/ItemTemplateFolder.java index cd5f76f5b..f25fd20df 100644 --- a/src/main/java/com/hbm/items/machine/ItemTemplateFolder.java +++ b/src/main/java/com/hbm/items/machine/ItemTemplateFolder.java @@ -2,22 +2,28 @@ package com.hbm.items.machine; import java.util.List; +import com.hbm.inventory.gui.GUIScreenTemplateFolder; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; import com.hbm.util.I18nUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -public class ItemTemplateFolder extends Item { +public class ItemTemplateFolder extends Item implements IGUIProvider { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if(world.isRemote) - player.openGui(MainRegistry.instance, ModItems.guiID_item_folder, world, 0, 0, 0); + player.openGui(MainRegistry.instance, 0, world, 0, 0, 0); return stack; } @@ -30,4 +36,15 @@ public class ItemTemplateFolder extends Item { list.add(line); } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIScreenTemplateFolder(player); + } } diff --git a/src/main/java/com/hbm/items/special/ItemBook.java b/src/main/java/com/hbm/items/special/ItemBook.java index 71c1114e2..2a3818926 100644 --- a/src/main/java/com/hbm/items/special/ItemBook.java +++ b/src/main/java/com/hbm/items/special/ItemBook.java @@ -2,15 +2,22 @@ package com.hbm.items.special; import java.util.List; +import com.hbm.inventory.container.ContainerBook; +import com.hbm.inventory.gui.GUIBook; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -public class ItemBook extends Item { +public class ItemBook extends Item implements IGUIProvider { @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { @@ -22,11 +29,22 @@ public class ItemBook extends Item { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if(!world.isRemote) - player.openGui(MainRegistry.instance, ModItems.guiID_item_book, world, 0, 0, 0); + player.openGui(MainRegistry.instance, 0, world, 0, 0, 0); return stack; } + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerBook(player.inventory); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIBook(player.inventory); + } + /*@Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { diff --git a/src/main/java/com/hbm/items/special/ItemHolotapeImage.java b/src/main/java/com/hbm/items/special/ItemHolotapeImage.java index 82fe2e127..46f89d797 100644 --- a/src/main/java/com/hbm/items/special/ItemHolotapeImage.java +++ b/src/main/java/com/hbm/items/special/ItemHolotapeImage.java @@ -2,16 +2,22 @@ package com.hbm.items.special; import java.util.List; +import com.hbm.inventory.gui.GUIScreenHolotape; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; import com.hbm.util.EnumUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -public class ItemHolotapeImage extends ItemHoloTape { +public class ItemHolotapeImage extends ItemHoloTape implements IGUIProvider { public ItemHolotapeImage() { super(EnumHoloImage.class, false, false); @@ -19,7 +25,7 @@ public class ItemHolotapeImage extends ItemHoloTape { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - if(world.isRemote) player.openGui(MainRegistry.instance, ModItems.guiID_item_holo_image, world, 0, 0, 0); + if(world.isRemote) player.openGui(MainRegistry.instance, 0, world, 0, 0, 0); return stack; } @@ -68,4 +74,15 @@ public class ItemHolotapeImage extends ItemHoloTape { return this.text; } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIScreenHolotape(); + } } diff --git a/src/main/java/com/hbm/items/tool/ItemCatalog.java b/src/main/java/com/hbm/items/tool/ItemCatalog.java index 5a476092e..db2eeb413 100644 --- a/src/main/java/com/hbm/items/tool/ItemCatalog.java +++ b/src/main/java/com/hbm/items/tool/ItemCatalog.java @@ -2,21 +2,28 @@ package com.hbm.items.tool; import java.util.List; +import com.hbm.handler.BobmazonOfferFactory; +import com.hbm.inventory.gui.GUIScreenBobmazon; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -public class ItemCatalog extends Item { +public class ItemCatalog extends Item implements IGUIProvider { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if(world.isRemote) - player.openGui(MainRegistry.instance, ModItems.guiID_item_bobmazon, world, 0, 0, 0); + player.openGui(MainRegistry.instance, 0, world, 0, 0, 0); return stack; } @@ -29,4 +36,18 @@ public class ItemCatalog extends Item { list.add("No tricks this time, i promise."); } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + if(BobmazonOfferFactory.getOffers(player.getHeldItem()) != null) + return new GUIScreenBobmazon(player, BobmazonOfferFactory.getOffers(player.getHeldItem())); + + return null; + } } diff --git a/src/main/java/com/hbm/items/tool/ItemDesingatorManual.java b/src/main/java/com/hbm/items/tool/ItemDesingatorManual.java index 11820cdd9..2d37857db 100644 --- a/src/main/java/com/hbm/items/tool/ItemDesingatorManual.java +++ b/src/main/java/com/hbm/items/tool/ItemDesingatorManual.java @@ -2,23 +2,29 @@ package com.hbm.items.tool; import java.util.List; +import com.hbm.inventory.gui.GUIScreenDesignator; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; import api.hbm.item.IDesignatorItem; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Vec3; import net.minecraft.world.World; -public class ItemDesingatorManual extends Item implements IDesignatorItem { +public class ItemDesingatorManual extends Item implements IDesignatorItem, IGUIProvider { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if(world.isRemote) - player.openGui(MainRegistry.instance, ModItems.guiID_item_designator, world, 0, 0, 0); + player.openGui(MainRegistry.instance, 0, world, 0, 0, 0); return stack; } @@ -43,4 +49,15 @@ public class ItemDesingatorManual extends Item implements IDesignatorItem { public Vec3 getCoords(World world, ItemStack stack, int x, int y, int z) { return Vec3.createVectorHelper(stack.stackTagCompound.getInteger("xCoord"), 0, stack.stackTagCompound.getInteger("zCoord")); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIScreenDesignator(player); + } } diff --git a/src/main/java/com/hbm/items/tool/ItemGuideBook.java b/src/main/java/com/hbm/items/tool/ItemGuideBook.java index 754c2d5c8..161116879 100644 --- a/src/main/java/com/hbm/items/tool/ItemGuideBook.java +++ b/src/main/java/com/hbm/items/tool/ItemGuideBook.java @@ -3,21 +3,25 @@ package com.hbm.items.tool; import java.util.ArrayList; import java.util.List; +import com.hbm.inventory.gui.GUIScreenGuide; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; import com.hbm.util.I18nUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -public class ItemGuideBook extends Item { +public class ItemGuideBook extends Item implements IGUIProvider { public ItemGuideBook() { this.setMaxStackSize(1); @@ -28,7 +32,7 @@ public class ItemGuideBook extends Item { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if(world.isRemote) - player.openGui(MainRegistry.instance, ModItems.guiID_item_guide, world, 0, 0, 0); + player.openGui(MainRegistry.instance, 0, world, 0, 0, 0); return stack; } @@ -313,4 +317,15 @@ public class ItemGuideBook extends Item { this.sizeY = sizeY; } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIScreenGuide(player); + } } diff --git a/src/main/java/com/hbm/items/tool/ItemSatInterface.java b/src/main/java/com/hbm/items/tool/ItemSatInterface.java index 43b79733f..f67a8cc9e 100644 --- a/src/main/java/com/hbm/items/tool/ItemSatInterface.java +++ b/src/main/java/com/hbm/items/tool/ItemSatInterface.java @@ -1,5 +1,7 @@ package com.hbm.items.tool; +import com.hbm.inventory.gui.GUIScreenSatCoord; +import com.hbm.inventory.gui.GUIScreenSatInterface; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemSatChip; import com.hbm.main.MainRegistry; @@ -7,16 +9,19 @@ import com.hbm.packet.PacketDispatcher; import com.hbm.packet.SatPanelPacket; import com.hbm.saveddata.SatelliteSavedData; import com.hbm.saveddata.satellites.Satellite; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -public class ItemSatInterface extends ItemSatChip { +public class ItemSatInterface extends ItemSatChip implements IGUIProvider { @SideOnly(Side.CLIENT) public static Satellite currentSat; @@ -26,10 +31,7 @@ public class ItemSatInterface extends ItemSatChip { if(world.isRemote) { - if(this == ModItems.sat_interface) - player.openGui(MainRegistry.instance, ModItems.guiID_item_sat_interface, world, 0, 0, 0); - if(this == ModItems.sat_coord) - player.openGui(MainRegistry.instance, ModItems.guiID_item_sat_coord, world, 0, 0, 0); + player.openGui(MainRegistry.instance, 0, world, 0, 0, 0); } return stack; @@ -50,4 +52,20 @@ public class ItemSatInterface extends ItemSatChip { } } + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + if(this == ModItems.sat_interface) + return new GUIScreenSatInterface(player); + else if(this == ModItems.sat_coord) + return new GUIScreenSatCoord(player); + + return null; + } + } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityBombMulti.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityBombMulti.java index 7728952aa..0eeae10f0 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityBombMulti.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityBombMulti.java @@ -1,12 +1,17 @@ package com.hbm.tileentity.bomb; +import com.hbm.inventory.container.ContainerBombMulti; +import com.hbm.inventory.gui.GUIBombMulti; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -14,8 +19,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityBombMulti extends TileEntity implements ISidedInventory { +public class TileEntityBombMulti extends TileEntity implements ISidedInventory, IGUIProvider { public ItemStack slots[]; private String customName; @@ -276,4 +282,15 @@ public class TileEntityBombMulti extends TileEntity implements ISidedInventory { { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerBombMulti(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIBombMulti(player.inventory, this); + } } \ No newline at end of file diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java index 86ecc275d..24a739811 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java @@ -6,9 +6,11 @@ import com.hbm.entity.missile.EntityMissileCustom; import com.hbm.handler.MissileStruct; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; +import com.hbm.inventory.container.ContainerCompactLauncher; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIMachineCompactLauncher; import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemCustomMissile; import com.hbm.items.weapon.ItemMissile; @@ -20,6 +22,7 @@ import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEMissileMultipartPacket; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import com.hbm.util.fauxpointtwelve.DirPos; @@ -29,8 +32,10 @@ import api.hbm.item.IDesignatorItem; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -39,9 +44,10 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityCompactLauncher extends TileEntityLoadedBase implements ISidedInventory, IFluidContainer, IFluidAcceptor, IEnergyUser, IFluidStandardReceiver { +public class TileEntityCompactLauncher extends TileEntityLoadedBase implements ISidedInventory, IFluidContainer, IFluidAcceptor, IEnergyUser, IFluidStandardReceiver, IGUIProvider { private ItemStack slots[]; @@ -617,4 +623,15 @@ public class TileEntityCompactLauncher extends TileEntityLoadedBase implements I public FluidTank[] getReceivingTanks() { return tanks; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerCompactLauncher(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineCompactLauncher(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPad.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPad.java index 46319ad09..9e7084101 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPad.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPad.java @@ -1,37 +1,40 @@ package com.hbm.tileentity.bomb; +import com.hbm.blocks.ModBlocks; +import com.hbm.blocks.bomb.LaunchPad; +import com.hbm.inventory.container.ContainerLaunchPadTier1; +import com.hbm.inventory.gui.GUILaunchPadTier1; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEMissilePacket; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energy.IEnergyUser; +import api.hbm.item.IDesignatorItem; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import li.cil.oc.api.machine.Arguments; +import li.cil.oc.api.machine.Callback; +import li.cil.oc.api.machine.Context; +import li.cil.oc.api.network.SimpleComponent; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.Optional; -import li.cil.oc.api.machine.Arguments; -import li.cil.oc.api.machine.Callback; -import li.cil.oc.api.machine.Context; -import li.cil.oc.api.network.SimpleComponent; - -import api.hbm.item.IDesignatorItem; -import net.minecraft.block.Block; -import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.bomb.LaunchPad; - @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) -public class TileEntityLaunchPad extends TileEntityLoadedBase implements ISidedInventory, IEnergyUser, SimpleComponent { +public class TileEntityLaunchPad extends TileEntityLoadedBase implements ISidedInventory, IEnergyUser, SimpleComponent, IGUIProvider { public ItemStack slots[]; @@ -320,4 +323,15 @@ public class TileEntityLaunchPad extends TileEntityLoadedBase implements ISidedI ((LaunchPad) ModBlocks.launch_pad).explode(worldObj, xCoord, yCoord, zCoord); return new Object[] {}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerLaunchPadTier1(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUILaunchPadTier1(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java index 6d7594261..71a0d7289 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java @@ -6,9 +6,11 @@ import com.hbm.entity.missile.EntityMissileCustom; import com.hbm.handler.MissileStruct; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; +import com.hbm.inventory.container.ContainerLaunchTable; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIMachineLaunchTable; import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemCustomMissile; import com.hbm.items.weapon.ItemMissile; @@ -20,6 +22,7 @@ import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEMissileMultipartPacket; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energy.IEnergyUser; @@ -28,16 +31,19 @@ import api.hbm.item.IDesignatorItem; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityLaunchTable extends TileEntityLoadedBase implements ISidedInventory, IEnergyUser, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver { +public class TileEntityLaunchTable extends TileEntityLoadedBase implements ISidedInventory, IEnergyUser, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver, IGUIProvider { private ItemStack slots[]; @@ -590,4 +596,15 @@ public class TileEntityLaunchTable extends TileEntityLoadedBase implements ISide public FluidTank[] getReceivingTanks() { return tanks; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerLaunchTable(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineLaunchTable(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java index c92caa00e..6403145d4 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java @@ -2,17 +2,24 @@ package com.hbm.tileentity.bomb; import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.entity.logic.EntityBalefire; +import com.hbm.inventory.container.ContainerNukeFstbmb; +import com.hbm.inventory.gui.GUINukeFstbmb; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.energy.IBatteryItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityNukeBalefire extends TileEntityMachineBase { +public class TileEntityNukeBalefire extends TileEntityMachineBase implements IGUIProvider { public boolean loaded; public boolean started; @@ -171,4 +178,15 @@ public class TileEntityNukeBalefire extends TileEntityMachineBase { { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerNukeFstbmb(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUINukeFstbmb(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBoy.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBoy.java index 8aaad9be4..39a3f4e54 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBoy.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBoy.java @@ -1,19 +1,25 @@ package com.hbm.tileentity.bomb; +import com.hbm.inventory.container.ContainerNukeBoy; +import com.hbm.inventory.gui.GUINukeBoy; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityNukeBoy extends TileEntity implements ISidedInventory { +public class TileEntityNukeBoy extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; private String customName; @@ -199,4 +205,15 @@ public class TileEntityNukeBoy extends TileEntity implements ISidedInventory { { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerNukeBoy(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUINukeBoy(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeCustom.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeCustom.java index 715afd4f7..e52ad8dc1 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeCustom.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeCustom.java @@ -5,21 +5,27 @@ import java.util.HashMap; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.bomb.NukeCustom; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.inventory.container.ContainerNukeCustom; +import com.hbm.inventory.gui.GUINukeCustom; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityNukeCustom extends TileEntity implements ISidedInventory { +public class TileEntityNukeCustom extends TileEntity implements ISidedInventory, IGUIProvider { public ItemStack slots[]; private String customName; @@ -432,4 +438,15 @@ public class TileEntityNukeCustom extends TileEntity implements ISidedInventory this.entry = entry; } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerNukeCustom(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUINukeCustom(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeFleija.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeFleija.java index ad4bbd823..9209af0e7 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeFleija.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeFleija.java @@ -1,19 +1,25 @@ package com.hbm.tileentity.bomb; +import com.hbm.inventory.container.ContainerNukeFleija; +import com.hbm.inventory.gui.GUINukeFleija; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityNukeFleija extends TileEntity implements ISidedInventory { +public class TileEntityNukeFleija extends TileEntity implements ISidedInventory, IGUIProvider { public ItemStack slots[]; private String customName; @@ -209,4 +215,15 @@ public class TileEntityNukeFleija extends TileEntity implements ISidedInventory return 65536.0D; } + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerNukeFleija(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUINukeFleija(player.inventory, this); + } + } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeGadget.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeGadget.java index 4777be282..31e4b24f8 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeGadget.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeGadget.java @@ -1,19 +1,25 @@ package com.hbm.tileentity.bomb; +import com.hbm.inventory.container.ContainerNukeGadget; +import com.hbm.inventory.gui.GUINukeGadget; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityNukeGadget extends TileEntity implements ISidedInventory { +public class TileEntityNukeGadget extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; private String customName; @@ -261,4 +267,15 @@ public class TileEntityNukeGadget extends TileEntity implements ISidedInventory { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerNukeGadget(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUINukeGadget(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMan.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMan.java index 0ddb12425..0c208e92e 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMan.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMan.java @@ -1,19 +1,25 @@ package com.hbm.tileentity.bomb; +import com.hbm.inventory.container.ContainerNukeMan; +import com.hbm.inventory.gui.GUINukeMan; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityNukeMan extends TileEntity implements ISidedInventory { +public class TileEntityNukeMan extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; private String customName; @@ -235,4 +241,15 @@ public class TileEntityNukeMan extends TileEntity implements ISidedInventory { { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerNukeMan(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUINukeMan(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMike.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMike.java index 1a4d07f0f..eef1a2dc2 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMike.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeMike.java @@ -1,19 +1,25 @@ package com.hbm.tileentity.bomb; +import com.hbm.inventory.container.ContainerNukeMike; +import com.hbm.inventory.gui.GUINukeMike; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityNukeMike extends TileEntity implements ISidedInventory { +public class TileEntityNukeMike extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; private String customName; @@ -221,4 +227,15 @@ public class TileEntityNukeMike extends TileEntity implements ISidedInventory { return 65536.0D; } + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerNukeMike(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUINukeMike(player.inventory, this); + } + } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeN2.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeN2.java index 4139108d1..382858356 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeN2.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeN2.java @@ -1,19 +1,25 @@ package com.hbm.tileentity.bomb; +import com.hbm.inventory.container.ContainerNukeN2; +import com.hbm.inventory.gui.GUINukeN2; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityNukeN2 extends TileEntity implements ISidedInventory { +public class TileEntityNukeN2 extends TileEntity implements ISidedInventory, IGUIProvider { public ItemStack slots[]; private String customName; @@ -209,4 +215,15 @@ public class TileEntityNukeN2 extends TileEntity implements ISidedInventory { { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerNukeN2(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUINukeN2(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeN45.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeN45.java index 29c457588..19fe5165d 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeN45.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeN45.java @@ -7,17 +7,22 @@ import com.hbm.config.BombConfig; import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.entity.logic.EntityNukeExplosionMK5; import com.hbm.explosion.ExplosionLarge; +import com.hbm.inventory.container.ContainerNukeN45; +import com.hbm.inventory.gui.GUINukeN45; import com.hbm.items.ModItems; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -28,7 +33,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -public class TileEntityNukeN45 extends TileEntity implements ISidedInventory { +public class TileEntityNukeN45 extends TileEntity implements ISidedInventory, IGUIProvider { public ItemStack slots[]; private String customName; @@ -312,4 +317,15 @@ public class TileEntityNukeN45 extends TileEntity implements ISidedInventory { return 65536.0D; } + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerNukeN45(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUINukeN45(player.inventory, this); + } + } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukePrototype.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukePrototype.java index f974d943e..3fcc4d460 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukePrototype.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukePrototype.java @@ -1,20 +1,26 @@ package com.hbm.tileentity.bomb; +import com.hbm.inventory.container.ContainerNukePrototype; +import com.hbm.inventory.gui.GUINukePrototype; import com.hbm.items.ModItems; -import com.hbm.items.machine.ItemBreedingRod.*; +import com.hbm.items.machine.ItemBreedingRod.BreedingRodType; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityNukePrototype extends TileEntity implements ISidedInventory { +public class TileEntityNukePrototype extends TileEntity implements ISidedInventory, IGUIProvider { public ItemStack slots[]; private String customName; @@ -212,4 +218,15 @@ public class TileEntityNukePrototype extends TileEntity implements ISidedInvento { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerNukePrototype(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUINukePrototype(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeSolinium.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeSolinium.java index c3606d4a9..5535654c7 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeSolinium.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeSolinium.java @@ -1,19 +1,25 @@ package com.hbm.tileentity.bomb; +import com.hbm.inventory.container.ContainerNukeSolinium; +import com.hbm.inventory.gui.GUINukeSolinium; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityNukeSolinium extends TileEntity implements ISidedInventory { +public class TileEntityNukeSolinium extends TileEntity implements ISidedInventory, IGUIProvider { public ItemStack slots[]; private String customName; @@ -206,4 +212,15 @@ public class TileEntityNukeSolinium extends TileEntity implements ISidedInventor { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerNukeSolinium(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUINukeSolinium(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeTsar.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeTsar.java index 1df071c68..a604b9271 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeTsar.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeTsar.java @@ -1,19 +1,25 @@ package com.hbm.tileentity.bomb; +import com.hbm.inventory.container.ContainerNukeTsar; +import com.hbm.inventory.gui.GUINukeTsar; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityNukeTsar extends TileEntity implements ISidedInventory { +public class TileEntityNukeTsar extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; private String customName; @@ -218,4 +224,15 @@ public class TileEntityNukeTsar extends TileEntity implements ISidedInventory { { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerNukeTsar(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUINukeTsar(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityTestNuke.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityTestNuke.java index 8aa17c9ad..d18dbcc55 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityTestNuke.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityTestNuke.java @@ -1,18 +1,26 @@ package com.hbm.tileentity.bomb; +import com.hbm.inventory.container.ContainerTestNuke; +import com.hbm.inventory.gui.GUITestNuke; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -public class TileEntityTestNuke extends TileEntity implements ISidedInventory { +public class TileEntityTestNuke extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; private String customName; @@ -200,4 +208,15 @@ public class TileEntityTestNuke extends TileEntity implements ISidedInventory { slots[i] = null; } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerTestNuke(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUITestNuke(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java index 3eaa5b1c9..9be891eba 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java @@ -4,9 +4,11 @@ import java.util.Random; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; +import com.hbm.inventory.container.ContainerAMSBase; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIAMSBase; import com.hbm.items.ISatChip; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemCatalyst; @@ -16,19 +18,23 @@ import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; import com.hbm.saveddata.SatelliteSavedData; import com.hbm.saveddata.satellites.SatelliteResonator; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IFluidContainer, IFluidAcceptor { +public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IFluidContainer, IFluidAcceptor, IGUIProvider { private ItemStack slots[]; @@ -528,4 +534,15 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerAMSBase(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIAMSBase(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java index 7a3107643..3595c47ea 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java @@ -1,33 +1,37 @@ package com.hbm.tileentity.machine; -import java.util.ArrayList; -import java.util.List; import java.util.Random; import com.hbm.explosion.ExplosionLarge; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; +import com.hbm.inventory.container.ContainerAMSEmitter; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIAMSEmitter; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, IFluidContainer, IFluidAcceptor { +public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, IFluidContainer, IFluidAcceptor, IGUIProvider { private ItemStack slots[]; @@ -407,4 +411,15 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerAMSEmitter(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIAMSEmitter(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java index 817398684..2d8163463 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java @@ -5,28 +5,34 @@ import java.util.Random; import com.hbm.explosion.ExplosionLarge; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; +import com.hbm.inventory.container.ContainerAMSLimiter; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIAMSLimiter; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.util.ParticleUtil; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, IFluidContainer, IFluidAcceptor { +public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, IFluidContainer, IFluidAcceptor, IGUIProvider { private ItemStack slots[]; @@ -415,4 +421,15 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerAMSLimiter(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIAMSLimiter(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java index 5dc289f22..24817d855 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java @@ -9,25 +9,31 @@ import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.logic.EntityNukeExplosionMK3.ATEntry; import com.hbm.handler.radiation.ChunkRadiationManager; +import com.hbm.inventory.container.ContainerCore; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUICore; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemCatalyst; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.ArmorUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; +import net.minecraft.world.World; -public class TileEntityCore extends TileEntityMachineBase { +public class TileEntityCore extends TileEntityMachineBase implements IGUIProvider { public int field; public int heat; @@ -337,4 +343,15 @@ public class TileEntityCore extends TileEntityMachineBase { public double getMaxRenderDistanceSquared() { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerCore(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUICore(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java index 48ea0c69e..cf5fe55b6 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java @@ -3,20 +3,31 @@ package com.hbm.tileentity.machine; import java.util.List; import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.inventory.container.ContainerCoreEmitter; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUICoreEmitter; import com.hbm.lib.ModDamageSource; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.block.ILaserable; import api.hbm.energy.IEnergyUser; import api.hbm.fluid.IFluidStandardReceiver; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import li.cil.oc.api.machine.Arguments; +import li.cil.oc.api.machine.Callback; +import li.cil.oc.api.machine.Context; +import li.cil.oc.api.network.SimpleComponent; import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -24,14 +35,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.Optional; -import li.cil.oc.api.machine.Arguments; -import li.cil.oc.api.machine.Callback; -import li.cil.oc.api.machine.Context; -import li.cil.oc.api.network.SimpleComponent; - @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) -public class TileEntityCoreEmitter extends TileEntityMachineBase implements IEnergyUser, IFluidAcceptor, ILaserable, IFluidStandardReceiver, SimpleComponent { +public class TileEntityCoreEmitter extends TileEntityMachineBase implements IEnergyUser, IFluidAcceptor, ILaserable, IFluidStandardReceiver, SimpleComponent, IGUIProvider { public long power; public static final long maxPower = 1000000000L; @@ -355,4 +360,15 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements IEne watts = newOutput; return new Object[] {}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerCoreEmitter(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUICoreEmitter(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java index 94f8f7540..9625a40c3 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java @@ -1,28 +1,34 @@ package com.hbm.tileentity.machine; import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.inventory.container.ContainerCoreInjector; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUICoreInjector; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.fluid.IFluidStandardReceiver; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.init.Blocks; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; import li.cil.oc.api.machine.Context; import li.cil.oc.api.network.SimpleComponent; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.inventory.Container; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) -public class TileEntityCoreInjector extends TileEntityMachineBase implements IFluidAcceptor, IFluidStandardReceiver, SimpleComponent { +public class TileEntityCoreInjector extends TileEntityMachineBase implements IFluidAcceptor, IFluidStandardReceiver, SimpleComponent, IGUIProvider { public FluidTank[] tanks; public static final int range = 15; @@ -205,4 +211,15 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl public Object[] getSecondFuel(Context context, Arguments args) { return new Object[] {tanks[1].getFill()}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerCoreInjector(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUICoreInjector(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java index b7822bf84..f08b9264c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java @@ -1,34 +1,36 @@ package com.hbm.tileentity.machine; -import java.util.ArrayList; -import java.util.List; - import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.inventory.container.ContainerCoreReceiver; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUICoreReceiver; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.block.ILaserable; import api.hbm.energy.IEnergyGenerator; import api.hbm.fluid.IFluidStandardReceiver; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import li.cil.oc.api.machine.Arguments; +import li.cil.oc.api.machine.Callback; +import li.cil.oc.api.machine.Context; +import li.cil.oc.api.network.SimpleComponent; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.Optional; -import li.cil.oc.api.machine.Arguments; -import li.cil.oc.api.machine.Callback; -import li.cil.oc.api.machine.Context; -import li.cil.oc.api.network.SimpleComponent; - @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) -public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEnergyGenerator, IFluidAcceptor, ILaserable, IFluidStandardReceiver, SimpleComponent { +public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEnergyGenerator, IFluidAcceptor, ILaserable, IFluidStandardReceiver, SimpleComponent, IGUIProvider { public long power; public long joules; @@ -206,4 +208,15 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEn public Object[] getCryogel(Context context, Arguments args) { return new Object[] {tank.getFill()}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerCoreReceiver(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUICoreReceiver(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreStabilizer.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreStabilizer.java index 2d708dc83..2d9bfdf2b 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreStabilizer.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreStabilizer.java @@ -1,27 +1,33 @@ package com.hbm.tileentity.machine; +import com.hbm.inventory.container.ContainerCoreStabilizer; +import com.hbm.inventory.gui.GUICoreStabilizer; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemLens; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.energy.IEnergyUser; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.init.Blocks; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; import li.cil.oc.api.machine.Context; import li.cil.oc.api.network.SimpleComponent; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.inventory.Container; +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; +import net.minecraftforge.common.util.ForgeDirection; @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) -public class TileEntityCoreStabilizer extends TileEntityMachineBase implements IEnergyUser, SimpleComponent { +public class TileEntityCoreStabilizer extends TileEntityMachineBase implements IEnergyUser, SimpleComponent, IGUIProvider { public long power; public static final long maxPower = 2500000000L; @@ -206,4 +212,15 @@ public class TileEntityCoreStabilizer extends TileEntityMachineBase implements I watts = newOutput; return new Object[] {}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerCoreStabilizer(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUICoreStabilizer(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnace.java b/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnace.java index 5ef34d833..c395da87f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnace.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnace.java @@ -1,23 +1,31 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.machine.MachineDiFurnace; +import com.hbm.inventory.container.ContainerDiFurnace; +import com.hbm.inventory.gui.GUIDiFurnace; import com.hbm.inventory.recipes.BlastFurnaceRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemRTGPellet; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.INBTPacketReceiver; import com.hbm.util.RTGUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -public class TileEntityDiFurnace extends TileEntity implements ISidedInventory, INBTPacketReceiver { +public class TileEntityDiFurnace extends TileEntity implements ISidedInventory, INBTPacketReceiver, IGUIProvider { private ItemStack slots[]; @@ -359,4 +367,15 @@ public class TileEntityDiFurnace extends TileEntity implements ISidedInventory, this.sideUpper = modes[1]; this.sideLower = modes[2]; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerDiFurnace(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIDiFurnace(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnaceRTG.java b/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnaceRTG.java index 7a1a8dbe4..7b5d5e485 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnaceRTG.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnaceRTG.java @@ -1,14 +1,23 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.machine.MachineDiFurnaceRTG; +import com.hbm.inventory.container.ContainerMachineDiFurnaceRTG; +import com.hbm.inventory.gui.GUIMachineDiFurnaceRTG; import com.hbm.inventory.recipes.BlastFurnaceRecipes; -import com.hbm.util.RTGUtil; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; +import com.hbm.util.RTGUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; -public class TileEntityDiFurnaceRTG extends TileEntityMachineBase +public class TileEntityDiFurnaceRTG extends TileEntityMachineBase implements IGUIProvider { public short progress; private short processSpeed = 0; @@ -173,4 +182,15 @@ public class TileEntityDiFurnaceRTG extends TileEntityMachineBase return "container.diFurnaceRTG"; } + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineDiFurnaceRTG(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineDiFurnaceRTG(player.inventory, this); + } + } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java b/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java index ed9135251..c2eb12a1a 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java @@ -6,21 +6,27 @@ import java.util.List; import com.hbm.blocks.BlockDummyable; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.container.ContainerElectrolyser; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIElectrolyser; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.energy.IEnergyUser; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.init.Blocks; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityElectrolyser extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IFluidAcceptor /* TODO: new fluid API */ { +public class TileEntityElectrolyser extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IFluidAcceptor, IGUIProvider /* TODO: new fluid API */ { public long power; public static final long maxPower = 20000000; @@ -184,4 +190,15 @@ public class TileEntityElectrolyser extends TileEntityMachineBase implements IEn this.power = power; } + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerElectrolyser(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIElectrolyser(player.inventory, this); + } + } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityFEL.java b/src/main/java/com/hbm/tileentity/machine/TileEntityFEL.java index f3f564292..7c7bb67fc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityFEL.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityFEL.java @@ -7,22 +7,28 @@ import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.MachineSILEX; import com.hbm.interfaces.Spaghetti; +import com.hbm.inventory.container.ContainerFEL; +import com.hbm.inventory.gui.GUIFEL; import com.hbm.items.machine.ItemFELCrystal; import com.hbm.items.machine.ItemFELCrystal.EnumWavelengths; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.ContaminationUtil; import com.hbm.util.ContaminationUtil.ContaminationType; import com.hbm.util.ContaminationUtil.HazardType; import api.hbm.energy.IEnergyUser; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -30,9 +36,10 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityFEL extends TileEntityMachineBase implements IEnergyUser { +public class TileEntityFEL extends TileEntityMachineBase implements IEnergyUser, IGUIProvider { public long power; public static final long maxPower = 20000000; @@ -246,4 +253,15 @@ public class TileEntityFEL extends TileEntityMachineBase implements IEnergyUser public long getMaxPower() { return maxPower; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerFEL(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIFEL(player.inventory, this); + } } \ No newline at end of file diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java b/src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java index b764fd23a..ff3e3a1ee 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java @@ -5,13 +5,16 @@ import java.util.Random; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IReactor; +import com.hbm.inventory.container.ContainerFWatzCore; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIFWatzCore; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import com.hbm.util.fauxpointtwelve.DirPos; import com.hbm.world.machine.FWatz; @@ -19,7 +22,11 @@ import com.hbm.world.machine.FWatz; import api.hbm.energy.IEnergyGenerator; import api.hbm.fluid.IFluidStandardReceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -27,7 +34,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; -public class TileEntityFWatzCore extends TileEntityLoadedBase implements ISidedInventory, IReactor, IEnergyGenerator, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver { +public class TileEntityFWatzCore extends TileEntityLoadedBase implements ISidedInventory, IReactor, IEnergyGenerator, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver, IGUIProvider { public long power; public final static long maxPower = 10000000000L; @@ -445,4 +452,13 @@ public class TileEntityFWatzCore extends TileEntityLoadedBase implements ISidedI public FluidTank[] getAllTanks() { return tanks; } + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerFWatzCore(player.inventory, this); + } + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIFWatzCore(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityForceField.java b/src/main/java/com/hbm/tileentity/machine/TileEntityForceField.java index 1208805c8..6259e1eb1 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityForceField.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityForceField.java @@ -3,10 +3,13 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; +import com.hbm.inventory.container.ContainerForceField; +import com.hbm.inventory.gui.GUIForceField; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEFFPacket; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energy.IBatteryItem; @@ -14,8 +17,10 @@ import api.hbm.energy.IEnergyUser; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -23,9 +28,10 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityForceField extends TileEntityLoadedBase implements ISidedInventory, IEnergyUser { +public class TileEntityForceField extends TileEntityLoadedBase implements ISidedInventory, IEnergyUser, IGUIProvider { private ItemStack slots[]; @@ -475,4 +481,15 @@ public class TileEntityForceField extends TileEntityLoadedBase implements ISided { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerForceField(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIForceField(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java b/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java index 2bfb33a88..215f5d766 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java @@ -8,27 +8,35 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.BlockHadronCoil; import com.hbm.blocks.machine.BlockHadronPlating; +import com.hbm.inventory.container.ContainerHadron; +import com.hbm.inventory.gui.GUIHadron; import com.hbm.inventory.recipes.HadronRecipes; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.tileentity.machine.TileEntityHadronDiode.DiodeConfig; import api.hbm.energy.IEnergyUser; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +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.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityHadron extends TileEntityMachineBase implements IEnergyUser { +public class TileEntityHadron extends TileEntityMachineBase implements IEnergyUser, IGUIProvider { public long power; public static final long maxPower = 10000000; @@ -739,4 +747,15 @@ public class TileEntityHadron extends TileEntityMachineBase implements IEnergyUs this.showCoord = showCoord; } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerHadron(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIHadron(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java index be63af569..fe47229b1 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java @@ -10,18 +10,21 @@ import com.hbm.explosion.ExplosionNT; import com.hbm.explosion.ExplosionNT.ExAttrib; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.container.ContainerITER; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIITER; import com.hbm.inventory.recipes.BreederRecipes; -import com.hbm.inventory.recipes.FusionRecipes; import com.hbm.inventory.recipes.BreederRecipes.BreederRecipe; +import com.hbm.inventory.recipes.FusionRecipes; import com.hbm.items.ModItems; import com.hbm.items.special.ItemFusionShield; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.fauxpointtwelve.DirPos; @@ -30,14 +33,17 @@ import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser, IFluidAcceptor, IFluidSource, IFluidStandardTransceiver /* TODO: finish fluid API impl */ { +public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser, IFluidAcceptor, IFluidSource, IFluidStandardTransceiver, IGUIProvider /* TODO: finish fluid API impl */ { public long power; public static final long maxPower = 10000000; @@ -581,4 +587,15 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser public boolean canConnect(FluidType type, ForgeDirection dir) { return dir == ForgeDirection.UP || dir == ForgeDirection.DOWN; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerITER(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIITER(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnace.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnace.java index bacd632ff..195b5f43e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnace.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnace.java @@ -2,23 +2,31 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.MachineArcFurnace; +import com.hbm.inventory.container.ContainerMachineArcFurnace; +import com.hbm.inventory.gui.GUIMachineArcFurnace; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energy.IEnergyUser; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.world.World; -public class TileEntityMachineArcFurnace extends TileEntityLoadedBase implements ISidedInventory, IEnergyUser { +public class TileEntityMachineArcFurnace extends TileEntityLoadedBase implements ISidedInventory, IEnergyUser, IGUIProvider { private ItemStack slots[]; @@ -381,4 +389,15 @@ public class TileEntityMachineArcFurnace extends TileEntityLoadedBase implements public long getMaxPower() { return maxPower; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineArcFurnace(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineArcFurnace(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssembler.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssembler.java index cdf98fe69..826bf7ffd 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssembler.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssembler.java @@ -7,14 +7,17 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.inventory.RecipesCommon.ComparableStack; -import com.hbm.inventory.recipes.AssemblerRecipes; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.container.ContainerMachineAssembler; +import com.hbm.inventory.gui.GUIMachineAssembler; +import com.hbm.inventory.recipes.AssemblerRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemAssemblyTemplate; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import com.hbm.sound.AudioWrapper; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.tileentity.machine.storage.TileEntityCrateBase; import com.hbm.tileentity.machine.storage.TileEntityCrateIron; @@ -24,6 +27,9 @@ import api.hbm.energy.IBatteryItem; import api.hbm.energy.IEnergyUser; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -31,8 +37,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.tileentity.TileEntityHopper; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityMachineAssembler extends TileEntityMachineBase implements IEnergyUser { +public class TileEntityMachineAssembler extends TileEntityMachineBase implements IEnergyUser, IGUIProvider { public long power; public static final long maxPower = 100000; @@ -605,4 +612,15 @@ public class TileEntityMachineAssembler extends TileEntityMachineBase implements return count; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineAssembler(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineAssembler(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemblerBase.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemblerBase.java index bdb552293..06189167c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemblerBase.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemblerBase.java @@ -7,6 +7,7 @@ import com.hbm.inventory.recipes.AssemblerRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemAssemblyTemplate; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.InventoryUtil; @@ -17,7 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; -public abstract class TileEntityMachineAssemblerBase extends TileEntityMachineBase implements IEnergyUser { +public abstract class TileEntityMachineAssemblerBase extends TileEntityMachineBase implements IEnergyUser, IGUIProvider { public long power; public int[] progress; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemfac.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemfac.java index 07c2abda0..9dd81d815 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemfac.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemfac.java @@ -8,9 +8,11 @@ import com.hbm.blocks.BlockDummyable; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.container.ContainerAssemfac; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIAssemfac; import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; @@ -19,10 +21,14 @@ import com.hbm.util.fauxpointtwelve.DirPos; import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; public class TileEntityMachineAssemfac extends TileEntityMachineAssemblerBase implements IFluidStandardTransceiver, IFluidAcceptor, IFluidSource { @@ -463,4 +469,15 @@ public class TileEntityMachineAssemfac extends TileEntityMachineAssemblerBase im public FluidTank[] getAllTanks() { return new FluidTank[] { water, steam }; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerAssemfac(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIAssemfac(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutocrafter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutocrafter.java index 7f5ffa1ac..6b964c3a0 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutocrafter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutocrafter.java @@ -3,11 +3,17 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; +import com.hbm.inventory.container.ContainerAutocrafter; +import com.hbm.inventory.gui.GUIAutocrafter; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.ItemStackUtil; import api.hbm.energy.IEnergyUser; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; @@ -16,8 +22,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; -public class TileEntityMachineAutocrafter extends TileEntityMachineBase implements IEnergyUser { +public class TileEntityMachineAutocrafter extends TileEntityMachineBase implements IEnergyUser, IGUIProvider { public static final String MODE_EXACT = "exact"; public static final String MODE_WILDCARD = "wildcard"; @@ -422,4 +429,15 @@ public class TileEntityMachineAutocrafter extends TileEntityMachineBase implemen nbt.setInteger("rec", this.recipeIndex); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerAutocrafter(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIAutocrafter(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java index 5bf7373ee..50571797e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java @@ -8,26 +8,33 @@ import com.hbm.blocks.machine.MachineBoiler; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.container.ContainerMachineBoiler; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIMachineBoiler; import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.Library; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.world.World; -public class TileEntityMachineBoiler extends TileEntityLoadedBase implements ISidedInventory, IFluidContainer, IFluidAcceptor, IFluidSource, IFluidStandardTransceiver { +public class TileEntityMachineBoiler extends TileEntityLoadedBase implements ISidedInventory, IFluidContainer, IFluidAcceptor, IFluidSource, IFluidStandardTransceiver, IGUIProvider { private ItemStack slots[]; @@ -406,4 +413,15 @@ public class TileEntityMachineBoiler extends TileEntityLoadedBase implements ISi public FluidTank[] getAllTanks() { return tanks; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineBoiler(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineBoiler(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java index 4a7323227..38616f5a8 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java @@ -8,30 +8,37 @@ import com.hbm.blocks.machine.MachineBoiler; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.container.ContainerMachineBoilerElectric; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIMachineBoilerElectric; import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energy.IBatteryItem; import api.hbm.energy.IEnergyUser; import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineBoilerElectric extends TileEntityLoadedBase implements ISidedInventory, IFluidContainer, IFluidAcceptor, IFluidSource, IEnergyUser, IFluidStandardTransceiver { +public class TileEntityMachineBoilerElectric extends TileEntityLoadedBase implements ISidedInventory, IFluidContainer, IFluidAcceptor, IFluidSource, IEnergyUser, IFluidStandardTransceiver, IGUIProvider { private ItemStack slots[]; @@ -428,4 +435,15 @@ public class TileEntityMachineBoilerElectric extends TileEntityLoadedBase implem public FluidTank[] getAllTanks() { return tanks; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineBoilerElectric(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineBoilerElectric(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java index c855fe8cd..a9d44bfd7 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java @@ -2,27 +2,35 @@ package com.hbm.tileentity.machine; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; +import com.hbm.inventory.container.ContainerMachineCMBFactory; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIMachineCMBFactory; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energy.IBatteryItem; import api.hbm.energy.IEnergyUser; import api.hbm.fluid.IFluidStandardReceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.world.World; -public class TileEntityMachineCMBFactory extends TileEntityLoadedBase implements ISidedInventory, IEnergyUser, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver { +public class TileEntityMachineCMBFactory extends TileEntityLoadedBase implements ISidedInventory, IEnergyUser, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver, IGUIProvider { private ItemStack slots[]; @@ -363,4 +371,15 @@ public class TileEntityMachineCMBFactory extends TileEntityLoadedBase implements public FluidTank[] getAllTanks() { return new FluidTank[] { tank }; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineCMBFactory(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineCMBFactory(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java index 606d992f1..b35ad6c76 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java @@ -1,22 +1,29 @@ package com.hbm.tileentity.machine; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.container.ContainerCentrifuge; +import com.hbm.inventory.gui.GUIMachineCentrifuge; import com.hbm.inventory.recipes.CentrifugeRecipes; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import com.hbm.sound.AudioWrapper; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.energy.IEnergyUser; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; +import net.minecraft.world.World; -public class TileEntityMachineCentrifuge extends TileEntityMachineBase implements IEnergyUser { +public class TileEntityMachineCentrifuge extends TileEntityMachineBase implements IEnergyUser, IGUIProvider { public int progress; public long power; @@ -287,4 +294,15 @@ public class TileEntityMachineCentrifuge extends TileEntityMachineBase implement public long getMaxPower() { return maxPower; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerCentrifuge(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineCentrifuge(player.inventory, this); + } } \ No newline at end of file diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemfac.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemfac.java index ca7974031..69215202a 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemfac.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemfac.java @@ -8,9 +8,11 @@ import java.util.Random; import com.hbm.blocks.BlockDummyable; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.container.ContainerChemfac; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIChemfac; import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; @@ -18,10 +20,14 @@ import com.hbm.util.fauxpointtwelve.DirPos; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; public class TileEntityMachineChemfac extends TileEntityMachineChemplantBase { @@ -390,4 +396,15 @@ public class TileEntityMachineChemfac extends TileEntityMachineChemplantBase { public double getMaxRenderDistanceSquared() { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerChemfac(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIChemfac(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java index 12a37e670..a1b29e28e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java @@ -8,9 +8,11 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.container.ContainerMachineChemplant; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIMachineChemplant; import com.hbm.inventory.recipes.ChemplantRecipes; import com.hbm.inventory.recipes.ChemplantRecipes.ChemRecipe; import com.hbm.items.ModItems; @@ -18,6 +20,7 @@ import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import com.hbm.sound.AudioWrapper; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.InventoryUtil; import com.hbm.util.fauxpointtwelve.DirPos; @@ -26,15 +29,19 @@ import api.hbm.energy.IEnergyUser; import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineChemplant extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IFluidAcceptor, IFluidStandardTransceiver { +public class TileEntityMachineChemplant extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IFluidAcceptor, IFluidStandardTransceiver, IGUIProvider { public long power; public static final long maxPower = 100000; @@ -620,4 +627,15 @@ public class TileEntityMachineChemplant extends TileEntityMachineBase implements public FluidTank[] getAllTanks() { return tanks; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineChemplant(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineChemplant(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplantBase.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplantBase.java index be3879c33..1a32bf626 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplantBase.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplantBase.java @@ -13,6 +13,7 @@ import com.hbm.inventory.recipes.ChemplantRecipes; import com.hbm.inventory.recipes.ChemplantRecipes.ChemRecipe; import com.hbm.items.ModItems; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.InventoryUtil; @@ -33,7 +34,7 @@ import net.minecraft.util.ChunkCoordinates; * Tanks follow the order R1(I1, I2, O1, O2), R2(I1, I2, O1, O2) ... * @author hbm */ -public abstract class TileEntityMachineChemplantBase extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IFluidAcceptor, IFluidUser { +public abstract class TileEntityMachineChemplantBase extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IFluidAcceptor, IFluidUser, IGUIProvider { public long power; public int[] progress; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java index e3c70e654..3abf74d1f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java @@ -1,14 +1,5 @@ package com.hbm.tileentity.machine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraftforge.common.util.ForgeDirection; - import java.io.IOException; import com.google.gson.JsonObject; @@ -17,23 +8,39 @@ import com.hbm.blocks.machine.MachineCoal; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidContainerRegistry; +import com.hbm.inventory.container.ContainerMachineCoal; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIMachineCoal; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; import com.hbm.tileentity.IConfigurableMachine; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energy.IBatteryItem; import api.hbm.energy.IEnergyGenerator; import api.hbm.fluid.IFluidStandardReceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineCoal extends TileEntityLoadedBase implements ISidedInventory, IEnergyGenerator, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver, IConfigurableMachine { +public class TileEntityMachineCoal extends TileEntityLoadedBase implements ISidedInventory, IEnergyGenerator, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver, IConfigurableMachine, IGUIProvider { private ItemStack slots[]; @@ -373,4 +380,15 @@ public class TileEntityMachineCoal extends TileEntityLoadedBase implements ISide writer.name("I:powerGen").value(genRate); writer.name("D:burnTimeMod").value(fuelMod); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineCoal(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineCoal(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java index 0b4ec923e..f2811240f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java @@ -1,14 +1,16 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.inventory.container.ContainerCrystallizer; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUICrystallizer; import com.hbm.inventory.recipes.CrystallizerRecipes; import com.hbm.inventory.recipes.CrystallizerRecipes.CrystallizerRecipe; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.fauxpointtwelve.DirPos; @@ -17,13 +19,17 @@ import api.hbm.energy.IEnergyUser; import api.hbm.fluid.IFluidStandardReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineCrystallizer extends TileEntityMachineBase implements IEnergyUser, IFluidStandardReceiver { +public class TileEntityMachineCrystallizer extends TileEntityMachineBase implements IEnergyUser, IFluidStandardReceiver, IGUIProvider { public long power; public static final long maxPower = 1000000; @@ -367,4 +373,15 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme public FluidTank[] getAllTanks() { return new FluidTank[] { tank }; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerCrystallizer(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUICrystallizer(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java index ee42bac61..05459da78 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java @@ -11,15 +11,18 @@ import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionThermo; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.container.ContainerMachineCyclotron; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIMachineCyclotron; import com.hbm.inventory.recipes.CyclotronRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.lib.Library; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.fauxpointtwelve.DirPos; @@ -28,12 +31,16 @@ import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityMachineCyclotron extends TileEntityMachineBase implements IFluidSource, IFluidAcceptor, IEnergyUser, IFluidStandardTransceiver { +public class TileEntityMachineCyclotron extends TileEntityMachineBase implements IFluidSource, IFluidAcceptor, IEnergyUser, IFluidStandardTransceiver, IGUIProvider { public long power; public static final long maxPower = 100000000; @@ -541,4 +548,15 @@ public class TileEntityMachineCyclotron extends TileEntityMachineBase implements public FluidTank[] getAllTanks() { return new FluidTank[] { amat, coolant }; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineCyclotron(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineCyclotron(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java index b6f70a09f..0a59d8262 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java @@ -1,17 +1,25 @@ package com.hbm.tileentity.machine; +import com.hbm.inventory.container.ContainerMachineDeuterium; +import com.hbm.inventory.gui.GUIMachineDeuterium; import com.hbm.items.ModItems; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -public class TileEntityMachineDeuterium extends TileEntity implements ISidedInventory { +public class TileEntityMachineDeuterium extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; @@ -296,4 +304,15 @@ public class TileEntityMachineDeuterium extends TileEntity implements ISidedInve } } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineDeuterium(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineDeuterium(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index d1dc5e237..b79e665dd 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -9,24 +9,33 @@ import com.google.gson.stream.JsonWriter; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidContainerRegistry; +import com.hbm.inventory.container.ContainerMachineDiesel; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.inventory.fluid.trait.FT_Combustible; import com.hbm.inventory.fluid.trait.FT_Combustible.FuelGrade; +import com.hbm.inventory.gui.GUIMachineDiesel; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.tileentity.IConfigurableMachine; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.energy.IBatteryItem; import api.hbm.energy.IEnergyGenerator; import api.hbm.fluid.IFluidStandardReceiver; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineDiesel extends TileEntityMachineBase implements IEnergyGenerator, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver, IConfigurableMachine { +public class TileEntityMachineDiesel extends TileEntityMachineBase implements IEnergyGenerator, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver, IConfigurableMachine, IGUIProvider { public long power; public int soundCycle = 0; @@ -288,4 +297,15 @@ public class TileEntityMachineDiesel extends TileEntityMachineBase implements IE writer.endArray().setIndent(" "); writer.name("B:shutUp").value(shutUp); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineDiesel(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineDiesel(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java index e6da469d4..99879af49 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java @@ -1,28 +1,33 @@ package com.hbm.tileentity.machine; +import com.hbm.inventory.container.ContainerMachineEPress; +import com.hbm.inventory.gui.GUIMachineEPress; import com.hbm.inventory.recipes.PressRecipes; import com.hbm.items.machine.ItemStamp; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEPressPacket; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energy.IEnergyUser; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineEPress extends TileEntityLoadedBase implements ISidedInventory, IEnergyUser { +public class TileEntityMachineEPress extends TileEntityLoadedBase implements ISidedInventory, IEnergyUser, IGUIProvider { private ItemStack slots[]; @@ -308,4 +313,15 @@ public class TileEntityMachineEPress extends TileEntityLoadedBase implements ISi public long getMaxPower() { return maxPower; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineEPress(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineEPress(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java index fe1a11bd4..3a51328b0 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java @@ -2,19 +2,28 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.machine.MachineElectricFurnace; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.container.ContainerElectricFurnace; +import com.hbm.inventory.gui.GUIMachineElectricFurnace; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.energy.IBatteryItem; import api.hbm.energy.IEnergyUser; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineElectricFurnace extends TileEntityMachineBase implements ISidedInventory, IEnergyUser { +public class TileEntityMachineElectricFurnace extends TileEntityMachineBase implements ISidedInventory, IEnergyUser, IGUIProvider { // HOLY FUCKING SHIT I SPENT 5 DAYS ON THIS SHITFUCK CLASS FILE // thanks Martin, vaer and Bob for the help @@ -243,4 +252,15 @@ public class TileEntityMachineElectricFurnace extends TileEntityMachineBase impl public long getMaxPower() { return maxPower; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerElectricFurnace(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineElectricFurnace(player.inventory, this); + } } \ No newline at end of file diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java index 260b28c52..ac797a691 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java @@ -4,16 +4,18 @@ import java.util.HashMap; import com.hbm.blocks.BlockDummyable; import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.inventory.container.ContainerMachineGasCent; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIMachineGasCent; import com.hbm.inventory.recipes.GasCentrifugeRecipes.PseudoFluidType; import com.hbm.items.ModItems; import com.hbm.items.machine.IItemFluidIdentifier; -import com.hbm.items.machine.ItemFluidIdentifier; import com.hbm.lib.Library; import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.InventoryUtil; import com.hbm.util.fauxpointtwelve.DirPos; @@ -23,14 +25,18 @@ import api.hbm.fluid.IFluidStandardReceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; //epic! -public class TileEntityMachineGasCent extends TileEntityMachineBase implements IEnergyUser, IFluidAcceptor, IFluidStandardReceiver { +public class TileEntityMachineGasCent extends TileEntityMachineBase implements IEnergyUser, IFluidAcceptor, IFluidStandardReceiver, IGUIProvider { public long power; public int progress; @@ -468,4 +474,15 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I * ---------------------------- */ } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineGasCent(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineGasCent(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java index e363cc63a..dd49bbf75 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java @@ -7,13 +7,16 @@ import com.google.gson.stream.JsonWriter; import com.hbm.blocks.BlockDummyable; import com.hbm.config.GeneralConfig; import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.inventory.container.ContainerIGenerator; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.inventory.fluid.trait.FT_Flammable; +import com.hbm.inventory.gui.GUIIGenerator; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.tileentity.IConfigurableMachine; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.RTGUtil; import com.hbm.util.fauxpointtwelve.DirPos; @@ -22,15 +25,19 @@ import api.hbm.energy.IEnergyGenerator; import api.hbm.fluid.IFluidStandardReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineIGenerator extends TileEntityMachineBase implements IFluidAcceptor, IEnergyGenerator, IFluidStandardReceiver, IConfigurableMachine { +public class TileEntityMachineIGenerator extends TileEntityMachineBase implements IFluidAcceptor, IEnergyGenerator, IFluidStandardReceiver, IConfigurableMachine, IGUIProvider { public long power; public int spin; @@ -370,4 +377,15 @@ public class TileEntityMachineIGenerator extends TileEntityMachineBase implement public FluidTank[] getAllTanks() { return tanks; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerIGenerator(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIIGenerator(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineKeyForge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineKeyForge.java index bc36ef189..67016d814 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineKeyForge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineKeyForge.java @@ -1,18 +1,25 @@ package com.hbm.tileentity.machine; -import com.hbm.items.ModItems; +import com.hbm.inventory.container.ContainerMachineKeyForge; +import com.hbm.inventory.gui.GUIMachineKeyForge; import com.hbm.items.ItemAmmoEnums.Ammo4Gauge; +import com.hbm.items.ModItems; import com.hbm.items.tool.ItemKeyPin; +import com.hbm.tileentity.IGUIProvider; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -public class TileEntityMachineKeyForge extends TileEntity implements ISidedInventory { +public class TileEntityMachineKeyForge extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; @@ -191,4 +198,15 @@ public class TileEntityMachineKeyForge extends TileEntity implements ISidedInven } } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineKeyForge(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineKeyForge(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java index ac1fb1502..4e43bfcb0 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java @@ -3,29 +3,36 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import api.hbm.fluid.IFluidStandardTransceiver; import com.hbm.blocks.BlockDummyable; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.container.ContainerMachineLargeTurbine; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.inventory.fluid.trait.FT_Coolable; import com.hbm.inventory.fluid.trait.FT_Coolable.CoolingType; +import com.hbm.inventory.gui.GUIMachineLargeTurbine; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.fauxpointtwelve.DirPos; import api.hbm.energy.IEnergyGenerator; +import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineLargeTurbine extends TileEntityMachineBase implements IFluidContainer, IFluidAcceptor, IFluidSource, IEnergyGenerator, IFluidStandardTransceiver { +public class TileEntityMachineLargeTurbine extends TileEntityMachineBase implements IFluidContainer, IFluidAcceptor, IFluidSource, IEnergyGenerator, IFluidStandardTransceiver, IGUIProvider { public long power; public static final long maxPower = 100000000; @@ -272,4 +279,15 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme public FluidTank[] getReceivingTanks() { return new FluidTank[] {tanks[0]}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineLargeTurbine(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineLargeTurbine(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java index 771e275f4..f34c79c98 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java @@ -2,6 +2,8 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.ModBlocks; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.container.ContainerMachineMiningDrill; +import com.hbm.inventory.gui.GUIMachineMiningDrill; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; @@ -9,6 +11,7 @@ import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEDrillPacket; import com.hbm.sound.SoundLoopMachine; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.block.IDrillInteraction; @@ -19,13 +22,17 @@ import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityMachineMiningDrill extends TileEntityMachineBase implements IEnergyUser, IMiningDrill { +public class TileEntityMachineMiningDrill extends TileEntityMachineBase implements IEnergyUser, IMiningDrill, IGUIProvider { public long power; public int warning; @@ -474,4 +481,15 @@ public class TileEntityMachineMiningDrill extends TileEntityMachineBase implemen public int getDrillRating() { return 50; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineMiningDrill(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineMiningDrill(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java index e7a48aa48..b8d708c5e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java @@ -9,9 +9,11 @@ import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.container.ContainerMiningLaser; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIMiningLaser; import com.hbm.inventory.recipes.CentrifugeRecipes; import com.hbm.inventory.recipes.CrystallizerRecipes; import com.hbm.inventory.recipes.CrystallizerRecipes.CrystallizerRecipe; @@ -20,6 +22,7 @@ import com.hbm.items.ModItems; import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.InventoryUtil; @@ -30,10 +33,13 @@ import api.hbm.fluid.IFluidStandardSender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -41,9 +47,10 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineMiningLaser extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IMiningDrill, IFluidStandardSender { +public class TileEntityMachineMiningLaser extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IMiningDrill, IFluidStandardSender, IGUIProvider { public long power; public int age = 0; @@ -694,4 +701,15 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen public FluidTank[] getAllTanks() { return new FluidTank[] { tank }; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMiningLaser(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMiningLaser(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMissileAssembly.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMissileAssembly.java index 3d5e06729..f47fc563f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMissileAssembly.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMissileAssembly.java @@ -1,25 +1,31 @@ package com.hbm.tileentity.machine; import com.hbm.handler.MissileStruct; +import com.hbm.inventory.container.ContainerMachineMissileAssembly; +import com.hbm.inventory.gui.GUIMachineMissileAssembly; import com.hbm.items.weapon.ItemCustomMissile; import com.hbm.items.weapon.ItemMissile; import com.hbm.items.weapon.ItemMissile.FuelType; import com.hbm.items.weapon.ItemMissile.PartType; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEMissileMultipartPacket; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityMachineMissileAssembly extends TileEntity implements ISidedInventory { +public class TileEntityMachineMissileAssembly extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; @@ -303,4 +309,15 @@ public class TileEntityMachineMissileAssembly extends TileEntity implements ISid { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineMissileAssembly(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineMissileAssembly(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java index bc8d7253f..0f91fdfb6 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java @@ -7,22 +7,29 @@ import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.MachineITER; import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.inventory.container.ContainerPlasmaHeater; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIPlasmaHeater; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.energy.IEnergyUser; import api.hbm.fluid.IFluidStandardReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase implements IFluidAcceptor, IEnergyUser, IFluidStandardReceiver { +public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase implements IFluidAcceptor, IEnergyUser, IFluidStandardReceiver, IGUIProvider { public long power; public static final long maxPower = 100000000; @@ -290,4 +297,15 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme public FluidTank[] getReceivingTanks() { return tanks; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerPlasmaHeater(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIPlasmaHeater(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java index 0929c2dc6..43c34db48 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java @@ -1,16 +1,20 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.ModBlocks; -import com.hbm.inventory.recipes.MachineRecipes; +import com.hbm.inventory.container.ContainerMachinePress; +import com.hbm.inventory.gui.GUIMachinePress; import com.hbm.inventory.recipes.PressRecipes; import com.hbm.items.machine.ItemStamp; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEPressPacket; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -18,9 +22,10 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachinePress extends TileEntity implements ISidedInventory { +public class TileEntityMachinePress extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; @@ -328,4 +333,15 @@ public class TileEntityMachinePress extends TileEntity implements ISidedInventor { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachinePress(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachinePress(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java index cbfe5b0a4..b770c4111 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRTG.java @@ -1,22 +1,30 @@ package com.hbm.tileentity.machine; import com.hbm.config.VersatileConfig; +import com.hbm.inventory.container.ContainerMachineRTG; +import com.hbm.inventory.gui.GUIMachineRTG; import com.hbm.items.machine.ItemRTGPellet; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import com.hbm.util.RTGUtil; import api.hbm.energy.IEnergyGenerator; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineRTG extends TileEntityLoadedBase implements ISidedInventory, IEnergyGenerator { +public class TileEntityMachineRTG extends TileEntityLoadedBase implements ISidedInventory, IEnergyGenerator, IGUIProvider { private ItemStack slots[]; @@ -232,4 +240,15 @@ public class TileEntityMachineRTG extends TileEntityLoadedBase implements ISided public void setPower(long i) { this.power = i; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineRTG(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineRTG(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadGen.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadGen.java index 0cf5628f5..6549a7e90 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadGen.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadGen.java @@ -4,23 +4,30 @@ import java.util.HashMap; import com.hbm.blocks.BlockDummyable; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.inventory.container.ContainerMachineRadGen; +import com.hbm.inventory.gui.GUIMachineRadGen; import com.hbm.items.ModItems; import com.hbm.items.special.ItemWasteLong; import com.hbm.items.special.ItemWasteShort; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.Tuple.Triplet; import api.hbm.energy.IEnergyGenerator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineRadGen extends TileEntityMachineBase implements IEnergyGenerator { +public class TileEntityMachineRadGen extends TileEntityMachineBase implements IEnergyGenerator, IGUIProvider { public int[] progress = new int[12]; public int[] maxProgress = new int[12]; @@ -268,4 +275,15 @@ public class TileEntityMachineRadGen extends TileEntityMachineBase implements IE public double getMaxRenderDistanceSquared() { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineRadGen(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineRadGen(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadar.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadar.java index 86c79472b..907a5be9d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadar.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadar.java @@ -6,7 +6,9 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.config.WeaponConfig; import com.hbm.extprop.HbmLivingProps; -import com.hbm.interfaces.Untested; +import com.hbm.inventory.container.ContainerMachineRadar; +import com.hbm.inventory.gui.GUIMachineRadar; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityTickingBase; import api.hbm.energy.IEnergyUser; @@ -14,14 +16,17 @@ import api.hbm.entity.IRadarDetectable; import api.hbm.entity.IRadarDetectable.RadarTargetType; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityMachineRadar extends TileEntityTickingBase implements IEnergyUser { +public class TileEntityMachineRadar extends TileEntityTickingBase implements IEnergyUser, IGUIProvider { public List entList = new ArrayList(); public List nearbyMissiles = new ArrayList(); @@ -279,4 +284,15 @@ public class TileEntityMachineRadar extends TileEntityTickingBase implements IEn { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineRadar(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineRadar(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java index 75471e696..8812d1714 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java @@ -3,34 +3,41 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import api.hbm.fluid.IFluidStandardTransceiver; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidStack; +import com.hbm.inventory.container.ContainerRadiolysis; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIRadiolysis; import com.hbm.inventory.recipes.RadiolysisRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemRTGPellet; import com.hbm.items.machine.ItemRTGPelletDepleted; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.RTGUtil; import com.hbm.util.Tuple.Pair; import com.hbm.util.fauxpointtwelve.DirPos; import api.hbm.energy.IEnergyGenerator; +import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineRadiolysis extends TileEntityMachineBase implements IEnergyGenerator, IFluidAcceptor, IFluidSource, IFluidContainer, IFluidStandardTransceiver { +public class TileEntityMachineRadiolysis extends TileEntityMachineBase implements IEnergyGenerator, IFluidAcceptor, IFluidSource, IFluidContainer, IFluidStandardTransceiver, IGUIProvider { public long power; public static final int maxPower = 1000000; @@ -358,4 +365,15 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement public double getMaxRenderDistanceSquared() { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerRadiolysis(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIRadiolysis(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorBreeding.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorBreeding.java index 9d0aa8302..33c2c9486 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorBreeding.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorBreeding.java @@ -2,27 +2,33 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.ReactorResearch; +import com.hbm.inventory.container.ContainerMachineReactorBreeding; +import com.hbm.inventory.gui.GUIMachineReactorBreeding; import com.hbm.inventory.recipes.BreederRecipes; import com.hbm.inventory.recipes.BreederRecipes.BreederRecipe; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.common.Optional; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; import li.cil.oc.api.machine.Context; import li.cil.oc.api.network.SimpleComponent; +import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) -public class TileEntityMachineReactorBreeding extends TileEntityMachineBase implements SimpleComponent { +public class TileEntityMachineReactorBreeding extends TileEntityMachineBase implements SimpleComponent, IGUIProvider { public int flux; public float progress; @@ -226,4 +232,15 @@ public class TileEntityMachineReactorBreeding extends TileEntityMachineBase impl public Object[] getProgress(Context context, Arguments args) { return new Object[] {progress}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineReactorBreeding(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineReactorBreeding(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java index 4c3fa81d9..ee0e824d8 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import api.hbm.fluid.IFluidStandardTransceiver; import com.hbm.blocks.ModBlocks; import com.hbm.config.MobConfig; import com.hbm.explosion.ExplosionNukeGeneric; @@ -12,19 +11,27 @@ import com.hbm.handler.radiation.ChunkRadiationManager; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.container.ContainerReactorMultiblock; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIReactorMultiblock; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFuelRod; import com.hbm.lib.Library; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; +import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; @@ -33,9 +40,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineReactorLarge extends TileEntityLoadedBase implements ISidedInventory, IFluidContainer, IFluidAcceptor, IFluidSource, IFluidStandardTransceiver { +public class TileEntityMachineReactorLarge extends TileEntityLoadedBase implements ISidedInventory, IFluidContainer, IFluidAcceptor, IFluidSource, IFluidStandardTransceiver, IGUIProvider { private ItemStack slots[]; @@ -995,4 +1003,15 @@ public class TileEntityMachineReactorLarge extends TileEntityLoadedBase implemen public FluidTank[] getReceivingTanks() { return new FluidTank[] {tanks[0], tanks[1]}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerReactorMultiblock(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIReactorMultiblock(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatDock.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatDock.java index a3aa409dd..f8db39c17 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatDock.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatDock.java @@ -1,17 +1,26 @@ package com.hbm.tileentity.machine; +import java.util.List; +import java.util.Random; + import com.hbm.entity.missile.EntityMinerRocket; import com.hbm.explosion.ExplosionNukeSmall; +import com.hbm.inventory.container.ContainerSatDock; +import com.hbm.inventory.gui.GUISatDock; import com.hbm.items.ISatChip; import com.hbm.saveddata.SatelliteSavedData; import com.hbm.saveddata.satellites.Satellite; import com.hbm.saveddata.satellites.SatelliteMiner; import com.hbm.saveddata.satellites.SatelliteMinerCargoRegistry; +import com.hbm.tileentity.IGUIProvider; import com.hbm.util.WeightedRandomObject; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -20,11 +29,9 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.WeightedRandom; +import net.minecraft.world.World; -import java.util.List; -import java.util.Random; - -public class TileEntityMachineSatDock extends TileEntity implements ISidedInventory { +public class TileEntityMachineSatDock extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack[] slots; @@ -364,4 +371,15 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent public double getMaxRenderDistanceSquared() { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerSatDock(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUISatDock(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatLinker.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatLinker.java index 3a384304f..2fd404480 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatLinker.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatLinker.java @@ -1,16 +1,23 @@ package com.hbm.tileentity.machine; +import com.hbm.inventory.container.ContainerMachineSatLinker; +import com.hbm.inventory.gui.GUIMachineSatLinker; import com.hbm.items.ISatChip; -import com.hbm.items.machine.ItemSatChip; +import com.hbm.tileentity.IGUIProvider; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -public class TileEntityMachineSatLinker extends TileEntity implements ISidedInventory { +public class TileEntityMachineSatLinker extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; @@ -184,4 +191,15 @@ public class TileEntityMachineSatLinker extends TileEntity implements ISidedInve } } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineSatLinker(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineSatLinker(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java index e9da0a2ba..8a0bfc0ac 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java @@ -1,21 +1,30 @@ package com.hbm.tileentity.machine; import com.hbm.config.VersatileConfig; +import com.hbm.inventory.container.ContainerMachineSchrabidiumTransmutator; +import com.hbm.inventory.gui.GUIMachineSchrabidiumTransmutator; import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemCapacitor; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import com.hbm.sound.AudioWrapper; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.energy.IBatteryItem; import api.hbm.energy.IEnergyUser; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineSchrabidiumTransmutator extends TileEntityMachineBase implements IEnergyUser { +public class TileEntityMachineSchrabidiumTransmutator extends TileEntityMachineBase implements IEnergyUser, IGUIProvider { public long power = 0; public int process = 0; @@ -234,4 +243,15 @@ public class TileEntityMachineSchrabidiumTransmutator extends TileEntityMachineB public long getMaxPower() { return maxPower; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineSchrabidiumTransmutator(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineSchrabidiumTransmutator(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java index 40fd34e0c..c55778131 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java @@ -9,31 +9,39 @@ import com.google.gson.stream.JsonWriter; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidContainerRegistry; +import com.hbm.inventory.container.ContainerMachineSelenium; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.inventory.fluid.trait.FT_Combustible; import com.hbm.inventory.fluid.trait.FT_Combustible.FuelGrade; +import com.hbm.inventory.gui.GUIMachineSelenium; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; import com.hbm.tileentity.IConfigurableMachine; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energy.IBatteryItem; import api.hbm.energy.IEnergyGenerator; import api.hbm.fluid.IFluidStandardReceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineSeleniumEngine extends TileEntityLoadedBase implements ISidedInventory, IEnergyGenerator, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver, IConfigurableMachine { +public class TileEntityMachineSeleniumEngine extends TileEntityLoadedBase implements ISidedInventory, IEnergyGenerator, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver, IConfigurableMachine, IGUIProvider { private ItemStack slots[]; @@ -413,4 +421,15 @@ public class TileEntityMachineSeleniumEngine extends TileEntityLoadedBase implem public FluidTank[] getReceivingTanks() { return new FluidTank[] {tank}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineSelenium(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineSelenium(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java index a12e5dcab..ee1e8fb32 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java @@ -1,23 +1,31 @@ package com.hbm.tileentity.machine; +import com.hbm.inventory.container.ContainerMachineShredder; +import com.hbm.inventory.gui.GUIMachineShredder; import com.hbm.inventory.recipes.ShredderRecipes; import com.hbm.items.machine.ItemBlades; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energy.IBatteryItem; import api.hbm.energy.IEnergyUser; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineShredder extends TileEntityLoadedBase implements ISidedInventory, IEnergyUser { +public class TileEntityMachineShredder extends TileEntityLoadedBase implements ISidedInventory, IEnergyUser, IGUIProvider { private ItemStack slots[]; @@ -414,4 +422,15 @@ public class TileEntityMachineShredder extends TileEntityLoadedBase implements I return 0; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineShredder(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineShredder(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSiren.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSiren.java index 7ad87852f..a2ebd812f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSiren.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSiren.java @@ -2,21 +2,29 @@ package com.hbm.tileentity.machine; import java.util.Arrays; +import com.hbm.inventory.container.ContainerMachineSiren; +import com.hbm.inventory.gui.GUIMachineSiren; import com.hbm.items.machine.ItemCassette; import com.hbm.items.machine.ItemCassette.SoundType; import com.hbm.items.machine.ItemCassette.TrackType; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TESirenPacket; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -public class TileEntityMachineSiren extends TileEntity implements ISidedInventory { +public class TileEntityMachineSiren extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; @@ -217,4 +225,15 @@ public class TileEntityMachineSiren extends TileEntity implements ISidedInventor return TrackType.NULL; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineSiren(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineSiren(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java index b2a065e2a..2a9f08a8b 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java @@ -6,29 +6,36 @@ import java.util.List; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.container.ContainerMachineTurbine; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.inventory.fluid.trait.FT_Coolable; import com.hbm.inventory.fluid.trait.FT_Coolable.CoolingType; -import com.hbm.inventory.recipes.MachineRecipes; +import com.hbm.inventory.gui.GUIMachineTurbine; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energy.IBatteryItem; import api.hbm.energy.IEnergyGenerator; import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineTurbine extends TileEntityLoadedBase implements ISidedInventory, IFluidContainer, IFluidAcceptor, IFluidSource, IEnergyGenerator, IFluidStandardTransceiver { +public class TileEntityMachineTurbine extends TileEntityLoadedBase implements ISidedInventory, IFluidContainer, IFluidAcceptor, IFluidSource, IEnergyGenerator, IFluidStandardTransceiver, IGUIProvider { private ItemStack slots[]; @@ -368,4 +375,15 @@ public class TileEntityMachineTurbine extends TileEntityLoadedBase implements IS public FluidTank[] getAllTanks() { return tanks; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineTurbine(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineTurbine(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java index bbba68220..cbff3354f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java @@ -5,11 +5,13 @@ import java.util.List; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.container.ContainerMachineTurbofan; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.inventory.fluid.trait.FT_Combustible; import com.hbm.inventory.fluid.trait.FT_Combustible.FuelGrade; +import com.hbm.inventory.gui.GUIMachineTurbofan; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.ModDamageSource; @@ -17,6 +19,7 @@ import com.hbm.main.MainRegistry; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; import com.hbm.sound.AudioWrapper; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.fauxpointtwelve.DirPos; @@ -25,16 +28,20 @@ import api.hbm.fluid.IFluidStandardReceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineTurbofan extends TileEntityMachineBase implements ISidedInventory, IEnergyGenerator, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver { +public class TileEntityMachineTurbofan extends TileEntityMachineBase implements ISidedInventory, IEnergyGenerator, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver, IGUIProvider { public long power; public static final long maxPower = 500_000; @@ -408,4 +415,15 @@ public class TileEntityMachineTurbofan extends TileEntityMachineBase implements public FluidTank[] getAllTanks() { return new FluidTank[] { tank }; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineTurbofan(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineTurbofan(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java index 4c2e2feed..6b5846286 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java @@ -1,18 +1,25 @@ package com.hbm.tileentity.machine; +import com.hbm.inventory.container.ContainerMicrowave; +import com.hbm.inventory.gui.GUIMicrowave; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.energy.IEnergyUser; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityMicrowave extends TileEntityMachineBase implements IEnergyUser { +public class TileEntityMicrowave extends TileEntityMachineBase implements IEnergyUser, IGUIProvider { public long power; public static final long maxPower = 50000; @@ -201,4 +208,15 @@ public class TileEntityMicrowave extends TileEntityMachineBase implements IEnerg nbt.setLong("power", power); nbt.setInteger("speed", speed); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMicrowave(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMicrowave(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityNukeFurnace.java b/src/main/java/com/hbm/tileentity/machine/TileEntityNukeFurnace.java index 82a9dc052..251ce6270 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityNukeFurnace.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityNukeFurnace.java @@ -4,19 +4,27 @@ import java.util.HashMap; import com.hbm.blocks.machine.MachineNukeFurnace; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.inventory.container.ContainerNukeFurnace; +import com.hbm.inventory.gui.GUINukeFurnace; import com.hbm.items.ItemCustomLore; import com.hbm.items.ModItems; -import com.hbm.items.machine.ItemBreedingRod.*; +import com.hbm.items.machine.ItemBreedingRod.BreedingRodType; +import com.hbm.tileentity.IGUIProvider; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -public class TileEntityNukeFurnace extends TileEntity implements ISidedInventory { +public class TileEntityNukeFurnace extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; @@ -391,4 +399,15 @@ public class TileEntityNukeFurnace extends TileEntity implements ISidedInventory return 0; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerNukeFurnace(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUINukeFurnace(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityRadiobox.java b/src/main/java/com/hbm/tileentity/machine/TileEntityRadiobox.java index 6db0cc2fd..b2ca2d267 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityRadiobox.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityRadiobox.java @@ -2,19 +2,25 @@ package com.hbm.tileentity.machine; import java.util.List; +import com.hbm.inventory.container.ContainerRadiobox; import com.hbm.lib.ModDamageSource; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energy.IEnergyUser; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.IMob; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityRadiobox extends TileEntityLoadedBase implements IEnergyUser { +public class TileEntityRadiobox extends TileEntityLoadedBase implements IEnergyUser, IGUIProvider { long power; public static long maxPower = 500000; @@ -83,4 +89,15 @@ public class TileEntityRadiobox extends TileEntityLoadedBase implements IEnergyU public double getMaxRenderDistanceSquared() { return 65536.0D; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerRadiobox(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java index 3fc148613..76432878f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java @@ -3,24 +3,27 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.ReactorResearch; import com.hbm.interfaces.IControlReceiver; +import com.hbm.inventory.container.ContainerReactorControl; +import com.hbm.inventory.gui.GUIReactorControl; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; -import com.hbm.tileentity.machine.rbmk.TileEntityRBMKControlAuto.RBMKFunction; -import com.hbm.tileentity.machine.rbmk.TileEntityRBMKControlManual.RBMKColor; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.block.BlockRedstoneComparator; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ISidedInventory; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; +import net.minecraft.world.World; -public class TileEntityReactorControl extends TileEntityMachineBase implements IControlReceiver { +public class TileEntityReactorControl extends TileEntityMachineBase implements IControlReceiver, IGUIProvider { private static final int[] slots_io = new int[] {0}; @@ -242,4 +245,15 @@ public class TileEntityReactorControl extends TileEntityMachineBase implements I QUAD, LOG } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerReactorControl(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIReactorControl(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java index c19264cf8..975d55198 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java @@ -8,31 +8,36 @@ import com.hbm.config.MobConfig; import com.hbm.handler.radiation.ChunkRadiationManager; import com.hbm.interfaces.IControlReceiver; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.inventory.container.ContainerReactorResearch; +import com.hbm.inventory.gui.GUIReactorResearch; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemPlateFuel; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import li.cil.oc.api.machine.Arguments; +import li.cil.oc.api.machine.Callback; +import li.cil.oc.api.machine.Context; +import li.cil.oc.api.network.SimpleComponent; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.Optional; -import li.cil.oc.api.machine.Arguments; -import li.cil.oc.api.machine.Callback; -import li.cil.oc.api.machine.Context; -import li.cil.oc.api.network.SimpleComponent; - @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) //TODO: fix reactor control; -public class TileEntityReactorResearch extends TileEntityMachineBase implements IControlReceiver, SimpleComponent { +public class TileEntityReactorResearch extends TileEntityMachineBase implements IControlReceiver, SimpleComponent, IGUIProvider { @SideOnly(Side.CLIENT) public double lastLevel; @@ -422,4 +427,15 @@ public class TileEntityReactorResearch extends TileEntityMachineBase implements targetLevel = newLevel; return new Object[] {}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerReactorResearch(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIReactorResearch(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java index 3f8eaa2ac..00d8de6de 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java @@ -16,14 +16,17 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.inventory.container.ContainerReactorZirnox; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIReactorZirnox; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemZirnoxRod; import com.hbm.items.machine.ItemZirnoxRod.EnumZirnoxType; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.EnumUtil; import com.hbm.util.fauxpointtwelve.DirPos; @@ -36,15 +39,18 @@ import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; import li.cil.oc.api.machine.Context; import li.cil.oc.api.network.SimpleComponent; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) -public class TileEntityReactorZirnox extends TileEntityMachineBase implements IFluidContainer, IFluidAcceptor, IFluidSource, IControlReceiver, IFluidStandardTransceiver, SimpleComponent { +public class TileEntityReactorZirnox extends TileEntityMachineBase implements IFluidContainer, IFluidAcceptor, IFluidSource, IControlReceiver, IFluidStandardTransceiver, SimpleComponent, IGUIProvider { public int heat; public static final int maxHeat = 100000; @@ -581,4 +587,15 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF isOn = args.checkBoolean(0); return new Object[] {}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerReactorZirnox(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIReactorZirnox(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityRtgFurnace.java b/src/main/java/com/hbm/tileentity/machine/TileEntityRtgFurnace.java index 1062d3a9d..0e9e87eaf 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityRtgFurnace.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityRtgFurnace.java @@ -1,20 +1,26 @@ package com.hbm.tileentity.machine; +import com.hbm.blocks.machine.MachineRtgFurnace; +import com.hbm.inventory.container.ContainerRtgFurnace; +import com.hbm.inventory.gui.GUIRtgFurnace; +import com.hbm.tileentity.IGUIProvider; +import com.hbm.util.RTGUtil; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; -import com.hbm.blocks.machine.MachineRtgFurnace; -import com.hbm.items.ModItems; -import com.hbm.items.machine.ItemRTGPellet; -import com.hbm.util.RTGUtil; - -public class TileEntityRtgFurnace extends TileEntity implements ISidedInventory { +public class TileEntityRtgFurnace extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; @@ -289,4 +295,15 @@ public class TileEntityRtgFurnace extends TileEntity implements ISidedInventory this.markDirty(); } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerRtgFurnace(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIRtgFurnace(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java b/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java index 6593f7ad0..f89d0660f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java @@ -2,30 +2,37 @@ package com.hbm.tileentity.machine; import java.util.HashMap; -import api.hbm.fluid.IFluidStandardReceiver; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.inventory.container.ContainerSILEX; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUISILEX; import com.hbm.inventory.recipes.SILEXRecipes; import com.hbm.inventory.recipes.SILEXRecipes.SILEXRecipe; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFELCrystal.EnumWavelengths; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.InventoryUtil; import com.hbm.util.WeightedRandomObject; +import api.hbm.fluid.IFluidStandardReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.WeightedRandom; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntitySILEX extends TileEntityMachineBase implements IFluidAcceptor, IFluidStandardReceiver { +public class TileEntitySILEX extends TileEntityMachineBase implements IFluidAcceptor, IFluidStandardReceiver, IGUIProvider { public EnumWavelengths mode = EnumWavelengths.NULL; public boolean hasLaser; @@ -338,4 +345,15 @@ public class TileEntitySILEX extends TileEntityMachineBase implements IFluidAcce public FluidTank[] getReceivingTanks() { return new FluidTank[] {tank}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerSILEX(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUISILEX(player.inventory, this); + } } \ No newline at end of file diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java b/src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java index e0c215294..20204ca0d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java @@ -3,17 +3,20 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.handler.MissileStruct; import com.hbm.entity.missile.EntitySoyuz; +import com.hbm.handler.MissileStruct; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; +import com.hbm.inventory.container.ContainerSoyuzLauncher; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUISoyuzLauncher; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import com.hbm.sound.AudioWrapper; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.fauxpointtwelve.DirPos; @@ -22,6 +25,9 @@ import api.hbm.fluid.IFluidStandardReceiver; import api.hbm.item.IDesignatorItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -29,9 +35,10 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntitySoyuzLauncher extends TileEntityMachineBase implements ISidedInventory, IEnergyUser, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver { +public class TileEntitySoyuzLauncher extends TileEntityMachineBase implements ISidedInventory, IEnergyUser, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver, IGUIProvider { public long power; public static final long maxPower = 1000000; @@ -472,4 +479,15 @@ public class TileEntitySoyuzLauncher extends TileEntityMachineBase implements IS public boolean canConnect(FluidType type, ForgeDirection dir) { return dir != ForgeDirection.UNKNOWN && dir != ForgeDirection.UP && dir != ForgeDirection.DOWN; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerSoyuzLauncher(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUISoyuzLauncher(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java b/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java index 52172bafb..e157188be 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java @@ -8,20 +8,28 @@ import com.hbm.hazard.HazardRegistry; import com.hbm.hazard.HazardSystem; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.container.ContainerStorageDrum; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIStorageDrum; import com.hbm.items.ModItems; import com.hbm.items.special.ItemWasteLong; import com.hbm.items.special.ItemWasteShort; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.ContaminationUtil; import com.hbm.util.ContaminationUtil.ContaminationType; import com.hbm.util.ContaminationUtil.HazardType; import api.hbm.fluid.IFluidStandardSender; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -29,7 +37,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; import net.minecraft.world.World; -public class TileEntityStorageDrum extends TileEntityMachineBase implements IFluidSource, IFluidStandardSender { +public class TileEntityStorageDrum extends TileEntityMachineBase implements IFluidSource, IFluidStandardSender, IGUIProvider { public FluidTank[] tanks; private static final int[] slots_arr = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 }; @@ -322,4 +330,15 @@ public class TileEntityStorageDrum extends TileEntityMachineBase implements IFlu public FluidTank[] getAllTanks() { return tanks; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerStorageDrum(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIStorageDrum(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityWasteDrum.java b/src/main/java/com/hbm/tileentity/machine/TileEntityWasteDrum.java index 4693ed304..14f86bab4 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityWasteDrum.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityWasteDrum.java @@ -1,19 +1,27 @@ package com.hbm.tileentity.machine; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.inventory.container.ContainerWasteDrum; +import com.hbm.inventory.gui.GUIWasteDrum; import com.hbm.inventory.recipes.FuelPoolRecipes; import com.hbm.items.machine.ItemRBMKRod; +import com.hbm.tileentity.IGUIProvider; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityWasteDrum extends TileEntity implements ISidedInventory { +public class TileEntityWasteDrum extends TileEntity implements ISidedInventory, IGUIProvider { private ItemStack slots[]; @@ -213,4 +221,15 @@ public class TileEntityWasteDrum extends TileEntity implements ISidedInventory { } } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerWasteDrum(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIWasteDrum(player.inventory, this); + } } \ No newline at end of file diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java b/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java index eedcc3aeb..7e59d7119 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityWatzCore.java @@ -12,9 +12,11 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.interfaces.IReactor; +import com.hbm.inventory.container.ContainerWatzCore; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIWatzCore; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemCapacitor; import com.hbm.items.special.WatzFuel; @@ -22,13 +24,18 @@ import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityLoadedBase; import api.hbm.energy.IEnergyGenerator; import api.hbm.fluid.IFluidStandardSender; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -37,7 +44,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityWatzCore extends TileEntityLoadedBase implements ISidedInventory, IReactor, IEnergyGenerator, IFluidContainer, IFluidSource, IFluidStandardSender { +public class TileEntityWatzCore extends TileEntityLoadedBase implements ISidedInventory, IReactor, IEnergyGenerator, IFluidContainer, IFluidSource, IFluidStandardSender, IGUIProvider { public long power; public final static long maxPower = 100000000; @@ -767,4 +774,13 @@ public class TileEntityWatzCore extends TileEntityLoadedBase implements ISidedIn public FluidTank[] getAllTanks() { return new FluidTank[] { tank }; } + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerWatzCore(player.inventory, this); + } + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIWatzCore(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFrackingTower.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFrackingTower.java index bda7c0c88..62f4a2cc7 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFrackingTower.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineFrackingTower.java @@ -6,15 +6,23 @@ import com.google.gson.JsonObject; import com.google.gson.stream.JsonWriter; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.inventory.container.ContainerMachineOilWell; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIMachineOilWell; import com.hbm.lib.Library; import com.hbm.tileentity.IConfigurableMachine; import com.hbm.util.fauxpointtwelve.DirPos; import com.hbm.world.feature.OilSpot; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.world.World; public class TileEntityMachineFrackingTower extends TileEntityOilDrillBase implements IFluidAcceptor { @@ -202,4 +210,15 @@ public class TileEntityMachineFrackingTower extends TileEntityOilDrillBase imple writer.name("I:gasPerBedrockDepositMax").value(gasPerBedrockDepositMax); writer.name("I:destructionRange").value(destructionRange); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineOilWell(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineOilWell(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java index 6c94e3730..e340df841 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java @@ -6,15 +6,18 @@ import com.hbm.interfaces.IControlReceiver; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.container.ContainerMachineGasFlare; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.inventory.fluid.trait.FT_Flammable; import com.hbm.inventory.fluid.trait.FluidTraitSimple.FT_Gaseous; import com.hbm.inventory.fluid.trait.FluidTraitSimple.FT_Gaseous_ART; +import com.hbm.inventory.gui.GUIMachineGasFlare; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.ParticleUtil; @@ -22,14 +25,17 @@ import api.hbm.energy.IEnergyGenerator; import api.hbm.fluid.IFluidStandardReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; +import net.minecraft.world.World; -public class TileEntityMachineGasFlare extends TileEntityMachineBase implements IEnergyGenerator, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver, IControlReceiver { +public class TileEntityMachineGasFlare extends TileEntityMachineBase implements IEnergyGenerator, IFluidContainer, IFluidAcceptor, IFluidStandardReceiver, IControlReceiver, IGUIProvider { public long power; public static final long maxPower = 100000; @@ -278,4 +284,15 @@ public class TileEntityMachineGasFlare extends TileEntityMachineBase implements public FluidTank[] getAllTanks() { return new FluidTank[] { tank }; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineGasFlare(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineGasFlare(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineLiquefactor.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineLiquefactor.java index 3d82aa216..2092b4805 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineLiquefactor.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineLiquefactor.java @@ -7,12 +7,15 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidStack; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.container.ContainerLiquefactor; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUILiquefactor; import com.hbm.inventory.recipes.LiquefactionRecipes; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.fauxpointtwelve.DirPos; @@ -20,11 +23,15 @@ import api.hbm.energy.IEnergyUser; import api.hbm.fluid.IFluidStandardSender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityMachineLiquefactor extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IFluidStandardSender { +public class TileEntityMachineLiquefactor extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IFluidStandardSender, IGUIProvider { public long power; public static final long maxPower = 100000; @@ -278,4 +285,15 @@ public class TileEntityMachineLiquefactor extends TileEntityMachineBase implemen public FluidTank[] getAllTanks() { return new FluidTank[] { tank }; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerLiquefactor(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUILiquefactor(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineOilWell.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineOilWell.java index b6318ce97..3e0c19f8b 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineOilWell.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineOilWell.java @@ -6,14 +6,22 @@ import com.google.gson.JsonObject; import com.google.gson.stream.JsonWriter; import com.hbm.blocks.ModBlocks; import com.hbm.explosion.ExplosionLarge; +import com.hbm.inventory.container.ContainerMachineOilWell; import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.gui.GUIMachineOilWell; import com.hbm.lib.Library; import com.hbm.tileentity.IConfigurableMachine; import com.hbm.util.fauxpointtwelve.DirPos; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; public class TileEntityMachineOilWell extends TileEntityOilDrillBase { @@ -155,4 +163,15 @@ public class TileEntityMachineOilWell extends TileEntityOilDrillBase { writer.name("I:gasPerDepositMax").value(gasPerDepositMax); writer.name("D:drainChance").value(drainChance); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineOilWell(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineOilWell(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachinePumpjack.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachinePumpjack.java index ebcd697ca..fb2a78c4f 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachinePumpjack.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachinePumpjack.java @@ -6,14 +6,22 @@ import com.google.gson.JsonObject; import com.google.gson.stream.JsonWriter; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.container.ContainerMachineOilWell; import com.hbm.inventory.fluid.FluidType; +import com.hbm.inventory.gui.GUIMachineOilWell; import com.hbm.tileentity.IConfigurableMachine; import com.hbm.util.fauxpointtwelve.DirPos; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; @@ -205,4 +213,15 @@ public class TileEntityMachinePumpjack extends TileEntityOilDrillBase { writer.name("I:gasPerDepositMax").value(gasPerDepositMax); writer.name("D:drainChance").value(drainChance); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineOilWell(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineOilWell(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java index 4b44632a8..e5fb627d7 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java @@ -16,12 +16,15 @@ import com.hbm.inventory.OreDictManager; import com.hbm.inventory.RecipesCommon.AStack; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.RecipesCommon.OreDictStack; +import com.hbm.inventory.container.ContainerMachineRefinery; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIMachineRefinery; import com.hbm.inventory.recipes.RefineryRecipes; import com.hbm.items.ModItems; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.IOverpressurable; import com.hbm.tileentity.IPersistentNBT; import com.hbm.tileentity.IRepairable; @@ -34,8 +37,10 @@ import api.hbm.energy.IEnergyUser; import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -45,7 +50,7 @@ import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMachineRefinery extends TileEntityMachineBase implements IEnergyUser, IFluidContainer, IFluidAcceptor, IFluidSource, IControlReceiver, IOverpressurable, IPersistentNBT, IRepairable, IFluidStandardTransceiver { +public class TileEntityMachineRefinery extends TileEntityMachineBase implements IEnergyUser, IFluidContainer, IFluidAcceptor, IFluidSource, IControlReceiver, IOverpressurable, IPersistentNBT, IRepairable, IFluidStandardTransceiver, IGUIProvider { public long power = 0; public int sulfur = 0; @@ -475,4 +480,15 @@ public class TileEntityMachineRefinery extends TileEntityMachineBase implements for(int i = 0; i < 5; i++) this.tanks[i].readFromNBT(data, "" + i); this.hasExploded = data.getBoolean("hasExploded"); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineRefinery(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineRefinery(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineSolidifier.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineSolidifier.java index 18fa8698e..c40e904ca 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineSolidifier.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineSolidifier.java @@ -2,12 +2,15 @@ package com.hbm.tileentity.machine.oil; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.UpgradeManager; +import com.hbm.inventory.container.ContainerSolidifier; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUISolidifier; import com.hbm.inventory.recipes.SolidificationRecipes; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.Tuple.Pair; import com.hbm.util.fauxpointtwelve.DirPos; @@ -16,11 +19,15 @@ import api.hbm.energy.IEnergyUser; import api.hbm.fluid.IFluidStandardReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityMachineSolidifier extends TileEntityMachineBase implements IEnergyUser, IFluidAcceptor, IFluidStandardReceiver { +public class TileEntityMachineSolidifier extends TileEntityMachineBase implements IEnergyUser, IFluidAcceptor, IFluidStandardReceiver, IGUIProvider { public long power; public static final long maxPower = 100000; @@ -252,4 +259,15 @@ public class TileEntityMachineSolidifier extends TileEntityMachineBase implement public FluidTank[] getAllTanks() { return new FluidTank[] { tank }; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerSolidifier(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUISolidifier(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityOilDrillBase.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityOilDrillBase.java index 3225454ad..8ddfb7867 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityOilDrillBase.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityOilDrillBase.java @@ -15,6 +15,7 @@ import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; import com.hbm.tileentity.IConfigurableMachine; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.BobMathUtil; import com.hbm.util.Tuple; @@ -32,7 +33,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; -public abstract class TileEntityOilDrillBase extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IFluidStandardTransceiver, IConfigurableMachine { +public abstract class TileEntityOilDrillBase extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IFluidStandardTransceiver, IConfigurableMachine, IGUIProvider { public int indicator = 0; diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java index 05caa6325..f9601d4b0 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java @@ -3,31 +3,36 @@ package com.hbm.tileentity.machine.rbmk; import java.util.ArrayList; import java.util.List; -import api.hbm.fluid.IFluidStandardTransceiver; -import api.hbm.fluid.IFluidUser; -import api.hbm.fluid.IPipeNet; - import com.hbm.blocks.ModBlocks; import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType; import com.hbm.interfaces.IControlReceiver; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.container.ContainerRBMKGeneric; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIRBMKBoiler; import com.hbm.lib.Library; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType; import com.hbm.util.fauxpointtwelve.DirPos; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.Vec3; - +import api.hbm.fluid.IFluidStandardTransceiver; +import api.hbm.fluid.IFluidUser; +import api.hbm.fluid.IPipeNet; import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; import li.cil.oc.api.machine.Context; import li.cil.oc.api.network.SimpleComponent; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements IFluidAcceptor, IFluidSource, IControlReceiver, IFluidStandardTransceiver, SimpleComponent { @@ -355,4 +360,15 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I public Object[] getWaterMax(Context context, Arguments args) { return new Object[] {feed.getMaxFill()}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerRBMKGeneric(player.inventory); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIRBMKBoiler(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java index aa9c4634f..f44cfb151 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java @@ -7,21 +7,26 @@ import java.util.Set; import com.hbm.interfaces.IControlReceiver; import com.hbm.inventory.fluid.Fluids; +import com.hbm.inventory.gui.GUIRBMKConsole; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKControlManual.RBMKColor; import com.hbm.util.I18nUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; +import net.minecraft.world.World; -public class TileEntityRBMKConsole extends TileEntityMachineBase implements IControlReceiver { +public class TileEntityRBMKConsole extends TileEntityMachineBase implements IControlReceiver, IGUIProvider { private int targetX; private int targetY; @@ -456,4 +461,15 @@ public class TileEntityRBMKConsole extends TileEntityMachineBase implements ICon this.offset = offset; } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIRBMKConsole(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlAuto.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlAuto.java index 07f2dbe02..dc4159964 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlAuto.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlAuto.java @@ -1,13 +1,20 @@ package com.hbm.tileentity.machine.rbmk; import com.hbm.interfaces.IControlReceiver; +import com.hbm.inventory.container.ContainerRBMKControlAuto; +import com.hbm.inventory.gui.GUIRBMKControlAuto; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKControlManual.RBMKColor; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; +import net.minecraft.world.World; public class TileEntityRBMKControlAuto extends TileEntityRBMKControl implements IControlReceiver { @@ -126,4 +133,15 @@ public class TileEntityRBMKControlAuto extends TileEntityRBMKControl implements public ColumnType getConsoleType() { return ColumnType.CONTROL_AUTO; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerRBMKControlAuto(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIRBMKControlAuto(player.inventory, this); + } } \ No newline at end of file diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java index 154d3018c..d9fb3bfe0 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlManual.java @@ -2,16 +2,22 @@ package com.hbm.tileentity.machine.rbmk; import com.hbm.blocks.machine.rbmk.RBMKControl; import com.hbm.interfaces.IControlReceiver; +import com.hbm.inventory.container.ContainerRBMKControl; +import com.hbm.inventory.gui.GUIRBMKControl; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.Vec3; - import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; import li.cil.oc.api.machine.Context; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; public class TileEntityRBMKControlManual extends TileEntityRBMKControl implements IControlReceiver { @@ -131,5 +137,16 @@ public class TileEntityRBMKControlManual extends TileEntityRBMKControl implement @Optional.Method(modid = "OpenComputers") public Object[] getColor(Context context, Arguments args) { return new Object[] {this.color}; + } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerRBMKControl(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIRBMKControl(player.inventory, this); } } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKHeater.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKHeater.java index 5c3fdcad6..29c75427d 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKHeater.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKHeater.java @@ -3,22 +3,30 @@ package com.hbm.tileentity.machine.rbmk; import java.util.ArrayList; import java.util.List; -import api.hbm.fluid.IFluidStandardTransceiver; import com.hbm.blocks.ModBlocks; import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.container.ContainerRBMKHeater; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.inventory.fluid.trait.FT_Heatable; import com.hbm.inventory.fluid.trait.FT_Heatable.HeatingStep; import com.hbm.inventory.fluid.trait.FT_Heatable.HeatingType; +import com.hbm.inventory.gui.GUIRBMKHeater; import com.hbm.lib.Library; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType; import com.hbm.util.fauxpointtwelve.DirPos; +import api.hbm.fluid.IFluidStandardTransceiver; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class TileEntityRBMKHeater extends TileEntityRBMKSlottedBase implements IFluidAcceptor, IFluidSource, IFluidStandardTransceiver { @@ -259,4 +267,15 @@ public class TileEntityRBMKHeater extends TileEntityRBMKSlottedBase implements I public FluidTank[] getReceivingTanks() { return new FluidTank[] {feed}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerRBMKHeater(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIRBMKHeater(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java index c6170daba..0a15a1f27 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java @@ -4,25 +4,33 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import api.hbm.fluid.IFluidStandardSender; import com.hbm.blocks.ModBlocks; import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.inventory.container.ContainerRBMKOutgasser; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIRBMKOutgasser; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemFluidIcon; import com.hbm.lib.Library; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType; import com.hbm.util.fauxpointtwelve.DirPos; +import api.hbm.fluid.IFluidStandardSender; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implements IRBMKFluxReceiver, IFluidSource, IFluidStandardSender { @@ -322,4 +330,15 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement public FluidTank[] getSendingTanks() { return new FluidTank[] {gas}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerRBMKOutgasser(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIRBMKOutgasser(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java index 2394ecea4..132e4eefc 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java @@ -5,23 +5,30 @@ import com.hbm.blocks.machine.rbmk.RBMKBase; import com.hbm.blocks.machine.rbmk.RBMKRod; import com.hbm.entity.projectile.EntityRBMKDebris.DebrisType; import com.hbm.handler.radiation.ChunkRadiationManager; +import com.hbm.inventory.container.ContainerRBMKRod; +import com.hbm.inventory.gui.GUIRBMKRod; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemRBMKRod; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType; import com.hbm.util.Compat; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; -import net.minecraftforge.common.util.ForgeDirection; - import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; import li.cil.oc.api.machine.Context; import li.cil.oc.api.network.SimpleComponent; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "OpenComputers")}) public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBMKFluxReceiver, IRBMKLoadable, SimpleComponent { @@ -413,4 +420,15 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM } return new Object[] {"N/A"}; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerRBMKRod(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIRBMKRod(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKSlottedBase.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKSlottedBase.java index 6291a04d5..7c6278c84 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKSlottedBase.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKSlottedBase.java @@ -2,6 +2,7 @@ package com.hbm.tileentity.machine.rbmk; import com.hbm.packet.NBTPacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraft.inventory.ISidedInventory; @@ -18,7 +19,7 @@ import net.minecraftforge.fluids.FluidTank; * @author hbm * */ -public abstract class TileEntityRBMKSlottedBase extends TileEntityRBMKActiveBase implements ISidedInventory { +public abstract class TileEntityRBMKSlottedBase extends TileEntityRBMKActiveBase implements ISidedInventory, IGUIProvider { public ItemStack slots[]; diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKStorage.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKStorage.java index 65a75a324..1806d06a7 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKStorage.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKStorage.java @@ -1,9 +1,17 @@ package com.hbm.tileentity.machine.rbmk; +import com.hbm.inventory.container.ContainerRBMKStorage; +import com.hbm.inventory.gui.GUIRBMKStorage; import com.hbm.items.machine.ItemRBMKRod; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKConsole.ColumnType; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; public class TileEntityRBMKStorage extends TileEntityRBMKSlottedBase implements IRBMKLoadable { @@ -77,4 +85,15 @@ public class TileEntityRBMKStorage extends TileEntityRBMKSlottedBase implements public void unload() { slots[0] = null; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerRBMKStorage(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIRBMKStorage(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java index 2dce4df9c..9c26e28d9 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java @@ -9,12 +9,15 @@ import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidContainerRegistry; +import com.hbm.inventory.container.ContainerBarrel; import com.hbm.inventory.fluid.FluidType; -import com.hbm.inventory.fluid.trait.FT_Corrosive; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.fluid.trait.FT_Corrosive; +import com.hbm.inventory.gui.GUIBarrel; import com.hbm.lib.Library; import com.hbm.saveddata.TomSaveData; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.IPersistentNBT; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.fauxpointtwelve.DirPos; @@ -24,14 +27,19 @@ import api.hbm.fluid.IFluidConnector; import api.hbm.fluid.IFluidStandardTransceiver; import api.hbm.fluid.IPipeNet; import api.hbm.fluid.PipeNet; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; -public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcceptor, IFluidSource, IFluidStandardTransceiver, IPersistentNBT { +public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcceptor, IFluidSource, IFluidStandardTransceiver, IPersistentNBT, IGUIProvider { public FluidTank tank; public short mode = 0; @@ -330,4 +338,15 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc this.tank.readFromNBT(data, "tank"); this.mode = data.getShort("nbt"); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerBarrel(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIBarrel(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateBase.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateBase.java index b5c377fd2..3bdf405c2 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateBase.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateBase.java @@ -1,5 +1,6 @@ package com.hbm.tileentity.machine.storage; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.machine.TileEntityLockableBase; import net.minecraft.entity.player.EntityPlayer; @@ -8,7 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -public abstract class TileEntityCrateBase extends TileEntityLockableBase implements ISidedInventory { +public abstract class TileEntityCrateBase extends TileEntityLockableBase implements ISidedInventory, IGUIProvider { protected ItemStack slots[]; public String customName; diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateDesh.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateDesh.java index 923928b66..e0c33c30a 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateDesh.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateDesh.java @@ -1,5 +1,15 @@ package com.hbm.tileentity.machine.storage; +import com.hbm.inventory.container.ContainerCrateDesh; +import com.hbm.inventory.gui.GUICrateDesh; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.world.World; + public class TileEntityCrateDesh extends TileEntityCrateBase { public TileEntityCrateDesh() { @@ -10,4 +20,15 @@ public class TileEntityCrateDesh extends TileEntityCrateBase { public String getInventoryName() { return this.hasCustomInventoryName() ? this.customName : "container.crateDesh"; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerCrateDesh(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUICrateDesh(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateIron.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateIron.java index abf54980b..aec9bf3f2 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateIron.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateIron.java @@ -1,5 +1,15 @@ package com.hbm.tileentity.machine.storage; +import com.hbm.inventory.container.ContainerCrateIron; +import com.hbm.inventory.gui.GUICrateIron; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.world.World; + public class TileEntityCrateIron extends TileEntityCrateBase { public TileEntityCrateIron() { @@ -10,4 +20,17 @@ public class TileEntityCrateIron extends TileEntityCrateBase { public String getInventoryName() { return this.hasCustomInventoryName() ? this.customName : "container.crateIron"; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerCrateIron(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUICrateIron(player.inventory, this); + } + + } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateSteel.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateSteel.java index 725fde319..940f689c6 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateSteel.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateSteel.java @@ -1,6 +1,15 @@ package com.hbm.tileentity.machine.storage; +import com.hbm.inventory.container.ContainerCrateSteel; +import com.hbm.inventory.gui.GUICrateSteel; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; +import net.minecraft.world.World; public class TileEntityCrateSteel extends TileEntityCrateBase implements ISidedInventory { @@ -12,4 +21,15 @@ public class TileEntityCrateSteel extends TileEntityCrateBase implements ISidedI public String getInventoryName() { return this.hasCustomInventoryName() ? this.customName : "container.crateSteel"; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerCrateSteel(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUICrateSteel(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateTungsten.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateTungsten.java index db640f843..d6a1536b1 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateTungsten.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateTungsten.java @@ -1,8 +1,15 @@ package com.hbm.tileentity.machine.storage; +import com.hbm.inventory.container.ContainerCrateTungsten; +import com.hbm.inventory.gui.GUICrateTungsten; import com.hbm.items.ModItems; import api.hbm.block.ILaserable; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.world.World; @@ -94,4 +101,15 @@ public class TileEntityCrateTungsten extends TileEntityCrateBase implements ILas } } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerCrateTungsten(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUICrateTungsten(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java index 6c41047f2..9a36c8493 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java @@ -6,7 +6,10 @@ import java.util.List; import java.util.Set; import com.hbm.blocks.machine.MachineBattery; +import com.hbm.inventory.container.ContainerMachineBattery; +import com.hbm.inventory.gui.GUIMachineBattery; import com.hbm.lib.Library; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.IPersistentNBT; import com.hbm.tileentity.TileEntityMachineBase; @@ -16,20 +19,25 @@ import api.hbm.energy.IEnergyConnector; import api.hbm.energy.IEnergyUser; import api.hbm.energy.IPowerNet; import api.hbm.energy.PowerNet; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; -import net.minecraftforge.common.util.ForgeDirection; - import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; import li.cil.oc.api.machine.Context; import li.cil.oc.api.network.SimpleComponent; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; @Optional.InterfaceList({@Optional.Interface(iface = "li.cil.oc.api.network.SimpleComponent", modid = "opencomputers")}) -public class TileEntityMachineBattery extends TileEntityMachineBase implements IEnergyUser, IPersistentNBT, SimpleComponent { +public class TileEntityMachineBattery extends TileEntityMachineBase implements IEnergyUser, IPersistentNBT, SimpleComponent, IGUIProvider { public long[] log = new long[20]; public long delta = 0; @@ -398,4 +406,15 @@ public class TileEntityMachineBattery extends TileEntityMachineBase implements I this.redHigh = data.getShort("redHigh"); this.priority = ConnectionPriority.values()[data.getInteger("priority")]; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMachineBattery(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineBattery(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachinePuF6Tank.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachinePuF6Tank.java index e9ba00d48..4241ac5cc 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachinePuF6Tank.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachinePuF6Tank.java @@ -1,22 +1,28 @@ package com.hbm.tileentity.machine.storage; import com.hbm.interfaces.IFluidContainer; +import com.hbm.inventory.container.ContainerPuF6Tank; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIMachinePuF6Tank; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityMachinePuF6Tank extends TileEntity implements ISidedInventory, IFluidContainer { +public class TileEntityMachinePuF6Tank extends TileEntity implements ISidedInventory, IFluidContainer, IGUIProvider { private ItemStack slots[]; @@ -228,4 +234,15 @@ public class TileEntityMachinePuF6Tank extends TileEntity implements ISidedInven if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerPuF6Tank(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachinePuF6Tank(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineUF6Tank.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineUF6Tank.java index 9fc7a4ba2..8cde23b50 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineUF6Tank.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineUF6Tank.java @@ -1,22 +1,28 @@ package com.hbm.tileentity.machine.storage; import com.hbm.interfaces.IFluidContainer; +import com.hbm.inventory.container.ContainerUF6Tank; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; +import com.hbm.inventory.gui.GUIMachineUF6Tank; import com.hbm.items.ModItems; +import com.hbm.tileentity.IGUIProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntityMachineUF6Tank extends TileEntity implements ISidedInventory, IFluidContainer { +public class TileEntityMachineUF6Tank extends TileEntity implements ISidedInventory, IFluidContainer, IGUIProvider { private ItemStack slots[]; @@ -230,4 +236,15 @@ public class TileEntityMachineUF6Tank extends TileEntity implements ISidedInvent if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerUF6Tank(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMachineUF6Tank(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMassStorage.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMassStorage.java index dab20d6e6..2b38ee9a0 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMassStorage.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMassStorage.java @@ -1,15 +1,20 @@ package com.hbm.tileentity.machine.storage; import com.hbm.interfaces.IControlReceiver; +import com.hbm.inventory.container.ContainerMassStorage; +import com.hbm.inventory.gui.GUIMassStorage; import com.hbm.items.ModItems; import com.hbm.tileentity.INBTPacketReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; +import net.minecraft.world.World; public class TileEntityMassStorage extends TileEntityCrateBase implements INBTPacketReceiver, IControlReceiver { @@ -186,4 +191,15 @@ public class TileEntityMassStorage extends TileEntityCrateBase implements INBTPa public int[] getAccessibleSlotsFromSide(int side) { return new int[] { 0, 2 }; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerMassStorage(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUIMassStorage(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntitySafe.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntitySafe.java index d258a90a2..f9197b479 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntitySafe.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntitySafe.java @@ -1,6 +1,15 @@ package com.hbm.tileentity.machine.storage; +import com.hbm.inventory.container.ContainerSafe; +import com.hbm.inventory.gui.GUISafe; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; +import net.minecraft.world.World; public class TileEntitySafe extends TileEntityCrateBase implements ISidedInventory { @@ -12,4 +21,15 @@ public class TileEntitySafe extends TileEntityCrateBase implements ISidedInvento public String getInventoryName() { return this.hasCustomInventoryName() ? this.customName : "container.safe"; } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerSafe(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUISafe(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntitySoyuzCapsule.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntitySoyuzCapsule.java index 6eea311be..f4d785a7d 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntitySoyuzCapsule.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntitySoyuzCapsule.java @@ -1,12 +1,19 @@ package com.hbm.tileentity.machine.storage; +import com.hbm.inventory.container.ContainerSoyuzCapsule; +import com.hbm.inventory.gui.GUISoyuzCapsule; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityInventoryBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; -public class TileEntitySoyuzCapsule extends TileEntityInventoryBase { +public class TileEntitySoyuzCapsule extends TileEntityInventoryBase implements IGUIProvider { public TileEntitySoyuzCapsule() { super(19); @@ -23,4 +30,15 @@ public class TileEntitySoyuzCapsule extends TileEntityInventoryBase { return AxisAlignedBB.getBoundingBox(xCoord - 1, yCoord - 1, zCoord - 1, xCoord + 2, yCoord + 3, zCoord + 2); } + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerSoyuzCapsule(player.inventory, this); + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUISoyuzCapsule(player.inventory, this); + } + } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java index 6d54d6a3a..2a3d52faf 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java @@ -15,12 +15,14 @@ import com.hbm.handler.BulletConfiguration; import com.hbm.handler.CasingEjector; import com.hbm.interfaces.IControlReceiver; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.inventory.container.ContainerTurretBase; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemTurretBiometry; import com.hbm.lib.Library; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; import com.hbm.particle.SpentCasing; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.energy.IEnergyUser; @@ -37,12 +39,14 @@ import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.passive.IAnimals; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; @@ -51,7 +55,7 @@ import net.minecraftforge.common.util.ForgeDirection; * @author hbm * */ -public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase implements IEnergyUser, IControlReceiver { +public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase implements IEnergyUser, IControlReceiver, IGUIProvider { @Override public boolean hasPermission(EntityPlayer player) { @@ -871,4 +875,10 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple cachedCasingConfig = null; } + + @SideOnly(Side.CLIENT) + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new ContainerTurretBase(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java index d0598c8d5..02273e7be 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java @@ -2,6 +2,12 @@ package com.hbm.tileentity.turret; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + public class TileEntityTurretBrandon extends TileEntityTurretBaseNT { @Override @@ -28,4 +34,10 @@ public class TileEntityTurretBrandon extends TileEntityTurretBaseNT { return null; } + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretChekhov.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretChekhov.java index 7e2af2be1..6ca6c4e35 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretChekhov.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretChekhov.java @@ -6,12 +6,18 @@ import java.util.List; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.CasingEjector; +import com.hbm.inventory.gui.GUITurretChekhov; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; +import net.minecraft.world.World; public class TileEntityTurretChekhov extends TileEntityTurretBaseNT { @@ -166,4 +172,10 @@ public class TileEntityTurretChekhov extends TileEntityTurretBaseNT { public boolean usesCasings() { return true; } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUITurretChekhov(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFriendly.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFriendly.java index 8a0b679b1..3a0d0126d 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFriendly.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFriendly.java @@ -5,6 +5,13 @@ import java.util.List; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.CasingEjector; +import com.hbm.inventory.gui.GUITurretFriendly; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; public class TileEntityTurretFriendly extends TileEntityTurretChekhov { @@ -39,4 +46,10 @@ public class TileEntityTurretFriendly extends TileEntityTurretChekhov { protected CasingEjector getEjector() { return ejector; } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUITurretFriendly(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java index 24830c609..5863b119f 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java @@ -14,6 +14,7 @@ import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.inventory.fluid.trait.FT_Combustible; import com.hbm.inventory.fluid.trait.FT_Flammable; import com.hbm.inventory.fluid.trait.FluidTraitSimple.FT_Liquid; +import com.hbm.inventory.gui.GUITurretFritz; import com.hbm.items.ModItems; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; @@ -22,9 +23,12 @@ import api.hbm.fluid.IFluidStandardReceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; public class TileEntityTurretFritz extends TileEntityTurretBaseNT implements IFluidAcceptor, IFluidStandardReceiver { @@ -233,4 +237,10 @@ public class TileEntityTurretFritz extends TileEntityTurretBaseNT implements IFl public boolean canConnect(FluidType type, ForgeDirection dir) { return dir != ForgeDirection.UP && dir != ForgeDirection.DOWN; } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUITurretFritz(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHoward.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHoward.java index a295b1487..5afbd8afa 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHoward.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHoward.java @@ -8,6 +8,7 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.CasingEjector; import com.hbm.handler.guncfg.GunDGKFactory; +import com.hbm.inventory.gui.GUITurretHoward; import com.hbm.lib.ModDamageSource; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; @@ -15,8 +16,13 @@ import com.hbm.particle.SpentCasing; import com.hbm.util.EntityDamageUtil; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; +import net.minecraft.world.World; public class TileEntityTurretHoward extends TileEntityTurretBaseNT { @@ -207,4 +213,10 @@ public class TileEntityTurretHoward extends TileEntityTurretBaseNT { public boolean usesCasings() { return true; } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUITurretHoward(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHowardDamaged.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHowardDamaged.java index 92066229d..b3426410c 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHowardDamaged.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHowardDamaged.java @@ -2,17 +2,24 @@ package com.hbm.tileentity.turret; import com.hbm.config.WeaponConfig; import com.hbm.handler.guncfg.GunDGKFactory; +import com.hbm.inventory.container.ContainerTurretBase; +import com.hbm.inventory.gui.GUITurretHoward; import com.hbm.lib.ModDamageSource; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; import com.hbm.util.EntityDamageUtil; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; +import net.minecraft.world.World; public class TileEntityTurretHowardDamaged extends TileEntityTurretHoward { @@ -95,4 +102,15 @@ public class TileEntityTurretHowardDamaged extends TileEntityTurretHoward { } } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretJeremy.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretJeremy.java index 1e344c870..f89b81cbd 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretJeremy.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretJeremy.java @@ -6,12 +6,18 @@ import java.util.List; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.CasingEjector; +import com.hbm.inventory.gui.GUITurretJeremy; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; +import net.minecraft.world.World; public class TileEntityTurretJeremy extends TileEntityTurretBaseNT { @@ -133,4 +139,10 @@ public class TileEntityTurretJeremy extends TileEntityTurretBaseNT { public int casingDelay() { return 22; } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUITurretJeremy(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java index 413a166ad..ea00c1637 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java @@ -3,6 +3,7 @@ package com.hbm.tileentity.turret; import java.util.ArrayList; import java.util.List; +import com.hbm.inventory.gui.GUITurretMaxwell; import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; import com.hbm.packet.AuxParticlePacketNT; @@ -13,6 +14,7 @@ import com.hbm.util.EntityDamageUtil; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -20,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.Vec3; +import net.minecraft.world.World; public class TileEntityTurretMaxwell extends TileEntityTurretBaseNT { @@ -232,4 +235,10 @@ public class TileEntityTurretMaxwell extends TileEntityTurretBaseNT { else super.networkUnpack(nbt); } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUITurretMaxwell(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretRichard.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretRichard.java index 04521c296..c23f2595e 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretRichard.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretRichard.java @@ -7,11 +7,19 @@ import com.hbm.entity.projectile.EntityBulletBase; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.inventory.RecipesCommon.ComparableStack; +import com.hbm.inventory.gui.GUITurretRichard; import com.hbm.items.ItemAmmoEnums.AmmoRocket; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import com.hbm.items.ModItems; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; +import net.minecraft.world.World; public class TileEntityTurretRichard extends TileEntityTurretBaseNT { @@ -165,4 +173,10 @@ public class TileEntityTurretRichard extends TileEntityTurretBaseNT { super.writeToNBT(nbt); nbt.setInteger("loaded", this.loaded); } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUITurretRichard(player.inventory, this); + } } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java index 686de3d99..d25acbc74 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java @@ -5,13 +5,19 @@ import java.util.List; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; +import com.hbm.inventory.gui.GUITurretTauon; import com.hbm.lib.ModDamageSource; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; +import net.minecraft.world.World; public class TileEntityTurretTauon extends TileEntityTurretBaseNT { @@ -150,4 +156,10 @@ public class TileEntityTurretTauon extends TileEntityTurretBaseNT { else super.networkUnpack(nbt); } + + @Override + @SideOnly(Side.CLIENT) + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUITurretTauon(player.inventory, this); + } }