From 6b4d7ebcc4f1a323d5c5f9c8f7a3ef4bf6cca729 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 18 May 2016 17:19:54 -0700 Subject: [PATCH] Fix #1195 Problem loading loot tables on startup --- .../java/forestry/core/config/Constants.java | 2 +- .../loot_tables/chests/abandoned_mineshaft.json | 1 + .../loot_tables/chests/desert_pyramid.json | 2 ++ .../loot_tables/chests/end_city_treasure.json | 5 ++++- .../forestry/loot_tables/chests/igloo_chest.json | 2 ++ .../loot_tables/chests/jungle_temple.json | 2 ++ .../loot_tables/chests/nether_bridge.json | 2 ++ .../loot_tables/chests/simple_dungeon.json | 1 + .../loot_tables/chests/stronghold_corridor.json | 1 + .../loot_tables/chests/stronghold_crossing.json | 1 + .../loot_tables/chests/stronghold_library.json | 2 ++ .../loot_tables/chests/village_naturalist.json | 16 ++++++++++++---- 12 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/main/java/forestry/core/config/Constants.java b/src/main/java/forestry/core/config/Constants.java index abcf996a0..9c0bcd4f6 100644 --- a/src/main/java/forestry/core/config/Constants.java +++ b/src/main/java/forestry/core/config/Constants.java @@ -50,7 +50,7 @@ public class Constants implements IForestryConstants { public static final int ID_VILLAGER_LUMBERJACK = 81; // Village Loot Key - public static final ResourceLocation VILLAGE_NATURALIST_LOOT_KEY = new ResourceLocation(RESOURCE_ID, "village_naturalist"); + public static final ResourceLocation VILLAGE_NATURALIST_LOOT_KEY = new ResourceLocation(RESOURCE_ID, "chests/village_naturalist"); // Item Ids 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 index 557e5356b..e9623b062 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/abandoned_mineshaft.json @@ -51,6 +51,7 @@ "entries": [ { "type": "item", + "entryName": "bee_steadfast_drone", "name": "forestry:beeDroneGE", "functions": [ { 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 index 41d87fdaa..7b65c6a8e 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/desert_pyramid.json @@ -51,6 +51,7 @@ "entries": [ { "type": "item", + "entryName": "bee_steadfast_drone", "name": "forestry:beeDroneGE", "functions": [ { @@ -62,6 +63,7 @@ }, { "type": "item", + "entryName": "bee_modest_drone", "name": "forestry:beeDroneGE", "functions": [ { 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 index 37da0c493..281e9393f 100644 --- 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 @@ -30,6 +30,7 @@ "entries": [ { "type": "item", + "entryName": "bee_steadfast_drone", "name": "forestry:beeDroneGE", "functions": [ { @@ -48,6 +49,7 @@ }, { "type": "item", + "entryName": "bee_steadfast_princess", "name": "forestry:beePrincessGE", "functions": [ { @@ -59,6 +61,7 @@ }, { "type": "item", + "entryName": "bee_ended_drone", "name": "forestry:beeDroneGE", "functions": [ { @@ -95,6 +98,6 @@ "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 index 78bbc10aa..4bb631661 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/igloo_chest.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/igloo_chest.json @@ -6,6 +6,7 @@ "entries": [ { "type": "item", + "entryName": "bee_steadfast_drone", "name": "forestry:beeDroneGE", "functions": [ { @@ -17,6 +18,7 @@ }, { "type": "item", + "entryName": "bee_wintry_drone", "name": "forestry:beeDroneGE", "functions": [ { 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 index 6ef12bf22..75d440dfe 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/jungle_temple.json @@ -6,6 +6,7 @@ "entries": [ { "type": "item", + "entryName": "bee_steadfast_drone", "name": "forestry:beeDroneGE", "functions": [ { @@ -17,6 +18,7 @@ }, { "type": "item", + "entryName": "bee_tropical_drone", "name": "forestry:beeDroneGE", "functions": [ { 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 index 72ef10b7a..b51f4235c 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/nether_bridge.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/nether_bridge.json @@ -6,6 +6,7 @@ "entries": [ { "type": "item", + "entryName": "bee_steadfast_drone", "name": "forestry:beeDroneGE", "functions": [ { @@ -17,6 +18,7 @@ }, { "type": "item", + "entryName": "bee_sinister_drone", "name": "forestry:beeDroneGE", "functions": [ { 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 index e646be6e6..6c964bd94 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/simple_dungeon.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/simple_dungeon.json @@ -6,6 +6,7 @@ "entries": [ { "type": "item", + "entryName": "bee_steadfast_drone", "name": "forestry:beeDroneGE", "functions": [ { 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 index e646be6e6..6c964bd94 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_corridor.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_corridor.json @@ -6,6 +6,7 @@ "entries": [ { "type": "item", + "entryName": "bee_steadfast_drone", "name": "forestry:beeDroneGE", "functions": [ { 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 index e646be6e6..6c964bd94 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_crossing.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_crossing.json @@ -6,6 +6,7 @@ "entries": [ { "type": "item", + "entryName": "bee_steadfast_drone", "name": "forestry:beeDroneGE", "functions": [ { 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 index 824980b06..d73a4248e 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/stronghold_library.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/stronghold_library.json @@ -6,6 +6,7 @@ "entries": [ { "type": "item", + "entryName": "bee_steadfast_drone", "name": "forestry:beeDroneGE", "functions": [ { @@ -17,6 +18,7 @@ }, { "type": "item", + "entryName": "bee_monastic_drone", "name": "forestry:beeDroneGE", "functions": [ { 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 index 298b63c7f..caef22ffc 100644 --- a/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist.json +++ b/src/main/resources/assets/forestry/loot_tables/chests/village_naturalist.json @@ -2,7 +2,7 @@ "pools": [ { "name": "forestry_apiculture_items", - "rolls": 3, + "rolls": 4, "entries": [ { "type": "item", @@ -35,7 +35,7 @@ { "type": "item", "name": "forestry:scoop", - "weight": 1 + "weight": 5 }, { "type": "item", @@ -46,10 +46,11 @@ }, { "name": "forestry_apiculture_bees", - "rolls": 2, + "rolls": 3, "entries": [ { "type": "item", + "entryName": "bee_forest_princess", "name": "forestry:beePrincessGE", "functions": [ { @@ -61,6 +62,7 @@ }, { "type": "item", + "entryName": "bee_common_drone", "name": "forestry:beeDroneGE", "functions": [ { @@ -72,6 +74,7 @@ }, { "type": "item", + "entryName": "bee_meadows_princess", "name": "forestry:beePrincessGE", "functions": [ { @@ -89,7 +92,7 @@ }, { "name": "forestry_arboriculture_items", - "rolls": 2, + "rolls": 3, "entries": [ { "type": "item", @@ -98,6 +101,7 @@ }, { "type": "item", + "entryName": "sapling_lime", "name": "forestry:sapling", "functions": [ { @@ -116,6 +120,7 @@ }, { "type": "item", + "entryName": "sapling_cherry", "name": "forestry:sapling", "functions": [ { @@ -134,6 +139,7 @@ }, { "type": "item", + "entryName": "sapling_larch", "name": "forestry:sapling", "functions": [ { @@ -152,6 +158,7 @@ }, { "type": "item", + "entryName": "sapling_teak", "name": "forestry:sapling", "functions": [ { @@ -167,6 +174,7 @@ }, { "type": "item", + "entryName": "sapling_padauk", "name": "forestry:sapling", "functions": [ {