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

extract real class name, with parent class, fluids: extract class

Browse Source
This commit is contained in:
Bixilon 2021-06-16 20:26:04 +02:00
parent c77829c609
commit 73d3327dc8
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import de.bixilon.pixlyzer.util.ReflectionUtil.getField
import de.bixilon.pixlyzer.util.ReflectionUtil.getGetter
import de.bixilon.pixlyzer.util.ReflectionUtil.variable
import de.bixilon.pixlyzer.util.Util
import de.bixilon.pixlyzer.util.Util.realName
import net.minecraft.block.Block
import net.minecraft.block.BlockState
import net.minecraft.block.Blocks
@ -70,7 +71,7 @@ object BlockGenerator : Generator(
blockData.addProperty("has_dynamic_shape", block.hasDynamicBounds())
}
blockData.addProperty("class", block::class.java.simpleName)
blockData.addProperty("class", block::class.java.realName)
if (block is FluidBlock) {
(FLUID_BLOCK_FLUID_FIELD.get(block) as Fluid).let {

3
src/main/kotlin/de/bixilon/pixlyzer/generator/generators/EntityGenerator.kt
View File

@ -7,6 +7,7 @@ import de.bixilon.pixlyzer.generator.Generator
import de.bixilon.pixlyzer.util.ReflectionUtil.getClass
import de.bixilon.pixlyzer.util.ReflectionUtil.getField
import de.bixilon.pixlyzer.util.ReflectionUtil.getGetter
import de.bixilon.pixlyzer.util.Util.realName
import net.minecraft.entity.Entity
import net.minecraft.entity.EntityType
import net.minecraft.entity.LivingEntity
@ -88,7 +89,7 @@ object EntityGenerator : Generator(
val entityClass = entity::class.java
entityData.addProperty("class", entityClass.simpleName)
entityData.addProperty("class", entityClass.realName)
entityClassMappings[entityClass] = resourceLocation
data.add(resourceLocation.toString(), entityData)

3
src/main/kotlin/de/bixilon/pixlyzer/generator/generators/FluidGenerator.kt
View File

@ -2,6 +2,7 @@ package de.bixilon.pixlyzer.generator.generators
import com.google.gson.JsonObject
import de.bixilon.pixlyzer.generator.Generator
import de.bixilon.pixlyzer.util.Util.realName
import net.minecraft.fluid.EmptyFluid
import net.minecraft.fluid.LavaFluid
import net.minecraft.fluid.WaterFluid
@ -64,6 +65,8 @@ object FluidGenerator : Generator(
}
}
fluidData.addProperty("class", fluid::class.java.realName)
if (render.size() > 0) {
fluidData.add("render", render)
}

3
src/main/kotlin/de/bixilon/pixlyzer/generator/generators/ItemGenerator.kt
View File

@ -8,6 +8,7 @@ import de.bixilon.pixlyzer.util.ReflectionUtil.getClass
import de.bixilon.pixlyzer.util.ReflectionUtil.getField
import de.bixilon.pixlyzer.util.ReflectionUtil.getGetter
import de.bixilon.pixlyzer.util.Util.nullCast
import de.bixilon.pixlyzer.util.Util.realName
import de.bixilon.pixlyzer.util.Util.toJsonArray
import net.minecraft.block.Block
import net.minecraft.block.BlockState
@ -212,7 +213,7 @@ object ItemGenerator : Generator(
}
itemData.addProperty("class", item::class.java.simpleName)
itemData.addProperty("class", item::class.java.realName)
data.add(resourceLocation.toString(), itemData)

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

@ -64,4 +64,6 @@ object Util {
return array
}
val Class<*>.realName: String
get() = this.name.removePrefix(this.packageName).removePrefix(".")
}