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

Finished adding all of the dungeon blocks and localized them. Added the appropriate models for rotated pillars/pillar caps.

Browse source
This commit is contained in:
WayofTime 2016-09-05 10:30:59 -04:00
parent b08c7fd7ae
commit afcba54df4
21 changed files with 569 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/main/resources/assets/bloodmagic/blockstates/BlockPillar1.json
View file

@ -1,76 +1,58 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube_bottom_top",
"model": "minecraft:cube",
"textures": {
"bottom": "bloodmagic:blocks/dungeon/dungeon_pillarheart",
"top": "bloodmagic:blocks/dungeon/dungeon_pillarheart",
"side": "bloodmagic:blocks/dungeon/dungeon_pillar"
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart",
"side": "bloodmagic:blocks/dungeon/dungeon_pillar",
"particle": "#end"
}
},
"variants": {
"axis": {
"x": {
"model": "bloodmagic:BlockPillarX"
},
"y": {
"model": "minecraft:cube_bottom_top",
"textures": {
"top": "#end",
"bottom": "#end"
}
},
"z": {
"model": "bloodmagic:BlockPillarZ"
}
},
"type": {
"raw": {
},
"corrosive": {
"textures": {
"bottom": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c",
"top": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c",
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c",
"side": "bloodmagic:blocks/dungeon/dungeon_pillar_c"
}
},
"destructive": {
"textures": {
"bottom": "bloodmagic:blocks/dungeon/dungeon_pillarheart_d",
"top": "bloodmagic:blocks/dungeon/dungeon_pillarheart_d",
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_d",
"side": "bloodmagic:blocks/dungeon/dungeon_pillar_d"
}
},
"vengeful": {
"textures": {
"bottom": "bloodmagic:blocks/dungeon/dungeon_pillarheart_v",
"top": "bloodmagic:blocks/dungeon/dungeon_pillarheart_v",
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_v",
"side": "bloodmagic:blocks/dungeon/dungeon_pillar_v"
}
},
"steadfast": {
"textures": {
"bottom": "bloodmagic:blocks/dungeon/dungeon_pillarheart_s",
"top": "bloodmagic:blocks/dungeon/dungeon_pillarheart_s",
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_s",
"side": "bloodmagic:blocks/dungeon/dungeon_pillar_s"
}
}
},
"axis": {
"x": {
"transform": {
"rotation": {"z": -90}
}
},
"y": {
},
"z": {
"transform": {
"rotation": {"x": 90}
}
}
},
"inventory": [{
"variants": {
"raw": {
},
"corrosive": {
"textures": {
"bottom": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c",
"top": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c",
"side": "bloodmagic:blocks/dungeon/dungeon_pillar_c"
}
}
}
}]
"inventory": [{ }]
}
}

58
src/main/resources/assets/bloodmagic/blockstates/BlockPillar2.json Normal file
View file

@ -0,0 +1,58 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube",
"textures": {
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart",
"side": "bloodmagic:blocks/dungeon/dungeon_pillarspecial",
"particle": "#end"
}
},
"variants": {
"axis": {
"x": {
"model": "bloodmagic:BlockPillarX"
},
"y": {
"model": "minecraft:cube_bottom_top",
"textures": {
"top": "#end",
"bottom": "#end"
}
},
"z": {
"model": "bloodmagic:BlockPillarZ"
}
},
"type": {
"raw": {
},
"corrosive": {
"textures": {
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c",
"side": "bloodmagic:blocks/dungeon/dungeon_pillarspecial_c"
}
},
"destructive": {
"textures": {
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_d",
"side": "bloodmagic:blocks/dungeon/dungeon_pillarspecial_d"
}
},
"vengeful": {
"textures": {
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_v",
"side": "bloodmagic:blocks/dungeon/dungeon_pillarspecial_v"
}
},
"steadfast": {
"textures": {
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_s",
"side": "bloodmagic:blocks/dungeon/dungeon_pillarspecial_s"
}
}
},
"inventory": [{ }]
}
}

57
src/main/resources/assets/bloodmagic/blockstates/BlockPillarCap1.json Normal file
View file

@ -0,0 +1,57 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube",
"textures": {
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart",
"sideBottom": "bloodmagic:blocks/dungeon/dungeon_pillarbottom",
"sideTop": "bloodmagic:blocks/dungeon/dungeon_pillartop",
"particle": "#end"
}
},
"variants": {
"facing": {
"down": {
"model": "minecraft:cube_bottom_top",
"textures": {
"top": "#end",
"bottom": "#end",
"side": "#sideBottom"
}
},
"up": {
"model": "minecraft:cube_bottom_top",
"textures": {
"top": "#end",
"bottom": "#end",
"side": "#sideTop"
}
},
"north": {
"model": "bloodmagic:BlockPillarCapNorth"
},
"south": {
"model": "bloodmagic:BlockPillarCapSouth"
},
"west": {
"model": "bloodmagic:BlockPillarCapWest"
},
"east": {
"model": "bloodmagic:BlockPillarCapEast"
}
},
"type": {
"raw": {
},
"corrosive": {
"textures": {
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_c",
"sideBottom": "bloodmagic:blocks/dungeon/dungeon_pillarbottom_c",
"sideTop": "bloodmagic:blocks/dungeon/dungeon_pillartop_c"
}
}
},
"inventory": [{ }]
}
}

57
src/main/resources/assets/bloodmagic/blockstates/BlockPillarCap2.json Normal file
View file

@ -0,0 +1,57 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube",
"textures": {
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_d",
"sideBottom": "bloodmagic:blocks/dungeon/dungeon_pillarbottom_d",
"sideTop": "bloodmagic:blocks/dungeon/dungeon_pillartop_d",
"particle": "#end"
}
},
"variants": {
"facing": {
"down": {
"model": "minecraft:cube_bottom_top",
"textures": {
"top": "#end",
"bottom": "#end",
"side": "#sideBottom"
}
},
"up": {
"model": "minecraft:cube_bottom_top",
"textures": {
"top": "#end",
"bottom": "#end",
"side": "#sideTop"
}
},
"north": {
"model": "bloodmagic:BlockPillarCapNorth"
},
"south": {
"model": "bloodmagic:BlockPillarCapSouth"
},
"west": {
"model": "bloodmagic:BlockPillarCapWest"
},
"east": {
"model": "bloodmagic:BlockPillarCapEast"
}
},
"type": {
"destructive": {
},
"vengeful": {
"textures": {
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_v",
"sideBottom": "bloodmagic:blocks/dungeon/dungeon_pillarbottom_v",
"sideTop": "bloodmagic:blocks/dungeon/dungeon_pillartop_v"
}
}
},
"inventory": [{ }]
}
}

50
src/main/resources/assets/bloodmagic/blockstates/BlockPillarCap3.json Normal file
View file

@ -0,0 +1,50 @@
{
"forge_marker": 1,
"defaults": {
"model": "minecraft:cube",
"textures": {
"end": "bloodmagic:blocks/dungeon/dungeon_pillarheart_s",
"sideBottom": "bloodmagic:blocks/dungeon/dungeon_pillarbottom_s",
"sideTop": "bloodmagic:blocks/dungeon/dungeon_pillartop_s",
"particle": "#end"
}
},
"variants": {
"facing": {
"down": {
"model": "minecraft:cube_bottom_top",
"textures": {
"top": "#end",
"bottom": "#end",
"side": "#sideBottom"
}
},
"up": {
"model": "minecraft:cube_bottom_top",
"textures": {
"top": "#end",
"bottom": "#end",
"side": "#sideTop"
}
},
"north": {
"model": "bloodmagic:BlockPillarCapNorth"
},
"south": {
"model": "bloodmagic:BlockPillarCapSouth"
},
"west": {
"model": "bloodmagic:BlockPillarCapWest"
},
"east": {
"model": "bloodmagic:BlockPillarCapEast"
}
},
"type": {
"steadfast": {
}
},
"inventory": [{ }]
}
}

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

@ -318,6 +318,18 @@ tile.BloodMagic.pillar1.destructive.name=Destructive Stone Pillar
tile.BloodMagic.pillar1.vengeful.name=Vengeful Stone Pillar
tile.BloodMagic.pillar1.steadfast.name=Steadfast Stone Pillar
tile.BloodMagic.pillar2.raw.name=Accented Raw Stone Pillar
tile.BloodMagic.pillar2.corrosive.name=Accented Corrosive Stone Pillar
tile.BloodMagic.pillar2.destructive.name=Accented Destructive Stone Pillar
tile.BloodMagic.pillar2.vengeful.name=Accented Vengeful Stone Pillar
tile.BloodMagic.pillar2.steadfast.name=Accented Steadfast Stone Pillar
tile.BloodMagic.pillarCap1.raw.name=Raw Stone Pillar Cap
tile.BloodMagic.pillarCap1.corrosive.name=Corrosive Stone Pillar Cap
tile.BloodMagic.pillarCap2.destructive.name=Destructive Stone Pillar Cap
tile.BloodMagic.pillarCap2.vengeful.name=Vengeful Stone Pillar Cap
tile.BloodMagic.pillarCap3.steadfast.name=Steadfast Stone Pillar Cap
# Fluids
fluid.lifeEssence=Life Essence

17
src/main/resources/assets/bloodmagic/models/block/BlockPillarCapEast.json Normal file
View file

@ -0,0 +1,17 @@
{
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"up": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideBottom", "rotation": 270 },
"down": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideBottom", "rotation": 270 },
"north": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideTop", "rotation": 270 },
"south": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideBottom", "rotation": 270 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" }
}
}
]
}

17
src/main/resources/assets/bloodmagic/models/block/BlockPillarCapNorth.json Normal file
View file

@ -0,0 +1,17 @@
{
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#sideTop" },
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#sideBottom" },
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" },
"west": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideTop", "rotation": 270 },
"east": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideBottom", "rotation": 270 }
}
}
]
}

17
src/main/resources/assets/bloodmagic/models/block/BlockPillarCapSouth.json Normal file
View file

@ -0,0 +1,17 @@
{
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#sideBottom" },
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#sideTop" },
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" },
"west": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideBottom", "rotation": 270 },
"east": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideTop", "rotation": 270 }
}
}
]
}

17
src/main/resources/assets/bloodmagic/models/block/BlockPillarCapWest.json Normal file
View file

@ -0,0 +1,17 @@
{
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"up": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideTop", "rotation": 270 },
"down": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideTop", "rotation": 270 },
"north": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideBottom", "rotation": 270 },
"south": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideTop", "rotation": 270 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" }
}
}
]
}

17
src/main/resources/assets/bloodmagic/models/block/BlockPillarX.json Normal file
View file

@ -0,0 +1,17 @@
{
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"up": { "uv": [ 16, 0, 0, 16 ], "texture": "#side", "rotation": 270 },
"down": { "uv": [ 16, 0, 0, 16 ], "texture": "#side", "rotation": 270 },
"north": { "uv": [ 16, 0, 0, 16 ], "texture": "#side", "rotation": 270 },
"south": { "uv": [ 16, 0, 0, 16 ], "texture": "#side", "rotation": 270 },
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" },
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" }
}
}
]
}

17
src/main/resources/assets/bloodmagic/models/block/BlockPillarZ.json Normal file
View file

@ -0,0 +1,17 @@
{
"elements": [
{
"from": [ 0, 0, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" },
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" },
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" },
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" },
"west": { "uv": [ 16, 0, 0, 16 ], "texture": "#side", "rotation": 270 },
"east": { "uv": [ 16, 0, 0, 16 ], "texture": "#side", "rotation": 270 }
}
}
]
}