From 6366d399a7affd592454a63ba8b7fcb2cf7e0a43 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Fri, 9 Apr 2021 14:14:59 +0200
Subject: [PATCH] fix generation in 19w45a

---
 src/main/kotlin/de/bixilon/pixlyzer/EntitySpawner.kt  |  2 +-
 .../generator/generators/MobEffectGenerator.kt        | 11 ++++++-----
 .../pixlyzer/generator/generators/PotionGenerator.kt  |  2 +-
 wrapper/PixLyzer.py                                   |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/de/bixilon/pixlyzer/EntitySpawner.kt b/src/main/kotlin/de/bixilon/pixlyzer/EntitySpawner.kt
index 146f5a3..befdbef 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/EntitySpawner.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/EntitySpawner.kt
@@ -46,7 +46,7 @@ object EntitySpawner {
             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) {
             EntityType.EGG -> return OBJENSIS.newInstance(EGG_ENTITY_CLASS) as Entity
             EntityType.SNOWBALL -> return OBJENSIS.newInstance(SNOWBAL_ENTITY_CLASS) as Entity
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/MobEffectGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/MobEffectGenerator.kt
index 0c58bd3..6e0cb92 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/MobEffectGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/MobEffectGenerator.kt
@@ -2,7 +2,7 @@ package de.bixilon.pixlyzer.generator.generators
 
 import com.google.gson.JsonObject
 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.EntityAttributeModifier
 import net.minecraft.entity.effect.StatusEffect
@@ -14,10 +14,10 @@ object MobEffectGenerator : Generator(
     "mob_effects"
 ) {
     override fun generate() {
-        for (mobEffect in Registry.STATUS_EFFECT) {
-            val resourceIdentifier = Registry.STATUS_EFFECT.getId(mobEffect)
+        for (mobEffect in STATUS_EFFECT_REGISTRY) {
+            val resourceIdentifier = STATUS_EFFECT_REGISTRY.getId(mobEffect)
             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("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_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 {
         MOB_EFFECT_CATEGORY_FIELD.isAccessible = true
@@ -62,4 +62,5 @@ object MobEffectGenerator : Generator(
         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>
 }
diff --git a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/PotionGenerator.kt b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/PotionGenerator.kt
index 87666c2..0740317 100644
--- a/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/PotionGenerator.kt
+++ b/src/main/kotlin/de/bixilon/pixlyzer/generator/generators/PotionGenerator.kt
@@ -42,7 +42,7 @@ object PotionGenerator : Generator(
         val mobEffect = JsonObject()
 
         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)
diff --git a/wrapper/PixLyzer.py b/wrapper/PixLyzer.py
index 4428291..717715b 100755
--- a/wrapper/PixLyzer.py
+++ b/wrapper/PixLyzer.py
@@ -19,7 +19,7 @@ OUT_FOLDER = os.path.abspath("data/version/") + "/"
 DATA_FOLDER = os.path.abspath("data/data/") + "/"
 
 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"
 
 VERSION_MANIFEST_URL = "https://launchermeta.mojang.com/mc/game/version_manifest.json"