diff --git a/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 b/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 index 2459bef7e61..dba4e294d96 100644 --- a/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 +++ b/src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09 @@ -1,6 +1,6 @@ -// 1.21.1 2024-09-28T11:00:15.3012517 ComputerHelp: mekanism +// 1.21.1 2024-12-27T11:00:53.679005 ComputerHelp: mekanism 740491ca25c3ff0efd50f10d2427e4ceccb0c1e1 data/mekanism/computer_help/enums.csv e43ab1d9e5ae68f834035609a85af3c6ce4161a4 data/mekanism/computer_help/enums.json -a61020bfab0b0525339f1b49417d2f7e17dbc7df data/mekanism/computer_help/jekyll.md +0e0954dc2f5f02d275cfcfb4e70af3912268fa5e data/mekanism/computer_help/jekyll.md 0442f235be0f36db5728aaf942c99e9c8638f662 data/mekanism/computer_help/methods.csv 366f1717990ae1860dc4739af4a8f441cd0acad5 data/mekanism/computer_help/methods.json diff --git a/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 b/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 index f3a5d8e79c5..f9cfee979f7 100644 --- a/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 +++ b/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 @@ -1,5 +1,5 @@ -// 1.21.1 2024-11-23T20:13:21.6073479 Languages: en_us for mod: mekanism +// 1.21.1 2024-12-27T14:08:24.2359495 Languages: en_us for mod: mekanism 8d915354d84b3a4d60c65f9280fdd7ceca016c35 assets/mekanism/lang/en_au.json 8d915354d84b3a4d60c65f9280fdd7ceca016c35 assets/mekanism/lang/en_gb.json -7e84d49fa4f68936a43bca5f7a4dfb071e735e27 assets/mekanism/lang/en_ud.json -85cdcefae92079d12d07e68a3561964f4d4d9552 assets/mekanism/lang/en_us.json +e505226bbe693ca89352ca2b34d89e13b78b4b65 assets/mekanism/lang/en_ud.json +4f36b53b05ad6ba90c15adfd656e56fa73abbd39 assets/mekanism/lang/en_us.json diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json index 9d000521a90..9b17afc56e5 100644 --- a/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json +++ b/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json @@ -2294,7 +2294,9 @@ "gui.mekanism.issues.no_recipe": "ʇnduᴉ ɥᵷnouǝ ʇou ɹo ǝdᴉɔǝɹ ᵷuᴉɥɔʇɐɯ oN - ", "gui.mekanism.issues.no_space": "ʇndʇno uᴉ ɯooɹ ɥᵷnouǝ ʇoN - ", "gui.mekanism.issues.no_space.overflow": "ɹǝɟɟnq ꞁɐuɹǝʇuᴉ uᴉ pǝɹoʇs ʍoꞁɟɹǝʌo 'ʇndʇno uᴉ ɯooɹ ɥᵷnouǝ ʇoN - ", - "gui.mekanism.issues.redstone_prevents_activation": "ʇǝɯ ʇou suoᴉʇᴉpuoɔ ǝuoʇspǝᴚ - ", + "gui.mekanism.issues.redstone_pulse_required": "˙ǝʇɐʌᴉʇɔɐ oʇ pǝɹᴉnbǝɹ ǝsꞁnd ǝuoʇspǝᴚ - ", + "gui.mekanism.issues.redstone_signal_absent": "˙ǝʇɐʌᴉʇɔɐ oʇ ǝuo ǝpᴉʌoɹd 'ʇuǝsqɐ ꞁɐuᵷᴉs ǝuoʇspǝᴚ - ", + "gui.mekanism.issues.redstone_signal_present": "˙ǝʇɐʌᴉʇɔɐ oʇ ʇᴉ ǝʌoɯǝɹ 'ʇuǝsǝɹd ꞁɐuᵷᴉs ǝuoʇspǝᴚ - ", "gui.mekanism.jitter": "%%%s :ɹǝʇʇᴉՐ", "gui.mekanism.liquid": "%s :pᴉnbᴉꞀ", "gui.mekanism.max": "%s :xɐW", diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json index 3629b1f0937..2fa70c670de 100644 --- a/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json +++ b/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json @@ -2297,7 +2297,9 @@ "gui.mekanism.issues.no_recipe": " - No matching recipe or not enough input", "gui.mekanism.issues.no_space": " - Not enough room in output", "gui.mekanism.issues.no_space.overflow": " - Not enough room in output, overflow stored in internal buffer", - "gui.mekanism.issues.redstone_prevents_activation": " - Redstone conditions not met", + "gui.mekanism.issues.redstone_pulse_required": " - Redstone pulse required to activate.", + "gui.mekanism.issues.redstone_signal_absent": " - Redstone signal absent, provide one to activate.", + "gui.mekanism.issues.redstone_signal_present": " - Redstone signal present, remove it to activate.", "gui.mekanism.jitter": "Jitter: %1$s%%", "gui.mekanism.liquid": "Liquid: %1$s", "gui.mekanism.max": "Max: %1$s", diff --git a/src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md b/src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md index 8816e3b2faf..139dbdf98c6 100644 --- a/src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md +++ b/src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md @@ -4495,5 +4495,5 @@ methods: returns: java_type: boolean type: boolean -version: 10.7.7 +version: 10.7.8 --- diff --git a/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java b/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java index 61732f0df8b..ffbba6b1ea9 100644 --- a/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java +++ b/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java @@ -1182,7 +1182,10 @@ private void addMisc() { add(MekanismLang.ISSUE_INPUT_DOESNT_PRODUCE_OUTPUT, " - Input does not produce output"); add(MekanismLang.ISSUE_INVALID_OREDICTIONIFICATOR_FILTER, " - Filter is no longer valid or supported"); add(MekanismLang.ISSUE_FILTER_HAS_BLACKLISTED_ELEMENT, " - Filter contains at least one element that is blacklisted"); - add(MekanismLang.ISSUE_REDSTONE_PREVENTS_ACTIVATION, " - Redstone conditions not met"); + //Redstone Activation + add(MekanismLang.ISSUE_REDSTONE_SIGNAL_ABSENT, " - Redstone signal absent, provide one to activate."); + add(MekanismLang.ISSUE_REDSTONE_SIGNAL_PRESENT, " - Redstone signal present, remove it to activate."); + add(MekanismLang.ISSUE_REDSTONE_PULSE_REQUIRED, " - Redstone pulse required to activate."); //Laser Amplifier add(MekanismLang.ENTITY_DETECTION, "Entity Detection"); add(MekanismLang.ENERGY_CONTENTS, "Energy Contents"); diff --git a/src/main/java/mekanism/client/gui/GuiMekanismTile.java b/src/main/java/mekanism/client/gui/GuiMekanismTile.java index 0696e892d33..7da299ef8af 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanismTile.java +++ b/src/main/java/mekanism/client/gui/GuiMekanismTile.java @@ -7,6 +7,7 @@ import mekanism.common.inventory.container.tile.MekanismTileContainer; import mekanism.common.inventory.warning.WarningTracker.WarningType; import mekanism.common.tile.base.TileEntityMekanism; +import mekanism.common.tile.interfaces.IRedstoneControl.RedstoneControl; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import org.jetbrains.annotations.Nullable; @@ -40,7 +41,10 @@ protected void addGenericTabs() { upgradeWindowTab = addRenderableWidget(new GuiUpgradeWindowTab(this, tile, () -> upgradeWindowTab)); } if (tile.supportsRedstone()) { - addRenderableWidget(new GuiRedstoneControlTab(this, tile).warning(WarningType.REDSTONE_PREVENTS_ACTIVATION, () -> !tile.isRedstoneActivated())); + addRenderableWidget(new GuiRedstoneControlTab(this, tile) + .warning(WarningType.REDSTONE_SIGNAL_ABSENT, () -> !tile.isRedstoneActivated() && tile.getControlType() == RedstoneControl.HIGH) + .warning(WarningType.REDSTONE_SIGNAL_PRESENT, () -> !tile.isRedstoneActivated() && tile.getControlType() == RedstoneControl.LOW) + .warning(WarningType.REDSTONE_PULSE_REQUIRED, () -> !tile.isRedstoneActivated() && tile.getControlType() == RedstoneControl.PULSE)); } //Note: We check if the capability is present rather than calling hasSecurity so that we don't add the tab to the security desk if (tile.getLevel() != null && IBlockSecurityUtils.INSTANCE.securityCapability(tile.getLevel(), tile.getBlockPos(), tile) != null) { diff --git a/src/main/java/mekanism/common/MekanismLang.java b/src/main/java/mekanism/common/MekanismLang.java index f9703b3792b..abd9c27a809 100644 --- a/src/main/java/mekanism/common/MekanismLang.java +++ b/src/main/java/mekanism/common/MekanismLang.java @@ -294,7 +294,10 @@ public enum MekanismLang implements ILangEntry { ISSUE_INPUT_DOESNT_PRODUCE_OUTPUT("gui", "issues.input_doesnt_produce_output"), ISSUE_INVALID_OREDICTIONIFICATOR_FILTER("gui", "issues.invalid_oredictionificator_filter"), ISSUE_FILTER_HAS_BLACKLISTED_ELEMENT("gui", "issues.filter_has_blacklisted_element"), - ISSUE_REDSTONE_PREVENTS_ACTIVATION("gui", "issues.redstone_prevents_activation"), + //Redstone Activation + ISSUE_REDSTONE_SIGNAL_ABSENT("gui", "issues.redstone_signal_absent"), + ISSUE_REDSTONE_SIGNAL_PRESENT("gui", "issues.redstone_signal_present"), + ISSUE_REDSTONE_PULSE_REQUIRED("gui", "issues.redstone_pulse_required"), //Laser Amplifier ENTITY_DETECTION("laser_amplifier", "entity_detection"), ENERGY_CONTENTS("laser_amplifier", "energy_contents"), diff --git a/src/main/java/mekanism/common/inventory/warning/WarningTracker.java b/src/main/java/mekanism/common/inventory/warning/WarningTracker.java index 2dd3c9ab43f..12397868d95 100644 --- a/src/main/java/mekanism/common/inventory/warning/WarningTracker.java +++ b/src/main/java/mekanism/common/inventory/warning/WarningTracker.java @@ -75,7 +75,9 @@ public enum WarningType { NOT_ENOUGH_ENERGY_REDUCED_RATE(MekanismLang.ISSUE_NOT_ENOUGH_ENERGY_REDUCED_RATE), INVALID_OREDICTIONIFICATOR_FILTER(MekanismLang.ISSUE_INVALID_OREDICTIONIFICATOR_FILTER, 4), FILTER_HAS_BLACKLISTED_ELEMENT(MekanismLang.ISSUE_FILTER_HAS_BLACKLISTED_ELEMENT, 5), - REDSTONE_PREVENTS_ACTIVATION(MekanismLang.ISSUE_REDSTONE_PREVENTS_ACTIVATION), + REDSTONE_SIGNAL_ABSENT(MekanismLang.ISSUE_REDSTONE_SIGNAL_ABSENT), + REDSTONE_SIGNAL_PRESENT(MekanismLang.ISSUE_REDSTONE_SIGNAL_PRESENT), + REDSTONE_PULSE_REQUIRED(MekanismLang.ISSUE_REDSTONE_PULSE_REQUIRED), ; private final ILangEntry langEntry;