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

Don't copy block state properties every time

Browse Source
This commit is contained in:
ZacSharp
2021-03-09 12:26:47 +01:00
parent 363519db02
commit 61e0525ee8
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/java/baritone/api/schematic/SubstituteSchematic.java
View File

@ -23,6 +23,7 @@ import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -30,6 +31,7 @@ public class SubstituteSchematic extends AbstractSchematic {
private final ISchematic schematic; private final ISchematic schematic;
private final Map<Block, List<Block>> substitutions; private final Map<Block, List<Block>> substitutions;
private final Map<IBlockState, Map<Block, IBlockState>> blockStateCache = new HashMap<>();
public SubstituteSchematic(ISchematic schematic, Map<Block,List<Block>> substitutions) { public SubstituteSchematic(ISchematic schematic, Map<Block,List<Block>> substitutions) {
super(schematic.widthX(), schematic.heightY(), schematic.lengthZ()); super(schematic.widthX(), schematic.heightY(), schematic.lengthZ());
@ -67,6 +69,9 @@ public class SubstituteSchematic extends AbstractSchematic {
} }
private IBlockState withBlock(IBlockState state, Block block) { private IBlockState withBlock(IBlockState state, Block block) {
if (blockStateCache.containsKey(state) && blockStateCache.get(state).containsKey(block)) {
return blockStateCache.get(state).get(block);
}
Collection<IProperty<?>> properties = state.getPropertyKeys(); Collection<IProperty<?>> properties = state.getPropertyKeys();
IBlockState newState = block.getDefaultState(); IBlockState newState = block.getDefaultState();
for (IProperty<?> property : properties) { for (IProperty<?> property : properties) {
@ -75,6 +80,7 @@ public class SubstituteSchematic extends AbstractSchematic {
} catch (IllegalArgumentException e) { //property does not exist for target block } catch (IllegalArgumentException e) { //property does not exist for target block
} }
} }
blockStateCache.computeIfAbsent(state, s -> new HashMap<Block,IBlockState>()).put(block, newState);
return newState; return newState;
} }
private <T extends Comparable<T>> IBlockState copySingleProp(IBlockState fromState, IBlockState toState, IProperty<T> prop) { private <T extends Comparable<T>> IBlockState copySingleProp(IBlockState fromState, IBlockState toState, IProperty<T> prop) {