From 83f7e43017486d97783e16cf03ab466d1501c694 Mon Sep 17 00:00:00 2001 From: blryface <124838505+blryface@users.noreply.github.com> Date: Sun, 15 Sep 2024 19:03:45 -0300 Subject: [PATCH] =?UTF-8?q?PrideSlime=20->=20=F0=9F=AA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/gay/pridecraft/joy/JoyClient.java | 1 - .../renderer/entity/PrideSlimeRenderer.java | 46 ----------------- .../PrideSlimeOverlayFeatureRenderer.java | 47 ------------------ .../renderer/model/PrideSlimeEntityModel.java | 47 ------------------ .../joy/textures/entity/slime/pride_slime.png | Bin 3710 -> 0 bytes 5 files changed, 141 deletions(-) delete mode 100644 src/main/java/gay/pridecraft/joy/renderer/entity/PrideSlimeRenderer.java delete mode 100644 src/main/java/gay/pridecraft/joy/renderer/feature/PrideSlimeOverlayFeatureRenderer.java delete mode 100644 src/main/java/gay/pridecraft/joy/renderer/model/PrideSlimeEntityModel.java delete mode 100644 src/main/resources/assets/joy/textures/entity/slime/pride_slime.png diff --git a/src/main/java/gay/pridecraft/joy/JoyClient.java b/src/main/java/gay/pridecraft/joy/JoyClient.java index a046735..e283afa 100644 --- a/src/main/java/gay/pridecraft/joy/JoyClient.java +++ b/src/main/java/gay/pridecraft/joy/JoyClient.java @@ -60,7 +60,6 @@ public class JoyClient implements ClientModInitializer { EntityRendererRegistry.register(ModEntities.TREE, TreeRenderer::new); EntityRendererRegistry.register(ModEntities.AXOLOTL, AxolotlRenderer::new); EntityRendererRegistry.register(ModEntities.FROG, FrogRenderer::new); - EntityRendererRegistry.register(ModEntities.PRIDE_SLIME, PrideSlimeRenderer::new); EntityRendererRegistry.register(ModEntities.PRIDE_SNIFFER, PrideSnifferRenderer::new); } } diff --git a/src/main/java/gay/pridecraft/joy/renderer/entity/PrideSlimeRenderer.java b/src/main/java/gay/pridecraft/joy/renderer/entity/PrideSlimeRenderer.java deleted file mode 100644 index 71e38ae..0000000 --- a/src/main/java/gay/pridecraft/joy/renderer/entity/PrideSlimeRenderer.java +++ /dev/null @@ -1,46 +0,0 @@ -package gay.pridecraft.joy.renderer.entity; - -import gay.pridecraft.joy.Joy; -import gay.pridecraft.joy.entity.custom.living.CustomSlimeEntity; -import gay.pridecraft.joy.renderer.feature.PrideSlimeOverlayFeatureRenderer; -import gay.pridecraft.joy.renderer.model.PrideSlimeEntityModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.render.entity.EntityRendererFactory; -import net.minecraft.client.render.entity.MobEntityRenderer; -import net.minecraft.client.render.entity.model.EntityModelLayers; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.MathHelper; - -@Environment(EnvType.CLIENT) -public class PrideSlimeRenderer extends MobEntityRenderer> { - private static final Identifier TEXTURE = Identifier.of(Joy.MOD_ID, "textures/entity/slime/pride_slime.png"); - - public PrideSlimeRenderer(EntityRendererFactory.Context context) { - super(context, new PrideSlimeEntityModel<>(context.getPart(EntityModelLayers.SLIME)), 0.25F); - this.addFeature(new PrideSlimeOverlayFeatureRenderer<>(this, context.getModelLoader())); - } - - @Override - public Identifier getTexture(CustomSlimeEntity.PrideSlimeEntity entity) { - return TEXTURE; - } - - public void render(CustomSlimeEntity.PrideSlimeEntity slimeEntity, float f, float g, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i) { - this.shadowRadius = 0.25F * (float)slimeEntity.getSize(); - super.render(slimeEntity, f, g, matrixStack, vertexConsumerProvider, i); - } - - protected void scale(CustomSlimeEntity.PrideSlimeEntity slimeEntity, MatrixStack matrixStack, float f) { - float g = 0.999F; - matrixStack.scale(0.999F, 0.999F, 0.999F); - matrixStack.translate(0.0F, 0.001F, 0.0F); - float h = (float) slimeEntity.getSize(); - float i = MathHelper.lerp(f, slimeEntity.lastStretch, slimeEntity.stretch) / (h * 0.5F + 1.0F); - float j = 1.0F / (i + 1.0F); - matrixStack.scale(j * h, 1.0F / j * h, j * h); - } -} - diff --git a/src/main/java/gay/pridecraft/joy/renderer/feature/PrideSlimeOverlayFeatureRenderer.java b/src/main/java/gay/pridecraft/joy/renderer/feature/PrideSlimeOverlayFeatureRenderer.java deleted file mode 100644 index 60eb5e1..0000000 --- a/src/main/java/gay/pridecraft/joy/renderer/feature/PrideSlimeOverlayFeatureRenderer.java +++ /dev/null @@ -1,47 +0,0 @@ -package gay.pridecraft.joy.renderer.feature; - -import gay.pridecraft.joy.renderer.model.PrideSlimeEntityModel; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.render.RenderLayer; -import net.minecraft.client.render.VertexConsumer; -import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.render.entity.LivingEntityRenderer; -import net.minecraft.client.render.entity.feature.FeatureRenderer; -import net.minecraft.client.render.entity.feature.FeatureRendererContext; -import net.minecraft.client.render.entity.model.EntityModel; -import net.minecraft.client.render.entity.model.EntityModelLayers; -import net.minecraft.client.render.entity.model.EntityModelLoader; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.entity.LivingEntity; - -@Environment(EnvType.CLIENT) -public class PrideSlimeOverlayFeatureRenderer extends FeatureRenderer> { - private final EntityModel model; - - public PrideSlimeOverlayFeatureRenderer(FeatureRendererContext> context, EntityModelLoader loader) { - super(context); - this.model = new PrideSlimeEntityModel<>(loader.getModelPart(EntityModelLayers.SLIME_OUTER)); - } - - public void render( - MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T livingEntity, float f, float g, float h, float j, float k, float l - ) { - MinecraftClient minecraftClient = MinecraftClient.getInstance(); - boolean bl = minecraftClient.hasOutline(livingEntity) && livingEntity.isInvisible(); - if (!livingEntity.isInvisible() || bl) { - VertexConsumer vertexConsumer; - if (bl) { - vertexConsumer = vertexConsumerProvider.getBuffer(RenderLayer.getOutline(this.getTexture(livingEntity))); - } else { - vertexConsumer = vertexConsumerProvider.getBuffer(RenderLayer.getEntityTranslucent(this.getTexture(livingEntity))); - } - - this.getContextModel().copyStateTo(this.model); - this.model.animateModel(livingEntity, f, g, h); - this.model.setAngles(livingEntity, f, g, j, k, l); - this.model.render(matrixStack, vertexConsumer, i, LivingEntityRenderer.getOverlay(livingEntity, 0.0F)); - } - } -} diff --git a/src/main/java/gay/pridecraft/joy/renderer/model/PrideSlimeEntityModel.java b/src/main/java/gay/pridecraft/joy/renderer/model/PrideSlimeEntityModel.java deleted file mode 100644 index 972600f..0000000 --- a/src/main/java/gay/pridecraft/joy/renderer/model/PrideSlimeEntityModel.java +++ /dev/null @@ -1,47 +0,0 @@ -package gay.pridecraft.joy.renderer.model; - -import net.minecraft.client.render.entity.model.SinglePartEntityModel; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.model.ModelData; -import net.minecraft.client.model.ModelPart; -import net.minecraft.client.model.ModelPartBuilder; -import net.minecraft.client.model.ModelPartData; -import net.minecraft.client.model.ModelTransform; -import net.minecraft.client.model.TexturedModelData; -import net.minecraft.entity.Entity; - -@Environment(EnvType.CLIENT) -public class PrideSlimeEntityModel extends SinglePartEntityModel { - private final ModelPart root; - - public PrideSlimeEntityModel(ModelPart root) { - this.root = root; - } - - public static TexturedModelData getOuterTexturedModelData() { - ModelData modelData = new ModelData(); - ModelPartData modelPartData = modelData.getRoot(); - modelPartData.addChild("cube", ModelPartBuilder.create().uv(0, 0).cuboid(-4.0F, 16.0F, -4.0F, 8.0F, 8.0F, 8.0F), ModelTransform.NONE); - return TexturedModelData.of(modelData, 64, 32); - } - - public static TexturedModelData getInnerTexturedModelData() { - ModelData modelData = new ModelData(); - ModelPartData modelPartData = modelData.getRoot(); - modelPartData.addChild("cube", ModelPartBuilder.create().uv(0, 16).cuboid(-3.0F, 17.0F, -3.0F, 6.0F, 6.0F, 6.0F), ModelTransform.NONE); - modelPartData.addChild("right_eye", ModelPartBuilder.create().uv(32, 0).cuboid(-3.25F, 18.0F, -3.5F, 2.0F, 2.0F, 2.0F), ModelTransform.NONE); - modelPartData.addChild("left_eye", ModelPartBuilder.create().uv(32, 4).cuboid(1.25F, 18.0F, -3.5F, 2.0F, 2.0F, 2.0F), ModelTransform.NONE); - modelPartData.addChild("mouth", ModelPartBuilder.create().uv(32, 8).cuboid(0.0F, 21.0F, -3.5F, 1.0F, 1.0F, 1.0F), ModelTransform.NONE); - return TexturedModelData.of(modelData, 64, 32); - } - - public void setAngles(T entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) { - } - - public ModelPart getPart() { - return this.root; - } -} - diff --git a/src/main/resources/assets/joy/textures/entity/slime/pride_slime.png b/src/main/resources/assets/joy/textures/entity/slime/pride_slime.png deleted file mode 100644 index 5b5fde762999e47547efd7ecd4e8c33b0b84ea3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3710 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