Skip to content

Commit 991ab7f

Browse files
Fix Jade not reporting "disabled after current cycle" (#3879)
Co-authored-by: Jurre Groenendijk <jurre@jilles.com>
1 parent 12e7968 commit 991ab7f

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

src/main/java/com/gregtechceu/gtceu/api/capability/IControllable.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,8 @@ public interface IControllable {
2121
void setWorkingEnabled(boolean isWorkingAllowed);
2222

2323
default void setSuspendAfterFinish(boolean suspendAfterFinish) {}
24+
25+
default boolean isSuspendAfterFinish() {
26+
return false;
27+
}
2428
}

src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@ default void setSuspendAfterFinish(boolean suspendAfterFinish) {
144144
getRecipeLogic().setSuspendAfterFinish(suspendAfterFinish);
145145
}
146146

147+
@Override
148+
default boolean isSuspendAfterFinish() {
149+
return getRecipeLogic().isSuspendAfterFinish();
150+
}
151+
147152
@Override
148153
default int getProgress() {
149154
return getRecipeLogic().getProgress();

src/main/java/com/gregtechceu/gtceu/integration/jade/provider/ControllableBlockProvider.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,17 @@ protected IControllable getCapability(Level level, BlockPos pos, @Nullable Direc
3333
@Override
3434
protected void write(CompoundTag data, IControllable capability) {
3535
data.putBoolean("WorkingEnabled", capability.isWorkingEnabled());
36+
data.putBoolean("SuspendAfter", capability.isSuspendAfterFinish());
3637
}
3738

3839
@Override
3940
protected void addTooltip(CompoundTag capData, ITooltip tooltip, Player player, BlockAccessor block,
4041
BlockEntity blockEntity, IPluginConfig config) {
41-
if (capData.contains("WorkingEnabled") && !capData.getBoolean("WorkingEnabled")) {
42-
tooltip.add(Component.translatable("gtceu.top.working_disabled").withStyle(ChatFormatting.YELLOW));
42+
if (capData.contains("SuspendAfter") && capData.getBoolean("SuspendAfter")) {
43+
tooltip.add(
44+
Component.translatable("behaviour.soft_hammer.disabled_cycle").withStyle(ChatFormatting.YELLOW));
45+
} else if (capData.contains("WorkingEnabled") && !capData.getBoolean("WorkingEnabled")) {
46+
tooltip.add(Component.translatable("behaviour.soft_hammer.disabled").withStyle(ChatFormatting.YELLOW));
4347
}
4448
}
4549
}

src/main/java/com/gregtechceu/gtceu/integration/top/provider/ControllableInfoProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ protected void addProbeInfo(IControllable capability, IProbeInfo probeInfo, Play
3535
IProbeHitData data) {
3636
IProbeInfo horizontalPane = probeInfo
3737
.horizontal(probeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER));
38-
if (!capability.isWorkingEnabled())
39-
horizontalPane.text(CompoundText.create().warning("gtceu.top.working_disabled"));
38+
if (capability.isSuspendAfterFinish())
39+
horizontalPane.text(CompoundText.create().warning("behaviour.soft_hammer.disabled_cycle"));
40+
else if (!capability.isWorkingEnabled())
41+
horizontalPane.text(CompoundText.create().warning("behaviour.soft_hammer.disabled"));
4042
}
4143
}

0 commit comments

Comments
 (0)