And thy punishment...

is death!
This commit is contained in:
Vaern 2023-02-22 21:19:07 -08:00
parent be10276e18
commit 905fe32d22
148 changed files with 780 additions and 1408 deletions

View File

@ -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");

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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;
}

View File

@ -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 {

View File

@ -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;

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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));
}
}

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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);
}
}

View File

@ -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 {

View File

@ -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());

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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!"));
}

View File

@ -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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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;

View File

@ -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

View File

@ -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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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;
}

View File

@ -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;

View File

@ -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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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 {

View File

@ -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;

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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);
}
}

View File

@ -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!"));
}

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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 {

View File

@ -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

View File

@ -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 {

View File

@ -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!"));
}

View File

@ -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;

View File

@ -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 {

Some files were not shown because too many files have changed in this diff Show More