MinecraftMods/EngineersDecor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Crafting table model changed. Mod logo changed. Added inset spot light.

Browse source
This commit is contained in:
stfwi 2019-03-04 13:13:21 +01:00
parent 107ad0ffad
commit 412098c960
19 changed files with 351 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

16
1.12/src/main/resources/assets/engineersdecor/blockstates/iron_inset_light.json Normal file
View file

@ -0,0 +1,16 @@
{
"forge_marker": 1,
"defaults": {
"model": "engineersdecor:light/inset_light_model",
"textures": {
"light": "engineersdecor:blocks/light/lamp_glass_warm_square_texture",
"side": "engineersdecor:blocks/iestyle/steel_texture",
"particle": "engineersdecor:blocks/iestyle/steel_texture"
}
},
"variants": {
"normal": [{}],
"facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":-90}, "down": {"x":90} },
"inventory": [{}]
}
}

10
1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang
View file

@ -60,11 +60,15 @@ tile.engineersdecor.treated_wood_pole.help=§6Straight pole fragment with the di
# Furniture
#-----------------------------------------------------------------------------------------------------------
tile.engineersdecor.treated_wood_table.name=Treated wood table
tile.engineersdecor.treated_wood_table.help=§6Robust four-legged wood table.§r\n Indoor and outdoor use.
tile.engineersdecor.treated_wood_table.help=§6Robust four-legged wood table.§r Indoor and outdoor use.
tile.engineersdecor.treated_wood_stool.name=Treated wood stool
tile.engineersdecor.treated_wood_stool.help=§6Robust wood stool.§r\n Indoor and outdoor use.
tile.engineersdecor.treated_wood_stool.help=§6Robust wood stool.§r Indoor and outdoor use.
tile.engineersdecor.treated_wood_crafting_table.name=Treated wood crafting table
tile.engineersdecor.treated_wood_crafting_table.help=§6Robust and weather-proof.§r
tile.engineersdecor.treated_wood_crafting_table.help=§6Robust and weather-proof.
tile.engineersdecor.iron_inset_light.name=Inset light
tile.engineersdecor.iron_inset_light.help=§6Small glowstone light source, sunk into the floor, ceiling or wall.§r\n\
Useful to light up places where electrical light installations are problematic.\
Light level like a torch.
# EOF
#-----------------------------------------------------------------------------------------------------------

BIN
1.12/src/main/resources/assets/engineersdecor/logo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Before After
Before After

126
1.12/src/main/resources/assets/engineersdecor/models/block/crafting_table/treated_wood_crafting_table_model.json
View file

@ -3,95 +3,101 @@
"textures": {
"side": "engineersdecor:blocks/crafting_table/treated_wood_crafting_table_side",
"top": "engineersdecor:blocks/crafting_table/treated_wood_crafting_table_top",
"particle": "engineersdecor:blocks/crafting_table/treated_wood_crafting_table_top",
"front": "engineersdecor:blocks/crafting_table/treated_wood_crafting_table_front",
"wood": "engineersdecor:blocks/iestyle/treated_wood"
"wood": "engineersdecor:blocks/iestyle/treated_wood",
"particle": "engineersdecor:blocks/iestyle/treated_wood",
"tray": "engineersdecor:blocks/crafting_table/treated_wood_crafting_table_tray"
},
"elements": [
{
"from": [0.5, 0, 3],
"to": [2.5, 13.25, 6],
"from": [0, 13, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [13.5, 2.75, 15.5, 16], "texture": "#front"},
"east": {"uv": [10, 2, 13, 16], "texture": "#side"},
"south": {"uv": [0.5, 2.75, 2.375, 16], "texture": "#side"},
"west": {"uv": [0, 2, 3, 16], "texture": "#side"},
"down": {"uv": [0.5, 10, 2.375, 13], "texture": "#wood"}
"north": {"uv": [0, 0, 16, 3], "texture": "#front"},
"east": {"uv": [0, 0, 16, 3], "texture": "#side"},
"south": {"uv": [0, 0, 16, 3], "texture": "#side"},
"west": {"uv": [0, 0, 16, 3], "texture": "#side"},
"up": {"uv": [0, 0, 16, 16], "texture": "#top"},
"down": {"uv": [0, 0, 16, 16], "texture": "#wood"}
}
},
{
"from": [7.5, 0, 3],
"to": [15.5, 13.25, 15.75],
"from": [1, 0, 1],
"to": [4, 6, 4],
"faces": {
"north": {"uv": [0.5, 2.75, 8.5, 16], "texture": "#front"},
"east": {"uv": [0, 2, 13, 16], "texture": "#side"},
"south": {"uv": [5, 2, 13, 16], "texture": "#side"},
"west": {"uv": [0, 2, 13, 16], "texture": "#side"},
"down": {"uv": [7.5, 0.25, 15.5, 13], "texture": "#wood"}
"north": {"uv": [12, 10, 15, 16], "texture": "#front"},
"east": {"uv": [12, 10, 15, 16], "texture": "#side"},
"south": {"uv": [1, 10, 4, 16], "texture": "#side"},
"west": {"uv": [1, 10, 4, 16], "texture": "#side"},
"down": {"uv": [1, 12, 4, 15], "texture": "#wood"}
}
},
{
"from": [0.5, 0, 12.75],
"to": [2.5, 13.25, 15.5],
"from": [1, 6, 1],
"to": [15, 13, 15],
"faces": {
"north": {"uv": [9, 2, 10.875, 15.25], "texture": "#side"},
"east": {"uv": [0, 2, 3, 16], "texture": "#side"},
"south": {"uv": [0, 2, 1.875, 16], "texture": "#side"},
"west": {"uv": [10, 2, 13, 16], "texture": "#side"},
"down": {"uv": [0.5, 0.25, 2.375, 3.25], "texture": "#wood"}
"north": {"uv": [1, 3, 15, 10], "texture": "#front"},
"east": {"uv": [1, 3, 15, 10], "texture": "#side"},
"south": {"uv": [1, 3, 15, 10], "texture": "#side"},
"west": {"uv": [1, 3, 15, 10], "texture": "#side"},
"down": {"uv": [1, 1, 15, 15], "texture": "#tray"}
}
},
{
"from": [0.5, 0, 6],
"to": [2.5, 2, 12.75],
"from": [1, 0, 12],
"to": [4, 6, 15],
"faces": {
"east": {"uv": [3.25, 14, 10, 16], "texture": "#side"},
"west": {"uv": [3, 14, 9.75, 16], "texture": "#side"},
"up": {"uv": [0.5, 6, 2.375, 12.75], "texture": "#side"},
"down": {"uv": [0.5, 3.25, 2.375, 10], "texture": "#wood"}
"north": {"uv": [12, 10, 15, 16], "texture": "#side"},
"east": {"uv": [1, 10, 4, 16], "texture": "#side"},
"south": {"uv": [1, 10, 4, 16], "texture": "#side"},
"west": {"uv": [12, 10, 15, 16], "texture": "#side"},
"down": {"uv": [1, 1, 4, 4], "texture": "#wood"}
}
},
{
"from": [0.5, 11.25, 6],
"to": [2.5, 13.25, 12.75],
"from": [12, 0, 1],
"to": [15, 6, 4],
"faces": {
"east": {"uv": [3, 2, 9.75, 4], "texture": "#side"},
"west": {"uv": [2, 2, 8.75, 4], "texture": "#side"},
"down": {"uv": [0.5, 3.25, 2.375, 10], "texture": "#side"}
"north": {"uv": [1, 10, 4, 16], "texture": "#front"},
"east": {"uv": [12, 10, 15, 16], "texture": "#side"},
"south": {"uv": [12, 10, 15, 16], "texture": "#side"},
"west": {"uv": [1, 10, 4, 16], "texture": "#side"},
"down": {"uv": [12, 12, 15, 15], "texture": "#wood"}
}
},
{
"from": [0.125, 13.25, 1.125],
"to": [15.875, 13.375, 16],
"from": [12, 0, 12],
"to": [15, 6, 15],
"faces": {
"north": {"uv": [0.125, 0.625, 15.875, 1.75], "texture": "#top"},
"east": {"uv": [1, 0, 15.125, 1.125], "texture": "#top"},
"south": {"uv": [0, 0, 15.75, 1.125], "texture": "#top"},
"west": {"uv": [1, 0, 15.125, 1.125], "texture": "#top"},
"down": {"uv": [0.125, 0, 15.875, 14.125], "texture": "#wood"}
"north": {"uv": [1, 10, 4, 16], "texture": "#side"},
"east": {"uv": [1, 10, 4, 16], "texture": "#side"},
"south": {"uv": [12, 10, 15, 16], "texture": "#side"},
"west": {"uv": [12, 10, 15, 16], "texture": "#side"},
"down": {"uv": [12, 1, 15, 4], "texture": "#wood"}
}
},
{
"from": [0, 13.375, 1],
"to": [16, 15.125, 16],
"from": [5, 10, 0],
"to": [11, 11, 1],
"faces": {
"north": {"uv": [0, 0, 16, 1.75], "texture": "#top"},
"east": {"uv": [1, 0, 15.25, 1.75], "texture": "#top"},
"south": {"uv": [0, 0, 16, 1.75], "texture": "#top"},
"west": {"uv": [0, 0, 14.25, 1.75], "texture": "#top"},
"up": {"uv": [0, 1.75, 16, 16], "texture": "#top"},
"down": {"uv": [0, 2, 13, 16], "texture": "#side"}
"north": {"uv": [5, 6, 11, 7], "texture": "#tray"},
"east": {"uv": [15, 6, 16, 7], "texture": "#tray"},
"south": {"uv": [5, 6, 11, 7], "texture": "#tray"},
"west": {"uv": [0, 6, 1, 7], "texture": "#tray"},
"up": {"uv": [5, 0, 11, 1], "texture": "#tray"},
"down": {"uv": [5, 15, 11, 16], "texture": "#tray"}
}
},
{
"from": [0.125, 15.125, 1.125],
"to": [15.875, 15.25, 15.875],
"from": [2, 1, 2],
"to": [14, 2, 14],
"faces": {
"north": {"uv": [0, 0.75, 16, 0.875], "texture": "#top"},
"east": {"uv": [0, 0.75, 14.125, 0.875], "texture": "#top"},
"south": {"uv": [0, 0.75, 16, 0.875], "texture": "#top"},
"west": {"uv": [1.875, 0.75, 16, 0.875], "texture": "#top"},
"up": {"uv": [0.125, 1.125, 15.875, 15.875], "texture": "#top"}
"north": {"uv": [2, 14, 14, 15], "texture": "#tray"},
"east": {"uv": [2, 14, 14, 15], "texture": "#tray"},
"south": {"uv": [2, 14, 14, 15], "texture": "#tray"},
"west": {"uv": [2, 14, 14, 15], "texture": "#tray"},
"up": {"uv": [2, 2, 14, 14], "texture": "#tray"},
"down": {"uv": [2, 2, 14, 14], "texture": "#tray"}
}
}
],
@ -106,11 +112,5 @@
"fixed": {
"scale": [0.5, 0.5, 0.5]
}
},
"groups": [0, 1, 2, 3, 4,
{
"name": "group",
"children": [5, 6, 7]
}
]
}
}

129
1.12/src/main/resources/assets/engineersdecor/models/block/light/inset_light_model.json Normal file
View file

@ -0,0 +1,129 @@
{
"parent": "block/cube",
"textures": {
"light": "engineersdecor:blocks/light/lamp_glass_warm_square_texture",
"side": "engineersdecor:blocks/iestyle/steel_texture",
"particle": "engineersdecor:blocks/iestyle/steel_texture"
},
"elements": [
{
"from": [6, 6, 0.125],
"to": [10, 10, 0.25],
"faces": {
"north": {"uv": [6, 6, 10, 10], "texture": "#light"},
"south": {"uv": [6, 6, 10, 10], "texture": "#light"}
}
},
{
"from": [10, 7, 0],
"to": [11, 9, 0.375],
"faces": {
"north": {"uv": [5, 7, 6, 9], "texture": "#side"},
"east": {"uv": [15.625, 7, 16, 9], "texture": "#side"},
"south": {"uv": [10, 7, 11, 9], "texture": "#side"},
"west": {"uv": [0, 7, 0.375, 9], "texture": "#side"},
"up": {"uv": [10, 0, 11, 0.375], "rotation": 180, "texture": "#side"},
"down": {"uv": [10, 15.625, 11, 16], "rotation": 180, "texture": "#side"}
}
},
{
"from": [5, 7, 0],
"to": [6, 9, 0.375],
"faces": {
"north": {"uv": [10, 7, 11, 9], "texture": "#side"},
"east": {"uv": [15.625, 7, 16, 9], "texture": "#side"},
"south": {"uv": [5, 7, 6, 9], "texture": "#side"},
"west": {"uv": [0, 7, 0.375, 9], "texture": "#side"},
"up": {"uv": [5, 0, 6, 0.375], "rotation": 180, "texture": "#side"},
"down": {"uv": [5, 15.625, 6, 16], "rotation": 180, "texture": "#side"}
}
},
{
"from": [7, 10, 0],
"to": [9, 11, 0.375],
"faces": {
"north": {"uv": [7, 5, 9, 6], "texture": "#side"},
"east": {"uv": [15.625, 5, 16, 6], "texture": "#side"},
"south": {"uv": [7, 5, 9, 6], "texture": "#side"},
"west": {"uv": [0, 5, 0.375, 6], "texture": "#side"},
"up": {"uv": [7, 0, 9, 0.375], "rotation": 180, "texture": "#side"},
"down": {"uv": [7, 15.625, 9, 16], "rotation": 180, "texture": "#side"}
}
},
{
"from": [7, 5, 0],
"to": [9, 6, 0.375],
"faces": {
"north": {"uv": [7, 10, 9, 11], "texture": "#side"},
"east": {"uv": [15.625, 10, 16, 11], "texture": "#side"},
"south": {"uv": [7, 10, 9, 11], "texture": "#side"},
"west": {"uv": [0, 10, 0.375, 11], "texture": "#side"},
"up": {"uv": [7, 0, 9, 0.375], "rotation": 180, "texture": "#side"},
"down": {"uv": [7, 15.625, 9, 16], "rotation": 180, "texture": "#side"}
}
},
{
"from": [6, 9, 0],
"to": [7, 10, 0.375],
"faces": {
"north": {"uv": [9, 6, 10, 7], "texture": "#side"},
"east": {"uv": [15.625, 6, 16, 7], "texture": "#side"},
"south": {"uv": [6, 6, 7, 7], "texture": "#side"},
"west": {"uv": [0, 6, 0.375, 7], "texture": "#side"},
"up": {"uv": [6, 0, 7, 0.375], "rotation": 180, "texture": "#side"},
"down": {"uv": [6, 15.625, 7, 16], "rotation": 180, "texture": "#side"}
}
},
{
"from": [6, 6, 0],
"to": [7, 7, 0.375],
"faces": {
"north": {"uv": [9, 9, 10, 10], "texture": "#side"},
"east": {"uv": [15.625, 9, 16, 10], "texture": "#side"},
"south": {"uv": [6, 9, 7, 10], "texture": "#side"},
"west": {"uv": [0, 9, 0.375, 10], "texture": "#side"},
"up": {"uv": [6, 0, 7, 0.375], "rotation": 180, "texture": "#side"},
"down": {"uv": [6, 15.625, 7, 16], "rotation": 180, "texture": "#side"}
}
},
{
"from": [9, 6, 0],
"to": [10, 7, 0.375],
"faces": {
"north": {"uv": [6, 9, 7, 10], "texture": "#side"},
"east": {"uv": [15.625, 9, 16, 10], "texture": "#side"},
"south": {"uv": [9, 9, 10, 10], "texture": "#side"},
"west": {"uv": [0, 9, 0.375, 10], "texture": "#side"},
"up": {"uv": [9, 0, 10, 0.375], "rotation": 180, "texture": "#side"},
"down": {"uv": [9, 15.625, 10, 16], "rotation": 180, "texture": "#side"}
}
},
{
"from": [9, 9, 0],
"to": [10, 10, 0.375],
"faces": {
"north": {"uv": [6, 6, 7, 7], "texture": "#side"},
"east": {"uv": [15.625, 6, 16, 7], "texture": "#side"},
"south": {"uv": [9, 6, 10, 7], "texture": "#side"},
"west": {"uv": [0, 6, 0.375, 7], "texture": "#side"},
"up": {"uv": [9, 0, 10, 0.375], "rotation": 180, "texture": "#side"},
"down": {"uv": [9, 15.625, 10, 16], "rotation": 180, "texture": "#side"}
}
}
],
"display": {
"gui": {
"rotation": [0, 180, 0],
"translation": [0, 0.5, 0]
},
"fixed": {
"rotation": [0, 180, 0],
"translation": [0, 0, -7.3]
},
"ground": {
"rotation": [0, 0, 0],
"translation": [0, 0, 7],
"scale": [0.7, 0.7, 0.7]
}
}
}

76
1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json
View file

@ -27,7 +27,13 @@
},
"name": "stickTreatedWood"
},
{
"ingredient": {
"type": "forge:ore_dict",
"ore": "plateIron"
},
"name": "plateIron"
},
{
"ingredient": {
"type": "forge:ore_dict",
@ -35,6 +41,13 @@
},
"name": "plateSteel"
},
{
"ingredient": {
"type": "forge:ore_dict",
"ore": "plateAluminium"
},
"name": "plateAluminium"
},
{
"ingredient": {
"type": "forge:ore_dict",
@ -42,7 +55,6 @@
},
"name": "stickSteel"
},
{
"ingredient": {
"type": "forge:ore_dict",
@ -50,7 +62,13 @@
},
"name": "stickIron"
},
{
"ingredient": {
"type": "forge:ore_dict",
"ore": "stickAluminium"
},
"name": "stickAluminium"
},
{
"ingredient": {
"type": "forge:ore_dict",
@ -101,6 +119,37 @@
},
"name": "ingotBrickNether"
},
{
"ingredient": [
{
"type": "forge:ore_dict",
"ore": "plateIron"
},
{
"type": "forge:ore_dict",
"ore": "plateSteel"
},
{
"type": "forge:ore_dict",
"ore": "plateCopper"
},
{
"type": "forge:ore_dict",
"ore": "plateAluminium"
},
{
"type": "forge:ore_dict",
"ore": "plateNickel"
},
{
"type": "forge:ore_dict",
"ore": "plateLead"
}
],
"name": "plateAnyMetal"
},
{
"ingredient": [
{
@ -114,6 +163,27 @@
],
"name": "ingotAnyBrick"
},
{
"ingredient": {
"type": "forge:ore_dict",
"ore": "dustGlowstone"
},
"name": "luminescentDust"
},
{
"ingredient": {
"type": "forge:ore_dict",
"ore": "glowstone"
},
"name": "luminescentBlock"
},
{
"ingredient": {
"type": "forge:ore_dict",
"ore": "paneGlass"
},
"name": "paneGlass"
},
{
"ingredient": [
{

32
1.12/src/main/resources/assets/engineersdecor/recipes/iron_inset_light_recipe.json Normal file
View file

@ -0,0 +1,32 @@
{
"conditions": [
{
"type": "engineersdecor:grc",
"result": "engineersdecor:iron_inset_light"
}
],
"type": "minecraft:crafting_shaped",
"pattern": [
" ",
"GGG",
"PLP"
],
"key": {
"P": {
"item": "#plateAnyMetal",
"data": 0
},
"L": {
"item": "#luminescentBlock",
"data": 0
},
"G": {
"item": "#paneGlass",
"data": 0
}
},
"result": {
"item": "engineersdecor:iron_inset_light",
"count": 8
}
}

BIN
1.12/src/main/resources/assets/engineersdecor/textures/blocks/crafting_table/treated_wood_crafting_table_front.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 816 B

After

Width:  |  Height:  |  Size: 516 B

Before After
Before After

BIN
1.12/src/main/resources/assets/engineersdecor/textures/blocks/crafting_table/treated_wood_crafting_table_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 755 B

After

Width:  |  Height:  |  Size: 483 B

Before After
Before After

BIN
1.12/src/main/resources/assets/engineersdecor/textures/blocks/crafting_table/treated_wood_crafting_table_top.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 601 B

Before After
Before After

BIN
1.12/src/main/resources/assets/engineersdecor/textures/blocks/crafting_table/treated_wood_crafting_table_tray.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 529 B

BIN
1.12/src/main/resources/assets/engineersdecor/textures/blocks/light/lamp_glass_warm_square_texture.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 506 B