Skip to content

Commit 48f391d

Browse files
authored
Fix armorstand and beacon beam textures in new resource packs. (#1881)
* Fix beacon beam texture. * Fix armorstand texture.
1 parent bdb7bd5 commit 48f391d

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ public class Texture {
321321
public static final Texture potatoes2 = new Texture();
322322
public static final Texture potatoes3 = new Texture();
323323
public static final Texture beacon = new Texture();
324+
@TexturePath(value = "assets/minecraft/textures/entity/beacon/beacon_beam", alternatives = {"assets/minecraft/textures/entity/beacon_beam"})
324325
public static final Texture beaconBeam = new Texture();
325326
public static final Texture anvilSide = new Texture();
326327
public static final Texture anvilTop = new Texture();
@@ -1736,6 +1737,7 @@ public class Texture {
17361737
/** Banner base texture. */
17371738
public static final Texture bannerBase = new Texture();
17381739

1740+
@TexturePath(value = "assets/minecraft/textures/entity/armorstand/armorstand", alternatives = {"assets/minecraft/textures/entity/armorstand/wood"})
17391741
public static final Texture armorStand = new Texture();
17401742

17411743
protected static boolean useAverageColor = PersistentSettings.getSingleColorTextures();

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,6 @@ public class TexturePackLoader {
310310
new SimpleTexture("assets/minecraft/textures/blocks/beacon", Texture.beacon),
311311
new SimpleTexture("textures/blocks/beacon", Texture.beacon),
312312
new IndexedTexture(0x29, Texture.beacon)));
313-
ALL_TEXTURES.put("beacon_beam", new SimpleTexture("assets/minecraft/textures/entity/beacon_beam", Texture.beaconBeam));
314313
ALL_TEXTURES.put("crafting_table_top", new AlternateTextures(
315314
new SimpleTexture("assets/minecraft/textures/block/crafting_table_top",
316315
Texture.workbenchTop),
@@ -3018,9 +3017,6 @@ public class TexturePackLoader {
30183017
ALL_TEXTURES.put("banner_base",
30193018
new SimpleTexture("assets/minecraft/textures/entity/banner_base", Texture.bannerBase));
30203019

3021-
ALL_TEXTURES.put("armor_stand",
3022-
new SimpleTexture("assets/minecraft/textures/entity/armorstand/wood", Texture.armorStand));
3023-
30243020
// Minecraft 1.13
30253021
ALL_TEXTURES.put("stripped_oak_log",
30263022
new SimpleTexture("assets/minecraft/textures/block/stripped_oak_log",

0 commit comments

Comments
 (0)