Merge pull request #31 from refinedmods/release/0.4.0

Release v0.4.0
refinedmods · Oct 12, 2024 · 83aa69f · 83aa69f
2 parents 3e33fbe + d75ee71
commit 83aa69f
Show file tree

Hide file tree

Showing 33 changed files with 634 additions and 222 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
     types: [ opened, synchronize, reopened ]
 jobs:
   build:
-    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.19.1
     with:
       mutation-testing: false
     secrets: inherit
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
@@ -17,7 +17,7 @@ on:
         type: string
 jobs:
   draft:
-    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.19.1
     with:
       release-type: ${{ inputs.release-type }}
       version-number-override: ${{ inputs.version-number-override }}

diff --git a/.github/workflows/issue-for-unsupported-version.yml b/.github/workflows/issue-for-unsupported-version.yml
@@ -4,4 +4,4 @@ on:
     types: [ labeled, unlabeled, reopened ]
 jobs:
   unsupported-labeler:
-    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.19.1
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -7,7 +7,7 @@ on:
       - closed
 jobs:
   publish-release:
-    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.19.1
     secrets: inherit
     with:
       project-name: 'Refined Storage - REI Integration'

diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml
@@ -4,4 +4,4 @@ on:
     - cron: '0 0 * * *'
 jobs:
   lock:
-    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.19.1
diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml
@@ -2,4 +2,4 @@ name: Validate branch name
 on: [ pull_request ]
 jobs:
   validate-branch-name:
-    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.19.1
diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml
@@ -4,4 +4,4 @@ on:
     types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ]
 jobs:
   validate-changelog:
-    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.19.1
diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml
@@ -2,4 +2,4 @@ name: Validate commit messages
 on: [ pull_request ]
 jobs:
   validate-commit-messages:
-    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.17.1
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.19.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,17 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.4.0] - 2024-10-12
+
+### Added
+
+-   The recipe transfer support in the Pattern Grid and Crafting Grid now indicates whether all or some resources are autocraftable.
+-   You can now start autocrafting for missing autocraftable items from the Crafting Grid via the recipe transfer.
+
+### Fixed
+
+-   Support for Refined Storage v2.0.0-milestone.4.8.
+
 ## [0.3.1] - 2024-08-11
 
 ### Fixed
@@ -69,7 +80,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   Support for REI collapsable entries.
 -   Grid / REI search box synchronization options.
 
-[Unreleased]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.3.1...HEAD
+[Unreleased]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.4.0...HEAD
+
+[0.4.0]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.3.1...v0.4.0
 
 [0.3.1]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.3.0...v0.3.1
 

diff --git a/README.md b/README.md
@@ -24,7 +24,6 @@ Adds support for:
 - [Crowdin](https://crowdin.com/project/refined-storage-rei-integration)
 - [Discord](https://discordapp.com/invite/VYzsydb)
 - [Twitter](https://twitter.com/refinedmods)
-- [Mastodon](https://anvil.social/@refinedmods)
 
 ## Building
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,13 @@
-refinedarchitectVersion=0.17.1
-refinedstorageVersion=2.0.0-milestone.4.7
+refinedarchitectVersion=0.19.1
+refinedstorageVersion=2.0.0-milestone.4.8
 # https://linkie.shedaniel.dev/dependencies?loader=neoforge&version=1.21
 # https://linkie.shedaniel.dev/dependencies?loader=fabric&version=1.21
 architecturyVersion=13.0.3
 clothConfigVersion=15.0.127
 reiVersion=16.0.729
 # Gradle
 org.gradle.jvmargs=-Xmx1G
+org.gradle.configureondemand=true
+org.gradle.caching=true
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.problems=warn
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/...tegration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/en_us.json b/...tegration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/en_us.json
@@ -3,5 +3,11 @@
   "gui.refinedstorage_rei_integration.grid.synchronizer.help": "Sync the search box text to the REI filter.",
   "gui.refinedstorage_rei_integration.grid.synchronizer.two_way": "REI two-way",
   "gui.refinedstorage_rei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the REI filter, and the REI filter to the search box text.",
-  "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers"
+  "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers",
+  "gui.refinedstorage_rei_integration.transfer.missing": "Missing items",
+  "gui.refinedstorage_rei_integration.transfer.missing_but_all_autocraftable": "Missing items, all are autocraftable",
+  "gui.refinedstorage_rei_integration.transfer.missing_but_some_autocraftable": "Missing items, some are autocraftable",
+  "gui.refinedstorage_rei_integration.transfer.ctrl_click_to_autocraft": "CTRL + click to autocraft",
+  "gui.refinedstorage_rei_integration.transfer.all_autocraftable": "All are autocraftable",
+  "gui.refinedstorage_rei_integration.transfer.some_autocraftable": "Some are autocraftable"
 }
diff --git a/refinedstorage-rei-integration-fabric/build.gradle.kts b/refinedstorage-rei-integration-fabric/build.gradle.kts
@@ -23,7 +23,6 @@ repositories {
 refinedarchitect {
     modId = "refinedstorage_rei_integration"
     fabric()
-    compileWithProject(project(":refinedstorage-rei-integration-common"))
     publishing {
         maven = true
     }
@@ -38,7 +37,13 @@ val architecturyVersion: String by project
 val clothConfigVersion: String by project
 val reiVersion: String by project
 
+val commonJava by configurations.existing
+val commonResources by configurations.existing
+
 dependencies {
+    compileOnly(project(":refinedstorage-rei-integration-common"))
+    commonJava(project(path = ":refinedstorage-rei-integration-common", configuration = "commonJava"))
+    commonResources(project(path = ":refinedstorage-rei-integration-common", configuration = "commonResources"))
     modApi("com.refinedmods.refinedstorage:refinedstorage-fabric:${refinedstorageVersion}")
     modApi("dev.architectury:architectury-fabric:${architecturyVersion}")
     modApi("me.shedaniel.cloth:cloth-config-fabric:${clothConfigVersion}")

diff --git a/...bric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/AbstractTransferHandler.java b/...bric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/AbstractTransferHandler.java
@@ -0,0 +1,34 @@
+package com.refinedmods.refinedstorage.rei.fabric;
+
+import com.refinedmods.refinedstorage.common.grid.AutocraftableResourceHint;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import me.shedaniel.math.Rectangle;
+import me.shedaniel.rei.api.client.gui.widgets.Slot;
+import me.shedaniel.rei.api.client.registry.transfer.TransferHandler;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+
+abstract class AbstractTransferHandler implements TransferHandler {
+    protected static final int AUTOCRAFTABLE_COLOR = AutocraftableResourceHint.AUTOCRAFTABLE.getColor();
+
+    protected static MutableComponent createAutocraftableHint(final Component component) {
+        return component.copy().withColor(AUTOCRAFTABLE_COLOR);
+    }
+
+    protected static void renderSlotHighlight(final GuiGraphics graphics, final Slot slot, final int color) {
+        final PoseStack poseStack = graphics.pose();
+        poseStack.pushPose();
+        poseStack.translate(0, 0, 50);
+        final Rectangle innerBounds = slot.getInnerBounds();
+        graphics.fill(
+            innerBounds.x,
+            innerBounds.y,
+            innerBounds.getMaxX(),
+            innerBounds.getMaxY(),
+            color
+        );
+        poseStack.popPose();
+    }
+}