Merge pull request #1278 from TeamLapen/feature/mother_generation

add ancient remains boss fight

dev_resources/models/defender.bbmodel

@@ -0,0 +1 @@
+{"meta":{"format_version":"4.5","model_format":"modded_entity","box_uv":true},"name":"defender","model_identifier":"","modded_entity_version":"1.17","modded_entity_flip_y":true,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":24,"height":24},"elements":[{"name":"cube","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-6,0,0],"to":[6,12,0.01],"autouv":0,"color":8,"origin":[0,0,0],"uv_offset":[-0.01,-0.01],"faces":{"north":{"uv":[0,0,12,12]},"east":{"uv":[-0.01,0,0,12]},"south":{"uv":[12.01,0,24.009999999999998,12]},"west":{"uv":[12,0,12.01,12]},"up":{"uv":[12,0,-2.1337098754514727e-16,-0.01]},"down":{"uv":[24,-0.01,12.000000000000002,0]}},"type":"cube","uuid":"885a951a-9019-d169-e38c-73726f062998"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-6,0,0],"to":[6,12,0.01],"autouv":0,"color":8,"origin":[0,0,0],"uv_offset":[-0.01,-0.01],"faces":{"north":{"uv":[0,0,12,12]},"east":{"uv":[-0.01,0,0,12]},"south":{"uv":[12.01,0,24.009999999999998,12]},"west":{"uv":[12,0,12.01,12]},"up":{"uv":[12,0,-2.1337098754514727e-16,-0.01]},"down":{"uv":[24,-0.01,12.000000000000002,0]}},"type":"cube","uuid":"582ecae4-b50c-0c1c-8816-198d159fe599"}],"outliner":[{"name":"cube","origin":[0,0,0],"rotation":[0,45,0],"color":0,"nbt":"{}","uuid":"677d5f39-9d0b-763c-37f0-5e7a804c1cd8","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["885a951a-9019-d169-e38c-73726f062998"]},{"name":"cube2","origin":[0,0,0],"rotation":[0,-45,0],"color":0,"nbt":"{}","uuid":"33e45818-f49a-7047-f0e1-5660d2f7b10e","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["582ecae4-b50c-0c1c-8816-198d159fe599"]}],"textures":[]}

dev_resources/models/ghost.bbmodel

@@ -0,0 +1 @@
+{"meta":{"format_version":"4.5","model_format":"modded_entity","box_uv":true},"name":"vampirism","model_identifier":"vampirism","modded_entity_version":"1.17","modded_entity_flip_y":true,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":64,"height":64},"elements":[{"name":"head","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-3,13,-3],"to":[3,19,3],"autouv":0,"color":7,"origin":[0,7,0],"faces":{"north":{"uv":[6,6,12,12],"texture":0},"east":{"uv":[0,6,6,12],"texture":0},"south":{"uv":[18,6,24,12],"texture":0},"west":{"uv":[12,6,18,12],"texture":0},"up":{"uv":[12,6,6,0],"texture":0},"down":{"uv":[18,0,12,6],"texture":0}},"type":"cube","uuid":"e7826be5-a11f-32cd-c043-ddffe66ecbc6"},{"name":"body","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-2,0,-2],"to":[2,12,2],"autouv":0,"color":9,"origin":[0,0,0],"uv_offset":[16,16],"faces":{"north":{"uv":[20,20,24,32],"texture":0},"east":{"uv":[16,20,20,32],"texture":0},"south":{"uv":[28,20,32,32],"texture":0},"west":{"uv":[24,20,28,32],"texture":0},"up":{"uv":[24,20,20,16],"texture":0},"down":{"uv":[28,16,24,20],"texture":0}},"type":"cube","uuid":"098085e0-960a-4f81-9a25-6cce9c6f623d"},{"name":"arm_left","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3,3,-1],"to":[5,12,1],"autouv":0,"color":2,"origin":[0,12,-4],"uv_offset":[41,17],"faces":{"north":{"uv":[43,19,45,28],"texture":0},"east":{"uv":[41,19,43,28],"texture":0},"south":{"uv":[47,19,49,28],"texture":0},"west":{"uv":[45,19,47,28],"texture":0},"up":{"uv":[45,19,43,17],"texture":0},"down":{"uv":[47,17,45,19],"texture":0}},"type":"cube","uuid":"6f74b57a-a218-39e8-9db7-da8d2e7c87d3"},{"name":"arm_right","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-5,3,-1],"to":[-3,12,1],"autouv":0,"color":2,"origin":[0,12,4],"uv_offset":[41,17],"faces":{"north":{"uv":[43,19,45,28],"texture":0},"east":{"uv":[41,19,43,28],"texture":0},"south":{"uv":[47,19,49,28],"texture":0},"west":{"uv":[45,19,47,28],"texture":0},"up":{"uv":[45,19,43,17],"texture":0},"down":{"uv":[47,17,45,19],"texture":0}},"type":"cube","uuid":"f2d5995d-b371-5a55-aaf0-b1b077407096"}],"outliner":[{"name":"body","origin":[0,7,0],"color":0,"nbt":"{}","uuid":"87b8cce3-9b97-75d4-c56b-68b028fad032","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["098085e0-960a-4f81-9a25-6cce9c6f623d",{"name":"head","origin":[0,13,0],"color":0,"nbt":"{}","uuid":"7fd260cd-9c76-9ec2-8e60-6b62d4424f6c","export":true,"mirror_uv":false,"isOpen":false,"locked":false,"visibility":true,"autouv":0,"children":["e7826be5-a11f-32cd-c043-ddffe66ecbc6"]},{"name":"arm_left","origin":[3,12,0],"color":0,"nbt":"{}","uuid":"68b8a470-56e2-956d-491d-b673fc2d8a95","export":true,"mirror_uv":false,"isOpen":false,"locked":false,"visibility":true,"autouv":0,"children":["6f74b57a-a218-39e8-9db7-da8d2e7c87d3"]},{"name":"arm_right","origin":[-5,12,0],"color":0,"nbt":"{}","uuid":"b85c1371-59ba-7e3e-411d-f31e2d6f9546","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["f2d5995d-b371-5a55-aaf0-b1b077407096"]}]}],"textures":[{"path":"/home/paube/Projects/Minecraft/Vampirism/1.20/src/main/resources/assets/vampirism/textures/entity/ghost.png","name":"ghost.png","folder":"block","namespace":"","id":"0","particle":false,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"6a3267f5-417c-9609-2655-6756760a22b6","relative_path":"../../Projects/Minecraft/Vampirism/1.20/src/main/resources/assets/vampirism/textures/entity/ghost.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAA7ZJREFUeF7tmUtLI0EQx2vU+H4jKitB8AvsF/HixYMYxahsEBaEvexld4+7hz2GYBQxXgLBgzcP2cPe/BgeAoIsIvjCV7SXf0ENYZgxcZKGnrEHGjOtU+n616+qukeHAq5cLqfa2tqovb2d/0IpRS8vLzz85jOZjBNky+T5wEXn83nV0dHBzjqOwwI8Pz/z8JtfW1uLlwA7OzssgDgLx6vVqiuAdz6dTsdPgEQiQRhw9unpiQdE8JtfWVmJnwDvmoCtrS2FSEsNQPGTGuA3v76+Hk0C3lrtg7pAVLuDE1Ttr6+v6fb2lqamprgL3N/f08PDA3V3d/t2gah2Byeo2p+entLR0RFtbGxwGmSzWZqdnaXx8XEWIC7dgQXwq+qXl5c0//Ub/cln2dmPnzbp78/vTECcukMgAWh3yS8/6F/2F6fAh8wmVbK/A/cBkgJR2x84r1V75/MmJfI5FqCaThNtb7MAceoOkWxdrTxbWAFaqWYUbVkCWh213d1dfo8gR2jZIcp9M4emcrmssDnr6+vjTdrc3FzTAWzagFfAvb099z2C9/0B7peWlkJ/Z6lUUrCBlzT4ubCwENqWrLtpA14BCoUCb6zkCC3HZ7lfXFwM/Z3vkoDj42N1c3PDyAv6ExMT5J0Lmw6hoyGRR87L556eHv6IGjAyMkIDAwPuQi8uLkh+f3d354Kzurr66hoODg6UHMUFfRDmnQubDi0RAI7BqdHRUXYMJ0lxVhaKVIAguEQMPFNPgEgQUCsAMIWDfgQkk0lG+S0CRIIAFDhEGARAgLOzM18CJicnXQHkmVgQIAktAjRCgDxTTwDjCSgWiwq5jIgODg42RMDV1RUTg9SpV7yMrwEiAJzBaKQGQDCMRgQwnoD9/X0l+Q+sIcDJyQkNDw9TV1cXPT4+8kDxm5mZYfKlEIKa5eXlVzuR8QTUCgDncZ2fn7PTY2NjHGm0RbxKw/1bBTCeAGyEavNfilulUqGhoSEWAG+Tp6en3c0PCJA6UK8IGk8ABKjNf/ESadDb2+v+S03wFwKkDtQT4PDwUEkadXZ2Mln9/f1uaslcKpUKtakL9VDtAQgCyA5QUkDSAFHGhe4g+IsAsiOsJ0Crj+tee00LoHuBuu1bAXQrbLp9S4DpEdK9PkuAboVNt28JMD1CutdnCdCtsOn2LQGmR0j3+iwBuhU23b4lwPQI6V6fJUC3wqbbtwSYHiHd67ME6FbYdPuWANMjpHt9lgDdCptu3xJgeoR0r88SoFth0+2/ewL+A92FwG7216M2AAAAAElFTkSuQmCC"}]}

src/generated/resources/assets/vampirism/blockstates/active_vulnerable_remains.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "vampirism:block/active_vulnerable_remains"
+    }
+  }
+}

src/generated/resources/assets/vampirism/blockstates/cursed_hanging_roots.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "vampirism:block/cursed_hanging_roots"
+    }
+  }
+}

src/generated/resources/assets/vampirism/blockstates/incapacitated_vulnerable_remains.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "vampirism:block/incapacitated_vulnerable_remains"
+    }
+  }
+}

src/generated/resources/assets/vampirism/blockstates/mother.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "vampirism:block/mother"
+    }
+  }
+}

src/generated/resources/assets/vampirism/blockstates/mother_trophy.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "vampirism:block/mother_trophy"
+    }
+  }
+}

src/generated/resources/assets/vampirism/blockstates/remains.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "vampirism:block/remains"
+    }
+  }
+}

src/generated/resources/assets/vampirism/blockstates/vulnerable_remains.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "vampirism:block/vulnerable_remains"
+    }
+  }
+}

src/generated/resources/assets/vampirism/models/block/active_vulnerable_remains.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "vampirism:block/active_vulnerable_remains"
+  }
+}

src/generated/resources/assets/vampirism/models/block/cursed_hanging_roots.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "vampirism:block/cursed_hanging_roots"
+  }
+}

src/generated/resources/assets/vampirism/models/block/incapacitated_vulnerable_remains.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "vampirism:block/incapacitated_vulnerable_remains"
+  }
+}

src/generated/resources/assets/vampirism/models/block/mother.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "vampirism:block/mother"
+  }
+}

src/generated/resources/assets/vampirism/models/block/remains.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "vampirism:block/remains"
+  }
+}

src/generated/resources/assets/vampirism/models/block/vulnerable_remains.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "vampirism:block/vulnerable_remains"
+  }
+}

src/generated/resources/assets/vampirism/models/item/cursed_hanging_roots.json

@@ -0,0 +1,3 @@
+{
+  "parent": "vampirism:block/cursed_hanging_roots"
+}

src/generated/resources/assets/vampirism/models/item/incapacitated_vulnerable_remains.json

@@ -0,0 +1,3 @@
+{
+  "parent": "vampirism:block/incapacitated_vulnerable_remains"
+}

src/generated/resources/assets/vampirism/models/item/mother.json

@@ -0,0 +1,3 @@
+{
+  "parent": "vampirism:block/mother"
+}

src/generated/resources/assets/vampirism/models/item/mother_core.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "vampirism:item/mother_core"
+  }
+}

src/generated/resources/assets/vampirism/models/item/remains.json

@@ -0,0 +1,3 @@
+{
+  "parent": "vampirism:block/remains"
+}

src/generated/resources/assets/vampirism/models/item/vulnerable_remains.json

@@ -0,0 +1,3 @@
+{
+  "parent": "vampirism:block/vulnerable_remains"
+}

src/generated/resources/data/minecraft/tags/blocks/replaceable_by_trees.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "vampirism:cursed_hanging_roots"
+  ]
+}

src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json

@@ -3,6 +3,7 @@
     "vampirism:sun_damage",
     "vampirism:blood_loss",
     "vampirism:vampire_on_fire",
-    "vampirism:dbno"
+    "vampirism:dbno",
+    "vampirism:mother"
   ]
 }

src/generated/resources/data/vampirism/advancements/hunter/cure_vampire_villager.json

@@ -4,6 +4,14 @@
     "cure": {
       "conditions": {},
       "trigger": "vampirism:cured_vampire_villager"
+    },
+    "main": {
+      "conditions": {
+        "type": "LEVEL",
+        "faction": "vampirism:hunter",
+        "level": 1
+      },
+      "trigger": "vampirism:faction"
     }
   },
   "display": {
@@ -24,6 +32,9 @@
   "requirements": [
     [
       "cure"
+    ],
+    [
+      "main"
     ]
   ],
   "sends_telemetry_event": true

src/generated/resources/data/vampirism/advancements/hunter/kill_mother.json

@@ -0,0 +1,41 @@
+{
+  "parent": "vampirism:hunter/become_hunter",
+  "criteria": {
+    "killed": {
+      "conditions": {},
+      "trigger": "vampirism:mother_win"
+    },
+    "main": {
+      "conditions": {
+        "type": "LEVEL",
+        "faction": "vampirism:hunter",
+        "level": 1
+      },
+      "trigger": "vampirism:faction"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "description": {
+      "translate": "advancement.vampirism.hunter_kill_mother.desc"
+    },
+    "frame": "challenge",
+    "hidden": true,
+    "icon": {
+      "item": "vampirism:mother_core"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancement.vampirism.hunter_kill_mother"
+    }
+  },
+  "requirements": [
+    [
+      "killed"
+    ],
+    [
+      "main"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/generated/resources/data/vampirism/advancements/hunter/max_lord.json

@@ -8,6 +8,14 @@
         "level": 5
       },
       "trigger": "vampirism:faction"
+    },
+    "main": {
+      "conditions": {
+        "type": "LEVEL",
+        "faction": "vampirism:hunter",
+        "level": 1
+      },
+      "trigger": "vampirism:faction"
     }
   },
   "display": {
@@ -28,6 +36,9 @@
   "requirements": [
     [
       "level"
+    ],
+    [
+      "main"
     ]
   ],
   "sends_telemetry_event": true

src/generated/resources/data/vampirism/advancements/hunter/stake.json

@@ -6,6 +6,14 @@
         "action": "STAKE"
       },
       "trigger": "vampirism:hunter_action"
+    },
+    "main": {
+      "conditions": {
+        "type": "LEVEL",
+        "faction": "vampirism:hunter",
+        "level": 1
+      },
+      "trigger": "vampirism:faction"
     }
   },
   "display": {
@@ -27,6 +35,9 @@
   "requirements": [
     [
       "flower"
+    ],
+    [
+      "main"
     ]
   ],
   "rewards": {

src/generated/resources/data/vampirism/advancements/hunter/technology.json

@@ -24,6 +24,14 @@
         ]
       },
       "trigger": "minecraft:inventory_changed"
+    },
+    "main": {
+      "conditions": {
+        "type": "LEVEL",
+        "faction": "vampirism:hunter",
+        "level": 1
+      },
+      "trigger": "vampirism:faction"
     }
   },
   "display": {
@@ -48,6 +56,9 @@
     ],
     [
       "advanced"
+    ],
+    [
+      "main"
     ]
   ],
   "sends_telemetry_event": true

src/generated/resources/data/vampirism/advancements/main/jump_scare.json

@@ -0,0 +1,40 @@
+{
+  "parent": "vampirism:main/vampire_forest",
+  "criteria": {
+    "main": {
+      "conditions": {
+        "entity": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "type": "vampirism:ghost"
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:entity_killed_player"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "description": {
+      "translate": "advancement.vampirism.jump_scare.desc"
+    },
+    "frame": "task",
+    "hidden": true,
+    "icon": {
+      "item": "minecraft:skeleton_skull"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancement.vampirism.jump_scare"
+    }
+  },
+  "requirements": [
+    [
+      "main"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/generated/resources/data/vampirism/advancements/vampire/bat.json

@@ -6,6 +6,14 @@
         "action": "BAT"
       },
       "trigger": "vampirism:vampire_action"
+    },
+    "main": {
+      "conditions": {
+        "type": "LEVEL",
+        "faction": "vampirism:vampire",
+        "level": 1
+      },
+      "trigger": "vampirism:faction"
     }
   },
   "display": {
@@ -26,6 +34,9 @@
   "requirements": [
     [
       "action"
+    ],
+    [
+      "main"
     ]
   ],
   "sends_telemetry_event": true