From f51faf25ce2a4900de3f1f11d8a7aa6a55a203da Mon Sep 17 00:00:00 2001 From: 90 Date: Sat, 21 Dec 2024 16:31:00 +0000 Subject: [PATCH] Remove some redundant textures --- settings.gradle.kts | 2 +- .../gripe/_90/arseng/data/ItemModelProvider.java | 4 ++-- .../673f85be5b770d138b429784cd3e193441e9291d | 12 ++++++------ .../models/item/portable_source_cell_16k.json | 4 ++-- .../models/item/portable_source_cell_1k.json | 4 ++-- .../models/item/portable_source_cell_256k.json | 4 ++-- .../models/item/portable_source_cell_4k.json | 4 ++-- .../models/item/portable_source_cell_64k.json | 4 ++-- .../arseng/textures/item/portable_cell_screen.png | Bin 213 -> 0 bytes .../textures/item/portable_source_cell_16k.png | Bin 215 -> 0 bytes .../textures/item/portable_source_cell_1k.png | Bin 191 -> 0 bytes .../textures/item/portable_source_cell_256k.png | Bin 205 -> 0 bytes .../textures/item/portable_source_cell_4k.png | Bin 213 -> 0 bytes .../textures/item/portable_source_cell_64k.png | Bin 214 -> 0 bytes 14 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 src/main/resources/assets/arseng/textures/item/portable_cell_screen.png delete mode 100644 src/main/resources/assets/arseng/textures/item/portable_source_cell_16k.png delete mode 100644 src/main/resources/assets/arseng/textures/item/portable_source_cell_1k.png delete mode 100644 src/main/resources/assets/arseng/textures/item/portable_source_cell_256k.png delete mode 100644 src/main/resources/assets/arseng/textures/item/portable_source_cell_4k.png delete mode 100644 src/main/resources/assets/arseng/textures/item/portable_source_cell_64k.png diff --git a/settings.gradle.kts b/settings.gradle.kts index e14c867..3a54a49 100644 --- 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 index 97c9b1e..19f9105 100644 --- 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 index dfdb3e6..ab3a9bf 100644 --- 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 index db6d1e0..08fe3dd 100644 --- 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" } } \ No newline at end of file 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 index 1fa0edf..db3578b 100644 --- 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" } } \ No newline at end of file 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 index 02541dc..612e8b6 100644 --- 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" } } \ No newline at end of file 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 index 17970e2..98b61df 100644 --- 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" } } \ No newline at end of file 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 index 32124da..96dce60 100644 --- 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" } } \ No newline at end of file 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 deleted file mode 100644 index bc23bbd3d32ac072dc060b2e6ab70b6df15163a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP_W(8 z#WBR9_w6J@u0sw2uJ>7P@9h%bAiRc^U&=$)V>Wv36jy2L-7kCZ_kM}u z^1c)cmwM-dSF);>2lnJJl)%_BMG$wiR@|4HHzS-n54 zJ^g{|rbWf4im9$O{NK1F<7D0)${#Bp3SvDCoy=s`njxg HN@xNA*z`=9 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 deleted file mode 100644 index 4eba983953435031aac8246bf5d4483b46c2280e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP_Wa} z#WBR9H~G*1|MtwP4V_AN7qdC=1l-&4Z-3l1FkA9Ende-O^^_O$o4r}2~j|Nrv< zae9HpkNJvUkDmO$YbO80q$3GaGWOJ7?)kX-cjTm)0~TM5g&C6nM=-qU$Q1)Riow&> K&t;ucLK6Tdu38KL 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 deleted file mode 100644 index 03bdf1ffac0422cb1eb777d722c096a0900f088b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP_WR` z#WBR9_wD43ybT6CEbo=OJl-5&()co^hxzvbhn|Kb3@Pkc!GagnLOg2TU%vV2^qC6b z?^(at85S7Gv1LThN@Bj6oBTH>?E!=JcZ~%clXw^yZ^l1mIA?o`{S5mRUqkMoyT_%k lr7Xy4cHeaU!uQi9jMeMp73QTeH2^JV@O1TaS?83{1OOH@LN)*Z 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 deleted file mode 100644 index 4a1162d64ab52af206f4494b853c0188e2c5da0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP_W+9 z#WBR9H~G*1|MtwP4V_AN7qdC=e6WA zpMSwg99`U8a<2c>Pcz&-)6TPZ{^EbuGJnoLC_m7z;{1T8z4^anmA(7l>t|~`CUHw7 zRv!E)pc3%&-|zqTGxkrMc*CPX+Cfj^#}p2R8u|C>SMFrw0G-0%>FVdQ&MBb@00xXt AW&i*H 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 deleted file mode 100644 index 7a90af299e96b19751dc791da2437ccdae056e31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP_W(8 z#WBR9H~G*1|MtwP4V_AN7qdC=WXw7EAzuHr;7_(Sd%tuTS_Hn^|1`vim*d*x-}}q{ zDZB9-vu)yO+?{Y-lMTe46f7#t%*=fF*3W(k+ewoDu3KI&~xK)>paH1TtcGx>l2S6#>W@V`!EFF59wL{)F%q)BnD4cKbLh* G2~7ZTgiw9} 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 deleted file mode 100644 index b778122f8f064904e814607a9baf9bfd7972bfb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP_V<( z#WBR9H~G*1|MtwP4V_AN7qdC=B+Q!fH(vj>;7_&}cQn##p5Fg_zesB)Tg=55fAqI) zZ27p)OD?kQKe&`cGyX3%mOpf~