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

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

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

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

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

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

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

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

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

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

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

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

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