Merge pull request #349 from refinedmods/release/2.0.0-milestone.2.8

Release v2.0.0-milestone.2.8

.github/CONTRIBUTING.md

@@ -257,7 +257,7 @@ with `refinedstorage2-platform-*` have dependencies on Minecraft.
 | `refinedstorage2-resource-api`    | ✔️            | Contains API for handling resources.                                                  |
 | `refinedstorage2-storage-api`     | ✔️            | Contains storage related functionality.                                               |
 | `refinedstorage2-platform-api`    | ✔️            | Implements the various Refined Storage API modules for use in Minecraft.              |
+| `refinedstorage2-platform-test`   | ✔️             | This module is used in platform tests for various Minecraft related helpers.          |
 | `refinedstorage2-platform-fabric` | ❌             | The platform module for Fabric. This module contains Fabric specific code.            |
 | `refinedstorage2-platform-forge`  | ❌             | The platform module for Forge. This module contains Forge specific code.              |
 | `refinedstorage2-platform-common` | ❌             | Common mod code. Most gameplay code is in here.                                       |
-| `refinedstorage2-platform-test`   | ❌             | This module is used in platform tests for various Minecraft related helpers.          |

.github/workflows/publish-release.yml

@@ -141,6 +141,18 @@ jobs:
           access-token: ${{ secrets.TWITTER_ACCESS_TOKEN }}
           access-token-secret: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
 
+  announce-mastodon:
+    name: Announce to Mastodon
+    runs-on: ubuntu-latest
+    needs: [ deploy-github-releases, extract-version-number ]
+    steps:
+      - name: Announce to Mastodon
+        uses: rzr/fediverse-action@master
+        with:
+          access-token: ${{ secrets.MASTODON_TOKEN }}
+          host: 'anvil.social'
+          message: "Refined Storage v${{ needs.extract-version-number.outputs.version }} has been released! ${{ needs.deploy-github-releases.outputs.release-url }}"
+
   sync-develop:
     name: Sync develop
     runs-on: ubuntu-latest

.gitignore

@@ -16,3 +16,4 @@ refinedstorage2-platform-forge/run/
 out/
 /bin/
 logs/
+.cache/

CHANGELOG.md

@@ -7,6 +7,40 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [2.0.0-milestone.2.8] - 2023-03-04
+
+### Fixed
+
+-   Fixed Disk Drive having 9 slots instead of 8.
+-   Fixed slow world loading.
+
+### Added
+
+-   The upgrade slots now show their supported upgrades.
+-   Different Cable colors. They only connect to same colored cables or the default cable.
+-   Colored variant of exporters, importers and external storages. They connect the same way as colored cables.
+-   Support for using the R/U keys in JEI and REI on Grid slots and filtering slots
+-   Crafting Grid.
+-   JEI and REI recipe transfer integration for the Crafting Grid.
+-   The crafting matrix in the Crafting Grid now has a button and keybinding to clear to the player inventory.
+    The keybinding is only available on Forge.
+-   A config option to clear items from the Crafting Grid crafting matrix to the player or network inventory.
+-   Support for collapsable entries for REI.
+-   Pressing CTRL + SHIFT on the crafting result slot filters the Grid view based on the items in the crafting matrix.
+    The reason for this is that you can quickly see how much you have left in the storage network.
+
+### Changed
+
+-   The button to clear to the network inventory next to the crafting matrix in the Crafting Grid is now disabled if
+    the Crafting Grid is inactive.
+-   The keybinding to clear the Crafting Grid matrix to the network inventory is only available on Forge.
+-   The JEI recipe transfer integration for the Crafting Grid now only supports regular crafting recipes.
+-   Decreased amount of logging to the info level. Now most logging happens on the debug level.
+
+### Removed
+
+-   Removed amount of stacks and max stacks stored on item storage tooltips.
+
 ## [2.0.0-milestone.2.7] - 2023-01-31
 
 ### Added
@@ -294,7 +328,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   The Grid can now use smooth scrolling.
 -   The Grid now has syntax highlighting for the search query.
 
-[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.2.7...HEAD
+[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.2.8...HEAD
+
+[2.0.0-milestone.2.8]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.2.7...v2.0.0-milestone.2.8
 
 [2.0.0-milestone.2.7]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.2.6...v2.0.0-milestone.2.7
 

build.gradle

@@ -80,29 +80,36 @@ subprojects {
         }
     }
 
-    apply plugin: "maven-publish"
-    publishing {
-        repositories {
-            maven {
-                name = "GitHubPackages"
-                url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
-                credentials {
-                    username = System.getenv("GITHUB_ACTOR")
-                    password = System.getenv("GITHUB_TOKEN")
+    if (!(project.name in [
+            'refinedstorage2-platform-common',
+            'refinedstorage2-platform-fabric',
+            'refinedstorage2-platform-forge',
+            'refinedstorage2-network'
+    ])) {
+        apply plugin: "maven-publish"
+        publishing {
+            repositories {
+                maven {
+                    name = "GitHubPackages"
+                    url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2")
+                    credentials {
+                        username = System.getenv("GITHUB_ACTOR")
+                        password = System.getenv("GITHUB_TOKEN")
+                    }
                 }
-            }
-            maven {
-                name = "CreeperHost"
-                url = uri("https://maven.creeperhost.net/release")
-                credentials {
-                    username = System.getenv("CREEPERHOST_MAVEN_USERNAME")
-                    password = System.getenv("CREEPERHOST_MAVEN_TOKEN")
+                maven {
+                    name = "CreeperHost"
+                    url = uri("https://maven.creeperhost.net/release")
+                    credentials {
+                        username = System.getenv("CREEPERHOST_MAVEN_USERNAME")
+                        password = System.getenv("CREEPERHOST_MAVEN_TOKEN")
+                    }
                 }
             }
-        }
-        publications {
-            gpr(MavenPublication) {
-                from(components.java)
+            publications {
+                gpr(MavenPublication) {
+                    from(components.java)
+                }
             }
         }
     }
@@ -113,8 +120,14 @@ subprojects {
 }
 
 task allJavadoc(type: Javadoc) {
-    source subprojects*.sourceSets.main.allJava
-    classpath += files(subprojects*.sourceSets.main.compileClasspath)
+    // platform modules (besides API) doesn't need Javadoc.
+    // For Fabric it even fails due to a mixin target being private.
+    def projects = getSubprojects()
+            .stream()
+            .filter { p -> p.name != "refinedstorage2-platform-fabric" && p.name != "refinedstorage2-platform-forge" && p.name != "refinedstorage2-platform-common" }
+            .toList()
+    source projects*.sourceSets.main.allJava
+    classpath += files(projects*.sourceSets.main.compileClasspath)
     destinationDir = file("build/docs/javadoc")
 }
 
@@ -144,7 +157,7 @@ sonarqube {
         property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/codeCoverageReport/codeCoverageReport.xml"
         // These project have less tests because they depend on Minecraft a lot, making it difficult to test.
         property "sonar.coverage.exclusions", "refinedstorage2-platform-forge/**/*,refinedstorage2-platform-fabric/**/*,refinedstorage2-platform-common/**/*,refinedstorage2-platform-api/**/*"
-        // JEI/REI code is duplicated as reusing it in a common module isn't possible/too difficult.
-        property "sonar.cpd.exclusions", "refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/integration/jei/*,refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/integration/rei/*,refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/integration/jei/*,refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/integration/rei/*"
+        // TODO: REI code is duplicated as reusing it in a common module isn't possible/too difficult. Fix this.
+        property "sonar.cpd.exclusions", "refinedstorage2-platform-forge/src/main/java/com/refinedmods/refinedstorage2/platform/forge/integration/recipemod/rei/*,refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/integration/recipemod/rei/*"
     }
 }

refinedstorage2-core-api/build.gradle

@@ -1,7 +1,11 @@
+plugins {
+    id 'java-library'
+}
+
 archivesBaseName = 'refinedstorage2-core-api'
 
 dependencies {
-    implementation libs.apiguardian
+    api libs.apiguardian
     testImplementation testLibs.junit.api
     testImplementation testLibs.junit.params
     testRuntimeOnly testLibs.junit.engine

refinedstorage2-grid-api/build.gradle

@@ -1,7 +1,11 @@
+plugins {
+    id 'java-library'
+}
+
 archivesBaseName = 'refinedstorage2-grid-api'
 
 dependencies {
-    implementation libs.apiguardian
+    api libs.apiguardian
     implementation libs.slf4j.api
     testImplementation testLibs.junit.api
     testImplementation testLibs.junit.params

refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridView.java

@@ -1,5 +1,6 @@
 package com.refinedmods.refinedstorage2.api.grid.view;
 
+import com.refinedmods.refinedstorage2.api.resource.list.ResourceList;
 import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource;
 
 import java.util.List;
@@ -34,8 +35,9 @@ public interface GridView {
 
     /**
      * @param predicate the filter
+     * @return the previous filtering predicate
      */
-    void setFilterAndSort(Predicate<GridResource> predicate);
+    Predicate<GridResource> setFilterAndSort(Predicate<GridResource> predicate);
 
     /**
      * Preventing sorting means that the changes will still arrive at the backing list and view list, but,
@@ -82,5 +84,10 @@ public interface GridView {
     /**
      * @return the view list
      */
-    List<GridResource> getAll();
+    List<GridResource> getViewList();
+
+    /**
+     * @return a copy of the backing list
+     */
+    ResourceList<Object> copyBackingList();
 }

refinedstorage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/view/GridViewImpl.java

@@ -3,6 +3,7 @@
 import com.refinedmods.refinedstorage2.api.core.CoreValidations;
 import com.refinedmods.refinedstorage2.api.resource.ResourceAmount;
 import com.refinedmods.refinedstorage2.api.resource.list.ResourceList;
+import com.refinedmods.refinedstorage2.api.resource.list.ResourceListImpl;
 import com.refinedmods.refinedstorage2.api.resource.list.ResourceListOperationResult;
 import com.refinedmods.refinedstorage2.api.storage.tracked.TrackedResource;
 
@@ -69,9 +70,11 @@ public void setSortingType(final GridSortingType sortingType) {
     }
 
     @Override
-    public void setFilterAndSort(final Predicate<GridResource> predicate) {
+    public Predicate<GridResource> setFilterAndSort(final Predicate<GridResource> predicate) {
+        final Predicate<GridResource> previousPredicate = filter;
         this.filter = predicate;
         sort();
+        return previousPredicate;
     }
 
     @Override
@@ -237,7 +240,14 @@ private Comparator<GridResource> getComparator() {
     }
 
     @Override
-    public List<GridResource> getAll() {
+    public List<GridResource> getViewList() {
         return viewList;
     }
+
+    @Override
+    public ResourceList<Object> copyBackingList() {
+        final ResourceList<Object> copy = new ResourceListImpl<>();
+        backingList.getAll().forEach(copy::add);
+        return copy;
+    }
 }