Rename grass to short_grass. (#1674)

chunky-dev · Nov 25, 2023 · 7bbf074 · 7bbf074
1 parent 50f6444
commit 7bbf074
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java b/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java
@@ -349,7 +349,8 @@ public class MinecraftBlockProvider implements BlockProvider {
     "minecraft:granite_stairs",
     "minecraft:granite_wall",
     "minecraft:grass_block",
-    "minecraft:grass",
+    "minecraft:grass", // pre 1.20.3-pre2
+    "minecraft:short_grass", // since 1.20.3-pre2
     "minecraft:grass_path", // pre 20w45a
     "minecraft:gravel",
     "minecraft:gray_banner",
@@ -1306,6 +1307,7 @@ public Block getBlockByTag(String namespacedName, Tag tag) {
       case "cobweb":
         return new SpriteBlock(name, Texture.cobweb);
       case "grass":
+      case "short_grass": // since 1.20.3-pre2
         return new Grass();
       case "fern":
         return new Fern();

diff --git a/chunky/src/java/se/llbit/chunky/block/minecraft/Grass.java b/chunky/src/java/se/llbit/chunky/block/minecraft/Grass.java
@@ -25,7 +25,7 @@
 public class Grass extends AbstractModelBlock {
 
   public Grass() {
-    super("grass", Texture.tallGrass);
+    super("short_grass", Texture.tallGrass);
     solid = false;
     model = new GrassTintedSpriteModel(texture);
   }

diff --git a/chunky/src/java/se/llbit/chunky/resources/TexturePackLoader.java b/chunky/src/java/se/llbit/chunky/resources/TexturePackLoader.java
@@ -325,6 +325,7 @@ public class TexturePackLoader {
         new SimpleTexture("textures/blocks/grass_side_overlay", Texture.grassSide),
         new IndexedTexture(0x26, Texture.grassSide)));
     ALL_TEXTURES.put("tallgrass", new AlternateTextures(
+        new SimpleTexture("assets/minecraft/textures/block/short_grass", Texture.tallGrass), // since 1.20.3-pre2
         new SimpleTexture("assets/minecraft/textures/block/grass", Texture.tallGrass),
         new SimpleTexture("assets/minecraft/textures/blocks/grass", Texture.tallGrass),
         new SimpleTexture("assets/minecraft/textures/blocks/tallgrass", Texture.tallGrass),