Update to MC 1.19.4

CyclopsMC · Mar 26, 2023 · 875e360 · 875e360
1 parent d718025
commit 875e360
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,12 +1,12 @@
 mod_version=1.1.1
-minecraft_version=1.19.3
-forge_version=44.1.0
-cyclopscore_version=1.17.3-264
-integrateddynamics_version=1.19.3-1.15.0-505
+minecraft_version=1.19.4
+forge_version=45.0.20
+cyclopscore_version=1.18.2-309
+integrateddynamics_version=1.19.4-1.16.2-540
 release_type=release
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 
-commoncapabilities_version=1.19.3-2.9.0-90
+commoncapabilities_version=1.19.4-2.9.0-92
 
 # Workaround for Spotless bug
 # https://github.com/diffplug/spotless/issues/834

diff --git a/...ntegratedcrafting/core/crafting/processoverride/CraftingProcessOverrideCraftingTable.java b/...ntegratedcrafting/core/crafting/processoverride/CraftingProcessOverrideCraftingTable.java
@@ -5,6 +5,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.RecipeType;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.CraftingTableBlock;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.ForgeEventFactory;
@@ -48,10 +49,11 @@ public boolean craft(Function<IngredientComponent<?, ?>, PartPos> targetGetter,
                          IMixedIngredients ingredients, ICraftingResultsSink resultsSink, boolean simulate) {
         PartPos target = targetGetter.apply(IngredientComponent.ITEMSTACK);
         CraftingGrid grid = new CraftingGrid(ingredients, 3, 3);
+        Level level = target.getPos().getLevel(true);
 
-        return CraftingHelpers.findServerRecipe(RecipeType.CRAFTING, grid, target.getPos().getLevel(true))
+        return CraftingHelpers.findServerRecipe(RecipeType.CRAFTING, grid, level)
                 .map(recipe -> {
-                    ItemStack result = recipe.assemble(grid);
+                    ItemStack result = recipe.assemble(grid, level.registryAccess());
 
                     if (result.isEmpty()) {
                         return false;

diff --git a/.../cyclops/integratedcrafting/inventory/container/ContainerPartInterfaceCraftingConfig.java b/.../cyclops/integratedcrafting/inventory/container/ContainerPartInterfaceCraftingConfig.java
@@ -3,6 +3,7 @@
 import net.minecraft.client.gui.screens.inventory.MenuAccess;
 import net.minecraft.client.gui.screens.MenuScreens;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.world.flag.FeatureFlags;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import org.cyclops.cyclopscore.client.gui.ScreenFactorySafe;
@@ -20,7 +21,7 @@ public class ContainerPartInterfaceCraftingConfig extends GuiConfig<ContainerPar
     public ContainerPartInterfaceCraftingConfig() {
         super(IntegratedCrafting._instance,
                 "part_interface_crafting",
-                eConfig -> new ContainerTypeData<>(ContainerPartInterfaceCrafting::new));
+                eConfig -> new ContainerTypeData<>(ContainerPartInterfaceCrafting::new, FeatureFlags.VANILLA_SET));
     }
 
     @OnlyIn(Dist.CLIENT)

diff --git a/.../integratedcrafting/inventory/container/ContainerPartInterfaceCraftingSettingsConfig.java b/.../integratedcrafting/inventory/container/ContainerPartInterfaceCraftingSettingsConfig.java
@@ -3,6 +3,7 @@
 import net.minecraft.client.gui.screens.inventory.MenuAccess;
 import net.minecraft.client.gui.screens.MenuScreens;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.world.flag.FeatureFlags;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import org.cyclops.cyclopscore.client.gui.ScreenFactorySafe;
@@ -20,7 +21,7 @@ public class ContainerPartInterfaceCraftingSettingsConfig extends GuiConfig<Cont
     public ContainerPartInterfaceCraftingSettingsConfig() {
         super(IntegratedCrafting._instance,
                 "part_interface_crafting_settings",
-                eConfig -> new ContainerTypeData<>(ContainerPartInterfaceCraftingSettings::new));
+                eConfig -> new ContainerTypeData<>(ContainerPartInterfaceCraftingSettings::new, FeatureFlags.VANILLA_SET));
     }
 
     @OnlyIn(Dist.CLIENT)

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[44,)"
+loaderVersion="[45,)"
 issueTrackerURL="https://github.com/CyclopsMC/IntegratedCrafting/issues"
 displayURL="https://www.curseforge.com/minecraft/mc-mods/integrated-crafting"
 license="MIT"
@@ -16,13 +16,13 @@ Craft stuff in Integrated Dynamics networks.
 [[dependencies.integratedcrafting]]
     modId="cyclopscore"
     mandatory=true
-    versionRange="[1.17.3,)"
+    versionRange="[1.18.2,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.integratedcrafting]]
     modId="integrateddynamics"
     mandatory=true
-    versionRange="[1.15.0,)"
+    versionRange="[1.16.2,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.integratedcrafting]]
@@ -34,12 +34,12 @@ Craft stuff in Integrated Dynamics networks.
 [[dependencies.integratedcrafting]]
     modId="forge"
     mandatory=true
-    versionRange="[44.1.0,)"
+    versionRange="[45.0.20,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.integratedcrafting]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.19.3,]"
+    versionRange="[1.19.4,]"
     ordering="NONE"
     side="BOTH"