update fabric code for minecraft 1.21.5

build.gradle

@@ -39,7 +39,8 @@ minecraft {
 dependencies {
     compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
     compileOnlyApi('org.jetbrains:annotations:23.0.0')
-    compileOnlyApi('com.epherical.epherolib:EpheroLib:1.2.0-1.20.6')
+    // compileOnlyApi('com.epherical.epherolib:EpheroLib:1.2.0-1.20.6')
+    compileOnlyApi files("jars/EpheroLib-FABRIC-1.2.0-1.21.5.jar")
 }
 
 sourceSets {

fabric/build.gradle

@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'fabric-loom' version '1.11-SNAPSHOT'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
@@ -45,12 +45,15 @@ dependencies {
     minecraft "com.mojang:minecraft:${rootProject.mc_ver}"
     mappings loom.layered() {
         officialMojangMappings()
-        parchment("org.parchmentmc.data:parchment-1.20.1:2023.07.09")
+        parchment("org.parchmentmc.data:parchment-${parchment_version}")
     }
     modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"
-    modImplementation('com.epherical.epherolib:EpheroLib-fabric:1.2.0-1.20.6')
-    modCompileOnly "vazkii.patchouli:Patchouli:1.20.1-84-FABRIC-SNAPSHOT"
+    //modImplementation('com.epherical.epherolib:EpheroLib-fabric:1.2.0-1.20.6')
+    modImplementation files("../jars/EpheroLib-FABRIC-1.2.0-1.21.5.jar")
+    modCompileOnly "vazkii.patchouli:Patchouli:1.21-88-FABRIC",{
+        exclude(group: "net.fabricmc.fabric-api")
+    }
 
     modCompileOnly "com.terraformersmc:modmenu:${rootProject.modmenu_version}",{
         exclude(group: "net.fabricmc.fabric-api")
@@ -78,7 +81,7 @@ loom {
         }
 
         datagen {
-            server()
+            inherit client
             name "Data Generation"
             vmArg "-Dfabric-api.datagen"
             vmArg "-Dfabric-api.datagen.output-dir=${getRootProject().file("src/main/generated")}"
@@ -94,6 +97,7 @@ processResources {
     from(sourceSets.main.resources.srcDirs) {
         include "fabric.mod.json"
         expand "mod_version": rootProject.version
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
 
     //from(sourceSets.main.resources.srcDirs) {

fabric/src/main/java/com/epherical/croptopia/Croptopia.java

@@ -23,7 +23,9 @@
 import net.minecraft.core.Registry;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.CreativeModeTabs;
@@ -65,12 +67,13 @@ public void onInitialize() {
 
 
 
-        Content.registerBlocks((id, object) -> Registry.register(BuiltInRegistries.BLOCK, id, object.get()));
+        Content.registerBlocks((id, fn) -> Registry.register(BuiltInRegistries.BLOCK, id, fn.apply(id)));
         mod.platform().registerFlammableBlocks();
-        Content.GUIDE = new GuideBookItem(createGroup());
-        Registry.register(BuiltInRegistries.ITEM, CroptopiaMod.createIdentifier(ItemNamesV2.GUIDE), Content.GUIDE);
+        final ResourceLocation guideBookId = CroptopiaMod.createIdentifier(ItemNamesV2.GUIDE);
+        Content.GUIDE = new GuideBookItem(createGroup(guideBookId));
+        Registry.register(BuiltInRegistries.ITEM, guideBookId, Content.GUIDE);
 
-        Content.registerItems((id, object) -> Registry.register(BuiltInRegistries.ITEM, id, object.get()));
+        Content.registerItems((id, fn) -> Registry.register(BuiltInRegistries.ITEM, id, fn.apply(id)));
 
         ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.NATURAL_BLOCKS).register(entries -> {
             entries.addAfter(Items.MANGROVE_PROPAGULE, Content.CINNAMON.getSapling());

fabric/src/main/java/com/epherical/croptopia/CroptopiaVillagerTrades.java

@@ -1,12 +1,8 @@
 package com.epherical.croptopia;
 
-import net.fabricmc.fabric.api.object.builder.v1.trade.TradeOfferHelper;
-import net.minecraft.world.entity.npc.VillagerProfession;
 import net.minecraft.world.entity.npc.VillagerTrades;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.item.trading.MerchantOffer;
+
 import java.util.List;
 
 public class CroptopiaVillagerTrades {

fabric/src/main/java/com/epherical/croptopia/FabricAdapter.java

@@ -3,15 +3,11 @@
 import com.epherical.croptopia.common.PlatformAdapter;
 import com.epherical.croptopia.event.DrinkEvent;
 import com.epherical.croptopia.register.Content;
-import com.epherical.epherolib.CommonPlatform;
 import com.epherical.epherolib.FabricPlatform;
-import net.fabricmc.api.EnvType;
 import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
 import net.fabricmc.fabric.api.registry.FlammableBlockRegistry;
-import net.fabricmc.fabric.impl.content.registry.FlammableBlockRegistryImpl;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;

fabric/src/main/java/com/epherical/croptopia/SetupCommand.java

@@ -5,7 +5,6 @@
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import net.fabricmc.fabric.impl.content.registry.FireBlockHooks;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
@@ -52,7 +51,7 @@ private static int execute(CommandSourceStack source, BlockPos pos, BlockInput b
             world.setBlock(pos.offset(2, 0, 0), block.getState().setValue(BlockStateProperties.AGE_7, 5), 2);
             world.setBlock(pos.offset(3, 0, 0), block.getState().setValue(BlockStateProperties.AGE_7, 7), 2);
 
-            serverWorld.blockUpdated(pos, block.getState().getBlock());
+            serverWorld.sendBlockUpdated(pos, block.getState(), block.getState(), 0); // REVIEW 1.21.5
             source.sendSuccess(() ->  Component.translatable("commands.setblock.success", pos.getX(), pos.getY(), pos.getZ()), true);
             return 1;
         }

fabric/src/main/java/com/epherical/croptopia/client/CroptopiaClient.java

@@ -1,16 +1,12 @@
 package com.epherical.croptopia.client;
 
 import com.epherical.croptopia.ClientFunctions;
-import com.epherical.croptopia.CroptopiaMod;
-import com.epherical.croptopia.blocks.LeafCropBlock;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
-import net.minecraft.client.renderer.BiomeColors;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.world.level.FoliageColor;
 import net.minecraft.world.level.block.Block;
 
 

fabric/src/main/java/com/epherical/croptopia/datagen/CroptopiaBiomeTagProvider.java

@@ -5,7 +5,6 @@
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.tags.TagsProvider;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.ComposterBlock;
 
 import java.util.concurrent.CompletableFuture;
 

fabric/src/main/java/com/epherical/croptopia/datagen/CroptopiaBlockTagProvider.java

@@ -4,21 +4,14 @@
 import com.epherical.croptopia.register.helpers.FarmlandCrop;
 import com.epherical.croptopia.register.helpers.Tree;
 import com.epherical.croptopia.register.helpers.TreeCrop;
-import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
-import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.minecraft.core.HolderLookup;
-import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.tags.BlockTags;
-import net.minecraft.tags.ItemTags;
 import net.minecraft.world.level.block.Block;
 
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
 
 public class CroptopiaBlockTagProvider extends IntrinsicHolderTagsProvider<Block> {
 

fabric/src/main/java/com/epherical/croptopia/datagen/CroptopiaDataGeneratorEntry.java

@@ -1,10 +1,13 @@
 package com.epherical.croptopia.datagen;
 
 import com.epherical.croptopia.common.generator.ConfiguredFeatureKeys;
+import com.epherical.croptopia.register.Content;
 import com.epherical.croptopia.register.helpers.Tree;
 import com.epherical.croptopia.register.helpers.TreeCrop;
+import net.fabricmc.api.EnvType;
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.core.RegistrySetBuilder;
 import net.minecraft.core.registries.Registries;
 
@@ -18,7 +21,11 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
         resources.addProvider(CroptopiaBiomeTagProvider::new);
         resources.addProvider(CroptopiaIndependentItemTagProvider::new);
         // tags always first
-        resources.addProvider(CroptopiaModelProvider::new);
+        if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
+            resources.addProvider(CroptopiaModelProvider::new);
+        } else {
+            Content.class.getName();
+        }
         resources.addProvider(CroptopiaRecipeProvider::new);
         resources.addProvider(CroptopiaWorldGeneration::new);
     }

fabric/src/main/java/com/epherical/croptopia/datagen/CroptopiaIndependentItemTagProvider.java

@@ -3,7 +3,6 @@
 import com.epherical.croptopia.Croptopia;
 import com.epherical.croptopia.mixin.datagen.IdentifierAccessor;
 import com.epherical.croptopia.mixin.datagen.ObjectBuilderAccessor;
-import com.epherical.croptopia.mixin.datagen.PathProviderAccessor;
 import com.epherical.croptopia.mixin.datagen.TagProviderAccessor;
 import com.epherical.croptopia.register.Content;
 import com.epherical.croptopia.register.TagCategory;
@@ -19,22 +18,15 @@
 import com.epherical.croptopia.register.helpers.TreeCrop;
 import com.epherical.croptopia.register.helpers.Utensil;
 import com.epherical.croptopia.util.PluralInfo;
-import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.fabricmc.fabric.impl.datagen.ForcedTagEntry;
 import net.minecraft.core.HolderLookup;
-import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.data.CachedOutput;
-import net.minecraft.data.DataGenerator;
 import net.minecraft.data.PackOutput;
-import net.minecraft.data.tags.ItemTagsProvider;
-import net.minecraft.data.tags.VanillaItemTagsProvider;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagEntry;
 import net.minecraft.tags.TagKey;
-import net.minecraft.tags.TagManager;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;