Remove some redundant textures

62832 · Dec 21, 2024 · f51faf2 · f51faf2
1 parent 2bc85e1
commit f51faf2
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 19 deletions.
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -91,7 +91,7 @@ run {
                 version("ae2", "19.0.25")
                 library("ae2", "appeng", "appliedenergistics2").versionRef("ae2")
 
-                version("ars", "5.3.5.844")
+                version("ars", "5.3.6.851")
                 library("ars", "com.hollingsworth.ars_nouveau", "ars_nouveau-$mc").versionRef("ars")
             }
         }

diff --git a/src/data/java/gripe/_90/arseng/data/ItemModelProvider.java b/src/data/java/gripe/_90/arseng/data/ItemModelProvider.java
@@ -62,8 +62,8 @@ private void portable(ItemDefinition<?> portable) {
                         "layer0",
                         ArsEnergistique.makeId("item/portable_source_cell_housing"))
                 .texture("layer1", AppEng.makeId("item/portable_cell_led"))
-                .texture("layer2", ArsEnergistique.makeId("item/portable_cell_screen"))
-                .texture("layer3", ArsEnergistique.makeId("item/portable_source_cell" + tierSuffix));
+                .texture("layer2", AppEng.makeId("item/portable_cell_screen"))
+                .texture("layer3", AppEng.makeId("item/portable_cell_side" + tierSuffix));
     }
 
     private void driveCell(String cell, int offset) {

diff --git a/src/generated/resources/.cache/673f85be5b770d138b429784cd3e193441e9291d b/src/generated/resources/.cache/673f85be5b770d138b429784cd3e193441e9291d
@@ -1,4 +1,4 @@
-// 1.21.1	2024-10-18T00:02:21.809844452	vanilla/Item Models: arseng
+// 1.21.1	2024-12-21T16:29:55.761027684	vanilla/Item Models: arseng
 608b49ba068b3b56382f5e7f7b07c05daaf748d1 assets/arseng/models/block/drive/cells/16k_source_cell.json
 87143fbfbe5f94aec6c5d30ea3c5f65d1188af67 assets/arseng/models/block/drive/cells/1k_source_cell.json
 9fe7f5069fe7014afb8bf9a229a0fe9ccc329fda assets/arseng/models/block/drive/cells/256k_source_cell.json
@@ -7,11 +7,11 @@ fe483b31efe3f4e573298f1d10a1c6253ea15cb0 assets/arseng/models/block/drive/cells/
 5e5a1328cd23c1359435ba898b01fc03834a7bf1 assets/arseng/models/block/drive/cells/creative_source_cell.json
 304a285a28f80e721d055733ba19972f0ec8bed4 assets/arseng/models/item/cable_source_acceptor.json
 ad365c33a88aa0653d765ef149f35edeae671c08 assets/arseng/models/item/creative_source_cell.json
-089f760efa2857a2c389e795762d9cdb57cf68b7 assets/arseng/models/item/portable_source_cell_16k.json
-892a1cedba9ac63ab93205fb4d55ef6e2cc3730e assets/arseng/models/item/portable_source_cell_1k.json
-a3703deb57fcb16a0352df140787cc46cfffa550 assets/arseng/models/item/portable_source_cell_256k.json
-fda32a408b550caeed24ed5ed90227b94a7b7100 assets/arseng/models/item/portable_source_cell_4k.json
-77753352abfdc5a4abb10270cea2640843a00ef3 assets/arseng/models/item/portable_source_cell_64k.json
+9ed7694dac6e9b715c79fa774a9a20c0567eba69 assets/arseng/models/item/portable_source_cell_16k.json
+84c55166bead0796bce5985466a865ec30c1ae16 assets/arseng/models/item/portable_source_cell_1k.json
+8925c060308bc9e843ed1a35e047db7a4172da47 assets/arseng/models/item/portable_source_cell_256k.json
+3a4585296ebe8756fe05c8c988b197b88c617247 assets/arseng/models/item/portable_source_cell_4k.json
+d02fb2982537690adaa1514bc22e154c661425ff assets/arseng/models/item/portable_source_cell_64k.json
 37e4abf9b48ef35dfe4675e1de16bdbb3ad655c8 assets/arseng/models/item/source_cell_housing.json
 b6e4b7a7b76ccc7ce9c3fabb494656a0d74ebe30 assets/arseng/models/item/source_p2p_tunnel.json
 ff1e556ac1bda4f4b6e9c3b72d08f1c779f42454 assets/arseng/models/item/source_storage_cell_16k.json

diff --git a/src/generated/resources/assets/arseng/models/item/portable_source_cell_16k.json b/src/generated/resources/assets/arseng/models/item/portable_source_cell_16k.json
@@ -3,7 +3,7 @@
   "textures": {
     "layer0": "arseng:item/portable_source_cell_housing",
     "layer1": "ae2:item/portable_cell_led",
-    "layer2": "arseng:item/portable_cell_screen",
-    "layer3": "arseng:item/portable_source_cell_16k"
+    "layer2": "ae2:item/portable_cell_screen",
+    "layer3": "ae2:item/portable_cell_side_16k"
   }
 }
diff --git a/src/generated/resources/assets/arseng/models/item/portable_source_cell_1k.json b/src/generated/resources/assets/arseng/models/item/portable_source_cell_1k.json
@@ -3,7 +3,7 @@
   "textures": {
     "layer0": "arseng:item/portable_source_cell_housing",
     "layer1": "ae2:item/portable_cell_led",
-    "layer2": "arseng:item/portable_cell_screen",
-    "layer3": "arseng:item/portable_source_cell_1k"
+    "layer2": "ae2:item/portable_cell_screen",
+    "layer3": "ae2:item/portable_cell_side_1k"
   }
 }
diff --git a/src/generated/resources/assets/arseng/models/item/portable_source_cell_256k.json b/src/generated/resources/assets/arseng/models/item/portable_source_cell_256k.json
@@ -3,7 +3,7 @@
   "textures": {
     "layer0": "arseng:item/portable_source_cell_housing",
     "layer1": "ae2:item/portable_cell_led",
-    "layer2": "arseng:item/portable_cell_screen",
-    "layer3": "arseng:item/portable_source_cell_256k"
+    "layer2": "ae2:item/portable_cell_screen",
+    "layer3": "ae2:item/portable_cell_side_256k"
   }
 }
diff --git a/src/generated/resources/assets/arseng/models/item/portable_source_cell_4k.json b/src/generated/resources/assets/arseng/models/item/portable_source_cell_4k.json
@@ -3,7 +3,7 @@
   "textures": {
     "layer0": "arseng:item/portable_source_cell_housing",
     "layer1": "ae2:item/portable_cell_led",
-    "layer2": "arseng:item/portable_cell_screen",
-    "layer3": "arseng:item/portable_source_cell_4k"
+    "layer2": "ae2:item/portable_cell_screen",
+    "layer3": "ae2:item/portable_cell_side_4k"
   }
 }
diff --git a/src/generated/resources/assets/arseng/models/item/portable_source_cell_64k.json b/src/generated/resources/assets/arseng/models/item/portable_source_cell_64k.json
@@ -3,7 +3,7 @@
   "textures": {
     "layer0": "arseng:item/portable_source_cell_housing",
     "layer1": "ae2:item/portable_cell_led",
-    "layer2": "arseng:item/portable_cell_screen",
-    "layer3": "arseng:item/portable_source_cell_64k"
+    "layer2": "ae2:item/portable_cell_screen",
+    "layer3": "ae2:item/portable_cell_side_64k"
   }
 }
diff --git a/src/main/resources/assets/arseng/textures/item/portable_cell_screen.png b/src/main/resources/assets/arseng/textures/item/portable_cell_screen.png
diff --git a/src/main/resources/assets/arseng/textures/item/portable_source_cell_16k.png b/src/main/resources/assets/arseng/textures/item/portable_source_cell_16k.png
diff --git a/src/main/resources/assets/arseng/textures/item/portable_source_cell_1k.png b/src/main/resources/assets/arseng/textures/item/portable_source_cell_1k.png
diff --git a/src/main/resources/assets/arseng/textures/item/portable_source_cell_256k.png b/src/main/resources/assets/arseng/textures/item/portable_source_cell_256k.png
diff --git a/src/main/resources/assets/arseng/textures/item/portable_source_cell_4k.png b/src/main/resources/assets/arseng/textures/item/portable_source_cell_4k.png
diff --git a/src/main/resources/assets/arseng/textures/item/portable_source_cell_64k.png b/src/main/resources/assets/arseng/textures/item/portable_source_cell_64k.png