From 7ff496ae323ea6a5e0df1147a90ff5dc581a92b2 Mon Sep 17 00:00:00 2001 From: SpecialBuilder Date: Mon, 13 Nov 2023 23:35:47 -0500 Subject: [PATCH] Migrate simple CIT textures --- .../optifine/cit/fire_sprite.properties | 4 ++++ .../optifine/cit/fire_sprite_layer_1.png | Bin .../cit/orb_of_ankou/golden_helmet_6.properties | 4 ---- .../cit/sky_dimension/diamond_20_layer_1.png | Bin 4021 -> 0 bytes .../cit/sky_dimension/diamond_20_layer_2.png | Bin 624 -> 0 bytes .../sky_dimension/diamond_boots_20.properties | 4 ---- .../diamond_chestplate_20.properties | 4 ---- .../sky_dimension/diamond_helmet_20.properties | 4 ---- .../sky_dimension/diamond_leggings_20.properties | 4 ---- .../cit/sky_dimension/gold_7_layer_1.png | Bin 918 -> 0 bytes .../cit/sky_dimension/gold_7_layer_1_anim.png | Bin 1444 -> 0 bytes .../cit/sky_dimension/gold_7_layer_2.png | Bin 475 -> 0 bytes .../cit/sky_dimension/gold_7_layer_2_anim.png | Bin 702 -> 0 bytes .../cit/sky_dimension/golden_boots_7.properties | 4 ---- .../sky_dimension/golden_chestplate_7.properties | 4 ---- .../cit/sky_dimension/golden_helmet_7.properties | 4 ---- .../sky_dimension/golden_leggings_7.properties | 4 ---- .../cit/sky_dimension/iron_1_layer_1.png | Bin 678 -> 0 bytes .../sky_dimension/iron_chestplate_1.properties | 4 ---- .../cit/sky_dimension/leather_1_layer_1.png | Bin 324 -> 0 bytes .../sky_dimension/leather_1_layer_1_overlay.png | Bin 436 -> 0 bytes .../sky_dimension/leather_helmet_1.properties | 5 ----- .../cit/sky_dimension/netherite_20_layer_1.png | Bin 1362 -> 0 bytes .../cit/sky_dimension/netherite_20_layer_2.png | Bin 3205 -> 0 bytes .../sky_dimension/netherite_boots_20.properties | 4 ---- .../netherite_chestplate_20.properties | 4 ---- .../sky_dimension/netherite_helmet_20.properties | 4 ---- .../netherite_leggings_20.properties | 4 ---- .../optifine/cit}/flippers.properties | 2 +- .../optifine/cit}/flippers_layer_1.png | Bin .../optifine/cit}/flippers_layer_1_overlay.png | Bin .../optifine/cit}/scuba_tank.properties | 2 +- .../optifine/cit}/scuba_tank_layer_1.png | Bin gm4_scuba_gear/beet.yaml | 2 +- .../optifine/cit}/waders.properties | 2 +- .../optifine/cit}/waders_layer_1.png | Bin 36 files changed, 8 insertions(+), 65 deletions(-) create mode 100644 gm4_orb_of_ankou/assets/gm4_orb_of_ankou/optifine/cit/fire_sprite.properties rename gm4_resource_pack/assets/minecraft/optifine/cit/orb_of_ankou/gold_6_layer_1.png => gm4_orb_of_ankou/assets/gm4_orb_of_ankou/optifine/cit/fire_sprite_layer_1.png (100%) delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/orb_of_ankou/golden_helmet_6.properties delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_20_layer_1.png delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_20_layer_2.png delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_boots_20.properties delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_chestplate_20.properties delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_helmet_20.properties delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_leggings_20.properties delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_1.png delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_1_anim.png delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_2.png delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_2_anim.png delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_boots_7.properties delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_chestplate_7.properties delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_helmet_7.properties delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_leggings_7.properties delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/iron_1_layer_1.png delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/iron_chestplate_1.properties delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/leather_1_layer_1.png delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/leather_1_layer_1_overlay.png delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/leather_helmet_1.properties delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_20_layer_1.png delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_20_layer_2.png delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_boots_20.properties delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_chestplate_20.properties delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_helmet_20.properties delete mode 100644 gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_leggings_20.properties rename {gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear => gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit}/flippers.properties (77%) rename {gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear => gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit}/flippers_layer_1.png (100%) rename {gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear => gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit}/flippers_layer_1_overlay.png (100%) rename {gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear => gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit}/scuba_tank.properties (67%) rename {gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear => gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit}/scuba_tank_layer_1.png (100%) rename {gm4_resource_pack/assets/minecraft/optifine/cit/sunken_treasure => gm4_sunken_treasure/assets/gm4_sunken_treasure/optifine/cit}/waders.properties (65%) rename {gm4_resource_pack/assets/minecraft/optifine/cit/sunken_treasure => gm4_sunken_treasure/assets/gm4_sunken_treasure/optifine/cit}/waders_layer_1.png (100%) diff --git a/gm4_orb_of_ankou/assets/gm4_orb_of_ankou/optifine/cit/fire_sprite.properties b/gm4_orb_of_ankou/assets/gm4_orb_of_ankou/optifine/cit/fire_sprite.properties new file mode 100644 index 0000000000..20cd77992c --- /dev/null +++ b/gm4_orb_of_ankou/assets/gm4_orb_of_ankou/optifine/cit/fire_sprite.properties @@ -0,0 +1,4 @@ +type=armor +matchItems=golden_helmet +texture.gold_layer_1=fire_sprite_layer_1 +nbt.CustomModelData=$entity/fire_sprite diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/orb_of_ankou/gold_6_layer_1.png b/gm4_orb_of_ankou/assets/gm4_orb_of_ankou/optifine/cit/fire_sprite_layer_1.png similarity index 100% rename from gm4_resource_pack/assets/minecraft/optifine/cit/orb_of_ankou/gold_6_layer_1.png rename to gm4_orb_of_ankou/assets/gm4_orb_of_ankou/optifine/cit/fire_sprite_layer_1.png diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/orb_of_ankou/golden_helmet_6.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/orb_of_ankou/golden_helmet_6.properties deleted file mode 100644 index 8b922d73b7..0000000000 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/orb_of_ankou/golden_helmet_6.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=armor -matchItems=golden_helmet -texture.gold_layer_1=gold_6_layer_1 -nbt.CustomModelData=regex:(6|3420006) diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_20_layer_1.png b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_20_layer_1.png deleted file mode 100644 index 9223551b22f1f90e37e06479a1194f87adc59748..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4021 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 b0Q@%q?o%3M#p1f?00000NkvXXu0mjfEvSZ5 diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_20_layer_2.png b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_20_layer_2.png deleted file mode 100644 index a22cedfc60ab77ae0f79945dd5ed6f4656ad562d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQk(@Ik;M!Q+`=Ht$S`Y;1V}}) zN02WALzOxMLqjtI!><$|eTjjgtc`);%}WLb%Xth8qW_N7UAAIiVEpFk;uunK>&>+D zU2_}+j@3@AT*Ufz#{)${rsB_L0w=hC7*ub~@0!cmTb_4#EC7Ta}>Gi_kdVcb_kHPmet&b>E_>CsX_2CX<3$AxsUMj; z`?xxGHwt~aECdu-bE{LfoS89F7HFYhIrG792-?8;z zac#c)v1d2?&uDIrr7M}jOj#(Xff>hTeIl;`~a!-b{Q?9 z)|x-xPM4oN^MJO}nkcK&;cD@VYmT0K{B!5eU9l_;o-Os~-|klx3)4MT=yHd*Bu~cu zjlMV#trBDY5&x*S<|lgKf?6Zw0d$ z9&mp80d#km?x9snx9-ts_%Ar0Q%!O5gKq_gUT<2ad-$)~Jo`00_iyMkHOx+#Jgsmt z&v$uw&pTpXhmY*`WHUec;N+ZrzTJ|yeK)1Ef5>JK{gAz)Xw^@7U}|CTboFyt=akR{ E0O5%bTmS$7 diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_boots_20.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_boots_20.properties deleted file mode 100644 index cf0118edcf..0000000000 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_boots_20.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=armor -matchItems=diamond_boots -texture.diamond_layer_1=diamond_20_layer_1 -nbt.CustomModelData=regex:(20|3420020) diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_chestplate_20.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_chestplate_20.properties deleted file mode 100644 index 15aa9835b0..0000000000 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_chestplate_20.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=armor -matchItems=diamond_chestplate -texture.diamond_layer_1=diamond_20_layer_1 -nbt.CustomModelData=regex:(20|3420020) diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_helmet_20.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_helmet_20.properties deleted file mode 100644 index 3fe2ed2791..0000000000 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_helmet_20.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=armor -matchItems=diamond_helmet -texture.diamond_layer_1=diamond_20_layer_1 -nbt.CustomModelData=regex:(20|3420020) diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_leggings_20.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_leggings_20.properties deleted file mode 100644 index 588dff403b..0000000000 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_leggings_20.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=armor -matchItems=diamond_leggings -texture.diamond_layer_2=diamond_20_layer_2 -nbt.CustomModelData=regex:(20|3420020) diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_1.png b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_1.png deleted file mode 100644 index c7b487171c600d7642be8dd4b639b0d49892f229..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 918 zcmV;H18Mw;P)qw(f|NPyZo&W$9{>FaO zIsgCz97#k$RCwCtSuw7gKoI2&?o%PhNSq)AqKde~KZq|9WSW106lpCX%ThXM-5~{u zg3d+cV)gYE$-ERW>)A2JSmygVp`*rQXxc=zlCa4>1;8sO-e zgb0vha$eiqBKD0sVk`un&iUi&@J>?s0_*TMbmtZ$fBH zb%c@S30PGII>rfP8oIg;;P0-@HwXZL!^;Q>V2f{aWdK%H1{Q??KOv;ca}qc~DzQ;v zYt#{=34y+~eI7Z;BL~>bI*(166Nq3Q0%JKwZ<~;LwR8}0shN8J^SvgaDWyk~1aC3U zBS*`vA4)?P5BuF%ZCy)rSxu%iS>$z~$4E;H4g*D|T04MISL ztuAeg*guO;x>Ml2fwXT~IQKgJn`94wlV_IR&Gv`nV z`~7-u^dh(Fz1m?}r}O7Ny1YOkz0CvK?B(wBb~%q6YrmdrY15_f@qYIK*aDlG21Po7 z?b3A;5;sKrmgp=;Fnj4SlCZ~IiIoBVW#3LQ+30-1G)_Cl?dAEaZ-vCpUb2_F&;NM& z{o|{3kM!~Y{znJjAr6?kFi%o#A0-jQkJYk sfcY>FxU>WE&adqb@UwsoMZo_700ZXiTH&yQYXATM07*qoM6N<$g4zqBWdHyG diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_1_anim.png b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_1_anim.png deleted file mode 100644 index 9fbc9f2db1c50f075a38cf4c701dfeb88b50c49c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1444 zcmZ8hdo+}37=J&*3?_|8?q-xCx#d(+&Gco7iQLjfN)$Gi#f*(G%ttO|-D9OJqnp-Y zn3XNp{X}Uft97?aV~LdeG?_u{=bYWMXZM`j8n=1!`E4a>>s1H~>-lSo1XimV7Y$4S?_@ z0H!7Zuq*^XW%WgD*8u=z4C&TK+^!Bz{lH849ac;dZJ0T6qg~xvhmy!pS;6mIp~Pm% z*43!mF{a~oC%I)&diFLcUL!`Fmj0@RAzgMjG5oV%-%m#T6sHA8o?xCkv*+H>Kz`4} zc@lEkZJ$v0Pcv8xFa9FZ?yaJUBTBd-(erI;l;=v5;nHPz^lq}=LYz~r01#KQ{kzsWGIud31H{gF$l4D!R{L%8PREA|_y>Ww2p985sJyml@ zB3*syRmiOgd9cykg~@axS)fAgN)5r}$T;lz>(W^)+`j~XLvMYHOua!ZW7vjHH>_WE zi!L9+ z^^+o+Qy%8m;-}Di_Up_G!Bk-H^``4smP6YX{-B)uE^Aiqd(^h_b9e?%Av}LOZ(5dp zntY-4ezrv61eLmbc({-)D$Nx6WULQk&o4~3N6!|xmJ;SvwO8aAiIJ+~j)t>EuA1C4 zT6o)BJ~1F=&>{dZtq5^RR6lnr-^Ri}x$L-s@NE>z)Ay>7yeo$qb1$Z;!(zmc1rz&3 zrtO4BS7M$>0Lq}j>gahI+%U+zNurPiM&wFOTph2Oh1|vuy~CZlCX^tj8g($jnFKpu z8mAgbn1fU#h?1!Z_a^C4&E=@QEVSmk5=SA_yDP#%0y^Ym$rKhc2R$SFoxBqRk-f@m zf|MtIsm&=L|OS)k{F3fWoTr@@fM>3FJ4<5aN_(Ww6j zt{|Ga%ADPgX*<|KFvC6N6CUXbOvs!9PTjgt-!-I`g~+&H30nibxPWQ$9Fr}>LYB54 zHKrj3RhTxJ!!|p|aQ%u(G*}Eqa0w*E|0RwKP|mqGfgvUn^NK)sc_7#oac zc-&|2s9+)4dr8g|;=kJox+PM^9(}(Uk>TZ(gY5*LS!u0t+!pHSb%jMS2!CzL|L+PK1tAAg2^?9zoEg;H(};();pO;65vB`lDs@ZUrMByjsG<$|eTjjgtc`);%}WLb%Xth8qW_N7UAAIiU`+IMaSW-r^=6u3 z-eChC*IIE!R|Z+9#r>D0e<+Dgn$2=SV8QIthCW7{iqmUMf6dh}SaW-q!)hfX_Crb@ z%>T}-9OZM^p88s(fhmB2%YjjYfpq}`oYTO|R8d>GYqO?>&q2kiZcU356}i8~86?vc zcsuUp@jHAG^I*P|v5mVS`ZI&xaa$l-w_JAJ^1JQEKTD>4R0I0t-n?#&Po8hW{~c!T zxTn<1mT9s;y5YBtU+zS=W}EM!d7bv`2CVHi-(3T~Z2M6nddlJw!;*!v3@RPm&qOCa z-^Ve{VOA#NzvGuPx)N4#aJKwOi)#38bDz0_wZMU8%}&V=HwB&)S}JS2w~n`~tkD$P z>nh6NEx#*FB7W}9`Gs!#WKY#h{J49j^Up_fH7!E!v(#tpNj-IDhpgAs0Mn0Mk+c5` zFg)>jz_e4MuD7VM=ESK#TDl*kMHR%Csvazw7&SS5G1EPE1}1}bufESO{sZ(5gQu&X J%Q~loCIBMPvV8ym diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_2_anim.png b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_2_anim.png deleted file mode 100644 index b76b1ad48b9492ef9d811055285c5f36527431b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 702 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDb50q$YKTtZeb8+WSBKa0w}1E z>=ES4z)+w%o+z-1wv}9B43Y}j!Lj3>R>EJCduKC}t@%{ACdF;M zad^$a&o;ZGjyT78M4hSB0a}d?W+*mHU;g`E#%iD3sVg;uw}vjWu>bNyoMG;^N!nMY zy!^vplB%`SX`SCQ?gM=%nQyF}erxS?tDJWwH}2F{zEA#dcg~;5;rl=~&YTk73 z73-IC2wqlHsuZsNDV#z2_MUjLb$(ages)|ZRL{3ytx@T38<8thGCTe*H8^)#bdvTm z<^$p>+}mU?zWp3fz>{L+ec<1tb$(6<_bDeS*v&g5v?2T6Jmwts2nV?vPrfyH&t7o$ zcy-JC@3AubZ~fUB6TD1{<-kt;s_evXFLECHMVB5Ay%GPYCjb1$&x_A*30-#3zsX*< z>|~4W;~iYFk9MCdJG1t)JEOuq;he^864jDhS#SB8&9grt^rM%rgWu~pS08`S_A~NJ zn0F|%pobHXUk8H+-uz+kymUKR!z<`K`wp?k><_TO0(TB9X8d7*!iI@9_6hS>U;g&_ zC*yJp8~q1fJ@O4$-~m}hEXI6bhQVWx*}wdYe;^Vq{~!pP2?l=l50V*Pac}KbKF)d+ OWR$0?pUXO@geCxCf(aY| diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_boots_7.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_boots_7.properties deleted file mode 100644 index c861284814..0000000000 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_boots_7.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=armor -matchItems=golden_boots -texture.gold_layer_1=gold_7_layer_1 -nbt.CustomModelData=regex:(7|3420007) diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_chestplate_7.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_chestplate_7.properties deleted file mode 100644 index 55231e2a33..0000000000 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_chestplate_7.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=armor -matchItems=golden_chestplate -texture.gold_layer_1=gold_7_layer_1 -nbt.CustomModelData=regex:(7|3420007) diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_helmet_7.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_helmet_7.properties deleted file mode 100644 index 1961e24297..0000000000 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_helmet_7.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=armor -matchItems=golden_helmet -texture.gold_layer_1=gold_7_layer_1 -nbt.CustomModelData=regex:(7|3420007) diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_leggings_7.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_leggings_7.properties deleted file mode 100644 index 6e158880a0..0000000000 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_leggings_7.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=armor -matchItems=golden_leggings -texture.gold_layer_2=gold_7_layer_2 -nbt.CustomModelData=regex:(7|3420007) diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/iron_1_layer_1.png b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/iron_1_layer_1.png deleted file mode 100644 index 326eee18ea9b68f6c289def7b5c2e30bce3f4dad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 678 zcmV;X0$KfuP)qw(f|NPyZo&W$9{>FaO zIsgCyEJ;K`RCwC#n9FX{Koo{QmsY9cTLV!bl%P@(iA6zz9TE$k0I@3au8-E8rLI}Q zJFp>At1hykkTx|X-d&b;nz@(U+Cr<%nUi{AEXTObKH%)1oE9!dw;-!k4>qT(#B}Lpr2*K8N zoyNxx5@442yg9DN!}_DKXRR-v7h@N&Ek}tGaZk;vZQDw?ZQBSTls_MTne}6lFOT^J z08qRC0D#f*{mKNHdtF-n-Vk` z58!zvy4`cNOPECq*WKVENfu)p?8joNy}4NfpnA8aM9u1x0rR{PuDijV>OCrz>Xjuj zS8G6ic5TZc9i+6+PDhK`Cv^tM{QX!EMI9wDgOLu>UzzbOB#JtJWexZv8E}y#G@Hlj zg_C|v(Xs(3S~lq*B@EljA4Q$9cC&e`AfC2PRQy6@z>tCgU|I!+qi12*mZLl6az)kh zuD@plK|q}Rz_iK?NByd|Z_++%$uMlItg|ivvCqex=yx{h80P*@5{-(IFyZ`_I M07*qoM6N<$f)?!~zyJUM diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/iron_chestplate_1.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/iron_chestplate_1.properties deleted file mode 100644 index 3ac8199627..0000000000 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/iron_chestplate_1.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=armor -matchItems=iron_chestplate -texture.iron_layer_1=iron_1_layer_1 -nbt.CustomModelData=regex:(1|3420001) diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/leather_1_layer_1.png b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/leather_1_layer_1.png deleted file mode 100644 index ad47e2b05df7cea32bae32a964ca6e7df6fa23b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQk(@Ik;M!Q+`=Ht$S`Y;1V}}) zN02WALzOxMLqjtI!><$|eTjjgtc`);%}WLb%Xth8qW_N7UA6+MJ>}`*7*cWT&9#k! zhZT5O1Ku7v64el8+j=Z$)%?RU6MkIMcqX2ub0(5sU|Pq7*cDkTvS!>={qX1V@0-s1 z7#%LI-CEA@@FPQ-*tc7wUu8xgi)`Og{{X1FZYI)ajz3HCwbi)0o zzan})84axOzmr@2w%cJjTA267oZUHx3vIVCg! E019Mypa1{> diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/leather_1_layer_1_overlay.png b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/leather_1_layer_1_overlay.png deleted file mode 100644 index bc0aff088397ec475e5a6f71502a17a309d272a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 436 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 diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_boots_20.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_boots_20.properties deleted file mode 100644 index a810b31c75..0000000000 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_boots_20.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=armor -matchItems=netherite_boots -texture.netherite_layer_1=netherite_20_layer_1 -nbt.CustomModelData=regex:(20|3420020) diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_chestplate_20.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_chestplate_20.properties deleted file mode 100644 index e87b7c73b5..0000000000 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_chestplate_20.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=armor -matchItems=netherite_chestplate -texture.netherite_layer_1=netherite_20_layer_1 -nbt.CustomModelData=regex:(20|3420020) diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_helmet_20.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_helmet_20.properties deleted file mode 100644 index c60b25223c..0000000000 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_helmet_20.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=armor -matchItems=netherite_helmet -texture.netherite_layer_1=netherite_20_layer_1 -nbt.CustomModelData=regex:(20|3420020) diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_leggings_20.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_leggings_20.properties deleted file mode 100644 index eab1fb43ab..0000000000 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_leggings_20.properties +++ /dev/null @@ -1,4 +0,0 @@ -type=armor -matchItems=netherite_leggings -texture.netherite_layer_2=netherite_20_layer_2 -nbt.CustomModelData=regex:(20|3420020) diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear/flippers.properties b/gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit/flippers.properties similarity index 77% rename from gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear/flippers.properties rename to gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit/flippers.properties index 4a9d29db42..78ace69e25 100644 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear/flippers.properties +++ b/gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit/flippers.properties @@ -2,4 +2,4 @@ type=armor matchItems=leather_boots texture.leather_layer_1=flippers_layer_1 texture.leather_layer_1_overlay=flippers_layer_1_overlay -nbt.CustomModelData=regex:(2|3420002) +nbt.CustomModelData=$item/flippers diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear/flippers_layer_1.png b/gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit/flippers_layer_1.png similarity index 100% rename from gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear/flippers_layer_1.png rename to gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit/flippers_layer_1.png diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear/flippers_layer_1_overlay.png b/gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit/flippers_layer_1_overlay.png similarity index 100% rename from gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear/flippers_layer_1_overlay.png rename to gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit/flippers_layer_1_overlay.png diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear/scuba_tank.properties b/gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit/scuba_tank.properties similarity index 67% rename from gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear/scuba_tank.properties rename to gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit/scuba_tank.properties index dcab77a466..95df21c39c 100644 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear/scuba_tank.properties +++ b/gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit/scuba_tank.properties @@ -1,4 +1,4 @@ type=armor matchItems=golden_chestplate texture.gold_layer_1=scuba_tank_layer_1 -nbt.CustomModelData=regex:(1|3420001) +nbt.CustomModelData=$item/scuba_tank diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear/scuba_tank_layer_1.png b/gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit/scuba_tank_layer_1.png similarity index 100% rename from gm4_resource_pack/assets/minecraft/optifine/cit/scuba_gear/scuba_tank_layer_1.png rename to gm4_scuba_gear/assets/gm4_scuba_gear/optifine/cit/scuba_tank_layer_1.png diff --git a/gm4_scuba_gear/beet.yaml b/gm4_scuba_gear/beet.yaml index 559f908157..bb31f40579 100644 --- a/gm4_scuba_gear/beet.yaml +++ b/gm4_scuba_gear/beet.yaml @@ -40,7 +40,7 @@ meta: template: generated_overlay - item: golden_chestplate reference: item/scuba_tank - tempalte: generated + template: generated - item: player_head reference: item/scuba_helmet template: generated diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sunken_treasure/waders.properties b/gm4_sunken_treasure/assets/gm4_sunken_treasure/optifine/cit/waders.properties similarity index 65% rename from gm4_resource_pack/assets/minecraft/optifine/cit/sunken_treasure/waders.properties rename to gm4_sunken_treasure/assets/gm4_sunken_treasure/optifine/cit/waders.properties index 89ae656be5..310991d888 100644 --- a/gm4_resource_pack/assets/minecraft/optifine/cit/sunken_treasure/waders.properties +++ b/gm4_sunken_treasure/assets/gm4_sunken_treasure/optifine/cit/waders.properties @@ -1,4 +1,4 @@ type=armor matchItems=golden_boots texture.gold_layer_1=waders_layer_1 -nbt.CustomModelData=regex:(1|3420001) +nbt.CustomModelData=$item/waders diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sunken_treasure/waders_layer_1.png b/gm4_sunken_treasure/assets/gm4_sunken_treasure/optifine/cit/waders_layer_1.png similarity index 100% rename from gm4_resource_pack/assets/minecraft/optifine/cit/sunken_treasure/waders_layer_1.png rename to gm4_sunken_treasure/assets/gm4_sunken_treasure/optifine/cit/waders_layer_1.png