diff --git a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java index a751dda2a..a72c295d1 100644 --- a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java @@ -57,16 +57,16 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv @Override public String getSide(boolean isActive) { - return prefix + "fusion_control_computer_side" ; + return prefix + "machine_side" ; } @Override public String getTop(boolean isActive) { - return prefix + "fusion_control_computer_top"; + return prefix + "machine_side"; } @Override public String getBottom(boolean isActive) { - return prefix + "fusion_control_computer_bottom"; + return prefix + "machine_side"; } } diff --git a/src/main/java/techreborn/blocks/BlockQuantumTank.java b/src/main/java/techreborn/blocks/BlockQuantumTank.java index 156f9edb7..0655fa469 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/BlockQuantumTank.java @@ -13,7 +13,6 @@ import techreborn.tiles.TileQuantumTank; public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotationTexture { - public BlockQuantumTank() { super(); setUnlocalizedName("techreborn.quantumTank"); @@ -28,11 +27,12 @@ public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotat @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if(fillBlockWithFluid(world, new BlockPos(x, y, z), player)){ + if(fillBlockWithFluid(world, new BlockPos(x, y, z), player)) { return true; } - if (!player.isSneaking()) + if (!player.isSneaking()) { player.openGui(Core.INSTANCE, GuiHandler.quantumTankID, world, x, y, z); + } return true; } @@ -40,12 +40,12 @@ public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotat @Override public String getFront(boolean isActive) { - return prefix + "ThermalGenerator_other"; + return "techreborn:blocks/machine/generators/thermal_generator_side_off"; } @Override public String getSide(boolean isActive) { - return prefix + "ThermalGenerator_other"; + return "techreborn:blocks/machine/generators/thermal_generator_side_off"; } @Override @@ -55,7 +55,6 @@ public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotat @Override public String getBottom(boolean isActive) { - return prefix + "ThermalGenerator_other"; + return "techreborn:blocks/machine/generators/thermal_generator_bottom"; } - } diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java index 1f25090b2..99568bda0 100644 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -7,7 +7,6 @@ import techreborn.client.TechRebornCreativeTab; public class BlockLightningRod extends BlockMachineBase implements IAdvancedRotationTexture { - public BlockLightningRod(Material material) { super(); setUnlocalizedName("techreborn.lightningrod"); @@ -18,22 +17,21 @@ public class BlockLightningRod extends BlockMachineBase implements IAdvancedRota @Override public String getFront(boolean isActive) { - return prefix + "lightning_rod_side"; + return prefix + "plasma_generator_side_off"; } @Override public String getSide(boolean isActive) { - return prefix + "lightning_rod_side" ; + return prefix + "plasma_generator_side_off" ; } @Override public String getTop(boolean isActive) { - return prefix + "lightning_rod_top"; + return prefix + "plasma_generator_side_off"; } @Override public String getBottom(boolean isActive) { - return prefix + "lightning_rod_bottom"; + return prefix + "plasma_generator_side_off"; } - } diff --git a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java index 677b28f8e..a1046678b 100644 --- a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java @@ -7,8 +7,6 @@ import techreborn.client.TechRebornCreativeTab; public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedRotationTexture { - - public BlockPlasmaGenerator(Material material) { super(); setUnlocalizedName("techreborn.plasmagenerator"); @@ -29,12 +27,11 @@ public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedR @Override public String getTop(boolean isActive) { - return prefix + "plasma_generator_bottom"; + return prefix + "plasma_generator_side_off"; } @Override public String getBottom(boolean isActive) { - return prefix + "plasma_generator_bottom"; + return prefix + "plasma_generator_side_off"; } - } diff --git a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java index 517323ae7..5a9c99ad1 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java @@ -1,8 +1,12 @@ package techreborn.blocks.generator; +import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import reborncore.RebornCore; import reborncore.common.BaseTileBlock; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.generator.TileWaterMill; @@ -10,16 +14,35 @@ import techreborn.tiles.generator.TileWaterMill; /** * Created by modmuss50 on 25/02/2016. */ -public class BlockWaterMill extends BaseTileBlock { +public class BlockWaterMill extends BaseTileBlock implements ITexturedBlock{ public BlockWaterMill() { super(Material.iron); setUnlocalizedName("techreborn.watermill"); setCreativeTab(TechRebornCreativeTab.instance); + RebornCore.jsonDestroyer.registerObject(this); } @Override public TileEntity createNewTileEntity(World worldIn, int meta) { return new TileWaterMill(); } + + private final String prefix = "techreborn:blocks/machine/generators/"; + + @Override + public String getTextureNameFromState(IBlockState state, EnumFacing side) { + boolean isActive = false; + if(side == EnumFacing.UP){ + return prefix + "generator_machine_bottom";// + (isActive ? "on" : "off"); + } else if(side==EnumFacing.DOWN){ + return prefix + "generator_machine_bottom"; + } + return prefix + "solar_panel_side_" + (isActive ? "on" : "off"); + } + + @Override + public int amountOfStates() { + return 2; + } } \ No newline at end of file diff --git a/src/main/java/techreborn/blocks/generator/BlockWindMill.java b/src/main/java/techreborn/blocks/generator/BlockWindMill.java index 5fe3deb77..271bd5c46 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWindMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWindMill.java @@ -1,25 +1,49 @@ package techreborn.blocks.generator; +import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import reborncore.RebornCore; import reborncore.common.BaseTileBlock; +import reborncore.common.blocks.IAdvancedRotationTexture; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.generator.TileWindMill; /** * Created by modmuss50 on 25/02/2016. */ -public class BlockWindMill extends BaseTileBlock { +public class BlockWindMill extends BaseTileBlock implements ITexturedBlock { public BlockWindMill() { super(Material.iron); setUnlocalizedName("techreborn.windmill"); setCreativeTab(TechRebornCreativeTab.instance); + RebornCore.jsonDestroyer.registerObject(this); } @Override public TileEntity createNewTileEntity(World worldIn, int meta) { return new TileWindMill(); } + + private final String prefix = "techreborn:blocks/machine/generators/"; + + @Override + public String getTextureNameFromState(IBlockState state, EnumFacing side) { + boolean isActive = false; + if(side == EnumFacing.UP){ + return prefix + "generator_machine_bottom";// + (isActive ? "on" : "off"); + } else if(side==EnumFacing.DOWN){ + return prefix + "generator_machine_bottom"; + } + return prefix + "solar_panel_side_" + (isActive ? "on" : "off"); + } + + @Override + public int amountOfStates() { + return 2; + } } diff --git a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java index a5bd15b51..9574f2421 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java @@ -51,7 +51,7 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT @Override public String getTop() { - return prefix + "chemical_reactor_top"; + return prefix + "machine_top"; } @Override