From 1ad5a97ca14129b521ec00e392b4149b8f5e2dc0 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Thu, 8 Aug 2024 08:23:08 +0200 Subject: [PATCH] Fixed Tiled Glass not requiring Silk Touch --- src/generated/resources/.cache/cache | 2 +- .../data/create/loot_tables/blocks/tiled_glass.json | 12 +++++++++++- .../decoration/palettes/AllPaletteBlocks.java | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index f08829149..c8bfb345c 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -3788,7 +3788,7 @@ de42002e7b77c3bdc8e69407f6dcab57bf5fa96e data/create/loot_tables/blocks/steam_wh 94f516dd7e6fd4bd4ee26fad2d2d84b79f40de0b data/create/loot_tables/blocks/sticky_mechanical_piston.json 69cc8ce9ff7b905b62f52d9ac4819e79f3235f58 data/create/loot_tables/blocks/stockpile_switch.json da3ceb80799d349b91781b0dd43a02e548045c66 data/create/loot_tables/blocks/stressometer.json -811674fd816503cd78fc4df267dc23f760940e8f data/create/loot_tables/blocks/tiled_glass.json +92c80a3ffd23529029d079e0c2e2cac7ea5ccec2 data/create/loot_tables/blocks/tiled_glass.json 313344ef4ee67ffd0f7fd44adcb3ad08de571c92 data/create/loot_tables/blocks/tiled_glass_pane.json e2846b8823918bce402eb361f703ecdc14251ccc data/create/loot_tables/blocks/track.json 749a2f82cc5315d10447d644b13c1c1e9a7673a6 data/create/loot_tables/blocks/track_observer.json diff --git a/src/generated/resources/data/create/loot_tables/blocks/tiled_glass.json b/src/generated/resources/data/create/loot_tables/blocks/tiled_glass.json index 431581e36..d02470ce7 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/tiled_glass.json +++ b/src/generated/resources/data/create/loot_tables/blocks/tiled_glass.json @@ -12,7 +12,17 @@ ], "conditions": [ { - "condition": "minecraft:survives_explosion" + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } } ] } diff --git a/src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteBlocks.java b/src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteBlocks.java index 6c5f94819..76cf710e1 100644 --- a/src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteBlocks.java +++ b/src/main/java/com/simibubi/create/content/decoration/palettes/AllPaletteBlocks.java @@ -41,6 +41,7 @@ public class AllPaletteBlocks { .addLayer(() -> RenderType::cutout) .recipe((c, p) -> p.stonecutting(DataIngredient.tag(Tags.Items.GLASS_COLORLESS), c::get)) .blockstate((c, p) -> BlockStateGen.cubeAll(c, p, "palettes/")) + .loot((t, g) -> t.dropWhenSilkTouch(g)) .tag(Tags.Blocks.GLASS_COLORLESS, BlockTags.IMPERMEABLE) .item() .tag(Tags.Items.GLASS_COLORLESS)