V1.9.3

LunarEclipseStudios · May 1, 2024 · 60a5233 · 60a5233
1 parent c86869e
commit 60a5233
Show file tree

Hide file tree

Showing 122 changed files with 962 additions and 744 deletions.
diff --git a/...og-1.20-v1.9.2-Data-Resource-Pack.zip.zip → ...20.5-1.20.6-v1.9.3-Data-Resource-Pack.zip b/...og-1.20-v1.9.2-Data-Resource-Pack.zip.zip → ...20.5-1.20.6-v1.9.3-Data-Resource-Pack.zip
diff --git a/From-The-Fog-1.20-v1.9.2-Forge-Fabric.jar → ...Fog-1.20.5-1.20.6-v1.9.3-Forge-Fabric.jar b/From-The-Fog-1.20-v1.9.2-Forge-Fabric.jar → ...Fog-1.20.5-1.20.6-v1.9.3-Forge-Fabric.jar
diff --git a/fabric-forge/META-INF/mods.toml b/fabric-forge/META-INF/mods.toml
@@ -5,7 +5,7 @@ logoFile="banner.png"
 
 [[mods]]
 modId="watching"
-version="1.9.2"
+version="1.9.3"
 displayName="From The Fog"
 credits="§8Created by §5☆Lunar Eclipse Studios☆"
 displayURL="https://lunareclipse.studio/creations/from-the-fog"
@@ -16,6 +16,6 @@ description='''Enter a world of fear and mystery with From The Fog, a Minecraft
 [[dependencies.watching]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.20, 1.21]"
+    versionRange="[1.20.5, 1.20.6]"
     ordering="NONE"
     side="BOTH"
diff --git a/fabric-forge/data/watching/advancements/main/be_comical_bonzo.json b/fabric-forge/data/watching/advancements/main/be_comical_bonzo.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/root",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359015}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359015
+            }
         },
         "title": {
             "translate": "advancements.ftf.be_comical_bonzo.title"

diff --git a/fabric-forge/data/watching/advancements/main/be_the_librarian.json b/fabric-forge/data/watching/advancements/main/be_the_librarian.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/root",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359010}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359010
+            }
         },
         "title": {
             "translate": "advancements.ftf.be_the_librarian.title"

diff --git a/fabric-forge/data/watching/advancements/main/built_shrine.json b/fabric-forge/data/watching/advancements/main/built_shrine.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/root",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359001}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359001
+            }
         },
         "title": {
             "translate": "advancements.ftf.built_shrine.title"

diff --git a/fabric-forge/data/watching/advancements/main/didnt_notice_herobrine.json b/fabric-forge/data/watching/advancements/main/didnt_notice_herobrine.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/spotted_herobrine",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359003}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359003
+            }
         },
         "title": {
             "translate": "advancements.ftf.didnt_notice_herobrine.title"

diff --git a/fabric-forge/data/watching/advancements/main/dog_growl.json b/fabric-forge/data/watching/advancements/main/dog_growl.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/built_shrine",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359011}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359011
+            }
         },
         "title": {
             "translate": "advancements.ftf.dog_growl.title"

diff --git a/fabric-forge/data/watching/advancements/main/dreadful_donation.json b/fabric-forge/data/watching/advancements/main/dreadful_donation.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/root",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359012}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359012
+            }
         },
         "title": {
             "translate": "advancements.ftf.dreadful_donation.title"
@@ -28,10 +30,14 @@
                 },
                 "items": [
                     {
-                        "nbt": "{dreadfulDonation:1b}"
+                        "components": {
+                            "minecraft:custom_data": {
+                                "dreadfulDonation": 1
+                            }
+                        }
                     }
                 ]
             }
         }
     }
-}
+}
diff --git a/fabric-forge/data/watching/advancements/main/found_herobrine_structure.json b/fabric-forge/data/watching/advancements/main/found_herobrine_structure.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/root",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359006}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359006
+            }
         },
         "title": {
             "translate": "advancements.ftf.found_herobrine_structure.title"

diff --git a/fabric-forge/data/watching/advancements/main/found_leafless_grove.json b/fabric-forge/data/watching/advancements/main/found_leafless_grove.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/found_herobrine_structure",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359004}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359004
+            }
         },
         "title": {
             "translate": "advancements.ftf.found_leafless_grove.title"
@@ -16,28 +18,28 @@
     },
     "criteria": {
         "found_grove": {
-            "trigger": "minecraft:location",
-            "conditions": {
-                "player": [
-                    {
-                        "condition": "minecraft:entity_properties",
-                        "entity": "this",
-                        "predicate": {
-                            "type_specific": {
-                                "type": "player",
-                                "advancements": {
-                                    "watching:main/root": true
-                                }
-                            },
-                            "location": {
-                                "structure": "watching:leafless_grove"
-                            }
-                        }
+          "trigger": "minecraft:location",
+          "conditions": {
+            "player": [
+              {
+                "condition": "minecraft:entity_properties",
+                "entity": "this",
+                "predicate": {
+                  "type_specific": {
+                    "type": "minecraft:player",
+                    "advancements": {
+                      "watching:main/root": true
                     }
-                ]
-            }
+                  },
+                  "location": {
+                    "structures": "watching:leafless_grove"
+                  }
+                }
+              }
+            ]
+          }
         }
-    },
+      },
     "requirements": [
         [
             "found_grove"

diff --git a/fabric-forge/data/watching/advancements/main/found_logless_tree.json b/fabric-forge/data/watching/advancements/main/found_logless_tree.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/found_herobrine_structure",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359005}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359005
+            }
         },
         "title": {
             "translate": "advancements.ftf.found_logless_tree.title"

diff --git a/fabric-forge/data/watching/advancements/main/found_torch_tunnel.json b/fabric-forge/data/watching/advancements/main/found_torch_tunnel.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/found_herobrine_structure",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359018}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359018
+            }
         },
         "title": {
             "translate": "advancements.ftf.found_torch_tunnel.title"

diff --git a/fabric-forge/data/watching/advancements/main/ghost_miner.json b/fabric-forge/data/watching/advancements/main/ghost_miner.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/built_shrine",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359016}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359016
+            }
         },
         "title": {
             "translate": "advancements.ftf.ghost_miner.title"

diff --git a/fabric-forge/data/watching/advancements/main/have_a_nightmare.json b/fabric-forge/data/watching/advancements/main/have_a_nightmare.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/built_shrine",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359007}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359007
+            }
         },
         "title": {
             "translate": "advancements.ftf.have_a_nightmare.title"

diff --git a/fabric-forge/data/watching/advancements/main/herobrine_griddy.json b/fabric-forge/data/watching/advancements/main/herobrine_griddy.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/spotted_herobrine",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359008}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359008
+            }
         },
         "title": {
             "translate": "advancements.ftf.herobrine_griddy.title"

diff --git a/fabric-forge/data/watching/advancements/main/jumpscared.json b/fabric-forge/data/watching/advancements/main/jumpscared.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/spotted_herobrine",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359002}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359002
+            }
         },
         "title": {
             "translate": "advancements.ftf.jumpscared.title"

diff --git a/fabric-forge/data/watching/advancements/main/liberty_lantern.json b/fabric-forge/data/watching/advancements/main/liberty_lantern.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/be_the_librarian",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359009}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359009
+            }
         },
         "title": {
             "translate": "advancements.ftf.liberty_lantern.title"
@@ -28,7 +30,7 @@
                         }
                     }
                 },
-                "item": {
+                "id": {
                     "items": [
                         "minecraft:lantern"
                     ]

diff --git a/fabric-forge/data/watching/advancements/main/named_dd_item.json b/fabric-forge/data/watching/advancements/main/named_dd_item.json
@@ -2,8 +2,10 @@
     "parent": "watching:main/dreadful_donation",
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359014}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359014
+            }
         },
         "title": {
             "translate": "advancements.ftf.named_dd_item.title"
@@ -28,7 +30,12 @@
                 },
                 "items": [
                     {
-                        "nbt": "{dreadfulDonation:1b,namedItem:1b}"
+                        "components": {
+                            "minecraft:custom_data": {
+                                "dreadfulDonation": 1,
+                                "namedItem": 1
+                            }
+                        }
                     }
                 ]
             }

diff --git a/fabric-forge/data/watching/advancements/main/root.json b/fabric-forge/data/watching/advancements/main/root.json
@@ -1,8 +1,10 @@
 {
     "display": {
         "icon": {
-            "item": "minecraft:disc_fragment_5",
-            "nbt": "{CustomModelData:1359013}"
+            "id": "minecraft:disc_fragment_5",
+            "components": {
+                "minecraft:custom_model_data": 1359013
+            }
         },
         "title": {
             "translate": "advancements.ftf.root.title"

diff --git a/fabric-forge/data/watching/advancements/main/spotted_herobrine.json b/fabric-forge/data/watching/advancements/main/spotted_herobrine.json
@@ -2,7 +2,7 @@
     "parent": "watching:main/built_shrine",
     "display": {
         "icon": {
-            "item": "minecraft:player_head",
+            "id": "minecraft:player_head",
             "nbt": "{SkullOwner:{Id:[I;-465008279,1042632222,-1922979353,-419106848],Properties:{textures:[{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY2NjQyNzMzNjM0NywKICAicHJvZmlsZUlkIiA6ICI3MzY0ODFkZmY2ZGY0NWUwOTA0ODg0ZjNiMWExMjY1NSIsCiAgInByb2ZpbGVOYW1lIiA6ICJUd2lsaWdodFFBUSIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS80NjZjY2QwMTM5ZTFmOWVkMjc1NTRhMGMzOWE0ZWZmYzczNjEwYjg2YWEwNTc5ZTQwNWY2NDFjZDFkNjc4YzQ1IgogICAgfQogIH0KfQ==\"}]}}}"
         },
         "title": {

diff --git a/fabric-forge/data/watching/advancements/main/survive/100_days.json b/fabric-forge/data/watching/advancements/main/survive/100_days.json
@@ -2,7 +2,7 @@
     "parent": "watching:main/survive/50_days",
     "display": {
         "icon": {
-            "item": "gold_block"
+            "id": "gold_block"
         },
         "title": {
             "translate": "advancements.ftf.survive_100_days.title"

diff --git a/fabric-forge/data/watching/advancements/main/survive/10_days.json b/fabric-forge/data/watching/advancements/main/survive/10_days.json
@@ -2,7 +2,7 @@
     "parent": "watching:main/survive/3_days",
     "display": {
         "icon": {
-            "item": "stone"
+            "id": "stone"
         },
         "title": {
             "translate": "advancements.ftf.survive_10_days.title"

diff --git a/fabric-forge/data/watching/advancements/main/survive/200_days.json b/fabric-forge/data/watching/advancements/main/survive/200_days.json
@@ -2,7 +2,7 @@
     "parent": "watching:main/survive/100_days",
     "display": {
         "icon": {
-            "item": "diamond_block"
+            "id": "diamond_block"
         },
         "title": {
             "translate": "advancements.ftf.survive_200_days.title"

diff --git a/fabric-forge/data/watching/advancements/main/survive/3_days.json b/fabric-forge/data/watching/advancements/main/survive/3_days.json
@@ -2,7 +2,7 @@
     "parent": "watching:main/root",
     "display": {
         "icon": {
-            "item": "dirt"
+            "id": "dirt"
         },
         "title": {
             "translate": "advancements.ftf.survive_3_days.title"

diff --git a/fabric-forge/data/watching/advancements/main/survive/50_days.json b/fabric-forge/data/watching/advancements/main/survive/50_days.json
@@ -2,7 +2,7 @@
     "parent": "watching:main/survive/10_days",
     "display": {
         "icon": {
-            "item": "iron_block"
+            "id": "iron_block"
         },
         "title": {
             "translate": "advancements.ftf.survive_50_days.title"