Merge pull request #636 from refinedmods/feat/GH-104/pattern-grid

feat: pattern grid and pattern
refinedmods · Jul 29, 2024 · 112ec9f · 112ec9f
2 parents ba0ab59 + 81e91ac
commit 112ec9f
Show file tree

Hide file tree

Showing 267 changed files with 5,723 additions and 171 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,22 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Added
+
+-   Pattern Grid
+-   Pattern
+
+### Changed
+
+-   The Pattern now shows the crafting recipe in the tooltip.
+-   When a Pattern is created for a crafting recipe, the Pattern will have a different texture and name to differentiate between empty patterns.
+-   The Pattern Grid now has support for more pattern types.
+
+### Fixed
+
+-   Clicking on a scrollbar no longer makes a clicking sound.
+-   Incorrect and outdated (mentioning NBT tags) help explanations for fuzzy mode.
+
 ## [2.0.0-milestone.4.5] - 2024-07-26
 
 ### Added

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,12 +21,3 @@ project.extensions.getByType<SonarExtension>().apply {
         )
     }
 }
-
-allprojects {
-    apply(plugin = "maven-publish")
-    publishing {
-        repositories {
-            mavenLocal()
-        }
-    }
-}
diff --git a/...common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApi.java b/...common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApi.java
@@ -7,6 +7,7 @@
 import com.refinedmods.refinedstorage.api.network.node.NetworkNode;
 import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy;
 import com.refinedmods.refinedstorage.api.resource.ResourceKey;
+import com.refinedmods.refinedstorage.common.api.autocrafting.Pattern;
 import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategyFactory;
 import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategyFactory;
 import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory;
@@ -200,4 +201,6 @@ EnergyStorage asBlockItemEnergyStorage(
     void sendNoPermissionMessage(ServerPlayer player, Component message);
 
     boolean canPlaceNetworkNode(ServerPlayer player, Level level, BlockPos pos, BlockState state);
+
+    Optional<Pattern> getPattern(ItemStack stack, Level level);
 }
diff --git a/...n-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApiProxy.java b/...n-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApiProxy.java
@@ -7,6 +7,7 @@
 import com.refinedmods.refinedstorage.api.network.node.NetworkNode;
 import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy;
 import com.refinedmods.refinedstorage.api.resource.ResourceKey;
+import com.refinedmods.refinedstorage.common.api.autocrafting.Pattern;
 import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategyFactory;
 import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategyFactory;
 import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory;
@@ -395,6 +396,11 @@ public boolean canPlaceNetworkNode(final ServerPlayer player,
         return ensureLoaded().canPlaceNetworkNode(player, level, pos, state);
     }
 
+    @Override
+    public Optional<Pattern> getPattern(final ItemStack stack, final Level level) {
+        return ensureLoaded().getPattern(stack, level);
+    }
+
     private RefinedStorageApi ensureLoaded() {
         if (delegate == null) {
             throw new IllegalStateException("API not loaded yet");

diff --git a/...src/main/java/com/refinedmods/refinedstorage/common/api/autocrafting/CraftingPattern.java b/...src/main/java/com/refinedmods/refinedstorage/common/api/autocrafting/CraftingPattern.java
@@ -0,0 +1,19 @@
+package com.refinedmods.refinedstorage.common.api.autocrafting;
+
+import com.refinedmods.refinedstorage.api.resource.ResourceAmount;
+import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.apiguardian.api.API;
+
+@API(status = API.Status.STABLE, since = "2.0.0-milestone.4.6")
+public record CraftingPattern(List<List<PlatformResourceKey>> inputs,
+                              ResourceAmount output,
+                              List<ResourceAmount> byproducts) implements Pattern {
+    @Override
+    public Collection<ResourceAmount> getOutputs() {
+        return List.of(output);
+    }
+}
diff --git a/...mon-api/src/main/java/com/refinedmods/refinedstorage/common/api/autocrafting/Pattern.java b/...mon-api/src/main/java/com/refinedmods/refinedstorage/common/api/autocrafting/Pattern.java
@@ -0,0 +1,12 @@
+package com.refinedmods.refinedstorage.common.api.autocrafting;
+
+import com.refinedmods.refinedstorage.api.resource.ResourceAmount;
+
+import java.util.Collection;
+
+import org.apiguardian.api.API;
+
+@API(status = API.Status.STABLE, since = "2.0.0-milestone.4.6")
+public interface Pattern {
+    Collection<ResourceAmount> getOutputs();
+}
diff --git a/...main/java/com/refinedmods/refinedstorage/common/api/autocrafting/PatternProviderItem.java b/...main/java/com/refinedmods/refinedstorage/common/api/autocrafting/PatternProviderItem.java
@@ -0,0 +1,17 @@
+package com.refinedmods.refinedstorage.common.api.autocrafting;
+
+import java.util.Optional;
+import java.util.UUID;
+import javax.annotation.Nullable;
+
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import org.apiguardian.api.API;
+
+@API(status = API.Status.STABLE, since = "2.0.0-milestone.4.6")
+public interface PatternProviderItem {
+    @Nullable
+    UUID getId(ItemStack stack);
+
+    Optional<Pattern> getPattern(ItemStack stack, Level level);
+}
diff --git a/...c/main/java/com/refinedmods/refinedstorage/common/api/autocrafting/ProcessingPattern.java b/...c/main/java/com/refinedmods/refinedstorage/common/api/autocrafting/ProcessingPattern.java
@@ -0,0 +1,16 @@
+package com.refinedmods.refinedstorage.common.api.autocrafting;
+
+import com.refinedmods.refinedstorage.api.resource.ResourceAmount;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.apiguardian.api.API;
+
+@API(status = API.Status.STABLE, since = "2.0.0-milestone.4.6")
+public record ProcessingPattern(List<List<ResourceAmount>> inputs, List<ResourceAmount> outputs) implements Pattern {
+    @Override
+    public Collection<ResourceAmount> getOutputs() {
+        return outputs;
+    }
+}
diff --git a/...pi/src/main/java/com/refinedmods/refinedstorage/common/api/autocrafting/package-info.java b/...pi/src/main/java/com/refinedmods/refinedstorage/common/api/autocrafting/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@FieldsAndMethodsAreNonnullByDefault
+package com.refinedmods.refinedstorage.common.api.autocrafting;
+
+import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/...-common/src/generated/resources/assets/refinedstorage/blockstates/black_pattern_grid.json b/...-common/src/generated/resources/assets/refinedstorage/blockstates/black_pattern_grid.json
@@ -0,0 +1,110 @@
+{
+  "variants": {
+    "active=false,direction=down_east": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": 90,
+      "y": -90
+    },
+    "active=false,direction=down_north": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": 90
+    },
+    "active=false,direction=down_south": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": 90,
+      "y": 180
+    },
+    "active=false,direction=down_west": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": 90,
+      "y": 90
+    },
+    "active=false,direction=east": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "y": 90
+    },
+    "active=false,direction=north": {
+      "model": "refinedstorage:block/pattern_grid/inactive"
+    },
+    "active=false,direction=south": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "y": 180
+    },
+    "active=false,direction=up_east": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": -90,
+      "y": -90
+    },
+    "active=false,direction=up_north": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": -90,
+      "y": 180
+    },
+    "active=false,direction=up_south": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": -90
+    },
+    "active=false,direction=up_west": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": -90,
+      "y": 90
+    },
+    "active=false,direction=west": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "y": 270
+    },
+    "active=true,direction=down_east": {
+      "model": "refinedstorage:block/pattern_grid/black",
+      "x": 90,
+      "y": -90
+    },
+    "active=true,direction=down_north": {
+      "model": "refinedstorage:block/pattern_grid/black",
+      "x": 90
+    },
+    "active=true,direction=down_south": {
+      "model": "refinedstorage:block/pattern_grid/black",
+      "x": 90,
+      "y": 180
+    },
+    "active=true,direction=down_west": {
+      "model": "refinedstorage:block/pattern_grid/black",
+      "x": 90,
+      "y": 90
+    },
+    "active=true,direction=east": {
+      "model": "refinedstorage:block/pattern_grid/black",
+      "y": 90
+    },
+    "active=true,direction=north": {
+      "model": "refinedstorage:block/pattern_grid/black"
+    },
+    "active=true,direction=south": {
+      "model": "refinedstorage:block/pattern_grid/black",
+      "y": 180
+    },
+    "active=true,direction=up_east": {
+      "model": "refinedstorage:block/pattern_grid/black",
+      "x": -90,
+      "y": -90
+    },
+    "active=true,direction=up_north": {
+      "model": "refinedstorage:block/pattern_grid/black",
+      "x": -90,
+      "y": 180
+    },
+    "active=true,direction=up_south": {
+      "model": "refinedstorage:block/pattern_grid/black",
+      "x": -90
+    },
+    "active=true,direction=up_west": {
+      "model": "refinedstorage:block/pattern_grid/black",
+      "x": -90,
+      "y": 90
+    },
+    "active=true,direction=west": {
+      "model": "refinedstorage:block/pattern_grid/black",
+      "y": 270
+    }
+  }
+}
diff --git a/...e-common/src/generated/resources/assets/refinedstorage/blockstates/blue_pattern_grid.json b/...e-common/src/generated/resources/assets/refinedstorage/blockstates/blue_pattern_grid.json
@@ -0,0 +1,110 @@
+{
+  "variants": {
+    "active=false,direction=down_east": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": 90,
+      "y": -90
+    },
+    "active=false,direction=down_north": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": 90
+    },
+    "active=false,direction=down_south": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": 90,
+      "y": 180
+    },
+    "active=false,direction=down_west": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": 90,
+      "y": 90
+    },
+    "active=false,direction=east": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "y": 90
+    },
+    "active=false,direction=north": {
+      "model": "refinedstorage:block/pattern_grid/inactive"
+    },
+    "active=false,direction=south": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "y": 180
+    },
+    "active=false,direction=up_east": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": -90,
+      "y": -90
+    },
+    "active=false,direction=up_north": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": -90,
+      "y": 180
+    },
+    "active=false,direction=up_south": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": -90
+    },
+    "active=false,direction=up_west": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "x": -90,
+      "y": 90
+    },
+    "active=false,direction=west": {
+      "model": "refinedstorage:block/pattern_grid/inactive",
+      "y": 270
+    },
+    "active=true,direction=down_east": {
+      "model": "refinedstorage:block/pattern_grid/blue",
+      "x": 90,
+      "y": -90
+    },
+    "active=true,direction=down_north": {
+      "model": "refinedstorage:block/pattern_grid/blue",
+      "x": 90
+    },
+    "active=true,direction=down_south": {
+      "model": "refinedstorage:block/pattern_grid/blue",
+      "x": 90,
+      "y": 180
+    },
+    "active=true,direction=down_west": {
+      "model": "refinedstorage:block/pattern_grid/blue",
+      "x": 90,
+      "y": 90
+    },
+    "active=true,direction=east": {
+      "model": "refinedstorage:block/pattern_grid/blue",
+      "y": 90
+    },
+    "active=true,direction=north": {
+      "model": "refinedstorage:block/pattern_grid/blue"
+    },
+    "active=true,direction=south": {
+      "model": "refinedstorage:block/pattern_grid/blue",
+      "y": 180
+    },
+    "active=true,direction=up_east": {
+      "model": "refinedstorage:block/pattern_grid/blue",
+      "x": -90,
+      "y": -90
+    },
+    "active=true,direction=up_north": {
+      "model": "refinedstorage:block/pattern_grid/blue",
+      "x": -90,
+      "y": 180
+    },
+    "active=true,direction=up_south": {
+      "model": "refinedstorage:block/pattern_grid/blue",
+      "x": -90
+    },
+    "active=true,direction=up_west": {
+      "model": "refinedstorage:block/pattern_grid/blue",
+      "x": -90,
+      "y": 90
+    },
+    "active=true,direction=west": {
+      "model": "refinedstorage:block/pattern_grid/blue",
+      "y": 270
+    }
+  }
+}