Skip to content

Commit 1aeda96

Browse files
Remove unused amethyst "lit" tag (#1623)
1 parent 2e46db9 commit 1aeda96

File tree

3 files changed

+8
-42
lines changed

3 files changed

+8
-42
lines changed

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,17 +2881,13 @@ public Block getBlockByTag(String namespacedName, Tag tag) {
28812881
case "lightning_rod":
28822882
return new LightningRod(BlockProvider.facing(tag, "up"), tag.get("Properties").get("powered").stringValue("false").equals("true"));
28832883
case "small_amethyst_bud":
2884-
return new AmethystCluster(name, Texture.smallAmethystBud, BlockProvider.facing(tag, "up"),
2885-
isLit(tag, true));
2884+
return new SpriteBlock(name, Texture.smallAmethystBud, BlockProvider.facing(tag, "up"));
28862885
case "medium_amethyst_bud":
2887-
return new AmethystCluster(name, Texture.mediumAmethystBud, BlockProvider.facing(tag, "up"),
2888-
isLit(tag, true));
2886+
return new SpriteBlock(name, Texture.mediumAmethystBud, BlockProvider.facing(tag, "up"));
28892887
case "large_amethyst_bud":
2890-
return new AmethystCluster(name, Texture.largeAmethystBud, BlockProvider.facing(tag, "up"),
2891-
isLit(tag, true));
2888+
return new SpriteBlock(name, Texture.largeAmethystBud, BlockProvider.facing(tag, "up"));
28922889
case "amethyst_cluster":
2893-
return new AmethystCluster(name, Texture.amethystCluster, BlockProvider.facing(tag, "up"),
2894-
isLit(tag, true));
2890+
return new SpriteBlock(name, Texture.amethystCluster, BlockProvider.facing(tag, "up"));
28952891
case "tinted_glass":
28962892
return new TintedGlass();
28972893
case "powder_snow":

chunky/src/java/se/llbit/chunky/chunk/BlockPalette.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -522,24 +522,16 @@ public static Map<String, Consumer<Block>> getDefaultMaterialProperties() {
522522
}
523523
});
524524
materialProperties.put("minecraft:small_amethyst_bud", block -> {
525-
if (block instanceof AmethystCluster && ((AmethystCluster) block).isLit()) {
526-
block.emittance = 1.0f / 15f;
527-
}
525+
block.emittance = 1.0f / 15f;
528526
});
529527
materialProperties.put("minecraft:medium_amethyst_bud", block -> {
530-
if (block instanceof AmethystCluster && ((AmethystCluster) block).isLit()) {
531-
block.emittance = 1.0f / 15f * 2;
532-
}
528+
block.emittance = 1.0f / 15f * 2;
533529
});
534530
materialProperties.put("minecraft:large_amethyst_bud", block -> {
535-
if (block instanceof AmethystCluster && ((AmethystCluster) block).isLit()) {
536-
block.emittance = 1.0f / 15f * 4;
537-
}
531+
block.emittance = 1.0f / 15f * 4;
538532
});
539533
materialProperties.put("minecraft:amethyst_cluster", block -> {
540-
if (block instanceof AmethystCluster && ((AmethystCluster) block).isLit()) {
541-
block.emittance = 1.0f / 15f * 5;
542-
}
534+
block.emittance = 1.0f / 15f * 5;
543535
});
544536
materialProperties.put("minecraft:tinted_glass", glassConfig);
545537
materialProperties.put("minecraft:sculk_sensor", block -> {

0 commit comments

Comments
 (0)