20w22a

core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java

@@ -63,22 +63,28 @@ public interface ViaBackwardsPlatform {
 
         getLogger().info("Registering protocols...");
         registerProtocol(new Protocol1_9_4To1_10(), ProtocolVersion.v1_9_3, ProtocolVersion.v1_10);
+
         registerProtocol(new Protocol1_10To1_11(), ProtocolVersion.v1_10, ProtocolVersion.v1_11);
         registerProtocol(new Protocol1_11To1_11_1(), ProtocolVersion.v1_11, ProtocolVersion.v1_11_1);
+
         registerProtocol(new Protocol1_11_1To1_12(), ProtocolVersion.v1_11_1, ProtocolVersion.v1_12);
         registerProtocol(new Protocol1_12To1_12_1(), ProtocolVersion.v1_12, ProtocolVersion.v1_12_1);
         registerProtocol(new Protocol1_12_1To1_12_2(), ProtocolVersion.v1_12_1, ProtocolVersion.v1_12_2);
+
         registerProtocol(new Protocol1_12_2To1_13(), ProtocolVersion.v1_12_2, ProtocolVersion.v1_13);
         registerProtocol(new Protocol1_13To1_13_1(), ProtocolVersion.v1_13, ProtocolVersion.v1_13_1);
         registerProtocol(new Protocol1_13_1To1_13_2(), ProtocolVersion.v1_13_1, ProtocolVersion.v1_13_2);
+
         registerProtocol(new Protocol1_13_2To1_14(), ProtocolVersion.v1_13_2, ProtocolVersion.v1_14);
         registerProtocol(new Protocol1_14To1_14_1(), ProtocolVersion.v1_14, ProtocolVersion.v1_14_1);
         registerProtocol(new Protocol1_14_1To1_14_2(), ProtocolVersion.v1_14_1, ProtocolVersion.v1_14_2);
         registerProtocol(new Protocol1_14_2To1_14_3(), ProtocolVersion.v1_14_2, ProtocolVersion.v1_14_3);
         registerProtocol(new Protocol1_14_3To1_14_4(), ProtocolVersion.v1_14_3, ProtocolVersion.v1_14_4);
+
         registerProtocol(new Protocol1_14_4To1_15(), ProtocolVersion.v1_14_4, ProtocolVersion.v1_15);
         registerProtocol(new Protocol1_15To1_15_1(), ProtocolVersion.v1_15, ProtocolVersion.v1_15_1);
         registerProtocol(new Protocol1_15_1To1_15_2(), ProtocolVersion.v1_15_1, ProtocolVersion.v1_15_2);
+
         registerProtocol(new Protocol1_15_2To1_16(), ProtocolVersion.v1_15_2, ProtocolVersion.v1_16);
     }
 

core/src/main/java/nl/matsv/viabackwards/api/data/VBMappingDataLoader.java

@@ -40,15 +40,10 @@ public class VBMappingDataLoader {
 
     public static JsonObject loadData(String name) {
         InputStream stream = VBMappingDataLoader.class.getClassLoader().getResourceAsStream("assets/viabackwards/data/" + name);
-        InputStreamReader reader = new InputStreamReader(stream);
+        try (InputStreamReader reader = new InputStreamReader(stream)) {
-        try {
             return GsonUtil.getGson().fromJson(reader, JsonObject.class);
-        } finally {
+        } catch (IOException e) {
-            try {
+            return null;
-                reader.close();
-            } catch (IOException ignored) {
-                // Ignored
-            }
         }
     }
 

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java

@@ -53,7 +53,8 @@ public class EntityPackets1_16 extends EntityRewriter<Protocol1_15_2To1_16> {
         protocol.registerOutgoing(State.PLAY, 0x3B, 0x3B, new PacketRemapper() {
             @Override
             public void registerMap() {
-                map(dimensionTransformer);
+                map(dimensionTransformer); // Dimension Type
+                map(Type.STRING, Type.NOTHING); // Dimension
                 map(Type.LONG);
                 map(Type.UNSIGNED_BYTE);
                 handler(wrapper -> {
@@ -76,8 +77,10 @@ public class EntityPackets1_16 extends EntityRewriter<Protocol1_15_2To1_16> {
             public void registerMap() {
                 map(Type.INT); //  Entity ID
                 map(Type.UNSIGNED_BYTE); // Gamemode
+                map(Type.STRING_ARRAY, Type.NOTHING); // World list
                 map(Type.NBT, Type.NOTHING); // whatever this is
-                map(dimensionTransformer); // Dimension
+                map(dimensionTransformer); // Dimension Type
+                map(Type.STRING, Type.NOTHING); // Dimension
                 map(Type.LONG); // Seed
                 map(Type.UNSIGNED_BYTE); // Max players
                 handler(wrapper -> {
@@ -171,6 +174,7 @@ public class EntityPackets1_16 extends EntityRewriter<Protocol1_15_2To1_16> {
 
         registerMetaHandler().filter(Entity1_16Types.EntityType.PIGLIN, 16).removed();
         registerMetaHandler().filter(Entity1_16Types.EntityType.PIGLIN, 17).removed();
+        registerMetaHandler().filter(Entity1_16Types.EntityType.PIGLIN, 18).removed();
 
         registerMetaHandler().filter(Entity1_16Types.EntityType.STRIDER, 15).handle(meta -> {
             boolean baby = meta.getData().getCastedValue();

core/src/main/resources/assets/viabackwards/data/translation-mappings.json

@@ -9,6 +9,8 @@
     "selectWorld.tooltip.experimental": "This world is using experimental settings",
     "selectWorld.access_failure": "Failed to access world",
     "selectWorld.delete_failure": "Failed to delete world",
+    "datapackFailure.title": "Errors in currently selected datapacks prevented world from loading.\nYou can either try to load only with vanilla datapack (\"safe mode\") or go back to title screen and fix it manually.",
+    "datapackFailure.safeMode": "Safe mode",
     "editGamerule.title": "Edit game rules",
     "editGamerule.default": "Default: %s",
     "selectWorld.gameRules": "Game Rules",
@@ -144,6 +146,7 @@
     "jigsaw_block.name": "Name:",
     "jigsaw_block.target": "Target name:",
     "jigsaw_block.levels": "Levels: %s",
+    "jigsaw_block.keep_jigsaws": "Keep Jigsaws: ",
     "jigsaw_block.generate": "Generate",
     "jigsaw_block.joint_label": "Joint type:",
     "jigsaw_block.joint.rollable": "Rollable",
@@ -158,6 +161,7 @@
     "death.fell.accident.scaffolding": "%1$s fell off scaffolding",
     "death.fell.accident.other_climbable": "%1$s fell while climbing",
     "death.attack.magic.player": "%1$s was killed by magic whilst trying to escape %2$s",
+    "death.attack.witherSkull": "%1$s was shot by a %2$s's skull",
     "death.attack.fireworks.item": "%1$s went off with a bang due to a firework fired from %3$s by %2$s",
     "death.attack.badRespawnPoint.message": "%1$s was killed by %2$s",
     "death.attack.badRespawnPoint.link": "Intentional Game Design",
@@ -333,6 +337,7 @@
     "commands.attribute.modifier.value.get.success": "Value of modifier %s on attribute %s for entity %s is %s",
     "commands.locatebiome.success": "The nearest %s is at %s (%s blocks away)",
     "commands.teleport.invalidPosition": "Invalid position for teleport",
+    "commands.reload.failure": "Reload failed, keeping old data",
     "commands.locatebiome.notFound": "Could not find a biome of type %s within reasonable distance",
     "commands.locatebiome.invalid": "There is no biome named %s",
     "commands.summon.invalidPosition": "Invalid position for summon",