v3.1.0

Fixed the data on Pokemons

Author: randombyte-developer

.gitignore

@@ -3,4 +3,5 @@
 .idea/
 .gradle/
 build/
-run/
+run/
+*.jar

build.gradle

@@ -1,3 +1,16 @@
+buildscript {
+    repositories {
+        jcenter()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+    }
+    dependencies {
+        classpath "net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT"
+    }
+}
+
 plugins {
     id "maven"
     id "org.jetbrains.kotlin.jvm" version "1.2.51"
@@ -12,8 +25,16 @@ if (!isJitpack) {
     apply plugin: "flavor.pie.promptsign"
 }
 
+apply plugin: "net.minecraftforge.gradle.forge"
+
 group "de.randombyte"
-version "3.0.0"
+version "3.1.0"
+
+minecraft {
+    version = "1.12.2-14.23.5.2768"
+    runDir = "run"
+    mappings = "snapshot_20171003"
+}
 
 repositories {
     jcenter()
@@ -32,6 +53,7 @@ dependencies {
     kapt "org.spongepowered:spongeapi:7.0.0"
     shadow("com.github.randombyte-developer.kosp:kosp:v2.2.3") { transitive = false }
     shadow "org.bstats:bstats-sponge:1.2"
+    compile files("libs/Pixelmon-1.12.2-7.0.1-server.jar")
 }
 
 shadowJar {
@@ -44,6 +66,7 @@ shadowJar {
     classifier = null // Remove "-all" suffix from output file name
 }
 build.dependsOn shadowJar
+reobfJar.dependsOn shadowJar
 install.dependsOn shadowJar
 if (!isJitpack) {
     signArchives.dependsOn shadowJar

src/main/kotlin/de/randombyte/entityparticles/EntityParticles.kt

@@ -13,6 +13,7 @@ import de.randombyte.entityparticles.data.EntityParticlesKeys.IS_REMOVER
 import de.randombyte.entityparticles.data.EntityParticlesKeys.PARTICLE_ID
 import de.randombyte.entityparticles.data.ParticleData
 import de.randombyte.entityparticles.data.RemoverItemData
+import de.randombyte.entityparticles.data.particleId
 import de.randombyte.kosp.config.ConfigManager
 import de.randombyte.kosp.extensions.executeAsConsole
 import de.randombyte.kosp.extensions.orNull
@@ -68,13 +69,16 @@ class EntityParticles @Inject constructor(
     internal companion object {
         const val ID = "entity-particles"
         const val NAME = "EntityParticles"
-        const val VERSION = "3.0.0"
+        const val VERSION = "3.1.0"
         const val AUTHOR = "RandomByte"
 
         const val ROOT_PERMISSION = ID
 
         const val PARTICLE_ID_ARG = "particleId"
         const val PLAYER_ARG = "player"
+
+        const val PIXELMON_ID = "pixelmon"
+        const val PIXELMON_PARTICLE_TAG_KEY = "$ID:particle"
     }
 
     private val configManager = ConfigManager(
@@ -172,7 +176,7 @@ class EntityParticles @Inject constructor(
                 ("entityParticles set ${targetEntity.location.extent.uniqueId} ${targetEntity.uniqueId} $particleId").executeAsConsole()
             }
             isRemover -> {
-                if (!targetEntity.get(EntityParticlesKeys.PARTICLE_ID).isPresent) return
+                if (targetEntity.particleId == null) return
                 player.setItemInHand(HandTypes.MAIN_HAND, itemInHand.setAmount(itemInHand.quantity - 1))
                 ("entityParticles set ${targetEntity.location.extent.uniqueId} ${targetEntity.uniqueId} nothing").executeAsConsole()
             }
@@ -280,16 +284,5 @@ class EntityParticles @Inject constructor(
         location.extent.spawnParticles(particleEffect, location.position.add(effect.centerOffset))
     }
 
-    private val Entity.particleId: String? get() {
-        val id = this.get(EntityParticlesKeys.PARTICLE_ID).orNull() ?: return null
-        val particleConfig = config.particles[id]
-        if (particleConfig == null) {
-            // invalid data -> remove
-            this.remove(ParticleData::class.java)
-            return null
-        }
-        return id
-    }
-
     private fun ItemStack.setAmount(amount: Int): ItemStack = apply { quantity = amount }
 }

src/main/kotlin/de/randombyte/entityparticles/commands/SetParticleCommand.kt

@@ -3,7 +3,7 @@ package de.randombyte.entityparticles.commands
 import de.randombyte.entityparticles.Config
 import de.randombyte.entityparticles.EntityParticles
 import de.randombyte.entityparticles.EntityParticles.Companion.PARTICLE_ID_ARG
-import de.randombyte.entityparticles.data.ParticleData
+import de.randombyte.entityparticles.data.particleId
 import de.randombyte.kosp.extensions.getWorld
 import de.randombyte.kosp.extensions.orNull
 import de.randombyte.kosp.extensions.toText
@@ -38,7 +38,7 @@ internal class SetParticleCommand(
         val trackedEntities = entityParticles.trackedEntities.getOrPut(entity.location.extent.uniqueId) { mutableMapOf() }
 
         if (particleId == "nothing") {
-            entity.remove(ParticleData::class.java)
+            entity.particleId = null
             entity.offer(Keys.GLOWING, false)
 
             trackedEntities -= (entity.uniqueId)
@@ -49,7 +49,7 @@ internal class SetParticleCommand(
         val particleConfig = getParticleConfig(particleId)
                 ?: throw CommandException("Particle '$particleId' is not available!".toText())
 
-        entity.offer(ParticleData(id = particleId, isActive = true))
+        entity.particleId = particleId
 
         if (particleConfig.glowing) {
             entity.offer(Keys.GLOWING, true)

src/main/kotlin/de/randombyte/entityparticles/data/DataUtils.kt

@@ -0,0 +1,61 @@
+package de.randombyte.entityparticles.data
+
+import com.pixelmonmod.pixelmon.entities.pixelmon.Entity1Base
+import de.randombyte.entityparticles.EntityParticles.Companion.PIXELMON_ID
+import de.randombyte.entityparticles.EntityParticles.Companion.PIXELMON_PARTICLE_TAG_KEY
+import de.randombyte.kosp.extensions.orNull
+import net.minecraft.nbt.NBTTagCompound
+import net.minecraftforge.common.util.Constants
+import org.spongepowered.api.Sponge
+import org.spongepowered.api.entity.Entity
+
+// What a hassle to get Pixelmon and the Sponge Data API working "together"
+
+var Entity.particleId: String?
+    get() {
+        return if (Sponge.getPluginManager().isLoaded(PIXELMON_ID) && this is Entity1Base) {
+            val persistentData = this.pokemonData.persistentData
+            if (!persistentData.hasKey(PIXELMON_PARTICLE_TAG_KEY)) {
+                // has to be accessed this way because of unknown issues with Sponge & Pixelmon
+                val spongeSavedParticleId = persistentData.removeSpongeSavedParticleId()
+                if (spongeSavedParticleId != null) {
+                    this.particleId = spongeSavedParticleId // save the ID the new way (directly with NBT)
+                    spongeSavedParticleId
+                } else null
+            } else {
+                persistentData.getString(PIXELMON_PARTICLE_TAG_KEY)
+            }
+        } else {
+            this.get(EntityParticlesKeys.PARTICLE_ID).orNull()
+        }
+    }
+    set(id) {
+        if (Sponge.getPluginManager().isLoaded(PIXELMON_ID) && this is Entity1Base) { // is Pixelmon entity? -> then do NBT
+            with(this.pokemonData.persistentData) {
+                if (id == null) {
+                    this.removeTag(PIXELMON_PARTICLE_TAG_KEY)
+                } else {
+                    this.setString(PIXELMON_PARTICLE_TAG_KEY, id)
+                }
+            }
+        } else {
+            if (id == null) { // normal entity -> Sponge data api
+                this.remove(EntityParticlesKeys.PARTICLE_ID)
+            } else {
+                this.tryOffer(ParticleData(id = id, isActive = true))
+            }
+        }
+    }
+
+private fun NBTTagCompound.removeSpongeSavedParticleId(): String? {
+    val manipulatorsCompoundTag = this.getCompoundTag("SpongeData").getTagList("CustomManipulators", Constants.NBT.TAG_COMPOUND)
+    val manipulators = manipulatorsCompoundTag.toList()
+
+    val particleManipulatorIndex = manipulators.indexOfFirst { (it as NBTTagCompound).getString("ManipulatorId") == "entity-particles:particle" }
+    if (particleManipulatorIndex < 0) return null
+    val particleManipulator = manipulators[particleManipulatorIndex]
+
+    manipulatorsCompoundTag.removeTag(particleManipulatorIndex) // remove old sponge data api tag
+
+    return (particleManipulator as NBTTagCompound).getCompoundTag("ManipulatorData").getString("Id")
+}