Skip to content

Commit 6af4e6e

Browse files
authored
Fix jukebox side texture. (#1567)
1 parent 815fdc6 commit 6af4e6e

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,7 @@ public Block getBlockByTag(String namespacedName, Tag tag) {
12081208
return new TexturedBlock(
12091209
name, Texture.sandstoneCut, Texture.sandstoneTop, Texture.sandstoneBottom);
12101210
case "note_block":
1211-
return new MinecraftBlock(name, Texture.jukeboxSide);
1211+
return new MinecraftBlock(name, Texture.noteBlock);
12121212
case "powered_rail":
12131213
return poweredRail(tag);
12141214
case "detector_rail": {

chunky/src/java/se/llbit/chunky/resources/Texture.java

+1
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ public class Texture {
176176
public static final Texture sugarCane = new Texture("sugar-canes");
177177
public static final Texture jukeboxSide = new Texture();
178178
public static final Texture jukeboxTop = new Texture();
179+
public static final Texture noteBlock = new Texture();
179180
public static final Texture torch = new Texture("torch");
180181
public static final Texture oakDoorTop = new Texture();
181182
public static final Texture oakDoorBottom = new Texture();

chunky/src/java/se/llbit/chunky/resources/TexturePackLoader.java

+12-5
Original file line numberDiff line numberDiff line change
@@ -502,11 +502,18 @@ public class TexturePackLoader {
502502
new SimpleTexture("textures/blocks/reeds", Texture.sugarCane),
503503
new IndexedTexture(0x49, Texture.sugarCane)));
504504
ALL_TEXTURES.put("note_block", new AlternateTextures(
505-
new SimpleTexture("assets/minecraft/textures/block/note_block", Texture.jukeboxSide),
506-
new SimpleTexture("assets/minecraft/textures/blocks/note_block", Texture.jukeboxSide),
507-
new SimpleTexture("assets/minecraft/textures/blocks/noteblock", Texture.jukeboxSide),
508-
new SimpleTexture("textures/blocks/musicBlock", Texture.jukeboxSide),
509-
new IndexedTexture(0x4A, Texture.jukeboxSide)));
505+
new SimpleTexture("assets/minecraft/textures/block/note_block", Texture.noteBlock),
506+
new SimpleTexture("assets/minecraft/textures/blocks/note_block", Texture.noteBlock),
507+
new SimpleTexture("assets/minecraft/textures/blocks/noteblock", Texture.noteBlock),
508+
new SimpleTexture("textures/blocks/musicBlock", Texture.noteBlock),
509+
new IndexedTexture(0x4A, Texture.noteBlock)));
510+
ALL_TEXTURES.put("jukebox_side", new AlternateTextures(
511+
new SimpleTexture("assets/minecraft/textures/block/jukebox_side", Texture.jukeboxSide),
512+
new SimpleTexture("assets/minecraft/textures/block/note_block", Texture.jukeboxSide),
513+
new SimpleTexture("assets/minecraft/textures/blocks/note_block", Texture.jukeboxSide),
514+
new SimpleTexture("assets/minecraft/textures/blocks/noteblock", Texture.jukeboxSide),
515+
new SimpleTexture("textures/blocks/musicBlock", Texture.jukeboxSide),
516+
new IndexedTexture(0x4A, Texture.jukeboxSide)));
510517
ALL_TEXTURES.put("jukebox_top", new AlternateTextures(
511518
new SimpleTexture("assets/minecraft/textures/block/jukebox_top", Texture.jukeboxTop),
512519
new SimpleTexture("assets/minecraft/textures/blocks/jukebox_top", Texture.jukeboxTop),

0 commit comments

Comments
 (0)