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

bom import *

Browse Source
This commit is contained in:
Logan Darklock 2019-09-06 17:50:55 -07:00
parent 147884f76d
commit 1bb4e44b71
No known key found for this signature in database
GPG Key ID: B8C37CEDE1AC60EA
1 changed files with 20 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,35 +19,7 @@ package baritone.api.utils;
import baritone.api.accessor.IItemStack; import baritone.api.accessor.IItemStack;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import net.minecraft.block.Block; import net.minecraft.block.*;
import net.minecraft.block.BlockBanner;
import net.minecraft.block.BlockBed;
import net.minecraft.block.BlockBrewingStand;
import net.minecraft.block.BlockButton;
import net.minecraft.block.BlockChorusPlant;
import net.minecraft.block.BlockDirt;
import net.minecraft.block.BlockDoor;
import net.minecraft.block.BlockDoublePlant;
import net.minecraft.block.BlockFence;
import net.minecraft.block.BlockFire;
import net.minecraft.block.BlockGrass;
import net.minecraft.block.BlockLeaves;
import net.minecraft.block.BlockLever;
import net.minecraft.block.BlockLog;
import net.minecraft.block.BlockPane;
import net.minecraft.block.BlockQuartz;
import net.minecraft.block.BlockRailBase;
import net.minecraft.block.BlockRedstoneWire;
import net.minecraft.block.BlockSapling;
import net.minecraft.block.BlockSkull;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.BlockStairs;
import net.minecraft.block.BlockStandingSign;
import net.minecraft.block.BlockStem;
import net.minecraft.block.BlockTrapDoor;
import net.minecraft.block.BlockTripWire;
import net.minecraft.block.BlockVine;
import net.minecraft.block.BlockWall;
import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -56,12 +28,7 @@ import net.minecraft.util.ResourceLocation;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Collections; import java.util.*;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.regex.MatchResult; import java.util.regex.MatchResult;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -230,22 +197,22 @@ public final class BlockOptionalMeta {
if (normalizations.containsKey(property)) { if (normalizations.containsKey(property)) {
try { try {
newState = newState.withProperty( newState = newState.withProperty(
castToIProperty(property), castToIProperty(property),
castToIPropertyValue(property, normalizations.get(property)) castToIPropertyValue(property, normalizations.get(property))
); );
} catch (IllegalArgumentException ignored) {} } catch (IllegalArgumentException ignored) {}
} else if (normalizations.containsKey(state.getValue(property))) { } else if (normalizations.containsKey(state.getValue(property))) {
try { try {
newState = newState.withProperty( newState = newState.withProperty(
castToIProperty(property), castToIProperty(property),
castToIPropertyValue(property, normalizations.get(state.getValue(property))) castToIPropertyValue(property, normalizations.get(state.getValue(property)))
); );
} catch (IllegalArgumentException ignored) {} } catch (IllegalArgumentException ignored) {}
} else if (normalizations.containsKey(valueClass)) { } else if (normalizations.containsKey(valueClass)) {
try { try {
newState = newState.withProperty( newState = newState.withProperty(
castToIProperty(property), castToIProperty(property),
castToIPropertyValue(property, normalizations.get(valueClass)) castToIPropertyValue(property, normalizations.get(valueClass))
); );
} catch (IllegalArgumentException ignored) {} } catch (IllegalArgumentException ignored) {}
} }
@ -260,28 +227,28 @@ public final class BlockOptionalMeta {
private static Set<IBlockState> getStates(@Nonnull Block block, @Nullable Integer meta) { private static Set<IBlockState> getStates(@Nonnull Block block, @Nullable Integer meta) {
return block.getBlockState().getValidStates().stream() return block.getBlockState().getValidStates().stream()
.filter(blockstate -> meta == null || stateMeta(blockstate) == meta) .filter(blockstate -> meta == null || stateMeta(blockstate) == meta)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
} }
private static ImmutableSet<Integer> getStateHashes(Set<IBlockState> blockstates) { private static ImmutableSet<Integer> getStateHashes(Set<IBlockState> blockstates) {
return ImmutableSet.copyOf( return ImmutableSet.copyOf(
blockstates.stream() blockstates.stream()
.map(IBlockState::hashCode) .map(IBlockState::hashCode)
.toArray(Integer[]::new) .toArray(Integer[]::new)
); );
} }
private static ImmutableSet<Integer> getStackHashes(Set<IBlockState> blockstates) { private static ImmutableSet<Integer> getStackHashes(Set<IBlockState> blockstates) {
//noinspection ConstantConditions //noinspection ConstantConditions
return ImmutableSet.copyOf( return ImmutableSet.copyOf(
blockstates.stream() blockstates.stream()
.map(state -> new ItemStack( .map(state -> new ItemStack(
state.getBlock().getItemDropped(state, new Random(), 0), state.getBlock().getItemDropped(state, new Random(), 0),
state.getBlock().damageDropped(state) state.getBlock().damageDropped(state)
)) ))
.map(stack -> ((IItemStack) (Object) stack).getBaritoneHash()) .map(stack -> ((IItemStack) (Object) stack).getBaritoneHash())
.toArray(Integer[]::new) .toArray(Integer[]::new)
); );
} }