Revert "Use Bookshelf Library For Tip Conditions"

This reverts commit e3856f4.
Fyoncle · Nov 26, 2024 · c431584 · c431584
1 parent 6b86528
commit c431584
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 70 deletions.
diff --git a/...esources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/better_than_mending.json b/...esources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/better_than_mending.json
@@ -1,10 +1,4 @@
 {
-  "bookshelf:load_conditions": [
-    {
-      "type": "bookshelf:mod_loaded",
-      "mods": ["betterthanmending"]
-    }
-  ],
   "title": {
     "text": "Tip",
     "underlined": true,
@@ -13,5 +7,11 @@
   "text": {
     "text": "You can sneak and right-click to repair tools that have Mending using your exp.",
     "color": "white"
-  }
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": ["betterthanmending"]
+    }
+  ]
 }
diff --git a/src/main/resources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/cage_firefly.json b/src/main/resources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/cage_firefly.json
@@ -1,10 +1,4 @@
 {
-  "bookshelf:load_conditions": [
-    {
-      "type": "bookshelf:mod_loaded",
-      "mods": ["supplementaries"]
-    }
-  ],
   "title": {
     "text": "Tip",
     "underlined": true,
@@ -13,5 +7,11 @@
   "text": {
     "text": "You can cage fireflies!",
     "color": "white"
-  }
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": ["supplementaries"]
+    }
+  ]
 }
diff --git a/.../resources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/distracting_trims.json b/.../resources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/distracting_trims.json
@@ -1,10 +1,4 @@
 {
-  "bookshelf:load_conditions": [
-    {
-      "type": "bookshelf:mod_loaded",
-      "mods": ["distractingtrims"]
-    }
-  ],
   "title": {
     "text": "Tip",
     "underlined": true,
@@ -13,5 +7,11 @@
   "text": {
     "text": "When you wear any gold-trimmed armor, piglins won’t become hostile towards you anymore!",
     "color": "white"
-  }
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": ["distractingtrims"]
+    }
+  ]
 }
diff --git a/src/main/resources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/dual_ride.json b/src/main/resources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/dual_ride.json
@@ -1,10 +1,4 @@
 {
-  "bookshelf:load_conditions": [
-    {
-      "type": "bookshelf:mod_loaded",
-      "mods": ["kaffees_dual_ride"]
-    }
-  ],
   "title": {
     "text": "Tip",
     "underlined": true,
@@ -13,5 +7,11 @@
   "text": {
     "text": "Now your friends can sit together on the same horse as you!",
     "color": "white"
-  }
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": ["kaffees_dual_ride"]
+    }
+  ]
 }
diff --git a/src/main/resources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/elytra_trims.json b/src/main/resources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/elytra_trims.json
@@ -1,10 +1,4 @@
 {
-  "bookshelf:load_conditions": [
-    {
-      "type": "bookshelf:mod_loaded",
-      "mods": ["elytratrims"]
-    }
-  ],
   "title": {
     "text": "Tip",
     "underlined": true,
@@ -13,5 +7,11 @@
   "text": {
     "text": "You can now also trim elytras!",
     "color": "white"
-  }
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": ["elytratrims"]
+    }
+  ]
 }
diff --git a/...main/resources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/horse_in_boat.json b/...main/resources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/horse_in_boat.json
@@ -1,10 +1,4 @@
 {
-  "bookshelf:load_conditions": [
-    {
-      "type": "bookshelf:mod_loaded",
-      "mods": ["horseinboat"]
-    }
-  ],
   "title": {
     "text": "Tip",
     "underlined": true,
@@ -13,5 +7,11 @@
   "text": {
     "text": "Horses can now sit in boats to travel with you!",
     "color": "white"
-  }
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": ["horseinboat"]
+    }
+  ]
 }
diff --git a/src/main/resources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/pat_wolf.json b/src/main/resources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/pat_wolf.json
@@ -1,10 +1,4 @@
 {
-  "bookshelf:load_conditions": [
-    {
-      "type": "bookshelf:mod_loaded",
-      "mods": ["calmdowndog"]
-    }
-  ],
   "title": {
     "text": "Tip",
     "underlined": true,
@@ -13,5 +7,11 @@
   "text": {
     "text": "You can sneak and right-click to pat your wolf and calm them!",
     "color": "white"
-  }
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": ["calmdowndog"]
+    }
+  ]
 }
diff --git a/...esources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/right_click_harvest.json b/...esources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/right_click_harvest.json
@@ -1,10 +1,4 @@
 {
-  "bookshelf:load_conditions": [
-    {
-      "type": "bookshelf:mod_loaded",
-      "mods": ["rightclickharvest"]
-    }
-  ],
   "title": {
     "text": "Tip",
     "underlined": true,
@@ -13,5 +7,11 @@
   "text": {
     "text": "You can now right-click crops to harvest and automatically replant them, and using hoes allows you to harvest larger areas!",
     "color": "white"
-  }
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": ["rightclickharvest"]
+    }
+  ]
 }
diff --git a/src/main/resources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/sit.json b/src/main/resources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/sit.json
@@ -1,10 +1,4 @@
 {
-  "bookshelf:load_conditions": [
-    {
-      "type": "bookshelf:mod_loaded",
-      "mods": ["sit"]
-    }
-  ],
   "title": {
     "text": "Tip",
     "underlined": true,
@@ -13,5 +7,11 @@
   "text": {
     "text": "You can now sit on stairs and slabs!",
     "color": "white"
-  }
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": ["sit"]
+    }
+  ]
 }
diff --git a/...esources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/tame_sculk_snappers.json b/...esources/resourcepacks/elysiumdaystweaks/assets/elysiumdays/tips/tame_sculk_snappers.json
@@ -1,10 +1,4 @@
 {
-  "bookshelf:load_conditions": [
-    {
-      "type": "bookshelf:mod_loaded",
-      "mods": ["deeperdarker"]
-    }
-  ],
   "title": {
     "text": "Tip",
     "underlined": true,
@@ -13,5 +7,11 @@
   "text": {
     "text": "You can tame sculk snappers!",
     "color": "white"
-  }
+  },
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": ["deeperdarker"]
+    }
+  ]
 }