avoid weird itemstacks chosen for ore #10470
Conversation
| @@ -689,13 +689,15 @@ private void discoverOres(final ItemStack stack) | |||
| { | |||
| if (stack.is(Tags.Items.ORES) || stack.is(ModTags.breakable_ore) || stack.is(ModTags.raw_ore)) | |||
| { | |||
| if (stack.getItem() instanceof BlockItem) | |||
| final ItemStack smeltingResult = MinecoloniesAPIProxy.getInstance().getFurnaceRecipes().getSmeltingResult(stack); | |||
| if (smeltingResult != null && !ItemStackUtils.compareItemStacksIgnoreStackSize(smeltingResult, stack)) | |||
There was a problem hiding this comment.
smeltingResult should never be null, it returns ItemStack.EMPTY on failure to find a recipe.
Other than that (which seems like a bug) this code seems equivalent to the prior version.
There was a problem hiding this comment.
The code is reversed, so it checks for a smelting recipe first, and marks it as being broken in other cases
Which solves the issue for raw redstone ore and ancient debris, but will probably give issues for regular ore blocks
There was a problem hiding this comment.
It's just a sanity check, so we don't add sth that just becomes itself here as a smeltable item. The if is still checked for both items/blocks
There was a problem hiding this comment.
The code is reversed, so it checks for a smelting recipe first, and marks it as being broken in other cases
The reversed order makes no difference, because the two checks are not exclusive and operate on different output collections.
There was a problem hiding this comment.
I missed that the else was removed, which solved the issue for regular ores
There was a problem hiding this comment.
It wasn't removed; it was never there. Hence why I'm saying that this code effectively did not change behaviour at all.
There was a problem hiding this comment.
I added an else temporarily there, but removed it afterwards. This code change just avoids blocks with buggy smelting recipes from being added as a smeltable ore.
There was a problem hiding this comment.
I happened to see the version with the temporary else
src/main/java/com/minecolonies/api/compatibility/CompatibilityManager.java
Outdated
Show resolved
Hide resolved
Closes #
Closes #
Changes proposed in this pull request
Testing
Review please