From a16a5aa98443928eccdc51bba8ec633686878f06 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 21 Mar 2019 16:20:44 -0500 Subject: [PATCH] Fix loot tables, and a fel pumpkin crash --- .../java/vazkii/botania/common/block/BlockFelPumpkin.java | 2 +- .../resources/data/botania/loot_tables/gaia_guardian.json | 2 +- .../data/botania/loot_tables/gaia_guardian_2.json | 8 ++++---- .../botania/loot_tables/inject/abandoned_mineshaft.json | 2 +- .../data/botania/loot_tables/inject/desert_pyramid.json | 2 +- .../data/botania/loot_tables/inject/jungle_temple.json | 2 +- .../data/botania/loot_tables/inject/simple_dungeon.json | 4 ++-- .../botania/loot_tables/inject/stronghold_corridor.json | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 2de752e7a..f528961b1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -76,7 +76,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { @Override public IBlockState getStateForPlacement(BlockItemUseContext context) { - return getDefaultState().with(BlockStateProperties.HORIZONTAL_FACING, context.getNearestLookingDirection().getOpposite()); + return getDefaultState().with(BlockStateProperties.HORIZONTAL_FACING, context.getPlacementHorizontalFacing().getOpposite()); } @Override diff --git a/src/main/resources/data/botania/loot_tables/gaia_guardian.json b/src/main/resources/data/botania/loot_tables/gaia_guardian.json index ef8b126d7..3dde68b0e 100644 --- a/src/main/resources/data/botania/loot_tables/gaia_guardian.json +++ b/src/main/resources/data/botania/loot_tables/gaia_guardian.json @@ -24,7 +24,7 @@ { "condition": "random_chance", "chance": 0.2 } ], "rolls": 1, - "entries": [{ "type": "item", "name": "botania:recordGaia1" }] + "entries": [{ "type": "item", "name": "botania:record_gaia_1" }] } ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/loot_tables/gaia_guardian_2.json b/src/main/resources/data/botania/loot_tables/gaia_guardian_2.json index 3d082de00..78c452b21 100644 --- a/src/main/resources/data/botania/loot_tables/gaia_guardian_2.json +++ b/src/main/resources/data/botania/loot_tables/gaia_guardian_2.json @@ -83,7 +83,7 @@ "rolls": 1, "entries": [{ "type": "item", - "name": "botania:overgrowthSeed", + "name": "botania:overgrowth_seed", "functions": [{ "function": "set_count", "count": { "min": 1, "max": 3 } }] }] }, @@ -256,17 +256,17 @@ { "weight": 14, "type": "item", - "name": "botania:recordGaia2" + "name": "botania:record_gaia_2" }, { "weight": 15, "type": "item", - "name": "minecraft:record_13" + "name": "minecraft:music_disc_13" }, { "weight": 15, "type": "item", - "name": "minecraft:record_wait" + "name": "minecraft:music_disc_wait" } ] }, diff --git a/src/main/resources/data/botania/loot_tables/inject/abandoned_mineshaft.json b/src/main/resources/data/botania/loot_tables/inject/abandoned_mineshaft.json index debe46e00..3e873181c 100644 --- a/src/main/resources/data/botania/loot_tables/inject/abandoned_mineshaft.json +++ b/src/main/resources/data/botania/loot_tables/inject/abandoned_mineshaft.json @@ -11,7 +11,7 @@ }, { "type": "item", - "name": "botania:overgrowthSeed", + "name": "botania:overgrowth_seed", "weight": 5 }, { diff --git a/src/main/resources/data/botania/loot_tables/inject/desert_pyramid.json b/src/main/resources/data/botania/loot_tables/inject/desert_pyramid.json index 7b451c202..f99647062 100644 --- a/src/main/resources/data/botania/loot_tables/inject/desert_pyramid.json +++ b/src/main/resources/data/botania/loot_tables/inject/desert_pyramid.json @@ -11,7 +11,7 @@ }, { "type": "item", - "name": "botania:overgrowthSeed", + "name": "botania:overgrowth_seed", "weight": 5 }, { diff --git a/src/main/resources/data/botania/loot_tables/inject/jungle_temple.json b/src/main/resources/data/botania/loot_tables/inject/jungle_temple.json index e7aab0b86..84101b18c 100644 --- a/src/main/resources/data/botania/loot_tables/inject/jungle_temple.json +++ b/src/main/resources/data/botania/loot_tables/inject/jungle_temple.json @@ -11,7 +11,7 @@ }, { "type": "item", - "name": "botania:overgrowthSeed", + "name": "botania:overgrowth_seed", "weight": 5 }, { diff --git a/src/main/resources/data/botania/loot_tables/inject/simple_dungeon.json b/src/main/resources/data/botania/loot_tables/inject/simple_dungeon.json index 9092d542c..36cde59d1 100644 --- a/src/main/resources/data/botania/loot_tables/inject/simple_dungeon.json +++ b/src/main/resources/data/botania/loot_tables/inject/simple_dungeon.json @@ -17,7 +17,7 @@ }, { "type": "item", - "name": "botania:manaBottle", + "name": "botania:mana_bottle", "weight": 10 }, { @@ -27,7 +27,7 @@ }, { "type": "item", - "name": "botania:overgrowthSeed", + "name": "botania:overgrowth_seed", "weight": 2 }, { diff --git a/src/main/resources/data/botania/loot_tables/inject/stronghold_corridor.json b/src/main/resources/data/botania/loot_tables/inject/stronghold_corridor.json index 66c310b19..e2dd4c8a4 100644 --- a/src/main/resources/data/botania/loot_tables/inject/stronghold_corridor.json +++ b/src/main/resources/data/botania/loot_tables/inject/stronghold_corridor.json @@ -17,7 +17,7 @@ }, { "type": "item", - "name": "botania:overgrowthSeed", + "name": "botania:overgrowth_seed", "weight": 5 }, {