Port to 21.10

Author: robotgryphon

gradle/mojang.versions.toml

@@ -1,7 +1,7 @@
 [versions]
-minecraft = "1.21.4"
+minecraft = "1.21.10"
 
 [versions.minecraftRange]
-require = "[1.21.4, 1.21.5)"
-prefer = "1.21.4"
+require = "[1.21.10, 1.21.11)"
+prefer = "1.21.10"
 

gradle/neoforged.versions.toml

@@ -1,7 +1,7 @@
 [versions]
-neoforge = "21.4.95-beta"
-mdg = "2.0.78"
-neoforgeRange = { require = "[21.4.95-beta,)", prefer = "21.1.95-beta" }
+neoforge = "21.10.64"
+mdg = "2.0.122"
+neoforgeRange = { require = "[21.10.64,)", prefer = "21.10.64" }
 
 [libraries.testframework]
 module = "net.neoforged:testframework"

neoforge/src/main/java/dev/compactmods/simplehoney/HiveItemHandler.java

@@ -1,13 +1,18 @@
 package dev.compactmods.simplehoney;
 
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.BeehiveBlock;
 import net.minecraft.world.level.block.Blocks;
-import net.neoforged.neoforge.items.IItemHandler;
+import net.neoforged.neoforge.transfer.ResourceHandler;
+import net.neoforged.neoforge.transfer.TransferPreconditions;
+import net.neoforged.neoforge.transfer.item.ItemResource;
+import net.neoforged.neoforge.transfer.transaction.TransactionContext;
 
-public class HiveItemHandler implements IItemHandler {
+import javax.annotation.ParametersAreNonnullByDefault;
+
+@ParametersAreNonnullByDefault
+public class HiveItemHandler implements ResourceHandler<ItemResource> {
 
     private final Level level;
     private final BlockPos blockPos;
@@ -27,43 +32,46 @@ public boolean readyToExtract() {
     }
 
     @Override
-    public int getSlotLimit(int slot) {
-        return slot == 0 ? 1 : 0;
+    public int size() {
+        return 1;
     }
 
     @Override
-    public boolean isItemValid(int slot, ItemStack stack) {
-        return false;
+    public ItemResource getResource(int slot) {
+        TransferPreconditions.checkNonNegative(slot);
+        if(slot != 0) return ItemResource.EMPTY;
+        return ItemResource.of(SimpleHoney.HONEY_DROP.get());
     }
 
     @Override
-    public int getSlots() {
-        return 1;
+    public long getAmountAsLong(int i) {
+        return i == 0 && readyToExtract() ? 1 : 0;
     }
 
     @Override
-    public ItemStack getStackInSlot(int slot) {
-        if(slot != 0) return ItemStack.EMPTY;
-        return readyToExtract() ? new ItemStack(SimpleHoney.HONEY_DROP.get()) : ItemStack.EMPTY;
+    public long getCapacityAsLong(int i, ItemResource resource) {
+        return 0;
     }
 
     @Override
-    public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
-        return stack;
+    public boolean isValid(int i, ItemResource resource) {
+        return false;
     }
 
     @Override
-    public ItemStack extractItem(int slot, int amount, boolean simulate) {
-        if(slot != 0 || amount == 0) return ItemStack.EMPTY;
+    public int insert(int i, ItemResource resource, int i1, TransactionContext ctx) {
+        return 0;
+    }
 
-        if(!readyToExtract()) return ItemStack.EMPTY;
+    @Override
+    public int extract(int slot, ItemResource resource, int i1, TransactionContext ctx) {
+        if(slot != 0)
+            return 0;
 
-        final var drop = new ItemStack(SimpleHoney.HONEY_DROP.get());
-        if(simulate) {
-            return drop;
-        }
+        if(!readyToExtract())
+            return 0;
 
         level.setBlockAndUpdate(blockPos, level.getBlockState(blockPos).setValue(BeehiveBlock.HONEY_LEVEL, 0));
-        return drop;
+        return 1;
     }
 }

neoforge/src/main/java/dev/compactmods/simplehoney/SimpleHoney.java

@@ -1,6 +1,5 @@
 package dev.compactmods.simplehoney;
 
-import cpw.mods.modlauncher.Environment;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -10,29 +9,22 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.item.Items;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.BeehiveBlock;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.FurnaceBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
-import net.neoforged.bus.EventBus;
-import net.neoforged.bus.api.Event;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.loading.FMLEnvironment;
 import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 import net.neoforged.neoforge.common.NeoForge;
-import net.neoforged.neoforge.common.Tags;
 import net.neoforged.neoforge.event.tick.LevelTickEvent;
-import net.neoforged.neoforge.items.IItemHandler;
 import net.neoforged.neoforge.registries.DeferredItem;
 import net.neoforged.neoforge.registries.DeferredRegister;
-import org.jetbrains.annotations.NotNull;
 
 @Mod(SimpleHoney.MOD_ID)
 public class SimpleHoney {
@@ -59,7 +51,7 @@ public SimpleHoney(IEventBus modEventBus) {
         ITEMS.register(modEventBus);
         modEventBus.addListener(this::registerCaps);
 
-        if(!FMLEnvironment.production) {
+        if(!FMLEnvironment.isProduction()) {
             NeoForge.EVENT_BUS.addListener(this::debugTickListener);
         }
     }
@@ -89,11 +81,11 @@ private void tickNearbyHives(Player player) {
     }
 
     private void registerCaps(final RegisterCapabilitiesEvent event) {
-        event.registerBlock(Capabilities.ItemHandler.BLOCK, this::honeyCap, Blocks.BEEHIVE, Blocks.BEE_NEST);
+        event.registerBlock(Capabilities.Item.BLOCK, this::honeyCap, Blocks.BEEHIVE, Blocks.BEE_NEST);
         // event.registerItem(Capabilities.FluidHandler.ITEM, (stack, ctx) -> new FluidHandlerItemStack.Consumable(stack, 250), HONEY_DROP);
     }
 
-    private IItemHandler honeyCap(Level level, BlockPos blockPos, BlockState blockState, BlockEntity blockEntity, Direction direction) {
+    private HiveItemHandler honeyCap(Level level, BlockPos blockPos, BlockState blockState, BlockEntity blockEntity, Direction direction) {
         if(direction == null || direction.getAxis().isHorizontal())
             return null;
 

neoforge/src/main/java/dev/compactmods/simplehoney/datagen/SHDataGeneration.java

@@ -8,7 +8,7 @@
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.data.event.GatherDataEvent;
 
-@EventBusSubscriber(modid = SimpleHoney.MOD_ID, bus = EventBusSubscriber.Bus.MOD)
+@EventBusSubscriber(modid = SimpleHoney.MOD_ID)
 public class SHDataGeneration {
 
     @SubscribeEvent