From 029c0fd5c5b84ddbeea1c3caddbcc1644cb8dcda Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 3 Jul 2024 21:32:08 +0200 Subject: [PATCH] fix: empty controllers not showing their true colors --- .../node/exporter/RoundRobinExporterNetworkNodeTest.java | 1 + .../controller/ControllerModelPredicateProvider.java | 7 ++++++- refinedstorage2-platform-forge/build.gradle | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java index d09f2cc24..2df0a9909 100644 --- a/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java +++ b/refinedstorage2-network/src/test/java/com/refinedmods/refinedstorage2/api/network/impl/node/exporter/RoundRobinExporterNetworkNodeTest.java @@ -29,6 +29,7 @@ class RoundRobinExporterNetworkNodeTest extends AbstractExporterNetworkNodeTest { private Runnable listener; + @Override @BeforeEach void setUp() { listener = mock(Runnable.class); diff --git a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java index 17cf86750..81ba9cffa 100644 --- a/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java +++ b/refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/controller/ControllerModelPredicateProvider.java @@ -16,7 +16,12 @@ public float unclampedCall(final ItemStack stack, @Nullable final LivingEntity entity, final int seed) { return PlatformApi.INSTANCE.getEnergyStorage(stack) - .map(energyStorage -> (float) energyStorage.getStored() / (float) energyStorage.getCapacity()) + .map(energyStorage -> { + if (energyStorage.getStored() == 0) { + return 1F; + } + return (float) energyStorage.getStored() / (float) energyStorage.getCapacity(); + }) .orElse(1F); } } diff --git a/refinedstorage2-platform-forge/build.gradle b/refinedstorage2-platform-forge/build.gradle index ee02459f4..957d6e3f9 100644 --- a/refinedstorage2-platform-forge/build.gradle +++ b/refinedstorage2-platform-forge/build.gradle @@ -4,4 +4,7 @@ archivesBaseName = 'refinedstorage2-platform-forge' enablePublishing() +// This avoids a build failure when running the "test" task, because there is no JUnit engine +// in this subproject. +// The test source set in this subproject is used for Minecraft game tests, not for JUnit tests. test.onlyIf { false }