Light buttons textures and models

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

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( );
+		return new StateMap.Builder( ).ignore( DLightPlate.POWERED ).build( );
-		if ( !this.button ) {
-			bld.ignore( DLightPlate.POWERED );
-		}
-		return bld.build( );
 	}
 
 

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 }
+		}
+
+	}
+}

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 }
+		}
+
+	}
+}

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"
 		}
 	} ,
 	

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"
 		}
 	} ,
 	

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" }
+    		}
+    	}
+	]
+}

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" : [

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 ]
+		}
+	}
+}

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": {