Skip to content

branch correction #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Doppel-R101 merged 2 commits into from
Feb 22, 2026
Merged

branch correction #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35f5946
Uploaded the lemonade glass models
Barni-Mezei Feb 21, 2026
dc79030
Merge pull request #11 from Barni-Mezei/main
Doppel-R101 Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions src/main/resources/assets/lemonmates/blockstates/lemon_slice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"format_version": "1.9.0",
"credit": "Made with Blockbench",
"textures": {
"0": "item/lemonade_glass_lemon_slice",
"particle": "item/lemonade_glass_lemon_slice"
},
"elements": [
{
"name": "slice_peel",
"from": [3, 5.5, 8],
"to": [4, 8.5, 9],
"rotation": {"angle": -22.5, "axis": "z", "origin": [5, 6.5, 8]},
"faces": {
"north": {"uv": [3, 1, 4, 4], "texture": "#0"},
"south": {"uv": [0, 5, 1, 8], "texture": "#0"},
"west": {"uv": [4, 5, 5, 8], "texture": "#0"},
"up": {"uv": [6, 1, 5, 0], "texture": "#0"},
"down": {"uv": [6, 1, 5, 2], "texture": "#0"}
}
},
{
"name": "slice_center",
"from": [4, 5.5, 8],
"to": [7, 9.5, 9],
"rotation": {"angle": -22.5, "axis": "z", "origin": [5, 6.5, 8]},
"faces": {
"north": {"uv": [0, 0, 3, 4], "texture": "#0"},
"east": {"uv": [4, 0, 5, 4], "texture": "#0"},
"south": {"uv": [1, 4, 4, 8], "texture": "#0"},
"west": {"uv": [4, 4, 5, 8], "texture": "#0"},
"up": {"uv": [9, 1, 6, 0], "texture": "#0"},
"down": {"uv": [6, 1, 9, 2], "texture": "#0"}
}
}
],
"display": {
"head": {
"translation": [0, 14.5, 0]
}
}
}
271 changes: 271 additions & 0 deletions src/main/resources/assets/lemonmates/blockstates/lemonade_glass.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,271 @@
{
"format_version": "1.9.0",
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"0": "item/lemonade_glass",
"particle": "item/lemonade_glass"
},
"elements": [
{
"name": "north_west",
"from": [5, 0, 5],
"to": [6, 7, 6],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 5]},
"faces": {
"north": {"uv": [6, 2, 6.5, 5.5], "texture": "#0"},
"east": {"uv": [6, 5.5, 6.5, 9], "texture": "#0"},
"south": {"uv": [6.5, 2, 7, 5.5], "texture": "#0"},
"west": {"uv": [6.5, 5.5, 7, 9], "texture": "#0"},
"up": {"uv": [4, 10, 3.5, 9.5], "texture": "#0"},
"down": {"uv": [10, 7, 9.5, 7.5], "texture": "#0"}
}
},
{
"name": "north_east",
"from": [10, 0, 5],
"to": [11, 7, 6],
"rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 5]},
"faces": {
"north": {"uv": [7, 2, 7.5, 5.5], "texture": "#0"},
"east": {"uv": [4, 7, 4.5, 10.5], "texture": "#0"},
"south": {"uv": [4.5, 7, 5, 10.5], "texture": "#0"},
"west": {"uv": [5, 7, 5.5, 10.5], "texture": "#0"},
"up": {"uv": [10, 8, 9.5, 7.5], "texture": "#0"},
"down": {"uv": [10, 8, 9.5, 8.5], "texture": "#0"}
}
},
{
"name": "south_east",
"from": [10, 0, 10],
"to": [11, 7, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 10]},
"faces": {
"north": {"uv": [5.5, 7, 6, 10.5], "texture": "#0"},
"east": {"uv": [7, 5.5, 7.5, 9], "texture": "#0"},
"south": {"uv": [0, 7.5, 0.5, 11], "texture": "#0"},
"west": {"uv": [0.5, 7.5, 1, 11], "texture": "#0"},
"up": {"uv": [10, 9, 9.5, 8.5], "texture": "#0"},
"down": {"uv": [9.5, 9.5, 9, 10], "texture": "#0"}
}
},
{
"name": "south_west",
"from": [5, 0, 10],
"to": [6, 7, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 10]},
"faces": {
"north": {"uv": [1, 7.5, 1.5, 11], "texture": "#0"},
"east": {"uv": [1.5, 7.5, 2, 11], "texture": "#0"},
"south": {"uv": [2, 7.5, 2.5, 11], "texture": "#0"},
"west": {"uv": [7.5, 2, 8, 5.5], "texture": "#0"},
"up": {"uv": [10, 10, 9.5, 9.5], "texture": "#0"},
"down": {"uv": [10.5, 0, 10, 0.5], "texture": "#0"}
}
},
{
"name": "north",
"from": [6, 6, 5],
"to": [10, 7, 6],
"rotation": {"angle": 0, "axis": "y", "origin": [6, 6, 5]},
"faces": {
"north": {"uv": [7.5, 5.5, 9.5, 6], "texture": "#0"},
"south": {"uv": [7.5, 6, 9.5, 6.5], "texture": "#0"},
"up": {"uv": [9.5, 7, 7.5, 6.5], "texture": "#0"},
"down": {"uv": [9.5, 7, 7.5, 7.5], "texture": "#0"}
}
},
{
"name": "east",
"from": [10, 6, 6],
"to": [11, 7, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [10, 6, 6]},
"faces": {
"east": {"uv": [7.5, 7.5, 9.5, 8], "texture": "#0"},
"west": {"uv": [8, 0, 10, 0.5], "texture": "#0"},
"up": {"uv": [3, 9.5, 2.5, 7.5], "texture": "#0"},
"down": {"uv": [3.5, 7.5, 3, 9.5], "texture": "#0"}
}
},
{
"name": "south",
"from": [6, 6, 10],
"to": [10, 7, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [6, 6, 10]},
"faces": {
"north": {"uv": [8, 0.5, 10, 1], "texture": "#0"},
"south": {"uv": [8, 1, 10, 1.5], "texture": "#0"},
"up": {"uv": [10, 2, 8, 1.5], "texture": "#0"},
"down": {"uv": [10, 2, 8, 2.5], "texture": "#0"}
}
},
{
"name": "west",
"from": [5, 6, 6],
"to": [6, 7, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 6, 6]},
"faces": {
"east": {"uv": [8, 2.5, 10, 3], "texture": "#0"},
"west": {"uv": [8, 3, 10, 3.5], "texture": "#0"},
"up": {"uv": [4, 9.5, 3.5, 7.5], "texture": "#0"},
"down": {"uv": [8.5, 3.5, 8, 5.5], "texture": "#0"}
}
},
{
"name": "north",
"from": [6, 0, 5],
"to": [10, 1, 6],
"rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 5]},
"faces": {
"north": {"uv": [7.5, 8, 9.5, 8.5], "texture": "#0"},
"south": {"uv": [8.5, 3.5, 10.5, 4], "texture": "#0"},
"up": {"uv": [10.5, 4.5, 8.5, 4], "texture": "#0"},
"down": {"uv": [10.5, 4.5, 8.5, 5], "texture": "#0"}
}
},
{
"name": "east",
"from": [10, 0, 6],
"to": [11, 1, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 6]},
"faces": {
"east": {"uv": [8.5, 5, 10.5, 5.5], "texture": "#0"},
"west": {"uv": [7.5, 8.5, 9.5, 9], "texture": "#0"},
"up": {"uv": [6.5, 11, 6, 9], "texture": "#0"},
"down": {"uv": [7, 9, 6.5, 11], "texture": "#0"}
}
},
{
"name": "south",
"from": [6, 0, 10],
"to": [10, 1, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 10]},
"faces": {
"north": {"uv": [7, 9, 9, 9.5], "texture": "#0"},
"south": {"uv": [9, 9, 11, 9.5], "texture": "#0"},
"up": {"uv": [11.5, 6, 9.5, 5.5], "texture": "#0"},
"down": {"uv": [11.5, 6, 9.5, 6.5], "texture": "#0"}
}
},
{
"name": "west",
"from": [5, 0, 6],
"to": [6, 1, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 6]},
"faces": {
"east": {"uv": [9.5, 6.5, 11.5, 7], "texture": "#0"},
"west": {"uv": [7, 9.5, 9, 10], "texture": "#0"},
"up": {"uv": [3, 11.5, 2.5, 9.5], "texture": "#0"},
"down": {"uv": [3.5, 9.5, 3, 11.5], "texture": "#0"}
}
},
{
"name": "bottom",
"from": [6, 0, 6],
"to": [10, 1, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 6]},
"faces": {
"up": {"uv": [6, 7, 4, 5], "texture": "#0"},
"down": {"uv": [8, 0, 6, 2], "texture": "#0"}
}
},
{
"name": "west",
"from": [5, 1, 6],
"to": [6, 6, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 1, 6]},
"faces": {
"east": {"uv": [0, 0, 2, 2.5], "texture": "#0"},
"west": {"uv": [2, 0, 4, 2.5], "texture": "#0"}
}
},
{
"name": "east",
"from": [10, 1, 6],
"to": [11, 6, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [10, 1, 6]},
"faces": {
"east": {"uv": [0, 2.5, 2, 5], "texture": "#0"},
"west": {"uv": [2, 2.5, 4, 5], "texture": "#0"}
}
},
{
"name": "north",
"from": [6, 1, 5],
"to": [10, 6, 6],
"rotation": {"angle": 0, "axis": "y", "origin": [6, 1, 5]},
"faces": {
"north": {"uv": [4, 0, 6, 2.5], "texture": "#0"},
"south": {"uv": [4, 2.5, 6, 5], "texture": "#0"}
}
},
{
"name": "south",
"from": [6, 1, 10],
"to": [10, 6, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [6, 1, 10]},
"faces": {
"north": {"uv": [0, 5, 2, 7.5], "texture": "#0"},
"south": {"uv": [2, 5, 4, 7.5], "texture": "#0"}
}
}
],
"display": {
"thirdperson_righthand": {
"translation": [0, 5.25, 1.5],
"scale": [0.67, 0.67, 0.67]
},
"thirdperson_lefthand": {
"translation": [0, 5.25, 1.5],
"scale": [0.67, 0.67, 0.67]
},
"firstperson_righthand": {
"translation": [0, 6, 0],
"scale": [0.8, 0.8, 0.8]
},
"firstperson_lefthand": {
"translation": [0, 6, 0],
"scale": [0.8, 0.8, 0.8]
},
"ground": {
"translation": [0, 3.5, 0],
"scale": [0.68, 0.68, 0.68]
},
"gui": {
"rotation": [22.5, -22.5, 0],
"translation": [0, 3.5, 0]
},
"head": {
"translation": [0, 14.5, 0]
},
"on_shelf": {
"scale": [1.87, 1.87, 1.87]
}
},
"groups": [
{
"name": "edges",
"origin": [8, 8, 8],
"color": 0,
"children": [0, 1, 2, 3]
},
{
"name": "top_edges",
"origin": [8, 8, 8],
"color": 0,
"children": [4, 5, 6, 7]
},
{
"name": "bottom_edges",
"origin": [8, 8, 8],
"color": 0,
"children": [8, 9, 10, 11]
},
{
"name": "faces",
"origin": [8, 8, 8],
"color": 0,
"children": [12, 13, 14, 15, 16]
}
]
}
28 changes: 28 additions & 0 deletions src/main/resources/assets/lemonmates/blockstates/lemonade_glass_fluid_full.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"format_version": "1.9.0",
"credit": "Made with Blockbench",
"textures": {
"0": "item/lemonade_glass_fluid",
"particle": "item/lemonade_glass_fluid"
},
"elements": [
{
"name": "fluid",
"from": [6, 1, 6],
"to": [10, 6, 10],
"faces": {
"north": {"uv": [4, 0, 8, 3], "texture": "#0"},
"east": {"uv": [4, 3, 8, 6], "texture": "#0"},
"south": {"uv": [4, 6, 8, 9], "texture": "#0"},
"west": {"uv": [0, 8, 4, 11], "texture": "#0"},
"up": {"uv": [4, 4, 0, 0], "texture": "#0"},
"down": {"uv": [4, 4, 0, 8], "texture": "#0"}
}
}
],
"display": {
"head": {
"translation": [0, 14.5, 0]
}
}
}
28 changes: 28 additions & 0 deletions src/main/resources/assets/lemonmates/blockstates/lemonade_glass_fluid_half.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"format_version": "1.9.0",
"credit": "Made with Blockbench",
"textures": {
"0": "item/lemonade_glass_fluid",
"particle": "item/lemonade_glass_fluid"
},
"elements": [
{
"name": "fluid",
"from": [6, 1, 6],
"to": [10, 4, 10],
"faces": {
"north": {"uv": [4, 0, 8, 3], "texture": "#0"},
"east": {"uv": [4, 3, 8, 6], "texture": "#0"},
"south": {"uv": [4, 6, 8, 9], "texture": "#0"},
"west": {"uv": [0, 8, 4, 11], "texture": "#0"},
"up": {"uv": [4, 4, 0, 0], "texture": "#0"},
"down": {"uv": [4, 4, 0, 8], "texture": "#0"}
}
}
],
"display": {
"head": {
"translation": [0, 14.5, 0]
}
}
}
Loading