From f9af65dc31c82cd2c9cdfedc755f30dbc809494a Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 7 Jul 2015 15:27:26 +0200 Subject: [PATCH] Completed Lamp Powerer --- .../blocks/BlockLampPowerer.java | 4 ---- .../actuallyadditions/creative/CreativeTab.java | 1 + .../assets/actuallyadditions/lang/en_US.lang | 5 ++++- .../textures/blocks/blockLampPowerer.png | Bin 0 -> 597 bytes .../textures/blocks/blockLampPowererFront.png | Bin 0 -> 566 bytes 5 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockLampPowerer.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockLampPowererFront.png diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java index 8963bf60e..34bb14370 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java @@ -22,7 +22,6 @@ import java.util.List; public class BlockLampPowerer extends Block implements INameableItem{ private IIcon frontIcon; - private IIcon topIcon; public BlockLampPowerer(){ super(Material.rock); @@ -45,7 +44,6 @@ public class BlockLampPowerer extends Block implements INameableItem{ @Override public IIcon getIcon(int side, int meta){ - if(side == 0 || side == 1) return this.topIcon; if(side == 3) return this.frontIcon; return this.blockIcon; } @@ -53,7 +51,6 @@ public class BlockLampPowerer extends Block implements INameableItem{ @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side){ int meta = world.getBlockMetadata(x, y, z); - if(side != meta && (side == 0 || side == 1)) return this.topIcon; if(side == meta) return this.frontIcon; return this.blockIcon; } @@ -91,7 +88,6 @@ public class BlockLampPowerer extends Block implements INameableItem{ public void registerBlockIcons(IIconRegister iconReg){ this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName()); 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{ diff --git a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java index e30573928..ca8daa3df 100644 --- a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java +++ b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java @@ -71,6 +71,7 @@ public class CreativeTab extends CreativeTabs{ add(InitBlocks.blockTestifiBucksGreenSlab); add(InitBlocks.blockTestifiBucksWhiteSlab); add(InitBlocks.blockColoredLamp); + add(InitBlocks.blockLampPowerer); add(InitItems.itemDrill); add(InitItems.itemDrillUpgradeSpeed); diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 5c2916356..50e187d7c 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -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.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.blockColoredLampOrange.name=Orange Lamp diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockLampPowerer.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockLampPowerer.png new file mode 100644 index 0000000000000000000000000000000000000000..9a38e92c40ad69507e755c6b3ffb0e12c297e74b GIT binary patch literal 597 zcmV-b0;>IqP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Ra1{@Os z2O}(?761SM7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyHvq?ljR5(wS zk~wYyK@de98!}%2$rgz(zyUx65C9T8h((}b6N^D&G5d}{c+4V5h&YCGJN6mOLHw9* z*~S^AR;#-9cqVYl1K zBoYaBk`{}_MBFWHKaaMH8wa!W#)No6XFJtmE;>0j;~;Znaur5%K_s z!(p4v#;6hiR8>_fPy#DwU})`jyS-kIR@rP8iVIt-)hgZ-d>sG?6<0i97y!U7Y{h$? zv5#j_3O74fMp`bH0BCy#d>C|O{{|W;jYgv=rkmg*uvG%^3-0xLjZ5s13E1Iq;M-9u jy8YUE_0M<3GU~qpAdElS2sg1p00000NkvXXu0mjfa*FS{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockLampPowererFront.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockLampPowererFront.png new file mode 100644 index 0000000000000000000000000000000000000000..7434c31de8400cbff80c7118106eb23f6460c98f GIT binary patch literal 566 zcmV-60?GY}P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Ra1{@Os z2O}(?761SM7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyHlu1NER5(wS zlFe$uKoo^tMO%YfLZP@QLW`TefDfR!Fbfk<@dtupKt&{&wh1X!0x>aFXuyJ-3Vnp` zyKmQhhWa2qlZjSc6dVr2m&rYM?!8IqC(TlQ-*8)|`b!nhu)oMNa%P3iX0uth+XWB<3P1wD`{jwlh4nb2Z3Lch%=((OZCgqflgVTN#DKO?C_vrBK}swD+=Ew+;~)$`3}~QUuOAp7dKGTK zD^!8m1cq!ji~0a}JBhb?I3qU{3I*CHF~I719$**?dPP<^DO1C8x!fD8rfC4o1Sx48 zK0J*!d_%9-+Z*e2It5q>GE<~~OGY03nVKB)bRMP#T6X9w6-7f>c=$*7_82RG7%(qY zRTqoJd_KpHWbh9LgVk!~x-LRZ)5QKa)}w#EBa~);0iq%SC`QAang9R*07*qoM6N<$ Eg1zA0nE(I) literal 0 HcmV?d00001