From 682de71ab7415e9788ffddecf834298a936d6cac Mon Sep 17 00:00:00 2001 From: Babbaj Date: Sat, 16 May 2020 18:21:27 -0400 Subject: [PATCH 1/2] Fix #mine in forge --- src/api/java/baritone/api/utils/BlockOptionalMeta.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/api/java/baritone/api/utils/BlockOptionalMeta.java b/src/api/java/baritone/api/utils/BlockOptionalMeta.java index 887e153f4..8bac62c89 100644 --- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java +++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java @@ -159,7 +159,14 @@ public final class BlockOptionalMeta { if (lootTableLocation == LootTables.EMPTY) { return Collections.emptyList(); } else { - return getManager().getLootTableFromLocation(lootTableLocation).generate(new LootContext.Builder(null).withRandom(new Random()).withParameter(LootParameters.POSITION, BlockPos.ZERO).withParameter(LootParameters.TOOL, ItemStack.EMPTY).withNullableParameter(LootParameters.BLOCK_ENTITY, null).withParameter(LootParameters.BLOCK_STATE, block.getDefaultState()).build(LootParameterSets.BLOCK)).stream().map(ItemStack::getItem).collect(Collectors.toList()); + List items = new ArrayList<>(); + + // the other overload for generate doesnt work in forge because forge adds code that requires a non null world + getManager().getLootTableFromLocation(lootTableLocation).generate( + new LootContext.Builder(null).withRandom(new Random()).withParameter(LootParameters.POSITION, BlockPos.ZERO).withParameter(LootParameters.TOOL, ItemStack.EMPTY).withNullableParameter(LootParameters.BLOCK_ENTITY, null).withParameter(LootParameters.BLOCK_STATE, block.getDefaultState()).build(LootParameterSets.BLOCK), + stack -> items.add(stack.getItem()) + ); + return items; } }); } From 47501ab8e1504de74b8b0535ea20818904bff527 Mon Sep 17 00:00:00 2001 From: Babbaj Date: Sat, 16 May 2020 18:23:38 -0400 Subject: [PATCH 2/2] fix terrible formatting --- src/api/java/baritone/api/utils/BlockOptionalMeta.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/api/java/baritone/api/utils/BlockOptionalMeta.java b/src/api/java/baritone/api/utils/BlockOptionalMeta.java index 8bac62c89..4bedc0201 100644 --- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java +++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java @@ -163,7 +163,13 @@ public final class BlockOptionalMeta { // the other overload for generate doesnt work in forge because forge adds code that requires a non null world getManager().getLootTableFromLocation(lootTableLocation).generate( - new LootContext.Builder(null).withRandom(new Random()).withParameter(LootParameters.POSITION, BlockPos.ZERO).withParameter(LootParameters.TOOL, ItemStack.EMPTY).withNullableParameter(LootParameters.BLOCK_ENTITY, null).withParameter(LootParameters.BLOCK_STATE, block.getDefaultState()).build(LootParameterSets.BLOCK), + new LootContext.Builder(null) + .withRandom(new Random()) + .withParameter(LootParameters.POSITION, BlockPos.ZERO) + .withParameter(LootParameters.TOOL, ItemStack.EMPTY) + .withNullableParameter(LootParameters.BLOCK_ENTITY, null) + .withParameter(LootParameters.BLOCK_STATE, block.getDefaultState()) + .build(LootParameterSets.BLOCK), stack -> items.add(stack.getItem()) ); return items;