CPU/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Improved remapper performance

Browse source
This commit is contained in:
Tim203 2019-10-11 00:15:23 +02:00
parent 0e97e52337
commit c462017149
1 changed files with 19 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
connector/src/main/java/org/geysermc/connector/utils/Remapper.java
View file

@ -3,20 +3,15 @@ package org.geysermc.connector.utils;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.nukkitx.protocol.bedrock.data.ItemData; import com.nukkitx.protocol.bedrock.data.ItemData;
import org.geysermc.connector.network.translators.block.JavaBlock; import org.geysermc.connector.network.translators.block.JavaBlock;
import org.geysermc.connector.network.translators.block.type.*;
import org.geysermc.connector.network.translators.item.BedrockItem; import org.geysermc.connector.network.translators.item.BedrockItem;
import org.geysermc.connector.network.translators.item.JavaItem; import org.geysermc.connector.network.translators.item.JavaItem;
import org.geysermc.connector.network.translators.block.type.ColoredBlock;
import org.geysermc.connector.network.translators.block.type.DyeColor;
import org.geysermc.connector.network.translators.block.type.StoneType;
import org.geysermc.connector.network.translators.block.type.WoodBlock;
import org.geysermc.connector.network.translators.block.type.WoodType;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class Remapper { public class Remapper {
public static final String MINECRAFT_PREFIX = "minecraft:";
public static final String MINECRAFT = "minecraft:";
public static final Remapper ITEM_REMAPPER = new Remapper(); public static final Remapper ITEM_REMAPPER = new Remapper();
public static final Remapper BLOCK_REMAPPER = new Remapper(); public static final Remapper BLOCK_REMAPPER = new Remapper();
@ -37,7 +32,7 @@ public class Remapper {
// Colorable block remapping // Colorable block remapping
for (ColoredBlock coloredBlock : ColoredBlock.values()) { for (ColoredBlock coloredBlock : ColoredBlock.values()) {
if (!getBedrockIdentifier(coloredBlock.name()).equalsIgnoreCase(bedrockItem.getIdentifier().replace(MINECRAFT, ""))) if (!getBedrockIdentifier(coloredBlock.name()).equalsIgnoreCase(bedrockItem.getIdentifier().replace(MINECRAFT_PREFIX, "")))
continue; continue;
// The item must be colorable // The item must be colorable
@ -46,13 +41,13 @@ public class Remapper {
continue; continue;
// Add the color to the identifier // Add the color to the identifier
identifier = MINECRAFT + color.name().toLowerCase() + "_" + coloredBlock.name().toLowerCase(); identifier = MINECRAFT_PREFIX + color.name().toLowerCase() + "_" + coloredBlock.name().toLowerCase();
} }
} }
// Wood remapping // Wood remapping
for (WoodBlock woodBlock : WoodBlock.values()) { for (WoodBlock woodBlock : WoodBlock.values()) {
if (!getBedrockIdentifier(woodBlock.name()).equalsIgnoreCase(bedrockItem.getIdentifier().replace(MINECRAFT, ""))) if (!getBedrockIdentifier(woodBlock.name()).equalsIgnoreCase(bedrockItem.getIdentifier().replace(MINECRAFT_PREFIX, "")))
continue; continue;
if (isTool(bedrockItem.getIdentifier())) if (isTool(bedrockItem.getIdentifier()))
@ -65,36 +60,36 @@ public class Remapper {
if (woodType.getId() != bedrockItem.getData()) if (woodType.getId() != bedrockItem.getData())
continue; continue;
identifier = MINECRAFT + woodType.name().toLowerCase() + "_" + woodBlock.name().toLowerCase(); identifier = MINECRAFT_PREFIX + woodType.name().toLowerCase() + "_" + woodBlock.name().toLowerCase();
} }
} }
// Stone remapping // Stone remapping
if (bedrockItem.getIdentifier().replace(MINECRAFT, "").equalsIgnoreCase("stone") && !isTool(bedrockItem.getIdentifier())) { if (bedrockItem.getIdentifier().replace(MINECRAFT_PREFIX, "").equalsIgnoreCase("stone") && !isTool(bedrockItem.getIdentifier())) {
for (StoneType stoneType : StoneType.values()) { for (StoneType stoneType : StoneType.values()) {
if (stoneType.getId() != bedrockItem.getData()) if (stoneType.getId() != bedrockItem.getData())
continue; continue;
// Set the identifier to stone // Set the identifier to stone
identifier = MINECRAFT + stoneType.name().toLowerCase(); identifier = MINECRAFT_PREFIX + stoneType.name().toLowerCase();
} }
} }
// Grass remapping // Grass remapping
if (bedrockItem.getIdentifier().replace(MINECRAFT, "").equalsIgnoreCase("grass")) { if (bedrockItem.getIdentifier().replace(MINECRAFT_PREFIX, "").equalsIgnoreCase("grass")) {
identifier = MINECRAFT + "grass_block"; identifier = MINECRAFT_PREFIX + "grass_block";
} }
if (bedrockItem.getIdentifier().replace(MINECRAFT, "").equalsIgnoreCase("tallgrass")) { if (bedrockItem.getIdentifier().replace(MINECRAFT_PREFIX, "").equalsIgnoreCase("tallgrass")) {
identifier = MINECRAFT + "grass"; identifier = MINECRAFT_PREFIX + "grass";
} }
// Dirt remapping // Dirt remapping
if (bedrockItem.getIdentifier().replace(MINECRAFT, "").equalsIgnoreCase("dirt")) { if (bedrockItem.getIdentifier().replace(MINECRAFT_PREFIX, "").equalsIgnoreCase("dirt")) {
if (bedrockItem.getData() == 0) if (bedrockItem.getData() == 0)
identifier = MINECRAFT + "dirt"; identifier = MINECRAFT_PREFIX + "dirt";
else else
identifier = MINECRAFT + "coarse_dirt"; identifier = MINECRAFT_PREFIX + "coarse_dirt";
} }
for (Map.Entry<Integer, ? extends JavaItem> javaItemEntry : javaItems.entrySet()) { for (Map.Entry<Integer, ? extends JavaItem> javaItemEntry : javaItems.entrySet()) {
@ -113,34 +108,19 @@ public class Remapper {
return bedrockToJava.get(bedrockItem.getValue()); return bedrockToJava.get(bedrockItem.getValue());
} }
return null; return null;
} }
public BedrockItem convertToBedrock(ItemStack item) { public BedrockItem convertToBedrock(ItemStack item) {
for (Map.Entry<Integer, JavaItem> javaItem : Toolbox.JAVA_ITEMS.entrySet()) { JavaItem javaItem = Toolbox.JAVA_ITEMS.get(item.getId());
if (javaItem.getValue().getId() != item.getId()) return javaItem != null ? javaToBedrock.get(javaItem) : null;
continue;
return javaToBedrock.get(javaItem.getValue());
}
return null;
} }
public BedrockItem convertToBedrockB(ItemStack block) { public BedrockItem convertToBedrockB(ItemStack block) {
for (Map.Entry<Integer, JavaBlock> javaItem : Toolbox.JAVA_BLOCKS.entrySet()) { JavaBlock javaBlock = Toolbox.JAVA_BLOCKS.get(block.getId());
if (javaItem.getValue().getId() != block.getId()) return javaBlock != null ? javaToBedrock.get(javaBlock) : null;
continue;
return javaToBedrock.get(javaItem.getValue());
}
return null;
} }
private static String getBedrockIdentifier(String javaIdentifier) { private static String getBedrockIdentifier(String javaIdentifier) {
javaIdentifier = javaIdentifier.toLowerCase(); javaIdentifier = javaIdentifier.toLowerCase();
javaIdentifier = javaIdentifier.replace("terracotta", "stained_hardened_clay"); javaIdentifier = javaIdentifier.replace("terracotta", "stained_hardened_clay");