Update to MC 1.21.8

Author: rubensworks

.github/workflows/ci.yml

@@ -53,12 +53,9 @@ jobs:
           GITHUB_USER: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: 'Test'
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-        if: ${{ env.COVERALLS_REPO_TOKEN }}
-        run: ./gradlew test jacocoTestReport coveralls
-      - name: 'Game Test'
-        run: ./gradlew runGameTestServer
+        run: ./gradlew test runGameTestServer jacocoTestReport
+      - name: 'Submit coverage results'
+        uses: coverallsapp/github-action@v2
       - name: 'Deploy as GitHub CI artifacts'
         uses: actions/upload-artifact@v4
         with:

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-	id 'net.neoforged.gradle.userdev' version '7.0.180'
-    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.integratedterminals
 java_version=21
 
 # Common
-minecraft_version=1.21.4
+minecraft_version=1.21.8
 mod_name=IntegratedTerminals
 mod_author=rubensworks (aka kroeser)
 mod_id=integratedterminals
@@ -15,13 +15,13 @@ display_url=https://www.curseforge.com/minecraft/mc-mods/integrated-terminals
 description=Terminals for managing and overviewing Integrated Dynamics networks.
 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=295910
 modrinth_project_id=HmLJoQ1K
 
 # 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-terminals.json
 
@@ -31,8 +31,8 @@ org.gradle.daemon=false
 org.gradle.caching=true
 
 # Dependencies
-cyclopscore_version=1.25.5-704
-integrateddynamics_version=1.24.1-1059
+cyclopscore_version=1.25.5-800
+integrateddynamics_version=1.24.1-1299
 integratedterminalscompat_version=1.0.0-99
-integratedcrafting_version=1.1.13-289
-commoncapabilities_version=2.9.7-194
+integratedcrafting_version=1.1.13-346
+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/integratedterminals/IntegratedTerminals.java

@@ -2,8 +2,6 @@
 
 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.fml.common.Mod;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
@@ -125,7 +123,6 @@ public void onConfigsRegister(ConfigHandlerCommon configHandler) {
     }
 
     @Override
-    @OnlyIn(Dist.CLIENT)
     protected IClientProxy constructClientProxy() {
         return new ClientProxy();
     }

src/main/java/org/cyclops/integratedterminals/api/ingredient/IIngredientComponentTerminalStorageHandler.java

@@ -1,25 +1,18 @@
 package org.cyclops.integratedterminals.api.ingredient;
 
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.network.chat.Component;
-import net.minecraft.ChatFormatting;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
 import org.cyclops.commoncapabilities.api.ingredient.IIngredientMatcher;
 import org.cyclops.commoncapabilities.api.ingredient.IngredientComponent;
 import org.cyclops.commoncapabilities.api.ingredient.storage.IIngredientComponentStorage;
-import org.cyclops.integratedterminals.client.gui.container.ContainerScreenTerminalStorage;
-import org.cyclops.integratedterminals.core.terminalstorage.query.SearchMode;
 
 import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.List;
-import java.util.function.Predicate;
 
 /**
  * Capability for displaying and interacting with ingredient components of a certain type in the storage terminal.
@@ -29,6 +22,8 @@
  */
 public interface IIngredientComponentTerminalStorageHandler<T, M> {
 
+    public IIngredientComponentTerminalStorageHandlerClient<T, M> getClient();
+
     /**
      * @return The ingredient component.
      */
@@ -39,25 +34,6 @@ public interface IIngredientComponentTerminalStorageHandler<T, M> {
      */
     public ItemStack getIcon();
 
-    /**
-     * Draw the given instance in the given gui.
-     * @param guiGraphics The matrix stack.
-     * @param instance An instance.
-     * @param maxQuantity The maximum allowed quantity of the given instance.
-     * @param label An optional label that should be rendered instead of the quantity.
-     * @param gui A gui to render in.
-     * @param layer The layer to render in.
-     * @param partialTick The partial tick.
-     * @param x The slot X position.
-     * @param y The slot Y position.
-     * @param mouseX The mouse X position.
-     * @param mouseY The mouse Y position.
-     * @param additionalTooltipLines The additional tooltip lines to add.
-     */
-    @OnlyIn(Dist.CLIENT)
-    public void drawInstance(GuiGraphics guiGraphics, T instance, long maxQuantity, @Nullable String label, AbstractContainerScreen gui, ContainerScreenTerminalStorage.DrawLayer layer, float partialTick, int x, int y,
-                             int mouseX, int mouseY, @Nullable List<Component> additionalTooltipLines);
-
     /**
      * Show the quantity of the given instance on the second tooltip line.
      * @param lines Tooltip lines
@@ -191,15 +167,6 @@ public default void insertMaxIntoContainer(IIngredientComponentStorage<T, M> sto
      */
     public void drainActivePlayerStackQuantity(Inventory playerInventory, AbstractContainerMenu container, long quantity);
 
-    /**
-     * Get a predicate for matching instances that apply to the given query string.
-     * @param searchMode The mode to search under
-     * @param query A query string.
-     * @return An instance matcher.
-     */
-    @OnlyIn(Dist.CLIENT)
-    public Predicate<T> getInstanceFilterPredicate(SearchMode searchMode, String query);
-
     /**
      * @return The available sorters.
      */

src/main/java/org/cyclops/integratedterminals/api/ingredient/IIngredientComponentTerminalStorageHandlerClient.java

@@ -0,0 +1,44 @@
+package org.cyclops.integratedterminals.api.ingredient;
+
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.network.chat.Component;
+import org.cyclops.integratedterminals.client.gui.container.ContainerScreenTerminalStorage;
+import org.cyclops.integratedterminals.core.terminalstorage.query.SearchMode;
+
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.function.Predicate;
+
+/**
+ * @author rubensworks
+ */
+public interface IIngredientComponentTerminalStorageHandlerClient<T, M> {
+
+    /**
+     * Draw the given instance in the given gui.
+     * @param guiGraphics The matrix stack.
+     * @param instance An instance.
+     * @param maxQuantity The maximum allowed quantity of the given instance.
+     * @param label An optional label that should be rendered instead of the quantity.
+     * @param gui A gui to render in.
+     * @param layer The layer to render in.
+     * @param partialTick The partial tick.
+     * @param x The slot X position.
+     * @param y The slot Y position.
+     * @param mouseX The mouse X position.
+     * @param mouseY The mouse Y position.
+     * @param additionalTooltipLines The additional tooltip lines to add.
+     */
+    public void drawInstance(GuiGraphics guiGraphics, T instance, long maxQuantity, @Nullable String label, AbstractContainerScreen gui, ContainerScreenTerminalStorage.DrawLayer layer, float partialTick, int x, int y,
+                             int mouseX, int mouseY, @Nullable List<Component> additionalTooltipLines);
+
+    /**
+     * Get a predicate for matching instances that apply to the given query string.
+     * @param searchMode The mode to search under
+     * @param query A query string.
+     * @return An instance matcher.
+     */
+    public Predicate<T> getInstanceFilterPredicate(SearchMode searchMode, String query);
+
+}

src/main/java/org/cyclops/integratedterminals/api/ingredient/IIngredientInstanceSorter.java

@@ -1,10 +1,8 @@
 package org.cyclops.integratedterminals.api.ingredient;
 
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.network.chat.Component;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.TooltipFlag;
 import org.cyclops.cyclopscore.client.gui.image.IImage;
 
 import java.util.Comparator;
@@ -37,7 +35,6 @@ public interface IIngredientInstanceSorter<T> extends Comparator<T> {
      * @param tooltipFlag The tooltip flag.
      * @param lines The tooltip lines.
      */
-    @OnlyIn(Dist.CLIENT)
     public void getTooltip(Player player, TooltipFlag tooltipFlag, List<Component> lines);
 
 }

src/main/java/org/cyclops/integratedterminals/api/terminalstorage/ITerminalButton.java

@@ -1,13 +1,10 @@
 package org.cyclops.integratedterminals.api.terminalstorage;
 
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.network.chat.Component;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.TooltipFlag;
 
-import javax.annotation.Nullable;
 import java.util.List;
 
 /**
@@ -16,6 +13,8 @@
 public interface ITerminalButton<C extends ITerminalStorageTabClient,
         O extends ITerminalStorageTabCommon, B extends Button> {
 
+    public ITerminalButtonClient<C, O, B> getClient();
+
     /**
      * Reload the button's visual representation based on the container's state.
      */
@@ -56,26 +55,6 @@ public default boolean isInLeftColumn() {
         return true;
     }
 
-    /**
-     * Create a gui button for displaying this button.
-     * @param x The button X position.
-     * @param y The button Y position.
-     * @return The gui button.
-     */
-    @OnlyIn(Dist.CLIENT)
-    public B createButton(int x, int y);
-
-    /**
-     * Callback for when the gui button has been clicked.
-     * @param clientTab The client tab in which the button was clicked.
-     * @param commonTab The common tab in which the button was clicked.
-     * @param guiButton The gui button.
-     * @param channel The active channel.
-     * @param mouseButton The mouse button that was used to click with.
-     */
-    @OnlyIn(Dist.CLIENT)
-    public void onClick(C clientTab, @Nullable O commonTab, B guiButton, int channel, int mouseButton);
-
     /**
      * @return The unlocalized name
      */
@@ -87,6 +66,5 @@ public default boolean isInLeftColumn() {
      * @param tooltipFlag The tooltip flag.
      * @param lines The tooltip lines.
      */
-    @OnlyIn(Dist.CLIENT)
     public void getTooltip(Player player, TooltipFlag tooltipFlag, List<Component> lines);
 }

src/main/java/org/cyclops/integratedterminals/api/terminalstorage/ITerminalButtonClient.java

@@ -0,0 +1,31 @@
+package org.cyclops.integratedterminals.api.terminalstorage;
+
+import net.minecraft.client.gui.components.Button;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author rubensworks
+ */
+public interface ITerminalButtonClient<C extends ITerminalStorageTabClient,
+        O extends ITerminalStorageTabCommon, B extends Button> {
+
+    /**
+     * Create a gui button for displaying this button.
+     * @param x The button X position.
+     * @param y The button Y position.
+     * @return The gui button.
+     */
+    public B createButton(int x, int y);
+
+    /**
+     * Callback for when the gui button has been clicked.
+     * @param clientTab The client tab in which the button was clicked.
+     * @param commonTab The common tab in which the button was clicked.
+     * @param guiButton The gui button.
+     * @param channel The active channel.
+     * @param mouseButton The mouse button that was used to click with.
+     */
+    public void onClick(C clientTab, @Nullable O commonTab, B guiButton, int channel, int mouseButton);
+
+}