Merge pull request #712 from refinedmods/release/2.0.0-milestone.4.9

Release v2.0.0-milestone.4.9
refinedmods · Nov 1, 2024 · 237af4f · 237af4f
2 parents dd9d0bd + 8e9ead3
commit 237af4f
Show file tree

Hide file tree

Showing 264 changed files with 5,177 additions and 183 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,20 +7,42 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [2.0.0-milestone.4.9] - 2024-11-01
+
+### Added
+
+-   Autocrafter Manager
+-   You can now configure the view type of the Autocrafter Manager:
+    -   Visible (only show autocrafters that are configured to be visible to the Autocrafter Manager)
+    -   Not full (only show autocrafters that are not full yet)
+    -   All (show all autocrafters)
+
+### Changed
+
+-   The search field in the Autocrafter Manager can now search in:
+    -   Pattern inputs
+    -   Pattern outputs
+    -   Autocrafter names
+    -   All of the above (by default)
+-   Due to technical limitations and the new filtering options listed above being client-side only, you can no longer shift-click patterns in the Autocrafter Manager.
+-   In the Autocrafter, you can now configure whether it is visible to the Autocrafter Manager (by default it's visible).
+
 ## [2.0.0-milestone.4.8] - 2024-10-12
 
 ### Added
 
 -   Autocrafter
+    -   Note: autocrafting itself hasn't been implemented yet. This is the in-game content, but not the autocrafting engine itself yet. 
 -   The Relay now has support for propagating autocrafting when not in pass-through mode.
 
 ### Changed
 
+-   The Crafter has been renamed to "Autocrafter".
 -   Optimized memory usage and startup time of cable models. After updating, cables will appear disconnected, but this is only visual. Cause a block update to fix this.
 -   Optimized performance of searching in the Grid.
 -   Custom titles that overflow will now have a marquee effect instead, for every GUI.
--   You can now define a priority in the Crafter.
--   You can now change the name of a Crafter in the GUI.
+-   You can now define a priority in the Autocrafter.
+-   You can now change the name of a Autocrafter in the GUI.
 -   Changed "Crafter mode" to "Locking mode" with following options:
     -   Never
     -   Lock until redstone pulse is received
@@ -35,7 +57,6 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   The numbers on the crafting preview screen are now compacted with units.
 -   When requesting autocrafting multiple resources at once, which can happen via a recipe mod, all the crafting requests are now listed on the side of the GUI.
 -   You can now request autocrafting from the Storage Monitor if the resource count reaches zero.
--   The Crafter has been renamed to "Autocrafter".
 
 ### Fixed
 
@@ -775,7 +796,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.4.8...HEAD
+[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.9...HEAD
+
+[2.0.0-milestone.4.9]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.8...v2.0.0-milestone.4.9
 
 [2.0.0-milestone.4.8]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.7...v2.0.0-milestone.4.8
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,12 +21,3 @@ project.extensions.getByType<SonarExtension>().apply {
         )
     }
 }
-
-allprojects {
-    apply(plugin = "publishing")
-    publishing {
-        repositories {
-            mavenLocal()
-        }
-    }
-}
diff --git a/...tocrafting-api/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/Pattern.java b/...tocrafting-api/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/Pattern.java
@@ -8,5 +8,7 @@
 
 @API(status = API.Status.STABLE, since = "2.0.0-milestone.4.6")
 public interface Pattern {
+    Set<ResourceKey> getInputResources();
+
     Set<ResourceKey> getOutputResources();
 }
diff --git a/...ting-api/src/test/java/com/refinedmods/refinedstorage/api/autocrafting/SimplePattern.java b/...ting-api/src/test/java/com/refinedmods/refinedstorage/api/autocrafting/SimplePattern.java
@@ -11,6 +11,11 @@ class SimplePattern implements Pattern {
         this.outputs = Set.of(outputs);
     }
 
+    @Override
+    public Set<ResourceKey> getInputResources() {
+        return Set.of();
+    }
+
     @Override
     public Set<ResourceKey> getOutputResources() {
         return outputs;

diff --git a/...api/src/main/java/com/refinedmods/refinedstorage/common/api/autocrafting/Autocrafter.java b/...api/src/main/java/com/refinedmods/refinedstorage/common/api/autocrafting/Autocrafter.java
@@ -0,0 +1,17 @@
+package com.refinedmods.refinedstorage.common.api.autocrafting;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.Container;
+import org.apiguardian.api.API;
+
+@API(status = API.Status.STABLE, since = "2.0.0-milestone.4.9")
+public interface Autocrafter {
+    Component getAutocrafterName();
+
+    Container getPatternContainer();
+
+    boolean isVisibleToTheAutocrafterManager();
+
+    BlockPos getLocalPosition();
+}
diff --git a/...main/java/com/refinedmods/refinedstorage/common/api/autocrafting/PatternProviderItem.java b/...main/java/com/refinedmods/refinedstorage/common/api/autocrafting/PatternProviderItem.java
@@ -12,6 +12,11 @@
 
 @API(status = API.Status.STABLE, since = "2.0.0-milestone.4.6")
 public interface PatternProviderItem {
+    static boolean isValid(final ItemStack stack, final Level level) {
+        return stack.getItem() instanceof PatternProviderItem patternProviderItem
+            && patternProviderItem.getPattern(stack, level).isPresent();
+    }
+
     @Nullable
     UUID getId(ItemStack stack);
 

diff --git a/...common/src/generated/resources/assets/refinedstorage/blockstates/autocrafter_manager.json b/...common/src/generated/resources/assets/refinedstorage/blockstates/autocrafter_manager.json
@@ -0,0 +1,110 @@
+{
+  "variants": {
+    "active=false,direction=down_east": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": 90,
+      "y": -90
+    },
+    "active=false,direction=down_north": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": 90
+    },
+    "active=false,direction=down_south": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": 90,
+      "y": 180
+    },
+    "active=false,direction=down_west": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": 90,
+      "y": 90
+    },
+    "active=false,direction=east": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "y": 90
+    },
+    "active=false,direction=north": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive"
+    },
+    "active=false,direction=south": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "y": 180
+    },
+    "active=false,direction=up_east": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": -90,
+      "y": -90
+    },
+    "active=false,direction=up_north": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": -90,
+      "y": 180
+    },
+    "active=false,direction=up_south": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": -90
+    },
+    "active=false,direction=up_west": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": -90,
+      "y": 90
+    },
+    "active=false,direction=west": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "y": 270
+    },
+    "active=true,direction=down_east": {
+      "model": "refinedstorage:block/autocrafter_manager/light_blue",
+      "x": 90,
+      "y": -90
+    },
+    "active=true,direction=down_north": {
+      "model": "refinedstorage:block/autocrafter_manager/light_blue",
+      "x": 90
+    },
+    "active=true,direction=down_south": {
+      "model": "refinedstorage:block/autocrafter_manager/light_blue",
+      "x": 90,
+      "y": 180
+    },
+    "active=true,direction=down_west": {
+      "model": "refinedstorage:block/autocrafter_manager/light_blue",
+      "x": 90,
+      "y": 90
+    },
+    "active=true,direction=east": {
+      "model": "refinedstorage:block/autocrafter_manager/light_blue",
+      "y": 90
+    },
+    "active=true,direction=north": {
+      "model": "refinedstorage:block/autocrafter_manager/light_blue"
+    },
+    "active=true,direction=south": {
+      "model": "refinedstorage:block/autocrafter_manager/light_blue",
+      "y": 180
+    },
+    "active=true,direction=up_east": {
+      "model": "refinedstorage:block/autocrafter_manager/light_blue",
+      "x": -90,
+      "y": -90
+    },
+    "active=true,direction=up_north": {
+      "model": "refinedstorage:block/autocrafter_manager/light_blue",
+      "x": -90,
+      "y": 180
+    },
+    "active=true,direction=up_south": {
+      "model": "refinedstorage:block/autocrafter_manager/light_blue",
+      "x": -90
+    },
+    "active=true,direction=up_west": {
+      "model": "refinedstorage:block/autocrafter_manager/light_blue",
+      "x": -90,
+      "y": 90
+    },
+    "active=true,direction=west": {
+      "model": "refinedstorage:block/autocrafter_manager/light_blue",
+      "y": 270
+    }
+  }
+}
diff --git a/.../src/generated/resources/assets/refinedstorage/blockstates/black_autocrafter_manager.json b/.../src/generated/resources/assets/refinedstorage/blockstates/black_autocrafter_manager.json
@@ -0,0 +1,110 @@
+{
+  "variants": {
+    "active=false,direction=down_east": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": 90,
+      "y": -90
+    },
+    "active=false,direction=down_north": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": 90
+    },
+    "active=false,direction=down_south": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": 90,
+      "y": 180
+    },
+    "active=false,direction=down_west": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": 90,
+      "y": 90
+    },
+    "active=false,direction=east": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "y": 90
+    },
+    "active=false,direction=north": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive"
+    },
+    "active=false,direction=south": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "y": 180
+    },
+    "active=false,direction=up_east": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": -90,
+      "y": -90
+    },
+    "active=false,direction=up_north": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": -90,
+      "y": 180
+    },
+    "active=false,direction=up_south": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": -90
+    },
+    "active=false,direction=up_west": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "x": -90,
+      "y": 90
+    },
+    "active=false,direction=west": {
+      "model": "refinedstorage:block/autocrafter_manager/inactive",
+      "y": 270
+    },
+    "active=true,direction=down_east": {
+      "model": "refinedstorage:block/autocrafter_manager/black",
+      "x": 90,
+      "y": -90
+    },
+    "active=true,direction=down_north": {
+      "model": "refinedstorage:block/autocrafter_manager/black",
+      "x": 90
+    },
+    "active=true,direction=down_south": {
+      "model": "refinedstorage:block/autocrafter_manager/black",
+      "x": 90,
+      "y": 180
+    },
+    "active=true,direction=down_west": {
+      "model": "refinedstorage:block/autocrafter_manager/black",
+      "x": 90,
+      "y": 90
+    },
+    "active=true,direction=east": {
+      "model": "refinedstorage:block/autocrafter_manager/black",
+      "y": 90
+    },
+    "active=true,direction=north": {
+      "model": "refinedstorage:block/autocrafter_manager/black"
+    },
+    "active=true,direction=south": {
+      "model": "refinedstorage:block/autocrafter_manager/black",
+      "y": 180
+    },
+    "active=true,direction=up_east": {
+      "model": "refinedstorage:block/autocrafter_manager/black",
+      "x": -90,
+      "y": -90
+    },
+    "active=true,direction=up_north": {
+      "model": "refinedstorage:block/autocrafter_manager/black",
+      "x": -90,
+      "y": 180
+    },
+    "active=true,direction=up_south": {
+      "model": "refinedstorage:block/autocrafter_manager/black",
+      "x": -90
+    },
+    "active=true,direction=up_west": {
+      "model": "refinedstorage:block/autocrafter_manager/black",
+      "x": -90,
+      "y": 90
+    },
+    "active=true,direction=west": {
+      "model": "refinedstorage:block/autocrafter_manager/black",
+      "y": 270
+    }
+  }
+}