0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't care about meta in bom if we have none

Browse Source
This commit is contained in:
Logan Darklock 2019-08-31 20:58:22 -07:00
parent bb2f4da6b6
commit cf12cbbcf4
No known key found for this signature in database
GPG Key ID: B8C37CEDE1AC60EA
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/java/baritone/api/utils/BlockOptionalMeta.java
View File

@ -104,7 +104,7 @@ public final class BlockOptionalMeta {
block = Block.REGISTRY.getObject(id); block = Block.REGISTRY.getObject(id);
meta = noMeta ? 0 : Integer.parseInt(matchResult.group(2)); meta = noMeta ? 0 : Integer.parseInt(matchResult.group(2));
blockstates = getStates(block, noMeta ? null : meta); blockstates = getStates(block, getMeta());
stateHashes = getStateHashes(blockstates); stateHashes = getStateHashes(blockstates);
stackHashes = getStackHashes(blockstates); stackHashes = getStackHashes(blockstates);
} }
@ -114,7 +114,7 @@ public final class BlockOptionalMeta {
} }
public Integer getMeta() { public Integer getMeta() {
return meta; return noMeta ? null : meta;
} }
public boolean matches(@Nonnull Block block) { public boolean matches(@Nonnull Block block) {
@ -128,12 +128,18 @@ public final class BlockOptionalMeta {
public boolean matches(ItemStack stack) { public boolean matches(ItemStack stack) {
//noinspection ConstantConditions //noinspection ConstantConditions
return stackHashes.contains(((IItemStack) (Object) stack).getBaritoneHash()); int hash = ((IItemStack) (Object) stack).getBaritoneHash();
if (noMeta) {
hash -= stack.getItemDamage();
}
return stackHashes.contains(hash);
} }
@Override @Override
public String toString() { public String toString() {
return String.format("BlockOptionalMeta{block=%s,meta=%s}", block, meta); return String.format("BlockOptionalMeta{block=%s,meta=%s}", block, getMeta());
} }
public static IBlockState blockStateFromStack(ItemStack stack) { public static IBlockState blockStateFromStack(ItemStack stack) {