diff options
| author | Glease <4586901+Glease@users.noreply.github.com> | 2023-08-25 01:41:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-25 01:41:04 +0800 |
| commit | 30362544023aabda090aa939cee4305ff69f4541 (patch) | |
| tree | 85ee801ba144c0b1d41c9865fabc7b65b30d9594 /src/main | |
| parent | f33faa55cdb6206430f1da4782e8c044102685b3 (diff) | |
| download | GT5-Unofficial-30362544023aabda090aa939cee4305ff69f4541.tar.gz GT5-Unofficial-30362544023aabda090aa939cee4305ff69f4541.tar.bz2 GT5-Unofficial-30362544023aabda090aa939cee4305ff69f4541.zip | |
fix linked input bus pasting not working when origin uses a circuit (#16)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/net/glease/ggfab/mte/MTE_LinkedInputBus.java | 4 | ||||
| -rw-r--r-- | src/main/resources/assets/ggfab/lang/en_US.lang | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/net/glease/ggfab/mte/MTE_LinkedInputBus.java b/src/main/java/net/glease/ggfab/mte/MTE_LinkedInputBus.java index 5d7bd737fc..691deea609 100644 --- a/src/main/java/net/glease/ggfab/mte/MTE_LinkedInputBus.java +++ b/src/main/java/net/glease/ggfab/mte/MTE_LinkedInputBus.java @@ -356,8 +356,8 @@ public class MTE_LinkedInputBus extends GT_MetaTileEntity_Hatch_InputBus { if ("".equals(channel)) { aPlayer.addChatMessage(new ChatComponentTranslation("ggfab.info.linked_input_bus.no_data")); return true; - } else if (circuit != null && !getConfigurationCircuits().contains(circuit)) { - aPlayer.addChatMessage(new ChatComponentTranslation("ggfab.info.linked_input_bus.no_data")); + } else if (circuit != null && getConfigurationCircuits().stream().noneMatch(circuit::isItemEqual)) { + aPlayer.addChatMessage(new ChatComponentTranslation("ggfab.info.linked_input_bus.invalid_circuit")); return true; } UUID owner = stick.stackTagCompound.hasKey("owner1") diff --git a/src/main/resources/assets/ggfab/lang/en_US.lang b/src/main/resources/assets/ggfab/lang/en_US.lang index d3f334491a..df9dc6cba1 100644 --- a/src/main/resources/assets/ggfab/lang/en_US.lang +++ b/src/main/resources/assets/ggfab/lang/en_US.lang @@ -13,7 +13,9 @@ ggfab.waila.advassline.slice.idle=Slice #%s: Idle ggfab.waila.advassline.slice.stuck=Slice #%s: §4STUCK ggfab.info.linked_input_bus.not_owned=§6The settings were copied from a different owner! +ggfab.info.linked_input_bus.no_data=§6Configuration data not found! ggfab.info.linked_input_bus.invalid_data=§6Configuration data was found but it is invalid! +ggfab.info.linked_input_bus.invalid_circuit=§6Configuration data was found but it contains a circuit not valid on this bus! ggfab.info.linked_input_bus.data_pasted=§2Pasted channel ("%s§2") and configuration circuit setting! ggfab.info.linked_input_bus.data_copied=§2Copied channel ("%s§2") and configuration circuit setting! ggfab.info.linked_input_bus.no_channel=§6No channel specified yet! |