Merge pull request #694 from refinedmods/chore/GH-98/autocrafter-rename

chore: rename crafter to autocrafter
refinedmods · Oct 4, 2024 · 4466b1a · 4466b1a
2 parents d35175f + 2229ae9
commit 4466b1a
Show file tree

Hide file tree

Showing 286 changed files with 2,317 additions and 2,312 deletions.
diff --git a/.idea/dictionaries/refinedstorage.xml b/.idea/dictionaries/refinedstorage.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Added
 
--   Crafter
+-   Autocrafter
 
 ### Changed
 
@@ -32,6 +32,7 @@ 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
 

diff --git a/...storage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/Grid.java b/...storage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/Grid.java
@@ -27,7 +27,7 @@ public interface Grid extends AutocraftingPreviewProvider {
 
     List<TrackedResourceAmount> getResources(Class<? extends Actor> actorType);
 
-    Set<PlatformResourceKey> getCraftableResources();
+    Set<PlatformResourceKey> getAutocraftableResources();
 
     GridOperations createOperations(ResourceType resourceType, ServerPlayer player);
 }
diff --git a/...ava/com/refinedmods/refinedstorage/common/api/grid/view/AbstractPlatformGridResource.java b/...ava/com/refinedmods/refinedstorage/common/api/grid/view/AbstractPlatformGridResource.java
@@ -18,16 +18,16 @@ public abstract class AbstractPlatformGridResource<T extends PlatformResourceKey
     protected final T resource;
     private final String name;
     private final Map<GridResourceAttributeKey, Set<String>> attributes;
-    private final boolean craftable;
+    private final boolean autocraftable;
 
     protected AbstractPlatformGridResource(final T resource,
                                            final String name,
                                            final Map<GridResourceAttributeKey, Set<String>> attributes,
-                                           final boolean craftable) {
+                                           final boolean autocraftable) {
         this.resource = resource;
         this.name = name;
         this.attributes = attributes;
-        this.craftable = craftable;
+        this.autocraftable = autocraftable;
     }
 
     @Override
@@ -51,8 +51,8 @@ public Set<String> getAttribute(final GridResourceAttributeKey key) {
     }
 
     @Override
-    public boolean isCraftable() {
-        return craftable;
+    public boolean isAutocraftable() {
+        return autocraftable;
     }
 
     @Nullable
@@ -67,7 +67,7 @@ public String toString() {
             + "resource=" + resource
             + ", name='" + name + '\''
             + ", attributes=" + attributes
-            + ", craftable=" + craftable
+            + ", autocraftable=" + autocraftable
             + '}';
     }
 }
diff --git a/...rc/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceType.java b/...rc/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceType.java
@@ -29,7 +29,7 @@ public interface ResourceType {
 
     double getDisplayAmount(long amount);
 
-    Optional<GridResource> toGridResource(ResourceKey resource, boolean craftable);
+    Optional<GridResource> toGridResource(ResourceKey resource, boolean autocraftable);
 
     long getInterfaceExportLimit();
 

diff --git a/...storage-common/src/generated/resources/assets/refinedstorage/blockstates/autocrafter.json b/...storage-common/src/generated/resources/assets/refinedstorage/blockstates/autocrafter.json
@@ -0,0 +1,56 @@
+{
+  "variants": {
+    "active=false,direction=down": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 180
+    },
+    "active=false,direction=east": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 90,
+      "y": 90
+    },
+    "active=false,direction=north": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 90
+    },
+    "active=false,direction=south": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 90,
+      "y": 180
+    },
+    "active=false,direction=up": {
+      "model": "refinedstorage:block/autocrafter/inactive"
+    },
+    "active=false,direction=west": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 90,
+      "y": 270
+    },
+    "active=true,direction=down": {
+      "model": "refinedstorage:block/autocrafter/light_blue",
+      "x": 180
+    },
+    "active=true,direction=east": {
+      "model": "refinedstorage:block/autocrafter/light_blue",
+      "x": 90,
+      "y": 90
+    },
+    "active=true,direction=north": {
+      "model": "refinedstorage:block/autocrafter/light_blue",
+      "x": 90
+    },
+    "active=true,direction=south": {
+      "model": "refinedstorage:block/autocrafter/light_blue",
+      "x": 90,
+      "y": 180
+    },
+    "active=true,direction=up": {
+      "model": "refinedstorage:block/autocrafter/light_blue"
+    },
+    "active=true,direction=west": {
+      "model": "refinedstorage:block/autocrafter/light_blue",
+      "x": 90,
+      "y": 270
+    }
+  }
+}
diff --git a/...e-common/src/generated/resources/assets/refinedstorage/blockstates/black_autocrafter.json b/...e-common/src/generated/resources/assets/refinedstorage/blockstates/black_autocrafter.json
@@ -0,0 +1,56 @@
+{
+  "variants": {
+    "active=false,direction=down": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 180
+    },
+    "active=false,direction=east": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 90,
+      "y": 90
+    },
+    "active=false,direction=north": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 90
+    },
+    "active=false,direction=south": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 90,
+      "y": 180
+    },
+    "active=false,direction=up": {
+      "model": "refinedstorage:block/autocrafter/inactive"
+    },
+    "active=false,direction=west": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 90,
+      "y": 270
+    },
+    "active=true,direction=down": {
+      "model": "refinedstorage:block/autocrafter/black",
+      "x": 180
+    },
+    "active=true,direction=east": {
+      "model": "refinedstorage:block/autocrafter/black",
+      "x": 90,
+      "y": 90
+    },
+    "active=true,direction=north": {
+      "model": "refinedstorage:block/autocrafter/black",
+      "x": 90
+    },
+    "active=true,direction=south": {
+      "model": "refinedstorage:block/autocrafter/black",
+      "x": 90,
+      "y": 180
+    },
+    "active=true,direction=up": {
+      "model": "refinedstorage:block/autocrafter/black"
+    },
+    "active=true,direction=west": {
+      "model": "refinedstorage:block/autocrafter/black",
+      "x": 90,
+      "y": 270
+    }
+  }
+}
diff --git a/...inedstorage/blockstates/blue_crafter.json → ...storage/blockstates/blue_autocrafter.json b/...inedstorage/blockstates/blue_crafter.json → ...storage/blockstates/blue_autocrafter.json
@@ -1,54 +1,54 @@
 {
   "variants": {
     "active=false,direction=down": {
-      "model": "refinedstorage:block/crafter/inactive",
+      "model": "refinedstorage:block/autocrafter/inactive",
       "x": 180
     },
     "active=false,direction=east": {
-      "model": "refinedstorage:block/crafter/inactive",
+      "model": "refinedstorage:block/autocrafter/inactive",
       "x": 90,
       "y": 90
     },
     "active=false,direction=north": {
-      "model": "refinedstorage:block/crafter/inactive",
+      "model": "refinedstorage:block/autocrafter/inactive",
       "x": 90
     },
     "active=false,direction=south": {
-      "model": "refinedstorage:block/crafter/inactive",
+      "model": "refinedstorage:block/autocrafter/inactive",
       "x": 90,
       "y": 180
     },
     "active=false,direction=up": {
-      "model": "refinedstorage:block/crafter/inactive"
+      "model": "refinedstorage:block/autocrafter/inactive"
     },
     "active=false,direction=west": {
-      "model": "refinedstorage:block/crafter/inactive",
+      "model": "refinedstorage:block/autocrafter/inactive",
       "x": 90,
       "y": 270
     },
     "active=true,direction=down": {
-      "model": "refinedstorage:block/crafter/blue",
+      "model": "refinedstorage:block/autocrafter/blue",
       "x": 180
     },
     "active=true,direction=east": {
-      "model": "refinedstorage:block/crafter/blue",
+      "model": "refinedstorage:block/autocrafter/blue",
       "x": 90,
       "y": 90
     },
     "active=true,direction=north": {
-      "model": "refinedstorage:block/crafter/blue",
+      "model": "refinedstorage:block/autocrafter/blue",
       "x": 90
     },
     "active=true,direction=south": {
-      "model": "refinedstorage:block/crafter/blue",
+      "model": "refinedstorage:block/autocrafter/blue",
       "x": 90,
       "y": 180
     },
     "active=true,direction=up": {
-      "model": "refinedstorage:block/crafter/blue"
+      "model": "refinedstorage:block/autocrafter/blue"
     },
     "active=true,direction=west": {
-      "model": "refinedstorage:block/crafter/blue",
+      "model": "refinedstorage:block/autocrafter/blue",
       "x": 90,
       "y": 270
     }

diff --git a/...e-common/src/generated/resources/assets/refinedstorage/blockstates/brown_autocrafter.json b/...e-common/src/generated/resources/assets/refinedstorage/blockstates/brown_autocrafter.json
@@ -0,0 +1,56 @@
+{
+  "variants": {
+    "active=false,direction=down": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 180
+    },
+    "active=false,direction=east": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 90,
+      "y": 90
+    },
+    "active=false,direction=north": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 90
+    },
+    "active=false,direction=south": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 90,
+      "y": 180
+    },
+    "active=false,direction=up": {
+      "model": "refinedstorage:block/autocrafter/inactive"
+    },
+    "active=false,direction=west": {
+      "model": "refinedstorage:block/autocrafter/inactive",
+      "x": 90,
+      "y": 270
+    },
+    "active=true,direction=down": {
+      "model": "refinedstorage:block/autocrafter/brown",
+      "x": 180
+    },
+    "active=true,direction=east": {
+      "model": "refinedstorage:block/autocrafter/brown",
+      "x": 90,
+      "y": 90
+    },
+    "active=true,direction=north": {
+      "model": "refinedstorage:block/autocrafter/brown",
+      "x": 90
+    },
+    "active=true,direction=south": {
+      "model": "refinedstorage:block/autocrafter/brown",
+      "x": 90,
+      "y": 180
+    },
+    "active=true,direction=up": {
+      "model": "refinedstorage:block/autocrafter/brown"
+    },
+    "active=true,direction=west": {
+      "model": "refinedstorage:block/autocrafter/brown",
+      "x": 90,
+      "y": 270
+    }
+  }
+}
diff --git a/...nedstorage/blockstates/brown_crafter.json → ...storage/blockstates/cyan_autocrafter.json b/...nedstorage/blockstates/brown_crafter.json → ...storage/blockstates/cyan_autocrafter.json
@@ -1,54 +1,54 @@
 {
   "variants": {
     "active=false,direction=down": {
-      "model": "refinedstorage:block/crafter/inactive",
+      "model": "refinedstorage:block/autocrafter/inactive",
       "x": 180
     },
     "active=false,direction=east": {
-      "model": "refinedstorage:block/crafter/inactive",
+      "model": "refinedstorage:block/autocrafter/inactive",
       "x": 90,
       "y": 90
     },
     "active=false,direction=north": {
-      "model": "refinedstorage:block/crafter/inactive",
+      "model": "refinedstorage:block/autocrafter/inactive",
       "x": 90
     },
     "active=false,direction=south": {
-      "model": "refinedstorage:block/crafter/inactive",
+      "model": "refinedstorage:block/autocrafter/inactive",
       "x": 90,
       "y": 180
     },
     "active=false,direction=up": {
-      "model": "refinedstorage:block/crafter/inactive"
+      "model": "refinedstorage:block/autocrafter/inactive"
     },
     "active=false,direction=west": {
-      "model": "refinedstorage:block/crafter/inactive",
+      "model": "refinedstorage:block/autocrafter/inactive",
       "x": 90,
       "y": 270
     },
     "active=true,direction=down": {
-      "model": "refinedstorage:block/crafter/brown",
+      "model": "refinedstorage:block/autocrafter/cyan",
       "x": 180
     },
     "active=true,direction=east": {
-      "model": "refinedstorage:block/crafter/brown",
+      "model": "refinedstorage:block/autocrafter/cyan",
       "x": 90,
       "y": 90
     },
     "active=true,direction=north": {
-      "model": "refinedstorage:block/crafter/brown",
+      "model": "refinedstorage:block/autocrafter/cyan",
       "x": 90
     },
     "active=true,direction=south": {
-      "model": "refinedstorage:block/crafter/brown",
+      "model": "refinedstorage:block/autocrafter/cyan",
       "x": 90,
       "y": 180
     },
     "active=true,direction=up": {
-      "model": "refinedstorage:block/crafter/brown"
+      "model": "refinedstorage:block/autocrafter/cyan"
     },
     "active=true,direction=west": {
-      "model": "refinedstorage:block/crafter/brown",
+      "model": "refinedstorage:block/autocrafter/cyan",
       "x": 90,
       "y": 270
     }