AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-16 19:05:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

bump pixlyzer

Browse Source
This commit is contained in:
Bixilon 2021-04-23 21:18:25 +02:00
parent a96d283997
commit 6ee7c57915
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/bixilon/minosoft/data/mappings/effects/StatusEffect.kt
View File

@ -37,8 +37,7 @@ data class StatusEffect(
override fun deserialize(mappings: VersionMapping?, resourceLocation: ResourceLocation, data: JsonObject): StatusEffect { override fun deserialize(mappings: VersionMapping?, resourceLocation: ResourceLocation, data: JsonObject): StatusEffect {
val attributes: MutableMap<ResourceLocation, StatusEffectAttribute> = mutableMapOf() val attributes: MutableMap<ResourceLocation, StatusEffectAttribute> = mutableMapOf()
// ToDo: Remove "modifiers" key data["attributes"].asJsonObject?.let {
(data["attributes"].asJsonObject ?: data["modifiers"].asJsonObject)?.let {
for ((key, value) in it.entrySet()) { for ((key, value) in it.entrySet()) {
attributes[ResourceLocation.getResourceLocation(key).fix()] = StatusEffectAttribute.deserialize(value.asJsonObject) attributes[ResourceLocation.getResourceLocation(key).fix()] = StatusEffectAttribute.deserialize(value.asJsonObject)
} }

2
src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt
View File

@ -163,7 +163,7 @@ class VersionMapping {
blockRegistry.initialize(pixlyzerData["blocks"]?.asJsonObject, this, Block, version.isFlattened(), Registry.MetaTypes.BITS_4) blockRegistry.initialize(pixlyzerData["blocks"]?.asJsonObject, this, Block, version.isFlattened(), Registry.MetaTypes.BITS_4)
itemRegistry.initialize(pixlyzerData["items"]?.asJsonObject, this, Item, version.isFlattened(), Registry.MetaTypes.BITS_16) itemRegistry.initialize(pixlyzerData["items"]?.asJsonObject, this, Item, version.isFlattened(), Registry.MetaTypes.BITS_16)
enchantmentRegistry.initialize(pixlyzerData["enchantments"]?.asJsonObject, this, Enchantment) enchantmentRegistry.initialize(pixlyzerData["enchantments"]?.asJsonObject, this, Enchantment)
statusEffectRegistry.initialize(pixlyzerData["mob_effect"]?.asJsonObject, this, StatusEffect) statusEffectRegistry.initialize(pixlyzerData["status_effect"]?.asJsonObject, this, StatusEffect)
biomeRegistry.initialize(pixlyzerData["biomes"]?.asJsonObject, this, Biome) biomeRegistry.initialize(pixlyzerData["biomes"]?.asJsonObject, this, Biome)
dimensionRegistry.initialize(pixlyzerData["dimensions"]?.asJsonObject, this, Dimension) dimensionRegistry.initialize(pixlyzerData["dimensions"]?.asJsonObject, this, Dimension)

2
src/main/resources/assets/minosoft/mapping/pixlyzer_index.json
View File

File diff suppressed because one or more lines are too long