Update to MC 1.19.4

Author: rubensworks

gradle.properties

@@ -1,7 +1,7 @@
 mod_version=0.2.5
-minecraft_version=1.19.3
-forge_version=44.1.0
-cyclopscore_version=1.17.3-264
+minecraft_version=1.19.4
+forge_version=45.0.20
+cyclopscore_version=1.18.2-309
 release_type=release
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 

src/main/java/org/cyclops/structuredcrafting/craft/WorldCraftingMatrix.java

@@ -197,7 +197,7 @@ protected Recipe getRecipe(Level level) {
         public ItemStack getOutput(Level level) {
             Recipe recipe = getRecipe(level);
             if (recipe != null) {
-                return recipe.assemble(inventoryCrafting);
+                return recipe.assemble(inventoryCrafting, level.registryAccess());
             }
             return ItemStack.EMPTY;
         }

src/main/java/org/cyclops/structuredcrafting/craft/provider/InventoryItemStackProvider.java

@@ -1,15 +1,15 @@
 package org.cyclops.structuredcrafting.craft.provider;
 
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.world.Container;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.core.Direction;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
-import net.minecraftforge.items.CapabilityItemHandler;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.items.IItemHandler;
 import org.apache.commons.lang3.tuple.Pair;
-import org.cyclops.cyclopscore.helper.InventoryHelpers;
 import org.cyclops.cyclopscore.helper.BlockEntityHelpers;
+import org.cyclops.cyclopscore.helper.InventoryHelpers;
 import org.cyclops.structuredcrafting.block.BlockStructuredCrafterConfig;
 
 /**
@@ -50,21 +50,21 @@ public boolean canHandleOutput() {
 
     @Override
     public boolean isValidForResults(Level world, BlockPos pos, Direction side) {
-        IItemHandler itemHandler = BlockEntityHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null);
+        IItemHandler itemHandler = BlockEntityHelpers.getCapability(world, pos, side, ForgeCapabilities.ITEM_HANDLER).orElse(null);
         Container inventory = BlockEntityHelpers.get(world, pos, Container.class).orElse(null);
         return itemHandler != null || inventory != null;
     }
 
     @Override
     public boolean hasItemStack(Level world, BlockPos pos, Direction side) {
         Container inventory = BlockEntityHelpers.get(world, pos, Container.class).orElse(null);
-        IItemHandler itemHandler = BlockEntityHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null);
+        IItemHandler itemHandler = BlockEntityHelpers.getCapability(world, pos, side, ForgeCapabilities.ITEM_HANDLER).orElse(null);
         return itemHandler != null || inventory != null;
     }
 
     @Override
     public ItemStack getItemStack(Level world, BlockPos pos, Direction side) {
-        IItemHandler itemHandler = BlockEntityHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null);
+        IItemHandler itemHandler = BlockEntityHelpers.getCapability(world, pos, side, ForgeCapabilities.ITEM_HANDLER).orElse(null);
         Container inventory = BlockEntityHelpers.get(world, pos, Container.class).orElse(null);
         Pair<Integer, ItemStack> result = itemHandler != null ? getFirstItem(itemHandler, side) : getFirstItem(inventory, side);
         if (result != null) {
@@ -75,7 +75,7 @@ public ItemStack getItemStack(Level world, BlockPos pos, Direction side) {
 
     @Override
     public void reduceItemStack(Level world, BlockPos pos, Direction side, boolean simulate) {
-        IItemHandler itemHandler = BlockEntityHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null);
+        IItemHandler itemHandler = BlockEntityHelpers.getCapability(world, pos, side, ForgeCapabilities.ITEM_HANDLER).orElse(null);
         if(itemHandler != null) {
             for(int slot = 0; slot < itemHandler.getSlots(); slot++) {
                 if(!itemHandler.extractItem(slot, 1, simulate).isEmpty()) {
@@ -98,7 +98,7 @@ public void reduceItemStack(Level world, BlockPos pos, Direction side, boolean s
 
     @Override
     public boolean addItemStack(Level world, BlockPos pos, Direction side, ItemStack itemStack, boolean simulate) {
-        IItemHandler itemHandler = BlockEntityHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null);
+        IItemHandler itemHandler = BlockEntityHelpers.getCapability(world, pos, side, ForgeCapabilities.ITEM_HANDLER).orElse(null);
         if(itemHandler != null) {
             for(int slot = 0; slot < itemHandler.getSlots(); slot++) {
                 if(itemHandler.insertItem(slot, itemStack, simulate).isEmpty()) {
@@ -118,7 +118,7 @@ public boolean addItemStack(Level world, BlockPos pos, Direction side, ItemStack
 
     @Override
     public boolean setItemStack(Level world, BlockPos pos, Direction side, ItemStack itemStack, boolean simulate) {
-        IItemHandler itemHandler = BlockEntityHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null);
+        IItemHandler itemHandler = BlockEntityHelpers.getCapability(world, pos, side, ForgeCapabilities.ITEM_HANDLER).orElse(null);
         if(itemHandler != null) {
             for(int slot = 0; slot < itemHandler.getSlots(); slot++) {
                 if(itemHandler.insertItem(slot, itemStack, simulate).isEmpty()) {

src/main/java/org/cyclops/structuredcrafting/craft/provider/WorldItemStackProvider.java

@@ -10,8 +10,8 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.common.util.FakePlayer;
-import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import org.cyclops.cyclopscore.helper.BlockEntityHelpers;
 import org.cyclops.cyclopscore.helper.ItemStackHelpers;
@@ -55,7 +55,7 @@ public boolean isValidForResults(Level world, BlockPos pos, Direction side) {
     }
 
     protected boolean hasEmptyItemHandler(Level world, BlockPos pos, Direction side) {
-        IItemHandler itemHandler = BlockEntityHelpers.getCapability(world, pos, side, CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null);
+        IItemHandler itemHandler = BlockEntityHelpers.getCapability(world, pos, side, ForgeCapabilities.ITEM_HANDLER).orElse(null);
         boolean emptyItemHandler = true;
         if (itemHandler != null) {
             for (int i = 0; i < itemHandler.getSlots(); i++) {

src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[44,)"
+loaderVersion="[45,)"
 issueTrackerURL="https://github.com/CyclopsMC/StructuredCrafting/issues"
 displayURL="https://www.curseforge.com/minecraft/mc-mods/structured-crafting"
 license="MIT"
@@ -16,18 +16,18 @@ Craft stuff in your world, automatically.
 [[dependencies.structuredcrafting]]
     modId="cyclopscore"
     mandatory=true
-    versionRange="[1.17.3,)"
+    versionRange="[1.18.2,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.structuredcrafting]]
     modId="forge"
     mandatory=true
-    versionRange="[44.1.0,)"
+    versionRange="[45.0.20,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.structuredcrafting]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.19.3,]"
+    versionRange="[1.19.4,]"
     ordering="NONE"
     side="BOTH"