Chikorita-Lover · Chikorita-Lover · Jul 15, 2024 · Nov 1, 2023 · Nov 4, 2023 · Nov 5, 2023
diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ Brewing coffee is greatly accessible in survival! All it takes is a campfire, yo
 - Spanish (Argentinian, European, Mexican; Thanks to @ExDrill)
 - Russian (Thanks to @xvein)
 - Chinese (Simplified; Thanks to @seaseii)
+- Ukrainian (Thanks to @unroman)
 
 ## 🧩Compatibility
-- [Farmer's Delight](https://modrinth.com/mod/farmers-delight-fabric)
+- [Farmer's Delight](https://modrinth.com/mod/farmers-delight-fabric)
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.0-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -48,8 +48,7 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
@@ -91,7 +90,7 @@ loom {
 			name "Data Generation"
 			vmArg "-Dfabric-api.datagen"
 			vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}"
-			vmArg "-Dfabric-api.datagen.modid=${mod_id}"
+			vmArg "-Dfabric-api.datagen.modid=${archives_base_name}"
 
 			runDir "build/datagen"
 		}

diff --git a/gradle.properties b/gradle.properties
@@ -4,16 +4,15 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-	minecraft_version=1.20.1
-	yarn_mappings=1.20.1+build.1
-	loader_version=0.14.21
+minecraft_version=1.21
+yarn_mappings=1.21+build.9
+loader_version=0.15.11
 
 # Mod Properties
-	mod_version = 1.0.3
-	mod_id = "caffeinated"
-	maven_group = com.chikoritalover
-	archives_base_name = caffeinated
+mod_version=1.0.5
+maven_group=net.chikorita_lover.caffeinated
+archives_base_name=caffeinated
 
 # Dependencies
-	fabric_version=0.83.0+1.20.1
-	farmersdelight_version=4640640
+fabric_version=0.100.6+1.21
+farmersdelight_version=4640640
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-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/generated/.cache/23ea077d1d6c303dee4db4b707eb3883dc4bc6bb b/src/main/generated/.cache/23ea077d1d6c303dee4db4b707eb3883dc4bc6bb
@@ -0,0 +1,8 @@
+// 1.21	2024-07-13T23:10:20.069673	Caffeinated/Block Loot Tables
+548d115eeb79b74d3fbe03951bdc179110ed6f8a data\caffeinated\loot_table\blocks\ground_coffee_cauldron.json
+8b8e67a4f2fbd3f51a69d1359cceb2704429f4c3 data\caffeinated\loot_table\blocks\coffee_berry_crate.json
+d481f7802dfc0e83cd271518b47e73b256a24d2f data\caffeinated\loot_table\blocks\flowering_coffee_shrub.json
+548d115eeb79b74d3fbe03951bdc179110ed6f8a data\caffeinated\loot_table\blocks\coffee_cauldron.json
+2181144c1ab146492f9cae41e26a4ad585b0c46b data\caffeinated\loot_table\blocks\ground_coffee_block.json
+c3b830bd1a84007839d42eaa7ecafef75a366d62 data\caffeinated\loot_table\blocks\potted_coffee_shrub.json
+3bec24cd54986eea9c228540df648ca7b01c86fc data\caffeinated\loot_table\blocks\coffee_bean_block.json
diff --git a/src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc b/src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc
@@ -1,19 +1,21 @@
-// 1.20	2023-06-07T12:12:41.4203152	Caffeinated/Recipes
-e154bc568fca23d856835d0e300a33c5e3c1fcd5 data\caffeinated\advancements\recipes\misc\coffee_beans_from_block.json
-2b1061f72b3e9a1295c9aa4334d37c9dcb3dfc53 data\caffeinated\advancements\recipes\misc\java_banner_pattern.json
-76a46edddf4e31119b24a67f63988b18a8aee17f data\caffeinated\recipes\ground_coffee_block.json
-187961e40d0322c1b7b655376bfe28d0b99ec8bd data\caffeinated\advancements\recipes\misc\ground_coffee_from_block.json
-06c7edbdec5cf1deb92d8e421279587f14aaab54 data\caffeinated\advancements\recipes\food\tiramisu.json
-aff0b344beb7238820d9ef40b8eeae0b6ee96bb9 data\caffeinated\recipes\coffee_beans_from_block.json
-4c85433379ef206f984248f2181f8f0d58e04302 data\caffeinated\recipes\coffee_beans_from_coffee_berries.json
-6b9902befd959eb3bc01bca55faa32da5902eaeb data\caffeinated\recipes\tiramisu.json
-195cc52740e219af6b8b65dde7d9ef8d0768d307 data\caffeinated\advancements\recipes\misc\coffee_beans_from_coffee_berries.json
-d34b1b5cba65cbe93df946e3a6badee9edc69dc0 data\caffeinated\recipes\coffee_berries.json
-7872d0d8329ad57778754a3bb074ae65f2fe2990 data\caffeinated\recipes\coffee_bean_block.json
-743816fab7585e00cd7f2678713589c48bdc2aed data\caffeinated\recipes\ground_coffee_from_block.json
-55a0f263de5782dd9ec9aecd1d1ae815e3760bdb data\caffeinated\advancements\recipes\building_blocks\ground_coffee_block.json
-d466ced2e8e679a807bdbcee307e0eb5e6547942 data\caffeinated\recipes\java_banner_pattern.json
-bb529f25b75b190a9da8518d7a0931d22cbaf194 data\caffeinated\advancements\recipes\building_blocks\coffee_bean_block.json
-9d1c02e4b749346060e0aca83030e22690aed245 data\caffeinated\recipes\ground_coffee_from_coffee_beans.json
-c25fb492ba07b4ed02e133e2329fe9f0b00a2b5e data\caffeinated\advancements\recipes\misc\ground_coffee_from_coffee_beans.json
-7ac9428c1c4810e6e439997467b8c5afad1711b9 data\caffeinated\advancements\recipes\food\coffee_berries.json
+// 1.21	2024-07-13T23:10:20.069673	Caffeinated/Recipes
+bc56b1de573d33d57411984e3b1a021270bb9719 data\caffeinated\recipe\coffee_berry_crate.json
+97e68d175c7717e19fbfce0ae98005eecb936cdf data\caffeinated\recipe\ground_coffee_from_block.json
+c53cb3ecd5aefc2402fa20a47249530bfe406917 data\caffeinated\advancement\recipes\misc\coffee_beans_from_coffee_berries.json
+716ff4f0b5a0c7cba8f79624ca38943fa61f0dbe data\caffeinated\recipe\coffee_bean_block.json
+c7380b07538b219d6c28d1ab96ed76850e2bf79c data\caffeinated\advancement\recipes\misc\ground_coffee_from_block.json
+9e061efc3626a119413e61ca86a53990ab4f8a8a data\caffeinated\advancement\recipes\misc\ground_coffee_from_coffee_beans.json
+b8e94b6ab3e5b643e335a6036992426d7e3ed11c data\caffeinated\advancement\recipes\building_blocks\coffee_bean_block.json
+5fd485c95e8541afbd5c36cbb898fc212dab1049 data\caffeinated\recipe\coffee_beans_from_block.json
+502b882af91d38778cbf774342f9a865f9420474 data\caffeinated\recipe\ground_coffee_block.json
+e6061a3a68f93067a4057874be4ca45d0c759b01 data\caffeinated\recipe\java_banner_pattern.json
+f1258bcc7fbf71701ecbdce075c9ac0d21afab91 data\caffeinated\advancement\recipes\decorations\coffee_berry_crate.json
+32683e175792178cf8a7630890b33f7327dc0f3e data\caffeinated\recipe\coffee_beans_from_coffee_berries.json
+de06447040bc87e767e2afd307bdf559a780865a data\caffeinated\advancement\recipes\misc\coffee_beans_from_block.json
+51cbbbc43481615db699ce0878398bb475466f96 data\caffeinated\advancement\recipes\building_blocks\ground_coffee_block.json
+31f69cf23ef6a168c6d98a8fef731d470bcbb187 data\caffeinated\recipe\coffee_berries.json
+081e951942029c81b7edec2c02074e4b47d00d3d data\caffeinated\recipe\ground_coffee_from_coffee_beans.json
+f241d014283983a15799cf435d7be5c883b1f112 data\caffeinated\recipe\tiramisu.json
+28fbe891feaa35e46b5015bbcd4693e28b79ab4c data\caffeinated\advancement\recipes\food\tiramisu.json
+d9e05f57073c3e404c58a204f07503f392f4d2fe data\caffeinated\advancement\recipes\food\coffee_berries.json
+ea5881f924bd7cef6e6da660f1fd92cdf3e2584a data\caffeinated\advancement\recipes\misc\java_banner_pattern.json
diff --git a/src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed b/src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed
@@ -1,4 +1,4 @@
-// 1.20	2023-06-07T12:12:41.4182846	Caffeinated/Model Definitions
+// 1.21	2024-07-13T23:10:20.0676508	Caffeinated/Model Definitions
 da4528a3cfafc1ab21e5814b64029c10ec357178 assets\caffeinated\blockstates\ground_coffee_block.json
 26f35f3a03b0d53578efd2c555721b08353d75f0 assets\caffeinated\blockstates\coffee_cauldron.json
 b1a481861132973fe035c9b9ce7613e15938034c assets\caffeinated\models\block\coffee_berry_crate.json

diff --git a/...es/building_blocks/coffee_bean_block.json → ...es/building_blocks/coffee_bean_block.json b/...es/building_blocks/coffee_bean_block.json → ...es/building_blocks/coffee_bean_block.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "caffeinated:coffee_beans"
-            ]
+            "items": "caffeinated:coffee_beans"
           }
         ]
       },
@@ -22,14 +20,13 @@
   },
   "requirements": [
     [
-      "has_coffee_beans",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_coffee_beans"
     ]
   ],
   "rewards": {
     "recipes": [
       "caffeinated:coffee_bean_block"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/.../building_blocks/ground_coffee_block.json → .../building_blocks/ground_coffee_block.json b/.../building_blocks/ground_coffee_block.json → .../building_blocks/ground_coffee_block.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "caffeinated:ground_coffee"
-            ]
+            "items": "caffeinated:ground_coffee"
           }
         ]
       },
@@ -22,14 +20,13 @@
   },
   "requirements": [
     [
-      "has_ground_coffee",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_ground_coffee"
     ]
   ],
   "rewards": {
     "recipes": [
       "caffeinated:ground_coffee_block"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/src/main/generated/data/caffeinated/advancement/recipes/decorations/coffee_berry_crate.json b/src/main/generated/data/caffeinated/advancement/recipes/decorations/coffee_berry_crate.json
@@ -0,0 +1,40 @@
+{
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": [
+        "farmersdelight"
+      ]
+    }
+  ],
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_coffee_berries": {
+      "conditions": {
+        "items": [
+          {
+            "items": "caffeinated:coffee_berries"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "minecraft:coffee_berry_crate"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_coffee_berries"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "minecraft:coffee_berry_crate"
+    ]
+  }
+}
diff --git a/...ncements/recipes/food/coffee_berries.json → ...ancement/recipes/food/coffee_berries.json b/...ncements/recipes/food/coffee_berries.json → ...ancement/recipes/food/coffee_berries.json
@@ -1,35 +1,40 @@
 {
+  "fabric:load_conditions": [
+    {
+      "condition": "fabric:all_mods_loaded",
+      "values": [
+        "farmersdelight"
+      ]
+    }
+  ],
   "parent": "minecraft:recipes/root",
   "criteria": {
     "has_coffee_berry_crate": {
       "conditions": {
         "items": [
           {
-            "items": [
-              "caffeinated:coffee_berry_crate"
-            ]
+            "items": "caffeinated:coffee_berry_crate"
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "caffeinated:coffee_berries"
+        "recipe": "minecraft:coffee_berries"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_coffee_berry_crate",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_coffee_berry_crate"
     ]
   ],
   "rewards": {
     "recipes": [
-      "caffeinated:coffee_berries"
+      "minecraft:coffee_berries"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...d/advancements/recipes/food/tiramisu.json → ...ed/advancement/recipes/food/tiramisu.json b/...d/advancements/recipes/food/tiramisu.json → ...ed/advancement/recipes/food/tiramisu.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "caffeinated:coffee_bottle"
-            ]
+            "items": "caffeinated:coffee_bottle"
           }
         ]
       },
@@ -22,14 +20,13 @@
   },
   "requirements": [
     [
-      "has_coffee_bottle",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_coffee_bottle"
     ]
   ],
   "rewards": {
     "recipes": [
       "caffeinated:tiramisu"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...recipes/misc/coffee_beans_from_block.json → ...recipes/misc/coffee_beans_from_block.json b/...recipes/misc/coffee_beans_from_block.json → ...recipes/misc/coffee_beans_from_block.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "caffeinated:coffee_bean_block"
-            ]
+            "items": "caffeinated:coffee_bean_block"
           }
         ]
       },
@@ -22,14 +20,13 @@
   },
   "requirements": [
     [
-      "has_coffee_bean_block",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_coffee_bean_block"
     ]
   ],
   "rewards": {
     "recipes": [
       "caffeinated:coffee_beans_from_block"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...isc/coffee_beans_from_coffee_berries.json → ...isc/coffee_beans_from_coffee_berries.json b/...isc/coffee_beans_from_coffee_berries.json → ...isc/coffee_beans_from_coffee_berries.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "caffeinated:coffee_berries"
-            ]
+            "items": "caffeinated:coffee_berries"
           }
         ]
       },
@@ -22,14 +20,13 @@
   },
   "requirements": [
     [
-      "has_coffee_berries",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_coffee_berries"
     ]
   ],
   "rewards": {
     "recipes": [
       "caffeinated:coffee_beans_from_coffee_berries"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }
diff --git a/...ecipes/misc/ground_coffee_from_block.json → ...ecipes/misc/ground_coffee_from_block.json b/...ecipes/misc/ground_coffee_from_block.json → ...ecipes/misc/ground_coffee_from_block.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "caffeinated:ground_coffee_block"
-            ]
+            "items": "caffeinated:ground_coffee_block"
           }
         ]
       },
@@ -22,14 +20,13 @@
   },
   "requirements": [
     [
-      "has_ground_coffee_block",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_ground_coffee_block"
     ]
   ],
   "rewards": {
     "recipes": [
       "caffeinated:ground_coffee_from_block"
     ]
-  },
-  "sends_telemetry_event": false
+  }
 }