Fix Knight Loot

Author: BunnyCinnamon

src/main/resources/assets/chessmod/loot_tables/entities/knight.json

@@ -1,13 +1,93 @@
 {
   "pools": [
+	{
+	  "name": "chessmod:white_king",
+	  "rolls": 1,
+	  "entries": [
+		{
+		  "type": "item",
+		  "name": "chessmod:piece",
+		  "weight": 1,
+		  "functions": [
+			{
+			  "function": "set_nbt",
+			  "tag": "{white:1b,type:5b}"
+			},
+			{
+			  "function": "set_count",
+			  "count": {
+				"min": 1,
+				"max": 1
+			  }
+			},
+			{
+			  "function": "looting_enchant",
+			  "count": {
+				"min": 1,
+				"max": 1
+			  }
+			}
+		  ]
+		},
+        {
+          "type": "empty",
+          "weight": 100
+        }
+	  ],
+	  "conditions": [
+		{
+		  "condition": "killed_by_player"
+		}
+	  ]
+	},
+	{
+	  "name": "chessmod:black_king",
+	  "rolls": 1,
+	  "entries": [
+	    {
+		  "type": "item",
+		  "name": "chessmod:piece",
+		  "weight": 1,
+		  "functions": [
+			{
+			  "function": "set_nbt",
+			  "tag": "{white:0b,type:5b}"
+			},
+			{
+			  "function": "set_count",
+			  "count": {
+				"min": 1,
+				"max": 1
+			  }
+			},
+			{
+			  "function": "looting_enchant",
+			  "count": {
+				"min": 1,
+				"max": 1
+			  }
+			}
+		  ]
+		},
+        {
+          "type": "empty",
+          "weight": 200
+        }
+	  ],
+	  "conditions": [
+		{
+		  "condition": "killed_by_player"
+		}
+	  ]
+	},
 	{
 	  "name": "chessmod:white_pawn",
 	  "rolls": 1,
 	  "entries": [
 	    {
 		  "type": "item",
 		  "name": "chessmod:piece",
-		  "weight": 20,
+		  "weight": 10,
 		  "functions": [
 			{
 			  "function": "set_nbt",
@@ -47,7 +127,7 @@
 	    {
 		  "type": "item",
 		  "name": "chessmod:piece",
-		  "weight": 1,
+		  "weight": 10,
 		  "functions": [
 			{
 			  "function": "set_nbt",
@@ -56,7 +136,7 @@
 			{
 			  "function": "set_count",
 			  "count": {
-				"min": 0,
+				"min": 1,
 				"max": 1
 			  }
 			},

src/main/scala/net/katsstuff/nightclipse/chessmod/entity/EntityKnight.scala

@@ -72,20 +72,6 @@ class EntityKnight(_world: World, attackPieces: Boolean) extends EntityMob(_worl
   override def getLootTable: ResourceLocation =
     ChessMod.resource("entities/knight")
 
-  override def dropLoot(wasRecentlyHit: Boolean, lootingModifier: Int, source: DamageSource): Unit = {
-    super.dropLoot(wasRecentlyHit, lootingModifier, source)
-
-    val color = if (rand.nextBoolean()) PieceColor.White else PieceColor.Black
-    if(!world.isRemote) {
-      entityDropItem(ItemPiece.stackOf(Piece(PieceType.Pawn, color)), 1)
-
-      if(rand.nextInt(100) == 0) {
-        entityDropItem(ItemPiece.stackOf(Piece(PieceType.King, color)), 1)
-      }
-    }
-
-  }
-
   override protected def getAmbientSound: SoundEvent = SoundEvents.ENTITY_SKELETON_AMBIENT
 
   override protected def getHurtSound(damageSourceIn: DamageSource): SoundEvent = SoundEvents.ENTITY_SKELETON_HURT