Skip to content

Add support for 26.2 snapshot 7 #1889

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
leMaik merged 6 commits into from
May 19, 2026
Merged

Add support for 26.2 snapshot 7 #1889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e655e57
Add an adapter to convert old sign textures to 26.2 sign textures.
leMaik May 15, 2026
55d7bc0
Update the sign model.
leMaik May 15, 2026
d9d7aaa
Update the wall sign model.
leMaik May 15, 2026
2864ac0
Add an adapter to convert old hanging sign textures to 26.2 sign text…
leMaik May 16, 2026
711d718
Update the hanging sign model.
leMaik May 17, 2026
7352695
Update the wall hanging sign model.
leMaik May 17, 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
251 changes: 105 additions & 146 deletions chunky/src/java/se/llbit/chunky/entity/HangingSignEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,193 +19,162 @@

public class HangingSignEntity extends Entity {
private static final Quad[] quadsAttached = new Quad[]{
// top
new Quad(
new Vector3(-7 / 16.0, 10 / 16.0, 1 / 16.0),
new Vector3(7 / 16.0, 10 / 16.0, 1 / 16.0),
new Vector3(-7 / 16.0, 10 / 16.0, -1 / 16.0),
new Vector4(2 / 64., 16 / 64., 1 - 12 / 32., 1 - 14 / 32.)
new Vector3(1 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(15 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(1 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector4(1 / 16.0, 8 / 16.0, 8 / 16.0, 9 / 16.0)
),
// bottom
new Quad(
new Vector3(-7 / 16.0, 0 / 16.0, -1 / 16.0),
new Vector3(7 / 16.0, 0 / 16.0, -1 / 16.0),
new Vector3(-7 / 16.0, 0 / 16.0, 1 / 16.0),
new Vector4(16 / 64., 30 / 64., 1 - 12 / 32., 1 - 14 / 32.)
new Vector3(1 / 16.0, 0 / 16.0, 7 / 16.0),
new Vector3(15 / 16.0, 0 / 16.0, 7 / 16.0),
new Vector3(1 / 16.0, 0 / 16.0, 9 / 16.0),
new Vector4(1 / 16.0, 8 / 16.0, 2 / 16.0, 3 / 16.0)
),
// left
new Quad(
new Vector3(-7 / 16.0, 10 / 16.0, 1 / 16.0),
new Vector3(-7 / 16.0, 10 / 16.0, -1 / 16.0),
new Vector3(-7 / 16.0, 0 / 16.0, 1 / 16.0),
new Vector4(0 / 64., 2 / 64.0, 1 - 14 / 32., 1 - 24 / 32.)
new Vector3(1 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(1 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector3(1 / 16.0, 0 / 16.0, 9 / 16.0),
new Vector4(1 / 16.0, 0 / 16.0, 8 / 16.0, 3 / 16.0)
),
// right
new Quad(
new Vector3(7 / 16.0, 10 / 16.0, -1 / 16.0),
new Vector3(7 / 16.0, 10 / 16.0, 1 / 16.0),
new Vector3(7 / 16.0, 0 / 16.0, -1 / 16.0),
new Vector4(16 / 64., 18 / 64.0, 1 - 14 / 32., 1 - 24 / 32.)
new Vector3(15 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector3(15 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(15 / 16.0, 0 / 16.0, 7 / 16.0),
new Vector4(9 / 16.0, 8 / 16.0, 8 / 16.0, 3 / 16.0)
),
// front
new Quad(
new Vector3(-7 / 16.0, 10 / 16.0, -1 / 16.0),
new Vector3(7 / 16.0, 10 / 16.0, -1 / 16.0),
new Vector3(-7 / 16.0, 0 / 16.0, -1 / 16.0),
new Vector4(16 / 64., 2 / 64., 1 - 14 / 32., 1 - 24 / 32.)
new Vector3(1 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector3(15 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector3(1 / 16.0, 0 / 16.0, 7 / 16.0),
new Vector4(16 / 16.0, 9 / 16.0, 8 / 16.0, 3 / 16.0)
),
// back
new Quad(
new Vector3(7 / 16.0, 10 / 16.0, 1 / 16.0),
new Vector3(-7 / 16.0, 10 / 16.0, 1 / 16.0),
new Vector3(7 / 16.0, 0 / 16.0, 1 / 16.0),
new Vector4(32 / 64., 18 / 64., 1 - 14 / 32., 1 - 24 / 32.)
new Vector3(15 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(1 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(15 / 16.0, 0 / 16.0, 9 / 16.0),
new Vector4(8 / 16.0, 1 / 16.0, 8 / 16.0, 3 / 16.0)
),
// chains front
new Quad(
new Vector3(-6 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(6 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(-6 / 16.0, 10 / 16.0, 0 / 16.0),
new Vector4(13 / 64., 27 / 64., 1 - 6 / 32., 1 - 12 / 32.)
new Vector3(2 / 16.0, 16 / 16.0, 8 / 16.0),
new Vector3(14 / 16.0, 16 / 16.0, 8 / 16.0),
new Vector3(2 / 16.0, 10 / 16.0, 8 / 16.0),
new Vector4(10 / 16.0, 16 / 16.0, 16 / 16.0, 13 / 16.0)
),
// chains back
new Quad(
new Vector3(6 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(-6 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(6 / 16.0, 10 / 16.0, 0 / 16.0),
new Vector4(13 / 64., 27 / 64., 1 - 6 / 32., 1 - 12 / 32.)
new Vector3(14 / 16.0, 16 / 16.0, 8 / 16.0),
new Vector3(2 / 16.0, 16 / 16.0, 8 / 16.0),
new Vector3(14 / 16.0, 10 / 16.0, 8 / 16.0),
new Vector4(16 / 16.0, 10 / 16.0, 16 / 16.0, 13 / 16.0)
)
};

private static final Quad[] quadsNotAttached = Model.join(
new Quad[]{
// top
new Quad(
new Vector3(-7 / 16.0, 10 / 16.0, 1 / 16.0),
new Vector3(7 / 16.0, 10 / 16.0, 1 / 16.0),
new Vector3(-7 / 16.0, 10 / 16.0, -1 / 16.0),
new Vector4(2 / 64., 16 / 64., 1 - 12 / 32., 1 - 14 / 32.)
new Vector3(1 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(15 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(1 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector4(1 / 16.0, 8 / 16.0, 8 / 16.0, 9 / 16.0)
),
// bottom
new Quad(
new Vector3(-7 / 16.0, 0 / 16.0, -1 / 16.0),
new Vector3(7 / 16.0, 0 / 16.0, -1 / 16.0),
new Vector3(-7 / 16.0, 0 / 16.0, 1 / 16.0),
new Vector4(16 / 64., 30 / 64., 1 - 12 / 32., 1 - 14 / 32.)
new Vector3(1 / 16.0, 0 / 16.0, 7 / 16.0),
new Vector3(15 / 16.0, 0 / 16.0, 7 / 16.0),
new Vector3(1 / 16.0, 0 / 16.0, 9 / 16.0),
new Vector4(1 / 16.0, 8 / 16.0, 2 / 16.0, 3 / 16.0)
),
// left
new Quad(
new Vector3(-7 / 16.0, 10 / 16.0, 1 / 16.0),
new Vector3(-7 / 16.0, 10 / 16.0, -1 / 16.0),
new Vector3(-7 / 16.0, 0 / 16.0, 1 / 16.0),
new Vector4(0 / 64., 2 / 64.0, 1 - 14 / 32., 1 - 24 / 32.)
new Vector3(1 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(1 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector3(1 / 16.0, 0 / 16.0, 9 / 16.0),
new Vector4(1 / 16.0, 0 / 16.0, 8 / 16.0, 3 / 16.0)
),
// right
new Quad(
new Vector3(7 / 16.0, 10 / 16.0, -1 / 16.0),
new Vector3(7 / 16.0, 10 / 16.0, 1 / 16.0),
new Vector3(7 / 16.0, 0 / 16.0, -1 / 16.0),
new Vector4(16 / 64., 18 / 64.0, 1 - 14 / 32., 1 - 24 / 32.)
new Vector3(15 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector3(15 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(15 / 16.0, 0 / 16.0, 7 / 16.0),
new Vector4(9 / 16.0, 8 / 16.0, 8 / 16.0, 3 / 16.0)
),
// front
new Quad(
new Vector3(-7 / 16.0, 10 / 16.0, -1 / 16.0),
new Vector3(7 / 16.0, 10 / 16.0, -1 / 16.0),
new Vector3(-7 / 16.0, 0 / 16.0, -1 / 16.0),
new Vector4(16 / 64., 2 / 64., 1 - 14 / 32., 1 - 24 / 32.)
new Vector3(1 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector3(15 / 16.0, 10 / 16.0, 7 / 16.0),
new Vector3(1 / 16.0, 0 / 16.0, 7 / 16.0),
new Vector4(16 / 16.0, 9 / 16.0, 8 / 16.0, 3 / 16.0)
),
// back
new Quad(
new Vector3(7 / 16.0, 10 / 16.0, 1 / 16.0),
new Vector3(-7 / 16.0, 10 / 16.0, 1 / 16.0),
new Vector3(7 / 16.0, 0 / 16.0, 1 / 16.0),
new Vector4(32 / 64., 18 / 64., 1 - 14 / 32., 1 - 24 / 32.)
),
new Vector3(15 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(1 / 16.0, 10 / 16.0, 9 / 16.0),
new Vector3(15 / 16.0, 0 / 16.0, 9 / 16.0),
new Vector4(8 / 16.0, 1 / 16.0, 8 / 16.0, 3 / 16.0)
)
},
// chains
Model.transform(
Model.rotateY(
new Quad[]{
new Quad(
new Vector3(-1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(-1.5 / 16.0, 10 / 16.0, 0 / 16.0),
new Vector4(6 / 64., 9 / 64., 1 - 6 / 32., 1 - 12 / 32.)
new Vector3(2.96447 / 16.0, 16 / 16.0, 4.46447 / 16.0),
new Vector3(5.96447 / 16.0, 16 / 16.0, 4.46447 / 16.0),
new Vector3(2.96447 / 16.0, 10 / 16.0, 4.46447 / 16.0),
new Vector4(11 / 16.0, 12.5 / 16.0, 12.5 / 16.0, 9.5 / 16.0)
),
new Quad(
new Vector3(1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(-1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(1.5 / 16.0, 10 / 16.0, 0 / 16.0),
new Vector4(6 / 64., 9 / 64., 1 - 6 / 32., 1 - 12 / 32.)
new Vector3(5.96447 / 16.0, 16 / 16.0, 4.46447 / 16.0),
new Vector3(2.96447 / 16.0, 16 / 16.0, 4.46447 / 16.0),
new Vector3(5.96447 / 16.0, 10 / 16.0, 4.46447 / 16.0),
new Vector4(12.5 / 16.0, 11 / 16.0, 12.5 / 16.0, 9.5 / 16.0)
)
},
Transform.NONE
.translate(0.5, 0.5, 0.5)
.rotateY(Math.toRadians(-45))
.translate(-0.5, -0.5, -0.5)
.translate(-5 / 16.0, 0 / 16.0, 0 / 16.0)
Math.toRadians(45)
),
Model.transform(
Model.rotateY(
new Quad[]{
new Quad(
new Vector3(-1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(-1.5 / 16.0, 10 / 16.0, 0 / 16.0),
new Vector4(0 / 64., 3 / 64., 1 - 6 / 32., 1 - 12 / 32.)
new Vector3(2.96447 / 16.0, 15 / 16.0, 11.53553 / 16.0),
new Vector3(5.96447 / 16.0, 15 / 16.0, 11.53553 / 16.0),
new Vector3(2.96447 / 16.0, 11 / 16.0, 11.53553 / 16.0),
new Vector4(14 / 16.0, 15.5 / 16.0, 12 / 16.0, 10 / 16.0)
),
new Quad(
new Vector3(1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(-1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(1.5 / 16.0, 10 / 16.0, 0 / 16.0),
new Vector4(0 / 64., 3 / 64., 1 - 6 / 32., 1 - 12 / 32.)
new Vector3(5.96447 / 16.0, 15 / 16.0, 11.53553 / 16.0),
new Vector3(2.96447 / 16.0, 15 / 16.0, 11.53553 / 16.0),
new Vector3(5.96447 / 16.0, 11 / 16.0, 11.53553 / 16.0),
new Vector4(15.5 / 16.0, 14 / 16.0, 12 / 16.0, 10 / 16.0)
)
},
Transform.NONE
.translate(0.5, 0.5, 0.5)
.rotateY(Math.toRadians(45))
.translate(-0.5, -0.5, -0.5)
.translate(-5 / 16.0, 0 / 16.0, 0 / 16.0)
Math.toRadians(-45)
),
Model.transform(
Model.rotateY(
new Quad[]{
new Quad(
new Vector3(-1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(-1.5 / 16.0, 10 / 16.0, 0 / 16.0),
new Vector4(6 / 64., 9 / 64., 1 - 6 / 32., 1 - 12 / 32.)
new Vector3(10.03553 / 16.0, 16 / 16.0, 11.53553 / 16.0),
new Vector3(13.03553 / 16.0, 16 / 16.0, 11.53553 / 16.0),
new Vector3(10.03553 / 16.0, 10 / 16.0, 11.53553 / 16.0),
new Vector4(11 / 16.0, 12.5 / 16.0, 12.5 / 16.0, 9.5 / 16.0)
),
new Quad(
new Vector3(1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(-1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(1.5 / 16.0, 10 / 16.0, 0 / 16.0),
new Vector4(6 / 64., 9 / 64., 1 - 6 / 32., 1 - 12 / 32.)
new Vector3(13.03553 / 16.0, 16 / 16.0, 11.53553 / 16.0),
new Vector3(10.03553 / 16.0, 16 / 16.0, 11.53553 / 16.0),
new Vector3(13.03553 / 16.0, 10 / 16.0, 11.53553 / 16.0),
new Vector4(12.5 / 16.0, 11 / 16.0, 12.5 / 16.0, 9.5 / 16.0)
)
},
Transform.NONE
.translate(0.5, 0.5, 0.5)
.rotateY(Math.toRadians(-45))
.translate(-0.5, -0.5, -0.5)
.translate(5 / 16.0, 0 / 16.0, 0 / 16.0)
Math.toRadians(45)
),
Model.transform(
Model.rotateY(
new Quad[]{
new Quad(
new Vector3(-1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(-1.5 / 16.0, 10 / 16.0, 0 / 16.0),
new Vector4(0 / 64., 3 / 64., 1 - 6 / 32., 1 - 12 / 32.)
new Vector3(10.03553 / 16.0, 15 / 16.0, 4.46447 / 16.0),
new Vector3(13.03553 / 16.0, 15 / 16.0, 4.46447 / 16.0),
new Vector3(10.03553 / 16.0, 11 / 16.0, 4.46447 / 16.0),
new Vector4(14 / 16.0, 15.5 / 16.0, 12 / 16.0, 10 / 16.0)
),
new Quad(
new Vector3(1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(-1.5 / 16.0, 16 / 16.0, 0 / 16.0),
new Vector3(1.5 / 16.0, 10 / 16.0, 0 / 16.0),
new Vector4(0 / 64., 3 / 64., 1 - 6 / 32., 1 - 12 / 32.)
new Vector3(13.03553 / 16.0, 15 / 16.0, 4.46447 / 16.0),
new Vector3(10.03553 / 16.0, 15 / 16.0, 4.46447 / 16.0),
new Vector3(13.03553 / 16.0, 11 / 16.0, 4.46447 / 16.0),
new Vector4(15.5 / 16.0, 14 / 16.0, 12 / 16.0, 10 / 16.0)
)
},
Transform.NONE
.translate(0.5, 0.5, 0.5)
.rotateY(Math.toRadians(45))
.translate(-0.5, -0.5, -0.5)
.translate(5 / 16.0, 0 / 16.0, 0 / 16.0)
Math.toRadians(-45)
)
);

Expand All @@ -216,32 +185,22 @@ public class HangingSignEntity extends Entity {
private static Quad[] backFaceWithText = new Quad[16];

static {
rotatedQuadsAttached[0] = Model.translate(quadsAttached, 0.5, 0, 0.5);
rotatedQuadsNotAttached[0] = Model.translate(quadsNotAttached, 0.5, 0, 0.5);
rotatedQuadsAttached[0] = quadsAttached;
rotatedQuadsNotAttached[0] = quadsNotAttached;

for (int i = 1; i < 16; ++i) {
rotatedQuadsAttached[i] = Model.rotateY(rotatedQuadsAttached[0], Math.PI - i * Math.PI / 8);
rotatedQuadsNotAttached[i] = Model.rotateY(rotatedQuadsNotAttached[0], Math.PI - i * Math.PI / 8);
}

frontFaceWithText[0] = new Quad(
new Vector3(-7 / 16.0, 10 / 16.0, -1 / 16.0),
new Vector3(7 / 16.0, 10 / 16.0, -1 / 16.0),
new Vector3(-7 / 16.0, 0 / 16.0, -1 / 16.0),
new Vector4(1, 0, 1, 0)
);
frontFaceWithText[0] = frontFaceWithText[0].transform(Transform.NONE.translate(0.5, 0, 0.5));
frontFaceWithText[0] = new Quad(quadsAttached[4], Transform.NONE);
frontFaceWithText[0].uv.set(0, 1, 0, 1);
for (int i = 1; i < 16; ++i) {
frontFaceWithText[i] = frontFaceWithText[0].transform(Transform.NONE.rotateY(Math.PI - i * Math.PI / 8));
}

backFaceWithText[0] = new Quad(
new Vector3(7 / 16.0, 10 / 16.0, 1 / 16.0),
new Vector3(-7 / 16.0, 10 / 16.0, 1 / 16.0),
new Vector3(7 / 16.0, 0 / 16.0, 1 / 16.0),
new Vector4(1, 0, 1, 0)
);
backFaceWithText[0] = backFaceWithText[0].transform(Transform.NONE.translate(0.5, 0, 0.5));
backFaceWithText[0] = new Quad(quadsAttached[5], Transform.NONE);
backFaceWithText[0].uv.set(0, 1, 0, 1);
for (int i = 1; i < 16; ++i) {
backFaceWithText[i] = backFaceWithText[0].transform(Transform.NONE.rotateY(Math.PI - i * Math.PI / 8));
}
Expand Down Expand Up @@ -275,8 +234,8 @@ public HangingSignEntity(Vector3 position, JsonArray[] frontText, SignEntity.Col
this.backGlowing = backGlowing;
this.angle = rotation;
this.attached = attached;
this.frontTexture = frontText != null ? new SignTexture(frontText, frontDye, frontGlowing, signTexture, 14, 10, 2 / 64., 1 - 24 / 32., 16 / 64., 1 - 14 / 32., 4.5, 3, 9) : null;
this.backTexture = backText != null ? new SignTexture(backText, backDye, backGlowing, signTexture, 14, 10, 18 / 64., 1 - 24 / 32., 32 / 64., 1 - 14 / 32., 4.5, 3, 9) : null;
this.frontTexture = frontText != null ? new SignTexture(frontText, frontDye, frontGlowing, signTexture, 14, 10, 2 / 32., 16 / 32., 16 / 32., 26 / 32., 4.5, 3, 9) : null;
this.backTexture = backText != null ? new SignTexture(backText, backDye, backGlowing, signTexture, 14, 10, 18 / 32., 16 / 32., 32 / 32., 26 / 32., 4.5, 3, 9) : null;
this.texture = signTexture;
this.material = material;
}
Expand Down
Loading
Loading