feat: add support for neo

klikli-dev · Jun 13, 2024 · 24b0e7a · 24b0e7a
1 parent e245bde
commit 24b0e7a
Show file tree

Hide file tree

Showing 32 changed files with 59 additions and 59 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -14,9 +14,9 @@ minecraft_version_range=[1.21,1.22)
 
 ## Neo
 # The neo version must agree with the Minecraft version to get a valid artifact
-neo_version=21.0.0-alpha.1.21-rc1.20240610.155935
+neo_version=21.0.0-beta
 # The neo version range can use any version of neo as bounds or match the loader version range
-neo_version_range=[21.0.0-alpha,)
+neo_version_range=[21.0.0-beta,)
 # The loader version range can only use the major version of Neo/FML as bounds
 neo_loader_version_range=[3,)
 neogradle_version=7.0.142

diff --git a/neo/src/generated/resources/.cache/1a31259611d3b927433f60e0500eb1623e6ee72d b/neo/src/generated/resources/.cache/1a31259611d3b927433f60e0500eb1623e6ee72d
@@ -1,32 +1,32 @@
-// 1.21 Release Candidate 1	2024-06-13T13:05:03.3862938	Books: modonomicon
+// 1.21	2024-06-13T19:09:37.1288506	Books: modonomicon
 d1966c22cbd9f7e253c22f6e95d16e1461379e4d data/modonomicon/modonomicon/books/demo/book.json
-d9409d4773641e5758ed001a2c347075d33d5bcc data/modonomicon/modonomicon/books/demo/categories/conditional.json
-6764245a2396c1c7bab9bf9b158eff25a1ef8b73 data/modonomicon/modonomicon/books/demo/categories/features.json
-25585795bd76e12743194a3b571df83703081e55 data/modonomicon/modonomicon/books/demo/categories/formatting.json
-741e7822e6a22b66da9ba81e936e15be8f4b0fe1 data/modonomicon/modonomicon/books/demo/categories/hidden.json
-13b4eddef4734fdab4fa4dd8ea49fd2eb964d4ec data/modonomicon/modonomicon/books/demo/categories/other.json
+4d937a7e140cd8f12cf66624d4f9f0fea3d25e60 data/modonomicon/modonomicon/books/demo/categories/conditional.json
+f6b8d25ca52be524ae7a0ef88e909c4ac4698361 data/modonomicon/modonomicon/books/demo/categories/features.json
+7602d0f5e99044e312c487af3ea7ec6411d0c1b2 data/modonomicon/modonomicon/books/demo/categories/formatting.json
+2037de6715bd9389e6c82c75858848613999c1a1 data/modonomicon/modonomicon/books/demo/categories/hidden.json
+e9be47ba70195df3e759fe231a70b4532ecfcacf data/modonomicon/modonomicon/books/demo/categories/other.json
 91921129e14250f4f9403e2ee1b4614da61f702a data/modonomicon/modonomicon/books/demo/commands/test_command.json
 b9ad32b76e2efc9f44c8b76d56670f9dc63f2a94 data/modonomicon/modonomicon/books/demo/commands/test_command2.json
 81cc81ae5db128b12850e1ee32da27f52af3e997 data/modonomicon/modonomicon/books/demo/entries/conditional/always_locked.json
-1740209703f885e8ba231e1c672b7b8ee5a3a559 data/modonomicon/modonomicon/books/demo/entries/features/command.json
-be412eec3ea496a1a58fa816ac01ee05a96231ab data/modonomicon/modonomicon/books/demo/entries/features/condition_advancement.json
-f29a1c9c15ac579997866653d7fbcde618d7990f data/modonomicon/modonomicon/books/demo/entries/features/condition_level_1.json
-1633836d94e6e87022c7707833e6058128a857f8 data/modonomicon/modonomicon/books/demo/entries/features/condition_level_2.json
-aa40f46745c26e49fc541cd9b1a5c23dffe5b7d2 data/modonomicon/modonomicon/books/demo/entries/features/condition_root.json
-315188eb0c017243db892339a62c1ad106575c47 data/modonomicon/modonomicon/books/demo/entries/features/custom_icon.json
-bd30a0763c8a1e858eb0942cedd2b1cf6be5dbbb data/modonomicon/modonomicon/books/demo/entries/features/empty.json
-afe7b90225aec0da861d555804c6ad4a94864afb data/modonomicon/modonomicon/books/demo/entries/features/entity.json
-49972e85b52dbee9652438379268edbc99a45cb6 data/modonomicon/modonomicon/books/demo/entries/features/image.json
-79a938f3c76fe29b4115f90e5377b5099bb28e90 data/modonomicon/modonomicon/books/demo/entries/features/multiblock.json
-77ba8a838f133cbccb8e2d1d5595804609143ff1 data/modonomicon/modonomicon/books/demo/entries/features/recipe.json
-06ad2f914550b97b6a1d8af3648bda1de9bd686d data/modonomicon/modonomicon/books/demo/entries/features/redirect.json
-ab129914c995673fde64b05b98b3f2d22f19afc9 data/modonomicon/modonomicon/books/demo/entries/features/spotlight.json
-867b6fcac014d4a954f56746344cf95502d12113 data/modonomicon/modonomicon/books/demo/entries/features/two_parents.json
-d6809ce8d254061a215cd7742b6cd05c8384884b data/modonomicon/modonomicon/books/demo/entries/formatting/advanced.json
-f84172fa6e3855cf44a4c73ea9d5c4408053ff46 data/modonomicon/modonomicon/books/demo/entries/formatting/always_locked.json
-2751f398e7170c469bf5ca8d72e069cfa41bb106 data/modonomicon/modonomicon/books/demo/entries/formatting/basic.json
-1d0b73bb34afde40b7a4b53cd9d2548fc64c14c4 data/modonomicon/modonomicon/books/demo/entries/formatting/link.json
+9c1cd93f821b8d75c3b440aba9399a3a324ac830 data/modonomicon/modonomicon/books/demo/entries/features/command.json
+3f4b5dcf418dabc39e48379da526f83810bcd3db data/modonomicon/modonomicon/books/demo/entries/features/condition_advancement.json
+8d5c900f92888af78e90c20cfffd59c9bb66c462 data/modonomicon/modonomicon/books/demo/entries/features/condition_level_1.json
+45ef048cf02d3a7e11c15836c9eb865050f9f5eb data/modonomicon/modonomicon/books/demo/entries/features/condition_level_2.json
+8a70cb4a1ce959ef735dbd9c051f7b061513f810 data/modonomicon/modonomicon/books/demo/entries/features/condition_root.json
+1ff9ff29111f0befffc51e68363d00d30243788c data/modonomicon/modonomicon/books/demo/entries/features/custom_icon.json
+8abbcefc78f809438598e6f9b1bd8b1b929096d7 data/modonomicon/modonomicon/books/demo/entries/features/empty.json
+8fb5b44d7b54f599942d1a9bcf55cd14c777e2d0 data/modonomicon/modonomicon/books/demo/entries/features/entity.json
+74e2a5fb91574789b390caed06e635fedafd3e4c data/modonomicon/modonomicon/books/demo/entries/features/image.json
+cccca6bb0ab5ae6510bb8a0333426e66e6c62538 data/modonomicon/modonomicon/books/demo/entries/features/multiblock.json
+e2cb80ba9c55ac1ffe021e250335522c53df2409 data/modonomicon/modonomicon/books/demo/entries/features/recipe.json
+78d45cfcf2fa553fda648771808efb93c2a46a1a data/modonomicon/modonomicon/books/demo/entries/features/redirect.json
+9f0853bcee34ed1a52f9fb116033a1ebc8c74908 data/modonomicon/modonomicon/books/demo/entries/features/spotlight.json
+8399e131f63049740e3642cfa60aba1483ceb191 data/modonomicon/modonomicon/books/demo/entries/features/two_parents.json
+559dcdd6e09db7f1bad0ea7d1e85f7372b49ea41 data/modonomicon/modonomicon/books/demo/entries/formatting/advanced.json
+ce1982da99d038c6b25ce04b87ea97ea9f71c2bb data/modonomicon/modonomicon/books/demo/entries/formatting/always_locked.json
+e0a67e391143a034a114098d6512d7d29cb78dac data/modonomicon/modonomicon/books/demo/entries/formatting/basic.json
+5549a62b7e53f283aa60cf00c88c5c0041727fee data/modonomicon/modonomicon/books/demo/entries/formatting/link.json
 bc27dd0360889e1bd1510e546bcef7d6ba924ba6 data/modonomicon/modonomicon/books/demo/entries/hidden/always_locked.json
-cfbbfcd1e9495c5932dace116ed3bb8ea9dd2cf5 data/modonomicon/modonomicon/books/demo/entries/other/a.json
-faedec29ee15d5b7851654f4e77c1dee8d7fb04b data/modonomicon/modonomicon/books/demo/entries/other/b.json
-3624044946f51c265359c236d12a6eb7c435cef1 data/modonomicon/modonomicon/books/demo/entries/other/root.json
+ad9bf7c6a5f334731ee95ff22deb1a002e5ad7bd data/modonomicon/modonomicon/books/demo/entries/other/a.json
+c918f7d1599d098728a78350cc25e9564ab2e8e0 data/modonomicon/modonomicon/books/demo/entries/other/b.json
+dbad1906d4c6e29bd8ac8512a46255198ac14d45 data/modonomicon/modonomicon/books/demo/entries/other/root.json
diff --git a/neo/src/generated/resources/.cache/4e3edd34b6c5246aeed9322e2916f3d9b1fb6f50 b/neo/src/generated/resources/.cache/4e3edd34b6c5246aeed9322e2916f3d9b1fb6f50
@@ -1,4 +1,4 @@
-// 1.21 Release Candidate 1	2024-06-11T07:27:31.875432	Item Models: modonomicon
+// 1.21	2024-06-13T19:09:37.1328497	Item Models: modonomicon
 b02e0bc9f75e0fde6807935577e74b75348413fb assets/modonomicon/models/item/modonomicon_blue.json
 83adea7fd65acd9581797454e1a6dc6122d8a826 assets/modonomicon/models/item/modonomicon_green.json
 4b35646623b74487675fa8ec1bb375535100c336 assets/modonomicon/models/item/modonomicon_purple.json

diff --git a/neo/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/neo/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
@@ -1,2 +1,2 @@
-// 1.21 Release Candidate 1	2024-06-13T12:56:36.2542607	Languages: en_us
+// 1.21	2024-06-13T19:09:37.1328497	Languages: en_us
 bd9b85ca1a74cef1d6752951d075eddbb1139a27 assets/modonomicon/lang/en_us.json
diff --git a/neo/src/generated/resources/.cache/e08f1c24cdfbf669e7cca3ce1d743acecd7e4bfe b/neo/src/generated/resources/.cache/e08f1c24cdfbf669e7cca3ce1d743acecd7e4bfe
@@ -1,4 +1,4 @@
-// 1.21 Release Candidate 1	2024-06-11T07:27:31.8764319	Multiblocks: modonomicon
+// 1.21	2024-06-13T19:09:37.1338499	Multiblocks: modonomicon
 9dc306d79a39ee2085be7e1384d8e39640d79e49 data/modonomicon/modonomicon/multiblocks/demo_dense.json
 89b499dd4f3850c8099ad26ae3c286e95ac8cf99 data/modonomicon/modonomicon/multiblocks/demo_fluid.json
 fc1e7363336d456dd0d1583fcfdaa27a8c4bf23e data/modonomicon/modonomicon/multiblocks/demo_predicate.json

diff --git a/...c/generated/resources/data/modonomicon/modonomicon/books/demo/categories/conditional.json b/...c/generated/resources/data/modonomicon/modonomicon/books/demo/categories/conditional.json
@@ -16,5 +16,5 @@
   },
   "name": "book.modonomicon.demo.conditional.name",
   "show_category_button": true,
-  "sort_number": -1
+  "sort_number": 3
 }
diff --git a/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/categories/features.json b/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/categories/features.json
@@ -25,5 +25,5 @@
   },
   "name": "book.modonomicon.demo.features.name",
   "show_category_button": true,
-  "sort_number": -1
+  "sort_number": 0
 }
diff --git a/...rc/generated/resources/data/modonomicon/modonomicon/books/demo/categories/formatting.json b/...rc/generated/resources/data/modonomicon/modonomicon/books/demo/categories/formatting.json
@@ -16,5 +16,5 @@
   "name": "book.modonomicon.demo.formatting.name",
   "open_entry_to_open_only_once": true,
   "show_category_button": true,
-  "sort_number": -1
+  "sort_number": 1
 }
diff --git a/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/categories/hidden.json b/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/categories/hidden.json
@@ -12,5 +12,5 @@
   },
   "name": "book.modonomicon.demo.hidden.name",
   "show_category_button": false,
-  "sort_number": -1
+  "sort_number": 2
 }
diff --git a/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/categories/other.json b/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/categories/other.json
@@ -14,5 +14,5 @@
   "name": "book.modonomicon.demo.other.name",
   "open_entry_to_open_only_once": false,
   "show_category_button": true,
-  "sort_number": -1
+  "sort_number": 4
 }
diff --git a/...generated/resources/data/modonomicon/modonomicon/books/demo/entries/features/command.json b/...generated/resources/data/modonomicon/modonomicon/books/demo/entries/features/command.json
@@ -42,7 +42,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 9,
   "x": -8,
   "y": 3
 }
diff --git a/...urces/data/modonomicon/modonomicon/books/demo/entries/features/condition_advancement.json b/...urces/data/modonomicon/modonomicon/books/demo/entries/features/condition_advancement.json
@@ -38,7 +38,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 2,
   "x": -3,
   "y": -4
 }
diff --git a/...resources/data/modonomicon/modonomicon/books/demo/entries/features/condition_level_1.json b/...resources/data/modonomicon/modonomicon/books/demo/entries/features/condition_level_1.json
@@ -34,7 +34,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 3,
   "x": -1,
   "y": 0
 }
diff --git a/...resources/data/modonomicon/modonomicon/books/demo/entries/features/condition_level_2.json b/...resources/data/modonomicon/modonomicon/books/demo/entries/features/condition_level_2.json
@@ -34,7 +34,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 4,
   "x": -6,
   "y": 0
 }
diff --git a/...ed/resources/data/modonomicon/modonomicon/books/demo/entries/features/condition_root.json b/...ed/resources/data/modonomicon/modonomicon/books/demo/entries/features/condition_root.json
@@ -22,7 +22,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 1,
   "x": -6,
   "y": -2
 }
diff --git a/...rated/resources/data/modonomicon/modonomicon/books/demo/entries/features/custom_icon.json b/...rated/resources/data/modonomicon/modonomicon/books/demo/entries/features/custom_icon.json
@@ -32,7 +32,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 13,
   "x": 2,
   "y": 2
 }
diff --git a/...c/generated/resources/data/modonomicon/modonomicon/books/demo/entries/features/empty.json b/...c/generated/resources/data/modonomicon/modonomicon/books/demo/entries/features/empty.json
@@ -44,7 +44,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 8,
   "x": -8,
   "y": 1
 }
diff --git a/.../generated/resources/data/modonomicon/modonomicon/books/demo/entries/features/entity.json b/.../generated/resources/data/modonomicon/modonomicon/books/demo/entries/features/entity.json
@@ -50,7 +50,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 10,
   "x": 1,
   "y": -3
 }
diff --git a/...c/generated/resources/data/modonomicon/modonomicon/books/demo/entries/features/image.json b/...c/generated/resources/data/modonomicon/modonomicon/books/demo/entries/features/image.json
@@ -70,7 +70,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 11,
   "x": 2,
   "y": 0
 }
diff --git a/...erated/resources/data/modonomicon/modonomicon/books/demo/entries/features/multiblock.json b/...erated/resources/data/modonomicon/modonomicon/books/demo/entries/features/multiblock.json
@@ -66,7 +66,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 0,
   "x": -14,
   "y": -3
 }
diff --git a/.../generated/resources/data/modonomicon/modonomicon/books/demo/entries/features/recipe.json b/.../generated/resources/data/modonomicon/modonomicon/books/demo/entries/features/recipe.json
@@ -113,7 +113,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 6,
   "x": -14,
   "y": -1
 }
diff --git a/...enerated/resources/data/modonomicon/modonomicon/books/demo/entries/features/redirect.json b/...enerated/resources/data/modonomicon/modonomicon/books/demo/entries/features/redirect.json
@@ -10,7 +10,7 @@
   },
   "name": "book.modonomicon.demo.features.redirect.name",
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 12,
   "x": -9,
   "y": -4
 }
diff --git a/...nerated/resources/data/modonomicon/modonomicon/books/demo/entries/features/spotlight.json b/...nerated/resources/data/modonomicon/modonomicon/books/demo/entries/features/spotlight.json
@@ -54,7 +54,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 7,
   "x": -14,
   "y": 1
 }
diff --git a/...rated/resources/data/modonomicon/modonomicon/books/demo/entries/features/two_parents.json b/...rated/resources/data/modonomicon/modonomicon/books/demo/entries/features/two_parents.json
@@ -49,7 +49,7 @@
     }
   ],
   "show_when_any_parent_unlocked": true,
-  "sort_number": -1,
+  "sort_number": 5,
   "x": -7,
   "y": -3
 }
diff --git a/...erated/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/advanced.json b/...erated/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/advanced.json
@@ -52,7 +52,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 1,
   "x": -4,
   "y": -1
 }
diff --git a/...d/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/always_locked.json b/...d/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/always_locked.json
@@ -12,7 +12,7 @@
   },
   "name": "book.modonomicon.demo.formatting.always_locked.name",
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 3,
   "x": 6,
   "y": 0
 }
diff --git a/...generated/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/basic.json b/...generated/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/basic.json
@@ -35,7 +35,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 0,
   "x": -8,
   "y": -1
 }
diff --git a/.../generated/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/link.json b/.../generated/resources/data/modonomicon/modonomicon/books/demo/entries/formatting/link.json
@@ -52,7 +52,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 2,
   "x": 0,
   "y": 0
 }
diff --git a/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/entries/other/a.json b/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/entries/other/a.json
@@ -42,7 +42,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 1,
   "x": -4,
   "y": -1
 }
diff --git a/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/entries/other/b.json b/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/entries/other/b.json
@@ -34,7 +34,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 2,
   "x": -8,
   "y": -1
 }
diff --git a/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/entries/other/root.json b/neo/src/generated/resources/data/modonomicon/modonomicon/books/demo/entries/other/root.json
@@ -22,7 +22,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": -1,
+  "sort_number": 0,
   "x": 0,
   "y": 0
 }
diff --git a/settings.gradle b/settings.gradle
@@ -30,5 +30,5 @@ rootProject.name = 'Modonomicon ' + minecraft_version
 
 include("common")
 include("fabric")
-//include("neo")
+include("neo")
 //include("forge")