beer more complex, advancements tab

src/main/resources/assets/szar/lang/en_us.json

@@ -117,12 +117,6 @@
   "item.szar.erika": "Music Disc",
   "item.szar.erika.desc": "Herms Niel - Erika",
 
-  "advancement.szar.nwordpass.title": "Nig-",
-  "advancement.szar.nwordpass.description": "Get an N-word pass",
-
-  "advancement.szar.two_towers.title": "Hmm, familiar...",
-  "advancement.szar.two_towers.description": "You were there when the towers fell",
-
   "item.szar.revolver": "Revolver",
   "item.szar.revolver_bullet": "Revolver Bullet",
   "item.szar.bullet_shell": "Revolver Bullet Shell",
@@ -157,30 +151,39 @@
   "item.szar.kebab": "Kebab",
   "death.attack.fart": "%1$s was farted on by %2$s",
 
-  "advancement.szar.high.title": "Did I always have no hands?",
+  "advancement.szar.nwordpass.title": "N̶i̶g̶",
+  "advancement.szar.nwordpass.description": "Use an N-word pass",
+
+  "advancement.szar.two_towers.title": "Hmm, familiar...",
+  "advancement.szar.two_towers.description": "You were there when the towers fell",
+
+  "advancement.szar.high.title": "Why is the sky green?",
   "advancement.szar.high.description": "Get high using weed.",
 
-  "advancement.szar.arrested.title": "Officer, I swear I didn't do anything!",
+  "advancement.szar.arrested.title": "I swear I'm innocent!",
   "advancement.szar.arrested.description": "Get arrested",
 
   "advancement.szar.files.title": "I wonder if I'm in the files..",
   "advancement.szar.files.description": "Read the Epstein files.",
 
-  "advancement.szar.nyan.title": "You are starting to annoy me!",
+  "advancement.szar.nyan.title": "nyan nyan nyan nyan...",
   "advancement.szar.nyan.description": "Get near a Nyan Cat",
 
-  "advancement.szar.oi.title": "DO THE THING",
+  "advancement.szar.oi.title": "OiOiOiAEyeEye",
   "advancement.szar.oi.description": "Play Firtana's sound",
 
-  "advancement.szar.crazy.title": "Crazy",
+  "advancement.szar.crazy.title": "No way",
   "advancement.szar.crazy.description": "Play a crazy music disc from the Szar Mod",
 
   "advancement.szar.gamble.title": "Let's go gambling!",
   "advancement.szar.gamble.description": "Gamble in a gambling machine.",
 
-  "advancement.szar.april.title": "I think you were used to be the other way, no?",
+  "advancement.szar.april.title": "Something feels off today...",
   "advancement.szar.april.description": "Play the game on April 1st",
 
   "advancement.szar.dontknow.title": "I think she doesn't know",
-  "advancement.szar.dontknow.description": "Ask a question from Merl"
+  "advancement.szar.dontknow.description": "Ask a question from Merl",
+
+  "advancement.szar.backrooms.title": "Where did the world go?",
+  "advancement.szar.backrooms.description": "Step into the Backrooms"
 }

src/main/resources/data/szar/advancements/april.json

@@ -1,11 +1,14 @@
 {
+  "parent": "szar:szar",
   "display": {
     "icon": {
       "item": "szar:april"
     },
     "title": {"translate": "advancement.szar.april.title"},
     "description": {"translate": "advancement.szar.april.description"},
-    "show_toast": false
+    "show_toast": true,
+    "announce_to_chat": false,
+    "frame": "challenge"
   },
   "criteria": {
     "used_item": {

src/main/resources/data/szar/advancements/arrested.json

@@ -1,4 +1,5 @@
 {
+  "parent": "szar:szar",
   "display": {
     "icon": {
       "item": "szar:police_handcuff"

src/main/resources/data/szar/advancements/backrooms.json

@@ -0,0 +1,16 @@
+{
+  "parent": "szar:szar",
+  "display": {
+    "icon": {
+      "item": "szar:tracker"
+    },
+    "title": {"translate": "advancement.szar.backrooms.title"},
+    "description": {"translate": "advancement.szar.backrooms.description"},
+    "show_toast": true
+  },
+  "criteria": {
+    "used_item": {
+      "trigger": "minecraft:impossible"
+    }
+  }
+}

src/main/resources/data/szar/advancements/crazy.json

@@ -1,4 +1,5 @@
 {
+  "parent": "szar:szar",
   "display": {
     "icon": {
       "item": "szar:baiter"

src/main/resources/data/szar/advancements/dontknow.json

@@ -1,4 +1,5 @@
 {
+  "parent": "szar:szar",
   "display": {
     "icon": {
       "item": "szar:merl_spawn_egg"

src/main/resources/data/szar/advancements/files.json

@@ -1,4 +1,5 @@
 {
+  "parent": "szar:szar",
   "display": {
     "icon": {
       "item": "szar:epstein_files"

src/main/resources/data/szar/advancements/gamble.json

@@ -1,4 +1,5 @@
 {
+  "parent": "szar:szar",
   "display": {
     "icon": {
       "item": "szar:slot_machine"

src/main/resources/data/szar/advancements/high.json

@@ -1,7 +1,8 @@
 {
+  "parent": "szar:szar",
   "display": {
     "icon": {
-      "item": "szar:weed_joint"
+      "item": "szar:cannabis"
     },
     "title": {"translate": "advancement.szar.high.title"},
     "description": {"translate": "advancement.szar.high.description"},

src/main/resources/data/szar/advancements/nwordpass.json

@@ -1,4 +1,5 @@
 {
+  "parent": "szar:szar",
   "display": {
     "icon": {
       "item": "szar:nwordpass"

src/main/resources/data/szar/advancements/nyan.json

@@ -1,4 +1,5 @@
 {
+  "parent": "szar:szar",
   "display": {
     "icon": {
       "item": "szar:pop_tart"

src/main/resources/data/szar/advancements/oi.json

@@ -1,4 +1,5 @@
 {
+  "parent": "szar:szar",
   "display": {
     "icon": {
       "item": "szar:firtana"

src/main/resources/data/szar/advancements/szar.json

@@ -0,0 +1,16 @@
+{
+  "display": {
+    "icon": { "item": "szar:cannabis" },
+    "title": "Szar",
+    "description": "The Szar mod advancements",
+    "frame": "task",
+    "background": "szar:textures/block/wall_block.png",
+    "show_toast": false,
+    "announce_to_chat": false
+  },
+  "criteria": {
+    "impossible": {
+      "trigger": "minecraft:impossible"
+    }
+  }
+}

src/main/resources/data/szar/advancements/two_towers_explosion.json

@@ -1,4 +1,5 @@
 {
+  "parent": "szar:szar",
   "criteria": {
     "boom": {
       "trigger": "minecraft:impossible"
@@ -8,7 +9,6 @@
     "icon": { "item": "szar:towers" },
     "title": {"translate": "advancement.szar.two_towers.title"},
     "description": {"translate": "advancement.szar.two_towers.description"},
-    "frame": "challenge",
     "show_toast": true,
     "announce_to_chat": true
   }

src/main/resources/szar.mixins.json

@@ -6,13 +6,16 @@
   "mixins": [
     "CraftingScreenHandlerMixin",
     "CraftingScreenHandlerMixin2",
+    "EntityCollisionMixin",
     "JukeboxMixin",
     "LevelSummaryMixin",
     "LivingEntityFallDamageMixin",
     "NoClipMixin",
     "PlaneBlockInteractionMixin",
+    "PlayerDropMixin",
     "PlayerEntityMixin",
     "PlayerInteractionMixin",
+    "PlayerSleepMixin",
     "RadiatedItemMixin"
   ],
   "injectors": {