From 1e618439dc6e2d62a1c8c992d7036cb917d459b2 Mon Sep 17 00:00:00 2001 From: Sarinsa Date: Fri, 1 Jul 2022 02:52:03 +0200 Subject: [PATCH] Scrap attempt at ninja TE disguise --- .../entity/NinjaSkeletonRenderer.java | 27 +++++-------------- .../specialmobs/common/entity/ai/INinja.java | 3 --- .../entity/skeleton/NinjaSkeletonEntity.java | 14 ---------- .../NinjaWitherSkeletonEntity.java | 14 ---------- 4 files changed, 6 insertions(+), 52 deletions(-) diff --git a/src/main/java/fathertoast/specialmobs/client/renderer/entity/NinjaSkeletonRenderer.java b/src/main/java/fathertoast/specialmobs/client/renderer/entity/NinjaSkeletonRenderer.java index 47acf4f..412e5af 100644 --- a/src/main/java/fathertoast/specialmobs/client/renderer/entity/NinjaSkeletonRenderer.java +++ b/src/main/java/fathertoast/specialmobs/client/renderer/entity/NinjaSkeletonRenderer.java @@ -54,29 +54,14 @@ public class NinjaSkeletonRenderer extends SpecialSkeletonRenderer { } else { shadowRadius = 0.0F; - renderBlockDisguise( ninja, disguiseBlock, entity.blockPosition(), partialTicks, entity.level, matrixStack, buffer, entity.getRandom() ); + renderBlockDisguise( disguiseBlock, entity.blockPosition(), entity.level, matrixStack, buffer, entity.getRandom() ); } } - private void renderBlockDisguise( INinja ninja, BlockState block, BlockPos pos, float partialTicks, IBlockDisplayReader displayReader, MatrixStack matrixStack, IRenderTypeBuffer buffer, Random random ) { - if (block.hasTileEntity()) { - TileEntity cachedTile = ninja.getOrCreateCachedTile(); - - if (cachedTile != null) { - renderTileEntityDisguise(cachedTile, partialTicks, matrixStack); - } - } - else { - matrixStack.pushPose(); - matrixStack.translate( -0.5, 0.0, -0.5 ); - blockRenderer.renderModel(block, pos, displayReader, matrixStack, buffer.getBuffer(RenderType.cutout()), false, random, EmptyModelData.INSTANCE); - matrixStack.popPose(); - } - } - - // TODO - Investigate or scrap? Currently does not work - private void renderTileEntityDisguise( TileEntity tileEntity, float partialTicks, MatrixStack matrixStack ) { - IRenderTypeBuffer renderTypeBuffer = Minecraft.getInstance().levelRenderer.renderBuffers.bufferSource(); - TileEntityRendererDispatcher.instance.render(tileEntity, partialTicks, matrixStack, renderTypeBuffer); + private void renderBlockDisguise( BlockState block, BlockPos pos, IBlockDisplayReader displayReader, MatrixStack matrixStack, IRenderTypeBuffer buffer, Random random ) { + matrixStack.pushPose(); + matrixStack.translate( -0.5, 0.0, -0.5 ); + blockRenderer.renderModel(block, pos, displayReader, matrixStack, buffer.getBuffer(RenderType.cutout()), false, random, EmptyModelData.INSTANCE); + matrixStack.popPose(); } } \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/ai/INinja.java b/src/main/java/fathertoast/specialmobs/common/entity/ai/INinja.java index 7235a3b..85579bd 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/ai/INinja.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/ai/INinja.java @@ -26,7 +26,4 @@ public interface INinja { /** Sets the block being hidden (rendered) as, set to null to cancel hiding. */ void setHiddenDragon( @Nullable BlockState block ); - - @Nullable - TileEntity getOrCreateCachedTile(); } \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/NinjaSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/NinjaSkeletonEntity.java index 6d33270..b4e3d2c 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/skeleton/NinjaSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/skeleton/NinjaSkeletonEntity.java @@ -257,18 +257,4 @@ public class NinjaSkeletonEntity extends _SpecialSkeletonEntity implements INinj spawnAnim(); } } - - @Nullable - @Override - public TileEntity getOrCreateCachedTile () { - if (cachedTileEntity == null) { - BlockState disguise = getHiddenDragon(); - - if (disguise != null && disguise.hasTileEntity()) { - cachedTileEntity = disguise.createTileEntity(level); - cachedTileEntity.setLevelAndPosition(null, BlockPos.ZERO); - } - } - return cachedTileEntity; - } } \ No newline at end of file diff --git a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/NinjaWitherSkeletonEntity.java b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/NinjaWitherSkeletonEntity.java index 829887a..3e8cac6 100644 --- a/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/NinjaWitherSkeletonEntity.java +++ b/src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/NinjaWitherSkeletonEntity.java @@ -6,7 +6,6 @@ import fathertoast.specialmobs.common.bestiary.SpecialMob; import fathertoast.specialmobs.common.entity.MobHelper; import fathertoast.specialmobs.common.entity.ai.INinja; import fathertoast.specialmobs.common.entity.ai.NinjaGoal; -import fathertoast.specialmobs.common.network.NetworkHelper; import fathertoast.specialmobs.common.util.AttributeHelper; import fathertoast.specialmobs.common.util.References; import fathertoast.specialmobs.datagen.loot.LootTableBuilder; @@ -29,7 +28,6 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.DamageSource; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.World; @@ -250,16 +248,4 @@ public class NinjaWitherSkeletonEntity extends _SpecialWitherSkeletonEntity impl spawnAnim(); } } - - @Nullable - @Override - public TileEntity getOrCreateCachedTile () { - if (cachedTileEntity == null) { - if (getHiddenDragon().hasTileEntity()) { - cachedTileEntity = getHiddenDragon().createTileEntity(level); - cachedTileEntity.setLevelAndPosition(null, BlockPos.ZERO); - } - } - return cachedTileEntity; - } } \ No newline at end of file