Start of new texturesm, again
This commit is contained in:
parent
360d9c2756
commit
83ef3e7577
1733 changed files with 3934 additions and 2931 deletions
|
@ -23,7 +23,7 @@ import techreborn.tiles.TileMachineCasing;
|
|||
|
||||
import java.util.Random;
|
||||
|
||||
public class BlockMachineCasing extends BlockMultiblockBase implements ITexturedBlock {
|
||||
public class BlockMachineCasing extends BlockMultiblockBase {
|
||||
|
||||
public static final String[] types = new String[] { "standard", "reinforced", "advanced" };
|
||||
public static final PropertyInteger METADATA = PropertyInteger.create("type", 0, types.length);
|
||||
|
@ -91,14 +91,5 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured
|
|||
return b != this && super.shouldSideBeRendered(blockState, worldIn, pos, side);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
|
||||
return "techreborn:blocks/machine/machine_blocks/casing" + types[getMetaFromState(blockState)] + "_full";
|
||||
}
|
||||
|
||||
@Override
|
||||
public int amountOfStates() {
|
||||
return types.length;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -129,7 +129,7 @@ public class BlockPlayerDetector extends BlockMachineBase implements ITexturedBl
|
|||
|
||||
@Override
|
||||
public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
|
||||
return "techreborn:blocks/machine/greg_machines/player_detector_" + types[getMetaFromState(blockState)];
|
||||
return "techreborn:blocks/machines/tier1_machines/player_detector_" + types[getMetaFromState(blockState)].toLowerCase();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -18,7 +18,7 @@ import techreborn.tiles.generator.TileSolarPanel;
|
|||
/**
|
||||
* Created by modmuss50 on 25/02/2016.
|
||||
*/
|
||||
public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock {
|
||||
public class BlockSolarPanel extends BaseTileBlock {
|
||||
|
||||
public static PropertyBool ACTIVE = PropertyBool.create("active");
|
||||
private final String prefix = "techreborn:blocks/machine/generators/";
|
||||
|
@ -79,19 +79,4 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTextureNameFromState(IBlockState state, EnumFacing side) {
|
||||
boolean isActive = state.getValue(ACTIVE);
|
||||
if (side == EnumFacing.UP) {
|
||||
return prefix + "solar_panel_top_" + (isActive ? "on" : "off");
|
||||
} else if (side == EnumFacing.DOWN) {
|
||||
return prefix + "generator_machine_bottom";
|
||||
}
|
||||
return prefix + "solar_panel_side_" + (isActive ? "on" : "off");
|
||||
}
|
||||
|
||||
@Override
|
||||
public int amountOfStates() {
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,7 +14,7 @@ import techreborn.tiles.generator.TileWaterMill;
|
|||
/**
|
||||
* Created by modmuss50 on 25/02/2016.
|
||||
*/
|
||||
public class BlockWaterMill extends BaseTileBlock implements ITexturedBlock {
|
||||
public class BlockWaterMill extends BaseTileBlock {
|
||||
|
||||
private final String prefix = "techreborn:blocks/machine/generators/";
|
||||
|
||||
|
@ -31,20 +31,4 @@ public class BlockWaterMill extends BaseTileBlock implements ITexturedBlock {
|
|||
return new TileWaterMill();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTextureNameFromState(IBlockState state, EnumFacing side) {
|
||||
boolean isActive = false;
|
||||
if (side == EnumFacing.UP) {
|
||||
return prefix + "generator_machine_bottom";// + (isActive ? "on" :
|
||||
// "off");
|
||||
} else if (side == EnumFacing.DOWN) {
|
||||
return prefix + "generator_machine_bottom";
|
||||
}
|
||||
return prefix + "solar_panel_side_" + (isActive ? "on" : "off");
|
||||
}
|
||||
|
||||
@Override
|
||||
public int amountOfStates() {
|
||||
return 2;
|
||||
}
|
||||
}
|
|
@ -14,7 +14,7 @@ import techreborn.tiles.generator.TileWindMill;
|
|||
/**
|
||||
* Created by modmuss50 on 25/02/2016.
|
||||
*/
|
||||
public class BlockWindMill extends BaseTileBlock implements ITexturedBlock {
|
||||
public class BlockWindMill extends BaseTileBlock {
|
||||
|
||||
private final String prefix = "techreborn:blocks/machine/generators/";
|
||||
|
||||
|
@ -31,20 +31,4 @@ public class BlockWindMill extends BaseTileBlock implements ITexturedBlock {
|
|||
return new TileWindMill();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTextureNameFromState(IBlockState state, EnumFacing side) {
|
||||
boolean isActive = false;
|
||||
if (side == EnumFacing.UP) {
|
||||
return prefix + "generator_machine_bottom";// + (isActive ? "on" :
|
||||
// "off");
|
||||
} else if (side == EnumFacing.DOWN) {
|
||||
return prefix + "generator_machine_bottom";
|
||||
}
|
||||
return prefix + "solar_panel_side_" + (isActive ? "on" : "off");
|
||||
}
|
||||
|
||||
@Override
|
||||
public int amountOfStates() {
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -27,7 +27,7 @@ import java.util.Random;
|
|||
*/
|
||||
public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotationTexture, ITexturedBlock {
|
||||
public static PropertyDirection FACING = PropertyDirection.create("facing", Facings.ALL);
|
||||
protected final String prefix = "techreborn:blocks/machine/storage/";
|
||||
protected final String prefix = "techreborn:blocks/machines/energy/";
|
||||
public String name;
|
||||
public int guiID;
|
||||
|
||||
|
@ -119,27 +119,27 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat
|
|||
|
||||
@Override
|
||||
public String getFrontOff() {
|
||||
return prefix + name.toLowerCase() + "_front";
|
||||
return prefix + getSimpleName(name.toLowerCase()) + "_front";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFrontOn() {
|
||||
return prefix + name.toLowerCase() + "_front";
|
||||
return prefix + getSimpleName(name.toLowerCase()) + "_front";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSide() {
|
||||
return prefix + name.toLowerCase() + "_side";
|
||||
return prefix + getSimpleName(name.toLowerCase()) + "_side";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTop() {
|
||||
return prefix + name.toLowerCase() + "_top";
|
||||
return prefix + getSimpleName(name.toLowerCase()) + "_side";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBottom() {
|
||||
return prefix + name.toLowerCase() + "_bottom";
|
||||
return prefix + getSimpleName(name.toLowerCase()) + "_side";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -191,4 +191,26 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat
|
|||
}
|
||||
}
|
||||
|
||||
public String getSimpleName(String fullName) {
|
||||
if (fullName.equalsIgnoreCase("Batbox")) {
|
||||
return "lv_storage";
|
||||
}
|
||||
if (fullName.equalsIgnoreCase("MFE")) {
|
||||
return "mv_storage";
|
||||
}
|
||||
if (fullName.equalsIgnoreCase("MFSU")) {
|
||||
return "hv_storage";
|
||||
}
|
||||
if (fullName.equalsIgnoreCase("AESU")) {
|
||||
return "ev_storage_adjust";
|
||||
}
|
||||
if (fullName.equalsIgnoreCase("IDSU")) {
|
||||
return "ev_storage_transmitter";
|
||||
}
|
||||
if (fullName.equalsIgnoreCase("LESU")) {
|
||||
return "ev_multi";
|
||||
}
|
||||
return fullName.toLowerCase();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ import java.util.Random;
|
|||
*/
|
||||
public abstract class BlockTransformer extends BaseTileBlock implements IRotationTexture, ITexturedBlock {
|
||||
public static PropertyDirection FACING = PropertyDirection.create("facing", Facings.ALL);
|
||||
protected final String prefix = "techreborn:blocks/machine/storage/";
|
||||
protected final String prefix = "techreborn:blocks/machines/energy/";
|
||||
public String name;
|
||||
|
||||
public BlockTransformer(String name) {
|
||||
|
@ -188,27 +188,27 @@ public abstract class BlockTransformer extends BaseTileBlock implements IRotatio
|
|||
|
||||
@Override
|
||||
public String getFrontOff() {
|
||||
return prefix + name.toLowerCase() + "_front";
|
||||
return prefix + name.toLowerCase().replace("transformer", "") + "_transformer_front";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFrontOn() {
|
||||
return prefix + name.toLowerCase() + "_front";
|
||||
return prefix + name.toLowerCase().replace("transformer", "") + "_transformer_front";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSide() {
|
||||
return prefix + name.toLowerCase() + "_side";
|
||||
return prefix + name.toLowerCase().replace("transformer", "") + "_transformer_side";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTop() {
|
||||
return prefix + name.toLowerCase() + "_side";
|
||||
return prefix + name.toLowerCase().replace("transformer", "") + "_transformer_side";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBottom() {
|
||||
return prefix + name.toLowerCase() + "_side";
|
||||
return prefix + name.toLowerCase().replace("transformer", "") + "_transformer_side";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue