maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Slight rework of the gui system, should fix some issues with wrenching. Should fix #1264 fixes #988 + a handful of weird gui de-syncs

Browse source
This commit is contained in:
modmuss50 2017-09-06 13:46:12 +01:00
parent 8588a40474
commit 094b67e050
44 changed files with 183 additions and 229 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -24,3 +24,4 @@ changelog.txt
java_pid2412.hprof
/asmTemp/
/logs/
/classes/

10
src/main/java/techreborn/blocks/BlockAutoCraftingTable.java
View file

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

9
src/main/java/techreborn/blocks/BlockComputerCube.java
View file

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

9
src/main/java/techreborn/blocks/BlockDigitalChest.java
View file

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

10
src/main/java/techreborn/blocks/BlockFusionControlComputer.java
View file

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

7
src/main/java/techreborn/blocks/BlockPlayerDetector.java
View file

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

8
src/main/java/techreborn/blocks/BlockQuantumChest.java
View file

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

13
src/main/java/techreborn/blocks/BlockQuantumTank.java
View file

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

7
src/main/java/techreborn/blocks/BlockSupercondensator.java
View file

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

7
src/main/java/techreborn/blocks/advanced_machine/BlockDistillationTower.java
View file

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

9
src/main/java/techreborn/blocks/advanced_machine/BlockImplosionCompressor.java
View file

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

9
src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialBlastFurnace.java
View file

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

10
src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialCentrifuge.java
View file

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

9
src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialElectrolyzer.java
View file

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

12
src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialGrinder.java
View file

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

12
src/main/java/techreborn/blocks/advanced_machine/BlockIndustrialSawmill.java
View file

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

13
src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java
View file

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

7
src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java
View file

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

12
src/main/java/techreborn/blocks/generator/BlockGasTurbine.java
View file

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

7
src/main/java/techreborn/blocks/generator/BlockLightningRod.java
View file

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

7
src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java
View file

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

7
src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java
View file

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

7
src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java
View file

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

12
src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java
View file

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

10
src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java
View file

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

12
src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java
View file

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

7
src/main/java/techreborn/blocks/generator/BlockWindMill.java
View file

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

9
src/main/java/techreborn/blocks/iron_machines/BlockIronAlloyFurnace.java
View file

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

9
src/main/java/techreborn/blocks/iron_machines/BlockIronFurnace.java
View file

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

9
src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java
View file

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

9
src/main/java/techreborn/blocks/machine/BlockChargeOMat.java
View file

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

9
src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java
View file

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

9
src/main/java/techreborn/blocks/machine/BlockChunkLoader.java
View file

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

9
src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java
View file

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

9
src/main/java/techreborn/blocks/machine/BlockRollingMachine.java
View file

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

10
src/main/java/techreborn/blocks/machine/BlockScrapboxinator.java
View file

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

11
src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java
View file

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

9
src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java
View file

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

10
src/main/java/techreborn/blocks/tier1/BlockCompressor.java
View file

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

10
src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java
View file

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

10
src/main/java/techreborn/blocks/tier1/BlockExtractor.java
View file

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

10
src/main/java/techreborn/blocks/tier1/BlockGrinder.java
View file

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

11
src/main/java/techreborn/blocks/tier1/BlockRecycler.java
View file

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

16
src/main/java/techreborn/client/EGui.java
View file

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