From 360b3bd47af406b918b22653faa5ee22de8f79fe Mon Sep 17 00:00:00 2001 From: Bixilon Date: Sat, 24 Apr 2021 21:48:05 +0200 Subject: [PATCH] fix loading in 1.15 --- .../minosoft/config/config/game/controls/KeyBindingsNames.kt | 3 ++- .../de/bixilon/minosoft/data/mappings/entities/EntityType.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/config/config/game/controls/KeyBindingsNames.kt b/src/main/java/de/bixilon/minosoft/config/config/game/controls/KeyBindingsNames.kt index 653e7e3be..245c4010e 100644 --- a/src/main/java/de/bixilon/minosoft/config/config/game/controls/KeyBindingsNames.kt +++ b/src/main/java/de/bixilon/minosoft/config/config/game/controls/KeyBindingsNames.kt @@ -47,7 +47,8 @@ object KeyBindingsNames { val CLOSE_CHAT = ResourceLocation("minosoft:close_chat") - val SELECT_HOTBAR_SLOTS = arrayOf(ResourceLocation("minosoft:select_hotbar_slot_1"), + val SELECT_HOTBAR_SLOTS = arrayOf( + ResourceLocation("minosoft:select_hotbar_slot_1"), ResourceLocation("minosoft:select_hotbar_slot_2"), ResourceLocation("minosoft:select_hotbar_slot_3"), ResourceLocation("minosoft:select_hotbar_slot_4"), diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/entities/EntityType.kt b/src/main/java/de/bixilon/minosoft/data/mappings/entities/EntityType.kt index b8ccbbf5a..0c6bffcf1 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/entities/EntityType.kt +++ b/src/main/java/de/bixilon/minosoft/data/mappings/entities/EntityType.kt @@ -62,7 +62,7 @@ data class EntityType( data["attributes"]?.asJsonObject?.let { for ((attributeResourceLocation, value) in it.entrySet()) { - attributes[ResourceLocation.getPathResourceLocation(attributeResourceLocation).fix()] = value.asFloat + attributes[ResourceLocation.getResourceLocation(attributeResourceLocation).fix()] = value.asFloat } }