Preliminary update to neoforge 20.4

build.gradle

@@ -38,7 +38,7 @@ repositories {
     }
     maven {
         // maven that contains infiniverse
-        url "https://cubicinterpolation.net/maven/"
+        url "https://commoble.net/maven/"
     }
 }
 
@@ -90,12 +90,12 @@ dependencies {
 
 	// http://dvs1.progwml6.com/files/maven
     compileOnly "mezz.jei:jei-${mc_version}-common-api:${mc_jei_version}"
-    compileOnly "mezz.jei:jei-${mc_version}-forge-api:${mc_jei_version}"
-    //runtimeOnly "mezz.jei:jei-${mc_version}-forge:${mc_jei_version}"
+    compileOnly "mezz.jei:jei-${mc_version}-neoforge-api:${mc_jei_version}"
+    runtimeOnly "mezz.jei:jei-${mc_version}-neoforge:${mc_jei_version}"
     compileOnly "com.refinedmods:refinedstorage:${mc_refined_storage_version}"
 
     implementation "software.bernie.geckolib:geckolib-${mc_gecko_version}"
-    compileOnly "commoble.infiniverse:${infiniverse_branch}:${infiniverse_version}"
+    implementation "net.commoble.infiniverse:${infiniverse_branch}:${infiniverse_version}"
 }
 
 sourceSets.main.resources {

gradle.properties

@@ -1,20 +1,20 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 org.gradle.daemon=false
 
-mc_version=1.20.1
+mc_version=1.20.4
 
-mc_ms_version=1.20.2-1.12.0.1
+mc_ms_version=1.20.4-1.12.0.1
 
-neo_version=20.2.86
+neo_version=20.4.232
 
-neogradle.subsystems.parchment.minecraftVersion=1.20.2
-neogradle.subsystems.parchment.mappingsVersion=2023.12.10
+neogradle.subsystems.parchment.minecraftVersion=1.20.4
+neogradle.subsystems.parchment.mappingsVersion=2024.04.14
 
-mc_jei_version=15.2.0.22
+mc_jei_version=17.3.0.49
 
-mc_gecko_version=neoforge-1.20.2:4.3.1
+mc_gecko_version=neoforge-1.20.4:4.4.4
 
-mc_refined_storage_version=1.11.4
+mc_refined_storage_version=1.13.0-beta.4
 
-infiniverse_branch=infiniverse-1.20.1
-infiniverse_version=1.0.0.5
+infiniverse_branch=infiniverse-1.20.4
+infiniverse_version=2.0.0.1

src/main/generated/resources/assets/minestuck/lang/en_us.json

@@ -538,8 +538,8 @@
   "block.minestuck.horizontal_green_stone_bricks": "Horizontal Green Stone Bricks",
   "block.minestuck.horse_clock_bottom": "Horse Clock",
   "block.minestuck.horse_clock_center": "Horse Clock",
+  "block.minestuck.horse_clock_center.tooltip": "It is so majestic you want to weep",
   "block.minestuck.horse_clock_top": "Horse Clock",
-  "block.minestuck.horse_clock_top.tooltip": "It is so majestic you want to weep",
   "block.minestuck.hot_cake": "Really Hot Cake",
   "block.minestuck.hubtop": "Hubtop",
   "block.minestuck.igneous_spike": "Igneous Spike",

src/main/generated/resources/data/minestuck/advancements/minestuck/alchemy.json

@@ -6,16 +6,12 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.alchemy.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:captcha_card"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.alchemy.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/all_modi.json

@@ -75,16 +75,13 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.all_modi.description"
     },
     "frame": "goal",
-    "hidden": false,
     "icon": {
       "item": "minestuck:queuestack_modus_card"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.all_modi.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/big_one_mil.json

@@ -11,17 +11,14 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.big_one_mil.description"
     },
     "frame": "goal",
-    "hidden": false,
     "icon": {
       "item": "minestuck:boondollars",
       "nbt": "{value:1000000}"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.big_one_mil.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/bugs.json

@@ -53,16 +53,12 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.bugs.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:chocolate_beetle"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.bugs.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/buy_out_shop.json

@@ -6,16 +6,12 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.buy_out_shop.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:cone_of_flies"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.buy_out_shop.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/commune.json

@@ -22,16 +22,12 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.commune.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:stone_tablet"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.commune.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/connect.json

@@ -6,16 +6,12 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.connect.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:client_disk"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.connect.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/double_digits.json

@@ -11,17 +11,13 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.double_digits.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:boondollars",
       "nbt": "{value:100}"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.double_digits.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/dungeon.json

@@ -19,16 +19,12 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.dungeon.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:frost_bricks"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.dungeon.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/entry.json

@@ -6,17 +6,13 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.entry.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:cruxite_apple",
       "nbt": "{color:10542335}"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.entry.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/first_step.json

@@ -11,17 +11,13 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.first_step.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:boondollars",
       "nbt": "{value:1}"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.first_step.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/french_fry.json

@@ -13,16 +13,12 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.french_fry.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:french_fry"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.french_fry.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/gold_seeds.json

@@ -14,16 +14,12 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.gold_seeds.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:gold_seeds"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.gold_seeds.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/halfway_point.json

@@ -11,17 +11,13 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.halfway_point.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:boondollars",
       "nbt": "{value:1000}"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.halfway_point.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/intellibeam.json

@@ -6,16 +6,12 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.intellibeam.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:intellibeam_laserstation"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.intellibeam.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/kill_ogre.json

@@ -17,17 +17,13 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.kill_ogre.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:pogo_hammer",
       "nbt": "{Damage:0}"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.kill_ogre.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/legendary_weapon.json

@@ -13,17 +13,13 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.legendary_weapon.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:caledfwlch",
       "nbt": "{Damage:0}"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.legendary_weapon.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/long_time_coming.json

@@ -15,16 +15,12 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.long_time_coming.description"
     },
-    "frame": "task",
-    "hidden": false,
     "icon": {
       "item": "minestuck:sburb_code"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.long_time_coming.title"
     }

src/main/generated/resources/data/minestuck/advancements/minestuck/melon_overload.json

@@ -6,17 +6,14 @@
     }
   },
   "display": {
-    "announce_to_chat": true,
     "description": {
       "translate": "advancements.minestuck.melon_overload.description"
     },
-    "frame": "task",
     "hidden": true,
     "icon": {
       "item": "minestuck:melonsbane",
       "nbt": "{Damage:0}"
     },
-    "show_toast": true,
     "title": {
       "translate": "advancements.minestuck.melon_overload.title"
     }