diff --git a/src/generated/resources/data/botania/loot_tables/blocks/floating_gourmaryllis.json b/src/generated/resources/data/botania/loot_tables/blocks/floating_gourmaryllis.json index 7d396faa2..d9f3389ef 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/floating_gourmaryllis.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/floating_gourmaryllis.json @@ -24,13 +24,7 @@ "source": "lastFood", "target": "BlockEntityTag.lastFood", "op": "replace" - } - ] - }, - { - "function": "minecraft:copy_nbt", - "source": "block_entity", - "ops": [ + }, { "source": "lastFoodCount", "target": "BlockEntityTag.lastFoodCount", diff --git a/src/generated/resources/data/botania/loot_tables/blocks/floating_hydroangeas.json b/src/generated/resources/data/botania/loot_tables/blocks/floating_hydroangeas.json index 481f71a50..c1f27ea60 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/floating_hydroangeas.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/floating_hydroangeas.json @@ -24,13 +24,7 @@ "source": "cooldown", "target": "BlockEntityTag.cooldown", "op": "replace" - } - ] - }, - { - "function": "minecraft:copy_nbt", - "source": "block_entity", - "ops": [ + }, { "source": "passiveDecayTicks", "target": "BlockEntityTag.passiveDecayTicks", diff --git a/src/generated/resources/data/botania/loot_tables/blocks/floating_rafflowsia.json b/src/generated/resources/data/botania/loot_tables/blocks/floating_rafflowsia.json index 2cecc18d0..9b3cc9c0a 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/floating_rafflowsia.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/floating_rafflowsia.json @@ -24,13 +24,7 @@ "source": "lastFlower", "target": "BlockEntityTag.lastFlower", "op": "replace" - } - ] - }, - { - "function": "minecraft:copy_nbt", - "source": "block_entity", - "ops": [ + }, { "source": "lastFlowerTimes", "target": "BlockEntityTag.lastFlowerTimes", diff --git a/src/generated/resources/data/botania/loot_tables/blocks/floating_thermalily.json b/src/generated/resources/data/botania/loot_tables/blocks/floating_thermalily.json index bd6fbfccb..d29da7acd 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/floating_thermalily.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/floating_thermalily.json @@ -14,6 +14,19 @@ { "condition": "minecraft:survives_explosion" } + ], + "functions": [ + { + "function": "minecraft:copy_nbt", + "source": "block_entity", + "ops": [ + { + "source": "cooldown", + "target": "BlockEntityTag.cooldown", + "op": "replace" + } + ] + } ] } ] diff --git a/src/generated/resources/data/botania/loot_tables/blocks/gourmaryllis.json b/src/generated/resources/data/botania/loot_tables/blocks/gourmaryllis.json index 541f74b84..faf9b602c 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/gourmaryllis.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/gourmaryllis.json @@ -24,13 +24,7 @@ "source": "lastFood", "target": "BlockEntityTag.lastFood", "op": "replace" - } - ] - }, - { - "function": "minecraft:copy_nbt", - "source": "block_entity", - "ops": [ + }, { "source": "lastFoodCount", "target": "BlockEntityTag.lastFoodCount", diff --git a/src/generated/resources/data/botania/loot_tables/blocks/hydroangeas.json b/src/generated/resources/data/botania/loot_tables/blocks/hydroangeas.json index 7a49c9e9a..7d96971a4 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/hydroangeas.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/hydroangeas.json @@ -24,13 +24,7 @@ "source": "cooldown", "target": "BlockEntityTag.cooldown", "op": "replace" - } - ] - }, - { - "function": "minecraft:copy_nbt", - "source": "block_entity", - "ops": [ + }, { "source": "passiveDecayTicks", "target": "BlockEntityTag.passiveDecayTicks", diff --git a/src/generated/resources/data/botania/loot_tables/blocks/rafflowsia.json b/src/generated/resources/data/botania/loot_tables/blocks/rafflowsia.json index 21fdf95fc..d26723d8a 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/rafflowsia.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/rafflowsia.json @@ -24,13 +24,7 @@ "source": "lastFlower", "target": "BlockEntityTag.lastFlower", "op": "replace" - } - ] - }, - { - "function": "minecraft:copy_nbt", - "source": "block_entity", - "ops": [ + }, { "source": "lastFlowerTimes", "target": "BlockEntityTag.lastFlowerTimes", diff --git a/src/generated/resources/data/botania/loot_tables/blocks/thermalily.json b/src/generated/resources/data/botania/loot_tables/blocks/thermalily.json index 631fa248a..08fff69a7 100644 --- a/src/generated/resources/data/botania/loot_tables/blocks/thermalily.json +++ b/src/generated/resources/data/botania/loot_tables/blocks/thermalily.json @@ -14,6 +14,19 @@ { "condition": "minecraft:survives_explosion" } + ], + "functions": [ + { + "function": "minecraft:copy_nbt", + "source": "block_entity", + "ops": [ + { + "source": "cooldown", + "target": "BlockEntityTag.cooldown", + "op": "replace" + } + ] + } ] } ] diff --git a/src/main/java/vazkii/botania/data/BlockLootProvider.java b/src/main/java/vazkii/botania/data/BlockLootProvider.java index 1ce001d7f..d22c7f76b 100644 --- a/src/main/java/vazkii/botania/data/BlockLootProvider.java +++ b/src/main/java/vazkii/botania/data/BlockLootProvider.java @@ -109,6 +109,8 @@ public class BlockLootProvider implements IDataProvider { functionTable.put(ModSubtiles.rafflowsiaFloating, b -> genCopyNbt(b, SubTileRafflowsia.TAG_LAST_FLOWER, SubTileRafflowsia.TAG_LAST_FLOWER_TIMES)); functionTable.put(ModSubtiles.spectrolus, b -> genCopyNbt(b, SubTileSpectrolus.TAG_NEXT_COLOR)); functionTable.put(ModSubtiles.spectrolusFloating, b -> genCopyNbt(b, SubTileSpectrolus.TAG_NEXT_COLOR)); + functionTable.put(ModSubtiles.thermalily, b -> genCopyNbt(b, SubTileHydroangeas.TAG_COOLDOWN)); + functionTable.put(ModSubtiles.thermalilyFloating, b -> genCopyNbt(b, SubTileHydroangeas.TAG_COOLDOWN)); } @Override @@ -138,11 +140,13 @@ public class BlockLootProvider implements IDataProvider { private static LootTable.Builder genCopyNbt(Block b, String... tags) { LootEntry.Builder entry = ItemLootEntry.builder(b); - LootPool.Builder pool = LootPool.builder().name("main").rolls(ConstantRange.of(1)).addEntry(entry) - .acceptCondition(SurvivesExplosion.builder()); + CopyNbt.Builder func = CopyNbt.func_215881_a(CopyNbt.Source.BLOCK_ENTITY); for (String tag : tags) { - pool = pool.acceptFunction(CopyNbt.func_215881_a(CopyNbt.Source.BLOCK_ENTITY).func_216056_a(tag, "BlockEntityTag." + tag)); + func = func.func_216056_a(tag, "BlockEntityTag." + tag); } + LootPool.Builder pool = LootPool.builder().name("main").rolls(ConstantRange.of(1)).addEntry(entry) + .acceptCondition(SurvivesExplosion.builder()) + .acceptFunction(func); return LootTable.builder().addLootPool(pool); }