lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Merged the three brick variants into one.

Browse source 
- Added the Inversion Pillar models and caps
This commit is contained in:
WayofTime 2016-09-11 15:45:54 -04:00
parent cfa6979056
commit 3e71ac3496
7 changed files with 104 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

102
src/main/resources/assets/bloodmagic/blockstates/BlockDemonBricks1.json
View file

@ -6,82 +6,30 @@
"uvlock": true
},
"variants": {
"type": {
"brick1_raw": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick1"
}
},
"brick1_corrosive": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick1_c"
}
},
"brick1_destructive": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick1_d"
}
},
"brick1_vengeful": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick1_v"
}
},
"brick1_steadfast": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick1_s"
}
},
"brick2_raw": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick2"
}
},
"brick2_corrosive": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick2_c"
}
},
"brick2_destructive": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick2_d"
}
},
"brick2_vengeful": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick2_v"
}
},
"brick2_steadfast": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick2_s"
}
},
"brick3_raw": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick3"
}
},
"brick3_corrosive": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick3_c"
}
},
"brick3_destructive": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick3_d"
}
},
"brick3_vengeful": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick3_v"
}
},
"brick3_steadfast": {
"textures": {
"all": "bloodmagic:blocks/dungeon/dungeon_brick3_s"
}
}
}
"type=brick1_raw": [
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick1"}},
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick2"}},
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick3"}}
],
"type=brick1_corrosive": [
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick1_c"}},
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick2_c"}},
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick3_c"}}
],
"type=brick1_destructive": [
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick1_d"}},
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick2_d"}},
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick3_d"}}
],
"type=brick1_vengeful": [
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick1_v"}},
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick2_v"}},
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick3_v"}}
],
"type=brick1_steadfast": [
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick1_s"}},
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick2_s"}},
{"textures": {"all": "bloodmagic:blocks/dungeon/dungeon_brick3_s"}}
]
}
}

28
src/main/resources/assets/bloodmagic/blockstates/BlockInversionPillar.json
View file

@ -13,44 +13,30 @@
"raw": {
"textures": {
},
"transform": {
"translation": [ 0, -0.46875, 0 ]
}
}
},
"corrosive": {
"textures": {
"texture": "bloodmagic:models/pillar_mid_c"
},
"transform": {
"translation": [ 0, -0.46875, 0 ]
}
}
},
"vengeful": {
"textures": {
"texture": "bloodmagic:models/pillar_mid_v"
},
"transform": {
"translation": [ 0, -0.46875, 0 ]
}
}
},
"destructive": {
"textures": {
"texture": "bloodmagic:models/pillar_mid_d"
},
"transform": {
"translation": [ 0, -0.46875, 0 ]
}
}
},
"steadfast": {
"textures": {
"texture": "bloodmagic:models/pillar_mid_s"
},
"transform": {
"translation": [ 0, -0.46875, 0 ]
}
}
}
}
},
"inventory": [{}]
}
}

37
src/main/resources/assets/bloodmagic/lang/en_US.lang
View file

@ -256,21 +256,11 @@ tile.BloodMagic.mimic.solidclear.name=Clear Mimic Block
tile.BloodMagic.mimic.solidlight.name=Lighted Mimic Block
tile.BloodMagic.mimic.sentient.name=Sentient Mimic Block
tile.BloodMagic.bricks1.brick1_raw.name=Long Raw Stone Bricks
tile.BloodMagic.bricks1.brick1_corrosive.name=Long Corrosive Stone Bricks
tile.BloodMagic.bricks1.brick1_destructive.name=Long Destructive Stone Bricks
tile.BloodMagic.bricks1.brick1_vengeful.name=Long Vengeful Stone Bricks
tile.BloodMagic.bricks1.brick1_steadfast.name=Long Steadfast Stone Bricks
tile.BloodMagic.bricks1.brick2_raw.name=Uneven Raw Stone Bricks
tile.BloodMagic.bricks1.brick2_corrosive.name=Uneven Corrosive Stone Bricks
tile.BloodMagic.bricks1.brick2_destructive.name=Uneven Destructive Stone Bricks
tile.BloodMagic.bricks1.brick2_vengeful.name=Uneven Vengeful Stone Bricks
tile.BloodMagic.bricks1.brick2_steadfast.name=Uneven Steadfast Stone Bricks
tile.BloodMagic.bricks1.brick3_raw.name=Raw Stone Bricks
tile.BloodMagic.bricks1.brick3_corrosive.name=Corrosive Stone Bricks
tile.BloodMagic.bricks1.brick3_destructive.name=Destructive Stone Bricks
tile.BloodMagic.bricks1.brick3_vengeful.name=Vengeful Stone Bricks
tile.BloodMagic.bricks1.brick3_steadfast.name=Steadfast Stone Bricks
tile.BloodMagic.bricks1.brick1_raw.name=Raw Stone Bricks
tile.BloodMagic.bricks1.brick1_corrosive.name=Corrosive Stone Bricks
tile.BloodMagic.bricks1.brick1_destructive.name=Destructive Stone Bricks
tile.BloodMagic.bricks1.brick1_vengeful.name=Vengeful Stone Bricks
tile.BloodMagic.bricks1.brick1_steadfast.name=Steadfast Stone Bricks
tile.BloodMagic.bricks2.smallbrick_raw.name=Small Raw Stone Bricks
tile.BloodMagic.bricks2.smallbrick_corrosive.name=Small Corrosive Stone Bricks
@ -288,6 +278,23 @@ tile.BloodMagic.bricks2.tilespecial_destructive.name=Accented Destructive Stone
tile.BloodMagic.bricks2.tilespecial_vengeful.name=Accented Vengeful Stone Tiles
tile.BloodMagic.bricks2.tilespecial_steadfast.name=Accented Steadfast Stone Tiles
tile.BloodMagic.inversionpillar.raw.name=Raw Inversion Pillar
tile.BloodMagic.inversionpillar.corrosive.name=Corrosive Inversion Pillar
tile.BloodMagic.inversionpillar.destructive.name=Destructive Inversion Pillar
tile.BloodMagic.inversionpillar.vengeful.name=Vengeful Inversion Pillar
tile.BloodMagic.inversionpillar.steadfast.name=Steadfast Inversion Pillar
tile.BloodMagic.inversionpillarend.raw_bottom.name=Raw Inversion Pillar Base
tile.BloodMagic.inversionpillarend.corrosive_bottom.name=Corrosive Inversion Pillar Base
tile.BloodMagic.inversionpillarend.destructive_bottom.name=Destructive Inversion Pillar Base
tile.BloodMagic.inversionpillarend.vengeful_bottom.name=Vengeful Inversion Pillar Base
tile.BloodMagic.inversionpillarend.steadfast_bottom.name=Steadfast Inversion Pillar Base
tile.BloodMagic.inversionpillarend.raw_top.name=Raw Inversion Pillar Cap
tile.BloodMagic.inversionpillarend.corrosive_top.name=Corrosive Inversion Pillar Cap
tile.BloodMagic.inversionpillarend.destructive_top.name=Destructive Inversion Pillar Cap
tile.BloodMagic.inversionpillarend.vengeful_top.name=Vengeful Inversion Pillar Cap
tile.BloodMagic.inversionpillarend.steadfast_top.name=Steadfast Inversion Pillar Cap
tile.BloodMagic.demonlight.raw.name=Raw Demon Eye
tile.BloodMagic.demonlight.corrosive.name=Corrosive Demon Eye
tile.BloodMagic.demonlight.destructive.name=Destructive Demon Eye

92
src/main/resources/assets/bloodmagic/models/block/pillar_mid.json
View file

@ -5,8 +5,8 @@
"elements": [
{
"__comment": "Base1",
"from": [ 2, 0, 2 ],
"to": [ 14, 4, 14 ],
"from": [ 2, -7, 2 ],
"to": [ 14, -3, 14 ],
"faces": {
"down": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture", "cullface": "down" },
"up": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture" },
@ -18,8 +18,8 @@
},
{
"__comment": "Rim1",
"from": [ 5, 4, 11 ],
"to": [ 11, 8, 14 ],
"from": [ 5, -3, 11 ],
"to": [ 11, 1, 14 ],
"faces": {
"up": { "uv": [ 5, 2.5, 8, 4 ], "texture": "#texture" },
"north": { "uv": [ 1.5, 4.5, 4.5, 6.5 ], "texture": "#texture" },
@ -30,8 +30,8 @@
},
{
"__comment": "Rim2",
"from": [ 2, 4, 5 ],
"to": [ 5, 8, 11 ],
"from": [ 2, -3, 5 ],
"to": [ 5, 1, 11 ],
"faces": {
"up": { "uv": [ 5, 2.5, 8, 4 ], "rotation": 90, "texture": "#texture" },
"north": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture" },
@ -42,8 +42,8 @@
},
{
"__comment": "Rim3",
"from": [ 5, 4, 2 ],
"to": [ 11, 8, 5 ],
"from": [ 5, -3, 2 ],
"to": [ 11, 1, 5 ],
"faces": {
"up": { "uv": [ 5, 2.5, 8, 4 ], "rotation": 180, "texture": "#texture" },
"north": { "uv": [ 1.5, 4.5, 4.5, 6.5 ], "texture": "#texture" },
@ -54,8 +54,8 @@
},
{
"__comment": "Rim4",
"from": [ 11, 4, 5 ],
"to": [ 14, 8, 11 ],
"from": [ 11, -3, 5 ],
"to": [ 14, 1, 11 ],
"faces": {
"up": { "uv": [ 5, 2.5, 8, 4 ], "rotation": 270, "texture": "#texture" },
"north": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture" },
@ -66,8 +66,8 @@
},
{
"__comment": "Mid1",
"from": [ 5, 8, 5 ],
"to": [ 11, 12, 11 ],
"from": [ 5, 1, 5 ],
"to": [ 11, 5, 11 ],
"faces": {
"down": { "uv": [ 10.5, 10.5, 13.5, 13.5 ], "texture": "#texture" },
"up": { "uv": [ 10.5, 10.5, 13.5, 13.5 ], "texture": "#texture" },
@ -79,8 +79,8 @@
},
{
"__comment": "Nook",
"from": [ 11, 3, 11 ],
"to": [ 13, 6, 13 ],
"from": [ 11, -4, 11 ],
"to": [ 13, -1, 13 ],
"faces": {
"down": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture" },
"up": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture" },
@ -92,8 +92,8 @@
},
{
"__comment": "Nook2",
"from": [ 3, 3, 11 ],
"to": [ 5, 6, 13 ],
"from": [ 3, -4, 11 ],
"to": [ 5, -1, 13 ],
"faces": {
"down": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture" },
"up": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture" },
@ -105,8 +105,8 @@
},
{
"__comment": "Nook3",
"from": [ 3, 3, 3 ],
"to": [ 5, 6, 5 ],
"from": [ 3, -4, 3 ],
"to": [ 5, -1, 5 ],
"faces": {
"down": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture" },
"up": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture" },
@ -118,8 +118,8 @@
},
{
"__comment": "Nook4",
"from": [ 11, 3, 3 ],
"to": [ 13, 6, 5 ],
"from": [ 11, -4, 3 ],
"to": [ 13, -1, 5 ],
"faces": {
"down": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture" },
"up": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture" },
@ -131,8 +131,8 @@
},
{
"__comment": "Mid3",
"from": [ 5, 13, 5 ],
"to": [ 11, 17, 11 ],
"from": [ 5, 6, 5 ],
"to": [ 11, 10, 11 ],
"faces": {
"down": { "uv": [ 10.5, 10.5, 13.5, 13.5 ], "texture": "#texture", "cullface": "up" },
"up": { "uv": [ 10.5, 10.5, 13.5, 13.5 ], "texture": "#texture", "cullface": "up" },
@ -144,8 +144,8 @@
},
{
"__comment": "Mid5",
"from": [ 5, 18, 5 ],
"to": [ 11, 22, 11 ],
"from": [ 5, 11, 5 ],
"to": [ 11, 15, 11 ],
"faces": {
"down": { "uv": [ 10.5, 10.5, 13.5, 13.5 ], "texture": "#texture", "cullface": "up" },
"up": { "uv": [ 10.5, 10.5, 13.5, 13.5 ], "texture": "#texture", "cullface": "up" },
@ -157,8 +157,8 @@
},
{
"__comment": "Mid2",
"from": [ 5.5, 12, 5.5 ],
"to": [ 10.5, 13, 10.5 ],
"from": [ 5.5, 5, 5.5 ],
"to": [ 10.5, 6, 10.5 ],
"faces": {
"north": { "uv": [ 12, 2, 14.5, 2.5 ], "texture": "#texture" },
"south": { "uv": [ 12, 2, 14.5, 2.5 ], "texture": "#texture" },
@ -168,8 +168,8 @@
},
{
"__comment": "Mid4",
"from": [ 5.5, 17, 5.5 ],
"to": [ 10.5, 18, 10.5 ],
"from": [ 5.5, 10, 5.5 ],
"to": [ 10.5, 11, 10.5 ],
"faces": {
"north": { "uv": [ 12, 2, 14.5, 2.5 ], "texture": "#texture", "cullface": "up" },
"south": { "uv": [ 12, 2, 14.5, 2.5 ], "texture": "#texture", "cullface": "up" },
@ -179,8 +179,8 @@
},
{
"__comment": "Rim5",
"from": [ 5, 22, 11 ],
"to": [ 11, 26, 14 ],
"from": [ 5, 15, 11 ],
"to": [ 11, 19, 14 ],
"faces": {
"down": { "uv": [ 5, 2.5, 8, 4 ], "rotation": 180, "texture": "#texture", "cullface": "up" },
"north": { "uv": [ 1.5, 2, 4.5, 4 ], "texture": "#texture", "cullface": "up" },
@ -191,8 +191,8 @@
},
{
"__comment": "Rim6",
"from": [ 11, 22, 5 ],
"to": [ 14, 26, 11 ],
"from": [ 11, 15, 5 ],
"to": [ 14, 19, 11 ],
"faces": {
"down": { "uv": [ 5, 2.5, 8, 4 ], "rotation": 270, "texture": "#texture", "cullface": "up" },
"north": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture", "cullface": "up" },
@ -203,8 +203,8 @@
},
{
"__comment": "Rim7",
"from": [ 2, 22, 5 ],
"to": [ 5, 26, 11 ],
"from": [ 2, 15, 5 ],
"to": [ 5, 19, 11 ],
"faces": {
"down": { "uv": [ 5, 2.5, 8, 4 ], "rotation": 90, "texture": "#texture", "cullface": "up" },
"north": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture", "cullface": "up" },
@ -215,8 +215,8 @@
},
{
"__comment": "Rim8",
"from": [ 5, 22, 2 ],
"to": [ 11, 26, 5 ],
"from": [ 5, 15, 2 ],
"to": [ 11, 19, 5 ],
"faces": {
"down": { "uv": [ 5, 2.5, 8, 4 ], "texture": "#texture", "cullface": "up" },
"north": { "uv": [ 1.5, 2, 4.5, 4 ], "texture": "#texture", "cullface": "up" },
@ -227,8 +227,8 @@
},
{
"__comment": "Base2",
"from": [ 2, 26, 2 ],
"to": [ 14, 30, 14 ],
"from": [ 2, 19, 2 ],
"to": [ 14, 23, 14 ],
"faces": {
"down": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture", "cullface": "up" },
"up": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture", "cullface": "up" },
@ -240,8 +240,8 @@
},
{
"__comment": "Nook5",
"from": [ 11, 24, 11 ],
"to": [ 13, 27, 13 ],
"from": [ 11, 17, 11 ],
"to": [ 13, 20, 13 ],
"faces": {
"down": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture", "cullface": "up" },
"up": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture", "cullface": "up" },
@ -253,8 +253,8 @@
},
{
"__comment": "Nook7",
"from": [ 3, 24, 11.5 ],
"to": [ 5, 27, 13.5 ],
"from": [ 3, 17, 11.5 ],
"to": [ 5, 20, 13.5 ],
"faces": {
"down": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture", "cullface": "up" },
"up": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture", "cullface": "up" },
@ -266,8 +266,8 @@
},
{
"__comment": "Nook8",
"from": [ 3, 24, 3 ],
"to": [ 5, 27, 5 ],
"from": [ 3, 17, 3 ],
"to": [ 5, 20, 5 ],
"faces": {
"down": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture", "cullface": "up" },
"up": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture", "cullface": "up" },
@ -279,8 +279,8 @@
},
{
"__comment": "Nook6",
"from": [ 11, 24, 3 ],
"to": [ 13, 27, 5 ],
"from": [ 11, 17, 3 ],
"to": [ 13, 20, 5 ],
"faces": {
"down": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture", "cullface": "up" },
"up": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture", "cullface": "up" },