Skip to content

Commit

Permalink
Block model rendering
Browse files Browse the repository at this point in the history
  • Loading branch information
@yuxuanchiadm
yuxuanchiadm committed Feb 29, 2024
1 parent 749a301 commit 095add7
Show file tree
Hide file tree
Showing 12 changed files with 200 additions and 172 deletions.
10 changes: 9 additions & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
plugins {
id 'fabric-loom' version '1.5-SNAPSHOT'
id 'maven-publish'
id "org.jetbrains.kotlin.jvm" version "1.9.22"
id "org.jetbrains.kotlin.jvm" version "1.9.22"
id 'idea'
}

version = project.mod_version
Expand All @@ -11,6 +12,13 @@ base {
archivesName = project.archives_base_name
}

idea {
module {
downloadJavadoc = false
downloadSources = true
}
}

repositories {
// Add repositories to retrieve artifacts from in here.
// You should only use this when depending on other mods because
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/net/easecation/bedrockloader/BedrockLoader.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ object BedrockLoader : ModInitializer {

val logger: Logger = LoggerFactory.getLogger("bedrock-loader")

private const val NAMESPACE: String = "bedrock-loader"
const val NAMESPACE: String = "bedrock-loader"
val BEDROCK_LOADER_MOD: ModContainer = FabricLoader.getInstance().getModContainer(NAMESPACE).orElseThrow()

override fun onInitialize() {
Expand Down
2 changes: 2 additions & 0 deletions src/main/kotlin/net/easecation/bedrockloader/BedrockLoaderClient.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package net.easecation.bedrockloader

import net.easecation.bedrockloader.render.BedrockModelProvider
import net.easecation.bedrockloader.render.BedrockVariantProvider
import net.fabricmc.api.ClientModInitializer
import net.fabricmc.api.EnvType
import net.fabricmc.api.Environment
Expand All @@ -11,6 +12,7 @@ object BedrockLoaderClient : ClientModInitializer {

override fun onInitializeClient() {
ModelLoadingRegistry.INSTANCE.registerResourceProvider { rm -> BedrockModelProvider }
ModelLoadingRegistry.INSTANCE.registerVariantProvider() { rm -> BedrockVariantProvider }
}

}
3 changes: 1 addition & 2 deletions src/main/kotlin/net/easecation/bedrockloader/block/BlockDataDriven.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class BlockDataDriven private constructor(val identifier: Identifier, val compon
}

private fun calculateSettings(components: BlockComponents): Settings {
val settings = FabricBlockSettings.of(Material.METAL).hardness(4.0f) // TODO hardness
val settings = FabricBlockSettings.of(Material.METAL).hardness(4.0f).nonOpaque() // TODO hardness
components.minecraftCollisionBox?.let {
when (it) {
is ComponentCollisionBox.ComponentCollisionBoxBoolean -> {
Expand Down Expand Up @@ -66,5 +66,4 @@ class BlockDataDriven private constructor(val identifier: Identifier, val compon
return super.getOutlineShape(state, view, pos, context)
}
}

}
169 changes: 95 additions & 74 deletions src/main/kotlin/net/easecation/bedrockloader/loader/BedrockResourcePackLoader.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import net.easecation.bedrockloader.util.GsonUtil
import net.fabricmc.api.EnvType
import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry
import net.fabricmc.loader.api.FabricLoader
import net.minecraft.client.texture.SpriteAtlasTexture
import net.minecraft.client.util.SpriteIdentifier
import net.minecraft.entity.EntityType
import net.minecraft.util.Identifier
import java.io.File
Expand All @@ -41,7 +43,7 @@ class BedrockResourcePackLoader(
for (block in context.resource.blocks) {
val identifier = block.key
val dir = namespaceDir(identifier.namespace)
createBlockTextures(identifier, block.value.textures)
createBlockTextures(identifier, block.value.textures, context.behavior.blocks[identifier]?.components?.minecraftMaterialInstances)
createBlockModel(
dir.resolve("models/block/${identifier.path}.json"),
identifier,
Expand All @@ -51,10 +53,11 @@ class BedrockResourcePackLoader(
)
createItemModel(dir.resolve("models/item/${identifier.path}.json"), identifier)
createBlockState(
dir.resolve("blockstates/${identifier.path}.json"),
identifier,
context.behavior.blocks[identifier]?.components?.minecraftGeometry,
context.behavior.blocks[identifier]?.components?.minecraftMaterialInstances)
dir.resolve("blockstates/${identifier.path}.json"),
identifier,
context.behavior.blocks[identifier]?.components?.minecraftGeometry,
context.behavior.blocks[identifier]?.components?.minecraftMaterialInstances
)
}
// Entity
for (entity in context.resource.entities) {
Expand Down Expand Up @@ -134,6 +137,10 @@ class BedrockResourcePackLoader(
if (!texturesBlock.exists()) {
texturesBlock.mkdirs()
}
val texturesBlocks = textures.resolve("blocks")
if (!texturesBlocks.exists()) {
texturesBlocks.mkdirs()
}
val texturesEntity = textures.resolve("entity")
if (!texturesEntity.exists()) {
texturesEntity.mkdirs()
Expand All @@ -147,20 +154,20 @@ class BedrockResourcePackLoader(
* 创建一个方块状态文件，内部包含model路径（附带命名空间）
* 如果方块带模型，则详见createBlockModel，在创建的方块模型中，继承与自定义基岩版geometry模型，从而调用自定义渲染器和烘焙器来渲染基岩版模型
*/
private fun createBlockState(file: File, identifier: Identifier, geometry: ComponentGeometry?, materialInstances: ComponentMaterialInstances?) {
private fun createBlockState(
file: File,
identifier: Identifier,
geometry: ComponentGeometry?,
materialInstances: ComponentMaterialInstances?
) {
// TODO block state
var model = "${identifier.namespace}:block/${identifier.path}"
// 带有模型的方块情况：通过行为包定义模型和贴图
when (geometry) {
is ComponentGeometry.ComponentGeometrySimple -> {
model = geometry.identifier
}
is ComponentGeometry.ComponentGeometryFull -> {
model = geometry.identifier
// TODO bone_visibility
}
else -> {}
}
// val model = when (geometry) {
// is ComponentGeometry.ComponentGeometrySimple -> geometry.identifier
// is ComponentGeometry.ComponentGeometryFull -> geometry.identifier
// null -> "${identifier.namespace}:block/${identifier.path}"
// }
val model = "${identifier.namespace}:block/${identifier.path}"
val blockState = JavaBlockStatesDefinition(
variants = mapOf(
"" to JavaBlockStatesDefinition.Variant(model)
Expand All @@ -174,7 +181,11 @@ class BedrockResourcePackLoader(
/**
* 根据方块材质包中的定义，创建一个方块贴图文件（附带命名空间）
*/
private fun createBlockTextures(identifier: Identifier, textures: BlockResourceDefinition.Textures?) {
private fun createBlockTextures(
identifier: Identifier,
textures: BlockResourceDefinition.Textures?,
materialInstances: ComponentMaterialInstances?
) {
val namespaceDir = this.namespaceDir(identifier.namespace)
when (textures) {
is BlockResourceDefinition.Textures.TexturesAllFace -> {
Expand Down Expand Up @@ -223,91 +234,101 @@ class BedrockResourcePackLoader(
}
else -> {}
}
materialInstances?.forEach { name, instance ->
val texture = context.resource.terrainTexture[instance.texture]?.textures
if (texture == null || !texture.contains("textures/")) {
BedrockLoader.logger.warn("[BedrockResourcePackLoader] Material instance texture not found: ${instance.texture}")
return@forEach
}
val bedrockTexture = context.resource.textureImages[texture]
if (bedrockTexture == null) {
BedrockLoader.logger.warn("[BedrockResourcePackLoader] Material instance texture not found: ${instance.texture}")
return@forEach
}
val file = namespaceDir.resolve(texture + "." + bedrockTexture.type.getExtension())
bedrockTexture.image.let { image ->
ImageIO.write(image, file.extension, file)
}

}
}

/**
* 根据方块材质包和行为包中的定义，创建一个方块模型文件（如果设定了模型，则应用模型；否则应用正常方块模型）
*/
private fun createBlockModel(file: File, identifier: Identifier, textures: BlockResourceDefinition.Textures?, geometry: ComponentGeometry?, materialInstances: ComponentMaterialInstances?) {
val model = JavaModelDefinition()

if (geometry != null) {
return
}
// 带有模型的方块情况：通过行为包定义模型和贴图
when (geometry) {
is ComponentGeometry.ComponentGeometrySimple -> {
model.parent = geometry.identifier
// 带有模型的方块情况：通过行为包定义模型和贴图
val geometryIdentifier = when (geometry) {
is ComponentGeometry.ComponentGeometrySimple -> geometry.identifier
is ComponentGeometry.ComponentGeometryFull -> geometry.identifier
}
is ComponentGeometry.ComponentGeometryFull -> {
model.parent = geometry.identifier
// TODO bone_visibility
}
else -> {
when (textures) {
is BlockResourceDefinition.Textures.TexturesAllFace -> {
model.parent = "block/cube_all"
}
is BlockResourceDefinition.Textures.TexturesMultiFace -> {
model.parent = "block/cube"
val bedrockModel = BedrockAddonsRegistry.models[geometryIdentifier] ?: return
val textureKey = materialInstances?.get("*")?.texture ?: return
val terrainTexture = context.resource.terrainTexture[textureKey]?.textures ?: return
val texture = if (terrainTexture.startsWith("textures/", ignoreCase = true)) terrainTexture.substring("textures/".length) else terrainTexture
val spriteId = SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, Identifier(identifier.namespace, texture))
bedrockModel.addSprite(spriteId)
} else {
val model = JavaModelDefinition()
model.parent = "block/cube_all"

// 通过行为包定义了贴图
materialInstances?.forEach { (key, value) ->
if (key == "*") {
value.texture?.let { texture ->
val javaTexture = context.resource.terrainTextureToJava(texture, identifier.namespace)
if (javaTexture != null) {
model.textures = mapOf("all" to javaTexture) // TODO 不确定是什么key...
}
}
else -> {}
} else {
BedrockLoader.logger.info("[BedrockResourcePackLoader] Material instance $key -> $value is not supported yet.")
}
}
}

// 通过行为包定义了贴图
materialInstances?.forEach { (key, value) ->
if (key == "*") {
value.texture?.let { texture ->
val javaTexture = context.resource.terrainTextureToJava(texture, identifier.namespace)
if (javaTexture != null) {
model.textures = mapOf("all" to javaTexture) // TODO 不确定是什么key...
// 普通方块情况：通过材质包的blocks.json定义贴图
when (textures) {
is BlockResourceDefinition.Textures.TexturesAllFace -> {
val texture = context.resource.terrainTexture[textures.all]?.textures
if (texture == null || !texture.contains("textures/")) {
BedrockLoader.logger.warn("[BedrockResourcePackLoader] Block texture not found: ${textures.all}")
return
}
context.resource.terrainTextureToJava(textures.all, identifier.namespace)
?.let { model.textures = mapOf("all" to it) }
}
} else {
BedrockLoader.logger.info("[BedrockResourcePackLoader] Material instance $key -> $value is not supported yet.")
}
}

// 普通方块情况：通过材质包的blocks.json定义贴图
when (textures) {
is BlockResourceDefinition.Textures.TexturesAllFace -> {
val texture = context.resource.terrainTexture[textures.all]?.textures
if (texture == null || !texture.contains("textures/")) {
BedrockLoader.logger.warn("[BedrockResourcePackLoader] Block texture not found: ${textures.all}")
return
}
context.resource.terrainTextureToJava(textures.all, identifier.namespace)?.let { model.textures = mapOf("all" to it) }
}
is BlockResourceDefinition.Textures.TexturesMultiFace -> {
val texturesMap = mutableMapOf<String, Identifier>()
is BlockResourceDefinition.Textures.TexturesMultiFace -> {
val texturesMap = mutableMapOf<String, Identifier>()

val directions = mapOf(
val directions = mapOf(
"up" to textures.up,
"down" to textures.down,
"north" to textures.north,
"south" to textures.south,
"east" to textures.east,
"west" to textures.west
)
)

for ((direction, textureKey) in directions) {
textureKey?.let {
val texture = context.resource.terrainTextureToJava(it, identifier.namespace)
if (texture != null) {
texturesMap[direction] = texture
for ((direction, textureKey) in directions) {
textureKey?.let {
val texture = context.resource.terrainTextureToJava(it, identifier.namespace)
if (texture != null) {
texturesMap[direction] = texture
}
}
}

model.textures = texturesMap
}

model.textures = texturesMap
else -> {}
}
else -> {}
}

FileWriter(file).use { writer ->
GsonUtil.GSON.toJson(model, writer)
FileWriter(file).use { writer ->
GsonUtil.GSON.toJson(model, writer)
}
}
}

Expand Down
Loading

0 comments on commit 095add7

Please sign in to comment.