Fix issues on 1.8 - 1.10.2

Signed-off-by: Irmo van den Berge <irmo.vandenberge@ziggo.nl>

src/main/java/com/bergerkiller/bukkit/common/internal/CommonBootstrap.java

@@ -774,7 +774,9 @@ public class CommonBootstrap {
             // Before 1.20.5, ChunkStatus was elsewhere
             remappings.put("net.minecraft.world.level.chunk.status.ChunkStatus", "net.minecraft.world.level.chunk.ChunkStatus");
             // Before 1.20.5, MapDecorationType was an enum and not in a registry
-            remappings.put("net.minecraft.world.level.saveddata.maps.MapDecorationType", "net.minecraft.world.level.saveddata.maps.MapIcon$Type");
+            remappings.put("net.minecraft.world.level.saveddata.maps.MapDecorationType",
+                    remappings.getOrDefault("net.minecraft.world.level.saveddata.maps.MapDecorationType",
+                                 "net.minecraft.world.level.saveddata.maps.MapIcon$Type"));
             // Before 1.20.5, SerializableMeta was a subclass of CraftMetaItem
             remappings.put("org.bukkit.craftbukkit.inventory.SerializableMeta", "org.bukkit.craftbukkit.inventory.CraftMetaItem$SerializableMeta");
         }

src/main/templates/com/bergerkiller/templates/net/minecraft/network/datawatcher.txt

@@ -462,7 +462,7 @@ class DataWatcher {
         #require DataWatcher private DataWatcher.WatchableObject dw_getItem:getItem(int key);
         DataWatcherObject dwo = (DataWatcherObject) key.getRawHandle();
         DataWatcher$Item item = instance#dw_getItem(dwo.getId());
-        return item.getValue();
+        Object rawValue = item.getValue();
 #endif
         return key.getType().getConverter().convert(rawValue);
     }