Skip to content

Commit

Permalink
Added HHN Merch
Browse files Browse the repository at this point in the history
  • Loading branch information
BGannonMC committed Oct 10, 2020
1 parent 0a92175 commit 010ce2e
Show file tree
Hide file tree
Showing 5,756 changed files with 393,270 additions and 156 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 5 additions & 0 deletions 1.12/assets/minecraft/blockstates/brick_block.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "brick" }
}
}
6 changes: 6 additions & 0 deletions 1.12/assets/minecraft/blockstates/brick_double_slab.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"variants": {
"normal": { "model": "brick" },
"all": { "model": "brick" }
}
}
6 changes: 6 additions & 0 deletions 1.12/assets/minecraft/blockstates/brick_slab.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"variants": {
"half=bottom": { "model": "half_slab_brick" },
"half=top": { "model": "upper_slab_brick" }
}
}
12 changes: 12 additions & 0 deletions 1.12/assets/minecraft/blockstates/coarse_dirt.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"variants": {
"normal": [
{ "model": "coarse_dirt" },
{ "model": "dirt/coarse_dirt1" },
{ "model": "dirt/coarse_dirt2" },
{ "model": "dirt/coarse_dirt3" },
{ "model": "dirt/coarse_dirt4" },
{ "model": "dirt/coarse_dirt5" }
]
}
}
36 changes: 36 additions & 0 deletions 1.12/assets/minecraft/blockstates/cobblestone_wall.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"variants": {
"east=false,north=false,south=false,up=false,west=false": { "model": "cobblestone_wall_post" },
"east=false,north=true,south=false,up=false,west=false": { "model": "cobblestone_wall_n" },
"east=true,north=false,south=false,up=false,west=false": { "model": "cobblestone_wall_n", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=false,west=false": { "model": "cobblestone_wall_n", "y": 180, "uvlock": true },
"east=false,north=false,south=false,up=false,west=true": { "model": "cobblestone_wall_n", "y": 270, "uvlock": true },
"east=true,north=true,south=false,up=false,west=false": { "model": "cobblestone_wall_ne" },
"east=true,north=false,south=true,up=false,west=false": { "model": "cobblestone_wall_ne", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=false,west=true": { "model": "cobblestone_wall_ne", "y": 180, "uvlock": true },
"east=false,north=true,south=false,up=false,west=true": { "model": "cobblestone_wall_ne", "y": 270, "uvlock": true },
"east=false,north=true,south=true,up=false,west=false": { "model": "cobblestone_wall_ns" },
"east=true,north=false,south=false,up=false,west=true": { "model": "cobblestone_wall_ns", "y": 90, "uvlock": true },
"east=true,north=true,south=true,up=false,west=false": { "model": "cobblestone_wall_nse" },
"east=true,north=false,south=true,up=false,west=true": { "model": "cobblestone_wall_nse", "y": 90, "uvlock": true },
"east=false,north=true,south=true,up=false,west=true": { "model": "cobblestone_wall_nse", "y": 180, "uvlock": true },
"east=true,north=true,south=false,up=false,west=true": { "model": "cobblestone_wall_nse", "y": 270, "uvlock": true },
"east=true,north=true,south=true,up=false,west=true": { "model": "cobblestone_wall_nsew" },
"east=false,north=false,south=false,up=true,west=false": { "model": "cobblestone_wall_post" },
"east=false,north=true,south=false,up=true,west=false": { "model": "cobblestone_wall_n" },
"east=true,north=false,south=false,up=true,west=false": { "model": "cobblestone_wall_n", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=true,west=false": { "model": "cobblestone_wall_n", "y": 180, "uvlock": true },
"east=false,north=false,south=false,up=true,west=true": { "model": "cobblestone_wall_n", "y": 270, "uvlock": true },
"east=true,north=true,south=false,up=true,west=false": { "model": "cobblestone_wall_ne" },
"east=true,north=false,south=true,up=true,west=false": { "model": "cobblestone_wall_ne", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=true,west=true": { "model": "cobblestone_wall_ne", "y": 180, "uvlock": true },
"east=false,north=true,south=false,up=true,west=true": { "model": "cobblestone_wall_ne", "y": 270, "uvlock": true },
"east=false,north=true,south=true,up=true,west=false": { "model": "cobblestone_wall_ns_above" },
"east=true,north=false,south=false,up=true,west=true": { "model": "cobblestone_wall_ns_above", "y": 90, "uvlock": true },
"east=true,north=true,south=true,up=true,west=false": { "model": "cobblestone_wall_nse" },
"east=true,north=false,south=true,up=true,west=true": { "model": "cobblestone_wall_nse", "y": 90, "uvlock": true },
"east=false,north=true,south=true,up=true,west=true": { "model": "cobblestone_wall_nse", "y": 180, "uvlock": true },
"east=true,north=true,south=false,up=true,west=true": { "model": "cobblestone_wall_nse", "y": 270, "uvlock": true },
"east=true,north=true,south=true,up=true,west=true": { "model": "cobblestone_wall_nsew" }
}
}
18 changes: 18 additions & 0 deletions 1.12/assets/minecraft/blockstates/grass.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"variants": {
"snowy=false": [
{ "model": "grass_normal" },
{ "model": "grass/grass_normal1" },
{ "model": "grass/grass_normal2" },
{ "model": "grass/grass_normal3" },
{ "model": "grass/grass_normal4" },
{ "model": "grass/grass_normal5" },
{ "model": "grass/grass_normal6" },
{ "model": "grass/grass_normal7" },
{ "model": "grass/grass_normal8" },
{ "model": "grass/grass_normal9" },
{ "model": "grass/grass_normal10" }
],
"snowy=true": { "model": "grass_snowed" }
}
}
41 changes: 41 additions & 0 deletions 1.12/assets/minecraft/blockstates/grass_block.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"variants": {
"snowy=false": [{
"model": "block/grass_block"
},
{
"model": "block/grass/grass_block1"
},
{
"model": "block/grass/grass_block2"
},
{
"model": "block/grass/grass_block3"
},
{
"model": "block/grass/grass_block4"
},
{
"model": "block/grass/grass_block5"
},
{
"model": "block/grass/grass_block6"
},
{
"model": "block/grass/grass_block7"
},
{
"model": "block/grass/grass_block8"
},
{
"model": "block/grass/grass_block9"
},
{
"model": "block/grass/grass_block10"
}
],
"snowy=true": {
"model": "block/grass_block_snow"
}
}
}
6 changes: 6 additions & 0 deletions 1.12/assets/minecraft/blockstates/item_frame.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"variants": {
"normal": { "model": "item_frame" },
"map": { "model": "item_frame_map" }
}
}
10 changes: 10 additions & 0 deletions 1.12/assets/minecraft/blockstates/stone_brick_slab.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"variants": {
"half=bottom": { "model": "half_slab_stone_brick" },
"half=top": { "model": "upper_slab_stone_brick" },
"half=top": { "model": "upper_slab_stone_brick2" },
"half=top": { "model": "upper_slab_stone_brick3" },
"half=top": { "model": "upper_slab_stone_brick4" },
"half=top": { "model": "upper_slab_stone_brick5" }
}
}
20 changes: 20 additions & 0 deletions 1.12/assets/minecraft/blockstates/stone_bricks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"variants": {
"": [{
"model": "block/stone_bricks"
},
{
"model": "block/stone_bricks_2"
},
{
"model": "block/stone_bricks_3"
},
{
"model": "block/stone_bricks_4"
},
{
"model": "block/stone_bricks_5"
}
]
}
}
11 changes: 11 additions & 0 deletions 1.12/assets/minecraft/blockstates/stonebrick.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"variants": {
"normal": [
{ "model": "stonebrick_normal" },
{ "model": "stonebrick_normal2" },
{ "model": "stonebrick_normal3" },
{ "model": "stonebrick_normal4" },
{ "model": "stonebrick_normal5" }
]
}
}
9 changes: 9 additions & 0 deletions 1.12/assets/minecraft/blockstates/torch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"variants": {
"facing=up": { "model": "normal_torch" },
"facing=east": { "model": "normal_torch_wall" },
"facing=south": { "model": "normal_torch_wall", "y": 90 },
"facing=west": { "model": "normal_torch_wall", "y": 180 },
"facing=north": { "model": "normal_torch_wall", "y": 270 }
}
}
25 changes: 25 additions & 0 deletions 1.12/assets/minecraft/blockstates/waterlily.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"variants": {
"normal": [
{ "model": "waterlily" },
{ "model": "waterlily/waterlily2" },
{ "model": "waterlily/waterlily2", "y": 90 },
{ "model": "waterlily/waterlily2", "y": 180 },
{ "model": "waterlily/waterlily2", "y": 270 },
{ "model": "waterlily/waterlily3" },
{ "model": "waterlily/waterlily3", "y": 90 },
{ "model": "waterlily/waterlily3", "y": 180 },
{ "model": "waterlily/waterlily3", "y": 270 },
{ "model": "waterlily/waterlily4" },
{ "model": "waterlily/waterlily4", "y": 90 },
{ "model": "waterlily/waterlily4", "y": 180 },
{ "model": "waterlily/waterlily4", "y": 270 },
{ "model": "waterlily/waterlily5" },
{ "model": "waterlily/waterlily5", "y": 90 },
{ "model": "waterlily/waterlily5", "y": 180 },
{ "model": "waterlily/waterlily5", "y": 270 },
{ "model": "waterlily/waterlily6" },
{ "model": "waterlily/waterlily7" }
]
}
}
File renamed without changes.
File renamed without changes.
52 changes: 52 additions & 0 deletions 1.12/assets/minecraft/models/block/anvil.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"elements": [
{ "__comment": "Anvil base",
"from": [ 2, 0, 2 ],
"to": [ 14, 4, 14 ],
"faces": {
"down": { "uv": [ 2, 2, 14, 14 ], "texture": "#body", "rotation": 180, "cullface": "down" },
"up": { "uv": [ 2, 2, 14, 14 ], "texture": "#body", "rotation": 180 },
"north": { "uv": [ 2, 12, 14, 16 ], "texture": "#body" },
"south": { "uv": [ 2, 12, 14, 16 ], "texture": "#body" },
"west": { "uv": [ 0, 2, 4, 14 ], "texture": "#body", "rotation": 90 },
"east": { "uv": [ 4, 2, 0, 14 ], "texture": "#body", "rotation": 270 }
}
},
{ "__comment": "Lower narrow portion",
"from": [ 4, 4, 3 ],
"to": [ 12, 5, 13 ],
"faces": {
"down": { "uv": [ 4, 3, 12, 13 ], "texture": "#body", "rotation": 180 },
"up": { "uv": [ 4, 3, 12, 13 ], "texture": "#body", "rotation": 180 },
"north": { "uv": [ 4, 11, 12, 12 ], "texture": "#body" },
"south": { "uv": [ 4, 11, 12, 12 ], "texture": "#body" },
"west": { "uv": [ 4, 3, 5, 13 ], "texture": "#body", "rotation": 90 },
"east": { "uv": [ 5, 3, 4, 13 ], "texture": "#body", "rotation": 270 }
}
},
{ "__comment": "Wider section beneath top portion",
"from": [ 6, 5, 4 ],
"to": [ 10, 10, 12 ],
"faces": {
"down": { "uv": [ 10, 12, 6, 4 ], "texture": "#body", "rotation": 180 },
"up": { "uv": [ 10, 12, 6, 4 ], "texture": "#body", "rotation": 180 },
"north": { "uv": [ 6, 6, 10, 11 ], "texture": "#body" },
"south": { "uv": [ 6, 6, 10, 11 ], "texture": "#body" },
"west": { "uv": [ 5, 4, 10, 12 ], "texture": "#body", "rotation": 90 },
"east": { "uv": [ 10, 4, 5, 12 ], "texture": "#body", "rotation": 270 }
}
},
{ "__comment": "Anvil top",
"from": [ 3, 10, 0 ],
"to": [ 13, 16, 16 ],
"faces": {
"down": { "uv": [ 3, 0, 13, 16 ], "texture": "#body", "rotation": 180 },
"up": { "uv": [ 3, 0, 13, 16 ], "texture": "#top", "rotation": 180 },
"north": { "uv": [ 3, 0, 13, 6 ], "texture": "#body" },
"south": { "uv": [ 3, 0, 13, 6 ], "texture": "#body" },
"west": { "uv": [ 10, 0, 16, 16 ], "texture": "#body", "rotation": 90 },
"east": { "uv": [ 16, 0, 10, 16 ], "texture": "#body", "rotation": 270 }
}
}
]
}
Loading

0 comments on commit 010ce2e

Please sign in to comment.