From 15348f659a06a4040191fb20392aa3276469e710 Mon Sep 17 00:00:00 2001 From: KennyTV Date: Mon, 15 Feb 2021 12:30:07 +0100 Subject: [PATCH] Fix missing shulker mapping warning Fixes #320 --- .../nl/matsv/viabackwards/api/data/BackwardsMappings.java | 3 ++- .../protocol1_12_2to1_13/data/BackwardsMappings.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java b/core/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java index d00031e8..107516e1 100644 --- a/core/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java +++ b/core/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java @@ -35,7 +35,8 @@ public class BackwardsMappings extends MappingData { if (diffMappings != null) { JsonObject diffItems = diffMappings.getAsJsonObject("items"); if (diffItems != null) { - backwardsItemMappings = VBMappingDataLoader.loadItemMappings(oldMappings.getAsJsonObject("items"), newMappings.getAsJsonObject("items"), diffItems, true); + backwardsItemMappings = VBMappingDataLoader.loadItemMappings(oldMappings.getAsJsonObject("items"), + newMappings.getAsJsonObject("items"), diffItems, shouldWarnOnMissing("items")); } JsonObject diffSounds = diffMappings.getAsJsonObject("sounds"); diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java index ead2a7f5..f99d8c7d 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java @@ -105,6 +105,11 @@ public class BackwardsMappings extends nl.matsv.viabackwards.api.data.BackwardsM return mappedId; } + @Override + protected boolean shouldWarnOnMissing(String key) { + return super.shouldWarnOnMissing(key) && !key.equals("items"); + } + public Int2ObjectMap getStatisticMappings() { return statisticMappings; }