Partial backport

src/main/java/com/github/mechalopa/hmag/client/model/FortressKeeperModel.java

@@ -134,10 +134,10 @@ public static LayerDefinition createBodyLayer()
 		ModClientUtils.addC(lap4pd, "left_arm_part_5d", 96, 48, -1.0F, 0.0F, -1.0F, 2.0F, 3.0F, 2.0F, -3.0F, 5.0F, 3.0F, true);
 		CubeListBuilder cubelistbuilder = CubeListBuilder.create().texOffs(40, 64).addBox(-2.5F, -1.0F, -2.5F, 5.0F, 3.0F, 5.0F);
 		CubeListBuilder cubelistbuilder1 = CubeListBuilder.create().texOffs(40, 64).mirror().addBox(-2.5F, -1.0F, -2.5F, 5.0F, 3.0F, 5.0F);
-		PartDefinition l1pd = pd.addOrReplaceChild("leg_1", cubelistbuilder, PartPose.offset(-3.5F, 16.25F, 3.5F));
-		PartDefinition l2pd = pd.addOrReplaceChild("leg_2", cubelistbuilder1, PartPose.offset(3.5F, 16.25F, 3.5F));
-		PartDefinition l3pd = pd.addOrReplaceChild("leg_3", cubelistbuilder, PartPose.offset(-3.5F, 16.25F, -3.5F));
-		PartDefinition l4pd = pd.addOrReplaceChild("leg_4", cubelistbuilder1, PartPose.offset(3.5F, 16.25F, -3.5F));
+		PartDefinition l1pd = pd.addOrReplaceChild("leg_1", cubelistbuilder, PartPose.offset(-4.5F, 16.25F, 4.0F));
+		PartDefinition l2pd = pd.addOrReplaceChild("leg_2", cubelistbuilder1, PartPose.offset(4.5F, 16.25F, 4.0F));
+		PartDefinition l3pd = pd.addOrReplaceChild("leg_3", cubelistbuilder, PartPose.offset(-4.5F, 16.25F, -4.0F));
+		PartDefinition l4pd = pd.addOrReplaceChild("leg_4", cubelistbuilder1, PartPose.offset(4.5F, 16.25F, -4.0F));
 		CubeListBuilder cubelistbuilder2 = CubeListBuilder.create().texOffs(42, 72).addBox(-2.0F, 0.0F, -2.0F, 4.0F, 6.0F, 4.0F);
 		CubeListBuilder cubelistbuilder3 = CubeListBuilder.create().texOffs(42, 72).mirror().addBox(-2.0F, 0.0F, -2.0F, 4.0F, 6.0F, 4.0F);
 		PartPose pp = PartPose.offset(0.0F, 2.0F, 0.0F);
@@ -176,7 +176,7 @@ public void setupAnim(T entity, float limbSwing, float limbSwingAmount, float ag
 		this.leg3.xRot = Mth.cos(limbSwing * 0.6662F + (float)Math.PI) * 1.2F * limbSwingAmount;
 		this.leg4.xRot = Mth.cos(limbSwing * 0.6662F) * 1.2F * limbSwingAmount;
 
-		float f = 0.09F;
+		float f = 0.081F;
 
 		this.leg1.zRot = f;
 		this.leg2.zRot = -f;

src/main/resources/data/forge/tags/items/bat_wings.json

@@ -25,6 +25,10 @@
     {
       "id": "xtraarrows:bat_skin",
       "required": false
+    },
+    {
+      "id": "actuallyadditions:bats_wing",
+      "required": false
     }
   ]
 }

src/main/resources/data/goety/tags/entity_types/endermen.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "hmag:ender_executor"
+  ]
+}

src/main/resources/data/hmag/recipes/bonetorch/soul_bonetorch_from_soul_powder.json

@@ -0,0 +1,25 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "conditions": [
+    {
+      "type": "forge:item_exists",
+      "item": "bonetorch:bonetorch"
+    },
+    {
+      "type": "forge:item_exists",
+      "item": "bonetorch:soul_bonetorch"
+    }
+  ],
+  "category": "misc",
+  "ingredients": [
+    {
+      "item": "bonetorch:bonetorch"
+    },
+    {
+      "item": "hmag:soul_powder"
+    }
+  ],
+  "result": {
+    "item": "bonetorch:soul_bonetorch"
+  }
+}

src/main/resources/data/hmag/recipes/refurbished_furniture/slicing/cureberry.json

@@ -0,0 +1,14 @@
+{
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "refurbished_furniture"
+    }
+  ],
+  "type": "refurbished_furniture:cutting_board_slicing",
+  "count": 2,
+  "ingredient": {
+    "item": "hmag:cureberry"
+  },
+  "result": "minecraft:red_dye"
+}

src/main/resources/data/hmag/recipes/refurbished_furniture/slicing/kobold_leather.json

@@ -0,0 +1,14 @@
+{
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "refurbished_furniture"
+    }
+  ],
+  "type": "refurbished_furniture:cutting_board_slicing",
+  "count": 4,
+  "ingredient": {
+    "item": "hmag:kobold_leather"
+  },
+  "result": "minecraft:blue_dye"
+}

src/main/resources/data/hmag/recipes/refurbished_furniture/slicing/mysterious_petal.json

@@ -0,0 +1,14 @@
+{
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "refurbished_furniture"
+    }
+  ],
+  "type": "refurbished_furniture:cutting_board_slicing",
+  "count": 3,
+  "ingredient": {
+    "item": "hmag:mysterious_petal"
+  },
+  "result": "minecraft:pink_dye"
+}

src/main/resources/data/hmag/recipes/refurbished_furniture/slicing/randomberry.json

@@ -0,0 +1,14 @@
+{
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "refurbished_furniture"
+    }
+  ],
+  "type": "refurbished_furniture:cutting_board_slicing",
+  "count": 2,
+  "ingredient": {
+    "item": "hmag:randomberry"
+  },
+  "result": "minecraft:purple_dye"
+}

src/main/resources/data/hmag/recipes/refurbished_furniture/slicing/soul_powder.json

@@ -0,0 +1,14 @@
+{
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "refurbished_furniture"
+    }
+  ],
+  "type": "refurbished_furniture:cutting_board_slicing",
+  "count": 1,
+  "ingredient": {
+    "item": "hmag:soul_powder"
+  },
+  "result": "minecraft:light_blue_dye"
+}

src/main/resources/data/hmag/recipes/tconstruct/smeltery/entity_melting/water_20_2.json → src/main/resources/data/hmag/recipes/tconstruct/smeltery/entity_melting/copper_10_4.json

@@ -6,14 +6,14 @@
     }
   ],
   "type": "tconstruct:entity_melting",
-  "damage": 2,
+  "damage": 4,
   "entity": {
     "types": [
       "hmag:drowned_girl"
     ]
   },
   "result": {
-    "amount": 20,
-    "fluid": "minecraft:water"
+    "amount": 10,
+    "fluid": "tconstruct:molten_copper"
   }
 }

src/main/resources/data/hmag/recipes/tconstruct/smeltery/entity_melting/iron_10_4.json

@@ -0,0 +1,20 @@
+{
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "tconstruct"
+    }
+  ],
+  "type": "tconstruct:entity_melting",
+  "damage": 4,
+  "entity": {
+    "types": [
+      "hmag:zombie_girl",
+      "hmag:husk_girl"
+    ]
+  },
+  "result": {
+    "amount": 10,
+    "fluid": "tconstruct:liquid_soul"
+  }
+}

src/main/resources/data/hmag/recipes/tconstruct/smeltery/entity_melting/leaping_potion_50_4.json

@@ -0,0 +1,23 @@
+{
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "tconstruct"
+    }
+  ],
+  "type": "tconstruct:entity_melting",
+  "damage": 4,
+  "entity": {
+    "types": [
+      "hmag:harpy",
+      "hmag:jiangshi"
+    ]
+  },
+  "result": {
+    "amount": 50,
+    "fluid": "tconstruct:potion",
+    "nbt": {
+      "Potion": "minecraft:leaping"
+    }
+  }
+}

src/main/resources/data/hmag/recipes/tconstruct/smeltery/entity_melting/regeneration_potion_50_4.json

@@ -0,0 +1,22 @@
+{
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "tconstruct"
+    }
+  ],
+  "type": "tconstruct:entity_melting",
+  "damage": 4,
+  "entity": {
+    "types": [
+      "hmag:ghastly_seeker"
+    ]
+  },
+  "result": {
+    "amount": 50,
+    "fluid": "tconstruct:potion",
+    "nbt": {
+      "Potion": "minecraft:regeneration"
+    }
+  }
+}

src/main/resources/data/hmag/recipes/tconstruct/smeltery/entity_melting/slow_falling_potion_50_4.json

@@ -0,0 +1,22 @@
+{
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "tconstruct"
+    }
+  ],
+  "type": "tconstruct:entity_melting",
+  "damage": 4,
+  "entity": {
+    "types": [
+      "hmag:dyssomnia"
+    ]
+  },
+  "result": {
+    "amount": 50,
+    "fluid": "tconstruct:potion",
+    "nbt": {
+      "Potion": "minecraft:slow_falling"
+    }
+  }
+}

src/main/resources/data/hmag/recipes/tconstruct/smeltery/entity_melting/soul_25_2.json

@@ -9,8 +9,6 @@
   "damage": 2,
   "entity": {
     "types": [
-      "hmag:zombie_girl",
-      "hmag:husk_girl",
       "hmag:ghost",
       "hmag:wither_ghost"
     ]

src/main/resources/data/hmag/recipes/tconstruct/smeltery/entity_melting/soul_25_4.json

@@ -9,8 +9,8 @@
   "damage": 4,
   "entity": {
     "types": [
+      "hmag:cursed_doll",
       "hmag:banshee",
-      "hmag:jiangshi",
       "hmag:giant_mummy"
     ]
   },

src/main/resources/data/hmag/recipes/tconstruct/smeltery/entity_melting/strength_potion_50_4.json

@@ -0,0 +1,22 @@
+{
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "tconstruct"
+    }
+  ],
+  "type": "tconstruct:entity_melting",
+  "damage": 4,
+  "entity": {
+    "types": [
+      "hmag:ogre"
+    ]
+  },
+  "result": {
+    "amount": 50,
+    "fluid": "tconstruct:potion",
+    "nbt": {
+      "Potion": "minecraft:strength"
+    }
+  }
+}

src/main/resources/data/hmag/tags/entity_types/bats.json

@@ -93,6 +93,10 @@
     {
       "id": "spookybats:biggest_fan_bat",
       "required": false
+    },
+    {
+      "id": "goety:vampire_bat",
+      "required": false
     }
   ]
 }

src/main/resources/data/hmag/tags/entity_types/creepers.json

@@ -86,6 +86,10 @@
       "id": "specialmobs:sandcreeper",
       "required": false
     },
+    {
+      "id": "specialmobs:scopecreeper",
+      "required": false
+    },
     {
       "id": "specialmobs:skeletoncreeper",
       "required": false

src/main/resources/data/hmag/tags/items/dragon_materials.json

@@ -6,6 +6,10 @@
     {
       "id": "ends_delight:dragon_tooth",
       "required": false
+    },
+    {
+      "id": "irons_spellbooks:dragonskin",
+      "required": false
     }
   ]
 }

src/main/resources/data/hmag/tags/worldgen/biome/is_hot.json

@@ -1,6 +1,8 @@
 {
   "replace": false,
   "values": [
+    "minecraft:badlands",
+    "minecraft:wooded_badlands",
     {
       "id": "#forge:is_hot",
       "required": false

src/main/resources/data/hmag/tags/worldgen/biome/is_overworld.json

@@ -94,6 +94,10 @@
       "id": "mysticsbiomes:strawberry_fields",
       "required": false
     },
+    {
+      "id": "mysticsbiomes:tropics",
+      "required": false
+    },
     {
       "id": "snifferplus:timeless_grotto",
       "required": false

src/main/resources/data/hmag/tags/worldgen/biome/no_hmag_monsters.json

@@ -59,6 +59,10 @@
     {
       "id": "mysticsbiomes:lavender_meadow",
       "required": false
+    },
+    {
+      "id": "mysticsbiomes:tropics",
+      "required": false
     }
   ]
 }