xtex/quaedam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: entity name tag height

Browse Source
This commit is contained in:
xtex 2023-07-02 11:32:08 +08:00
parent 7d721adcca
commit ed77d13eeb
Signed by: xtex
GPG Key ID: B918086ED8045B91
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/main/kotlin/quaedam/projection/swarm/ProjectedPersonEntity.kt
View File

@ -26,10 +26,13 @@ class ProjectedPersonEntity(entityType: EntityType<out PathfinderMob>, level: Le
const val KEY_ENTITY_SHAPE = "EntityShape" const val KEY_ENTITY_SHAPE = "EntityShape"
const val BOUNDING_WIDTH = 0.6f
const val BOUNDING_HEIGHT = 1.8f
val entity = Quaedam.entities.register(ID) { val entity = Quaedam.entities.register(ID) {
EntityType.Builder.of(::ProjectedPersonEntity, MobCategory.CREATURE) EntityType.Builder.of(::ProjectedPersonEntity, MobCategory.CREATURE)
.canSpawnFarFromPlayer() .canSpawnFarFromPlayer()
.sized(0.6f, 1.8f * 1.3f) .sized(BOUNDING_WIDTH, BOUNDING_HEIGHT * 1.2f)
.build("quaedam:$ID") .build("quaedam:$ID")
}!! }!!
@ -99,4 +102,6 @@ class ProjectedPersonEntity(entityType: EntityType<out PathfinderMob>, level: Le
override fun getTypeName(): Component = shape.name.takeIf { it.isNotEmpty() }?.let { Component.literal(it) } override fun getTypeName(): Component = shape.name.takeIf { it.isNotEmpty() }?.let { Component.literal(it) }
?: super.getTypeName() ?: super.getTypeName()
override fun getNameTagOffsetY() = super.getNameTagOffsetY() - BOUNDING_HEIGHT * (1.3f - shape.scaleY)
} }

3
common/src/main/kotlin/quaedam/projection/swarm/ProjectedPersonRenderer.kt
View File

@ -1,6 +1,8 @@
package quaedam.projection.swarm package quaedam.projection.swarm
import com.mojang.blaze3d.vertex.PoseStack import com.mojang.blaze3d.vertex.PoseStack
import net.fabricmc.api.EnvType
import net.fabricmc.api.Environment
import net.minecraft.client.model.PlayerModel import net.minecraft.client.model.PlayerModel
import net.minecraft.client.model.geom.ModelLayers import net.minecraft.client.model.geom.ModelLayers
import net.minecraft.client.renderer.entity.EntityRendererProvider import net.minecraft.client.renderer.entity.EntityRendererProvider
@ -8,6 +10,7 @@ import net.minecraft.client.renderer.entity.MobRenderer
import net.minecraft.client.renderer.entity.layers.CustomHeadLayer import net.minecraft.client.renderer.entity.layers.CustomHeadLayer
import net.minecraft.client.renderer.entity.layers.ItemInHandLayer import net.minecraft.client.renderer.entity.layers.ItemInHandLayer
@Environment(EnvType.CLIENT)
class ProjectedPersonRenderer(context: EntityRendererProvider.Context) : class ProjectedPersonRenderer(context: EntityRendererProvider.Context) :
MobRenderer<ProjectedPersonEntity, PlayerModel<ProjectedPersonEntity>>( MobRenderer<ProjectedPersonEntity, PlayerModel<ProjectedPersonEntity>>(
context, context,

5
common/src/main/kotlin/quaedam/projection/swarm/ProjectedPersonShape.kt
View File

@ -3,7 +3,6 @@ package quaedam.projection.swarm
import dev.architectury.platform.Platform import dev.architectury.platform.Platform
import dev.architectury.registry.ReloadListenerRegistry import dev.architectury.registry.ReloadListenerRegistry
import net.fabricmc.api.EnvType import net.fabricmc.api.EnvType
import net.fabricmc.api.Environment
import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.CompoundTag
import net.minecraft.resources.ResourceLocation import net.minecraft.resources.ResourceLocation
import net.minecraft.server.packs.PackType import net.minecraft.server.packs.PackType
@ -13,8 +12,6 @@ import net.minecraft.util.profiling.ProfilerFiller
import quaedam.Quaedam import quaedam.Quaedam
import java.util.concurrent.CompletableFuture import java.util.concurrent.CompletableFuture
import java.util.concurrent.Executor import java.util.concurrent.Executor
import java.util.function.IntFunction
import java.util.stream.Collectors
import kotlin.math.abs import kotlin.math.abs
import kotlin.random.Random import kotlin.random.Random
import kotlin.random.nextInt import kotlin.random.nextInt
@ -137,7 +134,7 @@ data class ProjectedPersonShape(
skins.addAll(resourceManager.listResources("textures/entity/projected_person") { it.namespace == "quaedam" }.keys) skins.addAll(resourceManager.listResources("textures/entity/projected_person") { it.namespace == "quaedam" }.keys)
Skins.skins = skins.toSet().toList().sorted() Skins.skins = skins.toSet().toList().sorted()
Quaedam.logger.info("Loaded ${Skins.skins.size} unique projected person skins") Quaedam.logger.info("Loaded ${Skins.skins.size} unique projected person skins")
Quaedam.logger.debug("Projected person skins ring: $skins") Quaedam.logger.debug("Projected person skins ring: {}", skins)
}, executor2) }, executor2)
override fun getName() = "quaedam:projected_person_skins" override fun getName() = "quaedam:projected_person_skins"

1
common/src/main/kotlin/quaedam/projector/ProjectorBlockEntity.kt
View File

@ -12,7 +12,6 @@ import net.minecraft.world.level.ChunkPos
import net.minecraft.world.level.block.entity.BlockEntity import net.minecraft.world.level.block.entity.BlockEntity
import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.block.state.BlockState
import net.minecraft.world.level.levelgen.structure.BoundingBox import net.minecraft.world.level.levelgen.structure.BoundingBox
import quaedam.Quaedam
import quaedam.projection.ProjectionEffect import quaedam.projection.ProjectionEffect
import quaedam.projection.ProjectionEffectType import quaedam.projection.ProjectionEffectType
import quaedam.projection.ProjectionProvider import quaedam.projection.ProjectionProvider