Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21

Author: rubensworks

resources/changelog/1.19.2-1.0.11.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.0 or higher.
+
+Fixes:
+* Fix some modded keybindings activating in scripting terminal, Closes #40

resources/changelog/1.20.1-1.0.14.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.0 or higher.
+
+Fixes:
+* Fix some modded keybindings activating in scripting terminal, Closes #40

resources/changelog/1.21.1-1.0.18.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.25.5 or higher.
+
+Fixes:
+* Fix some modded keybindings activating in scripting terminal, Closes #40

src/main/java/org/cyclops/integratedscripting/client/gui/component/input/WidgetTextArea.java

@@ -8,7 +8,7 @@
 import net.minecraft.client.StringSplitter;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.font.TextFieldHelper;
 import net.minecraft.client.gui.narration.NarratedElementType;
@@ -53,7 +53,7 @@
  * @author rubensworks
  */
 @OnlyIn(Dist.CLIENT)
-public class WidgetTextArea extends AbstractWidget implements GuiEventListener {
+public class WidgetTextArea extends EditBox implements GuiEventListener {
 
     public static final int ROW_HEIGHT = 9;
 
@@ -82,7 +82,7 @@ public class WidgetTextArea extends AbstractWidget implements GuiEventListener {
     private int firstRow;
 
     public WidgetTextArea(Font font, int x, int y, int width, int height, Component narrationMessage, boolean scrollBar, boolean showLineNumbers) {
-        super(x, y, width, height, narrationMessage);
+        super(font, x, y, width, height, narrationMessage);
         this.font = font;
         this.showLineNumbers = showLineNumbers;
         this.textFieldHelper = new TextFieldHelperExtended(this::getValue, this::setValuePassive, this::getClipboard, this::setClipboard, s -> true, this::setSelected, this::onCursorPosChanged);
@@ -204,7 +204,7 @@ public void setSelectionPos(int pos) {
     }
 
     @Override
-    protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
+    public void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
         narrationElementOutput.add(NarratedElementType.TITLE, Component.translatable("narration.edit_box", this.getValue()));
     }
 
@@ -432,7 +432,7 @@ private void keyEnd() {
     }
 
     @Override
-    protected void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
+    public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
         // Determine lines to show
         DisplayCache displayCache = this.getDisplayCache();
         List<LineInfo> lines = Arrays.asList(displayCache.lines);