Castle Renovation

-Removed placeholder final boss -Cleaned up castle spawns -Giants can no longer be knocked back
Elite-Modding-Team · Apr 25, 2024 · ec1714e · ec1714e
1 parent ab7c932
commit ec1714e
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 155 deletions.
diff --git a/src/main/java/twilightforest/TFFeature.java b/src/main/java/twilightforest/TFFeature.java
@@ -393,15 +393,12 @@ public StructureStartTFAbstract provideStructureStart(World world, Random rand,
 			TFFinalCastlePieces.registerFinalCastlePieces();
 
 			// plain parts of the castle, like the tower maze
-			this.addMonster(EntityTFKobold.class, 10, 4, 4)
-					.addMonster(EntityTFAdherent.class, 10, 1, 1)
+			this.addMonster(EntityTFAdherent.class, 10, 1, 1)
 					.addMonster(EntityTFHarbingerCube.class, 10, 1, 1)
-					.addMonster(EntityEnderman.class, 10, 1, 1)
 					// internal castle
-					.addMonster(1, EntityTFKobold.class, 10, 4, 4)
 					.addMonster(1, EntityTFAdherent.class, 10, 1, 1)
 					.addMonster(1, EntityTFHarbingerCube.class, 10, 1, 1)
-					.addMonster(1, EntityTFArmoredGiant.class, 10, 1, 1)
+					.addMonster(1, EntityTFArmoredGiant.class, 10, 1, 1) // Placeholder
 					// dungeons
 					.addMonster(2, EntityTFAdherent.class, 10, 1, 1)
 					// forge

diff --git a/src/main/java/twilightforest/TFSounds.java b/src/main/java/twilightforest/TFSounds.java
@@ -17,9 +17,6 @@ public final class TFSounds {
 	public static final SoundEvent KOBOLD_AMBIENT = createEvent("mob.kobold.kobold");
 	public static final SoundEvent KOBOLD_HURT = createEvent("mob.kobold.hurt");
 	public static final SoundEvent KOBOLD_PARROT = createEvent("mob.kobold.parrot");
-	public static final SoundEvent FINAL_KOBOLD_DEATH = createEvent("mob.final_kobold.die");
-	public static final SoundEvent FINAL_KOBOLD_AMBIENT = createEvent("mob.final_kobold.kobold");
-	public static final SoundEvent FINAL_KOBOLD_HURT = createEvent("mob.final_kobold.hurt");
 	public static final SoundEvent CICADA = createEvent("mob.cicada");
 	public static final SoundEvent NAGA_HISS = createEvent("mob.naga.hiss");
 	public static final SoundEvent NAGA_HURT = createEvent("mob.naga.hurt");

diff --git a/src/main/java/twilightforest/client/TFClientProxy.java b/src/main/java/twilightforest/client/TFClientProxy.java
@@ -89,7 +89,6 @@ public void preInit() {
 		RenderingRegistry.registerEntityRenderingHandler(EntityTFRaven.class, m -> new RenderTFBird(m, new ModelTFRaven(), 1.0F, "raven.png"));
 		RenderingRegistry.registerEntityRenderingHandler(EntityTFQuestRam.class, RenderTFQuestRam::new);
 		RenderingRegistry.registerEntityRenderingHandler(EntityTFKobold.class, m -> new RenderTFKobold(m, new ModelTFKobold(), 0.4F, "kobold.png"));
-		RenderingRegistry.registerEntityRenderingHandler(EntityTFFinalKobold.class, m -> new RenderTFFinalKobold(m, new ModelTFKobold(), 3.2F, "kobold.png"));
 		RenderingRegistry.registerEntityRenderingHandler(EntityTFBoggard.class, m -> new RenderTFBiped<>(m, new ModelTFLoyalZombie(), 0.625F, "kobold.png"));
 		RenderingRegistry.registerEntityRenderingHandler(EntityTFMosquitoSwarm.class, m -> new RenderTFGenericLiving<>(m, new ModelTFMosquitoSwarm(), 0.0F, "mosquitoswarm.png"));
 		RenderingRegistry.registerEntityRenderingHandler(EntityTFDeathTome.class, m -> new RenderTFGenericLiving<>(m, new ModelTFDeathTome(), 0.3F, "textures/entity/enchanting_table_book.png"));

diff --git a/src/main/java/twilightforest/client/renderer/entity/RenderTFFinalKobold.java b/src/main/java/twilightforest/client/renderer/entity/RenderTFFinalKobold.java
diff --git a/src/main/java/twilightforest/entity/EntityTFGiantMiner.java b/src/main/java/twilightforest/entity/EntityTFGiantMiner.java
@@ -56,6 +56,7 @@ protected void applyEntityAttributes() {
 		this.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.23D);
 		this.getEntityAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(2.0D);
 		this.getEntityAttribute(SharedMonsterAttributes.FOLLOW_RANGE).setBaseValue(40.0D);
+		this.getEntityAttribute(SharedMonsterAttributes.KNOCKBACK_RESISTANCE).setBaseValue(1.0D);
 	}
 
 	@Override

diff --git a/src/main/java/twilightforest/entity/TFEntities.java b/src/main/java/twilightforest/entity/TFEntities.java
@@ -106,7 +106,6 @@ public static void registerEntities(RegistryEvent.Register<EntityEntry> event) {
 		helper.registerEntity(TFEntityNames.RAVEN, EntityTFRaven.class, EntityTFRaven::new, 0x000011, 0x222233);
 		helper.registerEntity(TFEntityNames.QUEST_RAM, EntityTFQuestRam.class, EntityTFQuestRam::new, 0xfefeee, 0x33aadd);
 		helper.registerEntity(TFEntityNames.KOBOLD, EntityTFKobold.class, EntityTFKobold::new, 0x372096, 0x895d1b);
-		helper.registerEntity(TFEntityNames.FINAL_KOBOLD, EntityTFFinalKobold.class, EntityTFFinalKobold::new, 0x372096, 0x895d1b);
 		helper.registerEntity(TFEntityNames.MOSQUITO_SWARM, EntityTFMosquitoSwarm.class, EntityTFMosquitoSwarm::new, 0x080904, 0x2d2f21);
 		helper.registerEntity(TFEntityNames.DEATH_TOME, EntityTFDeathTome.class, EntityTFDeathTome::new, 0x774e22, 0xdbcdbe);
 		helper.registerEntity(TFEntityNames.MINOTAUR, EntityTFMinotaur.class, EntityTFMinotaur::new, 0x3f3024, 0xaa7d66);

diff --git a/src/main/java/twilightforest/entity/boss/EntityTFFinalKobold.java b/src/main/java/twilightforest/entity/boss/EntityTFFinalKobold.java
diff --git a/src/main/java/twilightforest/entity/boss/EntityTFSnowQueen.java b/src/main/java/twilightforest/entity/boss/EntityTFSnowQueen.java
@@ -149,7 +149,7 @@ public ResourceLocation getLootTable() {
 	public void onLivingUpdate() {
 		super.onLivingUpdate();
 
-		if (isBreathing()) playSound(MMSounds.ENTITY_FROSTMAW_ICEBREATH_START, rand.nextFloat() * 0.5F, rand.nextFloat() * 1.5F);
+		if (isBreathing()) playSound(MMSounds.ENTITY_FROSTMAW_ICEBREATH_START, rand.nextFloat() * 0.75F, rand.nextFloat() * 1.5F);
 		if (!world.isRemote) {
 			bossInfo.setPercent(getHealth() / getMaxHealth());
 		} else {

diff --git a/src/main/java/twilightforest/util/TFEntityNames.java b/src/main/java/twilightforest/util/TFEntityNames.java
@@ -90,11 +90,10 @@ public class TFEntityNames {
 	public static final ResourceLocation GIANT_MINER = prefix("giant_miner");
 	public static final ResourceLocation ARMORED_GIANT = prefix("armored_giant");
 
+	// Final Castle
 	public static final ResourceLocation HARBINGER_CUBE = prefix("harbinger_cube");
 	public static final ResourceLocation ADHERENT = prefix("adherent");
-	public static final ResourceLocation ROVING_CUBE = prefix("roving_cube");
-	public static final ResourceLocation SLIDER = prefix("slider");
-	public static final ResourceLocation CASTLE_GUARDIAN = prefix("castle_guardian");
+	// More castle mobs here
 
 	// Technical
 	public static final ResourceLocation HYDRA_HEAD = prefix("hydra_head");
@@ -118,6 +117,11 @@ public class TFEntityNames {
 	public static final ResourceLocation SEEKER_ARROW = prefix("seeker_arrow");
 	public static final ResourceLocation ICE_ARROW = prefix("ice_arrow");
 	public static final ResourceLocation ICE_SNOWBALL = prefix("ice_snowball");
+
+	// Unused
+	public static final ResourceLocation ROVING_CUBE = prefix("roving_cube");
+	public static final ResourceLocation SLIDER = prefix("slider");
+	public static final ResourceLocation CASTLE_GUARDIAN = prefix("castle_guardian");
 
 	private static ResourceLocation prefix(String path) {
 		return new ResourceLocation(TwilightForestMod.ID, path);

diff --git a/src/main/resources/assets/twilightforest/sounds.json b/src/main/resources/assets/twilightforest/sounds.json
@@ -33,33 +33,6 @@
       }
     ]
   },
-  "mob.final_kobold.die": {
-    "sounds": [
-      {
-        "type": "event",
-        "name": "twilightforest:mob.kobold.die",
-        "pitch": 0.1
-      }
-    ]
-  },
-  "mob.final_kobold.kobold": {
-    "sounds": [
-      {
-        "type": "event",
-        "name": "twilightforest:mob.kobold.kobold",
-        "pitch": 0.1
-      }
-    ]
-  },
-  "mob.final_kobold.hurt": {
-    "sounds": [
-      {
-        "type": "event",
-        "name": "twilightforest:mob.kobold.hurt",
-        "pitch": 0.1
-      }
-    ]
-  },
   "mob.cicada": {
     "sounds": [
       "twilightforest:mob/cicada0",