From 905fe32d220667731cf9cff522a3452f52d7f313 Mon Sep 17 00:00:00 2001 From: Vaern Date: Wed, 22 Feb 2023 21:19:07 -0800 Subject: [PATCH] And thy punishment... is death! --- src/main/java/com/hbm/blocks/ModBlocks.java | 58 +- .../java/com/hbm/blocks/bomb/BombMulti.java | 2 +- .../com/hbm/blocks/bomb/CompactLauncher.java | 2 +- .../java/com/hbm/blocks/bomb/LaunchPad.java | 2 +- .../java/com/hbm/blocks/bomb/LaunchTable.java | 2 +- .../com/hbm/blocks/bomb/NukeBalefire.java | 4 +- .../java/com/hbm/blocks/bomb/NukeBoy.java | 2 +- .../java/com/hbm/blocks/bomb/NukeCustom.java | 2 +- .../java/com/hbm/blocks/bomb/NukeFleija.java | 2 +- .../java/com/hbm/blocks/bomb/NukeGadget.java | 2 +- .../java/com/hbm/blocks/bomb/NukeMan.java | 2 +- .../java/com/hbm/blocks/bomb/NukeMike.java | 2 +- src/main/java/com/hbm/blocks/bomb/NukeN2.java | 2 +- .../java/com/hbm/blocks/bomb/NukeN45.java | 2 +- .../com/hbm/blocks/bomb/NukePrototype.java | 2 +- .../com/hbm/blocks/bomb/NukeSolinium.java | 2 +- .../java/com/hbm/blocks/bomb/NukeTsar.java | 2 +- .../com/hbm/blocks/generic/BlockBobble.java | 18 +- .../hbm/blocks/generic/BlockSnowglobe.java | 5 +- .../com/hbm/blocks/machine/BlockAMSBase.java | 2 +- .../hbm/blocks/machine/BlockAMSEmitter.java | 2 +- .../hbm/blocks/machine/BlockAMSLimiter.java | 2 +- .../hbm/blocks/machine/BlockArmorTable.java | 20 +- .../hbm/blocks/machine/BlockFluidBarrel.java | 2 +- .../hbm/blocks/machine/BlockHadronAccess.java | 2 +- .../hbm/blocks/machine/BlockHadronCore.java | 2 +- .../com/hbm/blocks/machine/CoreComponent.java | 13 +- .../java/com/hbm/blocks/machine/CoreCore.java | 2 +- .../hbm/blocks/machine/DummyBlockAMSBase.java | 2 +- .../blocks/machine/DummyBlockAMSEmitter.java | 2 +- .../blocks/machine/DummyBlockAMSLimiter.java | 2 +- .../blocks/machine/DummyBlockAssembler.java | 2 +- .../hbm/blocks/machine/DummyBlockDrill.java | 2 +- .../hbm/blocks/machine/DummyBlockMachine.java | 6 +- .../blocks/machine/DummyBlockRefinery.java | 2 +- .../blocks/machine/DummyBlockTurbofan.java | 2 +- .../com/hbm/blocks/machine/FWatzHatch.java | 8 +- .../hbm/blocks/machine/MachineArcFurnace.java | 2 +- .../hbm/blocks/machine/MachineBattery.java | 2 +- .../blocks/machine/MachineBigAssTank9000.java | 2 +- .../com/hbm/blocks/machine/MachineBoiler.java | 4 +- .../hbm/blocks/machine/MachineCMBFactory.java | 2 +- .../hbm/blocks/machine/MachineCentrifuge.java | 2 +- .../hbm/blocks/machine/MachineChemplant.java | 2 +- .../com/hbm/blocks/machine/MachineCoal.java | 2 +- .../blocks/machine/MachineCrystallizer.java | 2 +- .../hbm/blocks/machine/MachineCyclotron.java | 2 +- .../hbm/blocks/machine/MachineDeuterium.java | 2 +- .../blocks/machine/MachineDiFurnaceRTG.java | 2 +- .../com/hbm/blocks/machine/MachineDiesel.java | 2 +- .../com/hbm/blocks/machine/MachineEPress.java | 2 +- .../machine/MachineElectricFurnace.java | 2 +- .../com/hbm/blocks/machine/MachineFEL.java | 2 +- .../com/hbm/blocks/machine/MachineFENSU.java | 2 +- .../hbm/blocks/machine/MachineForceField.java | 2 +- .../blocks/machine/MachineFrackingTower.java | 2 +- .../hbm/blocks/machine/MachineGasCent.java | 2 +- .../hbm/blocks/machine/MachineGasFlare.java | 2 +- .../hbm/blocks/machine/MachineIGenerator.java | 2 +- .../com/hbm/blocks/machine/MachineITER.java | 2 +- .../hbm/blocks/machine/MachineKeyForge.java | 2 +- .../blocks/machine/MachineLargeTurbine.java | 2 +- .../hbm/blocks/machine/MachineMicrowave.java | 2 +- .../blocks/machine/MachineMiningLaser.java | 2 +- .../machine/MachineMissileAssembly.java | 2 +- .../blocks/machine/MachineNukeFurnace.java | 2 +- .../hbm/blocks/machine/MachineOilWell.java | 2 +- .../com/hbm/blocks/machine/MachineOrbus.java | 2 +- .../blocks/machine/MachinePlasmaHeater.java | 2 +- .../com/hbm/blocks/machine/MachinePress.java | 2 +- .../hbm/blocks/machine/MachinePuF6Tank.java | 2 +- .../hbm/blocks/machine/MachinePumpjack.java | 2 +- .../com/hbm/blocks/machine/MachineRTG.java | 2 +- .../com/hbm/blocks/machine/MachineRadGen.java | 2 +- .../com/hbm/blocks/machine/MachineRadar.java | 2 +- .../machine/MachineReactorBreeding.java | 2 +- .../blocks/machine/MachineReactorControl.java | 2 +- .../hbm/blocks/machine/MachineRefinery.java | 2 +- .../hbm/blocks/machine/MachineRtgFurnace.java | 2 +- .../com/hbm/blocks/machine/MachineSILEX.java | 2 +- .../hbm/blocks/machine/MachineSatDock.java | 2 +- .../hbm/blocks/machine/MachineSatLinker.java | 2 +- .../MachineSchrabidiumTransmutator.java | 2 +- .../blocks/machine/MachineSeleniumEngine.java | 2 +- .../hbm/blocks/machine/MachineShredder.java | 2 +- .../com/hbm/blocks/machine/MachineSiren.java | 2 +- .../hbm/blocks/machine/MachineTurbine.java | 2 +- .../hbm/blocks/machine/MachineTurbofan.java | 2 +- .../hbm/blocks/machine/MachineUF6Tank.java | 2 +- .../java/com/hbm/blocks/machine/NTMAnvil.java | 19 +- .../com/hbm/blocks/machine/ReactorHatch.java | 8 +- .../hbm/blocks/machine/ReactorResearch.java | 2 +- .../com/hbm/blocks/machine/ReactorZirnox.java | 2 +- .../com/hbm/blocks/machine/SoyuzCapsule.java | 2 +- .../com/hbm/blocks/machine/SoyuzLauncher.java | 2 +- .../com/hbm/blocks/machine/StorageDrum.java | 4 +- .../com/hbm/blocks/machine/WasteDrum.java | 2 +- .../com/hbm/blocks/machine/WatzHatch.java | 8 +- .../hbm/blocks/machine/rbmk/RBMKConsole.java | 2 +- .../java/com/hbm/blocks/test/TestNuke.java | 2 +- .../com/hbm/blocks/turret/TurretBrandon.java | 2 +- .../com/hbm/blocks/turret/TurretChekhov.java | 2 +- .../com/hbm/blocks/turret/TurretFriendly.java | 2 +- .../com/hbm/blocks/turret/TurretFritz.java | 2 +- .../com/hbm/blocks/turret/TurretHoward.java | 2 +- .../com/hbm/blocks/turret/TurretJeremy.java | 2 +- .../com/hbm/blocks/turret/TurretMaxwell.java | 2 +- .../com/hbm/blocks/turret/TurretRichard.java | 2 +- .../com/hbm/blocks/turret/TurretTauon.java | 2 +- .../hbm/entity/cart/EntityMinecartCrate.java | 21 +- .../entity/cart/EntityMinecartDestroyer.java | 19 +- src/main/java/com/hbm/handler/GUIHandler.java | 1172 +---------------- src/main/java/com/hbm/items/ModItems.java | 17 +- .../hbm/items/machine/ItemFluidIDMulti.java | 18 +- .../hbm/items/machine/ItemTemplateFolder.java | 18 +- .../java/com/hbm/items/special/ItemBook.java | 19 +- .../hbm/items/special/ItemHolotapeImage.java | 18 +- .../java/com/hbm/items/tool/ItemCatalog.java | 22 +- .../hbm/items/tool/ItemDesingatorManual.java | 18 +- .../com/hbm/items/tool/ItemGuideBook.java | 18 +- .../com/hbm/items/tool/ItemSatInterface.java | 27 +- .../bomb/TileEntityNukeBalefire.java | 19 +- .../machine/TileEntityDiFurnaceRTG.java | 21 +- .../hbm/tileentity/machine/TileEntityFEL.java | 23 +- .../tileentity/machine/TileEntityHadron.java | 18 +- .../tileentity/machine/TileEntityITER.java | 20 +- .../TileEntityMachineCrystallizer.java | 20 +- .../TileEntityMachineLargeTurbine.java | 21 +- .../machine/TileEntityMachineMiningLaser.java | 19 +- .../TileEntityMachinePlasmaHeater.java | 19 +- .../machine/TileEntityMicrowave.java | 19 +- .../machine/TileEntityReactorZirnox.java | 33 +- .../tileentity/machine/TileEntitySILEX.java | 21 +- .../machine/TileEntityStorageDrum.java | 18 +- .../machine/rbmk/TileEntityRBMKConsole.java | 17 +- .../machine/storage/TileEntityBarrel.java | 20 +- .../storage/TileEntitySoyuzCapsule.java | 19 +- .../turret/TileEntityTurretBaseNT.java | 11 +- .../turret/TileEntityTurretBrandon.java | 9 + .../turret/TileEntityTurretChekhov.java | 9 + .../turret/TileEntityTurretFriendly.java | 10 + .../turret/TileEntityTurretFritz.java | 9 + .../turret/TileEntityTurretHoward.java | 9 + .../turret/TileEntityTurretHowardDamaged.java | 15 + .../turret/TileEntityTurretJeremy.java | 9 + .../turret/TileEntityTurretMaxwell.java | 8 + .../turret/TileEntityTurretRichard.java | 9 + .../turret/TileEntityTurretTauon.java | 9 + 148 files changed, 780 insertions(+), 1408 deletions(-) diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 59035df1f..2e25c807f 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -616,7 +616,6 @@ public class ModBlocks { public static Block sat_dock; public static Block soyuz_capsule; - public static final int guiID_capsule = 93; public static Block crate_iron; public static Block crate_steel; @@ -637,7 +636,6 @@ public class ModBlocks { public static Block nuke_n2; public static Block nuke_n45; public static Block nuke_fstbmb; - public static final int guiID_nuke_fstbmb = 96; public static Block bomb_multi; public static Block heater_firebox; @@ -666,19 +664,15 @@ public class ModBlocks { public static Block machine_difurnace_rtg_off; public static Block machine_difurnace_rtg_on; //public static final int guiID_test_difurnace = 1; historical - public static final int guiID_rtg_difurnace = 125; public static Block machine_centrifuge; public static Block machine_gascent; 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; @@ -724,13 +718,11 @@ 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 Block machine_microwave; - public static final int guiID_microwave = 97; public static Block machine_arc_furnace_off; public static Block machine_arc_furnace_on; @@ -804,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; @@ -851,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; @@ -949,7 +938,6 @@ public class ModBlocks { public static Block machine_steam_engine; public static Block machine_turbine; 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; @@ -975,8 +963,7 @@ public class ModBlocks { 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 Block machine_assemfac; @@ -1017,11 +1004,9 @@ public class ModBlocks { public static Block machine_keyforge; public static Block machine_armor_table; - public static final int guiID_armor_table = 102; - + public static Block reactor_research; public static Block reactor_zirnox; - public static final int guiID_reactor_zirnox = 124; public static Block zirnox_destroyed; public static Block machine_controller; @@ -1033,12 +1018,10 @@ public class ModBlocks { public static Block radiorec; public static Block machine_forcefield; - public static final int guiID_forcefield = 75; - + public static Block machine_waste_drum; public static Block machine_storage_drum; - public static final int guiID_storage_drum = 118; - + public static Block machine_autocrafter; public static Block anvil_iron; @@ -1052,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; @@ -1095,7 +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_console = 117; public static Block rbmk_loader; public static Block rbmk_steam_inlet; public static Block rbmk_steam_outlet; @@ -1742,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"); @@ -2222,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); @@ -2322,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..34704c5f8 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,14 @@ 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 + 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..0b05a13d0 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,21 @@ 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 + 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/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..76e82f66c 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,14 @@ 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 + 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/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/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..128a1264e 100644 --- a/src/main/java/com/hbm/entity/cart/EntityMinecartCrate.java +++ b/src/main/java/com/hbm/entity/cart/EntityMinecartCrate.java @@ -3,24 +3,27 @@ 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 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 +43,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 +102,14 @@ 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 + 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..48cde41db 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,14 @@ 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 + 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 7f41530bc..c23ddbcf0 100644 --- a/src/main/java/com/hbm/handler/GUIHandler.java +++ b/src/main/java/com/hbm/handler/GUIHandler.java @@ -18,6 +18,7 @@ import com.hbm.tileentity.machine.storage.*; import com.hbm.tileentity.turret.*; 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; @@ -29,10 +30,10 @@ 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,583 +48,25 @@ public class GUIHandler implements IGuiHandler { return ((IGUIProvider) item.getItem()).provideContainer(ID, player, world, x, y, z); } + Entity entity = player.worldObj.getEntityByID(x); + + if(entity != null && entity instanceof IGUIProvider) { + return ((IGUIProvider) entity).provideContainer(ID, player, world, x, y, z); + } + //notice: stop doing this, unless you absolutely have to :3 //notice: stop doing this completely, period :P - - switch(ID) { - - - 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_storage_drum: { - if(entity instanceof TileEntityStorageDrum) { - return new ContainerStorageDrum(player.inventory, (TileEntityStorageDrum) 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_rtg_difurnace: { - if (entity instanceof TileEntityDiFurnaceRTG) { - return new ContainerMachineDiFurnaceRTG(player.inventory, (TileEntityDiFurnaceRTG) entity); - } - return null; - } - - 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)); - } 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); @@ -638,592 +81,15 @@ public class GUIHandler implements IGuiHandler { return ((IGUIProvider) item.getItem()).provideGUI(ID, player, world, x, y, z); } + Entity entity = player.worldObj.getEntityByID(x); + + if(entity != null && entity instanceof IGUIProvider) { + return ((IGUIProvider) entity).provideGUI(ID, player, world, x, y, z); + } + //stop doing this unless you absolutely have to ;3 //stop doing this, period >:3 - - switch(ID) { - - 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_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_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_rtg_difurnace: { - if (entity instanceof TileEntityDiFurnaceRTG) { - return new GUIMachineDiFurnaceRTG(player.inventory, (TileEntityDiFurnaceRTG) entity); - } - return null; - } - - 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)); - } return null; } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index f148a81ff..05b47d310 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -2631,22 +2631,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..8efb96193 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,14 @@ 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 + 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..411cb2479 100644 --- a/src/main/java/com/hbm/items/machine/ItemTemplateFolder.java +++ b/src/main/java/com/hbm/items/machine/ItemTemplateFolder.java @@ -2,22 +2,26 @@ 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 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 +34,14 @@ 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 + 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..ce2e9e762 100644 --- a/src/main/java/com/hbm/items/special/ItemBook.java +++ b/src/main/java/com/hbm/items/special/ItemBook.java @@ -2,15 +2,20 @@ 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 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 +27,21 @@ 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 + 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..acdab4b60 100644 --- a/src/main/java/com/hbm/items/special/ItemHolotapeImage.java +++ b/src/main/java/com/hbm/items/special/ItemHolotapeImage.java @@ -2,16 +2,20 @@ 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 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 +23,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 +72,14 @@ 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 + 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..aac1e5d1f 100644 --- a/src/main/java/com/hbm/items/tool/ItemCatalog.java +++ b/src/main/java/com/hbm/items/tool/ItemCatalog.java @@ -2,21 +2,26 @@ 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 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 +34,17 @@ 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 + 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..376b89e04 100644 --- a/src/main/java/com/hbm/items/tool/ItemDesingatorManual.java +++ b/src/main/java/com/hbm/items/tool/ItemDesingatorManual.java @@ -2,23 +2,27 @@ 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 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 +47,14 @@ 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 + 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..66b3702b8 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,14 @@ 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 + 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..bb9196674 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,19 @@ public class ItemSatInterface extends ItemSatChip { } } + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + 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/TileEntityNukeBalefire.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java index c92caa00e..ba777a915 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,14 @@ 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 + 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/machine/TileEntityDiFurnaceRTG.java b/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnaceRTG.java index 7a1a8dbe4..d8ec77f1e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnaceRTG.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnaceRTG.java @@ -1,14 +1,21 @@ 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 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 +180,14 @@ 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 + 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/TileEntityFEL.java b/src/main/java/com/hbm/tileentity/machine/TileEntityFEL.java index f3f564292..e15e8165b 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,14 @@ 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 + 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/TileEntityHadron.java b/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java index 2bfb33a88..b45894d9d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java @@ -8,12 +8,15 @@ 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; @@ -21,14 +24,17 @@ import api.hbm.energy.IEnergyUser; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; 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 +745,14 @@ 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 + 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..183059b4d 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,14 @@ 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 + 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/TileEntityMachineCrystallizer.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java index 0b4ec923e..741e80b5c 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,14 @@ 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 + 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/TileEntityMachineLargeTurbine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java index ac1fb1502..914b16794 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,14 @@ 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 + 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/TileEntityMachineMiningLaser.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMiningLaser.java index e7a48aa48..8132d04a5 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,14 @@ 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 + 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/TileEntityMachinePlasmaHeater.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java index bc8d7253f..45109dcc3 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,14 @@ 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 + 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/TileEntityMicrowave.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java index 4c2e2feed..3e034142c 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,14 @@ 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 + 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/TileEntityReactorZirnox.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java index f56240304..8d9f26214 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java @@ -16,35 +16,40 @@ 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.ItemZirnoxBreedingRod; import com.hbm.items.machine.ItemZirnoxRod; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.fauxpointtwelve.DirPos; import api.hbm.fluid.IFluidStandardTransceiver; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Vec3; -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.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 +586,14 @@ 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 + 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/TileEntitySILEX.java b/src/main/java/com/hbm/tileentity/machine/TileEntitySILEX.java index 6593f7ad0..ae4270520 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,14 @@ 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 + 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/TileEntityStorageDrum.java b/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java index 52172bafb..ab9adedfa 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityStorageDrum.java @@ -8,20 +8,26 @@ 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 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 +35,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 +328,14 @@ 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 + 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/rbmk/TileEntityRBMKConsole.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java index aa9c4634f..413e94c14 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,14 @@ 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 + 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/storage/TileEntityBarrel.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java index 2dce4df9c..5f350f93f 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; @@ -25,13 +28,16 @@ import api.hbm.fluid.IFluidStandardTransceiver; import api.hbm.fluid.IPipeNet; import api.hbm.fluid.PipeNet; 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 +336,14 @@ 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 + 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/TileEntitySoyuzCapsule.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntitySoyuzCapsule.java index 6eea311be..d4f2561c5 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,14 @@ 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 + 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..568431479 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,9 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple cachedCasingConfig = null; } + + @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..85619ae9b 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBrandon.java @@ -2,6 +2,10 @@ package com.hbm.tileentity.turret; import java.util.List; +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 +32,9 @@ public class TileEntityTurretBrandon extends TileEntityTurretBaseNT { return null; } + @Override + 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..ae3565089 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretChekhov.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretChekhov.java @@ -6,12 +6,16 @@ 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 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 +170,9 @@ public class TileEntityTurretChekhov extends TileEntityTurretBaseNT { public boolean usesCasings() { return true; } + + @Override + 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..f040365b8 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFriendly.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretFriendly.java @@ -5,6 +5,11 @@ import java.util.List; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.CasingEjector; +import com.hbm.inventory.gui.GUITurretFriendly; + +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; public class TileEntityTurretFriendly extends TileEntityTurretChekhov { @@ -39,4 +44,9 @@ public class TileEntityTurretFriendly extends TileEntityTurretChekhov { protected CasingEjector getEjector() { return ejector; } + + @Override + 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..0402cd26c 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,9 @@ public class TileEntityTurretFritz extends TileEntityTurretBaseNT implements IFl public boolean canConnect(FluidType type, ForgeDirection dir) { return dir != ForgeDirection.UP && dir != ForgeDirection.DOWN; } + + @Override + 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..f17434678 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,11 @@ import com.hbm.particle.SpentCasing; import com.hbm.util.EntityDamageUtil; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +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 +211,9 @@ public class TileEntityTurretHoward extends TileEntityTurretBaseNT { public boolean usesCasings() { return true; } + + @Override + 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..994e9263d 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHowardDamaged.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHowardDamaged.java @@ -2,17 +2,22 @@ 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 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 +100,14 @@ public class TileEntityTurretHowardDamaged extends TileEntityTurretHoward { } } } + + @Override + public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + 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..16ebe86f3 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretJeremy.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretJeremy.java @@ -6,12 +6,16 @@ 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 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 +137,9 @@ public class TileEntityTurretJeremy extends TileEntityTurretBaseNT { public int casingDelay() { return 22; } + + @Override + 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..8cbae5c0f 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,9 @@ public class TileEntityTurretMaxwell extends TileEntityTurretBaseNT { else super.networkUnpack(nbt); } + + @Override + 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..033491f50 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretRichard.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretRichard.java @@ -7,11 +7,15 @@ 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 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 +169,9 @@ public class TileEntityTurretRichard extends TileEntityTurretBaseNT { super.writeToNBT(nbt); nbt.setInteger("loaded", this.loaded); } + + @Override + 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..97a0e3f99 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java @@ -5,13 +5,17 @@ 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 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 +154,9 @@ public class TileEntityTurretTauon extends TileEntityTurretBaseNT { else super.networkUnpack(nbt); } + + @Override + public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { + return new GUITurretTauon(player.inventory, this); + } }