Adding NBT data for bosses and drops

This gives awesome flexability when it comes to the monsters created by the mod. Also updating example fights to show how to drop a totem of summoning as a reward.
Brian-Wuest · Jun 28, 2020 · f02900f · f02900f
1 parent ad9eace
commit f02900f
Show file tree

Hide file tree

Showing 6 changed files with 193 additions and 139 deletions.
diff --git a/sample_fights/creeper.json b/sample_fights/creeper.json
@@ -8,8 +8,7 @@
     "maxHealth": 40,
     "attackDamage": 10.5,
     "alwaysShowDisplayName": true,
-    "additionalDrops": [
-      {
+    "additionalDrops": [{
         "item": "minecraft:diamond",
         "minDrops": 1,
         "maxDrops": 4,
@@ -19,13 +18,23 @@
         "item": "minecraft:gold_chestplate",
         "minDrops": 1,
         "maxDrops": 1,
-        "dropChance": 715
+        "dropChance": 71
       },
       {
         "item": "minecraft:diamond_sword",
         "minDrops": 1,
         "maxDrops": 1,
         "dropChance": 75
+      },
+      {
+        "item": "from_the_depths:item_totem_of_summoning",
+        "minDrops": 1,
+        "maxDrops": 1,
+        "dropChance": 100,
+        "_comment": "Provide a drop for the next monster in a sequence of bosses. This is especially helpful to get players to build up to a mega boss!",
+        "nbt": {
+          "spawn_info": "Custom_Skeleton"
+        }
       }
     ]
   },
@@ -48,4 +57,4 @@
       "count": 1
     }
   }
-}
+}
diff --git a/sample_fights/slime.json b/sample_fights/slime.json
@@ -0,0 +1,31 @@
+{
+  "key": "Custom_slime",
+  "bossInfo": {
+    "domain": "minecraft",
+    "name": "slime",
+    "displayName": "Custom Slime Rawr!",
+    "maxHealth": 40,
+    "attackDamage": 10.5,
+    "alwaysShowDisplayName": true,
+    "nbt": {"Size": -1 },
+    "additionalDrops": [{
+        "item": "minecraft:diamond",
+        "minDrops": 1,
+        "maxDrops": 4,
+        "dropChance": 70
+      },
+      {
+        "item": "minecraft:gold_chestplate",
+        "minDrops": 1,
+        "maxDrops": 1,
+        "dropChance": 715
+      },
+      {
+        "item": "minecraft:diamond_sword",
+        "minDrops": 1,
+        "maxDrops": 1,
+        "dropChance": 75
+      }
+    ]
+  }
+}
diff --git a/src/main/java/com/wuest/from_the_depths/EntityInfo/BaseMonster.java b/src/main/java/com/wuest/from_the_depths/EntityInfo/BaseMonster.java
@@ -27,7 +27,6 @@ public abstract class BaseMonster {
 	public ArrayList<DropInfo> additionalDrops;
 	public String commandToRunAtSpawn;
 	public JsonObject nbt;
-	protected NBTTagCompound convertedNBT;
 
 	public BaseMonster() {
 		this.maxHealth = -1;
@@ -95,31 +94,33 @@ public Entity createEntityForWorld(World world, BlockPos pos, ICommandSender com
 				NBTTagCompound entityCompoundTag = entityLiving.getEntityData();
 				entityCompoundTag.setTag("from_the_depths", trackingTag);
 
-				// Serialize the entity NBT data so it can be updated.
-				NBTTagCompound serializedEntity = entityLiving.serializeNBT();
-
 				entityLiving.forceSpawn = true;
 				entityLiving.rotationYawHead = entityLiving.rotationYaw;
 				entityLiving.renderYawOffset = entityLiving.rotationYaw;
 				entityLiving.setPositionAndUpdate(spawnPos.getX(), spawnPos.getY(), spawnPos.getZ());
 				entityLiving.onInitialSpawn(world.getDifficultyForLocation(new BlockPos(spawnPos)),
 						(IEntityLivingData) null);
 
+				// Serialize the entity NBT data so it can be updated.
+				NBTTagCompound serializedEntity = entityLiving.serializeNBT();
 
 				// This has to be after the "onInitialSpawn" call since some monsters will set properties to random values which need to be set specifically.
 				if (this.nbt != null) {
+					NBTTagCompound compound = null;
 					try {
-						this.convertedNBT = JsonToNBT.getTagFromJson(this.nbt.toString());
+						compound = JsonToNBT.getTagFromJson(this.nbt.toString());
 					}
 					catch (NBTException exception) {
 						FromTheDepths.logger.error(exception);
 					}
 
-					for (String tagKey : this.convertedNBT.getKeySet()) {
-						serializedEntity.setTag(tagKey, this.convertedNBT.getTag(tagKey));
-					}
+					if (compound != null && !compound.hasNoTags()) {
+						for (String tagKey : compound.getKeySet()) {
+							serializedEntity.setTag(tagKey, compound.getTag(tagKey));
+						}
 
-					entityLiving.readEntityFromNBT(serializedEntity);
+						entityLiving = (EntityLiving)EntityList.createEntityFromNBT(serializedEntity,world);
+					}
 				}
 
 				world.spawnEntity(entityLiving);
@@ -272,12 +273,6 @@ public void loadFromNBT(NBTTagCompound tag) {
 		this.commandToRunAtSpawn = tag.getString("commandToRunAtSpawn");
 
 		if (tag.hasKey("nbt")) {
-			try {
-				this.convertedNBT = JsonToNBT.getTagFromJson(tag.getString("nbt"));
-			} catch (NBTException exception) {
-              FromTheDepths.logger.error(exception);
-			}
-
 			JsonParser parser = new JsonParser();
 			this.nbt = (JsonObject)parser.parse(tag.getString("nbt"));
 		}

diff --git a/src/main/java/com/wuest/from_the_depths/EntityInfo/BossAddInfo.java b/src/main/java/com/wuest/from_the_depths/EntityInfo/BossAddInfo.java
@@ -188,7 +188,8 @@ public BossAddInfo clone() {
 		newInstance.numberLeftToSpawn = this.numberLeftToSpawn;
 		newInstance.timeUntilNextSpawn = this.timeUntilNextSpawn;
 		newInstance.commandToRunAtSpawn = this.commandToRunAtSpawn;
-
+		newInstance.nbt = this.nbt;
+
 		if (this.nextWaveOfAdds != null) {
 			newInstance.nextWaveOfAdds = this.nextWaveOfAdds.clone();
 		}

diff --git a/src/main/java/com/wuest/from_the_depths/EntityInfo/BossInfo.java b/src/main/java/com/wuest/from_the_depths/EntityInfo/BossInfo.java
@@ -31,7 +31,6 @@ public BossInfo clone() {
     newInstance.timeToWaitBeforeSpawn = this.timeToWaitBeforeSpawn;
     newInstance.commandToRunAtSpawn = this.commandToRunAtSpawn;
     newInstance.nbt = this.nbt;
-    newInstance.convertedNBT = this.convertedNBT;
 
     for (DropInfo info : this.additionalDrops) {
       newInstance.additionalDrops.add(info.clone());