Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Completed Lamp Powerer

Browse source
This commit is contained in:
Ellpeck 2015-07-07 15:27:26 +02:00
parent 311fadbc4b
commit f9af65dc31
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java
View file

@ -22,7 +22,6 @@ import java.util.List;
public class BlockLampPowerer extends Block implements INameableItem{ public class BlockLampPowerer extends Block implements INameableItem{
private IIcon frontIcon; private IIcon frontIcon;
private IIcon topIcon;
public BlockLampPowerer(){ public BlockLampPowerer(){
super(Material.rock); super(Material.rock);
@ -45,7 +44,6 @@ public class BlockLampPowerer extends Block implements INameableItem{
@Override @Override
public IIcon getIcon(int side, int meta){ public IIcon getIcon(int side, int meta){
if(side == 0 || side == 1) return this.topIcon;
if(side == 3) return this.frontIcon; if(side == 3) return this.frontIcon;
return this.blockIcon; return this.blockIcon;
} }
@ -53,7 +51,6 @@ public class BlockLampPowerer extends Block implements INameableItem{
@Override @Override
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){
int meta = world.getBlockMetadata(x, y, z); int meta = world.getBlockMetadata(x, y, z);
if(side != meta && (side == 0 || side == 1)) return this.topIcon;
if(side == meta) return this.frontIcon; if(side == meta) return this.frontIcon;
return this.blockIcon; return this.blockIcon;
} }
@ -91,7 +88,6 @@ public class BlockLampPowerer extends Block implements INameableItem{
public void registerBlockIcons(IIconRegister iconReg){ public void registerBlockIcons(IIconRegister iconReg){
this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName()); this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName());
this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName() + "Front"); this.frontIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName() + "Front");
this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName() + "Top");
} }
public static class TheItemBlock extends ItemBlock{ public static class TheItemBlock extends ItemBlock{

1
src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java
View file

@ -71,6 +71,7 @@ public class CreativeTab extends CreativeTabs{
add(InitBlocks.blockTestifiBucksGreenSlab); add(InitBlocks.blockTestifiBucksGreenSlab);
add(InitBlocks.blockTestifiBucksWhiteSlab); add(InitBlocks.blockTestifiBucksWhiteSlab);
add(InitBlocks.blockColoredLamp); add(InitBlocks.blockColoredLamp);
add(InitBlocks.blockLampPowerer);
add(InitItems.itemDrill); add(InitItems.itemDrill);
add(InitItems.itemDrillUpgradeSpeed); add(InitItems.itemDrillUpgradeSpeed);

5
src/main/resources/assets/actuallyadditions/lang/en_US.lang
View file

@ -63,7 +63,10 @@ tooltip.actuallyadditions.blockCoalGenerator.desc=Produces Energy from Coal and
tooltip.actuallyadditions.blockColoredLamp.desc.1=Sneak-Right-Click to turn me on! tooltip.actuallyadditions.blockColoredLamp.desc.1=Sneak-Right-Click to turn me on!
tooltip.actuallyadditions.blockColoredLamp.desc.2=Right-Click me with a Dye to dye me! tooltip.actuallyadditions.blockColoredLamp.desc.2=Right-Click me with a Dye to dye me!
tooltip.actuallyadditions.blockColoredLamp.desc.3=Use a Lamp Powerer to toggle me with Redstone! tooltip.actuallyadditions.blockColoredLamp.desc.3=Use a Lamp Controller to toggle me with Redstone!
tile.actuallyadditions.blockLampPowerer.name=Lamp Controller
tooltip.actuallyadditions.blockLampPowerer.desc=Place me facing towards a Lamp and power me with Redstone to turn it on!
tile.actuallyadditions.blockColoredLampWhite.name=White Lamp tile.actuallyadditions.blockColoredLampWhite.name=White Lamp
tile.actuallyadditions.blockColoredLampOrange.name=Orange Lamp tile.actuallyadditions.blockColoredLampOrange.name=Orange Lamp

BIN
src/main/resources/assets/actuallyadditions/textures/blocks/blockLampPowerer.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 597 B

BIN
src/main/resources/assets/actuallyadditions/textures/blocks/blockLampPowererFront.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 566 B