From 9b11fc200cff1b7b620478ed387135045df98497 Mon Sep 17 00:00:00 2001 From: attackeight Date: Wed, 7 Aug 2024 13:56:39 -0400 Subject: [PATCH 1/2] Fix small type with upgrade aquatic stripped driftwood --- src/generated/resources/.cache/cache | 4 ++-- .../recipes/cutting/compat/upgrade_aquatic/driftwood.json | 2 +- .../{strippped_driftwood.json => stripped_driftwood.json} | 2 +- .../create/foundation/data/recipe/CuttingRecipeGen.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/{strippped_driftwood.json => stripped_driftwood.json} (84%) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 02cb1cd94..f08829149 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -5067,14 +5067,14 @@ c125d5b8088a5a37ecdf77814220d2c0f5fd2ee1 data/create/recipes/cutting/compat/twil a9981ca1dff2b3c75b5f539e0054c75aa4f473d1 data/create/recipes/cutting/compat/twilightforest/transformation_wood.json 4460fe49a2be02420b2771b28ff164e94af491c1 data/create/recipes/cutting/compat/twilightforest/twilight_oak_log.json d61e70b16b07f9d2a173b2ef0ae38aaef6038cb8 data/create/recipes/cutting/compat/twilightforest/twilight_oak_wood.json -5588c9ccec0bf76bc070e320c2ebe671fbbc5cac data/create/recipes/cutting/compat/upgrade_aquatic/driftwood.json +01b0f6e46d098f4015abf6fe65f923b175a981c1 data/create/recipes/cutting/compat/upgrade_aquatic/driftwood.json eb826b1eeb57256d16cc117ac79f24e232fdeeaa data/create/recipes/cutting/compat/upgrade_aquatic/driftwood_log.json e7c7f03043b0c67a7dbd7809483a6e68a71fb377 data/create/recipes/cutting/compat/upgrade_aquatic/river_log.json a36ab5a0bb93787898766c1bdcb883b9657e8d94 data/create/recipes/cutting/compat/upgrade_aquatic/river_wood.json +3e7e7ccb514eb19111670b5c904498013f64dd97 data/create/recipes/cutting/compat/upgrade_aquatic/stripped_driftwood.json 30f9402bba23859d22a2ee42ac92e69fd52c8770 data/create/recipes/cutting/compat/upgrade_aquatic/stripped_driftwood_log.json 34fde0b06ecfaab5e2bcbed1fdced89191deb71f data/create/recipes/cutting/compat/upgrade_aquatic/stripped_river_log.json 3c7ad1ef67c39022a87e08ae6ed04b4e678b2dac data/create/recipes/cutting/compat/upgrade_aquatic/stripped_river_wood.json -7e08c613d89c0c8ecc95c28f4921f460be09c0b7 data/create/recipes/cutting/compat/upgrade_aquatic/strippped_driftwood.json 7d9e56b0dc595052fbdcca6bad0375cf937146f6 data/create/recipes/cutting/crimson_hyphae.json 0c877153c4e080cf1c9a07247e7f5b59e7cfc9a8 data/create/recipes/cutting/crimson_stem.json 8d71bb2524538a0d8fd044427cf7134bc2b31d8b data/create/recipes/cutting/dark_oak_log.json diff --git a/src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/driftwood.json b/src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/driftwood.json index c3427257d..5cb69c466 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/driftwood.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/driftwood.json @@ -7,7 +7,7 @@ ], "results": [ { - "item": "upgrade_aquatic:strippped_driftwood" + "item": "upgrade_aquatic:stripped_driftwood" } ], "processingTime": 50, diff --git a/src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/strippped_driftwood.json b/src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/stripped_driftwood.json similarity index 84% rename from src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/strippped_driftwood.json rename to src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/stripped_driftwood.json index 1ca0391df..1b0c9810b 100644 --- a/src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/strippped_driftwood.json +++ b/src/generated/resources/data/create/recipes/cutting/compat/upgrade_aquatic/stripped_driftwood.json @@ -2,7 +2,7 @@ "type": "create:cutting", "ingredients": [ { - "item": "upgrade_aquatic:strippped_driftwood" + "item": "upgrade_aquatic:stripped_driftwood" } ], "results": [ diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java index 9adf8f46c..b15fdd306 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java @@ -126,7 +126,7 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { // Upgrade Aquatic UA = cuttingCompat(Mods.UA, "river"), - UA_2 = stripAndMakePlanks(Mods.UA, "driftwood", "strippped_driftwood", "driftwood_planks"), + UA_2 = stripAndMakePlanks(Mods.UA, "driftwood", "stripped_driftwood", "driftwood_planks"), UA_3 = cuttingCompatLogOnly(Mods.UA, "driftwood"), //Vault Hunters 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 2/2] 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)