diff --git a/src/main/java/techreborn/blocks/BlockChunkLoader.java b/src/main/java/techreborn/blocks/BlockChunkLoader.java deleted file mode 100644 index ebfada4d5..000000000 --- a/src/main/java/techreborn/blocks/BlockChunkLoader.java +++ /dev/null @@ -1,58 +0,0 @@ -package techreborn.blocks; - -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.TechRebornCreativeTab; -import techreborn.tiles.TileChunkLoader; - -public class BlockChunkLoader extends BlockMachineBase implements IAdvancedRotationTexture { - - - public BlockChunkLoader(Material material) { - super(); - setUnlocalizedName("techreborn.chunkloader"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World world, 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) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.chunkloaderID, world, x, y, - 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 f38ad8778..197f63559 100644 --- a/src/main/java/techreborn/blocks/BlockComputerCube.java +++ b/src/main/java/techreborn/blocks/BlockComputerCube.java @@ -27,7 +27,7 @@ public class BlockComputerCube extends BlockMachineBase implements IAdvancedRota return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/BlockDigitalChest.java b/src/main/java/techreborn/blocks/BlockDigitalChest.java index 61bb0b037..73b6b699b 100644 --- a/src/main/java/techreborn/blocks/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/BlockDigitalChest.java @@ -32,7 +32,7 @@ public class BlockDigitalChest extends BlockMachineBase implements IAdvancedRota return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java b/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java index 307715333..7673ebab9 100644 --- a/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java +++ b/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java @@ -15,7 +15,7 @@ public class BlockElectricCraftingTable extends BlockMachineBase implements IAdv setCreativeTab(TechRebornCreativeTab.instance); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/BlockFusionCoil.java b/src/main/java/techreborn/blocks/BlockFusionCoil.java index 3be3f9654..600946a32 100644 --- a/src/main/java/techreborn/blocks/BlockFusionCoil.java +++ b/src/main/java/techreborn/blocks/BlockFusionCoil.java @@ -16,7 +16,7 @@ public class BlockFusionCoil extends BlockMachineBase { } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { diff --git a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java index fc962a748..8fffc2ad1 100644 --- a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java @@ -48,7 +48,7 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv return new TileEntityFusionController(); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { @@ -57,16 +57,16 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv @Override public String getSide(boolean isActive) { - return prefix + "plasma_generator_side_off" ; + return prefix + "fusion_control_computer_side" ; } @Override public String getTop(boolean isActive) { - return prefix + "plasma_generator_side_off"; + return prefix + "fusion_control_computer_top"; } @Override public String getBottom(boolean isActive) { - return prefix + "plasma_generator_side_off"; + return prefix + "fusion_control_computer_bottom"; } } diff --git a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java index b2863d7f9..734805071 100644 --- a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java +++ b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java @@ -14,7 +14,7 @@ public class BlockHighlyAdvancedMachine extends BlockMachineBase { setCreativeTab(TechRebornCreativeTab.instance); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/machine_blocks/"; @Override diff --git a/src/main/java/techreborn/blocks/BlockIronFurnace.java b/src/main/java/techreborn/blocks/BlockIronFurnace.java deleted file mode 100644 index 2cf3cee85..000000000 --- a/src/main/java/techreborn/blocks/BlockIronFurnace.java +++ /dev/null @@ -1,112 +0,0 @@ -package techreborn.blocks; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.common.blocks.BlockMachineBase; -import reborncore.common.blocks.IRotationTexture; -import techreborn.Core; -import techreborn.client.GuiHandler; -import techreborn.client.TechRebornCreativeTab; -import techreborn.tiles.TileIronFurnace; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -public class BlockIronFurnace extends BlockMachineBase implements IRotationTexture { - - public BlockIronFurnace() { - super(); - setUnlocalizedName("techreborn.ironfurnace"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TileIronFurnace(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.ironFurnace, world, x, y, z); - return true; - } - - @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - List items = new ArrayList(); - items.add(new ItemStack(this)); - return items; - } - - @SideOnly(Side.CLIENT) - @SuppressWarnings("incomplete-switch") - public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random rand) - { - if (this.isActive(state)) - { - EnumFacing enumfacing = (EnumFacing)state.getValue(FACING); - double d0 = (double)pos.getX() + 0.5D; - double d1 = (double)pos.getY() + rand.nextDouble() * 6.0D / 16.0D; - double d2 = (double)pos.getZ() + 0.5D; - double d3 = 0.52D; - double d4 = rand.nextDouble() * 0.6D - 0.3D; - - switch (enumfacing) - { - case WEST: - worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); - worldIn.spawnParticle(EnumParticleTypes.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); - break; - case EAST: - worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); - worldIn.spawnParticle(EnumParticleTypes.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]); - break; - case NORTH: - worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D, new int[0]); - worldIn.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D, new int[0]); - break; - case SOUTH: - worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D, new int[0]); - worldIn.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D, new int[0]); - } - } - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "iron_furnace_front_off"; - } - - @Override - public String getFrontOn() { - return prefix + "iron_furnace_front_on"; - } - - @Override - public String getSide() { - return prefix + "iron_furnace_side"; - } - - @Override - public String getTop() { - return prefix + "iron_furnace_top"; - } - - @Override - public String getBottom() { - return prefix + "iron_furnace_bottom"; - } -} diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index c50e31169..b4909d8e8 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -101,7 +101,7 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured @Override public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { - return "techreborn:blocks/machine/casing" + types[getMetaFromState(blockState)] + "_full"; + return "techreborn:blocks/machine/machine_blocks/casing" + types[getMetaFromState(blockState)] + "_full"; } @Override diff --git a/src/main/java/techreborn/blocks/BlockMachineFrame.java b/src/main/java/techreborn/blocks/BlockMachineFrame.java index e9116c603..2f9d3636f 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrame.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrame.java @@ -58,7 +58,7 @@ public class BlockMachineFrame extends BaseBlock implements ITexturedBlock { @Override public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { - return "techreborn:blocks/machine/" + types[getMetaFromState(blockState)] + "_machine_block"; + return "techreborn:blocks/machine/machine_blocks/" + types[getMetaFromState(blockState)] + "_machine_block"; } @Override diff --git a/src/main/java/techreborn/blocks/BlockNuke.java b/src/main/java/techreborn/blocks/BlockNuke.java index 383298545..ed2079624 100644 --- a/src/main/java/techreborn/blocks/BlockNuke.java +++ b/src/main/java/techreborn/blocks/BlockNuke.java @@ -51,7 +51,7 @@ public class BlockNuke extends BlockTNT implements ITexturedBlock { @Override public String getTextureNameFromState(IBlockState iBlockState, EnumFacing enumFacing) { - return "techreborn:blocks/machine/machine_bottom"; + return "techreborn:blocks/machine/greg_machine/nuke"; } @Override diff --git a/src/main/java/techreborn/blocks/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/BlockPlayerDetector.java index c66416bcf..707ad714f 100644 --- a/src/main/java/techreborn/blocks/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/BlockPlayerDetector.java @@ -124,7 +124,7 @@ public class BlockPlayerDetector extends BaseTileBlock implements ITexturedBlock @Override public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { - return "techreborn:blocks/machine/player_detector_" + types[getMetaFromState(blockState)]; + return "techreborn:blocks/machine/greg_machines/player_detector_" + types[getMetaFromState(blockState)]; } @Override diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java index 97c27e340..260c8688f 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java @@ -36,7 +36,7 @@ public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRota } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/BlockQuantumTank.java b/src/main/java/techreborn/blocks/BlockQuantumTank.java index 75d5d5545..a93569170 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/BlockQuantumTank.java @@ -36,7 +36,7 @@ public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotat return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/BlockSupercondensator.java b/src/main/java/techreborn/blocks/BlockSupercondensator.java index 1c7043c94..2869fdbb8 100644 --- a/src/main/java/techreborn/blocks/BlockSupercondensator.java +++ b/src/main/java/techreborn/blocks/BlockSupercondensator.java @@ -14,7 +14,7 @@ public class BlockSupercondensator extends BlockMachineBase implements IAdvanced setCreativeTab(TechRebornCreativeTab.instance); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index c362a2dac..a5cb42b20 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -39,16 +39,16 @@ public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedR return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { - return prefix + "machine_side"; + return prefix + "generator_machine_side"; } @Override public String getSide(boolean isActive) { - return prefix + "machine_side" ; + return prefix + "generator_machine_side" ; } @Override @@ -58,7 +58,7 @@ public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedR @Override public String getBottom(boolean isActive) { - return prefix + "machine_bottom"; + return prefix + "generator_machine_bottom"; } diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java index 4dc91a31d..6c7d94f36 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java +++ b/src/main/java/techreborn/blocks/generator/BlockDragonEggSiphoner.java @@ -24,7 +24,7 @@ public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvance return new TileDragonEggSiphoner(); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { @@ -43,7 +43,7 @@ public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvance @Override public String getBottom(boolean isActive) { - return prefix + "machine_bottom"; + return prefix + "generator_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java index ae35f0acd..d449661cd 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -38,16 +38,16 @@ public class BlockGasTurbine extends BlockMachineBase implements IAdvancedRotati return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { - return prefix + "machine_side"; + return prefix + "generator_machine_side"; } @Override public String getSide(boolean isActive) { - return prefix + "machine_side" ; + return prefix + "generator_machine_side" ; } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockGenerator.java b/src/main/java/techreborn/blocks/generator/BlockGenerator.java index 255b55569..4d90ea743 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockGenerator.java @@ -31,7 +31,7 @@ public class BlockGenerator extends BlockMachineBase implements IRotationTexture return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFrontOff() { @@ -45,16 +45,16 @@ public class BlockGenerator extends BlockMachineBase implements IRotationTexture @Override public String getSide() { - return prefix + "machine_side" ; + return prefix + "generator_machine_side" ; } @Override public String getTop() { - return prefix + "machine_top"; + return prefix + "generator_machine_top"; } @Override public String getBottom() { - return prefix + "machine_bottom"; + return prefix + "generator_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java index 9121ca4c0..f20367b6d 100644 --- a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java @@ -24,7 +24,7 @@ public class BlockHeatGenerator extends BlockMachineBase implements IAdvancedRot return new TileHeatGenerator(); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java index caeffbda4..1f25090b2 100644 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -14,16 +14,16 @@ public class BlockLightningRod extends BlockMachineBase implements IAdvancedRota setCreativeTab(TechRebornCreativeTab.instance); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { - return prefix + "idsu_front"; + return prefix + "lightning_rod_side"; } @Override public String getSide(boolean isActive) { - return prefix + "idsu_front" ; + return prefix + "lightning_rod_side" ; } @Override @@ -33,7 +33,7 @@ public class BlockLightningRod extends BlockMachineBase implements IAdvancedRota @Override public String getBottom(boolean isActive) { - return prefix + "extreme_voltage_machine_side"; + return prefix + "lightning_rod_bottom"; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java index e4960fbf0..c875db2c1 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java @@ -14,7 +14,7 @@ public class BlockMagicEnergyAbsorber extends BlockMachineBase implements IAdvan } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java index 54a4746a7..31417b778 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java @@ -14,7 +14,7 @@ public class BlockMagicEnergyConverter extends BlockMachineBase implements IAdva } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java index 22b3475e7..677b28f8e 100644 --- a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java @@ -15,7 +15,7 @@ public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedR setCreativeTab(TechRebornCreativeTab.instance); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { @@ -29,12 +29,12 @@ public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedR @Override public String getTop(boolean isActive) { - return prefix + "plasma_generator_side_off"; + return prefix + "plasma_generator_bottom"; } @Override public String getBottom(boolean isActive) { - return prefix + "plasma_generator_side_off"; + return prefix + "plasma_generator_bottom"; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index e96d1a27d..fbb3f64fb 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -39,7 +39,7 @@ public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvanc return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getFront(boolean isActive) { @@ -53,12 +53,12 @@ public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvanc @Override public String getTop(boolean isActive) { - return prefix + "machine_top"; + return prefix + "generator_machine_top"; } @Override public String getBottom(boolean isActive) { - return prefix + "machine_bottom"; + return prefix + "generator_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java index 8a63099cb..82b904bdb 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java @@ -46,7 +46,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock { return new TileSolarPanel(); } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override public String getTextureNameFromState(IBlockState state, EnumFacing side) { @@ -54,7 +54,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock { if(side == EnumFacing.UP){ return prefix + "solar_panel_top_" + (isActive ? "on" : "off"); } else if(side==EnumFacing.DOWN){ - return prefix + "machine_bottom"; + return prefix + "generator_machine_bottom"; } return prefix + "solar_panel_side_" + (isActive ? "on" : "off"); } diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index 50f4f5a0a..93d231567 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -38,7 +38,7 @@ public class BlockThermalGenerator extends BlockMachineBase implements IAdvanced return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/generators/"; @Override @@ -58,6 +58,6 @@ public class BlockThermalGenerator extends BlockMachineBase implements IAdvanced @Override public String getBottom(boolean isActive) { - return prefix + "machine_bottom"; + return prefix + "generator_machine_bottom"; } } diff --git a/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java b/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java deleted file mode 100644 index fd5c05ec3..000000000 --- a/src/main/java/techreborn/blocks/machine/BlockAlloyFurnace.java +++ /dev/null @@ -1,74 +0,0 @@ -package techreborn.blocks.machine; - -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.world.IBlockAccess; -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.TechRebornCreativeTab; -import techreborn.tiles.TileAlloyFurnace; - -import java.util.ArrayList; -import java.util.List; - -public class BlockAlloyFurnace extends BlockMachineBase implements IRotationTexture { - - public BlockAlloyFurnace(Material material) { - super(); - setUnlocalizedName("techreborn.alloyfurnace"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TileAlloyFurnace(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.alloyFurnaceID, world, x, y, z); - return true; - } - - @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - List items = new ArrayList(); - items.add(new ItemStack(this)); - return items; - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "alloy_furnace_front_off"; - } - - @Override - public String getFrontOn() { - return prefix + "alloy_furnace_front_on"; - } - - @Override - public String getSide() { - return prefix + "alloy_furnace_side"; - } - - @Override - public String getTop() { - return prefix + "alloy_furnace_top"; - } - - @Override - public String getBottom() { - return prefix + "machine_bottom"; - } -} diff --git a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java deleted file mode 100644 index 46cf1764c..000000000 --- a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java +++ /dev/null @@ -1,60 +0,0 @@ -package techreborn.blocks.machine; - -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.TechRebornCreativeTab; -import techreborn.tiles.TileAlloySmelter; - -public class BlockAlloySmelter extends BlockMachineBase implements IRotationTexture { - - public BlockAlloySmelter(Material material) { - super(); - setUnlocalizedName("techreborn.alloysmelter"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TileAlloySmelter(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.alloySmelterID, world, x, y, z); - return true; - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "electric_alloy_furnace_front_off"; - } - - @Override - public String getFrontOn() { - return prefix + "electric_alloy_furnace_front_on"; - } - - @Override - public String getSide() { - return prefix + "machine_side"; - } - - @Override - public String getTop() { - return prefix + "machine_top"; - } - - @Override - public String getBottom() { - return prefix + "machine_bottom"; - } -} diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java index 477eb1049..31f3357b4 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java @@ -32,7 +32,7 @@ public class BlockAssemblingMachine extends BlockMachineBase implements IRotatio return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFrontOff() { diff --git a/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java b/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java deleted file mode 100644 index a5c5541d1..000000000 --- a/src/main/java/techreborn/blocks/machine/BlockBlastFurnace.java +++ /dev/null @@ -1,65 +0,0 @@ -package techreborn.blocks.machine; - -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.TechRebornCreativeTab; -import techreborn.tiles.TileBlastFurnace; - -public class BlockBlastFurnace extends BlockMachineBase implements IRotationTexture { - - public BlockBlastFurnace(Material material) { - super(); - setUnlocalizedName("techreborn.blastfurnace"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TileBlastFurnace(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.blastFurnaceID, world, x, y, z); - return true; - } - - @Override - public boolean isAdvanced() { - return true; - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "industrial_blast_furnace_front_off"; - } - - @Override - public String getFrontOn() { - return prefix + "industrial_blast_furnace_front_on"; - } - - @Override - public String getSide() { - return prefix + "advanced_machine_side"; - } - - @Override - public String getTop() { - return prefix + "advanced_machine_side"; - } - - @Override - public String getBottom() { - return prefix + "assembling_machine_top"; - } -} diff --git a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java deleted file mode 100644 index 60d17eaa7..000000000 --- a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java +++ /dev/null @@ -1,60 +0,0 @@ -package techreborn.blocks.machine; - -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.TechRebornCreativeTab; -import techreborn.tiles.TileCentrifuge; - -public class BlockCentrifuge extends BlockMachineBase implements IRotationTexture { - - public BlockCentrifuge() { - super(); - setUnlocalizedName("techreborn.centrifuge"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileCentrifuge(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()) { - player.openGui(Core.INSTANCE, GuiHandler.centrifugeID, world, x, y, z); - } - return true; - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "industrial_centrifuge_side_off"; - } - - @Override - public String getFrontOn() { - return prefix + "industrial_centrifuge_side_on"; - } - - @Override - public String getSide() { - return getFrontOff(); - } - - @Override - public String getTop() { - return prefix + "industrial_centrifuge_top_off"; - } - - @Override - public String getBottom() { - return prefix + "industrial_centrifuge_bottom"; - } -} diff --git a/src/main/java/techreborn/blocks/machine/BlockChargeBench.java b/src/main/java/techreborn/blocks/machine/BlockChargeBench.java index 4d3d9de09..fb56b6e35 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChargeBench.java +++ b/src/main/java/techreborn/blocks/machine/BlockChargeBench.java @@ -31,7 +31,7 @@ public class BlockChargeBench extends BlockMachineBase implements IRotationTextu return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFrontOff() { diff --git a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java index c9f409f12..a5bd15b51 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java @@ -32,7 +32,7 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFrontOff() { @@ -51,11 +51,11 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT @Override public String getTop() { - return prefix + "industrial_centrifuge_top_off"; + return prefix + "chemical_reactor_top"; } @Override public String getBottom() { - return prefix + "industrial_centrifuge_bottom"; + return prefix + "chemical_reactor_bottom"; } } diff --git a/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java b/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java deleted file mode 100644 index 41adef5ec..000000000 --- a/src/main/java/techreborn/blocks/machine/BlockDistillationTower.java +++ /dev/null @@ -1,42 +0,0 @@ -package techreborn.blocks.machine; - -import net.minecraft.block.material.Material; -import reborncore.common.blocks.BlockMachineBase; -import reborncore.common.blocks.IRotationTexture; -import techreborn.client.TechRebornCreativeTab; - -public class BlockDistillationTower extends BlockMachineBase implements IRotationTexture { - - public BlockDistillationTower(Material material) { - super(); - setUnlocalizedName("techreborn.distillationtower"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "distillation_tower_front_off"; - } - - @Override - public String getFrontOn() { - return prefix + "distillation_tower_front_off"; - } - - @Override - public String getSide() { - return prefix + "advanced_machine_side"; - } - - @Override - public String getTop() { - return prefix + "industrial_centrifuge_top_off"; - } - - @Override - public String getBottom() { - return prefix + "industrial_centrifuge_bottom"; - } -} diff --git a/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java deleted file mode 100644 index 0567bcc39..000000000 --- a/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java +++ /dev/null @@ -1,60 +0,0 @@ -package techreborn.blocks.machine; - -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.TechRebornCreativeTab; -import techreborn.tiles.TileImplosionCompressor; - -public class BlockImplosionCompressor extends BlockMachineBase implements IRotationTexture { - - public BlockImplosionCompressor(Material material) { - super(); - setUnlocalizedName("techreborn.implosioncompressor"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileImplosionCompressor(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.implosionCompresserID, world, x, y, z); - return true; - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "implosion_compressor_front_off"; - } - - @Override - public String getFrontOn() { - return prefix + "implosion_compressor_front_on"; - } - - @Override - public String getSide() { - return prefix + "advanced_machine_side"; - } - - @Override - public String getTop() { - return prefix + "industrial_centrifuge_top_off"; - } - - @Override - public String getBottom() { - return prefix + "implosion_compressor_bottom"; - } -} diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java deleted file mode 100644 index fa80ff122..000000000 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java +++ /dev/null @@ -1,60 +0,0 @@ -package techreborn.blocks.machine; - -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.TechRebornCreativeTab; -import techreborn.tiles.TileIndustrialElectrolyzer; - -public class BlockIndustrialElectrolyzer extends BlockMachineBase implements IRotationTexture { - - public BlockIndustrialElectrolyzer(Material material) { - super(); - setUnlocalizedName("techreborn.industrialelectrolyzer"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TileIndustrialElectrolyzer(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.industrialElectrolyzerID, world, x, y, z); - return true; - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "industrial_electrolyzer_front_off"; - } - - @Override - public String getFrontOn() { - return prefix + "industrial_electrolyzer_front_on"; - } - - @Override - public String getSide() { - return prefix + "industrial_electrolyzer_front_off"; - } - - @Override - public String getTop() { - return prefix + "machine_top"; - } - - @Override - public String getBottom() { - return prefix + "machine_bottom"; - } -} diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialGrinder.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialGrinder.java deleted file mode 100644 index 6f9dd0610..000000000 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialGrinder.java +++ /dev/null @@ -1,64 +0,0 @@ -package techreborn.blocks.machine; - -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -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.TechRebornCreativeTab; -import techreborn.tiles.TileIndustrialGrinder; - -public class BlockIndustrialGrinder extends BlockMachineBase implements IRotationTexture { - - public BlockIndustrialGrinder(Material material) { - super(); - setUnlocalizedName("techreborn.industrialgrinder"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileIndustrialGrinder(); - } - - @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)){ - return true; - } - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.industrialGrinderID, world, x, y, z); - return true; - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "industrial_grinder_front_off"; - } - - @Override - public String getFrontOn() { - return prefix + "industrial_grinder_front_on"; - } - - @Override - public String getSide() { - return prefix + "machine_side"; - } - - @Override - public String getTop() { - return prefix + "industrial_grinder_top_off"; - } - - @Override - public String getBottom() { - return prefix + "industrial_centrifuge_bottom"; - } -} diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java deleted file mode 100644 index 2d1f09be7..000000000 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java +++ /dev/null @@ -1,64 +0,0 @@ -package techreborn.blocks.machine; - -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -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.TechRebornCreativeTab; -import techreborn.tiles.TileIndustrialSawmill; - -public class BlockIndustrialSawmill extends BlockMachineBase implements IRotationTexture { - - public BlockIndustrialSawmill(Material material) { - super(); - setUnlocalizedName("techreborn.industrialsawmill"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) { - return new TileIndustrialSawmill(); - } - - @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)){ - return true; - } - if (!player.isSneaking()) - player.openGui(Core.INSTANCE, GuiHandler.sawMillID, world, x, y, z); - return true; - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "industrial_sawmill_front_off"; - } - - @Override - public String getFrontOn() { - return prefix + "industrial_sawmill_front_on"; - } - - @Override - public String getSide() { - return prefix + "advanced_machine_side"; - } - - @Override - public String getTop() { - return prefix + "advanced_machine_side"; - } - - @Override - public String getBottom() { - return prefix + "advanced_machine_side"; - } -} diff --git a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java index 744315cfd..0ce91a44c 100644 --- a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java @@ -31,7 +31,7 @@ public class BlockMatterFabricator extends BlockMachineBase implements IAdvanced return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public boolean isAdvanced() { diff --git a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java index 9f186fb5e..727241532 100644 --- a/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockRollingMachine.java @@ -31,7 +31,7 @@ public class BlockRollingMachine extends BlockMachineBase implements IAdvancedRo return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java index 0dba4d314..1f7bc4f5d 100644 --- a/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/machine/BlockVacuumFreezer.java @@ -34,7 +34,7 @@ public class BlockVacuumFreezer extends BlockMachineBase implements IAdvancedRot return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/greg_machines/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/storage/BlockAesu.java b/src/main/java/techreborn/blocks/storage/BlockAesu.java index 40bdf836f..84be46267 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockAesu.java @@ -11,11 +11,11 @@ import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileAesu; -public class BlockAesu extends BlockMachineBase implements IRotationTexture { +public class BlockAESU extends BlockMachineBase implements IRotationTexture { - public BlockAesu(Material material) { + public BlockAESU(Material material) { super(); setUnlocalizedName("techreborn.aesu"); setCreativeTab(TechRebornCreativeTab.instance); @@ -35,7 +35,7 @@ public class BlockAesu extends BlockMachineBase implements IRotationTexture { return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/storage/"; @Override public String getFrontOff() { diff --git a/src/main/java/techreborn/blocks/storage/BlockIDSU.java b/src/main/java/techreborn/blocks/storage/BlockIDSU.java index 7aa1176f5..4e686e1d2 100644 --- a/src/main/java/techreborn/blocks/storage/BlockIDSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockIDSU.java @@ -48,7 +48,7 @@ public class BlockIDSU extends BlockMachineBase implements IAdvancedRotationText } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/storage/"; @Override diff --git a/src/main/java/techreborn/blocks/storage/BlockLesu.java b/src/main/java/techreborn/blocks/storage/BlockLesu.java index a53a05cf5..820364b69 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockLesu.java @@ -11,10 +11,10 @@ import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.lesu.TileLesu; -public class BlockLesu extends BlockMachineBase implements IAdvancedRotationTexture { +public class BlockLESU extends BlockMachineBase implements IAdvancedRotationTexture { - public BlockLesu(Material material) { + public BlockLESU(Material material) { super(); setUnlocalizedName("techreborn.lesu"); setCreativeTab(TechRebornCreativeTab.instance); @@ -35,7 +35,7 @@ public class BlockLesu extends BlockMachineBase implements IAdvancedRotationText return true; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/storage/"; @Override diff --git a/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java b/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java index 6dcb86611..52bddec5b 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLesuStorage.java @@ -13,9 +13,9 @@ import reborncore.common.blocks.IAdvancedRotationTexture; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.lesu.TileLesuStorage; -public class BlockLesuStorage extends BlockMachineBase implements IAdvancedRotationTexture { +public class BlockLESUStorage extends BlockMachineBase implements IAdvancedRotationTexture { - public BlockLesuStorage(Material material) { + public BlockLESUStorage(Material material) { super(); setUnlocalizedName("techreborn.lesustorage"); setCreativeTab(TechRebornCreativeTab.instance); @@ -48,7 +48,7 @@ public class BlockLesuStorage extends BlockMachineBase implements IAdvancedRotat return block == (Block) this; } - private final String prefix = "techreborn:blocks/machine/"; + private final String prefix = "techreborn:blocks/machine/storage/"; @Override public String getFront(boolean isActive) { diff --git a/src/main/java/techreborn/blocks/teir1/BlockCompressor.java b/src/main/java/techreborn/blocks/teir1/BlockCompressor.java deleted file mode 100644 index ad7fc1c96..000000000 --- a/src/main/java/techreborn/blocks/teir1/BlockCompressor.java +++ /dev/null @@ -1,61 +0,0 @@ -package techreborn.blocks.teir1; - -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.TechRebornCreativeTab; -import techreborn.tiles.teir1.TileCompressor; - -public class BlockCompressor extends BlockMachineBase implements IRotationTexture{ - - public BlockCompressor(Material material) { - super(); - setUnlocalizedName("techreborn.compressor"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileCompressor(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()){ - player.openGui(Core.INSTANCE, GuiHandler.compressorID, world, x, y, z); - } - return true; - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "compressor_front_off"; - } - - @Override - public String getFrontOn() { - return prefix + "compressor_front_on"; - } - - @Override - public String getSide() { - return prefix + "machine_side"; - } - - @Override - public String getTop() { - return prefix + "machine_top"; - } - - @Override - public String getBottom() { - return prefix + "machine_bottom"; - } -} diff --git a/src/main/java/techreborn/blocks/teir1/BlockElectricFurnace.java b/src/main/java/techreborn/blocks/teir1/BlockElectricFurnace.java deleted file mode 100644 index f4bd8d44d..000000000 --- a/src/main/java/techreborn/blocks/teir1/BlockElectricFurnace.java +++ /dev/null @@ -1,61 +0,0 @@ -package techreborn.blocks.teir1; - -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.TechRebornCreativeTab; -import techreborn.tiles.teir1.TileElectricFurnace; - -public class BlockElectricFurnace extends BlockMachineBase implements IRotationTexture{ - - public BlockElectricFurnace(Material material) { - super(); - setUnlocalizedName("techreborn.electricfurnace"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileElectricFurnace(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()){ - player.openGui(Core.INSTANCE, GuiHandler.electricFurnaceID, world, x, y, z); - } - return true; - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "electric_furnace_front_off"; - } - - @Override - public String getFrontOn() { - return prefix + "electric_furnace_front_on"; - } - - @Override - public String getSide() { - return prefix + "machine_side" ; - } - - @Override - public String getTop() { - return prefix + "machine_top"; - } - - @Override - public String getBottom() { - return prefix + "machine_bottom"; - } -} diff --git a/src/main/java/techreborn/blocks/teir1/BlockExtractor.java b/src/main/java/techreborn/blocks/teir1/BlockExtractor.java deleted file mode 100644 index 9bcfc5962..000000000 --- a/src/main/java/techreborn/blocks/teir1/BlockExtractor.java +++ /dev/null @@ -1,61 +0,0 @@ -package techreborn.blocks.teir1; - -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.TechRebornCreativeTab; -import techreborn.tiles.teir1.TileExtractor; - -public class BlockExtractor extends BlockMachineBase implements IRotationTexture{ - - public BlockExtractor(Material material) { - super(); - setUnlocalizedName("techreborn.extractor"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileExtractor(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()){ - player.openGui(Core.INSTANCE, GuiHandler.extractorID, world, x, y, z); - } - return true; - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "extractor_front_off"; - } - - @Override - public String getFrontOn() { - return prefix + "extractor_front_on"; - } - - @Override - public String getSide() { - return prefix + "machine_side"; - } - - @Override - public String getTop() { - return prefix + "machine_top"; - } - - @Override - public String getBottom() { - return prefix + "machine_bottom"; - } -} diff --git a/src/main/java/techreborn/blocks/teir1/BlockGrinder.java b/src/main/java/techreborn/blocks/teir1/BlockGrinder.java deleted file mode 100644 index 6f5bc1aa7..000000000 --- a/src/main/java/techreborn/blocks/teir1/BlockGrinder.java +++ /dev/null @@ -1,61 +0,0 @@ -package techreborn.blocks.teir1; - -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.TechRebornCreativeTab; -import techreborn.tiles.teir1.TileGrinder; - -public class BlockGrinder extends BlockMachineBase implements IRotationTexture{ - - public BlockGrinder(Material material) { - super(); - setUnlocalizedName("techreborn.grinder"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileGrinder(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()){ - player.openGui(Core.INSTANCE, GuiHandler.grinderID, world, x, y, z); - } - return true; - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "industrial_grinder_front_off"; - } - - @Override - public String getFrontOn() { - return prefix + "industrial_grinder_front_on"; - } - - @Override - public String getSide() { - return prefix + "machine_side"; - } - - @Override - public String getTop() { - return prefix + "industrial_grinder_top_off"; - } - - @Override - public String getBottom() { - return prefix + "industrial_centrifuge_bottom"; - } -} diff --git a/src/main/java/techreborn/blocks/teir1/BlockRecycler.java b/src/main/java/techreborn/blocks/teir1/BlockRecycler.java deleted file mode 100644 index e90c23f76..000000000 --- a/src/main/java/techreborn/blocks/teir1/BlockRecycler.java +++ /dev/null @@ -1,61 +0,0 @@ -package techreborn.blocks.teir1; - -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.TechRebornCreativeTab; -import techreborn.tiles.teir1.TileRecycler; - -public class BlockRecycler extends BlockMachineBase implements IRotationTexture{ - - public BlockRecycler(Material material) { - super(); - setUnlocalizedName("techreborn.recycler"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileRecycler(); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - if (!player.isSneaking()){ - player.openGui(Core.INSTANCE, GuiHandler.recyclerID, world, x, y, z); - } - return true; - } - - private final String prefix = "techreborn:blocks/machine/"; - - @Override - public String getFrontOff() { - return prefix + "recycler_front_off"; - } - - @Override - public String getFrontOn() { - return prefix + "recycler_front_on"; - } - - @Override - public String getSide() { - return prefix + "machine_side"; - } - - @Override - public String getTop() { - return prefix + "machine_top"; - } - - @Override - public String getBottom() { - return prefix + "machine_bottom"; - } -} diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index ea1353d83..03f89b6c5 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -8,31 +8,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import reborncore.common.tile.TileMachineBase; import techreborn.Core; -import techreborn.blocks.BlockChunkLoader; -import techreborn.blocks.BlockComputerCube; -import techreborn.blocks.BlockDigitalChest; -import techreborn.blocks.BlockElectricCraftingTable; -import techreborn.blocks.BlockFusionCoil; -import techreborn.blocks.BlockFusionControlComputer; -import techreborn.blocks.BlockHighlyAdvancedMachine; -import techreborn.blocks.BlockIronFence; -import techreborn.blocks.BlockIronFurnace; -import techreborn.blocks.BlockMachineCasing; -import techreborn.blocks.BlockMachineFrame; -import techreborn.blocks.BlockNuke; -import techreborn.blocks.BlockOre; -import techreborn.blocks.BlockOre2; -import techreborn.blocks.BlockPlayerDetector; -import techreborn.blocks.BlockQuantumChest; -import techreborn.blocks.BlockQuantumTank; -import techreborn.blocks.BlockReinforcedGlass; -import techreborn.blocks.BlockRubberLeaves; -import techreborn.blocks.BlockRubberLog; -import techreborn.blocks.BlockRubberPlank; -import techreborn.blocks.BlockRubberSapling; -import techreborn.blocks.BlockStorage; -import techreborn.blocks.BlockStorage2; -import techreborn.blocks.BlockSupercondensator; +import techreborn.blocks.*; +import techreborn.blocks.advanced_machine.*; import techreborn.blocks.generator.BlockDieselGenerator; import techreborn.blocks.generator.BlockDragonEggSiphoner; import techreborn.blocks.generator.BlockGasTurbine; @@ -47,30 +24,14 @@ import techreborn.blocks.generator.BlockSolarPanel; import techreborn.blocks.generator.BlockThermalGenerator; import techreborn.blocks.generator.BlockWaterMill; import techreborn.blocks.generator.BlockWindMill; -import techreborn.blocks.machine.BlockAlloyFurnace; -import techreborn.blocks.machine.BlockAlloySmelter; -import techreborn.blocks.machine.BlockAssemblingMachine; -import techreborn.blocks.machine.BlockBlastFurnace; -import techreborn.blocks.machine.BlockCentrifuge; -import techreborn.blocks.machine.BlockChargeBench; -import techreborn.blocks.machine.BlockChemicalReactor; -import techreborn.blocks.machine.BlockDistillationTower; -import techreborn.blocks.machine.BlockImplosionCompressor; -import techreborn.blocks.machine.BlockIndustrialElectrolyzer; -import techreborn.blocks.machine.BlockIndustrialGrinder; -import techreborn.blocks.machine.BlockIndustrialSawmill; -import techreborn.blocks.machine.BlockMatterFabricator; -import techreborn.blocks.machine.BlockRollingMachine; -import techreborn.blocks.machine.BlockVacuumFreezer; -import techreborn.blocks.storage.BlockAesu; +import techreborn.blocks.iron_machines.BlockAlloyFurnace; +import techreborn.blocks.iron_machines.BlockIronFurnace; +import techreborn.blocks.machine.*; +import techreborn.blocks.storage.BlockAESU; import techreborn.blocks.storage.BlockIDSU; -import techreborn.blocks.storage.BlockLesu; -import techreborn.blocks.storage.BlockLesuStorage; -import techreborn.blocks.teir1.BlockCompressor; -import techreborn.blocks.teir1.BlockElectricFurnace; -import techreborn.blocks.teir1.BlockExtractor; -import techreborn.blocks.teir1.BlockGrinder; -import techreborn.blocks.teir1.BlockRecycler; +import techreborn.blocks.storage.BlockLESU; +import techreborn.blocks.storage.BlockLESUStorage; +import techreborn.blocks.tier1.*; import techreborn.itemblocks.ItemBlockAesu; import techreborn.itemblocks.ItemBlockDigitalChest; import techreborn.itemblocks.ItemBlockMachineCasing; @@ -312,18 +273,18 @@ public class ModBlocks { GameRegistry.registerBlock(Idsu, "idsu"); GameRegistry.registerTileEntity(TileIDSU.class, "TileIDSUTR"); - Aesu = new BlockAesu(Material.rock); + Aesu = new BlockAESU(Material.rock); GameRegistry.registerBlock(Aesu, ItemBlockAesu.class, "aesu"); GameRegistry.registerTileEntity(TileAesu.class, "TileAesuTR"); - Lesu = new BlockLesu(Material.rock); + Lesu = new BlockLESU(Material.rock); GameRegistry.registerBlock(Lesu, "lesu"); GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR"); Supercondensator = new BlockSupercondensator(Material.rock); GameRegistry.registerBlock(Supercondensator, "supercondensator"); - LesuStorage = new BlockLesuStorage(Material.rock); + LesuStorage = new BlockLESUStorage(Material.rock); GameRegistry.registerBlock(LesuStorage, "lesustorage"); GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR"); diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_other.png b/src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_other.png deleted file mode 100644 index cfdd5b094..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_other.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_top.png deleted file mode 100644 index e45e0c1d1..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/ThermalGenerator_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/advancedMachine_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advancedMachine_machine_block.png deleted file mode 100644 index 3c79b8503..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/advancedMachine_machine_block.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machine_side.png deleted file mode 100644 index 0101558b0..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/advanced_machine_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/aesu_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/aesu_front.png deleted file mode 100644 index 93da5ca99..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/aesu_front.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/aesu_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/aesu_side.png deleted file mode 100644 index 3898e5f5e..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/aesu_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_bottom.png deleted file mode 100644 index 9e19b1412..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_front_off.png deleted file mode 100644 index b3d58bafe..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_front_on.png deleted file mode 100644 index 1e726ec8b..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_side.png deleted file mode 100644 index 24a1625aa..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_top.png deleted file mode 100644 index 66085310c..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/alloy_furnace_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/aluminum_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/aluminum_machine_block.png deleted file mode 100644 index 1bb0edac9..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/aluminum_machine_block.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_front_off.png deleted file mode 100644 index ddaa83873..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_front_on.png deleted file mode 100644 index ad913f373..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_top.png deleted file mode 100644 index 25581a3e2..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/assembling_machine_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/brass_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/brass_machine_block.png deleted file mode 100644 index e49158bfb..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/brass_machine_block.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/bronze_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/bronze_machine_block.png deleted file mode 100644 index 0ced27445..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/bronze_machine_block.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced.png b/src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced.png deleted file mode 100644 index 5b48dd18d..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced_edge.png b/src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced_edge.png deleted file mode 100644 index 2e2cdc803..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced_edge.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced_full.png b/src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced_full.png deleted file mode 100644 index d30e16531..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/casingadvanced_full.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced.png b/src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced.png deleted file mode 100644 index baf7626a0..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced_edge.png b/src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced_edge.png deleted file mode 100644 index 3ee4f29b3..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced_edge.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced_full.png b/src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced_full.png deleted file mode 100644 index 5c219b570..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/casingreinforced_full.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard.png b/src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard.png deleted file mode 100644 index 63650578b..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard_edge.png b/src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard_edge.png deleted file mode 100644 index 4ae47b8e5..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard_edge.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard_full.png b/src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard_full.png deleted file mode 100644 index cf472d679..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/casingstandard_full.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/centrifuge_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/centrifuge_front_off.png deleted file mode 100644 index 7cdcc0825..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/centrifuge_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/chargeBench_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/chargeBench_side.png deleted file mode 100644 index 3bb33ea5f..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/chargeBench_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/chemical_reactor_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/chemical_reactor_side_off.png deleted file mode 100644 index b020cb984..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/chemical_reactor_side_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/chemical_reactor_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/chemical_reactor_side_on.png deleted file mode 100644 index f3061ae2f..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/chemical_reactor_side_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_off.png deleted file mode 100644 index aaf417ae0..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_on.png deleted file mode 100644 index e30f6b1ac..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_on.png.mcmeta deleted file mode 100644 index 60af67825..000000000 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/compressor_front_on.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation":{ - "frametime":4 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/computer_cube.png b/src/main/resources/assets/techreborn/textures/blocks/machine/computer_cube.png deleted file mode 100644 index 24590a6eb..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/computer_cube.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_off.png deleted file mode 100644 index 5ffa07e13..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_on.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_on.mcmeta deleted file mode 100644 index 97596ba81..000000000 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_on.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_on.png deleted file mode 100644 index 299a1fa74..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/diesel_generator_top_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/distillation_tower_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/distillation_tower_front_off.png deleted file mode 100644 index 62d24616a..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/distillation_tower_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/distillation_tower_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/distillation_tower_front_on.png deleted file mode 100644 index db61220c3..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/distillation_tower_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_side_off.png deleted file mode 100644 index 1818b15e2..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_side_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_side_on.png deleted file mode 100644 index bc0b68963..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_side_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_top.png deleted file mode 100644 index 35ac445c4..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/dragon_egg_energy_siphon_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_alloy_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/electric_alloy_furnace_front_off.png deleted file mode 100644 index 6589e797a..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_alloy_furnace_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_alloy_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/electric_alloy_furnace_front_on.png deleted file mode 100644 index dd6338717..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_alloy_furnace_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_crafting_table_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/electric_crafting_table_front.png deleted file mode 100644 index 8ed44344d..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_crafting_table_front.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_crafting_table_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/electric_crafting_table_top.png deleted file mode 100644 index 807bad9d3..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_crafting_table_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/electric_furnace_front_off.png deleted file mode 100644 index 4e2e61bc0..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_furnace_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/electric_furnace_front_on.png deleted file mode 100644 index 9256acbd4..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/electric_furnace_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_off.png deleted file mode 100644 index f84d051b3..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_on.png deleted file mode 100644 index 87ab13b81..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_on.png.mcmeta deleted file mode 100644 index 97596ba81..000000000 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/extractor_front_on.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/extreme_voltage_machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/extreme_voltage_machine_side.png deleted file mode 100644 index 3898e5f5e..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/extreme_voltage_machine_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_coil.png b/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_coil.png deleted file mode 100644 index 2deae8484..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_coil.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_control_computer_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_control_computer_front.png deleted file mode 100644 index daa9d9df8..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_control_computer_front.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_control_computer_front.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_control_computer_front.png.mcmeta deleted file mode 100644 index 60af67825..000000000 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/fusion_control_computer_front.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation":{ - "frametime":4 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/gas_generator_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/gas_generator_bottom.png deleted file mode 100644 index 6e6564e1f..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/gas_generator_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/gas_generator_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/gas_generator_top.png deleted file mode 100644 index cc90d92b9..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/gas_generator_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_off.png deleted file mode 100644 index 964527ca2..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_on.png deleted file mode 100644 index c7c10464e..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_on.png.mcmeta deleted file mode 100644 index 4f0718ac9..000000000 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/generator_front_on.png.mcmeta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "animation": {} -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_bottom.png deleted file mode 100644 index 136c6a1a4..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_side.png deleted file mode 100644 index c6d698cdf..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_top.png deleted file mode 100644 index 01550883d..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/highlyadvancedmachine.png b/src/main/resources/assets/techreborn/textures/blocks/machine/highlyadvancedmachine.png deleted file mode 100644 index eb7432efe..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/highlyadvancedmachine.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_front.png deleted file mode 100644 index 9b8d19b9c..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_front.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png deleted file mode 100644 index 7fc5c2c0d..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png.mcmeta deleted file mode 100644 index 60af67825..000000000 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/idsu_side.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation":{ - "frametime":4 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_bottom.png deleted file mode 100644 index 509a6056f..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_front_off.png deleted file mode 100644 index 1442869a5..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_front_on.png deleted file mode 100644 index b5ca1a2a6..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/implosion_compressor_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_blast_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_blast_furnace_front_off.png deleted file mode 100644 index 42f13e725..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_blast_furnace_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_blast_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_blast_furnace_front_on.png deleted file mode 100644 index 4604f8586..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_blast_furnace_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_bottom.png deleted file mode 100644 index 0ffe7cd57..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_off.png deleted file mode 100644 index 67a541b6b..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png deleted file mode 100644 index 7a9665b8b..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png.mcmeta deleted file mode 100644 index dfae8cae1..000000000 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation":{ - "frametime":1 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_off.png deleted file mode 100644 index 2fa2aa7a3..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png deleted file mode 100644 index 436672a26..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png.mcmeta deleted file mode 100644 index dfae8cae1..000000000 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation":{ - "frametime":1 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_chunk_loader_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_chunk_loader_side.png deleted file mode 100644 index 43e5a1fa5..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_chunk_loader_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_electrolyzer_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_electrolyzer_front_off.png deleted file mode 100644 index 7cdcc0825..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_electrolyzer_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_electrolyzer_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_electrolyzer_front_on.png deleted file mode 100644 index d87d16cda..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_electrolyzer_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_front_off.png deleted file mode 100644 index 39dc387e2..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_front_on.png deleted file mode 100644 index 039e3133f..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_off.png deleted file mode 100644 index 9da945bf4..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_on.png deleted file mode 100644 index 039cdd166..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_on.png.mcmeta deleted file mode 100644 index 60af67825..000000000 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_grinder_top_on.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation":{ - "frametime":4 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_off.png deleted file mode 100644 index efbf0ac53..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_on.png deleted file mode 100644 index bd8b1747f..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_on.png.mcmeta deleted file mode 100644 index dfae8cae1..000000000 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_sawmill_front_on.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation":{ - "frametime":1 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_bottom.png deleted file mode 100644 index 9e19b1412..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_off.png deleted file mode 100644 index 9b9aead07..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_on.png deleted file mode 100644 index 37994fef1..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_on.png.mcmeta deleted file mode 100644 index 4f0718ac9..000000000 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_front_on.png.mcmeta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "animation": {} -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_side.png deleted file mode 100644 index 24a1625aa..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_top.png deleted file mode 100644 index 66085310c..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_furnace_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machine_block.png deleted file mode 100644 index 1613a8302..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machine_block.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/lathe_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lathe_front_off.png deleted file mode 100644 index f3f94fec8..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/lathe_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/lathe_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lathe_front_on.png deleted file mode 100644 index 547cadba7..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/lathe_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_block.png deleted file mode 100644 index 4b044bf0a..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_block.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_front.png deleted file mode 100644 index 4835a79ed..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_front.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_side.png deleted file mode 100644 index b1e09dc1f..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/lesu_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/lightning_rod_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/lightning_rod_top.png deleted file mode 100644 index bcd1fdbe5..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/lightning_rod_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/machine_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_bottom.png deleted file mode 100644 index 73e829527..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/machine_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/machine_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_machine_block.png deleted file mode 100644 index 537ab32cd..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/machine_machine_block.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_side.png deleted file mode 100644 index 537ab32cd..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/machine_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/machine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/machine_top.png deleted file mode 100644 index d5fadf931..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/machine_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_bottom.png deleted file mode 100644 index 1a5674773..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_side.png deleted file mode 100644 index a14912952..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_top.png deleted file mode 100644 index 785425912..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_absorber_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_bottom.png deleted file mode 100644 index a16c9f1d0..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_front on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_front on.png deleted file mode 100644 index 4a9f88805..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_front on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_front_off.png deleted file mode 100644 index 1818b15e2..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_side.png deleted file mode 100644 index 01a53768b..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_top.png deleted file mode 100644 index 4b28a01ca..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/magic_energy_converter_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/matter_fabricator_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/matter_fabricator_off.png deleted file mode 100644 index 38a141ffa..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/matter_fabricator_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/matter_fabricator_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/matter_fabricator_on.png deleted file mode 100644 index 2b5e51c7b..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/matter_fabricator_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/matterfab_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/matterfab_off.png deleted file mode 100644 index c9b76ec03..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/matterfab_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/matterfab_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/matterfab_on.png deleted file mode 100644 index f12fa6e66..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/matterfab_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_books.png b/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_books.png deleted file mode 100644 index 3a8905ecf..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_books.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_cans.png b/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_cans.png deleted file mode 100644 index ecad4b9d8..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_cans.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_empty.png b/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_empty.png deleted file mode 100644 index 152268390..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_empty.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_paper.png b/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_paper.png deleted file mode 100644 index 3577dd676..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/metal_shelf_paper.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_front.png deleted file mode 100644 index fd1c2d243..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_front.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_side_off.png deleted file mode 100644 index 9b8cd1962..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_side_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_side_on.png deleted file mode 100644 index 23a471af6..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/plasma_generator_side_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/plate_cutting_machine_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/plate_cutting_machine_front_off.png deleted file mode 100644 index c90cf4201..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/plate_cutting_machine_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/plate_cutting_machine_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/plate_cutting_machine_front_on.png deleted file mode 100644 index 26d862a8f..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/plate_cutting_machine_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_all.png b/src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_all.png deleted file mode 100644 index e3818fb35..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_all.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_others.png b/src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_others.png deleted file mode 100644 index 8d888febe..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_others.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_you.png b/src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_you.png deleted file mode 100644 index 2fb44fb74..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/player_detector_you.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/qchest_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/qchest_side.png deleted file mode 100644 index 104aa2782..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/qchest_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/quantum_chest.png b/src/main/resources/assets/techreborn/textures/blocks/machine/quantum_chest.png deleted file mode 100644 index fb9b45471..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/quantum_chest.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/quantum_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/quantum_top.png deleted file mode 100644 index 24590a6eb..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/quantum_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_off.png deleted file mode 100644 index e41baff43..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_on.png deleted file mode 100644 index a6c87d2cd..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_on.png.mcmeta deleted file mode 100644 index 97596ba81..000000000 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/recycler_front_on.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/reinforcedglass.png b/src/main/resources/assets/techreborn/textures/blocks/machine/reinforcedglass.png deleted file mode 100644 index 16a8ad7f5..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/reinforcedglass.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/rolling_machine_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/rolling_machine_side_off.png deleted file mode 100644 index 047ef270e..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/rolling_machine_side_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/rolling_machine_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/rolling_machine_side_on.png deleted file mode 100644 index 48ca2e551..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/rolling_machine_side_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/semifluid_generator_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/semifluid_generator_side.png deleted file mode 100644 index 008c8d789..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/semifluid_generator_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_side_off.png deleted file mode 100644 index 798289263..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_side_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_side_on.png deleted file mode 100644 index bd4fb834b..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_side_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_top_off.png deleted file mode 100644 index 3bedc33da..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_top_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_top_on.png deleted file mode 100644 index 78a0fa5f6..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/solar_panel_top_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/steel_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/steel_machine_block.png deleted file mode 100644 index 3ee25efeb..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/steel_machine_block.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/supercondensator_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/supercondensator_front.png deleted file mode 100644 index 3bae2edbc..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/supercondensator_front.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/supercondensator_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/supercondensator_side.png deleted file mode 100644 index 14358b0ef..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/supercondensator_side.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_off.png deleted file mode 100644 index 03c8cefe6..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_on.png deleted file mode 100644 index adeec8292..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_on.png.mcmeta deleted file mode 100644 index 7ceb36394..000000000 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_side_on.png.mcmeta +++ /dev/null @@ -1,45 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_off.png deleted file mode 100644 index 0af080f9e..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_on.png deleted file mode 100644 index 715cac950..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_on.png.mcmeta deleted file mode 100644 index 7ceb36394..000000000 --- a/src/main/resources/assets/techreborn/textures/blocks/machine/thermal_generator_top_on.png.mcmeta +++ /dev/null @@ -1,45 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/titanium_machine_block.png b/src/main/resources/assets/techreborn/textures/blocks/machine/titanium_machine_block.png deleted file mode 100644 index 293c8a331..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/titanium_machine_block.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/vacuum_freezer_front.png b/src/main/resources/assets/techreborn/textures/blocks/machine/vacuum_freezer_front.png deleted file mode 100644 index cc7c48768..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/vacuum_freezer_front.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/vacuum_freezer_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/vacuum_freezer_top.png deleted file mode 100644 index 72ee0c939..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/vacuum_freezer_top.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_books.png b/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_books.png deleted file mode 100644 index e3a488386..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_books.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_cans.png b/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_cans.png deleted file mode 100644 index ecd7a0606..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_cans.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_empty.png b/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_empty.png deleted file mode 100644 index 677d4c6a6..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_empty.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_paper.png b/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_paper.png deleted file mode 100644 index 59c3c659d..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_paper.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_side.png deleted file mode 100644 index 9e9505ca6..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/wood_shelf_side.png and /dev/null differ