fix cherry pick errors

This will cause conflicts again, but they are minor. This commits belongs into master and not into the feature branch.

Author: Bixilon

src/main/java/de/bixilon/minosoft/data/registries/fallback/FallbackRegistries.kt

@@ -64,7 +64,7 @@ object FallbackRegistries {
 
     fun load() {
         Log.log(LogMessageType.LOADING, LogLevels.VERBOSE) { "Loading default registries..." }
-        if (this.registries.isEmpty() || this.enums.isEmpty() || this.other.isEmpty()) throw IllegalArgumentException("No fallback registries?")
+        if (this.registries.isEmpty() || this.enums.isEmpty()) throw IllegalArgumentException("No fallback registries?")
 
         for ((registry, file) in registries) {
             val data = IntegratedAssets.DEFAULT[file.prefix("mappings/registries/").suffix(".json")].readJsonObject()
@@ -76,7 +76,6 @@ object FallbackRegistries {
         }
         this.registries.clear()
         this.enums.clear()
-        this.other.clear()
 
         Log.log(LogMessageType.LOADING, LogLevels.VERBOSE) { "Loaded default registries!" }
     }