Update to 1.21.0

gradle.properties

@@ -4,15 +4,15 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.6
-yarn_mappings=1.20.6+build.1
+minecraft_version=1.21
+yarn_mappings=1.21+build.9
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=1.0.6
+mod_version=1.0.5
 maven_group=net.chikorita_lover.caffeinated
 archives_base_name=caffeinated
 
 # Dependencies
-fabric_version=0.98.0+1.20.6
+fabric_version=0.100.6+1.21
 farmersdelight_version=4640640

src/main/generated/.cache/23ea077d1d6c303dee4db4b707eb3883dc4bc6bb

@@ -1,8 +1,8 @@
-// 1.20.6 2024-05-09T17:09:50.125139 Caffeinated/Block Loot Tables
-d481f7802dfc0e83cd271518b47e73b256a24d2f data\caffeinated\loot_tables\blocks\flowering_coffee_shrub.json
-548d115eeb79b74d3fbe03951bdc179110ed6f8a data\caffeinated\loot_tables\blocks\coffee_cauldron.json
-548d115eeb79b74d3fbe03951bdc179110ed6f8a data\caffeinated\loot_tables\blocks\ground_coffee_cauldron.json
-3bec24cd54986eea9c228540df648ca7b01c86fc data\caffeinated\loot_tables\blocks\coffee_bean_block.json
-2181144c1ab146492f9cae41e26a4ad585b0c46b data\caffeinated\loot_tables\blocks\ground_coffee_block.json
-8b8e67a4f2fbd3f51a69d1359cceb2704429f4c3 data\caffeinated\loot_tables\blocks\coffee_berry_crate.json
-c3b830bd1a84007839d42eaa7ecafef75a366d62 data\caffeinated\loot_tables\blocks\potted_coffee_shrub.json
+// 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

src/main/generated/.cache/c189bb4c92920ea572e0709157481155fe15e5dc

@@ -1,21 +1,21 @@
-// 1.20.6 2024-05-09T17:09:50.125139 Caffeinated/Recipes
-de06447040bc87e767e2afd307bdf559a780865a data\caffeinated\advancements\recipes\misc\coffee_beans_from_block.json
-ea5881f924bd7cef6e6da660f1fd92cdf3e2584a data\caffeinated\advancements\recipes\misc\java_banner_pattern.json
-502b882af91d38778cbf774342f9a865f9420474 data\caffeinated\recipes\ground_coffee_block.json
-c7380b07538b219d6c28d1ab96ed76850e2bf79c data\caffeinated\advancements\recipes\misc\ground_coffee_from_block.json
-28fbe891feaa35e46b5015bbcd4693e28b79ab4c data\caffeinated\advancements\recipes\food\tiramisu.json
-5fd485c95e8541afbd5c36cbb898fc212dab1049 data\caffeinated\recipes\coffee_beans_from_block.json
-32683e175792178cf8a7630890b33f7327dc0f3e data\caffeinated\recipes\coffee_beans_from_coffee_berries.json
-c53cb3ecd5aefc2402fa20a47249530bfe406917 data\caffeinated\advancements\recipes\misc\coffee_beans_from_coffee_berries.json
-f241d014283983a15799cf435d7be5c883b1f112 data\caffeinated\recipes\tiramisu.json
-31f69cf23ef6a168c6d98a8fef731d470bcbb187 data\caffeinated\recipes\coffee_berries.json
-bc56b1de573d33d57411984e3b1a021270bb9719 data\caffeinated\recipes\coffee_berry_crate.json
-716ff4f0b5a0c7cba8f79624ca38943fa61f0dbe data\caffeinated\recipes\coffee_bean_block.json
-f1258bcc7fbf71701ecbdce075c9ac0d21afab91 data\caffeinated\advancements\recipes\decorations\coffee_berry_crate.json
-97e68d175c7717e19fbfce0ae98005eecb936cdf data\caffeinated\recipes\ground_coffee_from_block.json
-51cbbbc43481615db699ce0878398bb475466f96 data\caffeinated\advancements\recipes\building_blocks\ground_coffee_block.json
-e6061a3a68f93067a4057874be4ca45d0c759b01 data\caffeinated\recipes\java_banner_pattern.json
-b8e94b6ab3e5b643e335a6036992426d7e3ed11c data\caffeinated\advancements\recipes\building_blocks\coffee_bean_block.json
-081e951942029c81b7edec2c02074e4b47d00d3d data\caffeinated\recipes\ground_coffee_from_coffee_beans.json
-9e061efc3626a119413e61ca86a53990ab4f8a8a data\caffeinated\advancements\recipes\misc\ground_coffee_from_coffee_beans.json
-d9e05f57073c3e404c58a204f07503f392f4d2fe 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

src/main/generated/.cache/f97ece2f3a543d4dbc8c984a7bcdf2d64b8f7bed

@@ -1,4 +1,4 @@
-// 1.20.6 2024-05-09T17:09:50.1219453 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

src/main/java/net/chikorita_lover/caffeinated/Caffeinated.java

@@ -2,22 +2,22 @@
 
 import net.chikorita_lover.caffeinated.registry.*;
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.loot.v2.LootTableEvents;
-import net.minecraft.item.ItemConvertible;
+import net.fabricmc.fabric.api.loot.v3.LootTableEvents;
 import net.minecraft.loot.LootPool;
-import net.minecraft.loot.LootTable;
 import net.minecraft.loot.LootTables;
-import net.minecraft.loot.condition.LootCondition;
-import net.minecraft.loot.condition.RandomChanceLootCondition;
+import net.minecraft.loot.entry.EmptyEntry;
 import net.minecraft.loot.entry.ItemEntry;
-import net.minecraft.loot.provider.number.UniformLootNumberProvider;
-import net.minecraft.registry.RegistryKey;
+import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class Caffeinated implements ModInitializer {
  public static final Logger LOGGER = LoggerFactory.getLogger("Caffeinated");
- public static final String MODID = "caffeinated";
+ public static final String NAMESPACE = "caffeinated";
+
+ public static Identifier of(String id) {
+ return Identifier.of(NAMESPACE, id);
+ }
 
  @Override
  public void onInitialize() {
@@ -30,30 +30,10 @@ public void onInitialize() {
  CaffeinatedStats.register();
  CaffeinatedStatusEffects.register();
  CaffeinatedTradeOffers.register();
- CaffeinatedBlockSoundGroup.register();
- CaffeinatedEntityTypeTags.register();
- CaffeinatedBlockTags.register();
- CaffeinatedItemTags.register();
- CaffeinatedBannerPatternTags.register();
-
- registerLootTableEvents();
- }
-
- public void registerLootTableEvents() {
- addLootTablePool(1, 1, 0.5F, LootTables.JUNGLE_TEMPLE_CHEST, CaffeinatedItems.COFFEE_BEANS, 1, 3);
- }
-
- private void addLootTablePool(int minRolls, int maxRolls, float chance, RegistryKey<LootTable> lootTable, ItemConvertible item, int minCount, int maxCount) {
- UniformLootNumberProvider lootTableRange = UniformLootNumberProvider.create(minRolls, maxRolls);
- LootCondition condition = RandomChanceLootCondition.builder(chance).build();
- LootTableEvents.MODIFY.register((key, builder, source) -> {
- if (lootTable.equals(key)) {
- LootPool lootPool = LootPool.builder()
- .rolls(lootTableRange)
- .conditionally(condition)
- .with(ItemEntry.builder(item).build()).build();
 
- builder.pool(lootPool);
+ LootTableEvents.MODIFY.register((key, tableBuilder, source, registries) -> {
+ if (key.equals(LootTables.JUNGLE_TEMPLE_CHEST)) {
+ tableBuilder.pool(LootPool.builder().with(ItemEntry.builder(CaffeinatedItems.COFFEE_BERRIES)).with(EmptyEntry.builder()));
  }
  });
  }