add ghost entity

TeamLapen · Oct 22, 2023 · ddff318 · ddff318
1 parent f3ad5e3
commit ddff318
Show file tree

Hide file tree

Showing 40 changed files with 756 additions and 196 deletions.
diff --git a/dev_resources/models/ghost.bbmodel b/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"}]}
diff --git a/src/generated/resources/data/vampirism/advancements/main/jump_scare.json b/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
+}
diff --git a/src/generated/resources/data/vampirism/loot_tables/entities/ghost.json b/src/generated/resources/data/vampirism/loot_tables/entities/ghost.json
@@ -0,0 +1,4 @@
+{
+  "type": "minecraft:entity",
+  "random_sequence": "vampirism:entities/ghost"
+}
diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_equipment.json b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_equipment.json
@@ -1,6 +1,15 @@
 {
   "requirements": {
     "requirements": [
+      {
+        "type": "vampirism:entity",
+        "amount": 5,
+        "description": {
+          "translate": "entity.vampirism.vampire_baron"
+        },
+        "entityType": "vampirism:vampire_baron",
+        "id": "vampirism:vampire_baron"
+      },
       {
         "type": "vampirism:entity_type",
         "amount": 4,
@@ -20,15 +29,6 @@
           "Count": 32,
           "id": "minecraft:gold_ingot"
         }
-      },
-      {
-        "type": "vampirism:entity",
-        "amount": 5,
-        "description": {
-          "translate": "entity.vampirism.vampire_baron"
-        },
-        "entityType": "vampirism:vampire_baron",
-        "id": "vampirism:vampire_baron"
       }
     ]
   },

diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_upgrade_enhanced.json b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_upgrade_enhanced.json
@@ -1,6 +1,15 @@
 {
   "requirements": {
     "requirements": [
+      {
+        "type": "vampirism:entity",
+        "amount": 10,
+        "description": {
+          "translate": "entity.vampirism.vampire_baron"
+        },
+        "entityType": "vampirism:vampire_baron",
+        "id": "vampirism:vampire_baron"
+      },
       {
         "type": "vampirism:item",
         "description": {
@@ -33,15 +42,6 @@
           "Count": 3,
           "id": "minecraft:diamond_block"
         }
-      },
-      {
-        "type": "vampirism:entity",
-        "amount": 10,
-        "description": {
-          "translate": "entity.vampirism.vampire_baron"
-        },
-        "entityType": "vampirism:vampire_baron",
-        "id": "vampirism:vampire_baron"
       }
     ]
   },

diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_upgrade_special.json b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_upgrade_special.json
@@ -1,6 +1,15 @@
 {
   "requirements": {
     "requirements": [
+      {
+        "type": "vampirism:entity",
+        "amount": 20,
+        "description": {
+          "translate": "entity.vampirism.vampire_baron"
+        },
+        "entityType": "vampirism:vampire_baron",
+        "id": "vampirism:vampire_baron"
+      },
       {
         "type": "vampirism:item",
         "description": {
@@ -33,15 +42,6 @@
           "Count": 8,
           "id": "minecraft:diamond_block"
         }
-      },
-      {
-        "type": "vampirism:entity",
-        "amount": 20,
-        "description": {
-          "translate": "entity.vampirism.vampire_baron"
-        },
-        "entityType": "vampirism:vampire_baron",
-        "id": "vampirism:vampire_baron"
       }
     ]
   },

diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/random_refinement2.json b/src/generated/resources/data/vampirism/vampirism/tasks/random_refinement2.json
@@ -1,6 +1,15 @@
 {
   "requirements": {
     "requirements": [
+      {
+        "type": "vampirism:entity",
+        "amount": 3,
+        "description": {
+          "translate": "entity.vampirism.vampire_baron"
+        },
+        "entityType": "vampirism:vampire_baron",
+        "id": "vampirism:vampire_baron"
+      },
       {
         "type": "vampirism:item",
         "description": {
@@ -11,15 +20,6 @@
           "Count": 2,
           "id": "minecraft:gold_ingot"
         }
-      },
-      {
-        "type": "vampirism:entity",
-        "amount": 3,
-        "description": {
-          "translate": "entity.vampirism.vampire_baron"
-        },
-        "entityType": "vampirism:vampire_baron",
-        "id": "vampirism:vampire_baron"
       }
     ]
   },

diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/random_refinement3.json b/src/generated/resources/data/vampirism/vampirism/tasks/random_refinement3.json
@@ -1,6 +1,15 @@
 {
   "requirements": {
     "requirements": [
+      {
+        "type": "vampirism:stat",
+        "amount": 15,
+        "description": {
+          "translate": "stat.minecraft.traded_with_villager"
+        },
+        "id": "minecraft:traded_with_villager",
+        "stat": "minecraft:traded_with_villager"
+      },
       {
         "type": "vampirism:item",
         "description": {
@@ -11,15 +20,6 @@
           "Count": 2,
           "id": "minecraft:gold_ingot"
         }
-      },
-      {
-        "type": "vampirism:stat",
-        "amount": 15,
-        "description": {
-          "translate": "stat.minecraft.traded_with_villager"
-        },
-        "id": "minecraft:traded_with_villager",
-        "stat": "minecraft:traded_with_villager"
       }
     ]
   },

diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord1.json b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord1.json
@@ -1,6 +1,24 @@
 {
   "requirements": {
     "requirements": [
+      {
+        "type": "vampirism:stat",
+        "amount": 25,
+        "description": {
+          "translate": "stat.vampirism.infected_creatures"
+        },
+        "id": "vampirism:infected_creatures",
+        "stat": "vampirism:infected_creatures"
+      },
+      {
+        "type": "vampirism:stat",
+        "amount": 3,
+        "description": {
+          "translate": "stat.vampirism.win_village_capture"
+        },
+        "id": "vampirism:win_village_capture",
+        "stat": "vampirism:win_village_capture"
+      },
       {
         "type": "vampirism:item",
         "description": {
@@ -22,24 +40,6 @@
           "Count": 5,
           "id": "vampirism:pure_blood_4"
         }
-      },
-      {
-        "type": "vampirism:stat",
-        "amount": 25,
-        "description": {
-          "translate": "stat.vampirism.infected_creatures"
-        },
-        "id": "vampirism:infected_creatures",
-        "stat": "vampirism:infected_creatures"
-      },
-      {
-        "type": "vampirism:stat",
-        "amount": 3,
-        "description": {
-          "translate": "stat.vampirism.win_village_capture"
-        },
-        "id": "vampirism:win_village_capture",
-        "stat": "vampirism:win_village_capture"
       }
     ]
   },

diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord5.json b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord5.json
@@ -1,6 +1,24 @@
 {
   "requirements": {
     "requirements": [
+      {
+        "type": "vampirism:stat",
+        "amount": 50,
+        "description": {
+          "translate": "stat.vampirism.infected_creatures"
+        },
+        "id": "vampirism:infected_creatures",
+        "stat": "vampirism:infected_creatures"
+      },
+      {
+        "type": "vampirism:stat",
+        "amount": 6,
+        "description": {
+          "translate": "stat.vampirism.capture_village"
+        },
+        "id": "vampirism:capture_village",
+        "stat": "vampirism:capture_village"
+      },
       {
         "type": "vampirism:item",
         "description": {
@@ -22,24 +40,6 @@
           "Count": 20,
           "id": "vampirism:pure_blood_4"
         }
-      },
-      {
-        "type": "vampirism:stat",
-        "amount": 50,
-        "description": {
-          "translate": "stat.vampirism.infected_creatures"
-        },
-        "id": "vampirism:infected_creatures",
-        "stat": "vampirism:infected_creatures"
-      },
-      {
-        "type": "vampirism:stat",
-        "amount": 6,
-        "description": {
-          "translate": "stat.vampirism.capture_village"
-        },
-        "id": "vampirism:capture_village",
-        "stat": "vampirism:capture_village"
       }
     ]
   },

diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_minion_binding.json b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_minion_binding.json
@@ -1,6 +1,15 @@
 {
   "requirements": {
     "requirements": [
+      {
+        "type": "vampirism:entity",
+        "amount": 5,
+        "description": {
+          "translate": "entity.vampirism.vampire_baron"
+        },
+        "entityType": "vampirism:vampire_baron",
+        "id": "vampirism:vampire_baron"
+      },
       {
         "type": "vampirism:entity_type",
         "amount": 4,
@@ -20,15 +29,6 @@
           "Count": 32,
           "id": "minecraft:gold_ingot"
         }
-      },
-      {
-        "type": "vampirism:entity",
-        "amount": 5,
-        "description": {
-          "translate": "entity.vampirism.vampire_baron"
-        },
-        "entityType": "vampirism:vampire_baron",
-        "id": "vampirism:vampire_baron"
       }
     ]
   },

diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_minion_upgrade_enhanced.json b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_minion_upgrade_enhanced.json
@@ -1,6 +1,15 @@
 {
   "requirements": {
     "requirements": [
+      {
+        "type": "vampirism:entity",
+        "amount": 10,
+        "description": {
+          "translate": "entity.vampirism.vampire_baron"
+        },
+        "entityType": "vampirism:vampire_baron",
+        "id": "vampirism:vampire_baron"
+      },
       {
         "type": "vampirism:item",
         "description": {
@@ -33,15 +42,6 @@
           "Count": 3,
           "id": "minecraft:diamond_block"
         }
-      },
-      {
-        "type": "vampirism:entity",
-        "amount": 10,
-        "description": {
-          "translate": "entity.vampirism.vampire_baron"
-        },
-        "entityType": "vampirism:vampire_baron",
-        "id": "vampirism:vampire_baron"
       }
     ]
   },