Merge pull request #800 from refinedmods/release/2.0.0-milestone.4.13

Release v2.0.0-milestone.4.13
refinedmods · Feb 1, 2025 · 2bb7edf · 2bb7edf
2 parents 690b942 + 6d88e7f
commit 2bb7edf
Show file tree

Hide file tree

Showing 76 changed files with 1,101 additions and 226 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.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.21.0
     with:
       gametests: true
     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.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.21.0
     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.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.21.0
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.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.21.0
     secrets: inherit
     with:
       project-name: 'Refined Storage'

diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml
@@ -4,4 +4,4 @@ on:
     - cron: '0 0 * * 1'
 jobs:
   lock:
-    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.21.0
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.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.21.0
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.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.21.0
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.20.0
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.21.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,21 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [2.0.0-milestone.4.13] - 2025-02-01
+
+### Added
+
+-   Colored variants are now moved to a separate creative mode tab.
+-   You can now start autocrafting tasks in the Relay's output network, using patterns and autocrafters from the input network.
+
+### Fixed
+
+-   Fixed Crafter and Security Manager bottom sides being lit on NeoForge.
+-   Fixed pattern input slot in the Pattern Grid not being accessible as an external inventory.
+-   Fixed duplication bug with the Crafting Grid matrix and insert-only storages.
+-   Fixed not being able to deselect the Grid search box.
+-   Fixed Storage Block not showing the amount and capacity when inactive.
+
 ## [2.0.0-milestone.4.12] - 2025-01-27
 
 ### Added
@@ -849,7 +864,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.12...HEAD
+[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.13...HEAD
+
+[2.0.0-milestone.4.13]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.12...v2.0.0-milestone.4.13
 
 [2.0.0-milestone.4.12]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.11...v2.0.0-milestone.4.12
 

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
   <p>Refined Storage is a mass storage mod for Minecraft that offers the player a network-based storage system, allowing
 them to store items and fluids on a massively expandable device network.</p>
 
-[![Build Status](https://github.com/refinedmods/refinedstorage2/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/refinedmods/refinedstorage2/actions/workflows/build.yml) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage2&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage2) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage2&metric=coverage)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage2) [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage2&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage2) [![Crowdin](https://badges.crowdin.net/refined-storage-2/localized.svg)](https://crowdin.com/project/refined-storage-2) [![Downloads on CurseForge](http://cf.way2muchnoise.eu/full_243076_downloads.svg)](http://minecraft.curseforge.com/projects/refined-storage) [![Downloads on Modrinth](https://img.shields.io/modrinth/dt/refined-storage?logo=modrinth)](https://modrinth.com/mod/refined-storage) [![Discord](https://img.shields.io/discord/342942776494653441)](https://discordapp.com/invite/VYzsydb) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE.md)
+[![Build Status](https://github.com/refinedmods/refinedstorage2/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/refinedmods/refinedstorage2/actions/workflows/build.yml) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage2&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage2) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage2&metric=coverage)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage2) [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=refinedmods_refinedstorage2&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=refinedmods_refinedstorage2) [![Crowdin](https://badges.crowdin.net/refined-storage-2/localized.svg)](https://crowdin.com/project/refined-storage-2) [![Downloads on CurseForge](http://cf.way2muchnoise.eu/full_243076_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/refined-storage) [![Downloads on Modrinth](https://img.shields.io/modrinth/dt/refined-storage?logo=modrinth)](https://modrinth.com/mod/refined-storage) [![Discord](https://img.shields.io/discord/342942776494653441)](https://discordapp.com/invite/VYzsydb) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE.md)
 </div>
 
 ## About

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,17 +13,6 @@ subprojects {
     group = "com.refinedmods.refinedstorage"
 }
 
-/* publish all subprojects to mavenLocal */
-subprojects {
-    apply(plugin = "maven-publish")
-
-    publishing {
-        repositories {
-            mavenLocal()
-        }
-    }
-}
-
 project.extensions.getByType<SonarExtension>().apply {
     properties {
         property(

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-refinedarchitectVersion=0.20.0
+refinedarchitectVersion=0.21.0
 # Gradle
 org.gradle.jvmargs=-Xmx1G
 org.gradle.configureondemand=true

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.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/...c/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ExternalPatternSink.java b/...c/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ExternalPatternSink.java
@@ -21,11 +21,12 @@ public interface ExternalPatternSink {
      * If the sink is locked, it must return {@link Result#LOCKED}.
      * If the resources are not applicable for this sink, it must return {@link Result#SKIPPED}.
      *
+     * @param pattern   the pattern
      * @param resources the resources
      * @param action    the action
      * @return the result
      */
-    Result accept(Collection<ResourceAmount> resources, Action action);
+    Result accept(Pattern pattern, Collection<ResourceAmount> resources, Action action);
 
     /**
      * @return the key for this sink

diff --git a/...c/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ExternalTaskPattern.java b/...c/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ExternalTaskPattern.java
@@ -194,7 +194,7 @@ private boolean acceptsIterationInputs(final MutableResourceList internalStorage
         // across the sink and the internal storage.
         // The end result is that we lie, do as if the insertion was successful,
         // and potentially void the extracted resources from the internal storage.
-        if (sink.accept(iterationInputs.copyState(), Action.EXECUTE) != ExternalPatternSink.Result.ACCEPTED) {
+        if (sink.accept(pattern, iterationInputs.copyState(), Action.EXECUTE) != ExternalPatternSink.Result.ACCEPTED) {
             LOGGER.warn("Sink {} did not accept all inputs for pattern {}", sink, pattern);
         }
         return true;
@@ -209,6 +209,7 @@ private ExternalPatternSink getSinkThatIsAcceptingResources(final List<ExternalP
         while (currentSinkIndex < sinks.size()) {
             final ExternalPatternSink sink = sinks.get(currentSinkIndex);
             final ExternalPatternSink.Result simulatedResult = sink.accept(
+                pattern,
                 iterationInputsSimulated.copyState(),
                 Action.SIMULATE
             );

diff --git a/...com/refinedmods/refinedstorage/api/autocrafting/task/ExternalPatternSinkProviderImpl.java b/...com/refinedmods/refinedstorage/api/autocrafting/task/ExternalPatternSinkProviderImpl.java
@@ -72,7 +72,9 @@ public ExternalPatternSinkKey getKey() {
         }
 
         @Override
-        public Result accept(final Collection<ResourceAmount> resources, final Action action) {
+        public Result accept(final Pattern p,
+                             final Collection<ResourceAmount> resources,
+                             final Action action) {
             if (fixedResult != null) {
                 return fixedResult;
             }

diff --git a/...-api/src/test/java/com/refinedmods/refinedstorage/api/autocrafting/task/TaskImplTest.java b/...-api/src/test/java/com/refinedmods/refinedstorage/api/autocrafting/task/TaskImplTest.java
@@ -765,7 +765,7 @@ void shouldNotCompleteTaskWithExternalPatternIfSinkDoesNotAcceptResourcesOnlyWhe
         );
         final PatternRepository patterns = patterns(IRON_INGOT_PATTERN, IRON_PICKAXE_PATTERN);
         final ExternalPatternSinkProviderImpl sinkProvider = new ExternalPatternSinkProviderImpl();
-        sinkProvider.put(IRON_INGOT_PATTERN, (resources, action) -> action == Action.EXECUTE
+        sinkProvider.put(IRON_INGOT_PATTERN, (pattern, resources, action) -> action == Action.EXECUTE
             ? ExternalPatternSink.Result.REJECTED
             : ExternalPatternSink.Result.ACCEPTED);
         final Task task = getRunningTask(storage, patterns, sinkProvider, IRON_PICKAXE, 1);

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
@@ -208,6 +208,8 @@ EnergyStorage asBlockItemEnergyStorage(
 
     ResourceLocation getCreativeModeTabId();
 
+    ResourceLocation getColoredCreativeModeTabId();
+
     AbstractNetworkNodeContainerBlockEntity<?> createStorageBlockEntity(BlockPos pos,
                                                                         BlockState state,
                                                                         StorageBlockProvider provider);

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
@@ -402,6 +402,11 @@ public ResourceLocation getCreativeModeTabId() {
         return ensureLoaded().getCreativeModeTabId();
     }
 
+    @Override
+    public ResourceLocation getColoredCreativeModeTabId() {
+        return ensureLoaded().getColoredCreativeModeTabId();
+    }
+
     @Override
     public AbstractNetworkNodeContainerBlockEntity<?> createStorageBlockEntity(final BlockPos pos,
                                                                                final BlockState state,

diff --git a/...-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/black.json b/...-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/black.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/black",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/black",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/black",

diff --git a/...e-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/blue.json b/...e-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/blue.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/blue",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/blue",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/blue",

diff --git a/...-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/brown.json b/...-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/brown.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/brown",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/brown",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/brown",

diff --git a/...e-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/cyan.json b/...e-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/cyan.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/cyan",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/cyan",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/cyan",

diff --git a/...e-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/gray.json b/...e-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/gray.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/gray",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/gray",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/gray",

diff --git a/...-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/green.json b/...-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/green.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/green",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/green",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/green",

diff --git a/...mmon/src/generated/resources/assets/refinedstorage/models/block/autocrafter/inactive.json b/...mmon/src/generated/resources/assets/refinedstorage/models/block/autocrafter/inactive.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/cutout",
+  "parent": "refinedstorage:block/sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/inactive",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/inactive",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/inactive",

diff --git a/...on/src/generated/resources/assets/refinedstorage/models/block/autocrafter/light_blue.json b/...on/src/generated/resources/assets/refinedstorage/models/block/autocrafter/light_blue.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/light_blue",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/light_blue",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/light_blue",

diff --git a/...on/src/generated/resources/assets/refinedstorage/models/block/autocrafter/light_gray.json b/...on/src/generated/resources/assets/refinedstorage/models/block/autocrafter/light_gray.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/light_gray",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/light_gray",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/light_gray",

diff --git a/...e-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/lime.json b/...e-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/lime.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/lime",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/lime",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/lime",

diff --git a/...ommon/src/generated/resources/assets/refinedstorage/models/block/autocrafter/magenta.json b/...ommon/src/generated/resources/assets/refinedstorage/models/block/autocrafter/magenta.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/magenta",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/magenta",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/magenta",

diff --git a/...common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/orange.json b/...common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/orange.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/orange",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/orange",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/orange",

diff --git a/...e-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/pink.json b/...e-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/pink.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/pink",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/pink",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/pink",

diff --git a/...common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/purple.json b/...common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/purple.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/purple",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/purple",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/purple",

diff --git a/...ge-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/red.json b/...ge-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/red.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/red",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/red",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/red",

diff --git a/...-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/white.json b/...-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/white.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/white",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/white",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/white",

diff --git a/...common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/yellow.json b/...common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/yellow.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/yellow",
     "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/yellow",
     "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/yellow",

diff --git a/...on/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json b/...on/src/generated/resources/assets/refinedstorage/models/block/security_manager/black.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/security_manager/cutouts/right/black",
     "cutout_north": "refinedstorage:block/security_manager/cutouts/front/black",
     "cutout_south": "refinedstorage:block/security_manager/cutouts/back/black",

diff --git a/...mon/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json b/...mon/src/generated/resources/assets/refinedstorage/models/block/security_manager/blue.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/security_manager/cutouts/right/blue",
     "cutout_north": "refinedstorage:block/security_manager/cutouts/front/blue",
     "cutout_south": "refinedstorage:block/security_manager/cutouts/back/blue",

diff --git a/...on/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json b/...on/src/generated/resources/assets/refinedstorage/models/block/security_manager/brown.json
@@ -1,7 +1,6 @@
 {
-  "parent": "refinedstorage:block/emissive_cutout",
+  "parent": "refinedstorage:block/emissive_sides_cutout",
   "textures": {
-    "cutout_down": "refinedstorage:block/bottom",
     "cutout_east": "refinedstorage:block/security_manager/cutouts/right/brown",
     "cutout_north": "refinedstorage:block/security_manager/cutouts/front/brown",
     "cutout_south": "refinedstorage:block/security_manager/cutouts/back/brown",