Skip to content

Commit

Permalink
Merge branch '1.17' into 1.18
Browse files Browse the repository at this point in the history
  • Loading branch information
@GeForceLegend
GeForceLegend committed Jun 14, 2022
2 parents cbafe17 + b51415b commit d17d8a1
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 80 deletions.
85 changes: 44 additions & 41 deletions assets/minecraft/models/block/enchanting_table.json
View file
Original file line number Diff line number Diff line change
@@ -1,102 +1,105 @@
{
"__comment":"Designed by GeForceLegend",
"parent":"block/block",
"textures":{
"bottom":"block/enchanting_table_bottom",
"particle":"block/enchanting_table_bottom",
"top":"block/enchanting_table_top",
"particle":"block/enchanting_table_side",
"side":"block/enchanting_table_side"
},
"elements":[
{
"from":[0,0,0],
"to":[16,11,16],
"to":[16,12,16],
"faces":{
"north":{"uv":[0,5,16,16],"texture":"#side","cullface":"north"},
"east":{"uv":[0,5,16,16],"texture":"#side","cullface":"east"},
"south":{"uv":[0,5,16,16],"texture":"#side","cullface":"south"},
"west":{"uv":[0,5,16,16],"texture":"#side","cullface":"west"},
"north":{"uv":[0,4,16,16],"texture":"#side","cullface":"north"},
"east":{"uv":[0,4,16,16],"texture":"#side","cullface":"east"},
"south":{"uv":[0,4,16,16],"texture":"#side","cullface":"south"},
"west":{"uv":[0,4,16,16],"texture":"#side","cullface":"west"},
"up":{"uv":[0,0,16,16],"texture":"#top"},
"down":{"uv":[0,0,16,16],"texture":"#bottom","cullface":"down"}
}
},
{
"from":[0,11,0],
"to":[3,12,4],
"from":[0,12,0],
"to":[3,13,4],
"faces":{
"north":{"uv":[13,3,16,4],"texture":"#side"},
"east":{"uv":[2,3,3,4],"texture":"#top"},
"south":{"uv":[0,3,3,4],"texture":"#top"},
"west":{"uv":[0,4,4,5],"texture":"#side","cullface":"west"},
"west":{"uv":[0,3,4,4],"texture":"#side"},
"up":{"uv":[0,0,3,4],"texture":"#top"}
}
},
{
"from":[0,11,0],
"to":[4,12,3],
"from":[3,12,0],
"to":[4,13,3],
"faces":{
"north":{"uv":[12,4,16,5],"texture":"#side","cullface":"north"},
"north":{"uv":[12,3,13,4],"texture":"#side"},
"east":{"uv":[3,0,4,3],"rotation":90,"texture":"#top"},
"south":{"uv":[3,2,4,3],"texture":"#top"},
"up":{"uv":[0,0,4,3],"texture":"#top"}
"up":{"uv":[3,0,4,3],"texture":"#top"}
}
},
{
"from":[0,11,13],
"to":[4,12,16],
"from":[3,12,13],
"to":[4,13,16],
"faces":{
"north":{"uv":[2,3,3,4],"texture":"#top"},
"north":{"uv":[3,13,4,14],"texture":"#top"},
"east":{"uv":[0,3,3,4],"texture":"#top"},
"south":{"uv":[0,4,4,5],"texture":"#side","cullface":"south"},
"up":{"uv":[0,13,4,16],"texture":"#top"}
"south":{"uv":[3,3,4,4],"texture":"#side"},
"up":{"uv":[3,13,4,16],"texture":"#top"}
}
},
{
"from":[0,11,12],
"to":[3,12,16],
"from":[0,12,12],
"to":[3,13,16],
"faces":{
"north":{"uv":[3,0,4,3],"rotation":90,"texture":"#top"},
"east":{"uv":[3,2,4,3],"texture":"#top"},
"west":{"uv":[12,4,16,5],"texture":"#side","cullface":"west"},
"east":{"uv":[2,12,3,13],"texture":"#top"},
"south":{"uv":[0,3,3,4],"texture":"#side"},
"west":{"uv":[12,3,16,4],"texture":"#side"},
"up":{"uv":[0,12,3,16],"texture":"#top"}
}
},
{
"from":[12,11,13],
"to":[16,12,16],
"from":[12,12,13],
"to":[13,13,16],
"faces":{
"north":{"uv":[3,2,4,3],"texture":"#top"},
"south":{"uv":[12,4,16,5],"texture":"#side","cullface":"south"},
"north":{"uv":[12,13,13,14],"texture":"#top"},
"south":{"uv":[12,3,13,4],"texture":"#side"},
"west":{"uv":[3,0,4,3],"rotation":90,"texture":"#top"},
"up":{"uv":[12,13,16,16],"texture":"#top"}
"up":{"uv":[12,13,13,16],"texture":"#top"}
}
},
{
"from":[13,11,12],
"to":[16,12,16],
"from":[13,12,12],
"to":[16,13,16],
"faces":{
"north":{"uv":[0,3,3,4],"texture":"#top"},
"east":{"uv":[0,4,4,5],"texture":"#side","cullface":"east"},
"west":{"uv":[2,3,3,4],"texture":"#top"},
"east":{"uv":[0,3,4,4],"texture":"#side"},
"south":{"uv":[13,3,16,4],"texture":"#side"},
"west":{"uv":[13,12,14,13],"texture":"#top"},
"up":{"uv":[13,12,16,16],"texture":"#top"}
}
},
{
"from":[12,11,0],
"to":[16,12,3],
"from":[12,12,0],
"to":[13,13,3],
"faces":{
"north":{"uv":[0,4,4,5],"texture":"#side","cullface":"north"},
"south":{"uv":[2,3,3,4],"texture":"#top"},
"north":{"uv":[3,3,4,4],"texture":"#side"},
"south":{"uv":[12,2,13,3],"texture":"#top"},
"west":{"uv":[0,3,3,4],"texture":"#top"},
"up":{"uv":[12,0,16,3],"texture":"#top"}
"up":{"uv":[12,0,13,3],"texture":"#top"}
}
},
{
"from":[13,11,0],
"to":[16,12,4],
"from":[13,12,0],
"to":[16,13,4],
"faces":{
"east":{"uv":[12,4,16,5],"texture":"#side","cullface":"east"},
"north":{"uv":[0,3,3,4],"texture":"#side"},
"east":{"uv":[12,3,16,4],"texture":"#side"},
"south":{"uv":[3,0,4,3],"rotation":90,"texture":"#top"},
"west":{"uv":[3,2,4,3],"texture":"#top"},
"west":{"uv":[13,3,14,4],"texture":"#top"},
"up":{"uv":[13,0,16,4],"texture":"#top"}
}
}
Expand Down
82 changes: 43 additions & 39 deletions assets/minecraft/models/item/enchanting_table.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,93 +11,97 @@
"elements":[
{
"from":[0,0,0],
"to":[16,11,16],
"to":[16,12,16],
"faces":{
"north":{"uv":[0,5,16,16],"texture":"#side"},
"east":{"uv":[0,5,16,16],"texture":"#side"},
"south":{"uv":[0,5,16,16],"texture":"#side"},
"west":{"uv":[0,5,16,16],"texture":"#side"},
"north":{"uv":[0,4,16,16],"texture":"#side"},
"east":{"uv":[0,4,16,16],"texture":"#side"},
"south":{"uv":[0,4,16,16],"texture":"#side"},
"west":{"uv":[0,4,16,16],"texture":"#side"},
"up":{"uv":[0,0,16,16],"texture":"#top"},
"down":{"uv":[0,0,16,16],"texture":"#bottom"}
}
},
{
"from":[0,11,0],
"to":[3,12,4],
"from":[0,12,0],
"to":[3,13,4],
"faces":{
"north":{"uv":[13,3,16,4],"texture":"#side"},
"east":{"uv":[2,3,3,4],"texture":"#top"},
"south":{"uv":[0,3,3,4],"texture":"#top"},
"west":{"uv":[0,4,4,5],"texture":"#side"},
"west":{"uv":[0,3,4,4],"texture":"#side"},
"up":{"uv":[0,0,3,4],"texture":"#top"}
}
},
{
"from":[0,11,0],
"to":[4,12,3],
"from":[3,12,0],
"to":[4,13,3],
"faces":{
"north":{"uv":[12,4,16,5],"texture":"#side"},
"north":{"uv":[12,3,13,4],"texture":"#side"},
"east":{"uv":[3,0,4,3],"rotation":90,"texture":"#top"},
"south":{"uv":[3,2,4,3],"texture":"#top"},
"up":{"uv":[0,0,4,3],"texture":"#top"}
"up":{"uv":[3,0,4,3],"texture":"#top"}
}
},
{
"from":[0,11,13],
"to":[4,12,16],
"from":[3,12,13],
"to":[4,13,16],
"faces":{
"north":{"uv":[2,3,3,4],"texture":"#top"},
"north":{"uv":[3,13,4,14],"texture":"#top"},
"east":{"uv":[0,3,3,4],"texture":"#top"},
"south":{"uv":[0,4,4,5],"texture":"#side"},
"up":{"uv":[0,13,4,16],"texture":"#top"}
"south":{"uv":[3,3,4,4],"texture":"#side"},
"up":{"uv":[3,13,4,16],"texture":"#top"}
}
},
{
"from":[0,11,12],
"to":[3,12,16],
"from":[0,12,12],
"to":[3,13,16],
"faces":{
"north":{"uv":[3,0,4,3],"rotation":90,"texture":"#top"},
"east":{"uv":[3,2,4,3],"texture":"#top"},
"west":{"uv":[12,4,16,5],"texture":"#side"},
"east":{"uv":[2,12,3,13],"texture":"#top"},
"south":{"uv":[0,3,3,4],"texture":"#side"},
"west":{"uv":[12,3,16,4],"texture":"#side"},
"up":{"uv":[0,12,3,16],"texture":"#top"}
}
},
{
"from":[12,11,13],
"to":[16,12,16],
"from":[12,12,13],
"to":[13,13,16],
"faces":{
"north":{"uv":[3,2,4,3],"texture":"#top"},
"south":{"uv":[12,4,16,5],"texture":"#side"},
"north":{"uv":[12,13,13,14],"texture":"#top"},
"south":{"uv":[12,3,13,4],"texture":"#side"},
"west":{"uv":[3,0,4,3],"rotation":90,"texture":"#top"},
"up":{"uv":[12,13,16,16],"texture":"#top"}
"up":{"uv":[12,13,13,16],"texture":"#top"}
}
},
{
"from":[13,11,12],
"to":[16,12,16],
"from":[13,12,12],
"to":[16,13,16],
"faces":{
"north":{"uv":[0,3,3,4],"texture":"#top"},
"east":{"uv":[0,4,4,5],"texture":"#side"},
"west":{"uv":[2,3,3,4],"texture":"#top"},
"east":{"uv":[0,3,4,4],"texture":"#side"},
"south":{"uv":[13,3,16,4],"texture":"#side"},
"west":{"uv":[13,12,14,13],"texture":"#top"},
"up":{"uv":[13,12,16,16],"texture":"#top"}
}
},
{
"from":[12,11,0],
"to":[16,12,3],
"from":[12,12,0],
"to":[13,13,3],
"faces":{
"north":{"uv":[0,4,4,5],"texture":"#side"},
"south":{"uv":[2,3,3,4],"texture":"#top"},
"north":{"uv":[3,3,4,4],"texture":"#side"},
"south":{"uv":[12,2,13,3],"texture":"#top"},
"west":{"uv":[0,3,3,4],"texture":"#top"},
"up":{"uv":[12,0,16,3],"texture":"#top"}
"up":{"uv":[12,0,13,3],"texture":"#top"}
}
},
{
"from":[13,11,0],
"to":[16,12,4],
"from":[13,12,0],
"to":[16,13,4],
"faces":{
"east":{"uv":[12,4,16,5],"texture":"#side"},
"north":{"uv":[0,3,3,4],"texture":"#side"},
"east":{"uv":[12,3,16,4],"texture":"#side"},
"south":{"uv":[3,0,4,3],"rotation":90,"texture":"#top"},
"west":{"uv":[3,2,4,3],"texture":"#top"},
"west":{"uv":[13,3,14,4],"texture":"#top"},
"up":{"uv":[13,0,16,4],"texture":"#top"}
}
},
Expand Down
Binary file added assets/minecraft/textures/block/enchanting_table_side.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d17d8a1

Please sign in to comment.