From 202e3e584cfa2db9324bb9d05bc166daa08471a0 Mon Sep 17 00:00:00 2001
From: EOT3000 <43685885+EOT3000@users.noreply.github.com>
Date: Mon, 5 Aug 2019 21:59:54 -0400
Subject: [PATCH] new remapper (:
---
api/pom.xml | 6 +
.../main/java/org/geysermc/api/Geyser.java | 30 +
.../org/geysermc/api/session/AuthData.java | 1 +
connector/pom.xml | 6 +
.../geysermc/connector/GeyserConnector.java | 19 +-
.../configuration/GeyserConfiguration.java | 3 +
.../connector/console/GeyserLogger.java | 2 -
.../geysermc/connector/metrics/Metrics.java | 546 +
.../network/ConnectorServerEventHandler.java | 1 -
.../network/session/GeyserSession.java | 2 +
.../org/geysermc/connector/utils/BiValue.java | 12 +
.../geysermc/connector/utils/FileUtils.java | 24 +-
.../geysermc/connector/utils/RemapUtils.java | 90 +
.../geysermc/connector/utils/Remapper.java | 59 +-
.../org/geysermc/connector/utils/Toolbox.java | 12 +-
.../resources/bedrock/biome_definitions.dat | Bin 0 -> 3544 bytes
.../resources/bedrock/cached_palette.json | 15917 +++++++++++++++
.../resources/bedrock/creative_items.json | 4157 ++++
.../resources/bedrock/entity_identifiers.dat | Bin 0 -> 8349 bytes
.../main/resources/{ => bedrock}/items.json | 478 +-
.../resources/bedrock/legacy_block_ids.json | 462 +
.../resources/bedrock/legacy_item_ids.json | 229 +
.../src/main/resources/bedrock_to_java.json | 409 -
.../src/main/resources/cached_pallete.json | 16557 ----------------
connector/src/main/resources/config.yml | 3 +
.../src/main/resources/java/java_blocks.json | 2030 ++
.../main/resources/{ => java}/java_items.json | 0
.../src/main/resources/java_to_bedrock.json | 1277 --
28 files changed, 23543 insertions(+), 18789 deletions(-)
create mode 100644 connector/src/main/java/org/geysermc/connector/metrics/Metrics.java
create mode 100644 connector/src/main/java/org/geysermc/connector/utils/BiValue.java
create mode 100644 connector/src/main/java/org/geysermc/connector/utils/RemapUtils.java
create mode 100644 connector/src/main/resources/bedrock/biome_definitions.dat
create mode 100644 connector/src/main/resources/bedrock/cached_palette.json
create mode 100644 connector/src/main/resources/bedrock/creative_items.json
create mode 100644 connector/src/main/resources/bedrock/entity_identifiers.dat
rename connector/src/main/resources/{ => bedrock}/items.json (83%)
create mode 100644 connector/src/main/resources/bedrock/legacy_block_ids.json
create mode 100644 connector/src/main/resources/bedrock/legacy_item_ids.json
delete mode 100644 connector/src/main/resources/bedrock_to_java.json
delete mode 100644 connector/src/main/resources/cached_pallete.json
create mode 100644 connector/src/main/resources/java/java_blocks.json
rename connector/src/main/resources/{ => java}/java_items.json (100%)
delete mode 100644 connector/src/main/resources/java_to_bedrock.json
diff --git a/api/pom.xml b/api/pom.xml
index a0cbdf87..bc497ed5 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -22,5 +22,11 @@
2.8.2
compile
+
+ org.apache.commons
+ commons-io
+ 1.3.2
+ compile
+
\ No newline at end of file
diff --git a/api/src/main/java/org/geysermc/api/Geyser.java b/api/src/main/java/org/geysermc/api/Geyser.java
index 1d1a2e87..3edfdb73 100644
--- a/api/src/main/java/org/geysermc/api/Geyser.java
+++ b/api/src/main/java/org/geysermc/api/Geyser.java
@@ -29,9 +29,15 @@ import org.geysermc.api.command.CommandMap;
import org.geysermc.api.logger.Logger;
import org.geysermc.api.plugin.PluginManager;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
import java.util.concurrent.ScheduledExecutorService;
public class Geyser {
+ private static final Map