From 094b67e0507caa21d5fab4bf6918d795647567ba Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 6 Sep 2017 13:46:12 +0100 Subject: [PATCH] Slight rework of the gui system, should fix some issues with wrenching. Should fix #1264 fixes #988 + a handful of weird gui de-syncs --- .gitignore | 1 + .../blocks/BlockAutoCraftingTable.java | 10 +++------- .../techreborn/blocks/BlockComputerCube.java | 9 +++------ .../techreborn/blocks/BlockDigitalChest.java | 9 +++------ .../blocks/BlockFusionControlComputer.java | 10 +++++++--- .../techreborn/blocks/BlockPlayerDetector.java | 7 +++++++ .../techreborn/blocks/BlockQuantumChest.java | 8 +++----- .../java/techreborn/blocks/BlockQuantumTank.java | 13 +++---------- .../techreborn/blocks/BlockSupercondensator.java | 7 +++++++ .../advanced_machine/BlockDistillationTower.java | 7 +++++++ .../BlockImplosionCompressor.java | 9 +++------ .../BlockIndustrialBlastFurnace.java | 9 +++------ .../BlockIndustrialCentrifuge.java | 10 +++------- .../BlockIndustrialElectrolyzer.java | 9 +++------ .../advanced_machine/BlockIndustrialGrinder.java | 12 +++--------- .../advanced_machine/BlockIndustrialSawmill.java | 12 +++--------- .../blocks/generator/BlockDieselGenerator.java | 13 +++---------- .../blocks/generator/BlockDragonEggSyphon.java | 7 +++++++ .../blocks/generator/BlockGasTurbine.java | 12 +++--------- .../blocks/generator/BlockLightningRod.java | 7 +++++++ .../generator/BlockMagicEnergyAbsorber.java | 7 +++++++ .../generator/BlockMagicEnergyConverter.java | 7 +++++++ .../blocks/generator/BlockPlasmaGenerator.java | 7 +++++++ .../generator/BlockSemiFluidGenerator.java | 12 +++--------- .../generator/BlockSolidFuelGenerator.java | 10 +++------- .../blocks/generator/BlockThermalGenerator.java | 12 +++--------- .../blocks/generator/BlockWindMill.java | 7 +++++++ .../iron_machines/BlockIronAlloyFurnace.java | 9 +++------ .../blocks/iron_machines/BlockIronFurnace.java | 9 +++------ .../blocks/machine/BlockAssemblingMachine.java | 9 +++------ .../blocks/machine/BlockChargeOMat.java | 9 +++------ .../blocks/machine/BlockChemicalReactor.java | 9 +++------ .../blocks/machine/BlockChunkLoader.java | 9 +++------ .../blocks/machine/BlockMatterFabricator.java | 9 +++------ .../blocks/machine/BlockRollingMachine.java | 9 +++------ .../blocks/machine/BlockScrapboxinator.java | 10 +++------- .../blocks/machine/BlockVacuumFreezer.java | 11 +++-------- .../blocks/tier1/BlockAlloySmelter.java | 9 +++------ .../techreborn/blocks/tier1/BlockCompressor.java | 10 +++------- .../blocks/tier1/BlockElectricFurnace.java | 10 +++------- .../techreborn/blocks/tier1/BlockExtractor.java | 10 +++------- .../techreborn/blocks/tier1/BlockGrinder.java | 10 +++------- .../techreborn/blocks/tier1/BlockRecycler.java | 11 ++++------- src/main/java/techreborn/client/EGui.java | 16 +++++++++++++++- 44 files changed, 183 insertions(+), 229 deletions(-) diff --git a/.gitignore b/.gitignore index c98c33bd4..2474789f3 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ changelog.txt java_pid2412.hprof /asmTemp/ /logs/ +/classes/ diff --git a/src/main/java/techreborn/blocks/BlockAutoCraftingTable.java b/src/main/java/techreborn/blocks/BlockAutoCraftingTable.java index f056d4f64..3ab354b46 100644 --- a/src/main/java/techreborn/blocks/BlockAutoCraftingTable.java +++ b/src/main/java/techreborn/blocks/BlockAutoCraftingTable.java @@ -34,6 +34,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -71,12 +72,7 @@ public class BlockAutoCraftingTable extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) { - player.openGui( Core.INSTANCE, EGui.AUTO_CRAFTING_TABLE.ordinal(), world, pos.getX(), pos.getY(),pos.getZ()); - } - return true; + public IMachineGuiHandler getGui() { + return EGui.AUTO_CRAFTING_TABLE; } } diff --git a/src/main/java/techreborn/blocks/BlockComputerCube.java b/src/main/java/techreborn/blocks/BlockComputerCube.java index 0f9bee9b7..b50b30714 100644 --- a/src/main/java/techreborn/blocks/BlockComputerCube.java +++ b/src/main/java/techreborn/blocks/BlockComputerCube.java @@ -31,6 +31,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -45,11 +46,7 @@ public class BlockComputerCube extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.MANUAL.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.MANUAL; } } diff --git a/src/main/java/techreborn/blocks/BlockDigitalChest.java b/src/main/java/techreborn/blocks/BlockDigitalChest.java index 4ffb9df76..7a78de045 100644 --- a/src/main/java/techreborn/blocks/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/BlockDigitalChest.java @@ -39,6 +39,7 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidBase; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -123,11 +124,7 @@ public class BlockDigitalChest extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.DIGITAL_CHEST.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.DIGITAL_CHEST; } } diff --git a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java index 6ef123b19..5fc5e3868 100644 --- a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java @@ -34,6 +34,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -56,9 +57,12 @@ public class BlockFusionControlComputer extends BlockMachineBase { final float hitX, final float hitY, final float hitZ) { final TileFusionControlComputer tileFusionControlComputer = (TileFusionControlComputer) world.getTileEntity(pos); tileFusionControlComputer.checkCoils(); - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.FUSION_CONTROLLER.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + return super.onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ); + } + + @Override + public IMachineGuiHandler getGui() { + return EGui.FUSION_CONTROLLER; } @Override diff --git a/src/main/java/techreborn/blocks/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/BlockPlayerDetector.java index 29a17a741..34d3be56e 100644 --- a/src/main/java/techreborn/blocks/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/BlockPlayerDetector.java @@ -47,11 +47,13 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.PropertyString; import reborncore.common.util.ArrayUtils; import reborncore.common.util.ChatUtils; import reborncore.common.util.StringUtils; +import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModBlocks; import techreborn.lib.MessageIDs; @@ -179,4 +181,9 @@ public class BlockPlayerDetector extends BlockMachineBase { public int getMetaFromState(IBlockState state) { return typeNamesList.indexOf(state.getValue(TYPE)); } + + @Override + public IMachineGuiHandler getGui() { + return null; + } } diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java index b5453e4a9..e9d37a867 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java @@ -39,6 +39,7 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidBase; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -124,10 +125,7 @@ public class BlockQuantumChest extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World worldIn, final BlockPos pos, final IBlockState state, final EntityPlayer playerIn, - final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ) { - if (!playerIn.isSneaking()) - playerIn.openGui(Core.INSTANCE, EGui.QUANTUM_CHEST.ordinal(), worldIn, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.QUANTUM_CHEST; } } diff --git a/src/main/java/techreborn/blocks/BlockQuantumTank.java b/src/main/java/techreborn/blocks/BlockQuantumTank.java index 9a339b6f0..ee5f28f64 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/BlockQuantumTank.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -55,15 +56,7 @@ public class BlockQuantumTank extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (this.fillBlockWithFluid(world, pos, player)) { - return true; - } - if (!player.isSneaking()) { - player.openGui(Core.INSTANCE, EGui.QUANTUM_TANK.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - } - return true; + public IMachineGuiHandler getGui() { + return EGui.QUANTUM_TANK; } } diff --git a/src/main/java/techreborn/blocks/BlockSupercondensator.java b/src/main/java/techreborn/blocks/BlockSupercondensator.java index b609804bb..26646d093 100644 --- a/src/main/java/techreborn/blocks/BlockSupercondensator.java +++ b/src/main/java/techreborn/blocks/BlockSupercondensator.java @@ -31,7 +31,9 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; +import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; public class BlockSupercondensator extends BlockMachineBase { @@ -47,4 +49,9 @@ public class BlockSupercondensator extends BlockMachineBase { // TODO // Remember to remove WIP override and imports once complete } + + @Override + public IMachineGuiHandler getGui() { + return null; + } } diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java b/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java index 89af08756..41d0a3397 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java @@ -26,7 +26,9 @@ package techreborn.blocks.advanced_machine; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; +import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; @@ -37,4 +39,9 @@ public class BlockDistillationTower extends BlockMachineBase { setCreativeTab(TechRebornCreativeTab.instance); ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } + + @Override + public IMachineGuiHandler getGui() { + return null; + } } diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java index 883d0aa03..bb4caed5d 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,11 +55,7 @@ public class BlockImplosionCompressor extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) - player.openGui( Core.INSTANCE, EGui.IMPLOSION_COMPRESSOR.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.IMPLOSION_COMPRESSOR; } } diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialBlastFurnace.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialBlastFurnace.java index d62db0527..7a9a3626a 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialBlastFurnace.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialBlastFurnace.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,12 +55,8 @@ public class BlockIndustrialBlastFurnace extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.BLAST_FURNACE.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.BLAST_FURNACE; } @Override diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialCentrifuge.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialCentrifuge.java index 37882e759..165271367 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialCentrifuge.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialCentrifuge.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,12 +55,7 @@ public class BlockIndustrialCentrifuge extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) { - player.openGui(Core.INSTANCE, EGui.CENTRIFUGE.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - } - return true; + public IMachineGuiHandler getGui() { + return EGui.CENTRIFUGE; } } diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java index 6d17b0978..312e77ef8 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,11 +55,7 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) - player.openGui( Core.INSTANCE, EGui.INDUSTRIAL_ELECTROLYZER.ordinal(), world, pos.getX(), pos.getY(),pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.INDUSTRIAL_ELECTROLYZER; } } diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java index 1324454b5..bc5d7c550 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,14 +55,7 @@ public class BlockIndustrialGrinder extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (this.fillBlockWithFluid(world, pos, player)) { - return true; - } - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.INDUSTRIAL_GRINDER.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.INDUSTRIAL_GRINDER; } } diff --git a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java index 125c18a4c..bbbe1ac81 100644 --- a/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,14 +55,7 @@ public class BlockIndustrialSawmill extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (this.fillBlockWithFluid(world, pos, player)) { - return true; - } - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.SAWMILL.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.SAWMILL; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index 9b00d1faa..d4b867362 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -60,15 +61,7 @@ public class BlockDieselGenerator extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (this.fillBlockWithFluid(world, pos, player)) { - return true; - } - if (!player.isSneaking()) { - player.openGui(Core.INSTANCE, EGui.DIESEL_GENERATOR.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - } - return true; + public IMachineGuiHandler getGui() { + return EGui.DIESEL_GENERATOR; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java index b542f71c6..c37a07ad8 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java +++ b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java @@ -31,7 +31,9 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; +import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileDragonEggSyphon; @@ -58,4 +60,9 @@ public class BlockDragonEggSyphon extends BlockMachineBase { //Remember to remove WIP override and imports once complete } + @Override + public IMachineGuiHandler getGui() { + return null; + } + } diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java index b887a78f3..bfe935a61 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,15 +55,8 @@ public class BlockGasTurbine extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (this.fillBlockWithFluid(world, pos, player)) { - return true; - } - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.GAS_TURBINE.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.GAS_TURBINE; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java index afc375514..6a98b71ac 100644 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -28,7 +28,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; +import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileLightningRod; @@ -46,4 +48,9 @@ public class BlockLightningRod extends BlockMachineBase { return new TileLightningRod(); } + + @Override + public IMachineGuiHandler getGui() { + return null; + } } diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java index ea48b3f2b..dbc2c7e30 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java @@ -32,7 +32,9 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; +import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; @@ -51,4 +53,9 @@ public class BlockMagicEnergyAbsorber extends BlockMachineBase { // Remember to remove WIP override and imports once complete } + @Override + public IMachineGuiHandler getGui() { + return null; + } + } diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java index 528641b84..8806b0e80 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java @@ -32,7 +32,9 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; +import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; @@ -50,4 +52,9 @@ public class BlockMagicEnergyConverter extends BlockMachineBase { //TODO //Remember to remove WIP override and imports once complete } + + @Override + public IMachineGuiHandler getGui() { + return null; + } } diff --git a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java index 1ee4c07b7..2f398f520 100644 --- a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java @@ -31,7 +31,9 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; +import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; public class BlockPlasmaGenerator extends BlockMachineBase { @@ -48,4 +50,9 @@ public class BlockPlasmaGenerator extends BlockMachineBase { // TODO // Remember to remove WIP override and imports once complete } + + @Override + public IMachineGuiHandler getGui() { + return null; + } } diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index 2d2d88c2f..b36ab5fbd 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,14 +55,7 @@ public class BlockSemiFluidGenerator extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (this.fillBlockWithFluid(world, pos, player)) { - return true; - } - if (!player.isSneaking()) - player.openGui( Core.INSTANCE, EGui.SEMIFLUID_GENERATOR.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.SEMIFLUID_GENERATOR; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java index f86e02da6..06e7c006e 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,12 +55,7 @@ public class BlockSolidFuelGenerator extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) { - player.openGui(Core.INSTANCE, EGui.GENERATOR.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - } - return true; + public IMachineGuiHandler getGui() { + return EGui.GENERATOR; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index 768d17b45..2f34554fc 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,14 +55,7 @@ public class BlockThermalGenerator extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (this.fillBlockWithFluid(world, pos, player)) { - return true; - } - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.THERMAL_GENERATOR.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.THERMAL_GENERATOR; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockWindMill.java b/src/main/java/techreborn/blocks/generator/BlockWindMill.java index 53da18c38..af5478f8e 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWindMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWindMill.java @@ -28,7 +28,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; +import techreborn.client.EGui; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileWindMill; @@ -50,4 +52,9 @@ public class BlockWindMill extends BlockMachineBase { return new TileWindMill(); } + + @Override + public IMachineGuiHandler getGui() { + return null; + } } diff --git a/src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java b/src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java index a27fb7617..9b65b06cd 100644 --- a/src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java @@ -35,6 +35,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -59,12 +60,8 @@ public class BlockIronAlloyFurnace extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.ALLOY_FURNACE.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.ALLOY_FURNACE; } @Override diff --git a/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java b/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java index f703fda9b..43604fa6c 100644 --- a/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java +++ b/src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java @@ -38,6 +38,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -63,12 +64,8 @@ public class BlockIronFurnace extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.IRON_FURNACE.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.IRON_FURNACE; } @Override diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java index d1f866707..9e0d578cd 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,11 +55,7 @@ public class BlockAssemblingMachine extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.ASSEMBLING_MACHINE.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.ASSEMBLING_MACHINE; } } diff --git a/src/main/java/techreborn/blocks/machine/BlockChargeOMat.java b/src/main/java/techreborn/blocks/machine/BlockChargeOMat.java index d408892ac..c6d80ac09 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChargeOMat.java +++ b/src/main/java/techreborn/blocks/machine/BlockChargeOMat.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,11 +55,7 @@ public class BlockChargeOMat extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.CHARGEBENCH.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.CHARGEBENCH; } } diff --git a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java index d646c60c3..1fbfd34a1 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,11 +55,7 @@ public class BlockChemicalReactor extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.CHEMICAL_REACTOR.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.CHEMICAL_REACTOR; } } diff --git a/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java b/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java index 8fe32a37b..740935415 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/machine/BlockChunkLoader.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,11 +55,7 @@ public class BlockChunkLoader extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.CHUNK_LOADER.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.CHUNK_LOADER; } } diff --git a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java index c7ad66972..151470001 100644 --- a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,12 +55,8 @@ public class BlockMatterFabricator extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.MATTER_FABRICATOR.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.MATTER_FABRICATOR; } @Override diff --git a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java index 53ee0cf21..5afabca7c 100644 --- a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,11 +55,7 @@ public class BlockRollingMachine extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.ROLLING_MACHINE.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.ROLLING_MACHINE; } } diff --git a/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java b/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java index 644c247e4..197d4a8cb 100644 --- a/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java +++ b/src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java @@ -36,6 +36,7 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -59,13 +60,8 @@ public class BlockScrapboxinator extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) { - player.openGui(Core.INSTANCE, EGui.SCRAPBOXINATOR.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - } - return true; + public IMachineGuiHandler getGui() { + return EGui.SCRAPBOXINATOR; } @Override diff --git a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java index 15006ad68..4a9328b28 100644 --- a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,13 +55,7 @@ public class BlockVacuumFreezer extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) { - player.openGui(Core.INSTANCE, EGui.VACUUM_FREEZER.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; - } - return false; + public IMachineGuiHandler getGui() { + return EGui.VACUUM_FREEZER; } } diff --git a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java index 92fdc4c63..543539970 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,11 +55,7 @@ public class BlockAlloySmelter extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, EGui.ALLOY_SMELTER.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - return true; + public IMachineGuiHandler getGui() { + return EGui.ALLOY_SMELTER; } } diff --git a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java index 020c31df0..1a4ade93b 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,12 +55,7 @@ public class BlockCompressor extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) { - player.openGui(Core.INSTANCE, EGui.COMPRESSOR.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - } - return true; + public IMachineGuiHandler getGui() { + return EGui.COMPRESSOR; } } diff --git a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java index 1722bffd1..9b6667c87 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java +++ b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,12 +55,7 @@ public class BlockElectricFurnace extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) { - player.openGui(Core.INSTANCE, EGui.ELECTRIC_FURNACE.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - } - return true; + public IMachineGuiHandler getGui() { + return EGui.ELECTRIC_FURNACE; } } diff --git a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java index 450541ee7..b443b2e0f 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,12 +55,7 @@ public class BlockExtractor extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) { - player.openGui(Core.INSTANCE, EGui.EXTRACTOR.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - } - return true; + public IMachineGuiHandler getGui() { + return EGui.EXTRACTOR; } } diff --git a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java index 70b086798..c1db780b8 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,12 +55,7 @@ public class BlockGrinder extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) { - player.openGui(Core.INSTANCE, EGui.GRINDER.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - } - return true; + public IMachineGuiHandler getGui() { + return EGui.GRINDER; } } diff --git a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java index fe4b5babd..18c8b5d7c 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java +++ b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java @@ -33,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import prospector.shootingstar.ShootingStar; import prospector.shootingstar.model.ModelCompound; +import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import techreborn.Core; import techreborn.client.EGui; @@ -54,12 +55,8 @@ public class BlockRecycler extends BlockMachineBase { } @Override - public boolean onBlockActivated(final World world, final BlockPos pos, final IBlockState state, - final EntityPlayer player, final EnumHand hand, final EnumFacing side, - final float hitX, final float hitY, final float hitZ) { - if (!player.isSneaking()) { - player.openGui(Core.INSTANCE, EGui.RECYCLER.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); - } - return true; + public IMachineGuiHandler getGui() { + return EGui.RECYCLER; } + } diff --git a/src/main/java/techreborn/client/EGui.java b/src/main/java/techreborn/client/EGui.java index 32e483686..3ecdc35b6 100644 --- a/src/main/java/techreborn/client/EGui.java +++ b/src/main/java/techreborn/client/EGui.java @@ -24,7 +24,13 @@ package techreborn.client; -public enum EGui { +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import reborncore.api.tile.IMachineGuiHandler; +import techreborn.Core; + +public enum EGui implements IMachineGuiHandler { THERMAL_GENERATOR(true), QUANTUM_TANK(true), @@ -76,4 +82,12 @@ public enum EGui { public boolean useContainerBuilder() { return this.containerBuilder; } + + + @Override + public void open(EntityPlayer player, BlockPos pos, World world) { + if(!world.isRemote){ + player.openGui(Core.INSTANCE, this.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); + } + } }