From 716167e3ec4a5f836721038dc10651e856477f16 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 9 Sep 2017 20:18:19 +0200 Subject: [PATCH] Fix #1375 Split up the loot tables for every plugin --- .../forestry/apiculture/PluginApiculture.java | 2 +- .../arboriculture/PluginArboriculture.java | 2 +- .../java/forestry/core/EventHandlerCore.java | 23 ++- .../java/forestry/factory/PluginFactory.java | 2 +- .../java/forestry/plugins/ForestryPlugin.java | 5 + .../java/forestry/plugins/PluginManager.java | 13 ++ .../java/forestry/storage/PluginStorage.java | 46 ++--- .../chests/abandoned_mineshaft.json | 71 ------- .../abandoned_mineshaft/apiculture.json | 26 +++ .../chests/abandoned_mineshaft/factory.json | 34 +++ .../chests/abandoned_mineshaft/storage.json | 19 ++ .../loot_tables/chests/desert_pyramid.json | 90 -------- .../chests/desert_pyramid/apiculture.json | 45 ++++ .../chests/desert_pyramid/arboriculture.json | 25 +++ .../chests/desert_pyramid/factory.json | 28 +++ .../loot_tables/chests/end_city_treasure.json | 103 ---------- .../chests/end_city_treasure/apiculture.json | 88 ++++++++ .../end_city_treasure/arboriculture.json | 19 ++ .../loot_tables/chests/igloo_chest.json | 45 ---- .../chests/igloo_chest/apiculture.json | 45 ++++ .../loot_tables/chests/jungle_temple.json | 66 ------ .../chests/jungle_temple/apiculture.json | 45 ++++ .../chests/jungle_temple/arboriculture.json | 25 +++ .../loot_tables/chests/nether_bridge.json | 38 ---- .../chests/nether_bridge/apiculture.json | 38 ++++ .../loot_tables/chests/simple_dungeon.json | 26 --- .../chests/simple_dungeon/apiculture.json | 26 +++ .../loot_tables/chests/spawn_bonus_chest.json | 15 -- .../chests/spawn_bonus_chest/apiculture.json | 15 ++ .../chests/stronghold_corridor.json | 26 --- .../stronghold_corridor/apiculture.json | 26 +++ .../chests/stronghold_crossing.json | 26 --- .../stronghold_crossing/apiculture.json | 26 +++ .../chests/stronghold_library.json | 38 ---- .../chests/stronghold_library/apiculture.json | 38 ++++ .../chests/village_naturalist.json | 194 ------------------ .../chests/village_naturalist/apiculture.json | 94 +++++++++ .../village_naturalist/arboriculture.json | 104 ++++++++++ 38 files changed, 823 insertions(+), 774 deletions(-) delete mode 100644 src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft/apiculture.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft/factory.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft/storage.json delete mode 100644 src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid/apiculture.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid/arboriculture.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid/factory.json delete mode 100644 src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure/apiculture.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure/arboriculture.json delete mode 100644 src/main/resources/assets/forestry/loot_tables/chests/igloo_chest.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/igloo_chest/apiculture.json delete mode 100644 src/main/resources/assets/forestry/loot_tables/chests/jungle_temple.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/jungle_temple/apiculture.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/jungle_temple/arboriculture.json delete mode 100644 src/main/resources/assets/forestry/loot_tables/chests/nether_bridge.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/nether_bridge/apiculture.json delete mode 100644 src/main/resources/assets/forestry/loot_tables/chests/simple_dungeon.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/simple_dungeon/apiculture.json delete mode 100644 src/main/resources/assets/forestry/loot_tables/chests/spawn_bonus_chest.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/spawn_bonus_chest/apiculture.json delete mode 100644 src/main/resources/assets/forestry/loot_tables/chests/stronghold_corridor.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/stronghold_corridor/apiculture.json delete mode 100644 src/main/resources/assets/forestry/loot_tables/chests/stronghold_crossing.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/stronghold_crossing/apiculture.json delete mode 100644 src/main/resources/assets/forestry/loot_tables/chests/stronghold_library.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/stronghold_library/apiculture.json delete mode 100644 src/main/resources/assets/forestry/loot_tables/chests/village_naturalist.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/village_naturalist/apiculture.json create mode 100644 src/main/resources/assets/forestry/loot_tables/chests/village_naturalist/arboriculture.json diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index 1b634690a..27ee3c7d6 100755 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -134,7 +134,7 @@ import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; -@ForestryPlugin(pluginID = ForestryPluginUids.APICULTURE, name = "Apiculture", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.apiculture.description") +@ForestryPlugin(pluginID = ForestryPluginUids.APICULTURE, name = "Apiculture", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.apiculture.description", lootTable = "apiculture") public class PluginApiculture extends BlankForestryPlugin { private static final String CONFIG_CATEGORY = "apiculture"; private static float secondPrincessChance = 0; diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index 3d83185c3..b84c37d7d 100755 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -113,7 +113,7 @@ import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; -@ForestryPlugin(pluginID = ForestryPluginUids.ARBORICULTURE, name = "Arboriculture", author = "Binnie & SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.arboriculture.description") +@ForestryPlugin(pluginID = ForestryPluginUids.ARBORICULTURE, name = "Arboriculture", author = "Binnie & SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.arboriculture.description", lootTable = "arboriculture") public class PluginArboriculture extends BlankForestryPlugin { @SuppressWarnings("NullableProblems") diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index 375970bd5..2f9a91dea 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -12,6 +12,7 @@ package forestry.core; import java.net.URL; import java.util.Collection; +import java.util.Set; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; @@ -120,15 +121,19 @@ public class EventHandlerCore { return; } - ResourceLocation resourceLocation = new ResourceLocation(Constants.MOD_ID, event.getName().getResourcePath()); - URL url = EventHandlerCore.class.getResource("/assets/" + resourceLocation.getResourceDomain() + "/loot_tables/" + resourceLocation.getResourcePath() + ".json"); - if (url != null) { - LootTable forestryChestAdditions = event.getLootTableManager().getLootTableFromLocation(resourceLocation); - if (forestryChestAdditions != LootTable.EMPTY_LOOT_TABLE) { - for (String poolName : PluginManager.getLootPoolNames()) { - LootPool pool = forestryChestAdditions.getPool(poolName); - if (pool != null) { - event.getTable().addPool(pool); + Set lootPoolNames = PluginManager.getLootPoolNames(); + + for (String lootTableFile : PluginManager.getLootTableFiles()) { + ResourceLocation resourceLocation = new ResourceLocation(Constants.MOD_ID, event.getName().getResourcePath() + "/" + lootTableFile); + URL url = EventHandlerCore.class.getResource("/assets/" + resourceLocation.getResourceDomain() + "/loot_tables/" + resourceLocation.getResourcePath() + ".json"); + if (url != null) { + LootTable forestryChestAdditions = event.getLootTableManager().getLootTableFromLocation(resourceLocation); + if (forestryChestAdditions != LootTable.EMPTY_LOOT_TABLE) { + for (String poolName : lootPoolNames) { + LootPool pool = forestryChestAdditions.getPool(poolName); + if (pool != null) { + event.getTable().addPool(pool); + } } } } diff --git a/src/main/java/forestry/factory/PluginFactory.java b/src/main/java/forestry/factory/PluginFactory.java index 5701ba4a1..ad638f5b2 100755 --- a/src/main/java/forestry/factory/PluginFactory.java +++ b/src/main/java/forestry/factory/PluginFactory.java @@ -75,7 +75,7 @@ import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; import forestry.storage.PluginStorage; -@ForestryPlugin(pluginID = ForestryPluginUids.FACTORY, name = "Factory", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.factory.description") +@ForestryPlugin(pluginID = ForestryPluginUids.FACTORY, name = "Factory", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.factory.description", lootTable = "factory") public class PluginFactory extends BlankForestryPlugin { @Nullable private static BlockRegistryFactory blocks; diff --git a/src/main/java/forestry/plugins/ForestryPlugin.java b/src/main/java/forestry/plugins/ForestryPlugin.java index 7929e9b35..86adb3c54 100644 --- a/src/main/java/forestry/plugins/ForestryPlugin.java +++ b/src/main/java/forestry/plugins/ForestryPlugin.java @@ -51,4 +51,9 @@ public @interface ForestryPlugin { */ String help() default ""; + /** + * @return The name of the loot table file, if any. + */ + String lootTable() default ""; + } diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index 88b8809fd..0a98835a6 100755 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -34,6 +34,7 @@ import net.minecraft.world.gen.IChunkGenerator; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; + import net.minecraftforge.fml.common.discovery.ASMDataTable; import net.minecraftforge.fml.common.event.FMLInterModComms; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; @@ -326,6 +327,18 @@ public class PluginManager { return lootPoolNames; } + public static Set getLootTableFiles() { + Set lootTableNames = new HashSet<>(); + for (IForestryPlugin plugin : loadedPlugins) { + ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class); + String lootTableFolder = info.lootTable(); + if (!lootTableFolder.isEmpty()) { + lootTableNames.add(lootTableFolder); + } + } + return lootTableNames; + } + private static boolean isEnabled(Configuration config, IForestryPlugin plugin) { ForestryPlugin info = plugin.getClass().getAnnotation(ForestryPlugin.class); diff --git a/src/main/java/forestry/storage/PluginStorage.java b/src/main/java/forestry/storage/PluginStorage.java index 30beb616b..bec35b87d 100644 --- a/src/main/java/forestry/storage/PluginStorage.java +++ b/src/main/java/forestry/storage/PluginStorage.java @@ -10,23 +10,39 @@ ******************************************************************************/ package forestry.storage; +import com.google.common.base.Preconditions; + import javax.annotation.Nullable; import java.awt.Color; import java.io.File; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.Predicate; -import com.google.common.base.Preconditions; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.config.Property; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.Forestry; import forestry.api.core.ForestryAPI; import forestry.api.recipes.RecipeManagers; @@ -57,26 +73,8 @@ import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; import forestry.storage.items.ItemRegistryStorage; import forestry.storage.proxy.ProxyStorage; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Property; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.OreDictionary; - -@ForestryPlugin(pluginID = ForestryPluginUids.STORAGE, name = "Storage", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.storage.description") +@ForestryPlugin(pluginID = ForestryPluginUids.STORAGE, name = "Storage", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.storage.description", lootTable = "storage") public class PluginStorage extends BlankForestryPlugin { @SuppressWarnings("NullableProblems") diff --git a/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft.json b/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft.json deleted file mode 100644 index 38f3cb479..000000000 --- a/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "pools": [ - { - "name": "forestry_factory_items", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "forestry:broken_bronze_shovel", - "weight": 10 - }, - { - "type": "item", - "name": "forestry:broken_bronze_pickaxe", - "weight": 30 - }, - { - "type": "item", - "name": "forestry:kit_pickaxe", - "weight": 10 - }, - { - "type": "item", - "name": "forestry:kit_shovel", - "weight": 5 - }, - { - "type": "empty", - "weight": 50 - } - ] - }, - { - "name": "forestry_storage_items", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "forestry:miner_bag", - "weight": 1 - }, - { - "type": "empty", - "weight": 20 - } - ] - }, - { - "name": "forestry_apiculture_bees", - "rolls": 1, - "entries": [ - { - "type": "item", - "entryName": "bee_steadfast_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesSteadfast" - } - ], - "weight": 1 - }, - { - "type": "empty", - "weight": 9 - } - ] - } - ] -} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft/apiculture.json b/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft/apiculture.json new file mode 100644 index 000000000..094586e7b --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft/apiculture.json @@ -0,0 +1,26 @@ +{ + "pools": [ + { + "name": "forestry_apiculture_bees", + "rolls": 1, + "entries": [ + { + "type": "item", + "entryName": "bee_steadfast_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesSteadfast" + } + ], + "weight": 1 + }, + { + "type": "empty", + "weight": 9 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft/factory.json b/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft/factory.json new file mode 100644 index 000000000..209f4e520 --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft/factory.json @@ -0,0 +1,34 @@ +{ + "pools": [ + { + "name": "forestry_factory_items", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "forestry:broken_bronze_shovel", + "weight": 10 + }, + { + "type": "item", + "name": "forestry:broken_bronze_pickaxe", + "weight": 30 + }, + { + "type": "item", + "name": "forestry:kit_pickaxe", + "weight": 10 + }, + { + "type": "item", + "name": "forestry:kit_shovel", + "weight": 5 + }, + { + "type": "empty", + "weight": 50 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft/storage.json b/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft/storage.json new file mode 100644 index 000000000..3abd9c6a7 --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft/storage.json @@ -0,0 +1,19 @@ +{ + "pools": [ + { + "name": "forestry_storage_items", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "forestry:miner_bag", + "weight": 1 + }, + { + "type": "empty", + "weight": 20 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid.json b/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid.json deleted file mode 100644 index cc526f123..000000000 --- a/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "pools": [ - { - "name": "forestry_arboriculture_items", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "forestry:sapling", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.treeAcacia" - } - ], - "weight": 1 - }, - { - "type": "empty", - "weight": 3 - } - ] - }, - { - "name": "forestry_factory_items", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "forestry:ash", - "functions": [ - { - "function": "set_count", - "count": { - "min": 7, - "max": 12 - } - } - ], - "weight": 1 - }, - { - "type": "empty", - "weight": 1 - } - ] - }, - { - "name": "forestry_apiculture_bees", - "rolls": 1, - "entries": [ - { - "type": "item", - "entryName": "bee_steadfast_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesSteadfast" - } - ], - "weight": 1 - }, - { - "type": "item", - "entryName": "bee_modest_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesModest" - }, - { - "function": "set_count", - "count": { - "min": 1, - "max": 3 - } - } - ], - "weight": 3 - }, - { - "type": "empty", - "weight": 6 - } - ] - } - ] -} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid/apiculture.json b/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid/apiculture.json new file mode 100644 index 000000000..5c14f7545 --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid/apiculture.json @@ -0,0 +1,45 @@ +{ + "pools": [ + { + "name": "forestry_apiculture_bees", + "rolls": 1, + "entries": [ + { + "type": "item", + "entryName": "bee_steadfast_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesSteadfast" + } + ], + "weight": 1 + }, + { + "type": "item", + "entryName": "bee_modest_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesModest" + }, + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ], + "weight": 3 + }, + { + "type": "empty", + "weight": 6 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid/arboriculture.json b/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid/arboriculture.json new file mode 100644 index 000000000..f7db8d195 --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid/arboriculture.json @@ -0,0 +1,25 @@ +{ + "pools": [ + { + "name": "forestry_arboriculture_items", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "forestry:sapling", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.treeAcacia" + } + ], + "weight": 1 + }, + { + "type": "empty", + "weight": 3 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid/factory.json b/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid/factory.json new file mode 100644 index 000000000..b0c47ba33 --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid/factory.json @@ -0,0 +1,28 @@ +{ + "pools": [ + { + "name": "forestry_factory_items", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "forestry:ash", + "functions": [ + { + "function": "set_count", + "count": { + "min": 7, + "max": 12 + } + } + ], + "weight": 1 + }, + { + "type": "empty", + "weight": 1 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure.json b/src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure.json deleted file mode 100644 index 252c52737..000000000 --- a/src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "pools": [ - { - "name": "forestry_apiculture_items", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "forestry:ambrosia", - "functions": [ - { - "function": "set_count", - "count": { - "min": 2, - "max": 5 - } - } - ], - "weight": 1 - }, - { - "type": "empty", - "weight": 3 - } - ] - }, - { - "name": "forestry_apiculture_bees", - "rolls": 2, - "entries": [ - { - "type": "item", - "entryName": "bee_steadfast_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesSteadfast" - }, - { - "function": "set_count", - "count": { - "min": 1, - "max": 2 - } - } - ], - "weight": 20 - }, - { - "type": "item", - "entryName": "bee_steadfast_princess", - "name": "forestry:bee_princess_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesSteadfast" - } - ], - "weight": 1 - }, - { - "type": "item", - "entryName": "bee_ended_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesEnded" - }, - { - "function": "set_count", - "count": { - "min": 1, - "max": 3 - } - } - ], - "weight": 20 - }, - { - "type": "empty", - "weight": 60 - } - ] - }, - { - "name": "forestry_arboriculture_items", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "forestry:grafter_proven", - "weight": 1 - }, - { - "type": "empty", - "weight": 1 - } - ] - } - ] -} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure/apiculture.json b/src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure/apiculture.json new file mode 100644 index 000000000..8542f24d6 --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure/apiculture.json @@ -0,0 +1,88 @@ +{ + "pools": [ + { + "name": "forestry_apiculture_items", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "forestry:ambrosia", + "functions": [ + { + "function": "set_count", + "count": { + "min": 2, + "max": 5 + } + } + ], + "weight": 1 + }, + { + "type": "empty", + "weight": 3 + } + ] + }, + { + "name": "forestry_apiculture_bees", + "rolls": 2, + "entries": [ + { + "type": "item", + "entryName": "bee_steadfast_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesSteadfast" + }, + { + "function": "set_count", + "count": { + "min": 1, + "max": 2 + } + } + ], + "weight": 20 + }, + { + "type": "item", + "entryName": "bee_steadfast_princess", + "name": "forestry:bee_princess_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesSteadfast" + } + ], + "weight": 1 + }, + { + "type": "item", + "entryName": "bee_ended_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesEnded" + }, + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ], + "weight": 20 + }, + { + "type": "empty", + "weight": 60 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure/arboriculture.json b/src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure/arboriculture.json new file mode 100644 index 000000000..a2f536af3 --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/end_city_treasure/arboriculture.json @@ -0,0 +1,19 @@ +{ + "pools": [ + { + "name": "forestry_arboriculture_items", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "forestry:grafter_proven", + "weight": 1 + }, + { + "type": "empty", + "weight": 1 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/igloo_chest.json b/src/main/resources/assets/forestry/loot_tables/chests/igloo_chest.json deleted file mode 100644 index 9ac0b2484..000000000 --- a/src/main/resources/assets/forestry/loot_tables/chests/igloo_chest.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "pools": [ - { - "name": "forestry_apiculture_bees", - "rolls": 1, - "entries": [ - { - "type": "item", - "entryName": "bee_steadfast_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesSteadfast" - } - ], - "weight": 1 - }, - { - "type": "item", - "entryName": "bee_wintry_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesWintry" - }, - { - "function": "set_count", - "count": { - "min": 1, - "max": 3 - } - } - ], - "weight": 2 - }, - { - "type": "empty", - "weight": 7 - } - ] - } - ] -} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/igloo_chest/apiculture.json b/src/main/resources/assets/forestry/loot_tables/chests/igloo_chest/apiculture.json new file mode 100644 index 000000000..ed2f0f3c9 --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/igloo_chest/apiculture.json @@ -0,0 +1,45 @@ +{ + "pools": [ + { + "name": "forestry_apiculture_bees", + "rolls": 1, + "entries": [ + { + "type": "item", + "entryName": "bee_steadfast_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesSteadfast" + } + ], + "weight": 1 + }, + { + "type": "item", + "entryName": "bee_wintry_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesWintry" + }, + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ], + "weight": 2 + }, + { + "type": "empty", + "weight": 7 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple.json b/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple.json deleted file mode 100644 index 9bdd9e8d8..000000000 --- a/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "pools": [ - { - "name": "forestry_apiculture_bees", - "rolls": 1, - "entries": [ - { - "type": "item", - "entryName": "bee_steadfast_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesSteadfast" - } - ], - "weight": 1 - }, - { - "type": "item", - "entryName": "bee_tropical_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesTropical" - }, - { - "function": "set_count", - "count": { - "min": 1, - "max": 3 - } - } - ], - "weight": 3 - }, - { - "type": "empty", - "weight": 6 - } - ] - }, - { - "name": "forestry_arboriculture_items", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "forestry:sapling", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.treeSipiri" - } - ], - "weight": 1 - }, - { - "type": "empty", - "weight": 9 - } - ] - } - ] -} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple/apiculture.json b/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple/apiculture.json new file mode 100644 index 000000000..20f56cd96 --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple/apiculture.json @@ -0,0 +1,45 @@ +{ + "pools": [ + { + "name": "forestry_apiculture_bees", + "rolls": 1, + "entries": [ + { + "type": "item", + "entryName": "bee_steadfast_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesSteadfast" + } + ], + "weight": 1 + }, + { + "type": "item", + "entryName": "bee_tropical_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesTropical" + }, + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ], + "weight": 3 + }, + { + "type": "empty", + "weight": 6 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple/arboriculture.json b/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple/arboriculture.json new file mode 100644 index 000000000..f32391efd --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple/arboriculture.json @@ -0,0 +1,25 @@ +{ + "pools": [ + { + "name": "forestry_arboriculture_items", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "forestry:sapling", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.treeSipiri" + } + ], + "weight": 1 + }, + { + "type": "empty", + "weight": 9 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/nether_bridge.json b/src/main/resources/assets/forestry/loot_tables/chests/nether_bridge.json deleted file mode 100644 index 3a316d90b..000000000 --- a/src/main/resources/assets/forestry/loot_tables/chests/nether_bridge.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "pools": [ - { - "name": "forestry_apiculture_bees", - "rolls": 1, - "entries": [ - { - "type": "item", - "entryName": "bee_steadfast_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesSteadfast" - } - ], - "weight": 1 - }, - { - "type": "item", - "entryName": "bee_sinister_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesSinister" - } - ], - "weight": 1 - }, - { - "type": "empty", - "weight": 8 - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/loot_tables/chests/nether_bridge/apiculture.json b/src/main/resources/assets/forestry/loot_tables/chests/nether_bridge/apiculture.json new file mode 100644 index 000000000..5da7b97ae --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/nether_bridge/apiculture.json @@ -0,0 +1,38 @@ +{ + "pools": [ + { + "name": "forestry_apiculture_bees", + "rolls": 1, + "entries": [ + { + "type": "item", + "entryName": "bee_steadfast_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesSteadfast" + } + ], + "weight": 1 + }, + { + "type": "item", + "entryName": "bee_sinister_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesSinister" + } + ], + "weight": 1 + }, + { + "type": "empty", + "weight": 8 + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/forestry/loot_tables/chests/simple_dungeon.json b/src/main/resources/assets/forestry/loot_tables/chests/simple_dungeon.json deleted file mode 100644 index 05199c913..000000000 --- a/src/main/resources/assets/forestry/loot_tables/chests/simple_dungeon.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "pools": [ - { - "name": "forestry_apiculture_bees", - "rolls": 1, - "entries": [ - { - "type": "item", - "entryName": "bee_steadfast_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesSteadfast" - } - ], - "weight": 1 - }, - { - "type": "empty", - "weight": 9 - } - ] - } - ] -} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/simple_dungeon/apiculture.json b/src/main/resources/assets/forestry/loot_tables/chests/simple_dungeon/apiculture.json new file mode 100644 index 000000000..094586e7b --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/simple_dungeon/apiculture.json @@ -0,0 +1,26 @@ +{ + "pools": [ + { + "name": "forestry_apiculture_bees", + "rolls": 1, + "entries": [ + { + "type": "item", + "entryName": "bee_steadfast_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesSteadfast" + } + ], + "weight": 1 + }, + { + "type": "empty", + "weight": 9 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/spawn_bonus_chest.json b/src/main/resources/assets/forestry/loot_tables/chests/spawn_bonus_chest.json deleted file mode 100644 index 3d68c2bc0..000000000 --- a/src/main/resources/assets/forestry/loot_tables/chests/spawn_bonus_chest.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "pools": [ - { - "name": "forestry_apiculture_bees", - "rolls": 1, - "entries": [ - { - "type": "item", - "name": "forestry:scoop", - "weight": 1 - } - ] - } - ] -} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/spawn_bonus_chest/apiculture.json b/src/main/resources/assets/forestry/loot_tables/chests/spawn_bonus_chest/apiculture.json new file mode 100644 index 000000000..3356d8c04 --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/spawn_bonus_chest/apiculture.json @@ -0,0 +1,15 @@ +{ + "pools": [ + { + "name": "forestry_apiculture_bees", + "rolls": 1, + "entries": [ + { + "type": "item", + "name": "forestry:scoop", + "weight": 1 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_corridor.json b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_corridor.json deleted file mode 100644 index 05199c913..000000000 --- a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_corridor.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "pools": [ - { - "name": "forestry_apiculture_bees", - "rolls": 1, - "entries": [ - { - "type": "item", - "entryName": "bee_steadfast_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesSteadfast" - } - ], - "weight": 1 - }, - { - "type": "empty", - "weight": 9 - } - ] - } - ] -} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_corridor/apiculture.json b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_corridor/apiculture.json new file mode 100644 index 000000000..094586e7b --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_corridor/apiculture.json @@ -0,0 +1,26 @@ +{ + "pools": [ + { + "name": "forestry_apiculture_bees", + "rolls": 1, + "entries": [ + { + "type": "item", + "entryName": "bee_steadfast_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesSteadfast" + } + ], + "weight": 1 + }, + { + "type": "empty", + "weight": 9 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_crossing.json b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_crossing.json deleted file mode 100644 index 05199c913..000000000 --- a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_crossing.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "pools": [ - { - "name": "forestry_apiculture_bees", - "rolls": 1, - "entries": [ - { - "type": "item", - "entryName": "bee_steadfast_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesSteadfast" - } - ], - "weight": 1 - }, - { - "type": "empty", - "weight": 9 - } - ] - } - ] -} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_crossing/apiculture.json b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_crossing/apiculture.json new file mode 100644 index 000000000..094586e7b --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_crossing/apiculture.json @@ -0,0 +1,26 @@ +{ + "pools": [ + { + "name": "forestry_apiculture_bees", + "rolls": 1, + "entries": [ + { + "type": "item", + "entryName": "bee_steadfast_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesSteadfast" + } + ], + "weight": 1 + }, + { + "type": "empty", + "weight": 9 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_library.json b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_library.json deleted file mode 100644 index a6b234f79..000000000 --- a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_library.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "pools": [ - { - "name": "forestry_apiculture_bees", - "rolls": 1, - "entries": [ - { - "type": "item", - "entryName": "bee_steadfast_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesSteadfast" - } - ], - "weight": 1 - }, - { - "type": "item", - "entryName": "bee_monastic_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesMonastic" - } - ], - "weight": 6 - }, - { - "type": "empty", - "weight": 3 - } - ] - } - ] -} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_library/apiculture.json b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_library/apiculture.json new file mode 100644 index 000000000..892331318 --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_library/apiculture.json @@ -0,0 +1,38 @@ +{ + "pools": [ + { + "name": "forestry_apiculture_bees", + "rolls": 1, + "entries": [ + { + "type": "item", + "entryName": "bee_steadfast_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesSteadfast" + } + ], + "weight": 1 + }, + { + "type": "item", + "entryName": "bee_monastic_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesMonastic" + } + ], + "weight": 6 + }, + { + "type": "empty", + "weight": 3 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist.json b/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist.json deleted file mode 100644 index 6effd0738..000000000 --- a/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist.json +++ /dev/null @@ -1,194 +0,0 @@ -{ - "pools": [ - { - "name": "forestry_apiculture_items", - "rolls": 4, - "entries": [ - { - "type": "item", - "name": "forestry:candle", - "functions": [ - { - "function": "set_count", - "count": { - "min": 7, - "max": 12 - } - } - ], - "weight": 10 - }, - { - "type": "item", - "name": "forestry:bee_combs", - "functions": [ - { - "function": "set_count", - "count": { - "min": 1, - "max": 4 - } - } - ], - "weight": 20 - }, - { - "type": "item", - "name": "forestry:scoop", - "weight": 5 - }, - { - "type": "item", - "name": "forestry:smoker", - "weight": 1 - } - ] - }, - { - "name": "forestry_apiculture_bees", - "rolls": 3, - "entries": [ - { - "type": "item", - "entryName": "bee_forest_princess", - "name": "forestry:bee_princess_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesForest" - } - ], - "weight": 6 - }, - { - "type": "item", - "entryName": "bee_common_drone", - "name": "forestry:bee_drone_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesCommon" - } - ], - "weight": 6 - }, - { - "type": "item", - "entryName": "bee_meadows_princess", - "name": "forestry:bee_princess_ge", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.speciesMeadows" - } - ], - "weight": 6 - }, - { - "type": "empty", - "weight": 3 - } - ] - }, - { - "name": "forestry_arboriculture_items", - "rolls": 3, - "entries": [ - { - "type": "item", - "name": "forestry:grafter", - "weight": 1 - }, - { - "type": "item", - "entryName": "sapling_lime", - "name": "forestry:sapling", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.treeLime" - }, - { - "function": "set_count", - "count": { - "min": 1, - "max": 3 - } - } - ], - "weight": 1 - }, - { - "type": "item", - "entryName": "sapling_cherry", - "name": "forestry:sapling", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.treeCherry" - }, - { - "function": "set_count", - "count": { - "min": 1, - "max": 3 - } - } - ], - "weight": 1 - }, - { - "type": "item", - "entryName": "sapling_larch", - "name": "forestry:sapling", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.treeLarch" - }, - { - "function": "set_count", - "count": { - "min": 1, - "max": 3 - } - } - ], - "weight": 1 - }, - { - "type": "item", - "entryName": "sapling_teak", - "name": "forestry:sapling", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.treeTeak" - }, - { - "function": "set_count", - "count": 1 - } - ], - "weight": 1 - }, - { - "type": "item", - "entryName": "sapling_padauk", - "name": "forestry:sapling", - "functions": [ - { - "function": "set_species_nbt", - "speciesUid": "forestry.treePadauk" - }, - { - "function": "set_count", - "count": 1 - } - ], - "weight": 1 - } - ] - } - ] -} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist/apiculture.json b/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist/apiculture.json new file mode 100644 index 000000000..001a57b54 --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist/apiculture.json @@ -0,0 +1,94 @@ +{ + "pools": [ + { + "name": "forestry_apiculture_items", + "rolls": 4, + "entries": [ + { + "type": "item", + "name": "forestry:candle", + "functions": [ + { + "function": "set_count", + "count": { + "min": 7, + "max": 12 + } + } + ], + "weight": 10 + }, + { + "type": "item", + "name": "forestry:bee_combs", + "functions": [ + { + "function": "set_count", + "count": { + "min": 1, + "max": 4 + } + } + ], + "weight": 20 + }, + { + "type": "item", + "name": "forestry:scoop", + "weight": 5 + }, + { + "type": "item", + "name": "forestry:smoker", + "weight": 1 + } + ] + }, + { + "name": "forestry_apiculture_bees", + "rolls": 3, + "entries": [ + { + "type": "item", + "entryName": "bee_forest_princess", + "name": "forestry:bee_princess_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesForest" + } + ], + "weight": 6 + }, + { + "type": "item", + "entryName": "bee_common_drone", + "name": "forestry:bee_drone_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesCommon" + } + ], + "weight": 6 + }, + { + "type": "item", + "entryName": "bee_meadows_princess", + "name": "forestry:bee_princess_ge", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.speciesMeadows" + } + ], + "weight": 6 + }, + { + "type": "empty", + "weight": 3 + } + ] + } + ] +} diff --git a/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist/arboriculture.json b/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist/arboriculture.json new file mode 100644 index 000000000..296455dc7 --- /dev/null +++ b/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist/arboriculture.json @@ -0,0 +1,104 @@ +{ + "pools": [ + { + "name": "forestry_arboriculture_items", + "rolls": 3, + "entries": [ + { + "type": "item", + "name": "forestry:grafter", + "weight": 1 + }, + { + "type": "item", + "entryName": "sapling_lime", + "name": "forestry:sapling", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.treeLime" + }, + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ], + "weight": 1 + }, + { + "type": "item", + "entryName": "sapling_cherry", + "name": "forestry:sapling", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.treeCherry" + }, + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ], + "weight": 1 + }, + { + "type": "item", + "entryName": "sapling_larch", + "name": "forestry:sapling", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.treeLarch" + }, + { + "function": "set_count", + "count": { + "min": 1, + "max": 3 + } + } + ], + "weight": 1 + }, + { + "type": "item", + "entryName": "sapling_teak", + "name": "forestry:sapling", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.treeTeak" + }, + { + "function": "set_count", + "count": 1 + } + ], + "weight": 1 + }, + { + "type": "item", + "entryName": "sapling_padauk", + "name": "forestry:sapling", + "functions": [ + { + "function": "set_species_nbt", + "speciesUid": "forestry.treePadauk" + }, + { + "function": "set_count", + "count": 1 + } + ], + "weight": 1 + } + ] + } + ] +}