diff --git a/build.gradle.kts b/build.gradle.kts index 7e00deefb..043d77a38 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,10 +8,10 @@ plugins { // Fabric: https://fabricmc.net/develop/ // Neoforge: https://neoforged.net/ -val MINECRAFT_VERSION by extra { "1.21.3" } -val NEOFORGE_VERSION by extra { "21.3.40-beta" } +val MINECRAFT_VERSION by extra { "1.21.4" } +val NEOFORGE_VERSION by extra { "21.4.0-beta" } val FABRIC_LOADER_VERSION by extra { "0.16.9" } -val FABRIC_API_VERSION by extra { "0.107.3+1.21.3" } +val FABRIC_API_VERSION by extra { "0.110.5+1.21.4" } // This value can be set to null to disable Parchment. // TODO: Add Parchment diff --git a/common/src/main/java/net/caffeinemc/mods/lithium/mixin/world/block_entity_ticking/sleeping/furnace/AbstractFurnaceBlockEntityMixin.java b/common/src/main/java/net/caffeinemc/mods/lithium/mixin/world/block_entity_ticking/sleeping/furnace/AbstractFurnaceBlockEntityMixin.java index 6530b99d9..7152445c0 100644 --- a/common/src/main/java/net/caffeinemc/mods/lithium/mixin/world/block_entity_ticking/sleeping/furnace/AbstractFurnaceBlockEntityMixin.java +++ b/common/src/main/java/net/caffeinemc/mods/lithium/mixin/world/block_entity_ticking/sleeping/furnace/AbstractFurnaceBlockEntityMixin.java @@ -24,7 +24,7 @@ public abstract class AbstractFurnaceBlockEntityMixin extends BlockEntity implem protected abstract boolean isLit(); @Shadow - int cookingProgress; + int cookingTimer; private WrappedBlockEntityTickInvokerAccessor tickWrapper = null; private TickingBlockEntity sleepingTicker = null; @@ -59,7 +59,7 @@ private static void checkSleep(ServerLevel serverLevel, BlockPos blockPos, Block } private void checkSleep(BlockState state) { - if (!this.isLit() && this.cookingProgress == 0 && (state.is(Blocks.FURNACE) || state.is(Blocks.BLAST_FURNACE) || state.is(Blocks.SMOKER)) && this.level != null) { + if (!this.isLit() && this.cookingTimer == 0 && (state.is(Blocks.FURNACE) || state.is(Blocks.BLAST_FURNACE) || state.is(Blocks.SMOKER)) && this.level != null) { this.lithium$startSleeping(); } } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index c707b4e9c..a36e6989e 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -28,10 +28,7 @@ "accessWidener": "lithium.accesswidener", "depends": { "fabricloader": ">=0.15.1", - "minecraft" : [ - "1.21.2", - "1.21.3" - ] + "minecraft" : "1.21.4" }, "breaks": { "optifabric": "*" diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 00fcbadf2..e9f3c918f 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -23,7 +23,7 @@ Lithium is a free and open-source optimization mod for Minecraft which makes a w [[dependencies.lithium]] modId = "minecraft" type = "required" -versionRange = "[1.21.2,1.21.3]" +versionRange = "1.21.4" ordering = "NONE" side = "BOTH"