AstralTransRocketries/pixlyzer
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/pixlyzer.git synced 2025-09-25 13:11:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix multipart generation

Browse Source
This commit is contained in:
Bixilon 2021-04-09 12:44:05 +02:00
parent 32bb7bb75f
commit 21ca745c54
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/de/bixilon/pixlyzer/PixLyzer.kt
View File

@ -164,5 +164,5 @@ object PixLyzer {
} }
private val initializeGameVersionMethod = getGetter(getClass("net.minecraft.SharedConstants"), "method_36208") private val initializeGameVersionMethod = getGetter(getClass("net.minecraft.SharedConstants"), "createGameVersion", "method_36208")
} }

24
src/main/kotlin/de/bixilon/pixlyzer/generator/generators/BlockGenerator.kt
View File

@ -73,7 +73,7 @@ object BlockGenerator : Generator(
val render = Util.readJsonMinecraftResource("assets/${resourceIdentifier.namespace}/blockstates/${resourceIdentifier.path}.json") val render = Util.readJsonMinecraftResource("assets/${resourceIdentifier.namespace}/blockstates/${resourceIdentifier.path}.json")
val multipartVariants: MutableMap<MutableMap<String, MutableSet<String>>, JsonElement> = mutableMapOf() val multipartVariants: MutableMap<MutableMap<String, MutableSet<String>>, MutableList<JsonElement>> = mutableMapOf()
render["multipart"]?.asJsonArray?.let { render["multipart"]?.asJsonArray?.let {
@ -108,7 +108,7 @@ object BlockGenerator : Generator(
} }
addBlockModel(condition["apply"]) addBlockModel(condition["apply"])
for (propertyMap in properties) { for (propertyMap in properties) {
multipartVariants[propertyMap] = condition["apply"] multipartVariants.getOrPut(propertyMap, { mutableListOf() }).add(condition["apply"])
} }
} }
} }
@ -244,7 +244,7 @@ object BlockGenerator : Generator(
} }
} }
val multipart = JsonArray() val multipart = JsonArray()
for ((properties, element) in multipartVariants) { for ((properties, elementList) in multipartVariants) {
var valid = true var valid = true
for ((propertyName, values) in properties) { for ((propertyName, values) in properties) {
if (!propertyData.has(propertyName)) { if (!propertyData.has(propertyName)) {
@ -257,15 +257,17 @@ object BlockGenerator : Generator(
} }
} }
if (valid) { if (valid) {
if (element is JsonArray) { for (element in elementList) {
for (apply in element) { if (element is JsonArray) {
if (!multipart.contains(apply)) { for (apply in element) {
multipart.add(apply) if (!multipart.contains(apply)) {
multipart.add(apply)
}
}
} else if (element is JsonObject) {
if (!multipart.contains(element)) {
multipart.add(element)
} }
}
} else if (element is JsonObject) {
if (!multipart.contains(element)) {
multipart.add(element)
} }
} }
} }