WIP boss stuff.

Currently, no progress has been made, but I will be working on it. Only reason I am making this commit is, so I can revert changes to this point after trying to fix the accessory hiding not syncing on world join.
jakeb072001 · Feb 22, 2024 · 1b0b78d · 1b0b78d
1 parent e154ada
commit 1b0b78d
Show file tree

Hide file tree

Showing 33 changed files with 481 additions and 65 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.7.2-1.20.1] - 2024-01-27
+## [1.8.0-1.20.1] - 2024-04-01
+### Added
+- Eye of Cthulhu and Eater of Worlds //-- Not yet done
+- Teams //-- Not yet done
+
+## [1.7.2-1.20.1] - 2024-02-21
 ### Changed
 - Skulls and Pumpkin now work with vanity system
 - Metal detector now detects Hellstone and Meteorite

diff --git a/src/main/java/terramine/client/render/ModAllEntityRenderers.java b/src/main/java/terramine/client/render/ModAllEntityRenderers.java
@@ -8,13 +8,14 @@
 import terramine.client.render.entity.renderer.blocks.ChestEntityRenderer;
 import terramine.client.render.entity.renderer.misc.FallingStarRenderer;
 import terramine.client.render.entity.renderer.misc.MeteoriteRenderer;
-import terramine.client.render.entity.renderer.monsters.CrimeraRenderer;
-import terramine.client.render.entity.renderer.monsters.DemonEyeRenderer;
-import terramine.client.render.entity.renderer.monsters.EaterOfSoulsRenderer;
-import terramine.client.render.entity.renderer.monsters.MimicRenderer;
-import terramine.client.render.entity.renderer.monsters.devourer.DevourerBodyRenderer;
-import terramine.client.render.entity.renderer.monsters.devourer.DevourerHeadRenderer;
-import terramine.client.render.entity.renderer.monsters.devourer.DevourerTailRenderer;
+import terramine.client.render.entity.renderer.mobs.bosses.TestBossRenderer;
+import terramine.client.render.entity.renderer.mobs.prehardmode.CrimeraRenderer;
+import terramine.client.render.entity.renderer.mobs.prehardmode.DemonEyeRenderer;
+import terramine.client.render.entity.renderer.mobs.prehardmode.EaterOfSoulsRenderer;
+import terramine.client.render.entity.renderer.mobs.hardmode.MimicRenderer;
+import terramine.client.render.entity.renderer.mobs.prehardmode.devourer.DevourerBodyRenderer;
+import terramine.client.render.entity.renderer.mobs.prehardmode.devourer.DevourerHeadRenderer;
+import terramine.client.render.entity.renderer.mobs.prehardmode.devourer.DevourerTailRenderer;
 import terramine.client.render.entity.renderer.projectiles.magic.FlamelashMissileRenderer;
 import terramine.client.render.entity.renderer.projectiles.magic.LaserRenderer;
 import terramine.client.render.entity.renderer.projectiles.magic.MagicMissileRenderer;
@@ -58,6 +59,11 @@ public static void register() {
         EntityRendererRegistry.register(ModEntities.DEVOURER_BODY, DevourerBodyRenderer::new);
         EntityRendererRegistry.register(ModEntities.DEVOURER_TAIL, DevourerTailRenderer::new);
         EntityRendererRegistry.register(ModEntities.CRIMERA, CrimeraRenderer::new);
+        /**
+         * Testing, remove later
+         */
+        EntityRendererRegistry.register(ModEntities.TEST_BOSS, TestBossRenderer::new);
+
         EntityRendererRegistry.register(ModEntities.FALLING_STAR, FallingStarRenderer::new);
         EntityRendererRegistry.register(ModEntities.METEORITE, MeteoriteRenderer::new);
         EntityRendererRegistry.register(ModEntities.MAGIC_MISSILE, MagicMissileRenderer::new);

diff --git a/src/main/java/terramine/client/render/entity/model/mobs/bosses/TestBossModel.java b/src/main/java/terramine/client/render/entity/model/mobs/bosses/TestBossModel.java
@@ -0,0 +1,30 @@
+package terramine.client.render.entity.model.mobs.bosses;
+
+import net.minecraft.client.model.AnimationUtils;
+import net.minecraft.client.model.HumanoidModel;
+import net.minecraft.client.model.geom.ModelPart;
+import net.minecraft.client.model.geom.builders.*;
+import terramine.common.entity.mobs.BossEntityAI;
+
+/**
+ * Testing, remove later
+ */
+public class TestBossModel<T extends BossEntityAI> extends HumanoidModel<T> {
+
+    public TestBossModel(ModelPart modelPart) {
+        super(modelPart);
+    }
+
+    public void setupAnim(T monster, float f, float g, float h, float i, float j) {
+        super.setupAnim(monster, f, g, h, i, j);
+        AnimationUtils.animateZombieArms(this.leftArm, this.rightArm, this.isAggressive(), this.attackTime, h);
+    }
+
+    public static LayerDefinition createLayer() {
+        return LayerDefinition.create(createMesh(new CubeDeformation(0.0F), 0), 64, 64);
+    }
+
+    public boolean isAggressive() {
+        return true;
+    }
+}
diff --git a/.../model/monsters/MimicChestLayerModel.java → ...l/mobs/hardmode/MimicChestLayerModel.java b/.../model/monsters/MimicChestLayerModel.java → ...l/mobs/hardmode/MimicChestLayerModel.java
@@ -1,4 +1,4 @@
-package terramine.client.render.entity.model.monsters;
+package terramine.client.render.entity.model.mobs.hardmode;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
@@ -8,7 +8,7 @@
 import net.minecraft.client.model.geom.builders.CubeListBuilder;
 import net.minecraft.client.model.geom.builders.LayerDefinition;
 import net.minecraft.client.model.geom.builders.MeshDefinition;
-import terramine.common.entity.mobs.MimicEntity;
+import terramine.common.entity.mobs.hardmode.MimicEntity;
 
 public class MimicChestLayerModel extends EntityModel<MimicEntity> {
 

diff --git a/...der/entity/model/monsters/MimicModel.java → ...ntity/model/mobs/hardmode/MimicModel.java b/...der/entity/model/monsters/MimicModel.java → ...ntity/model/mobs/hardmode/MimicModel.java
@@ -1,4 +1,4 @@
-package terramine.client.render.entity.model.monsters;
+package terramine.client.render.entity.model.mobs.hardmode;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
@@ -9,7 +9,7 @@
 import net.minecraft.client.model.geom.builders.CubeListBuilder;
 import net.minecraft.client.model.geom.builders.LayerDefinition;
 import net.minecraft.client.model.geom.builders.MeshDefinition;
-import terramine.common.entity.mobs.MimicEntity;
+import terramine.common.entity.mobs.hardmode.MimicEntity;
 
 public class MimicModel extends EntityModel<MimicEntity> {
 

diff --git a/...r/entity/model/monsters/CrimeraModel.java → .../model/mobs/prehardmode/CrimeraModel.java b/...r/entity/model/monsters/CrimeraModel.java → .../model/mobs/prehardmode/CrimeraModel.java
@@ -1,4 +1,4 @@
-package terramine.client.render.entity.model.monsters;
+package terramine.client.render.entity.model.mobs.prehardmode;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
@@ -9,7 +9,7 @@
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.util.Mth;
 import org.jetbrains.annotations.NotNull;
-import terramine.common.entity.mobs.CrimeraEntity;
+import terramine.common.entity.mobs.prehardmode.CrimeraEntity;
 
 public class CrimeraModel<T extends CrimeraEntity> extends HierarchicalModel<T> {
 

diff --git a/.../entity/model/monsters/DemonEyeModel.java → ...model/mobs/prehardmode/DemonEyeModel.java b/.../entity/model/monsters/DemonEyeModel.java → ...model/mobs/prehardmode/DemonEyeModel.java
@@ -1,4 +1,4 @@
-package terramine.client.render.entity.model.monsters;
+package terramine.client.render.entity.model.mobs.prehardmode;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
@@ -10,7 +10,7 @@
 import net.minecraft.client.model.geom.builders.MeshDefinition;
 import net.minecraft.client.renderer.RenderType;
 import org.jetbrains.annotations.NotNull;
-import terramine.common.entity.mobs.DemonEyeEntity;
+import terramine.common.entity.mobs.prehardmode.DemonEyeEntity;
 
 public class DemonEyeModel<T extends DemonEyeEntity> extends HierarchicalModel<T> {
 

diff --git a/.../entity/model/monsters/DevourerModel.java → ...model/mobs/prehardmode/DevourerModel.java b/.../entity/model/monsters/DevourerModel.java → ...model/mobs/prehardmode/DevourerModel.java
@@ -1,4 +1,4 @@
-package terramine.client.render.entity.model.monsters;
+package terramine.client.render.entity.model.mobs.prehardmode;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
@@ -9,8 +9,8 @@
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.world.entity.monster.Monster;
 import org.jetbrains.annotations.NotNull;
-import terramine.common.entity.mobs.devourer.DevourerEntity;
-import terramine.common.entity.mobs.devourer.DevourerTailEntity;
+import terramine.common.entity.mobs.prehardmode.devourer.DevourerEntity;
+import terramine.common.entity.mobs.prehardmode.devourer.DevourerTailEntity;
 
 public class DevourerModel<T extends Monster> extends HierarchicalModel<T> {
     protected final ModelPart root;

diff --git a/...ity/model/monsters/EaterOfSoulsModel.java → ...l/mobs/prehardmode/EaterOfSoulsModel.java b/...ity/model/monsters/EaterOfSoulsModel.java → ...l/mobs/prehardmode/EaterOfSoulsModel.java
@@ -1,4 +1,4 @@
-package terramine.client.render.entity.model.monsters;
+package terramine.client.render.entity.model.mobs.prehardmode;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
@@ -9,7 +9,7 @@
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.util.Mth;
 import org.jetbrains.annotations.NotNull;
-import terramine.common.entity.mobs.EaterOfSoulsEntity;
+import terramine.common.entity.mobs.prehardmode.EaterOfSoulsEntity;
 
 public class EaterOfSoulsModel<T extends EaterOfSoulsEntity> extends HierarchicalModel<T> {
 

diff --git a/src/main/java/terramine/client/render/entity/renderer/mobs/bosses/TestBossRenderer.java b/src/main/java/terramine/client/render/entity/renderer/mobs/bosses/TestBossRenderer.java
@@ -0,0 +1,37 @@
+package terramine.client.render.entity.renderer.mobs.bosses;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.entity.EntityRendererProvider;
+import net.minecraft.client.renderer.entity.MobRenderer;
+import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.NotNull;
+import terramine.TerraMine;
+import terramine.client.render.entity.model.mobs.bosses.TestBossModel;
+import terramine.common.entity.mobs.bosses.TestBoss;
+import terramine.common.init.ModModelLayers;
+
+/**
+ * Testing, remove later
+ */
+@Environment(value= EnvType.CLIENT)
+public class TestBossRenderer extends MobRenderer<TestBoss, TestBossModel<TestBoss>> {
+
+    private static final ResourceLocation TEXTURE = TerraMine.id("textures/entity/monsters/pre-hardmode/crimera/default.png");
+
+    public TestBossRenderer(EntityRendererProvider.Context context) {
+        super(context, new TestBossModel<>(context.bakeLayer(ModModelLayers.TEST_BOSS)), 0.70F);
+    }
+
+    @Override
+    public ResourceLocation getTextureLocation(TestBoss entity) {
+        return TEXTURE;
+    }
+
+    @Override
+    public void render(@NotNull TestBoss entity, float entityYaw, float partialTicks, @NotNull PoseStack matrixStack, @NotNull MultiBufferSource buffer, int packedLight) {
+        super.render(entity, entityYaw, partialTicks, matrixStack, buffer, packedLight);
+    }
+}
diff --git a/...ty/renderer/monsters/MimicChestLayer.java → ...nderer/mobs/hardmode/MimicChestLayer.java b/...ty/renderer/monsters/MimicChestLayer.java → ...nderer/mobs/hardmode/MimicChestLayer.java
@@ -1,4 +1,4 @@
-package terramine.client.render.entity.renderer.monsters;
+package terramine.client.render.entity.renderer.mobs.hardmode;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
@@ -14,9 +14,9 @@
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 import terramine.TerraMine;
-import terramine.client.render.entity.model.monsters.MimicChestLayerModel;
-import terramine.client.render.entity.model.monsters.MimicModel;
-import terramine.common.entity.mobs.MimicEntity;
+import terramine.client.render.entity.model.mobs.hardmode.MimicChestLayerModel;
+import terramine.client.render.entity.model.mobs.hardmode.MimicModel;
+import terramine.common.entity.mobs.hardmode.MimicEntity;
 import terramine.common.init.ModModelLayers;
 
 import java.util.ArrayList;

diff --git a/...tity/renderer/monsters/MimicRenderer.java → ...renderer/mobs/hardmode/MimicRenderer.java b/...tity/renderer/monsters/MimicRenderer.java → ...renderer/mobs/hardmode/MimicRenderer.java
@@ -1,4 +1,4 @@
-package terramine.client.render.entity.renderer.monsters;
+package terramine.client.render.entity.renderer.mobs.hardmode;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.MultiBufferSource;
@@ -7,8 +7,8 @@
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 import terramine.TerraMine;
-import terramine.client.render.entity.model.monsters.MimicModel;
-import terramine.common.entity.mobs.MimicEntity;
+import terramine.client.render.entity.model.mobs.hardmode.MimicModel;
+import terramine.common.entity.mobs.hardmode.MimicEntity;
 import terramine.common.init.ModModelLayers;
 
 public class MimicRenderer extends MobRenderer<MimicEntity, MimicModel> {

diff --git a/...ty/renderer/monsters/CrimeraRenderer.java → ...rer/mobs/prehardmode/CrimeraRenderer.java b/...ty/renderer/monsters/CrimeraRenderer.java → ...rer/mobs/prehardmode/CrimeraRenderer.java
@@ -1,4 +1,4 @@
-package terramine.client.render.entity.renderer.monsters;
+package terramine.client.render.entity.renderer.mobs.prehardmode;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
@@ -10,8 +10,8 @@
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 import terramine.TerraMine;
-import terramine.client.render.entity.model.monsters.CrimeraModel;
-import terramine.common.entity.mobs.CrimeraEntity;
+import terramine.client.render.entity.model.mobs.prehardmode.CrimeraModel;
+import terramine.common.entity.mobs.prehardmode.CrimeraEntity;
 import terramine.common.init.ModModelLayers;
 
 @Environment(value=EnvType.CLIENT)

diff --git a/...y/renderer/monsters/DemonEyeRenderer.java → ...er/mobs/prehardmode/DemonEyeRenderer.java b/...y/renderer/monsters/DemonEyeRenderer.java → ...er/mobs/prehardmode/DemonEyeRenderer.java
@@ -1,4 +1,4 @@
-package terramine.client.render.entity.renderer.monsters;
+package terramine.client.render.entity.renderer.mobs.prehardmode;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
@@ -10,8 +10,8 @@
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 import terramine.TerraMine;
-import terramine.client.render.entity.model.monsters.DemonEyeModel;
-import terramine.common.entity.mobs.DemonEyeEntity;
+import terramine.client.render.entity.model.mobs.prehardmode.DemonEyeModel;
+import terramine.common.entity.mobs.prehardmode.DemonEyeEntity;
 import terramine.common.init.ModModelLayers;
 
 @Environment(value=EnvType.CLIENT)

diff --git a/...nderer/monsters/EaterOfSoulsRenderer.java → ...obs/prehardmode/EaterOfSoulsRenderer.java b/...nderer/monsters/EaterOfSoulsRenderer.java → ...obs/prehardmode/EaterOfSoulsRenderer.java
@@ -1,4 +1,4 @@
-package terramine.client.render.entity.renderer.monsters;
+package terramine.client.render.entity.renderer.mobs.prehardmode;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
@@ -10,8 +10,8 @@
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 import terramine.TerraMine;
-import terramine.client.render.entity.model.monsters.EaterOfSoulsModel;
-import terramine.common.entity.mobs.EaterOfSoulsEntity;
+import terramine.client.render.entity.model.mobs.prehardmode.EaterOfSoulsModel;
+import terramine.common.entity.mobs.prehardmode.EaterOfSoulsEntity;
 import terramine.common.init.ModModelLayers;
 
 @Environment(value=EnvType.CLIENT)

diff --git a/...nsters/devourer/DevourerBodyRenderer.java → ...rdmode/devourer/DevourerBodyRenderer.java b/...nsters/devourer/DevourerBodyRenderer.java → ...rdmode/devourer/DevourerBodyRenderer.java
@@ -1,4 +1,4 @@
-package terramine.client.render.entity.renderer.monsters.devourer;
+package terramine.client.render.entity.renderer.mobs.prehardmode.devourer;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
@@ -10,8 +10,8 @@
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 import terramine.TerraMine;
-import terramine.client.render.entity.model.monsters.DevourerModel;
-import terramine.common.entity.mobs.devourer.DevourerBodyEntity;
+import terramine.client.render.entity.model.mobs.prehardmode.DevourerModel;
+import terramine.common.entity.mobs.prehardmode.devourer.DevourerBodyEntity;
 import terramine.common.init.ModModelLayers;
 
 @Environment(value=EnvType.CLIENT)

diff --git a/...nsters/devourer/DevourerHeadRenderer.java → ...rdmode/devourer/DevourerHeadRenderer.java b/...nsters/devourer/DevourerHeadRenderer.java → ...rdmode/devourer/DevourerHeadRenderer.java
@@ -1,4 +1,4 @@
-package terramine.client.render.entity.renderer.monsters.devourer;
+package terramine.client.render.entity.renderer.mobs.prehardmode.devourer;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
@@ -10,8 +10,8 @@
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 import terramine.TerraMine;
-import terramine.client.render.entity.model.monsters.DevourerModel;
-import terramine.common.entity.mobs.devourer.DevourerEntity;
+import terramine.client.render.entity.model.mobs.prehardmode.DevourerModel;
+import terramine.common.entity.mobs.prehardmode.devourer.DevourerEntity;
 import terramine.common.init.ModModelLayers;
 
 @Environment(value=EnvType.CLIENT)

diff --git a/...nsters/devourer/DevourerTailRenderer.java → ...rdmode/devourer/DevourerTailRenderer.java b/...nsters/devourer/DevourerTailRenderer.java → ...rdmode/devourer/DevourerTailRenderer.java
@@ -1,4 +1,4 @@
-package terramine.client.render.entity.renderer.monsters.devourer;
+package terramine.client.render.entity.renderer.mobs.prehardmode.devourer;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
@@ -10,8 +10,8 @@
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
 import terramine.TerraMine;
-import terramine.client.render.entity.model.monsters.DevourerModel;
-import terramine.common.entity.mobs.devourer.DevourerTailEntity;
+import terramine.client.render.entity.model.mobs.prehardmode.DevourerModel;
+import terramine.common.entity.mobs.prehardmode.devourer.DevourerTailEntity;
 import terramine.common.init.ModModelLayers;
 
 @Environment(value=EnvType.CLIENT)