ResistanceMap finish.
This commit is contained in:
1 parent
59c617b856
commit
853fea4ce9
3 files changed
+14
-1
No files matched your search
@@ -42,6 +42,13 @@
|
||||
"typeId": "cobblemon:water"
|
||||
},
|
||||
"resistance": "SUPER_EFFECTIVE"
|
||||
},
|
||||
{
|
||||
"effect": {
|
||||
"type": "cobblemon:showdown_condition",
|
||||
"conditionId": "sandstorm"
|
||||
},
|
||||
"resistance": "IMMUNE"
|
||||
}
|
||||
],
|
||||
"displayName": {
|
||||
|
||||
+6
@@ -43,6 +43,12 @@ class ResistanceMap(private val map: Map<Effect, Resistance>) : Map<Effect, Resi
|
||||
val CODEC: Codec<ResistanceMap> = Codec.list(ENTRY_CODEC)
|
||||
.comapFlatMap(
|
||||
{ list ->
|
||||
val presentEffects = hashSetOf<Effect>()
|
||||
list.forEach {
|
||||
if (!presentEffects.add(it.first)) {
|
||||
return@comapFlatMap DataResult.error { "Duplicate effect in ResistanceMap, this is impossible" }
|
||||
}
|
||||
}
|
||||
DataResult.success(ResistanceMap(list.associate { it.first to it.second }))
|
||||
},
|
||||
{ it.entries.map { entry -> Pair(entry.key, entry.value) } }
|
||||
+1
-1
@@ -21,7 +21,7 @@ class CobblemonFabricDataGeneratorEntrypoint : DataGeneratorEntrypoint {
|
||||
|
||||
private fun commonDataGen(pack: FabricDataGenerator.Pack) {
|
||||
pack.addProvider { output, registries -> ElementalTypeProvider(output, registries) }
|
||||
//pack.addProvider { output, registries -> TeraTypeProvider(output, registries) }
|
||||
pack.addProvider { output, registries -> TeraTypeProvider(output, registries) }
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user