some texture fixs

This commit is contained in:
gigabit101 2016-03-23 16:53:32 +00:00
parent fffcecbb98
commit 17ff9b2aad
7 changed files with 65 additions and 24 deletions

View file

@ -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 + "fusion_control_computer_side" ; return prefix + "machine_side" ;
} }
@Override @Override
public String getTop(boolean isActive) { public String getTop(boolean isActive) {
return prefix + "fusion_control_computer_top"; return prefix + "machine_side";
} }
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "fusion_control_computer_bottom"; return prefix + "machine_side";
} }
} }

View file

@ -13,7 +13,6 @@ import techreborn.tiles.TileQuantumTank;
public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotationTexture {
public BlockQuantumTank() { public BlockQuantumTank() {
super(); super();
setUnlocalizedName("techreborn.quantumTank"); setUnlocalizedName("techreborn.quantumTank");
@ -31,8 +30,9 @@ public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotat
if(fillBlockWithFluid(world, new BlockPos(x, y, z), player)) { if(fillBlockWithFluid(world, new BlockPos(x, y, z), player)) {
return true; return true;
} }
if (!player.isSneaking()) if (!player.isSneaking()) {
player.openGui(Core.INSTANCE, GuiHandler.quantumTankID, world, x, y, z); player.openGui(Core.INSTANCE, GuiHandler.quantumTankID, world, x, y, z);
}
return true; return true;
} }
@ -40,12 +40,12 @@ public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotat
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
return prefix + "ThermalGenerator_other"; return "techreborn:blocks/machine/generators/thermal_generator_side_off";
} }
@Override @Override
public String getSide(boolean isActive) { public String getSide(boolean isActive) {
return prefix + "ThermalGenerator_other"; return "techreborn:blocks/machine/generators/thermal_generator_side_off";
} }
@Override @Override
@ -55,7 +55,6 @@ public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotat
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "ThermalGenerator_other"; return "techreborn:blocks/machine/generators/thermal_generator_bottom";
} }
} }

View file

@ -7,7 +7,6 @@ import techreborn.client.TechRebornCreativeTab;
public class BlockLightningRod extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockLightningRod extends BlockMachineBase implements IAdvancedRotationTexture {
public BlockLightningRod(Material material) { public BlockLightningRod(Material material) {
super(); super();
setUnlocalizedName("techreborn.lightningrod"); setUnlocalizedName("techreborn.lightningrod");
@ -18,22 +17,21 @@ public class BlockLightningRod extends BlockMachineBase implements IAdvancedRota
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
return prefix + "lightning_rod_side"; return prefix + "plasma_generator_side_off";
} }
@Override @Override
public String getSide(boolean isActive) { public String getSide(boolean isActive) {
return prefix + "lightning_rod_side" ; return prefix + "plasma_generator_side_off" ;
} }
@Override @Override
public String getTop(boolean isActive) { public String getTop(boolean isActive) {
return prefix + "lightning_rod_top"; return prefix + "plasma_generator_side_off";
} }
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "lightning_rod_bottom"; return prefix + "plasma_generator_side_off";
} }
} }

View file

@ -7,8 +7,6 @@ import techreborn.client.TechRebornCreativeTab;
public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedRotationTexture {
public BlockPlasmaGenerator(Material material) { public BlockPlasmaGenerator(Material material) {
super(); super();
setUnlocalizedName("techreborn.plasmagenerator"); setUnlocalizedName("techreborn.plasmagenerator");
@ -29,12 +27,11 @@ public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedR
@Override @Override
public String getTop(boolean isActive) { public String getTop(boolean isActive) {
return prefix + "plasma_generator_bottom"; return prefix + "plasma_generator_side_off";
} }
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "plasma_generator_bottom"; return prefix + "plasma_generator_side_off";
} }
} }

View file

@ -1,8 +1,12 @@
package techreborn.blocks.generator; package techreborn.blocks.generator;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.RebornCore;
import reborncore.common.BaseTileBlock; import reborncore.common.BaseTileBlock;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileWaterMill; import techreborn.tiles.generator.TileWaterMill;
@ -10,16 +14,35 @@ import techreborn.tiles.generator.TileWaterMill;
/** /**
* Created by modmuss50 on 25/02/2016. * Created by modmuss50 on 25/02/2016.
*/ */
public class BlockWaterMill extends BaseTileBlock { public class BlockWaterMill extends BaseTileBlock implements ITexturedBlock{
public BlockWaterMill() { public BlockWaterMill() {
super(Material.iron); super(Material.iron);
setUnlocalizedName("techreborn.watermill"); setUnlocalizedName("techreborn.watermill");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
RebornCore.jsonDestroyer.registerObject(this);
} }
@Override @Override
public TileEntity createNewTileEntity(World worldIn, int meta) { public TileEntity createNewTileEntity(World worldIn, int meta) {
return new TileWaterMill(); return new TileWaterMill();
} }
private final String prefix = "techreborn:blocks/machine/generators/";
@Override
public String getTextureNameFromState(IBlockState state, EnumFacing side) {
boolean isActive = false;
if(side == EnumFacing.UP){
return prefix + "generator_machine_bottom";// + (isActive ? "on" : "off");
} else if(side==EnumFacing.DOWN){
return prefix + "generator_machine_bottom";
}
return prefix + "solar_panel_side_" + (isActive ? "on" : "off");
}
@Override
public int amountOfStates() {
return 2;
}
} }

View file

@ -1,25 +1,49 @@
package techreborn.blocks.generator; package techreborn.blocks.generator;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.RebornCore;
import reborncore.common.BaseTileBlock; import reborncore.common.BaseTileBlock;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileWindMill; import techreborn.tiles.generator.TileWindMill;
/** /**
* Created by modmuss50 on 25/02/2016. * Created by modmuss50 on 25/02/2016.
*/ */
public class BlockWindMill extends BaseTileBlock { public class BlockWindMill extends BaseTileBlock implements ITexturedBlock {
public BlockWindMill() { public BlockWindMill() {
super(Material.iron); super(Material.iron);
setUnlocalizedName("techreborn.windmill"); setUnlocalizedName("techreborn.windmill");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
RebornCore.jsonDestroyer.registerObject(this);
} }
@Override @Override
public TileEntity createNewTileEntity(World worldIn, int meta) { public TileEntity createNewTileEntity(World worldIn, int meta) {
return new TileWindMill(); return new TileWindMill();
} }
private final String prefix = "techreborn:blocks/machine/generators/";
@Override
public String getTextureNameFromState(IBlockState state, EnumFacing side) {
boolean isActive = false;
if(side == EnumFacing.UP){
return prefix + "generator_machine_bottom";// + (isActive ? "on" : "off");
} else if(side==EnumFacing.DOWN){
return prefix + "generator_machine_bottom";
}
return prefix + "solar_panel_side_" + (isActive ? "on" : "off");
}
@Override
public int amountOfStates() {
return 2;
}
} }

View file

@ -51,7 +51,7 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT
@Override @Override
public String getTop() { public String getTop() {
return prefix + "chemical_reactor_top"; return prefix + "machine_top";
} }
@Override @Override