Remove unused amethyst "lit" tag (chunky-dev#1623)

leMaik · Sep 9, 2023 · 2a0f5a3 · 2a0f5a3
1 parent 8f12ab3
commit 2a0f5a3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 42 deletions.
diff --git a/chunky/src/java/se/llbit/chunky/block/AmethystCluster.java b/chunky/src/java/se/llbit/chunky/block/AmethystCluster.java
diff --git a/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java b/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java
@@ -2881,17 +2881,13 @@ public Block getBlockByTag(String namespacedName, Tag tag) {
       case "lightning_rod":
         return new LightningRod(BlockProvider.facing(tag, "up"), tag.get("Properties").get("powered").stringValue("false").equals("true"));
       case "small_amethyst_bud":
-        return new AmethystCluster(name, Texture.smallAmethystBud, BlockProvider.facing(tag, "up"),
-            isLit(tag, true));
+        return new SpriteBlock(name, Texture.smallAmethystBud, BlockProvider.facing(tag, "up"));
       case "medium_amethyst_bud":
-        return new AmethystCluster(name, Texture.mediumAmethystBud, BlockProvider.facing(tag, "up"),
-            isLit(tag, true));
+        return new SpriteBlock(name, Texture.mediumAmethystBud, BlockProvider.facing(tag, "up"));
       case "large_amethyst_bud":
-        return new AmethystCluster(name, Texture.largeAmethystBud, BlockProvider.facing(tag, "up"),
-            isLit(tag, true));
+        return new SpriteBlock(name, Texture.largeAmethystBud, BlockProvider.facing(tag, "up"));
       case "amethyst_cluster":
-        return new AmethystCluster(name, Texture.amethystCluster, BlockProvider.facing(tag, "up"),
-            isLit(tag, true));
+        return new SpriteBlock(name, Texture.amethystCluster, BlockProvider.facing(tag, "up"));
       case "tinted_glass":
         return new TintedGlass();
       case "powder_snow":

diff --git a/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java b/chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java
@@ -522,24 +522,16 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
       }
     });
     materialProperties.put("minecraft:small_amethyst_bud", block -> {
-      if (block instanceof AmethystCluster && ((AmethystCluster) block).isLit()) {
-        block.emittance = 1.0f / 15f;
-      }
+      block.emittance = 1.0f / 15f;
     });
     materialProperties.put("minecraft:medium_amethyst_bud", block -> {
-      if (block instanceof AmethystCluster && ((AmethystCluster) block).isLit()) {
-        block.emittance = 1.0f / 15f * 2;
-      }
+      block.emittance = 1.0f / 15f * 2;
     });
     materialProperties.put("minecraft:large_amethyst_bud", block -> {
-      if (block instanceof AmethystCluster && ((AmethystCluster) block).isLit()) {
-        block.emittance = 1.0f / 15f * 4;
-      }
+      block.emittance = 1.0f / 15f * 4;
     });
     materialProperties.put("minecraft:amethyst_cluster", block -> {
-      if (block instanceof AmethystCluster && ((AmethystCluster) block).isLit()) {
-        block.emittance = 1.0f / 15f * 5;
-      }
+      block.emittance = 1.0f / 15f * 5;
     });
     materialProperties.put("minecraft:tinted_glass", glassConfig);
     materialProperties.put("minecraft:sculk_sensor", block -> {