diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
index 5e15162b8ee..710c8176e1a 100644
--- a/bootstrap/bungeecord/pom.xml
+++ b/bootstrap/bungeecord/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
bootstrap-bungeecord
@@ -14,7 +14,7 @@
org.geysermc
connector
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
compile
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index d58cb2ca496..bf31f3fea77 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
geyser-parent
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
bootstrap-parent
pom
diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml
index 84086ba15c6..4ac23652941 100644
--- a/bootstrap/spigot/pom.xml
+++ b/bootstrap/spigot/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
bootstrap-spigot
@@ -21,7 +21,7 @@
org.geysermc
connector
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
compile
diff --git a/bootstrap/sponge/pom.xml b/bootstrap/sponge/pom.xml
index adeaa91de6f..72733a31135 100644
--- a/bootstrap/sponge/pom.xml
+++ b/bootstrap/sponge/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
bootstrap-sponge
@@ -14,7 +14,7 @@
org.geysermc
connector
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
compile
diff --git a/bootstrap/standalone/pom.xml b/bootstrap/standalone/pom.xml
index 6610af3b55c..2d28a753529 100644
--- a/bootstrap/standalone/pom.xml
+++ b/bootstrap/standalone/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
bootstrap-standalone
@@ -14,7 +14,7 @@
org.geysermc
connector
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
compile
diff --git a/bootstrap/velocity/pom.xml b/bootstrap/velocity/pom.xml
index 3b093285d0a..0190d128e87 100644
--- a/bootstrap/velocity/pom.xml
+++ b/bootstrap/velocity/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
bootstrap-parent
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
bootstrap-velocity
@@ -14,7 +14,7 @@
org.geysermc
connector
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
compile
diff --git a/common/pom.xml b/common/pom.xml
index be90f0146cd..8ddcfd9813c 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
geyser-parent
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
common
diff --git a/connector/pom.xml b/connector/pom.xml
index d91b27d4799..30fec659cbd 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -6,7 +6,7 @@
org.geysermc
geyser-parent
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
connector
@@ -21,7 +21,7 @@
org.geysermc
common
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
compile
@@ -155,9 +155,6 @@
com.github.GeyserMC
MCProtocolLib
e316986
-
-
-
compile
diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
index 90b5e59298d..73dad722095 100644
--- a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
+++ b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
@@ -58,14 +58,15 @@
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
import com.nukkitx.protocol.bedrock.packet.*;
-import com.nukkitx.protocol.bedrock.v431.Bedrock_v431;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntList;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectMaps;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.*;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.ObjectIterator;
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NonNull;
@@ -806,7 +807,7 @@ public void packetReceived(PacketReceivedEvent event) {
@Override
public void packetError(PacketErrorEvent event) {
connector.getLogger().warning(LanguageUtils.getLocaleStringLog("geyser.network.downstream_error", event.getCause().getMessage()));
- //if (connector.getConfig().isDebugMode()) //TODO don't leave this uncommented
+ if (connector.getConfig().isDebugMode())
event.getCause().printStackTrace();
event.setSuppress(true);
}
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java
index 43bd9d9343d..ed7818924fd 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java
@@ -270,10 +270,7 @@ public BlockTranslator(String paletteFile) {
NbtMap blockTag = buildBedrockState(entry.getValue());
int bedrockRuntimeId = blockStateOrderedMap.getOrDefault(blockTag, -1);
if (bedrockRuntimeId == -1) {
- //TODO REMOVE THIS COMMENT BEFORE RELEASE!!!! :)
- //throw new RuntimeException("Unable to find " + javaId + " Bedrock runtime ID! Built compound tag: \n" + blockTag);
- bedrockRuntimeId = 0;
- GeyserConnector.getInstance().getLogger().warning("Unable to find " + javaId + " Bedrock runtime ID!");
+ throw new RuntimeException("Unable to find " + javaId + " Bedrock runtime ID! Built compound tag: \n" + blockTag);
}
switch (javaId) {
diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings
index af2d3a85b04..cc93558bde0 160000
--- a/connector/src/main/resources/mappings
+++ b/connector/src/main/resources/mappings
@@ -1 +1 @@
-Subproject commit af2d3a85b04517ba76e72d48eef5bb3b837ec5bb
+Subproject commit cc93558bde00d6f081b8339ef53cf157d242d3f1
diff --git a/pom.xml b/pom.xml
index 6146d9862ab..5b3e5a5f221 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
4.0.0
org.geysermc
geyser-parent
- 1.3.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
pom
Geyser
Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers.