Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-19 06:32:03 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50 from Nesaak/master

Browse Source 
Use an array to store custom block id's in BlockManager for faster lo…
This commit is contained in:
TheMode 2020-09-08 15:47:12 +02:00 committed by GitHub
commit d874f26b2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/net/minestom/server/instance/block/BlockManager.java
View File

@ -1,7 +1,5 @@
package net.minestom.server.instance.block; package net.minestom.server.instance.block;
import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
import it.unimi.dsi.fastutil.shorts.Short2ObjectOpenHashMap;
import net.minestom.server.instance.block.rule.BlockPlacementRule; import net.minestom.server.instance.block.rule.BlockPlacementRule;
import java.util.HashMap; import java.util.HashMap;
@ -10,22 +8,24 @@ import java.util.Map;
public class BlockManager { public class BlockManager {
// custom block id -> custom block // custom block id -> custom block
private Short2ObjectMap<CustomBlock> customBlocksInternalId = new Short2ObjectOpenHashMap<>(); private CustomBlock[] customBlocksInternalId = new CustomBlock[Short.MAX_VALUE];
// custom block identifier -> custom block // custom block identifier -> custom block
private Map<String, CustomBlock> customBlocksId = new HashMap<>(); private Map<String, CustomBlock> customBlocksId = new HashMap<>();
// block id -> block placement rule // block id -> block placement rule
private Short2ObjectOpenHashMap<BlockPlacementRule> placementRules = new Short2ObjectOpenHashMap<>(); private BlockPlacementRule[] placementRules = new BlockPlacementRule[Short.MAX_VALUE];
/** /**
* Register a custom block * Register a custom block
* *
* @param customBlock the custom block to register * @param customBlock the custom block to register
* @throws IllegalArgumentException if {@param customBlock} block id is negative
*/ */
public void registerCustomBlock(CustomBlock customBlock) { public void registerCustomBlock(CustomBlock customBlock) {
final String identifier = customBlock.getIdentifier();
final short id = customBlock.getCustomBlockId(); final short id = customBlock.getCustomBlockId();
this.customBlocksInternalId.put(id, customBlock); if (id < 0) throw new IllegalArgumentException("Custom block ID must be > 0, got: " + id);
final String identifier = customBlock.getIdentifier();
this.customBlocksInternalId[id] = customBlock;
this.customBlocksId.put(identifier, customBlock); this.customBlocksId.put(identifier, customBlock);
} }
@ -33,9 +33,12 @@ public class BlockManager {
* Register a block placement rule * Register a block placement rule
* *
* @param blockPlacementRule the block placement rule to register * @param blockPlacementRule the block placement rule to register
* @throws IllegalArgumentException if {@param blockPlacementRule} block id is negative
*/ */
public void registerBlockPlacementRule(BlockPlacementRule blockPlacementRule) { public void registerBlockPlacementRule(BlockPlacementRule blockPlacementRule) {
this.placementRules.put(blockPlacementRule.getBlockId(), blockPlacementRule); final short id = blockPlacementRule.getBlockId();
if (id < 0) throw new IllegalArgumentException("Block ID must be > 0, got: " + id);
this.placementRules[id] = blockPlacementRule;
} }
/** /**
@ -47,7 +50,7 @@ public class BlockManager {
public BlockPlacementRule getBlockPlacementRule(short blockStateId) { public BlockPlacementRule getBlockPlacementRule(short blockStateId) {
final Block block = Block.fromStateId(blockStateId); // Convert block alternative final Block block = Block.fromStateId(blockStateId); // Convert block alternative
final short blockId = block.getBlockId(); final short blockId = block.getBlockId();
return this.placementRules.get(blockId); return this.placementRules[blockId];
} }
/** /**
@ -77,7 +80,7 @@ public class BlockManager {
* @return the {@link CustomBlock} associated with the id, null if not any * @return the {@link CustomBlock} associated with the id, null if not any
*/ */
public CustomBlock getCustomBlock(short id) { public CustomBlock getCustomBlock(short id) {
return customBlocksInternalId.get(id); return customBlocksInternalId[id];
} }
} }