Update to 1.20.4

hybridlabs · Jan 1, 2024 · 43e041c · 43e041c
1 parent 8f9f944
commit 43e041c
Show file tree

Hide file tree

Showing 215 changed files with 494 additions and 706 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 }
 
 plugins {
-    id "fabric-loom" version "1.3-SNAPSHOT"
+    id "fabric-loom" version "1.4-SNAPSHOT"
     id "maven-publish"
     id "org.jetbrains.kotlin.jvm" version "1.9.+"
 

diff --git a/gradle.properties b/gradle.properties
@@ -4,28 +4,28 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.1
-yarn_build=9
-loader_version=0.14.21
-fabric_kotlin_version=1.10.0+kotlin.1.9.0
+minecraft_version=1.20.4
+yarn_build=3
+loader_version=0.15.3
+fabric_kotlin_version=1.10.17+kotlin.1.9.22
 
 # Mod Properties
 mod_version=1.0.1
 maven_group=dev.hybridlabs
 
 # Dependencies
-fabric_version=0.86.0+1.20.1
-mod_menu_version=7.1.0
+fabric_version=0.92.0+1.20.4
+mod_menu_version=9.0.0
 
 # Metadata
 mod_id=hybrid-blocks
 mod_name=Hybrid Blocks
 release_type=release
-major_version=1.20
-supported_versions=1.20,1.20.1
+major_version=1.20.4
+supported_versions=1.20.4
 
 modrinth_id=61Q9LmD0
 curseforge_id=832475
 
 github_repository=hybridlabs/hybrid-blocks
-github_branch=1.20
+github_branch=1.20.4
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/...sources/data/hybrid-blocks/advancements/recipes/building_blocks/black_stained_bricks.json b/...sources/data/hybrid-blocks/advancements/recipes/building_blocks/black_stained_bricks.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_bricks",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_bricks"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:black_stained_bricks"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...data/hybrid-blocks/advancements/recipes/building_blocks/black_stained_cracked_bricks.json b/...data/hybrid-blocks/advancements/recipes/building_blocks/black_stained_cracked_bricks.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_cracked_bricks",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_cracked_bricks"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:black_stained_cracked_bricks"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...ocks/advancements/recipes/building_blocks/black_stained_cracked_bricks_from_smelting.json b/...ocks/advancements/recipes/building_blocks/black_stained_cracked_bricks_from_smelting.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_cracked_bricks",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_cracked_bricks"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:black_stained_cracked_bricks_from_smelting"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...s/data/hybrid-blocks/advancements/recipes/building_blocks/black_stained_mossy_bricks.json b/...s/data/hybrid-blocks/advancements/recipes/building_blocks/black_stained_mossy_bricks.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_mossy_bricks",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_mossy_bricks"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:black_stained_mossy_bricks"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...ocks/advancements/recipes/building_blocks/black_stained_mossy_bricks_from_moss_block.json b/...ocks/advancements/recipes/building_blocks/black_stained_mossy_bricks_from_moss_block.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_moss_block",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_moss_block"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:black_stained_mossy_bricks_from_moss_block"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...rid-blocks/advancements/recipes/building_blocks/black_stained_mossy_bricks_from_vine.json b/...rid-blocks/advancements/recipes/building_blocks/black_stained_mossy_bricks_from_vine.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_vine",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_vine"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:black_stained_mossy_bricks_from_vine"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/.../data/hybrid-blocks/advancements/recipes/building_blocks/black_stained_quartz_pillar.json b/.../data/hybrid-blocks/advancements/recipes/building_blocks/black_stained_quartz_pillar.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_quartz_pillar",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_quartz_pillar"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:black_stained_quartz_pillar"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/.../data/hybrid-blocks/advancements/recipes/building_blocks/black_stained_smooth_quartz.json b/.../data/hybrid-blocks/advancements/recipes/building_blocks/black_stained_smooth_quartz.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_smooth_quartz",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_smooth_quartz"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:black_stained_smooth_quartz"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...esources/data/hybrid-blocks/advancements/recipes/building_blocks/blue_stained_bricks.json b/...esources/data/hybrid-blocks/advancements/recipes/building_blocks/blue_stained_bricks.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_bricks",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_bricks"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:blue_stained_bricks"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/.../data/hybrid-blocks/advancements/recipes/building_blocks/blue_stained_cracked_bricks.json b/.../data/hybrid-blocks/advancements/recipes/building_blocks/blue_stained_cracked_bricks.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_cracked_bricks",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_cracked_bricks"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:blue_stained_cracked_bricks"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...locks/advancements/recipes/building_blocks/blue_stained_cracked_bricks_from_smelting.json b/...locks/advancements/recipes/building_blocks/blue_stained_cracked_bricks_from_smelting.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_cracked_bricks",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_cracked_bricks"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:blue_stained_cracked_bricks_from_smelting"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...es/data/hybrid-blocks/advancements/recipes/building_blocks/blue_stained_mossy_bricks.json b/...es/data/hybrid-blocks/advancements/recipes/building_blocks/blue_stained_mossy_bricks.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_mossy_bricks",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_mossy_bricks"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:blue_stained_mossy_bricks"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...locks/advancements/recipes/building_blocks/blue_stained_mossy_bricks_from_moss_block.json b/...locks/advancements/recipes/building_blocks/blue_stained_mossy_bricks_from_moss_block.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_moss_block",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_moss_block"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:blue_stained_mossy_bricks_from_moss_block"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...brid-blocks/advancements/recipes/building_blocks/blue_stained_mossy_bricks_from_vine.json b/...brid-blocks/advancements/recipes/building_blocks/blue_stained_mossy_bricks_from_vine.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_vine",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_vine"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:blue_stained_mossy_bricks_from_vine"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...s/data/hybrid-blocks/advancements/recipes/building_blocks/blue_stained_quartz_pillar.json b/...s/data/hybrid-blocks/advancements/recipes/building_blocks/blue_stained_quartz_pillar.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_quartz_pillar",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_quartz_pillar"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:blue_stained_quartz_pillar"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...s/data/hybrid-blocks/advancements/recipes/building_blocks/blue_stained_smooth_quartz.json b/...s/data/hybrid-blocks/advancements/recipes/building_blocks/blue_stained_smooth_quartz.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_smooth_quartz",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_smooth_quartz"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:blue_stained_smooth_quartz"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...sources/data/hybrid-blocks/advancements/recipes/building_blocks/brown_stained_bricks.json b/...sources/data/hybrid-blocks/advancements/recipes/building_blocks/brown_stained_bricks.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_bricks",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_bricks"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:brown_stained_bricks"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...data/hybrid-blocks/advancements/recipes/building_blocks/brown_stained_cracked_bricks.json b/...data/hybrid-blocks/advancements/recipes/building_blocks/brown_stained_cracked_bricks.json
@@ -22,14 +22,13 @@
   },
   "requirements": [
     [
-      "has_cracked_bricks",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_cracked_bricks"
     ]
   ],
   "rewards": {
     "recipes": [
       "hybrid-blocks:brown_stained_cracked_bricks"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }