From e84be6e4d889b4aa5247e79540b9d424a4a48740 Mon Sep 17 00:00:00 2001 From: Ruben Taelman Date: Fri, 13 Dec 2024 10:26:25 +0100 Subject: [PATCH 1/2] Don't invoke WorldHelpers.efficientTick client-side Related to #961 --- .../BlockEntitySanguinaryEnvironmentalAccumulator.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/cyclops/evilcraft/blockentity/BlockEntitySanguinaryEnvironmentalAccumulator.java b/src/main/java/org/cyclops/evilcraft/blockentity/BlockEntitySanguinaryEnvironmentalAccumulator.java index c9ea0a5c37..55610c8fbd 100644 --- a/src/main/java/org/cyclops/evilcraft/blockentity/BlockEntitySanguinaryEnvironmentalAccumulator.java +++ b/src/main/java/org/cyclops/evilcraft/blockentity/BlockEntitySanguinaryEnvironmentalAccumulator.java @@ -32,11 +32,7 @@ import org.apache.commons.lang3.tuple.Triple; import org.cyclops.cyclopscore.capability.item.ItemHandlerSlotMasked; import org.cyclops.cyclopscore.datastructure.SingleCache; -import org.cyclops.cyclopscore.helper.BlockEntityHelpers; -import org.cyclops.cyclopscore.helper.CraftingHelpers; -import org.cyclops.cyclopscore.helper.LocationHelpers; -import org.cyclops.cyclopscore.helper.MinecraftHelpers; -import org.cyclops.cyclopscore.helper.WorldHelpers; +import org.cyclops.cyclopscore.helper.*; import org.cyclops.cyclopscore.inventory.SimpleInventory; import org.cyclops.evilcraft.RegistryEntries; import org.cyclops.evilcraft.block.BlockSanguinaryEnvironmentalAccumulator; @@ -296,7 +292,7 @@ public Metadata getTileWorkingMetadata() { @Override public boolean canWork() { - if(!forceLoadTanks && invalidLocations != null && !WorldHelpers.efficientTick(level, TANK_CHECK_TICK_OFFSET, getBlockPos())) { + if(!forceLoadTanks && invalidLocations != null && (level.isClientSide() || !WorldHelpers.efficientTick(level, TANK_CHECK_TICK_OFFSET, getBlockPos()))) { return invalidLocations.isEmpty(); } forceLoadTanks = false; From cc7f787b19e6ee8ab92c07d7e099479029975a48 Mon Sep 17 00:00:00 2001 From: Ruben Taelman Date: Fri, 13 Dec 2024 10:50:33 +0100 Subject: [PATCH 2/2] Bump mod version --- gradle.properties | 2 +- resources/changelog/1.19.2-1.2.41.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 resources/changelog/1.19.2-1.2.41.txt diff --git a/gradle.properties b/gradle.properties index 1a6350174c..d0efc00013 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -mod_version=1.2.40 +mod_version=1.2.41 minecraft_version=1.19.2 forge_version=43.0.8 cyclopscore_version=1.17.0-237 diff --git a/resources/changelog/1.19.2-1.2.41.txt b/resources/changelog/1.19.2-1.2.41.txt new file mode 100644 index 0000000000..ebd4c3beac --- /dev/null +++ b/resources/changelog/1.19.2-1.2.41.txt @@ -0,0 +1,6 @@ +As always, don't forget to backup your world before updating! +Requires CyclopsCore version 1.17.0 or higher. + +Fixes: +* Don't invoke WorldHelpers.efficientTick client-side, Related to #961 +