Various small fixes for 1.12

This commit is contained in:
Philipp Rustemeier
2018-03-14 22:37:46 +01:00
parent 489fb82fbd
commit 62c2a9e9b8
604 changed files with 299 additions and 130 deletions
@@ -0,0 +1,21 @@
{ "parent": "block/block",
"textures": {
"particle": "wizardry:blocks/arcane_workbench_bottom",
"bottom": "wizardry:blocks/arcane_workbench_bottom",
"top": "wizardry:blocks/arcane_workbench_top",
"side": "wizardry:blocks/arcane_workbench_side"
},
"elements": [
{ "from": [ 0, 0, 0 ],
"to": [ 16, 12, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" },
"north": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 4, 16, 16 ], "texture": "#side", "cullface": "east" }
}
}
]
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "wizardry:blocks/crystal_block"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "wizardry:blocks/crystal_flower"
}
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "wizardry:blocks/crystal_ore"
}
}
@@ -0,0 +1,3 @@
{
"parent": "block/ice"
}
@@ -0,0 +1,16 @@
{
"parent": "block/block",
"elements": [
{ "from": [ 0, 0, 0 ],
"to": [ 0, 0, 0 ],
"faces": {
"down": { "texture": "#down", "cullface": "down" },
"up": { "texture": "#up", "cullface": "up" },
"north": { "texture": "#north", "cullface": "north" },
"south": { "texture": "#south", "cullface": "south" },
"west": { "texture": "#west", "cullface": "west" },
"east": { "texture": "#east", "cullface": "east" }
}
}
]
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "wizardry:blocks/meteor"
}
}
@@ -0,0 +1,20 @@
{
"parent": "block/block",
"textures": {
"all": "blocks/stone",
"particle": "blocks/stone"
},
"elements": [
{ "from": [ 0, 0, 0 ],
"to": [ 0, 0, 0 ],
"faces": {
"down": { "texture": "#down", "cullface": "down" },
"up": { "texture": "#up", "cullface": "up" },
"north": { "texture": "#north", "cullface": "north" },
"south": { "texture": "#south", "cullface": "south" },
"west": { "texture": "#west", "cullface": "west" },
"east": { "texture": "#east", "cullface": "east" }
}
}
]
}
@@ -0,0 +1,16 @@
{
"ambientocclusion": false,
"textures": {
"particle": "wizardry:blocks/snare",
"texture": "wizardry:blocks/snare"
},
"elements": [
{ "from": [ 0, 0.25, 0 ],
"to": [ 16, 0.25, 16 ],
"faces": {
"down": { "uv": [ 16, 16, 0, 0 ], "texture": "#texture"},
"up": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture"}
}
}
]
}
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "wizardry:blocks/spectral_block"
}
}
@@ -0,0 +1,20 @@
{
"parent": "block/block",
"textures": {
"all": "wizardry:blocks/transportation_stone",
"particle": "wizardry:blocks/transportation_stone"
},
"elements": [
{ "from": [ 5, 0, 5 ],
"to": [ 11, 6, 11 ],
"faces": {
"down": { "texture": "#all", "cullface": "down" },
"up": { "texture": "#all"},
"north": { "texture": "#all"},
"south": { "texture": "#all"},
"west": { "texture": "#all"},
"east": { "texture": "#all"}
}
}
]
}
@@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "blocks/web"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_advanced_earth"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_advanced_fire"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_advanced_healing"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_advanced_ice"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_advanced_lightning"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_advanced_necromancy"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_advanced_sorcery"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_advanced"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_apprentice_earth"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_apprentice_fire"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_apprentice_healing"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_apprentice_ice"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_apprentice_lightning"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_apprentice_necromancy"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_apprentice_sorcery"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_apprentice"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/arcane_tome"
}
}
@@ -0,0 +1,3 @@
{
"parent": "wizardry:block/arcane_workbench"
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/armour_upgrade"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/upgrade_attunement"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_basic_earth"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_basic_fire"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_basic_healing"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_basic_ice"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_basic_lightning"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_basic_necromancy"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_basic_sorcery"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/scroll"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/upgrade_blast"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/upgrade_condenser"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/upgrade_cooldown"
}
}
@@ -0,0 +1,3 @@
{
"parent": "wizardry:block/crystal_block"
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:blocks/crystal_flower"
}
}
@@ -0,0 +1,3 @@
{
"parent": "wizardry:block/crystal_ore"
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/upgrade_duration"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/firebomb"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/flaming_axe"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/frost_axe"
}
}
@@ -0,0 +1,3 @@
{
"parent": "wizardry:block/ice_statue"
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/identification_scroll"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/magic_crystal"
}
}
@@ -0,0 +1,3 @@
{
"parent": "wizardry:block/sea_lantern"
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/magic_silk"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_basic"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/mana_flask"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_master_earth"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_master_fire"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_master_healing"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_master_ice"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_master_lightning"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_master_necromancy"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_master_sorcery"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/wand_master"
}
}
@@ -0,0 +1,3 @@
{
"parent": "wizardry:block/meteor"
}
@@ -0,0 +1,3 @@
{
"parent": "block/stone"
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/poison_bomb"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/upgrade_range"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/scroll"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/upgrade_siphon"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/smoke_bomb"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:blocks/snare"
}
}
@@ -0,0 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "items/spawn_egg",
"layer1": "items/spawn_egg_overlay"
}
}
@@ -0,0 +1,3 @@
{
"parent": "wizardry:block/spectral_block"
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/spectral_boots"
}
}
@@ -0,0 +1,50 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/spectral_bow_standby"
},
"display": {
"thirdperson_righthand": {
"rotation": [ -80, 260, -40 ],
"translation": [ -1, -2, 2.5 ],
"scale": [ 0.9, 0.9, 0.9 ]
},
"thirdperson_lefthand": {
"rotation": [ -80, -280, 40 ],
"translation": [ -1, -2, 2.5 ],
"scale": [ 0.9, 0.9, 0.9 ]
},
"firstperson_righthand": {
"rotation": [ 0, -90, 25 ],
"translation": [ 1.13, 3.2, 1.13],
"scale": [ 0.68, 0.68, 0.68 ]
},
"firstperson_lefthand": {
"rotation": [ 0, 90, -25 ],
"translation": [ 1.13, 3.2, 1.13],
"scale": [ 0.68, 0.68, 0.68 ]
}
},
"overrides": [
{
"predicate": {
"pulling": 1
},
"model": "wizardry:item/spectral_bow_pulling_0"
},
{
"predicate": {
"pulling": 1,
"pull": 0.65
},
"model": "wizardry:item/spectral_bow_pulling_1"
},
{
"predicate": {
"pulling": 1,
"pull": 0.9
},
"model": "wizardry:item/spectral_bow_pulling_2"
}
]
}
@@ -0,0 +1,6 @@
{
"parent": "item/bow",
"textures": {
"layer0": "wizardry:items/spectral_bow_pulling_0"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/bow",
"textures": {
"layer0": "wizardry:items/spectral_bow_pulling_1"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/bow",
"textures": {
"layer0": "wizardry:items/spectral_bow_pulling_2"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/spectral_chestplate"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/spectral_helmet"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/spectral_leggings"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/spectral_pickaxe"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "wizardry:items/spectral_sword"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/spell_book"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/upgrade_storage"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/transportation_stone"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "blocks/web"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/wizard_boots"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/wizard_boots_earth"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/wizard_boots_fire"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/wizard_boots_healing"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/wizard_boots_ice"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/wizard_boots_lightning"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/wizard_boots_necromancy"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/wizard_boots_sorcery"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/wizard_handbook"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/wizard_hat"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "wizardry:items/wizard_hat_earth"
}
}

Some files were not shown because too many files have changed in this diff Show More