From 4e2a79c4ba87885db9bd82971e01fa0ff02c570a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@nocternity.net>
Date: Mon, 18 Jul 2016 15:37:42 +0200
Subject: [PATCH] Light buttons textures and models

---
 TODO.txt                                      |   1 +
 graphics/light-button.xcf                     | Bin 0 -> 4385 bytes
 src/java/mmm/deco/DLightPlate.java            |   8 +--
 .../blockstates/deco/light/button/lit.json    |  23 +++++++
 .../blockstates/deco/light/button/unlit.json  |  23 +++++++
 .../mmm/blockstates/deco/light/plate/lit.json |   3 +-
 .../blockstates/deco/light/plate/unlit.json   |   3 +-
 .../mmm/models/block/deco/light/button.json   |  57 ++++++++++++++++++
 .../mmm/models/block/deco/light/plate.json    |   3 +-
 .../mmm/models/item/deco/light/button.json    |  30 +++++++++
 .../mmm/models/item/deco/light/plate.json     |   3 +-
 .../textures/blocks/deco/light/button/lit.png | Bin 0 -> 419 bytes
 .../blocks/deco/light/button/sides.png        | Bin 0 -> 142 bytes
 .../blocks/deco/light/button/unlit.png        | Bin 0 -> 305 bytes
 14 files changed, 144 insertions(+), 10 deletions(-)
 create mode 100644 graphics/light-button.xcf
 create mode 100644 src/resources/assets/mmm/blockstates/deco/light/button/lit.json
 create mode 100644 src/resources/assets/mmm/blockstates/deco/light/button/unlit.json
 create mode 100644 src/resources/assets/mmm/models/block/deco/light/button.json
 create mode 100644 src/resources/assets/mmm/models/item/deco/light/button.json
 create mode 100644 src/resources/assets/mmm/textures/blocks/deco/light/button/lit.png
 create mode 100644 src/resources/assets/mmm/textures/blocks/deco/light/button/sides.png
 create mode 100644 src/resources/assets/mmm/textures/blocks/deco/light/button/unlit.png

diff --git a/TODO.txt b/TODO.txt
index 3a16e86..36d5533 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -5,6 +5,7 @@ deco			No		Copper pots
 deco			No		Copper plates
 deco			No		Lanterns
 deco			No		Light plates
+							-> fix recipe (needs brass)													BF
 -------------------------------------------------------------------------------------------------------
 plants			No?		Tomatoes
 plants			No?		Turnips
diff --git a/graphics/light-button.xcf b/graphics/light-button.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..1a667d220478772f0fbad8b9d3781f5e556484bb
GIT binary patch
literal 4385
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

literal 0
HcmV?d00001

diff --git a/src/java/mmm/deco/DLightPlate.java b/src/java/mmm/deco/DLightPlate.java
index 8db758b..e6d703c 100644
--- a/src/java/mmm/deco/DLightPlate.java
+++ b/src/java/mmm/deco/DLightPlate.java
@@ -67,7 +67,7 @@ public class DLightPlate
 		this.lightSource = cls;
 		this.lit = lit;
 		this.button = button;
-		this.lightValue = this.lit ? this.button ? 9 : 14 : 1;
+		this.lightValue = this.lit ? this.button ? 12 : 14 : 1;
 
 		this.setCreativeTab( button ? CreativeTabs.REDSTONE : CreativeTabs.DECORATIONS );
 		this.setHardness( 0.25f );
@@ -106,11 +106,7 @@ public class DLightPlate
 	@SideOnly( Side.CLIENT )
 	public IStateMapper getStateMapper( )
 	{
-		final StateMap.Builder bld = new StateMap.Builder( );
-		if ( !this.button ) {
-			bld.ignore( DLightPlate.POWERED );
-		}
-		return bld.build( );
+		return new StateMap.Builder( ).ignore( DLightPlate.POWERED ).build( );
 	}
 
 
diff --git a/src/resources/assets/mmm/blockstates/deco/light/button/lit.json b/src/resources/assets/mmm/blockstates/deco/light/button/lit.json
new file mode 100644
index 0000000..4a5ae5a
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/deco/light/button/lit.json
@@ -0,0 +1,23 @@
+{
+	"forge_marker": 1 ,
+	"defaults" : {
+		"model": "mmm:deco/light/plate" ,
+		"textures": {
+			"plate": "mmm:blocks/deco/light/button/lit" ,
+			"side": "mmm:blocks/deco/light/button/sides"
+		}
+	} ,
+	
+	"variants" : {
+
+		"facing" : {
+			"north" : { "y": 0 } ,
+			"east" : { "y": 90 } ,
+			"south" : { "y": 180 } ,
+			"west" : { "y": 270 } ,
+			"up" : { "x": 270 } ,
+			"down" : { "x" : 90 }
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/blockstates/deco/light/button/unlit.json b/src/resources/assets/mmm/blockstates/deco/light/button/unlit.json
new file mode 100644
index 0000000..db21f72
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/deco/light/button/unlit.json
@@ -0,0 +1,23 @@
+{
+	"forge_marker": 1 ,
+	"defaults" : {
+		"model": "mmm:deco/light/button" ,
+		"textures": {
+			"plate": "mmm:blocks/deco/light/button/unlit" ,
+			"side": "mmm:blocks/deco/light/button/sides"
+		}
+	} ,
+	
+	"variants" : {
+
+		"facing" : {
+			"north" : { "y": 0 } ,
+			"east" : { "y": 90 } ,
+			"south" : { "y": 180 } ,
+			"west" : { "y": 270 } ,
+			"up" : { "x": 270 } ,
+			"down" : { "x" : 90 }
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/blockstates/deco/light/plate/lit.json b/src/resources/assets/mmm/blockstates/deco/light/plate/lit.json
index f9948ab..c957c8b 100644
--- a/src/resources/assets/mmm/blockstates/deco/light/plate/lit.json
+++ b/src/resources/assets/mmm/blockstates/deco/light/plate/lit.json
@@ -3,7 +3,8 @@
 	"defaults" : {
 		"model": "mmm:deco/light/plate" ,
 		"textures": {
-			"plate": "mmm:blocks/deco/light/plate/lit"
+			"plate": "mmm:blocks/deco/light/plate/lit" ,
+			"side": "mmm:blocks/deco/light/plate/sides"
 		}
 	} ,
 	
diff --git a/src/resources/assets/mmm/blockstates/deco/light/plate/unlit.json b/src/resources/assets/mmm/blockstates/deco/light/plate/unlit.json
index f4a9186..094c115 100644
--- a/src/resources/assets/mmm/blockstates/deco/light/plate/unlit.json
+++ b/src/resources/assets/mmm/blockstates/deco/light/plate/unlit.json
@@ -3,7 +3,8 @@
 	"defaults" : {
 		"model": "mmm:deco/light/plate" ,
 		"textures": {
-			"plate": "mmm:blocks/deco/light/plate/unlit"
+			"plate": "mmm:blocks/deco/light/plate/unlit" ,
+			"side": "mmm:blocks/deco/light/plate/sides"
 		}
 	} ,
 	
diff --git a/src/resources/assets/mmm/models/block/deco/light/button.json b/src/resources/assets/mmm/models/block/deco/light/button.json
new file mode 100644
index 0000000..b59e079
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/deco/light/button.json
@@ -0,0 +1,57 @@
+{
+    "ambientocclusion": false,
+	"textures" : {
+		"particle" : "#plate" ,
+		"plate": "#plate" ,
+		"side": "#side" ,
+		"back": "mmm:blocks/deco/light/plate/sides"
+	} ,
+	
+	"elements" : [
+		{
+    		"from": [ 3, 1, 15 ],
+    		"to": [ 13, 15, 16 ],
+             "faces": {
+                "down":  { "texture": "#side" },
+                "up":    { "texture": "#side" },
+                "north": { "texture": "#plate" },
+                "south": { "texture": "#back" , "cullface" : "south" },
+                "west":  { "texture": "#side" },
+                "east":  { "texture": "#side" }
+            }
+    	} ,
+    	{
+    		"from": [ 1, 3, 15 ],
+    		"to": [ 3, 13, 16 ],
+             "faces": {
+                "down":  { "texture": "#side" },
+                "up":    { "texture": "#side" },
+                "north": { "texture": "#plate" },
+                "south": { "texture": "#back" , "cullface" : "south" },
+                "east":  { "texture": "#side" }
+            }
+    	} ,
+    	{
+    		"from": [ 13, 3, 15 ],
+    		"to": [ 15, 13, 16 ],
+             "faces": {
+                "down":  { "texture": "#side" },
+                "up":    { "texture": "#side" },
+                "north": { "texture": "#plate" },
+                "south": { "texture": "#back" , "cullface" : "south" },
+                "east":  { "texture": "#side" }
+            }
+    	} ,
+    	{
+    		"from": [ 5 , 6 , 14 ] ,
+    		"to": [ 11 , 10 , 15 ] ,
+    		"faces": {
+                "north": { "texture": "#plate" } ,
+                "down":  { "texture": "#side" } ,
+                "up":    { "texture": "#side" } ,
+                "east":  { "texture": "#side" } ,
+                "west":  { "texture": "#side" }
+    		}
+    	}
+	]
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/block/deco/light/plate.json b/src/resources/assets/mmm/models/block/deco/light/plate.json
index bdba9e8..d473434 100644
--- a/src/resources/assets/mmm/models/block/deco/light/plate.json
+++ b/src/resources/assets/mmm/models/block/deco/light/plate.json
@@ -1,8 +1,9 @@
 {
+    "ambientocclusion": false,
 	"textures" : {
 		"particle" : "#plate" ,
 		"plate": "#plate" ,
-		"side": "mmm:blocks/deco/light/plate/sides"
+		"side": "#side"
 	} ,
 	
 	"elements" : [
diff --git a/src/resources/assets/mmm/models/item/deco/light/button.json b/src/resources/assets/mmm/models/item/deco/light/button.json
new file mode 100644
index 0000000..7722334
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/deco/light/button.json
@@ -0,0 +1,30 @@
+{
+	"parent": "mmm:block/deco/light/button" ,
+	"textures": {
+		"plate": "mmm:blocks/deco/light/button/unlit" ,
+		"side": "mmm:blocks/deco/light/button/sides"
+	} ,
+
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [ 10, 90, 10 ],
+			"translation": [ -4, 0, -4 ],
+			"scale": [ 0.7, 0.7, 0.7 ]
+		},
+		"firstperson_righthand": {
+			"rotation": [ 10, 90, 10 ],
+			"translation": [ 0, 1.5, -1 ],
+			"scale": [ 0.8, 0.8, 0.8 ]
+		},
+		"ground": {
+			"rotation": [ 0, 0, 0 ],
+			"translation": [ 0, 2, 0 ],
+			"scale": [ 0.8, 0.8, 0.8 ]
+		},
+		"gui": {
+			"rotation": [ 0, 180, 0 ],
+			"translation": [ 0, 0, 0 ],
+			"scale": [ 0.8, 0.8, 0.8 ]
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/deco/light/plate.json b/src/resources/assets/mmm/models/item/deco/light/plate.json
index e4c6ad2..5e6166a 100644
--- a/src/resources/assets/mmm/models/item/deco/light/plate.json
+++ b/src/resources/assets/mmm/models/item/deco/light/plate.json
@@ -1,7 +1,8 @@
 {
 	"parent": "mmm:block/deco/light/plate" ,
 	"textures": {
-		"plate": "mmm:blocks/deco/light/plate/unlit"
+		"plate": "mmm:blocks/deco/light/plate/unlit" ,
+		"side": "mmm:blocks/deco/light/plate/sides"
 	} ,
 
 	"display": {
diff --git a/src/resources/assets/mmm/textures/blocks/deco/light/button/lit.png b/src/resources/assets/mmm/textures/blocks/deco/light/button/lit.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8f4f2ca2cfc35b300d18e8b9563465f0ae8f744
GIT binary patch
literal 419
zcmV;U0bKrxP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004MNkl<ZILob*
zO-lk%6o&mx{ey_M(WX#i=!2p(192xUq(x9rn+Vzzw9C*azrvAloDnr54H^n+<1X4%
zXinkk?VcNVbUt+Dz{{C??>WyobIx3kXOz$J-XspU$8oeXVT#ryadxslg`oiXYzD=I
z*Hk&ZV(yWBE{B}}L8go%Pz2clrw7x#lKcETEC73Ev94XO@^>L|W&u!Uaj0D_;Wi(E
znhv6p3!z?&LQMrwO06-USu;U3BRK&#2?@=oIJ(_m{21RB8J#wVXqSF2S3u$12fezB
zcIy+s7t<TlE7J=Mqs=SfRk{JFS%tV44P^_h)&~oEXKFG%{sTHaKrJh|1E`8>Zi73E
z(y5yMPjCg$6nf+Gp^^>qY>m<;YhnyqCS*2oU=IYKe^fL=B{}C9qhkuu^)cvLgm03Q
zlJs#~$ptLIq`JJoWdYcKDD}e6?VTKU03Hg9gYN<Xh&)WXvW$`5;6E$D1^{=l5vKqE
N002ovPDHLkV1i1Bug(Af

literal 0
HcmV?d00001

diff --git a/src/resources/assets/mmm/textures/blocks/deco/light/button/sides.png b/src/resources/assets/mmm/textures/blocks/deco/light/button/sides.png
new file mode 100644
index 0000000000000000000000000000000000000000..490779acd1f6271e48f20c3ddf360712fda05ae6
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`p`I>|Ar`&KH?~_nvgddoBgeIj
zKi{i$bE1h|C7VGb+oz!1|BD}gsqp40wcu3{<56dJXmnYXHesG)3d1%FH5P{|Hcy>~
pOJ5G`YS5a=IW2W#YPi!UhR}dBmGQR|wSg8ec)I$ztaD0e0suZGEzbY|

literal 0
HcmV?d00001

diff --git a/src/resources/assets/mmm/textures/blocks/deco/light/button/unlit.png b/src/resources/assets/mmm/textures/blocks/deco/light/button/unlit.png
new file mode 100644
index 0000000000000000000000000000000000000000..d143b7bc9ec861f801aa71067ba71d0f6e513925
GIT binary patch
literal 305
zcmV-10nYx3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002^Nkl<ZILl*T
zpeC5p<NAL}tK<La9nNqJ;)5_uZf>vNf4m0lTps#=-|7fBKD;RvE(W5n9WKB$0A@1C
zMwmvJCUgT9ObP(I<jjuv|0o8a+YI9$-<A$$!!S$^#Q>1aq!<9g$2P}e8UVtF)<^x%
zOSQ$o>G76uc@QROKvYx|9EXO6!VLh~j@1C<zycWn(u9nW4LH6f7QX=?#n>=T13<BW
zYyd0}K>-M3BYP3A7m%Y0n*ms3p)%X(|K&qPU_p?g{c9q@^wF)ED4Id|?9K!*Mlk?A
zK^<Hh1*T8!EWj|}{H{dYc>!bq$Ygx@^8S?nRL#KvETGlPGGttF00000NkvXXu0mjf
D8PR?7

literal 0
HcmV?d00001