Changed lots of texture paths. There will be some missing ones, I'll resolve those later.

This commit is contained in:
TheDoctorSoda 2016-03-13 20:27:15 -07:00
parent 2e4327f8cb
commit 7d5fe7f19a
214 changed files with 76 additions and 1285 deletions

View file

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

View file

@ -27,7 +27,7 @@ public class BlockComputerCube extends BlockMachineBase implements IAdvancedRota
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -32,7 +32,7 @@ public class BlockDigitalChest extends BlockMachineBase implements IAdvancedRota
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -15,7 +15,7 @@ public class BlockElectricCraftingTable extends BlockMachineBase implements IAdv
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -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 @Override
public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {

View file

@ -48,7 +48,7 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv
return new TileEntityFusionController(); return new TileEntityFusionController();
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
@ -57,16 +57,16 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv
@Override @Override
public String getSide(boolean isActive) { public String getSide(boolean isActive) {
return prefix + "plasma_generator_side_off" ; return prefix + "fusion_control_computer_side" ;
} }
@Override @Override
public String getTop(boolean isActive) { public String getTop(boolean isActive) {
return prefix + "plasma_generator_side_off"; return prefix + "fusion_control_computer_top";
} }
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "plasma_generator_side_off"; return prefix + "fusion_control_computer_bottom";
} }
} }

View file

@ -14,7 +14,7 @@ public class BlockHighlyAdvancedMachine extends BlockMachineBase {
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/machine_blocks/";
@Override @Override

View file

@ -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<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
List<ItemStack> items = new ArrayList<ItemStack>();
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";
}
}

View file

@ -101,7 +101,7 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured
@Override @Override
public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { 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 @Override

View file

@ -58,7 +58,7 @@ public class BlockMachineFrame extends BaseBlock implements ITexturedBlock {
@Override @Override
public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { 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 @Override

View file

@ -51,7 +51,7 @@ public class BlockNuke extends BlockTNT implements ITexturedBlock {
@Override @Override
public String getTextureNameFromState(IBlockState iBlockState, EnumFacing enumFacing) { public String getTextureNameFromState(IBlockState iBlockState, EnumFacing enumFacing) {
return "techreborn:blocks/machine/machine_bottom"; return "techreborn:blocks/machine/greg_machine/nuke";
} }
@Override @Override

View file

@ -124,7 +124,7 @@ public class BlockPlayerDetector extends BaseTileBlock implements ITexturedBlock
@Override @Override
public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { 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 @Override

View file

@ -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 @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -36,7 +36,7 @@ public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotat
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -14,7 +14,7 @@ public class BlockSupercondensator extends BlockMachineBase implements IAdvanced
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -39,16 +39,16 @@ public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedR
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
return prefix + "machine_side"; return prefix + "generator_machine_side";
} }
@Override @Override
public String getSide(boolean isActive) { public String getSide(boolean isActive) {
return prefix + "machine_side" ; return prefix + "generator_machine_side" ;
} }
@Override @Override
@ -58,7 +58,7 @@ public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedR
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "machine_bottom"; return prefix + "generator_machine_bottom";
} }

View file

@ -24,7 +24,7 @@ public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvance
return new TileDragonEggSiphoner(); return new TileDragonEggSiphoner();
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
@ -43,7 +43,7 @@ public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvance
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "machine_bottom"; return prefix + "generator_machine_bottom";
} }
} }

View file

@ -38,16 +38,16 @@ public class BlockGasTurbine extends BlockMachineBase implements IAdvancedRotati
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
return prefix + "machine_side"; return prefix + "generator_machine_side";
} }
@Override @Override
public String getSide(boolean isActive) { public String getSide(boolean isActive) {
return prefix + "machine_side" ; return prefix + "generator_machine_side" ;
} }
@Override @Override

View file

@ -31,7 +31,7 @@ public class BlockGenerator extends BlockMachineBase implements IRotationTexture
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {
@ -45,16 +45,16 @@ public class BlockGenerator extends BlockMachineBase implements IRotationTexture
@Override @Override
public String getSide() { public String getSide() {
return prefix + "machine_side" ; return prefix + "generator_machine_side" ;
} }
@Override @Override
public String getTop() { public String getTop() {
return prefix + "machine_top"; return prefix + "generator_machine_top";
} }
@Override @Override
public String getBottom() { public String getBottom() {
return prefix + "machine_bottom"; return prefix + "generator_machine_bottom";
} }
} }

View file

@ -24,7 +24,7 @@ public class BlockHeatGenerator extends BlockMachineBase implements IAdvancedRot
return new TileHeatGenerator(); return new TileHeatGenerator();
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -14,16 +14,16 @@ public class BlockLightningRod extends BlockMachineBase implements IAdvancedRota
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
return prefix + "idsu_front"; return prefix + "lightning_rod_side";
} }
@Override @Override
public String getSide(boolean isActive) { public String getSide(boolean isActive) {
return prefix + "idsu_front" ; return prefix + "lightning_rod_side" ;
} }
@Override @Override
@ -33,7 +33,7 @@ public class BlockLightningRod extends BlockMachineBase implements IAdvancedRota
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "extreme_voltage_machine_side"; return prefix + "lightning_rod_bottom";
} }
} }

View file

@ -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 @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -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 @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -15,7 +15,7 @@ public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedR
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
@ -29,12 +29,12 @@ public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedR
@Override @Override
public String getTop(boolean isActive) { public String getTop(boolean isActive) {
return prefix + "plasma_generator_side_off"; return prefix + "plasma_generator_bottom";
} }
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "plasma_generator_side_off"; return prefix + "plasma_generator_bottom";
} }
} }

View file

@ -39,7 +39,7 @@ public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvanc
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
@ -53,12 +53,12 @@ public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvanc
@Override @Override
public String getTop(boolean isActive) { public String getTop(boolean isActive) {
return prefix + "machine_top"; return prefix + "generator_machine_top";
} }
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "machine_bottom"; return prefix + "generator_machine_bottom";
} }
} }

View file

@ -46,7 +46,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock {
return new TileSolarPanel(); return new TileSolarPanel();
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getTextureNameFromState(IBlockState state, EnumFacing side) { public String getTextureNameFromState(IBlockState state, EnumFacing side) {
@ -54,7 +54,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock {
if(side == EnumFacing.UP){ if(side == EnumFacing.UP){
return prefix + "solar_panel_top_" + (isActive ? "on" : "off"); return prefix + "solar_panel_top_" + (isActive ? "on" : "off");
} else if(side==EnumFacing.DOWN){ } else if(side==EnumFacing.DOWN){
return prefix + "machine_bottom"; return prefix + "generator_machine_bottom";
} }
return prefix + "solar_panel_side_" + (isActive ? "on" : "off"); return prefix + "solar_panel_side_" + (isActive ? "on" : "off");
} }

View file

@ -38,7 +38,7 @@ public class BlockThermalGenerator extends BlockMachineBase implements IAdvanced
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
@ -58,6 +58,6 @@ public class BlockThermalGenerator extends BlockMachineBase implements IAdvanced
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "machine_bottom"; return prefix + "generator_machine_bottom";
} }
} }

View file

@ -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<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
List<ItemStack> items = new ArrayList<ItemStack>();
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";
}
}

View file

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

View file

@ -32,7 +32,7 @@ public class BlockAssemblingMachine extends BlockMachineBase implements IRotatio
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {

View file

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

View file

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

View file

@ -31,7 +31,7 @@ public class BlockChargeBench extends BlockMachineBase implements IRotationTextu
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {

View file

@ -32,7 +32,7 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {
@ -51,11 +51,11 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT
@Override @Override
public String getTop() { public String getTop() {
return prefix + "industrial_centrifuge_top_off"; return prefix + "chemical_reactor_top";
} }
@Override @Override
public String getBottom() { public String getBottom() {
return prefix + "industrial_centrifuge_bottom"; return prefix + "chemical_reactor_bottom";
} }
} }

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -31,7 +31,7 @@ public class BlockMatterFabricator extends BlockMachineBase implements IAdvanced
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public boolean isAdvanced() { public boolean isAdvanced() {

View file

@ -31,7 +31,7 @@ public class BlockRollingMachine extends BlockMachineBase implements IAdvancedRo
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -34,7 +34,7 @@ public class BlockVacuumFreezer extends BlockMachineBase implements IAdvancedRot
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -11,11 +11,11 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileAesu; 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(); super();
setUnlocalizedName("techreborn.aesu"); setUnlocalizedName("techreborn.aesu");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
@ -35,7 +35,7 @@ public class BlockAesu extends BlockMachineBase implements IRotationTexture {
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/storage/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {

View file

@ -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 @Override

View file

@ -11,10 +11,10 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.lesu.TileLesu; 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(); super();
setUnlocalizedName("techreborn.lesu"); setUnlocalizedName("techreborn.lesu");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
@ -35,7 +35,7 @@ public class BlockLesu extends BlockMachineBase implements IAdvancedRotationText
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/storage/";
@Override @Override

View file

@ -13,9 +13,9 @@ import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.lesu.TileLesuStorage; 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(); super();
setUnlocalizedName("techreborn.lesustorage"); setUnlocalizedName("techreborn.lesustorage");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
@ -48,7 +48,7 @@ public class BlockLesuStorage extends BlockMachineBase implements IAdvancedRotat
return block == (Block) this; return block == (Block) this;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/storage/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -8,31 +8,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.tile.TileMachineBase; import reborncore.common.tile.TileMachineBase;
import techreborn.Core; import techreborn.Core;
import techreborn.blocks.BlockChunkLoader; import techreborn.blocks.*;
import techreborn.blocks.BlockComputerCube; import techreborn.blocks.advanced_machine.*;
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.generator.BlockDieselGenerator; import techreborn.blocks.generator.BlockDieselGenerator;
import techreborn.blocks.generator.BlockDragonEggSiphoner; import techreborn.blocks.generator.BlockDragonEggSiphoner;
import techreborn.blocks.generator.BlockGasTurbine; import techreborn.blocks.generator.BlockGasTurbine;
@ -47,30 +24,14 @@ import techreborn.blocks.generator.BlockSolarPanel;
import techreborn.blocks.generator.BlockThermalGenerator; import techreborn.blocks.generator.BlockThermalGenerator;
import techreborn.blocks.generator.BlockWaterMill; import techreborn.blocks.generator.BlockWaterMill;
import techreborn.blocks.generator.BlockWindMill; import techreborn.blocks.generator.BlockWindMill;
import techreborn.blocks.machine.BlockAlloyFurnace; import techreborn.blocks.iron_machines.BlockAlloyFurnace;
import techreborn.blocks.machine.BlockAlloySmelter; import techreborn.blocks.iron_machines.BlockIronFurnace;
import techreborn.blocks.machine.BlockAssemblingMachine; import techreborn.blocks.machine.*;
import techreborn.blocks.machine.BlockBlastFurnace; import techreborn.blocks.storage.BlockAESU;
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.storage.BlockIDSU; import techreborn.blocks.storage.BlockIDSU;
import techreborn.blocks.storage.BlockLesu; import techreborn.blocks.storage.BlockLESU;
import techreborn.blocks.storage.BlockLesuStorage; import techreborn.blocks.storage.BlockLESUStorage;
import techreborn.blocks.teir1.BlockCompressor; import techreborn.blocks.tier1.*;
import techreborn.blocks.teir1.BlockElectricFurnace;
import techreborn.blocks.teir1.BlockExtractor;
import techreborn.blocks.teir1.BlockGrinder;
import techreborn.blocks.teir1.BlockRecycler;
import techreborn.itemblocks.ItemBlockAesu; import techreborn.itemblocks.ItemBlockAesu;
import techreborn.itemblocks.ItemBlockDigitalChest; import techreborn.itemblocks.ItemBlockDigitalChest;
import techreborn.itemblocks.ItemBlockMachineCasing; import techreborn.itemblocks.ItemBlockMachineCasing;
@ -312,18 +273,18 @@ public class ModBlocks {
GameRegistry.registerBlock(Idsu, "idsu"); GameRegistry.registerBlock(Idsu, "idsu");
GameRegistry.registerTileEntity(TileIDSU.class, "TileIDSUTR"); GameRegistry.registerTileEntity(TileIDSU.class, "TileIDSUTR");
Aesu = new BlockAesu(Material.rock); Aesu = new BlockAESU(Material.rock);
GameRegistry.registerBlock(Aesu, ItemBlockAesu.class, "aesu"); GameRegistry.registerBlock(Aesu, ItemBlockAesu.class, "aesu");
GameRegistry.registerTileEntity(TileAesu.class, "TileAesuTR"); GameRegistry.registerTileEntity(TileAesu.class, "TileAesuTR");
Lesu = new BlockLesu(Material.rock); Lesu = new BlockLESU(Material.rock);
GameRegistry.registerBlock(Lesu, "lesu"); GameRegistry.registerBlock(Lesu, "lesu");
GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR"); GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR");
Supercondensator = new BlockSupercondensator(Material.rock); Supercondensator = new BlockSupercondensator(Material.rock);
GameRegistry.registerBlock(Supercondensator, "supercondensator"); GameRegistry.registerBlock(Supercondensator, "supercondensator");
LesuStorage = new BlockLesuStorage(Material.rock); LesuStorage = new BlockLESUStorage(Material.rock);
GameRegistry.registerBlock(LesuStorage, "lesustorage"); GameRegistry.registerBlock(LesuStorage, "lesustorage");
GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR"); GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR");

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 550 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 490 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 476 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 442 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 623 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 503 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 441 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 509 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 505 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 397 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 420 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 439 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 452 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 505 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 669 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 715 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 681 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 880 B

View file

@ -1,5 +0,0 @@
{
"animation":{
"frametime":4
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 B

View file

@ -1,5 +0,0 @@
{
"animation":{
"frametime":2
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 634 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 649 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 767 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 694 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 681 B

Some files were not shown because too many files have changed in this diff Show more