From a8028719d2a667d168357f6f367e8639a1c4bcb7 Mon Sep 17 00:00:00 2001 From: DMgaming100 Date: Mon, 30 Sep 2024 14:55:12 +0300 Subject: [PATCH] oxygen collector and bubble distrinutor --- .../blockstates/oxygen_bubble_distributor.json | 5 ++++- .../blockstates/oxygen_collector.json | 5 ++++- .../oxygen_bubble_distributor_active.json | 6 ++++++ .../models/machine/oxygen_collector.json | 3 +-- .../models/machine/oxygen_collector_active.json | 6 ++++++ .../block/oxygen_bubble_distributor.png | Bin 455 -> 293 bytes .../block/oxygen_bubble_distributor_active.png | Bin 0 -> 438 bytes ...oxygen_bubble_distributor_active.png.mcmeta} | 2 +- .../textures/block/oxygen_collector.png | Bin 873 -> 307 bytes .../textures/block/oxygen_collector_active.png | Bin 0 -> 456 bytes .../block/oxygen_collector_active.png.mcmeta | 5 +++++ 11 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/galacticraft/models/machine/oxygen_bubble_distributor_active.json create mode 100644 src/main/resources/assets/galacticraft/models/machine/oxygen_collector_active.json create mode 100644 src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor_active.png rename src/main/resources/assets/galacticraft/textures/block/{oxygen_collector.png.mcmeta => oxygen_bubble_distributor_active.png.mcmeta} (54%) create mode 100644 src/main/resources/assets/galacticraft/textures/block/oxygen_collector_active.png create mode 100644 src/main/resources/assets/galacticraft/textures/block/oxygen_collector_active.png.mcmeta diff --git a/src/main/generated/assets/galacticraft/blockstates/oxygen_bubble_distributor.json b/src/main/generated/assets/galacticraft/blockstates/oxygen_bubble_distributor.json index 5fe217384..1fdfbaadb 100644 --- a/src/main/generated/assets/galacticraft/blockstates/oxygen_bubble_distributor.json +++ b/src/main/generated/assets/galacticraft/blockstates/oxygen_bubble_distributor.json @@ -1,7 +1,10 @@ { "variants": { - "": { + "active=false": { "model": "galacticraft:machine/oxygen_bubble_distributor" + }, + "active=true": { + "model": "galacticraft:machine/oxygen_bubble_distributor_active" } } } \ No newline at end of file diff --git a/src/main/generated/assets/galacticraft/blockstates/oxygen_collector.json b/src/main/generated/assets/galacticraft/blockstates/oxygen_collector.json index 50ecd2ec6..32cdc6e08 100644 --- a/src/main/generated/assets/galacticraft/blockstates/oxygen_collector.json +++ b/src/main/generated/assets/galacticraft/blockstates/oxygen_collector.json @@ -1,7 +1,10 @@ { "variants": { - "": { + "active=false": { "model": "galacticraft:machine/oxygen_collector" + }, + "active=true": { + "model": "galacticraft:machine/oxygen_collector_active" } } } \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/models/machine/oxygen_bubble_distributor_active.json b/src/main/resources/assets/galacticraft/models/machine/oxygen_bubble_distributor_active.json new file mode 100644 index 000000000..312ce6cc3 --- /dev/null +++ b/src/main/resources/assets/galacticraft/models/machine/oxygen_bubble_distributor_active.json @@ -0,0 +1,6 @@ +{ + "machinelib:generate": "machinelib:single", + "sprites": { + "sprite": "galacticraft:block/oxygen_bubble_distributor_active" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/models/machine/oxygen_collector.json b/src/main/resources/assets/galacticraft/models/machine/oxygen_collector.json index 305edaef6..13a90126b 100644 --- a/src/main/resources/assets/galacticraft/models/machine/oxygen_collector.json +++ b/src/main/resources/assets/galacticraft/models/machine/oxygen_collector.json @@ -1,7 +1,6 @@ { "machinelib:generate": "machinelib:single", "sprites": { - "sprite": "galacticraft:block/oxygen_collector", - "particle": "galacticraft:block/oxygen_collector" + "sprite": "galacticraft:block/oxygen_collector" } } \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/models/machine/oxygen_collector_active.json b/src/main/resources/assets/galacticraft/models/machine/oxygen_collector_active.json new file mode 100644 index 000000000..1c14ef31c --- /dev/null +++ b/src/main/resources/assets/galacticraft/models/machine/oxygen_collector_active.json @@ -0,0 +1,6 @@ +{ + "machinelib:generate": "machinelib:single", + "sprites": { + "sprite": "galacticraft:block/oxygen_collector_active" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor.png b/src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor.png index e92087453d51fffbd4f5abac082ceb132d3f1ea4..8ed81732977e73216f7ae960db3e65747fdb4ce9 100644 GIT binary patch delta 278 zcmX@kyp(BzL_G^L0|Ud`yN`l^6k~CayA#8@b22Z19F}xPUq=Rpjs4tz5?O(Kl>na* zR}T;OprD}0s7MBojTRd&hEh1rS?GeoCO|{#S9F5 zhd`K7RKu$QDA?uc;us=vIXNLDNF+fZ#UQa>fRERd*Nm4pQNT~nTwl+eJ6S+aFJ1qI z0e^CW-i(ve47zQ58nd+|!%6A$#fF2_t+CdZbPq01G_zVhUij9IKx zZbfYg(#@E{@XD+KzA{Cy85}Sb4q9e066hoP5=M^ delta 441 zcmV;q0Y?6%0>=Z87=H)`0000V^Z#K00004VQb$4nuFf3k0004jNkl%!pS;hxQA6Z+TJb(kro$nzZM93u}7m(Oc5nV_{sYkk2@hCa2{ z6h#5R%gZxLsW2;wg7x~OBC;^_=1JE#H$W45k1M6beHt@%Lkp{r3JAa9>_^q~N@Up7T8akuw75`#u7f%Vm)5EzRe1 zX0ut~gbe!r@5QqJa$VP~R;x&j&jdgSaXO@P*s(|D9dh*@fZFGIZ152#6z%gZ?v@#E9I-LgMu#YTkx9tUJj0wFE jg5BPx#1ZP1_K>z@;j|==^1poj5Bv4FLMMy|TQc_Y`T3I|iJ1HqCG&D3MBqS9T6>@TN zySuxUm6bj|KEU;*KL7v#32;bRa{vGi!vFvd!vV){sAK>D0UJp~K~yNuozSsr!!QsA z;439Ic9#}EK|93f%yyCo2%Sq@iH@NTqS=fC@mdrJrVkLXC*v;7?RmdSax}Clg%&jY zAffy2hl{)0Yq)_J0>+XwVUG}G-LNS@jRk)b``O_MVO3n!Wm=+9Ob|P0*7h5!Hn literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/galacticraft/textures/block/oxygen_collector.png.mcmeta b/src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor_active.png.mcmeta similarity index 54% rename from src/main/resources/assets/galacticraft/textures/block/oxygen_collector.png.mcmeta rename to src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor_active.png.mcmeta index 01955dc7e..24f9c2fae 100644 --- a/src/main/resources/assets/galacticraft/textures/block/oxygen_collector.png.mcmeta +++ b/src/main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor_active.png.mcmeta @@ -1,5 +1,5 @@ { "animation": { - "frametime": 0.5 + "frametime": 1 } } diff --git a/src/main/resources/assets/galacticraft/textures/block/oxygen_collector.png b/src/main/resources/assets/galacticraft/textures/block/oxygen_collector.png index f9bfd112d62acd8872e728aa7d7e4170b13754cf..e4643210c0ca5223c2675ca6cb1d2e57d3e2d071 100644 GIT binary patch delta 293 zcmaFKwwY;yc)b7%GXn#|+q;i~fD~hKkh>GZx^prwfgF}}M_)$E)e-c@Ne1ia= z5LXWm_n@Gl$f!sg8*5EX&7@$>;uMqSB5OZK6(A556)h?%+P!=C)TvWVOib+T?0EJ( z>jLWKEbxddW?8eR=R!5&W+$NCV7%gG5LK_UqPDF%rGzS{cU+`PGo0<-s= z%KE5v+JkN5(bYS|-fZhiNr*0JD?Svdr;vOx_N-_5R)?Oww`P|$Ng9{xooz8F(cgRJ z6^qfcjC?EZl$zKQ_sfdT^W{rQ mR+4ftF*fPDD$dPeVzAzC7IVC0;&Y(O7(8A5T-G@yGywqm@M%r} delta 863 zcmV-l1EBn~0_g^j7k@wq0ssI2oF8Dp00004XF*Lt006O$eEU(80009ZNklBjE6vzKI7D;8%vrV9xn!&*)5a?t>XzIwh=^WSp- zv)L_mO|#71IF4^_#wF7%R|?;%W*I=`<>I&K=bRdo$#(#iG5}o9lN%T%0M%;w^bYB&wSO9*s6it_2=-89Yv1>kQq=BtyWMUVfKsa0>pke9-|quxwObU)=xRhG zx)hNo9CxKs;lb;1lJkS-c@znScX)W{I8MsLZ1!t1S?nw8`u+at=_$LSd;l1Rk;;KA zCgU-+C*v_M!!l{pe8C-E9YxXV>Ix;zYnmiUiL#-U_J4gJK(pB(i}m$aY|2|%*xh|w zGk);IYc+!!)oPgsCzD%RqQNB!TU%Rth)I%gewmR)(i+Ei)udOa!|`i`zfVHhf<^dirCAf0X7^?IGA z$RP0-9)EPn;lcB~3=h;zd0-w~*A2sv=4KwCK?1-qjHL&zZJmevu`PL^l@>y5Zq{+f z1I_Xv52TCZn0es+dImhS+a2Hcb9q=4U*>+GbAK@S$|KY16j%dL78wn z4T)%MwObt0@$qpKMJW%&!-o@JPmV*%2y*d>F*^Lod}-n% pd7zMcu-2wmHsby_ybJf#J%}kx>EoE002ovPDHLkV1mTAr8@us diff --git a/src/main/resources/assets/galacticraft/textures/block/oxygen_collector_active.png b/src/main/resources/assets/galacticraft/textures/block/oxygen_collector_active.png new file mode 100644 index 0000000000000000000000000000000000000000..bdc6fd7200f42c9ad3e9d0d8577360b8ee6f632e GIT binary patch literal 456 zcmV;(0XP1MP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMMy|TQc_Y`T3I|iJ1HqCVpAz|WHf_vJ5E6) zBqSsi6%}%Fa=W{`m6eq=G&DXwJ`B9(iU0rr32;bRa{vGi!vFvd!vV){sAK>D0U=35 zK~yNuozSsL!$2Iz@xOy&js$eDyKc#)n}fD%7at&CUm%a5FOWiSE2hg~htN*VB-g0~ zAE1zf5J&rm(k(c5H@Wi!tq2PL;k*4m{NUi?`~*(n63)W=yD$hMXvJw~mR|RvHA_j7 zb^36W