Change all containers init to IContainerProvider + Add Enum for gui ids handling

This commit is contained in:
Ourten 2017-01-08 20:34:46 +01:00
parent b93fe6c5ad
commit eb220643fc
114 changed files with 2155 additions and 2025 deletions

View file

@ -4,10 +4,12 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileAssemblingMachine;
@ -15,47 +17,47 @@ public class BlockAssemblingMachine extends BlockMachineBase implements IRotatio
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockAssemblingMachine(Material material) {
public BlockAssemblingMachine(final Material material) {
super();
setUnlocalizedName("techreborn.assemblingmachine");
setCreativeTab(TechRebornCreativeTab.instance);
this.setUnlocalizedName("techreborn.assemblingmachine");
this.setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileAssemblingMachine();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
float hitY, float hitZ) {
public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX,
final float hitY, final float hitZ) {
if (!player.isSneaking())
player.openGui(Core.INSTANCE, GuiHandler.assemblingmachineID, world, x, y, z);
player.openGui(Core.INSTANCE, EGui.ASSEMBLING_MACHINE.ordinal(), world, x, y, z);
return true;
}
@Override
public String getFrontOff() {
return prefix + "assembling_machine_front_off";
return this.prefix + "assembling_machine_front_off";
}
@Override
public String getFrontOn() {
return prefix + "assembling_machine_front_on";
return this.prefix + "assembling_machine_front_on";
}
@Override
public String getSide() {
return prefix + "machine_side";
return this.prefix + "machine_side";
}
@Override
public String getTop() {
return prefix + "machine_top";
return this.prefix + "machine_top";
}
@Override
public String getBottom() {
return prefix + "assembling_machine_top";
return this.prefix + "assembling_machine_top";
}
}

View file

@ -4,10 +4,12 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileChargeBench;
@ -15,47 +17,47 @@ public class BlockChargeBench extends BlockMachineBase implements IRotationTextu
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockChargeBench(Material material) {
public BlockChargeBench(final Material material) {
super();
setUnlocalizedName("techreborn.chargebench");
setCreativeTab(TechRebornCreativeTab.instance);
this.setUnlocalizedName("techreborn.chargebench");
this.setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileChargeBench();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
float hitY, float hitZ) {
public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX,
final float hitY, final float hitZ) {
if (!player.isSneaking())
player.openGui(Core.INSTANCE, GuiHandler.chargeBench, world, x, y, z);
player.openGui(Core.INSTANCE, EGui.CHARGEBENCH.ordinal(), world, x, y, z);
return true;
}
@Override
public String getFrontOff() {
return prefix + "chargeBench_side";
return this.prefix + "chargeBench_side";
}
@Override
public String getFrontOn() {
return prefix + "chargeBench_side";
return this.prefix + "chargeBench_side";
}
@Override
public String getSide() {
return prefix + "chargeBench_side";
return this.prefix + "chargeBench_side";
}
@Override
public String getTop() {
return prefix + "chargeBench_side";
return this.prefix + "chargeBench_side";
}
@Override
public String getBottom() {
return prefix + "chargeBench_side";
return this.prefix + "chargeBench_side";
}
}

View file

@ -4,10 +4,12 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileChemicalReactor;
@ -15,47 +17,47 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockChemicalReactor(Material material) {
public BlockChemicalReactor(final Material material) {
super();
setUnlocalizedName("techreborn.chemicalreactor");
setCreativeTab(TechRebornCreativeTab.instance);
this.setUnlocalizedName("techreborn.chemicalreactor");
this.setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileChemicalReactor();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
float hitY, float hitZ) {
public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX,
final float hitY, final float hitZ) {
if (!player.isSneaking())
player.openGui(Core.INSTANCE, GuiHandler.chemicalReactorID, world, x, y, z);
player.openGui(Core.INSTANCE, EGui.CHEMICAL_REACTOR.ordinal(), world, x, y, z);
return true;
}
@Override
public String getFrontOff() {
return prefix + "chemical_reactor_side_off";
return this.prefix + "chemical_reactor_side_off";
}
@Override
public String getFrontOn() {
return prefix + "chemical_reactor_side_on";
return this.prefix + "chemical_reactor_side_on";
}
@Override
public String getSide() {
return prefix + "machine_side";
return this.prefix + "machine_side";
}
@Override
public String getTop() {
return prefix + "machine_top";
return this.prefix + "machine_top";
}
@Override
public String getBottom() {
return prefix + "chemical_reactor_bottom";
return this.prefix + "chemical_reactor_bottom";
}
}

View file

@ -4,10 +4,12 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileChunkLoader;
@ -15,42 +17,42 @@ public class BlockChunkLoader extends BlockMachineBase implements IAdvancedRotat
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockChunkLoader(Material material) {
public BlockChunkLoader(final Material material) {
super();
setUnlocalizedName("techreborn.chunkloader");
setCreativeTab(TechRebornCreativeTab.instance);
this.setUnlocalizedName("techreborn.chunkloader");
this.setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileChunkLoader();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
float hitY, float hitZ) {
public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX,
final float hitY, final float hitZ) {
if (!player.isSneaking())
player.openGui(Core.INSTANCE, GuiHandler.chunkloaderID, world, x, y, z);
player.openGui(Core.INSTANCE, EGui.CHUNK_LOADER.ordinal(), world, x, y, z);
return true;
}
@Override
public String getFront(boolean isActive) {
return prefix + "industrial_chunk_loader_side";
public String getFront(final boolean isActive) {
return this.prefix + "industrial_chunk_loader_side";
}
@Override
public String getSide(boolean isActive) {
return prefix + "industrial_chunk_loader_side";
public String getSide(final boolean isActive) {
return this.prefix + "industrial_chunk_loader_side";
}
@Override
public String getTop(boolean isActive) {
return prefix + "machine_top";
public String getTop(final boolean isActive) {
return this.prefix + "machine_top";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "machine_bottom";
public String getBottom(final boolean isActive) {
return this.prefix + "machine_bottom";
}
}

View file

@ -4,10 +4,12 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileMatterFabricator;
@ -15,22 +17,22 @@ public class BlockMatterFabricator extends BlockMachineBase implements IAdvanced
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockMatterFabricator(Material material) {
public BlockMatterFabricator(final Material material) {
super();
setUnlocalizedName("techreborn.matterfabricator");
setCreativeTab(TechRebornCreativeTab.instance);
this.setUnlocalizedName("techreborn.matterfabricator");
this.setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) {
return new TileMatterFabricator();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
float hitY, float hitZ) {
public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX,
final float hitY, final float hitZ) {
if (!player.isSneaking())
player.openGui(Core.INSTANCE, GuiHandler.matterfabID, world, x, y, z);
player.openGui(Core.INSTANCE, EGui.MATTER_FABRICATOR.ordinal(), world, x, y, z);
return true;
}
@ -40,22 +42,22 @@ public class BlockMatterFabricator extends BlockMachineBase implements IAdvanced
}
@Override
public String getFront(boolean isActive) {
return isActive ? prefix + "matter_fabricator_on" : prefix + "matter_fabricator_off";
public String getFront(final boolean isActive) {
return isActive ? this.prefix + "matter_fabricator_on" : this.prefix + "matter_fabricator_off";
}
@Override
public String getSide(boolean isActive) {
return isActive ? prefix + "matter_fabricator_on" : prefix + "matter_fabricator_off";
public String getSide(final boolean isActive) {
return isActive ? this.prefix + "matter_fabricator_on" : this.prefix + "matter_fabricator_off";
}
@Override
public String getTop(boolean isActive) {
return isActive ? prefix + "matter_fabricator_on" : prefix + "matter_fabricator_off";
public String getTop(final boolean isActive) {
return isActive ? this.prefix + "matter_fabricator_on" : this.prefix + "matter_fabricator_off";
}
@Override
public String getBottom(boolean isActive) {
return isActive ? prefix + "matter_fabricator_on" : prefix + "matter_fabricator_off";
public String getBottom(final boolean isActive) {
return isActive ? this.prefix + "matter_fabricator_on" : this.prefix + "matter_fabricator_off";
}
}

View file

@ -4,10 +4,12 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileRollingMachine;
@ -15,42 +17,42 @@ public class BlockRollingMachine extends BlockMachineBase implements IAdvancedRo
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockRollingMachine(Material material) {
public BlockRollingMachine(final Material material) {
super();
setUnlocalizedName("techreborn.rollingmachine");
setCreativeTab(TechRebornCreativeTab.instance);
this.setUnlocalizedName("techreborn.rollingmachine");
this.setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) {
return new TileRollingMachine();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
float hitY, float hitZ) {
public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX,
final float hitY, final float hitZ) {
if (!player.isSneaking())
player.openGui(Core.INSTANCE, GuiHandler.rollingMachineID, world, x, y, z);
player.openGui(Core.INSTANCE, EGui.ROLLING_MACHINE.ordinal(), world, x, y, z);
return true;
}
@Override
public String getFront(boolean isActive) {
return isActive ? prefix + "rolling_machine_side_on" : prefix + "rolling_machine_side_off";
public String getFront(final boolean isActive) {
return isActive ? this.prefix + "rolling_machine_side_on" : this.prefix + "rolling_machine_side_off";
}
@Override
public String getSide(boolean isActive) {
return prefix + "machine_side";
public String getSide(final boolean isActive) {
return this.prefix + "machine_side";
}
@Override
public String getTop(boolean isActive) {
return prefix + "machine_top";
public String getTop(final boolean isActive) {
return this.prefix + "machine_top";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "machine_bottom";
public String getBottom(final boolean isActive) {
return this.prefix + "machine_bottom";
}
}

View file

@ -4,10 +4,12 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileScrapboxinator;
@ -15,48 +17,48 @@ public class BlockScrapboxinator extends BlockMachineBase implements IRotationTe
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockScrapboxinator(Material material) {
public BlockScrapboxinator(final Material material) {
super();
setUnlocalizedName("techreborn.scrapboxinator");
setCreativeTab(TechRebornCreativeTab.instance);
this.setUnlocalizedName("techreborn.scrapboxinator");
this.setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
public TileEntity createNewTileEntity(final World p_149915_1_, final int p_149915_2_) {
return new TileScrapboxinator();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
float hitY, float hitZ) {
public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float hitX,
final float hitY, final float hitZ) {
if (!player.isSneaking()) {
player.openGui(Core.INSTANCE, GuiHandler.scrapboxinatorID, world, x, y, z);
player.openGui(Core.INSTANCE, EGui.SCRAPBOXINATOR.ordinal(), world, x, y, z);
}
return true;
}
@Override
public String getFrontOff() {
return prefix + "scrapboxinator_front_off";
return this.prefix + "scrapboxinator_front_off";
}
@Override
public String getFrontOn() {
return prefix + "scrapboxinator_front_on";
return this.prefix + "scrapboxinator_front_on";
}
@Override
public String getSide() {
return prefix + "machine_side";
return this.prefix + "machine_side";
}
@Override
public String getTop() {
return prefix + "machine_top";
return this.prefix + "machine_top";
}
@Override
public String getBottom() {
return prefix + "machine_bottom";
return this.prefix + "machine_bottom";
}
}

View file

@ -8,10 +8,12 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core;
import techreborn.client.GuiHandler;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.multiblock.TileVacuumFreezer;
@ -19,43 +21,43 @@ public class BlockVacuumFreezer extends BlockMachineBase implements IAdvancedRot
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockVacuumFreezer(Material material) {
public BlockVacuumFreezer(final Material material) {
super();
setUnlocalizedName("techreborn.vacuumfreezer");
setCreativeTab(TechRebornCreativeTab.instance);
this.setUnlocalizedName("techreborn.vacuumfreezer");
this.setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
public TileEntity createNewTileEntity(final World world, final int meta) {
return new TileVacuumFreezer();
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
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, GuiHandler.vacuumFreezerID, world, pos.getX(), pos.getY(), pos.getZ());
player.openGui(Core.INSTANCE, EGui.VACUUM_FREEZER.ordinal(), world, pos.getX(), pos.getY(), pos.getZ());
return true;
}
return false;
}
@Override
public String getFront(boolean isActive) {
return prefix + "vacuum_freezer_front";
public String getFront(final boolean isActive) {
return this.prefix + "vacuum_freezer_front";
}
@Override
public String getSide(boolean isActive) {
return prefix + "machine_side";
public String getSide(final boolean isActive) {
return this.prefix + "machine_side";
}
@Override
public String getTop(boolean isActive) {
return prefix + "vacuum_freezer_top";
public String getTop(final boolean isActive) {
return this.prefix + "vacuum_freezer_top";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "machine_bottom";
public String getBottom(final boolean isActive) {
return this.prefix + "machine_bottom";
}
}