Update to MC 1.21.8

Author: rubensworks

.github/workflows/ci.yml

@@ -5,27 +5,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-env:
-  DEFAULT_JAVA_VERSION: 21
-  DEFAULT_JAVA_DISTRIBUTION: 'microsoft'
-
 jobs:
   build:
-    name: Build for Java ${{ matrix.java }} on ${{ matrix.distribution }}
+    name: Build
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        java:
-          - 21
-          - 22
-          - 23
-        distribution:
-          - 'adopt-hotspot'
-          - 'oracle'
-        include:
-          - java: 21
-            distribution: 'microsoft'
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v4
@@ -34,8 +17,8 @@ jobs:
       - name: 'Setup Java'
         uses: actions/setup-java@v4
         with:
-          distribution: ${{ matrix.distribution }}
-          java-version: ${{ matrix.java }}
+          distribution: 'microsoft'
+          java-version: 21
       - name: 'Setup Gradle'
         uses: gradle/actions/setup-gradle@v4
         with:
@@ -75,30 +58,29 @@ jobs:
         uses: coverallsapp/github-action@v2
       - name: 'Deploy as GitHub CI artifacts'
         uses: actions/upload-artifact@v4
-        if: startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.distribution, env.DEFAULT_JAVA_DISTRIBUTION)
         with:
           if-no-files-found: error
           path: build/libs/*
       - name: 'Deploy to CurseForge'
-        if: (startsWith(github.ref, 'refs/tags/') || (!startsWith(github.event.head_commit.message, 'Bump mod version') && startsWith(github.ref, 'refs/heads/master'))) && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.distribution, env.DEFAULT_JAVA_DISTRIBUTION)
+        if: startsWith(github.ref, 'refs/tags/') || (!startsWith(github.event.head_commit.message, 'Bump mod version') && startsWith(github.ref, 'refs/heads/master'))
         env:
           CURSEFORGE_KEY_SECRET: ${{ secrets.CURSEFORGE_KEY_SECRET }}
         run: ./gradlew publishCurseForge
       - name: 'Deploy to Modrinth'
         continue-on-error: true
-        if: (startsWith(github.ref, 'refs/tags/') || (!startsWith(github.event.head_commit.message, 'Bump mod version') && startsWith(github.ref, 'refs/heads/master'))) && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.distribution, env.DEFAULT_JAVA_DISTRIBUTION)
+        if: startsWith(github.ref, 'refs/tags/') || (!startsWith(github.event.head_commit.message, 'Bump mod version') && startsWith(github.ref, 'refs/heads/master'))
         env:
           MODRINTH_KEY_SECRET: ${{ secrets.MODRINTH_KEY_SECRET }}
         run: ./gradlew modrinth
       - name: 'Deploy to Maven'
-        if: (startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/heads/feature')) && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.distribution, env.DEFAULT_JAVA_DISTRIBUTION)
+        if: startsWith(github.ref, 'refs/heads/master') || startsWith(github.ref, 'refs/heads/feature')
         env:
           MAVEN_URL: ${{ secrets.MAVEN_URL }}
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_KEY: ${{ secrets.MAVEN_KEY }}
         run: ./gradlew publish
       - name: 'Deploy JavaDoc to GitHub Pages'
-        if: startsWith(github.ref, 'refs/heads/master') && startsWith(matrix.java, env.DEFAULT_JAVA_VERSION) && startsWith(matrix.distribution, env.DEFAULT_JAVA_DISTRIBUTION)
+        if: startsWith(github.ref, 'refs/heads/master')
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'net.neoforged.gradle.userdev' version '7.0.171'
-    id 'net.darkhax.curseforgegradle' version '1.0.8'
+	id 'net.neoforged.gradle.userdev' version '7.0.185'
+    id 'net.darkhax.curseforgegradle' version '1.1.26'
 	id 'com.github.kt3k.coveralls' version '2.12.0'
     id 'com.diffplug.spotless' version '6.25.0'
     id 'com.github.johnrengelman.shadow' version '8.1.1'

gradle.properties

@@ -4,7 +4,7 @@ group=org.cyclops.integratedscripting
 java_version=21
 
 # Common
-minecraft_version=1.21.4
+minecraft_version=1.21.8
 mod_name=IntegratedScripting
 mod_author=rubensworks (aka kroeser)
 mod_id=integratedscripting
@@ -15,13 +15,13 @@ display_url=https://www.curseforge.com/minecraft/mc-mods/integrated-scripting
 description=Create scripts for handling operations in Integrated Dynamics.
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 
-parchment_version=2024.12.07
-parchment_minecraft_version=1.21.4
+parchment_version=2025.06.15
+parchment_minecraft_version=1.21.5
 curseforge_project_id=889785
 modrinth_project_id=uDJkuFRe
 
 # NeoForge
-neoforge_version=21.4.33-beta
+neoforge_version=21.8.20
 neoforge_loader_version_range=[4,)
 neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/integrated-scripting.json
 
@@ -32,6 +32,6 @@ org.gradle.caching=true
 
 # Dependencies
 graal_version=24.1.1
-cyclopscore_version=1.25.5-704
-integrateddynamics_version=1.24.1-1059
-commoncapabilities_version=2.9.7-194
+cyclopscore_version=1.25.5-800
+integrateddynamics_version=1.24.1-1300
+commoncapabilities_version=2.9.7-251

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/org/cyclops/integratedscripting/IntegratedScripting.java

@@ -6,8 +6,6 @@
 import net.minecraft.commands.Commands;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.Mod;
@@ -42,6 +40,7 @@
 import org.cyclops.integratedscripting.core.network.ScriptingData;
 import org.cyclops.integratedscripting.evaluate.translation.ValueTranslatorRegistry;
 import org.cyclops.integratedscripting.evaluate.translation.ValueTranslators;
+import org.cyclops.integratedscripting.gametest.GameTestsScripts;
 import org.cyclops.integratedscripting.inventory.container.ContainerScriptingDriveConfig;
 import org.cyclops.integratedscripting.inventory.container.ContainerTerminalScriptingConfig;
 import org.cyclops.integratedscripting.item.ItemScriptingDiskConfig;
@@ -162,7 +161,6 @@ protected void onConfigsRegister(ConfigHandlerCommon configHandler) {
         configHandler.addConfigurable(new DataComponentDiskIdConfig());
     }
 
-    @OnlyIn(Dist.CLIENT)
     @Override
     protected IClientProxy constructClientProxy() {
         return new ClientProxy();
@@ -173,6 +171,13 @@ protected ICommonProxy constructCommonProxy() {
         return new CommonProxy();
     }
 
+    @Override
+    public Class<?>[] getGameTestClasses() {
+        return new Class<?>[]{
+                GameTestsScripts.class
+        };
+    }
+
     /**
      * Log a new info message for this mod.
      * @param message The message to show.

src/main/java/org/cyclops/integratedscripting/api/language/ILanguageHandler.java

@@ -1,8 +1,6 @@
 package org.cyclops.integratedscripting.api.language;
 
 import net.minecraft.network.chat.Style;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
 import org.apache.commons.lang3.tuple.Pair;
 import org.cyclops.cyclopscore.client.gui.image.IImage;
 import org.cyclops.integrateddynamics.api.evaluate.EvaluationException;
@@ -18,7 +16,6 @@ public interface ILanguageHandler {
 
     public String getName();
 
-    @OnlyIn(Dist.CLIENT)
     public IImage getIcon();
 
     public List<String> getExtensions();

src/main/java/org/cyclops/integratedscripting/blockentity/BlockEntityScriptingDrive.java

@@ -1,8 +1,6 @@
 package org.cyclops.integratedscripting.blockentity;
 
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.HolderLookup;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.player.Inventory;
@@ -12,6 +10,8 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.storage.ValueInput;
+import net.minecraft.world.level.storage.ValueOutput;
 import net.neoforged.neoforge.items.wrapper.InvWrapper;
 import org.cyclops.cyclopscore.datastructure.DimPos;
 import org.cyclops.cyclopscore.inventory.SimpleInventory;
@@ -80,15 +80,15 @@ public INetworkElement createNetworkElement(Level world, BlockPos blockPos) {
     }
 
     @Override
-    public void read(CompoundTag tag, HolderLookup.Provider provider) {
-        super.read(tag, provider);
-        this.exposedDiskId = tag.getInt("exposedDiskId");
+    public void read(ValueInput input) {
+        super.read(input);
+        this.exposedDiskId = input.getInt("exposedDiskId").orElseThrow();
     }
 
     @Override
-    public void saveAdditional(CompoundTag tag, HolderLookup.Provider provider) {
-        super.saveAdditional(tag, provider);
-        tag.putInt("exposedDiskId", this.exposedDiskId);
+    public void saveAdditional(ValueOutput output) {
+        super.saveAdditional(output);
+        output.putInt("exposedDiskId", this.exposedDiskId);
     }
 
     public int getExposedDiskId() {

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

@@ -1,6 +1,5 @@
 package org.cyclops.integratedscripting.client.gui.component.input;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
@@ -9,9 +8,10 @@
 import net.minecraft.client.gui.narration.NarratedElementType;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.ARGB;
 import net.minecraft.util.FormattedCharSequence;
 import org.cyclops.cyclopscore.client.gui.component.button.ButtonText;
 import org.cyclops.cyclopscore.helper.IModHelpers;
@@ -49,12 +49,10 @@ public WidgetDialog(Font font, int x, int y, Screen parent,
 
     protected void drawBackground(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
         // Gray-out background
-        RenderSystem.setShaderColor(0F, 0F, 0F, 0.95F);
         guiGraphics.fill(0, 0, parent.width, parent.height, IModHelpers.get().getBaseHelpers().RGBAToInt(50, 50, 50, 100));
-        RenderSystem.setShaderColor(1, 1, 1, 1);
 
         // Draw dialog texture
-        guiGraphics.blit(RenderType::guiTextured, TEXTURE, getX(), getY(), 0, 0, WIDTH, HEIGHT, 256, 256);
+        guiGraphics.blit(RenderPipelines.GUI_TEXTURED, TEXTURE, getX(), getY(), 0, 0, WIDTH, HEIGHT, 256, 256);
     }
 
     @Override
@@ -64,9 +62,9 @@ protected void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, flo
         this.buttonConfirm.render(guiGraphics, mouseX, mouseY, partialTicks);
         this.buttonCancel.render(guiGraphics, mouseX, mouseY, partialTicks);
 
-        guiGraphics.drawCenteredString(font, title, this.getX() + this.width / 2, this.getY() + 4, 16777215);
+        guiGraphics.drawCenteredString(font, title, this.getX() + this.width / 2, this.getY() + 4, ARGB.opaque(16777215));
         FormattedCharSequence formattedcharsequence = message.getVisualOrderText();
-        guiGraphics.drawString(font, message, (this.getX() + this.width / 2 - font.width(formattedcharsequence) / 2), (this.getY() + 25), 4210752, false);
+        guiGraphics.drawString(font, message, (this.getX() + this.width / 2 - font.width(formattedcharsequence) / 2), (this.getY() + 25), ARGB.opaque(4210752), false);
     }
 
     @Override

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

@@ -16,13 +16,12 @@
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.BookEditScreen;
 import net.minecraft.client.renderer.Rect2i;
-import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.Style;
+import net.minecraft.util.ARGB;
 import net.minecraft.util.StringUtil;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.apache.commons.lang3.mutable.MutableInt;
@@ -52,7 +51,6 @@
  *
  * @author rubensworks
  */
-@OnlyIn(Dist.CLIENT)
 public class WidgetTextArea extends EditBox implements GuiEventListener {
 
     public static final int ROW_HEIGHT = 9;
@@ -441,7 +439,7 @@ public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float
         // Draw lines
         int lastLineNumber = -1;
         for(LineInfo line : lines) {
-            guiGraphics.drawString(this.font, line.asComponent, line.x, line.y - offsetY, -16777216, false);
+            guiGraphics.drawString(this.font, line.asComponent, line.x, line.y - offsetY, ARGB.opaque(-16777216), false);
             // Draw line number
             if (this.showLineNumbers && lastLineNumber != line.lineNumber) {
                 IModHelpers.get().getRenderHelpers().drawScaledString(
@@ -451,7 +449,7 @@ public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float
                         this.getX(),
                         line.y - offsetY + 2,
                         0.5f,
-                        line.hasCursor ? 0 : IModHelpers.get().getBaseHelpers().RGBToInt(120, 120, 120),
+                        line.hasCursor ? 0 : IModHelpers.get().getBaseHelpers().RGBAToInt(120, 120, 120, 255),
                         false,
                         Font.DisplayMode.NORMAL
                 );
@@ -477,7 +475,7 @@ private void renderCursor(GuiGraphics guiGraphics, Pos2i pos, boolean cursorAtEn
             if (!cursorAtEnd) {
                 guiGraphics.fill(pos.x, pos.y - 1, pos.x + 1, pos.y + 9, -16777216);
             } else {
-                guiGraphics.drawString(this.font, "_", pos.x, pos.y, 0);
+                guiGraphics.drawString(this.font, "_", pos.x, pos.y, ARGB.opaque(0));
             }
         }
 
@@ -489,7 +487,7 @@ private void renderHighlight(GuiGraphics guiGraphics, Rect2i[] highlightAreas) {
             int j = rect2i.getY();
             int k = i + rect2i.getWidth();
             int l = j + rect2i.getHeight();
-            guiGraphics.fill(RenderType.guiTextHighlight(), i, j, k, l, -16776961);
+            guiGraphics.fill(RenderPipelines.GUI_TEXT_HIGHLIGHT, i, j, k, l, -16776961);
         }
     }
 
@@ -636,7 +634,6 @@ private Rect2i createSelection(Pos2i p_98117_, Pos2i p_98118_) {
         return new Rect2i(i, k, j - i, l - k);
     }
 
-    @OnlyIn(Dist.CLIENT)
     static class DisplayCache {
         private final String fullText;
         @Nullable
@@ -699,7 +696,6 @@ public int findLineEnd(int p_98219_) {
         }
     }
 
-    @OnlyIn(Dist.CLIENT)
     static class LineInfo {
         final List<Pair<Style, String>> contentsStyled;
         final String contents;
@@ -725,7 +721,6 @@ public LineInfo(List<Pair<Style, String>> contentsStyled, int x, int y, int line
         }
     }
 
-    @OnlyIn(Dist.CLIENT)
     static class Pos2i {
         public final int x;
         public final int y;

src/main/java/org/cyclops/integratedscripting/client/gui/container/ContainerScreenScriptingDrive.java

@@ -3,6 +3,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.ARGB;
 import net.minecraft.world.entity.player.Inventory;
 import org.cyclops.cyclopscore.client.gui.container.ContainerScreenExtended;
 import org.cyclops.integratedscripting.Reference;
@@ -31,6 +32,6 @@ protected int getBaseYSize() {
     @Override
     protected void renderLabels(GuiGraphics guiGraphics, int x, int y) {
         // super.drawGuiContainerForegroundLayer(matrixStack, x, y);
-        guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false);
+        guiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, ARGB.opaque(4210752), false);
     }
 }