AstralTransRocketries/pixlyzer
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/pixlyzer.git synced 2025-09-27 14:10:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix generation in 19w45a

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

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

@ -46,7 +46,7 @@ object EntitySpawner {
return entity return entity
} }
// ToDo: This crashes in 21w13a? // ToDo: This crashes in 21w13a, is an issue in tiny remapper, should be fixed by now
when (entityType) { when (entityType) {
EntityType.EGG -> return OBJENSIS.newInstance(EGG_ENTITY_CLASS) as Entity EntityType.EGG -> return OBJENSIS.newInstance(EGG_ENTITY_CLASS) as Entity
EntityType.SNOWBALL -> return OBJENSIS.newInstance(SNOWBAL_ENTITY_CLASS) as Entity EntityType.SNOWBALL -> return OBJENSIS.newInstance(SNOWBAL_ENTITY_CLASS) as Entity

11
src/main/kotlin/de/bixilon/pixlyzer/generator/generators/MobEffectGenerator.kt
View File

@ -2,7 +2,7 @@ package de.bixilon.pixlyzer.generator.generators
import com.google.gson.JsonObject import com.google.gson.JsonObject
import de.bixilon.pixlyzer.generator.Generator import de.bixilon.pixlyzer.generator.Generator
import de.bixilon.pixlyzer.util.ReflectionUtil import de.bixilon.pixlyzer.util.ReflectionUtil.getField
import net.minecraft.entity.attribute.EntityAttribute import net.minecraft.entity.attribute.EntityAttribute
import net.minecraft.entity.attribute.EntityAttributeModifier import net.minecraft.entity.attribute.EntityAttributeModifier
import net.minecraft.entity.effect.StatusEffect import net.minecraft.entity.effect.StatusEffect
@ -14,10 +14,10 @@ object MobEffectGenerator : Generator(
"mob_effects" "mob_effects"
) { ) {
override fun generate() { override fun generate() {
for (mobEffect in Registry.STATUS_EFFECT) { for (mobEffect in STATUS_EFFECT_REGISTRY) {
val resourceIdentifier = Registry.STATUS_EFFECT.getId(mobEffect) val resourceIdentifier = STATUS_EFFECT_REGISTRY.getId(mobEffect)
val mobEffectData = JsonObject() val mobEffectData = JsonObject()
mobEffectData.addProperty("id", Registry.STATUS_EFFECT.getRawId(mobEffect)) mobEffectData.addProperty("id", STATUS_EFFECT_REGISTRY.getRawId(mobEffect))
mobEffectData.addProperty("category", mobEffect.type.name.toLowerCase()) // ToDo: add category color mobEffectData.addProperty("category", mobEffect.type.name.toLowerCase()) // ToDo: add category color
mobEffectData.addProperty("color", mobEffect.color) mobEffectData.addProperty("color", mobEffect.color)
@ -47,7 +47,7 @@ object MobEffectGenerator : Generator(
private val MOB_EFFECT_CATEGORY_FIELD: Field = StatusEffect::class.java.getDeclaredField("type") private val MOB_EFFECT_CATEGORY_FIELD: Field = StatusEffect::class.java.getDeclaredField("type")
private val MOB_EFFECT_MODIFIERS_FIELD: Field = StatusEffect::class.java.getDeclaredField("attributeModifiers") private val MOB_EFFECT_MODIFIERS_FIELD: Field = StatusEffect::class.java.getDeclaredField("attributeModifiers")
private val AMOUNT_ENTITY_ATTRIBUTE_MODIFIER_FIELD = ReflectionUtil.getField(EntityAttributeModifier::class.java, "amount", "value")!! private val AMOUNT_ENTITY_ATTRIBUTE_MODIFIER_FIELD = getField(EntityAttributeModifier::class.java, "amount", "value")!!
init { init {
MOB_EFFECT_CATEGORY_FIELD.isAccessible = true MOB_EFFECT_CATEGORY_FIELD.isAccessible = true
@ -62,4 +62,5 @@ object MobEffectGenerator : Generator(
return MOB_EFFECT_MODIFIERS_FIELD.get(this) as Map<EntityAttribute, EntityAttributeModifier> return MOB_EFFECT_MODIFIERS_FIELD.get(this) as Map<EntityAttribute, EntityAttributeModifier>
} }
val STATUS_EFFECT_REGISTRY = getField(Registry::class.java, "STATUS_EFFECT", "MOB_EFFECT")!!.get(null) as Registry<StatusEffect>
} }

2
src/main/kotlin/de/bixilon/pixlyzer/generator/generators/PotionGenerator.kt
View File

@ -42,7 +42,7 @@ object PotionGenerator : Generator(
val mobEffect = JsonObject() val mobEffect = JsonObject()
effectType?.let { effectType?.let {
mobEffect.addProperty("effect", Registry.STATUS_EFFECT.getId(it).toString()) mobEffect.addProperty("effect", MobEffectGenerator.STATUS_EFFECT_REGISTRY.getId(it).toString())
} }
mobEffect.addProperty("duration", duration) mobEffect.addProperty("duration", duration)

2
wrapper/PixLyzer.py
View File

@ -19,7 +19,7 @@ OUT_FOLDER = os.path.abspath("data/version/") + "/"
DATA_FOLDER = os.path.abspath("data/data/") + "/" DATA_FOLDER = os.path.abspath("data/data/") + "/"
JAVA_PATH = "/usr/lib/jvm/graalvm-ce-java8-21.0.0.2//bin/java" JAVA_PATH = "/usr/lib/jvm/graalvm-ce-java8-21.0.0.2//bin/java"
TINY_REMAPPER_PATH = "/home/moritz/Games/Minecraft/PixLyzer/wrapper/data/tiny-remapper-0.3.2-fat.jar" TINY_REMAPPER_PATH = "/home/moritz/Games/Minecraft/PixLyzer/wrapper/data/tiny-remapper-0.3.1-fat-player.jar" # Get it from: https://files.player.to/tmp/tiny-remapper-0.3.1-fat-player.jar
ADDITIONAL_CLASSPATH = "/home/moritz/kotlin-stdlib-1.4.30.jar:/home/moritz/Games/Minecraft/PixLyzer/wrapper/data/objenesis-tck-3.1.jar" ADDITIONAL_CLASSPATH = "/home/moritz/kotlin-stdlib-1.4.30.jar:/home/moritz/Games/Minecraft/PixLyzer/wrapper/data/objenesis-tck-3.1.jar"
VERSION_MANIFEST_URL = "https://launchermeta.mojang.com/mc/game/version_manifest.json" VERSION_MANIFEST_URL = "https://launchermeta.mojang.com/mc/game/version_manifest.json"