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 0000000..1a667d2 Binary files /dev/null and b/graphics/light-button.xcf differ 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 0000000..c8f4f2c Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/deco/light/button/lit.png differ 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 0000000..490779a Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/deco/light/button/sides.png differ 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 0000000..d143b7b Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/deco/light/button/unlit.png differ