From 94a2229ed7928bd66fa8a0addc1ce233d635eb18 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 27 Nov 2015 19:54:34 +0000 Subject: [PATCH] All block textures now work --- .../techreborn/blocks/BlockChunkLoader.java | 24 ++++++++- .../techreborn/blocks/BlockComputerCube.java | 24 ++++++++- .../techreborn/blocks/BlockDigitalChest.java | 24 ++++++++- .../blocks/BlockElectricCraftingTable.java | 23 ++++++++- .../techreborn/blocks/BlockFusionCoil.java | 7 +++ .../blocks/BlockFusionControlComputer.java | 24 ++++++++- .../blocks/BlockHighlyAdvancedMachine.java | 10 ++++ .../blocks/BlockPlayerDetector.java | 51 ++++++++++++++----- .../techreborn/blocks/BlockQuantumChest.java | 24 ++++++++- .../techreborn/blocks/BlockQuantumTank.java | 24 ++++++++- .../blocks/BlockSupercondensator.java | 24 ++++++++- .../generator/BlockDieselGenerator.java | 25 ++++++++- .../generator/BlockDragonEggSiphoner.java | 23 ++++++++- .../blocks/generator/BlockGasTurbine.java | 23 ++++++++- .../blocks/generator/BlockHeatGenerator.java | 23 ++++++++- .../blocks/generator/BlockLightningRod.java | 25 ++++++++- .../generator/BlockMagicEnergyAbsorber.java | 25 ++++++++- .../generator/BlockMagicEnergyConverter.java | 27 ++++++++-- .../generator/BlockPlasmaGenerator.java | 23 ++++++++- .../generator/BlockSemiFluidGenerator.java | 23 ++++++++- .../generator/BlockThermalGenerator.java | 25 ++++++++- .../blocks/machine/BlockVacuumFreezer.java | 25 ++++++++- .../techreborn/blocks/storage/BlockAesu.java | 23 --------- .../techreborn/blocks/storage/BlockIDSU.java | 27 +++++++++- .../techreborn/blocks/storage/BlockLesu.java | 26 +++++++++- .../blocks/storage/BlockLesuStorage.java | 25 ++++++++- 26 files changed, 568 insertions(+), 59 deletions(-) diff --git a/src/main/java/techreborn/blocks/BlockChunkLoader.java b/src/main/java/techreborn/blocks/BlockChunkLoader.java index b9d60b42e..f76061e1b 100644 --- a/src/main/java/techreborn/blocks/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/BlockChunkLoader.java @@ -8,7 +8,7 @@ import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.tiles.TileChunkLoader; -public class BlockChunkLoader extends BlockMachineBase { +public class BlockChunkLoader extends BlockMachineBase implements IAdvancedRotationTexture { public BlockChunkLoader(Material material) { @@ -29,4 +29,26 @@ public class BlockChunkLoader extends BlockMachineBase { z); return true; } + + private final String prefix = "techreborn:/blocks/machine/"; + + @Override + public String getFront(boolean isActive) { + return prefix + "industrial_chunk_loader_side"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "industrial_chunk_loader_side" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "machine_top"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "machine_bottom"; + } } diff --git a/src/main/java/techreborn/blocks/BlockComputerCube.java b/src/main/java/techreborn/blocks/BlockComputerCube.java index 1a7a639c9..de5cf77b6 100644 --- a/src/main/java/techreborn/blocks/BlockComputerCube.java +++ b/src/main/java/techreborn/blocks/BlockComputerCube.java @@ -6,7 +6,7 @@ import net.minecraft.world.World; import techreborn.Core; import techreborn.client.GuiHandler; -public class BlockComputerCube extends BlockMachineBase { +public class BlockComputerCube extends BlockMachineBase implements IAdvancedRotationTexture { public BlockComputerCube(Material material) { @@ -23,4 +23,26 @@ public class BlockComputerCube extends BlockMachineBase { return true; } + private final String prefix = "techreborn:/blocks/machine/"; + + @Override + public String getFront(boolean isActive) { + return prefix + "computer_cube"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "computer_cube" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "computer_cube"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "computer_cube"; + } + } \ No newline at end of file diff --git a/src/main/java/techreborn/blocks/BlockDigitalChest.java b/src/main/java/techreborn/blocks/BlockDigitalChest.java index 0be508c49..25480da8e 100644 --- a/src/main/java/techreborn/blocks/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/BlockDigitalChest.java @@ -8,7 +8,7 @@ import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.tiles.TileDigitalChest; -public class BlockDigitalChest extends BlockMachineBase { +public class BlockDigitalChest extends BlockMachineBase implements IAdvancedRotationTexture { public BlockDigitalChest() { super(Material.rock); @@ -29,4 +29,26 @@ public class BlockDigitalChest extends BlockMachineBase { return true; } + private final String prefix = "techreborn:/blocks/machine/"; + + @Override + public String getFront(boolean isActive) { + return prefix + "quantum_chest"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "qchest_side" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "quantum_top"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "machine_bottom"; + } + } diff --git a/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java b/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java index ba598e378..9a625f389 100644 --- a/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java +++ b/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java @@ -3,7 +3,7 @@ package techreborn.blocks; import net.minecraft.block.material.Material; -public class BlockElectricCraftingTable extends BlockMachineBase { +public class BlockElectricCraftingTable extends BlockMachineBase implements IAdvancedRotationTexture { public BlockElectricCraftingTable(Material material) { @@ -11,5 +11,26 @@ public class BlockElectricCraftingTable extends BlockMachineBase { setUnlocalizedName("techreborn.electriccraftingtable"); } + private final String prefix = "techreborn:/blocks/machine/"; + + @Override + public String getFront(boolean isActive) { + return prefix + "electric_crafting_table_front"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "machine_side" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "electric_crafting_table_top"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "machine_bottom"; + } } diff --git a/src/main/java/techreborn/blocks/BlockFusionCoil.java b/src/main/java/techreborn/blocks/BlockFusionCoil.java index 497caa148..7f34a4b3c 100644 --- a/src/main/java/techreborn/blocks/BlockFusionCoil.java +++ b/src/main/java/techreborn/blocks/BlockFusionCoil.java @@ -1,6 +1,8 @@ package techreborn.blocks; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumFacing; public class BlockFusionCoil extends BlockMachineBase { @@ -11,5 +13,10 @@ public class BlockFusionCoil extends BlockMachineBase { } + private final String prefix = "techreborn:/blocks/machine/"; + @Override + public String getTextureName(IBlockState blockState, EnumFacing facing) { + return prefix + "fusion_coil"; + } } diff --git a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java index e30e6bed6..e3ce972ec 100644 --- a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java @@ -9,7 +9,7 @@ import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.tiles.fusionReactor.TileEntityFusionController; -public class BlockFusionControlComputer extends BlockMachineBase { +public class BlockFusionControlComputer extends BlockMachineBase implements IAdvancedRotationTexture { @@ -34,4 +34,26 @@ public class BlockFusionControlComputer extends BlockMachineBase { public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityFusionController(); } + + private final String prefix = "techreborn:/blocks/machine/"; + + @Override + public String getFront(boolean isActive) { + return prefix + "fusion_control_computer_front"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "plasma_generator_side_off" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "plasma_generator_side_off"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "plasma_generator_side_off"; + } } diff --git a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java index 6c99f81bd..977c5036e 100644 --- a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java +++ b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java @@ -1,6 +1,8 @@ package techreborn.blocks; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumFacing; public class BlockHighlyAdvancedMachine extends BlockMachineBase { @@ -9,4 +11,12 @@ public class BlockHighlyAdvancedMachine extends BlockMachineBase { setUnlocalizedName("techreborn.highlyAdvancedMachine"); } + private final String prefix = "techreborn:/blocks/machine/"; + + + @Override + public String getTextureName(IBlockState blockState, EnumFacing facing) { + return prefix + "highlyadvancedmachine"; + } + } diff --git a/src/main/java/techreborn/blocks/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/BlockPlayerDetector.java index 3fdb2dbec..cd4724030 100644 --- a/src/main/java/techreborn/blocks/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/BlockPlayerDetector.java @@ -2,6 +2,8 @@ package techreborn.blocks; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -17,19 +19,24 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.api.IBlockTextureProvider; +import reborncore.common.BaseTileBlock; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TilePlayerDectector; import java.util.List; import java.util.Random; -public class BlockPlayerDetector extends BlockMachineBase { +public class BlockPlayerDetector extends BaseTileBlock implements IBlockTextureProvider { + + public PropertyInteger METADATA; public BlockPlayerDetector() { super(Material.rock); setUnlocalizedName("techreborn.playerDetector"); setCreativeTab(TechRebornCreativeTab.instance); setHardness(2f); + this.setDefaultState(this.blockState.getBaseState().withProperty(METADATA, 0)); } public static final String[] types = new String[] @@ -50,12 +57,6 @@ public class BlockPlayerDetector extends BlockMachineBase { } - - @Override - public void onBlockAdded(World world, int x, int y, int z) { - - } - @Override public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { return new TilePlayerDectector(); @@ -89,16 +90,16 @@ public class BlockPlayerDetector extends BlockMachineBase { return 0; } + @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemstack) { - super.onBlockPlacedBy(world, x, y, z, player, itemstack); - TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); + public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + super.onBlockPlacedBy(worldIn, pos, state, placer, stack); + TileEntity tile = worldIn.getTileEntity(pos); if (tile instanceof TilePlayerDectector) { - ((TilePlayerDectector) tile).owenerUdid = player.getUniqueID().toString(); + ((TilePlayerDectector) tile).owenerUdid = placer.getUniqueID().toString(); } } - @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer entityplayer, EnumFacing side, float hitX, float hitY, float hitZ) { // int newMeta = (world.getBlockMetadata(x, y, z) + 1) % 3; @@ -120,4 +121,30 @@ public class BlockPlayerDetector extends BlockMachineBase { } return true; } + + @Override + public String getTextureName(IBlockState blockState, EnumFacing facing) { + return "techreborn:blocks/machine/player_detector_" + types[getMetaFromState(blockState)]; + } + + @Override + public int amoutOfVariants() { + return types.length; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return this.getDefaultState().withProperty(METADATA, meta); + } + + @Override + public int getMetaFromState(IBlockState state) { + return (Integer) state.getValue(METADATA); + } + + protected BlockState createBlockState() { + + METADATA = PropertyInteger.create("Type", 0, types.length); + return new BlockState(this, METADATA); + } } diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java index 6e6ee6f78..06cf1f589 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java @@ -16,7 +16,7 @@ import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileQuantumChest; -public class BlockQuantumChest extends BlockMachineBase { +public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRotationTexture { public BlockQuantumChest() { super(Material.rock); @@ -38,4 +38,26 @@ public class BlockQuantumChest extends BlockMachineBase { return true; } + + private final String prefix = "techreborn:/blocks/machine/"; + + @Override + public String getFront(boolean isActive) { + return prefix + "quantum_chest"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "qchest_side"; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "quantum_top"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "machine_bottom"; + } } diff --git a/src/main/java/techreborn/blocks/BlockQuantumTank.java b/src/main/java/techreborn/blocks/BlockQuantumTank.java index 8256e052b..c8b9feb10 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/BlockQuantumTank.java @@ -9,7 +9,7 @@ import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.tiles.TileQuantumTank; -public class BlockQuantumTank extends BlockMachineBase { +public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotationTexture { public BlockQuantumTank() { @@ -33,4 +33,26 @@ public class BlockQuantumTank extends BlockMachineBase { return true; } + private final String prefix = "techreborn:/blocks/machine/"; + + @Override + public String getFront(boolean isActive) { + return prefix + "ThermalGenerator_other"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "ThermalGenerator_other"; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "quantum_top"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "ThermalGenerator_other"; + } + } diff --git a/src/main/java/techreborn/blocks/BlockSupercondensator.java b/src/main/java/techreborn/blocks/BlockSupercondensator.java index 3ee7ab20e..3d9ca6931 100644 --- a/src/main/java/techreborn/blocks/BlockSupercondensator.java +++ b/src/main/java/techreborn/blocks/BlockSupercondensator.java @@ -2,7 +2,7 @@ package techreborn.blocks; import net.minecraft.block.material.Material; -public class BlockSupercondensator extends BlockMachineBase { +public class BlockSupercondensator extends BlockMachineBase implements IAdvancedRotationTexture { public BlockSupercondensator(Material material) { @@ -10,4 +10,26 @@ public class BlockSupercondensator extends BlockMachineBase { setUnlocalizedName("techreborn.supercondensator"); } + private final String prefix = "techreborn:/blocks/machine/"; + + @Override + public String getFront(boolean isActive) { + return prefix + "supercondensator_front"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "supercondensator_side" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "supercondensator_side"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "machine_bottom"; + } + } diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index 00e04f694..65142d162 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -7,10 +7,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; +import techreborn.blocks.IAdvancedRotationTexture; import techreborn.client.GuiHandler; import techreborn.tiles.TileDieselGenerator; -public class BlockDieselGenerator extends BlockMachineBase { +public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedRotationTexture { public BlockDieselGenerator(Material material) { @@ -36,5 +37,27 @@ public class BlockDieselGenerator extends BlockMachineBase { return true; } + private final String prefix = "techreborn:/blocks/machine/"; + + @Override + public String getFront(boolean isActive) { + return prefix + "machine_side"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "machine_side" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "diesel_generator_top_off"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "machine_bottom"; + } + } diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java index 8a81c5c56..7c72425ef 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java +++ b/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java @@ -4,9 +4,10 @@ import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import techreborn.blocks.BlockMachineBase; +import techreborn.blocks.IAdvancedRotationTexture; import techreborn.tiles.TileDragonEggSiphoner; -public class BlockDragonEggSiphoner extends BlockMachineBase { +public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvancedRotationTexture { @@ -21,6 +22,26 @@ public class BlockDragonEggSiphoner extends BlockMachineBase { return new TileDragonEggSiphoner(); } + private final String prefix = "techreborn:/blocks/machine/"; + @Override + public String getFront(boolean isActive) { + return prefix + "dragon_egg_energy_siphon_side_off"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "dragon_egg_energy_siphon_side_off" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "dragon_egg_energy_siphon_top"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "machine_bottom"; + } } diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java index dd744528b..e2447fac9 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -7,10 +7,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; +import techreborn.blocks.IAdvancedRotationTexture; import techreborn.client.GuiHandler; import techreborn.tiles.TileGasTurbine; -public class BlockGasTurbine extends BlockMachineBase { +public class BlockGasTurbine extends BlockMachineBase implements IAdvancedRotationTexture { public BlockGasTurbine(Material material) { @@ -35,6 +36,26 @@ public class BlockGasTurbine extends BlockMachineBase { return true; } + private final String prefix = "techreborn:/blocks/machine/"; + @Override + public String getFront(boolean isActive) { + return prefix + "machine_side"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "machine_side" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "gas_generator_top"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "gas_generator_bottom"; + } } diff --git a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java index 6d4058337..c3a47bf3e 100644 --- a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java @@ -4,9 +4,10 @@ import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import techreborn.blocks.BlockMachineBase; +import techreborn.blocks.IAdvancedRotationTexture; import techreborn.tiles.TileHeatGenerator; -public class BlockHeatGenerator extends BlockMachineBase { +public class BlockHeatGenerator extends BlockMachineBase implements IAdvancedRotationTexture { public BlockHeatGenerator(Material material) { @@ -21,6 +22,26 @@ public class BlockHeatGenerator extends BlockMachineBase { return new TileHeatGenerator(); } + private final String prefix = "techreborn:/blocks/machine/"; + @Override + public String getFront(boolean isActive) { + return prefix + "heat_generator_side"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "heat_generator_side" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "heat_generator_top"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "heat_generator_bottom"; + } } diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java index dde845e39..10d887f76 100644 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -2,8 +2,9 @@ package techreborn.blocks.generator; import net.minecraft.block.material.Material; import techreborn.blocks.BlockMachineBase; +import techreborn.blocks.IAdvancedRotationTexture; -public class BlockLightningRod extends BlockMachineBase { +public class BlockLightningRod extends BlockMachineBase implements IAdvancedRotationTexture { public BlockLightningRod(Material material) { @@ -11,4 +12,26 @@ public class BlockLightningRod extends BlockMachineBase { setUnlocalizedName("techreborn.lightningrod"); } + private final String prefix = "techreborn:/blocks/machine/"; + + @Override + public String getFront(boolean isActive) { + return prefix + "idsu_front"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "idsu_front" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "lightning_rod_top"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "extreme_voltage_machine_side"; + } + } diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java index 18827a7c9..d4623e8e6 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java @@ -2,8 +2,9 @@ package techreborn.blocks.generator; import net.minecraft.block.material.Material; import techreborn.blocks.BlockMachineBase; +import techreborn.blocks.IAdvancedRotationTexture; -public class BlockMagicEnergyAbsorber extends BlockMachineBase { +public class BlockMagicEnergyAbsorber extends BlockMachineBase implements IAdvancedRotationTexture { public BlockMagicEnergyAbsorber(Material material) { super(material); @@ -11,4 +12,26 @@ public class BlockMagicEnergyAbsorber extends BlockMachineBase { } + private final String prefix = "techreborn:/blocks/machine/"; + + @Override + public String getFront(boolean isActive) { + return prefix + "magic_energy_absorber_side"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "magic_energy_absorber_side" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "magic_energy_absorber_top"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "magic_energy_absorber_bottom"; + } + } diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java index 5aeb9039b..bb92f80b0 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java @@ -2,10 +2,9 @@ package techreborn.blocks.generator; import net.minecraft.block.material.Material; import techreborn.blocks.BlockMachineBase; +import techreborn.blocks.IAdvancedRotationTexture; -public class BlockMagicEnergyConverter extends BlockMachineBase { - - +public class BlockMagicEnergyConverter extends BlockMachineBase implements IAdvancedRotationTexture { public BlockMagicEnergyConverter(Material material) { super(material); @@ -13,5 +12,27 @@ public class BlockMagicEnergyConverter extends BlockMachineBase { } + private final String prefix = "techreborn:/blocks/machine/"; + + @Override + public String getFront(boolean isActive) { + return prefix + "magic_energy_converter_front_off"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "magic_energy_converter_side" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "magic_energy_converter_top"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "magic_energy_converter_bottom"; + } + } diff --git a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java index bfc2dcc8c..fe567bc92 100644 --- a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java @@ -2,8 +2,9 @@ package techreborn.blocks.generator; import net.minecraft.block.material.Material; import techreborn.blocks.BlockMachineBase; +import techreborn.blocks.IAdvancedRotationTexture; -public class BlockPlasmaGenerator extends BlockMachineBase { +public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedRotationTexture { @@ -12,6 +13,26 @@ public class BlockPlasmaGenerator extends BlockMachineBase { setUnlocalizedName("techreborn.plasmagenerator"); } + private final String prefix = "techreborn:/blocks/machine/"; + @Override + public String getFront(boolean isActive) { + return prefix + "plasma_generator_front"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "plasma_generator_side_off" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "plasma_generator_side_off"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "plasma_generator_side_off"; + } } diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index 11497ca13..504684d71 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -7,10 +7,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; +import techreborn.blocks.IAdvancedRotationTexture; import techreborn.client.GuiHandler; import techreborn.tiles.TileSemifluidGenerator; -public class BlockSemiFluidGenerator extends BlockMachineBase { +public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvancedRotationTexture { @@ -36,6 +37,26 @@ public class BlockSemiFluidGenerator extends BlockMachineBase { return true; } + private final String prefix = "techreborn:/blocks/machine/"; + @Override + public String getFront(boolean isActive) { + return prefix + "semifluid_generator_side"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "semifluid_generator_side" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "machine_top"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "machine_bottom"; + } } diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index 55599e5cd..fe7c7d152 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -7,10 +7,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; +import techreborn.blocks.IAdvancedRotationTexture; import techreborn.client.GuiHandler; import techreborn.tiles.TileThermalGenerator; -public class BlockThermalGenerator extends BlockMachineBase { +public class BlockThermalGenerator extends BlockMachineBase implements IAdvancedRotationTexture { @@ -36,4 +37,26 @@ public class BlockThermalGenerator extends BlockMachineBase { return true; } + private final String prefix = "techreborn:/blocks/machine/"; + + + @Override + public String getFront(boolean isActive) { + return isActive ? prefix + "thermal_generator_side_on" : prefix + "matter_fabricator_off"; + } + + @Override + public String getSide(boolean isActive) { + return isActive ? prefix + "thermal_generator_side_on" : prefix + "matter_fabricator_off"; + } + + @Override + public String getTop(boolean isActive) { + return isActive ? prefix + "thermal_generator_top_on" : prefix + "matter_fabricator_off"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "machine_bottom"; + } } diff --git a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java index 4b3213044..2e1ad3f0f 100644 --- a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java @@ -7,10 +7,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; +import techreborn.blocks.IAdvancedRotationTexture; import techreborn.client.GuiHandler; import techreborn.tiles.TileVacuumFreezer; -public class BlockVacuumFreezer extends BlockMachineBase { +public class BlockVacuumFreezer extends BlockMachineBase implements IAdvancedRotationTexture{ public BlockVacuumFreezer(Material material) { @@ -36,4 +37,26 @@ public class BlockVacuumFreezer extends BlockMachineBase { z); return true; } + + private final String prefix = "techreborn:/blocks/machine/"; + + @Override + public String getFront(boolean isActive) { + return prefix + "vacuum_freezer_front"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "machine_side" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "vacuum_freezer_top"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "machine_bottom"; + } } diff --git a/src/main/java/techreborn/blocks/storage/BlockAesu.java b/src/main/java/techreborn/blocks/storage/BlockAesu.java index 73b37741d..08265f52f 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockAesu.java @@ -33,29 +33,6 @@ public class BlockAesu extends BlockMachineBase implements IRotationTexture { return true; } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerBlockIcons(IIconRegister icon) { -// this.blockIcon = icon.registerIcon("techreborn:machine/aesu_side"); -// this.iconFront = icon.registerIcon("techreborn:machine/aesu_front"); -// this.iconTop = icon.registerIcon("techreborn:machine/aesu_side"); -// this.iconBottom = icon.registerIcon("techreborn:machine/aesu_side"); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { -// int metadata = getTileRotation(blockAccess, x, y, z); -// if (side == metadata && blockAccess.getBlockMetadata(x, y, z) == 1) { -// return this.iconFront; -// } -// return metadata == 0 && side == 3 ? this.iconFront -// : side == 1 ? this.iconTop : -// side == 0 ? this.iconBottom : (side == 0 ? this.iconTop -// : (side == metadata ? this.iconFront : this.blockIcon)); -// } - private final String prefix = "techreborn:/blocks/machine/"; @Override diff --git a/src/main/java/techreborn/blocks/storage/BlockIDSU.java b/src/main/java/techreborn/blocks/storage/BlockIDSU.java index af57287e6..afb12c521 100644 --- a/src/main/java/techreborn/blocks/storage/BlockIDSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockIDSU.java @@ -9,10 +9,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; +import techreborn.blocks.IAdvancedRotationTexture; import techreborn.client.GuiHandler; import techreborn.tiles.idsu.TileIDSU; -public class BlockIDSU extends BlockMachineBase { +public class BlockIDSU extends BlockMachineBase implements IAdvancedRotationTexture { public BlockIDSU(Material material) { @@ -44,4 +45,28 @@ public class BlockIDSU extends BlockMachineBase { } } + + private final String prefix = "techreborn:/blocks/machine/"; + + + @Override + public String getFront(boolean isActive) { + return prefix + "idsu_front"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "idsu_side" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "idsu_side"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "idsu_side"; + } + } diff --git a/src/main/java/techreborn/blocks/storage/BlockLesu.java b/src/main/java/techreborn/blocks/storage/BlockLesu.java index 45ba23986..bdd1c6882 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockLesu.java @@ -6,10 +6,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; +import techreborn.blocks.IAdvancedRotationTexture; import techreborn.client.GuiHandler; import techreborn.tiles.lesu.TileLesu; -public class BlockLesu extends BlockMachineBase { +public class BlockLesu extends BlockMachineBase implements IAdvancedRotationTexture { public BlockLesu(Material material) { @@ -32,4 +33,27 @@ public class BlockLesu extends BlockMachineBase { return true; } + private final String prefix = "techreborn:/blocks/machine/"; + + + @Override + public String getFront(boolean isActive) { + return prefix + "lesu_front"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "lesu_side" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "lesu_side"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "lesu_side"; + } + } diff --git a/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java b/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java index cd06c9fbc..c53903dd4 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java @@ -9,9 +9,10 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.blocks.BlockMachineBase; +import techreborn.blocks.IAdvancedRotationTexture; import techreborn.tiles.lesu.TileLesuStorage; -public class BlockLesuStorage extends BlockMachineBase { +public class BlockLesuStorage extends BlockMachineBase implements IAdvancedRotationTexture { public BlockLesuStorage(Material material) { super(material); @@ -44,4 +45,26 @@ public class BlockLesuStorage extends BlockMachineBase { public boolean shouldConnectToBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta) { return block == (Block) this; } + + private final String prefix = "techreborn:/blocks/machine/"; + + @Override + public String getFront(boolean isActive) { + return prefix + "lesu_block"; + } + + @Override + public String getSide(boolean isActive) { + return prefix + "lesu_block" ; + } + + @Override + public String getTop(boolean isActive) { + return prefix + "lesu_block"; + } + + @Override + public String getBottom(boolean isActive) { + return prefix + "lesu_block"; + } }