Fix CC integration with the monitor cover (#4143)

Author: TarLaboratories

src/generated/resources/assets/gtceu/lang/en_ud.json

@@ -3528,6 +3528,9 @@
   "gtceu.placeholder_info.block.0": "˙)█( ןoqɯʎs ʞɔoןq ǝɥʇ suɹnʇǝᴚ",
   "gtceu.placeholder_info.block.1": ":ǝbɐs∩",
   "gtceu.placeholder_info.block.2": ",█, >- }ʞɔoןq{  ",
+  "gtceu.placeholder_info.bufferText.0": "ʇɟɐɹƆɹǝʇndɯoƆ ʎq ǝןqıssǝɔɔɐ ɹǝɟɟnq ɐ ɯoɹɟ ʇxǝʇ ǝɥʇ suɹnʇǝᴚ",
+  "gtceu.placeholder_info.bufferText.1": ":ǝbɐs∩",
+  "gtceu.placeholder_info.bufferText.2": ")00Ɩ-Ɩ sı ǝuıן( ǝuıן pǝıɟıɔǝds ǝɥʇ uo ɹǝɟɟnq ǝɥʇ ɯoɹɟ ʇxǝʇ >- }>ǝuıן< ʇxǝ⟘ɹǝɟɟnq{  ",
   "gtceu.placeholder_info.calc.0": "˙uoıʇɐɹǝdo ɹo uoıʇɔunɟ ɥʇɐɯ ɐ ɟo ʇןnsǝɹ ǝɥʇ suɹnʇǝᴚ",
   "gtceu.placeholder_info.calc.1": ":ǝbɐs∩",
   "gtceu.placeholder_info.calc.2": "buıɹʇs‾ʎuɐ >- }>buıɹʇs‾ʎuɐ< ɔןɐɔ{  ",

src/generated/resources/assets/gtceu/lang/en_us.json

@@ -3528,6 +3528,9 @@
   "gtceu.placeholder_info.block.0": "Returns the block symbol (█).",
   "gtceu.placeholder_info.block.1": "Usage:",
   "gtceu.placeholder_info.block.2": "  {block} -> '█'",
+  "gtceu.placeholder_info.bufferText.0": "Returns the text from a buffer accessible by ComputerCraft",
+  "gtceu.placeholder_info.bufferText.1": "Usage:",
+  "gtceu.placeholder_info.bufferText.2": "  {bufferText <line>} -> text from the buffer on the specified line (line is 1-100)",
   "gtceu.placeholder_info.calc.0": "Returns the result of a math function or operation.",
   "gtceu.placeholder_info.calc.1": "Usage:",
   "gtceu.placeholder_info.calc.2": "  {calc <any_string>} -> any_string",

src/main/java/com/gregtechceu/gtceu/api/placeholder/IPlaceholderInfoProviderCover.java

@@ -11,5 +11,9 @@ public interface IPlaceholderInfoProviderCover {
 
     List<? extends Component> getCreateDisplayTargetBuffer();
 
+    List<? extends Component> getComputerCraftTextBuffer();
+
     void setDisplayTargetBufferLine(int line, MutableComponent component);
+
+    void setComputerCraftTextBufferLine(int line, MutableComponent component);
 }

src/main/java/com/gregtechceu/gtceu/common/cover/ComputerMonitorCover.java

@@ -84,13 +84,19 @@ public class ComputerMonitorCover extends CoverBehavior
     private final List<MutableComponent> createDisplayTargetBuffer = new ArrayList<>();
     @Persisted
     @Getter
+    private final List<MutableComponent> computerCraftTextBuffer = new ArrayList<>();
+    @Persisted
+    @Getter
     private final UUID placeholderUUID;
 
     public ComputerMonitorCover(CoverDefinition definition, ICoverable coverHolder, Direction attachedSide) {
         super(definition, coverHolder, attachedSide);
         renderer = new CoverTextRenderer(this::getText);
         placeholderUUID = UUID.randomUUID();
-        for (int i = 0; i < 100; i++) createDisplayTargetBuffer.add(MutableComponent.create(ComponentContents.EMPTY));
+        for (int i = 0; i < 100; i++) {
+            createDisplayTargetBuffer.add(MutableComponent.create(ComponentContents.EMPTY));
+            computerCraftTextBuffer.add(MutableComponent.create(ComponentContents.EMPTY));
+        }
     }
 
     public List<MutableComponent> getRenderedText() {
@@ -107,6 +113,11 @@ public void setDisplayTargetBufferLine(int line, MutableComponent component) {
         createDisplayTargetBuffer.set(line, component);
     }
 
+    @Override
+    public void setComputerCraftTextBufferLine(int line, MutableComponent component) {
+        computerCraftTextBuffer.set(line, component);
+    }
+
     @Override
     public boolean canPipePassThrough() {
         return false;

src/main/java/com/gregtechceu/gtceu/common/cover/WirelessTransmitterCover.java

@@ -33,10 +33,15 @@ public class WirelessTransmitterCover extends CoverBehavior
 
     @Getter
     private final List<MutableComponent> createDisplayTargetBuffer = new ArrayList<>();
+    @Getter
+    private final List<MutableComponent> computerCraftTextBuffer = new ArrayList<>();
 
     public WirelessTransmitterCover(CoverDefinition definition, ICoverable coverHolder, Direction attachedSide) {
         super(definition, coverHolder, attachedSide);
-        for (int i = 0; i < 100; i++) createDisplayTargetBuffer.add(MutableComponent.create(ComponentContents.EMPTY));
+        for (int i = 0; i < 100; i++) {
+            createDisplayTargetBuffer.add(MutableComponent.create(ComponentContents.EMPTY));
+            computerCraftTextBuffer.add(MutableComponent.create(ComponentContents.EMPTY));
+        }
     }
 
     @Override
@@ -59,6 +64,11 @@ public void setDisplayTargetBufferLine(int line, MutableComponent component) {
         createDisplayTargetBuffer.set(line, component);
     }
 
+    @Override
+    public void setComputerCraftTextBufferLine(int line, MutableComponent component) {
+        computerCraftTextBuffer.set(line, component);
+    }
+
     @Override
     public ManagedFieldHolder getFieldHolder() {
         return MANAGED_FIELD_HOLDER;

src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java

@@ -1609,6 +1609,10 @@ public static void init(RegistrateLangProvider provider) {
                 "  {eval \"repeating a: {repeat 5 \\\"a \\\"}\" -> repeating a: a a a a a ",
                 "  {eval \\\"\"{some random text}\"\\\" -> {some random text}",
                 "  {eval \"text \"\\\"\"{something with spaces}\"\\\"\" more text\" -> text {something with spaces} more text");
+        multiLang(provider, "gtceu.placeholder_info.bufferText",
+                "Returns the text from a buffer accessible by ComputerCraft",
+                "Usage:",
+                "  {bufferText <line>} -> text from the buffer on the specified line (line is 1-100)");
         provider.add("gtceu.ender_item_link_cover.title", "Ender Item Link");
         provider.add("gtceu.ender_redstone_link_cover.title", "Ender Redstone Link");
         provider.add("gtceu.ender_redstone_link_cover.label", "Redstone power: %d");

src/main/java/com/gregtechceu/gtceu/integration/cctweaked/CCTweakedPlugin.java

@@ -1,11 +1,16 @@
 package com.gregtechceu.gtceu.integration.cctweaked;
 
 import com.gregtechceu.gtceu.api.capability.forge.GTCapability;
+import com.gregtechceu.gtceu.api.placeholder.*;
+import com.gregtechceu.gtceu.api.placeholder.exceptions.NotSupportedException;
+import com.gregtechceu.gtceu.api.placeholder.exceptions.PlaceholderException;
 import com.gregtechceu.gtceu.integration.cctweaked.peripherals.*;
 
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.ForgeComputerCraftAPI;
 
+import java.util.List;
+
 public class CCTweakedPlugin {
 
     public static void init() {
@@ -21,5 +26,17 @@ public static void init() {
         ForgeComputerCraftAPI.registerGenericCapability(GTCapability.CAPABILITY_WORKABLE);
         ForgeComputerCraftAPI.registerGenericCapability(GTCapability.CAPABILITY_COVERABLE);
         ForgeComputerCraftAPI.registerGenericCapability(GTCapability.CAPABILITY_CENTRAL_MONITOR);
+        PlaceholderHandler.addPlaceholder(new Placeholder("bufferText") {
+
+            @Override
+            public MultiLineComponent apply(PlaceholderContext ctx,
+                                            List<MultiLineComponent> args) throws PlaceholderException {
+                PlaceholderUtils.checkArgs(args, 1);
+                if (!(ctx.cover() instanceof IPlaceholderInfoProviderCover cover)) throw new NotSupportedException();
+                int i = PlaceholderUtils.toInt(args.get(0));
+                PlaceholderUtils.checkRange("line number", 1, 100, i);
+                return MultiLineComponent.of(cover.getComputerCraftTextBuffer().get(i - 1));
+            }
+        });
     }
 }

src/main/java/com/gregtechceu/gtceu/integration/cctweaked/peripherals/CoverHolderPeripheral.java

@@ -27,7 +27,7 @@ public static MethodResult setBufferedText(ICoverable coverable, String face, in
         if (direction == null) return MethodResult.of(false, "invalid face");
         if (line < 1 || line > 100) return MethodResult.of(false, "line must be from 1 to 100 (inclusive)");
         if (coverable.getCoverAtSide(direction) instanceof IPlaceholderInfoProviderCover cover) {
-            cover.setDisplayTargetBufferLine(line, Component.literal(text));
+            cover.setComputerCraftTextBufferLine(line - 1, Component.literal(text));
             return MethodResult.of(true, "success");
         } else return MethodResult.of(false, "invalid cover");
     }
@@ -44,7 +44,7 @@ public static MethodResult parsePlaceholders(ICoverable coverable, String face,
                     cover.itemStackHandler,
                     cover,
                     new MultiLineComponent(cover.getText()),
-                    cover.getPlaceholderUUID())));
+                    cover.getPlaceholderUUID())).toString());
         } else return MethodResult.of(false, "invalid cover");
     }
 }