From 875e360b419d1c49ca74fa6cd638c0ea0f9de70c Mon Sep 17 00:00:00 2001 From: Ruben Taelman Date: Sun, 26 Mar 2023 17:20:34 +0200 Subject: [PATCH] Update to MC 1.19.4 --- gradle.properties | 10 +++++----- .../CraftingProcessOverrideCraftingTable.java | 6 ++++-- .../ContainerPartInterfaceCraftingConfig.java | 3 ++- .../ContainerPartInterfaceCraftingSettingsConfig.java | 3 ++- src/main/resources/META-INF/mods.toml | 10 +++++----- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index a62bbc1b..6b78640e 100644 --- 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/src/main/java/org/cyclops/integratedcrafting/core/crafting/processoverride/CraftingProcessOverrideCraftingTable.java b/src/main/java/org/cyclops/integratedcrafting/core/crafting/processoverride/CraftingProcessOverrideCraftingTable.java index 47456d2c..d3ac4519 100644 --- a/src/main/java/org/cyclops/integratedcrafting/core/crafting/processoverride/CraftingProcessOverrideCraftingTable.java +++ b/src/main/java/org/cyclops/integratedcrafting/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, 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/src/main/java/org/cyclops/integratedcrafting/inventory/container/ContainerPartInterfaceCraftingConfig.java b/src/main/java/org/cyclops/integratedcrafting/inventory/container/ContainerPartInterfaceCraftingConfig.java index 58fdd80d..160544c0 100644 --- a/src/main/java/org/cyclops/integratedcrafting/inventory/container/ContainerPartInterfaceCraftingConfig.java +++ b/src/main/java/org/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 new ContainerTypeData<>(ContainerPartInterfaceCrafting::new)); + eConfig -> new ContainerTypeData<>(ContainerPartInterfaceCrafting::new, FeatureFlags.VANILLA_SET)); } @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/org/cyclops/integratedcrafting/inventory/container/ContainerPartInterfaceCraftingSettingsConfig.java b/src/main/java/org/cyclops/integratedcrafting/inventory/container/ContainerPartInterfaceCraftingSettingsConfig.java index efbead78..75cb8bc2 100644 --- a/src/main/java/org/cyclops/integratedcrafting/inventory/container/ContainerPartInterfaceCraftingSettingsConfig.java +++ b/src/main/java/org/cyclops/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 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 index 392b39d8..8b1e6fb3 100644 --- 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"