From 7e914f010ef9e652a8ad671adba84355d17c6498 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Fri, 10 Mar 2023 00:32:47 +0600 Subject: [PATCH] Make shields normal --- .../mc/otm/datagen/blocks/BlockStates.kt | 1 + .../mc/otm/datagen/items/ItemModels.kt | 1 + .../models/block/cobblestone_generator.json | 84 ++++++++++++++++++ .../item/tritanium_shield_blocking.json | 14 +-- .../textures/block/cobblestone_generator.png | Bin 0 -> 1104 bytes .../item/component/tritanium_nugget.png | Bin 2437 -> 224 bytes 6 files changed, 93 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/cobblestone_generator.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/cobblestone_generator.png diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt index 1d7daaded..3182f3a45 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt @@ -87,6 +87,7 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.STORAGE_POWER_SUPPLIER) provider.block(MBlocks.MATTER_RECYCLER) provider.block(MBlocks.ENERGY_SERVO) + provider.block(MBlocks.COBBLESTONE_GENERATOR) provider.exec { for (crate in MRegistry.CARGO_CRATES.allBlocks.values) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index ead8fb642..c2773104a 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -122,6 +122,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.PLATE_PRESS, "plate_press_idle") provider.block(MItems.STORAGE_POWER_SUPPLIER, "storage_power_supplier") provider.block(MItems.MATTER_RECYCLER, "matter_recycler_working") + provider.block(MItems.COBBLESTONE_GENERATOR, "cobblestone_generator") provider.block(MItems.STORAGE_BUS) provider.block(MItems.STORAGE_IMPORTER) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/cobblestone_generator.json b/src/main/resources/assets/overdrive_that_matters/models/block/cobblestone_generator.json new file mode 100644 index 000000000..2f06eb12d --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/cobblestone_generator.json @@ -0,0 +1,84 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 64], + "textures": { + "0": "overdrive_that_matters:block/cobblestone_generator", + "particle": "overdrive_that_matters:block/cobblestone_generator" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 6, 16], + "faces": { + "north": {"uv": [8, 0, 16, 1.5], "texture": "#0"}, + "east": {"uv": [8, 0, 16, 1.5], "texture": "#0"}, + "south": {"uv": [8, 0, 16, 1.5], "texture": "#0"}, + "west": {"uv": [8, 0, 16, 1.5], "texture": "#0"}, + "up": {"uv": [0, 10, 8, 14], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 4], "texture": "#0"} + } + }, + { + "from": [4, 6, 0], + "to": [12, 16, 16], + "faces": { + "north": {"uv": [12, 4, 16, 6.5], "texture": "#0"}, + "east": {"uv": [8, 1.5, 16, 4], "texture": "#0"}, + "south": {"uv": [12, 8.5, 16, 11], "texture": "#0"}, + "west": {"uv": [8, 1.5, 16, 4], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 16, 8.5], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [1, 6, 1], + "to": [4, 15, 15], + "faces": { + "north": {"uv": [8.5, 7, 7, 9.25], "texture": "#0"}, + "south": {"uv": [7, 7, 8.5, 9.25], "texture": "#0"}, + "west": {"uv": [0, 7, 7, 9.25], "texture": "#0"}, + "up": {"uv": [0, 9.25, 7, 10], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [12, 6, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [7, 4, 8.5, 6.25], "texture": "#0"}, + "east": {"uv": [0, 4, 7, 6.25], "texture": "#0"}, + "south": {"uv": [8.5, 4, 7, 6.25], "texture": "#0"}, + "up": {"uv": [0, 6.25, 7, 7], "rotation": 90, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield_blocking.json b/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield_blocking.json index ee8421417..22d720b39 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield_blocking.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield_blocking.json @@ -105,20 +105,20 @@ ], "display": { "thirdperson_righthand": { - "rotation": [90, 39, -40], + "rotation": [120, 0, -45], "translation": [1, -2, 0] }, "thirdperson_lefthand": { - "rotation": [90, 0, 180], - "translation": [0, -2, 4] + "rotation": [120, 0, 135], + "translation": [1, -2, 0] }, "firstperson_righthand": { - "rotation": [90, -5, -90], - "translation": [-1.75, -7, 4] + "rotation": [82, 6, -90], + "translation": [-1.5, -4.75, 4.75] }, "firstperson_lefthand": { - "rotation": [90, -5, 90], - "translation": [-1.75, -7, 4] + "rotation": [82, 6, 90], + "translation": [-1.75, -4.75, 4] }, "ground": { "rotation": [90, 0, 0], diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cobblestone_generator.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cobblestone_generator.png new file mode 100644 index 0000000000000000000000000000000000000000..d1c82ec86ab9b99853eec50a33dbeefcc652268c GIT binary patch literal 1104 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3-pQ0$S$)DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(ehKlmmQ1Tun_)wY9ay#KhFp)Y2+ja+~`9|Nmc9R8(JI-`?IH5)zV-kYF6V z-Xv^`Mf5?J{Fhbas@zN!yO}2TVv+5u zm5!GJd9TF?UJmBH9Kv^}Q1(%~_Vsw->#;%)+jZ_$Dc#DHc-*IdGez`vuJp4RX0KK` z-z}Cq>%?(8N9yHLhlj127reM`=Sp3T6u1(~cfUsE-7dek+k752s-Jb?yy(My(vt07 zh2pd6rsqAlE(h^mPY^z7!FIxo^@11o+pS)&*Sfr1=J0f?$?NrQ7k#-;S+gBCVLffj ze#VjGdYsUwv(b;*wVuzmIOoQBJ6rNnAkVEV$wwVJ4_h>^MhKku;<{TZeP!%DzPNUFBlj&GzARn8uAT+mT?w%L>4nJ@ErnSMo|r~1_lNuPfr)e5D)LC zQ>()-I|v+2-?VaVtl8ETf-J!<7lTBn1l4FO?Q>wfpMU%Pf6YC+tvwI7$(;-Q|GE5D z$>p8a)#+ukg$kE&DJ{DZwEC#2eMhHe(3u|!X`+JjITmOfGHEP)tTs&{^*Q&6g|EII z^YmuEBK_5BrP7-K-vzUyZu3`jvh+mH5DUI0tjSp!k@?{HE}31E9KDY+u?T&NVD!?o zaJmrk^qA(1DH8;^R>`fBY;p@_DKHXyuuSR0?57)h9Yt3hb~S8Jxbx0yW|Z-**3df) z(XTORw@>;3(4^S*!e z{!hmIDsjrc6(&wf{_QgH#}6Bm_QMO0B=a0+YW$Mu82o6du&JklkI0jjrl5uM>L(-y z&9pqOFPQS9`rt;ne@pm(yq{2!vpsH~{)zb(!awy{7GKQYEo~fndW*z6U`k`~boFyt I=akR{0I=K?MF0Q* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_nugget.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_nugget.png index d36635b4d3d72a5dd2644f4bd55341d6da866d5b..477a509933873bb793c436ad52653d9f6194b16b 100644 GIT binary patch delta 202 zcmZn_e!!^M8Q|y6%O%Cdz`(%k>ERLtqy<2jgBeI_=<)|oR8**!2=EDUjfl^P&97>l zwPNn>GnO_EezEDfP5nScJ@I_&fD}hbkYDhB2w=F^yf+dk##!JIS^M7Zw^N&9NA*$7}|A%QFZAQ omUjwy*M9%m7zZJjkY>wb;}+i^bu_gMVX#MEe?A$v*Na(MM4QcKvNOrc zVt#pbv5sJ!F;>@gp66QYx>Ssko*|F+b~vfvjo)&zJV}yR)rwHAdF9Y#e=9J0gTAr@ zH)yX@#d@8fNU|s29e2Vu&SY6CxO_G}Rf^zIO2Kvf#!Z}3-{SXPyt}%bQ%d|+3tK9s zYfUNTRB)S1-?d!FF7bjJhzy=F&-0SJ==AzOJUbZwv<+sO=GpoAcxSKM>Bn&l zC_erC;cPZ1gx0$84G&PlV@rMa_I{q1Cl}|sCWdKHgjrXDQ&}Uie3t^a!=ZQk=qH}rKEJqtoB#aRCyR9gJbL}!<@Ex{ zfJIF<2x$kw>Dk%r8krNSX0~YpAIq_eB9Ee!(Ha2NH3M#oWyB3*dUE>Z*Z*O+j_%B6 zvvANd4C~qSY#m3VfAJW=7eyfi(m-&EGQ~w*sA>^s8Q2OBYrvyxN|wuYr9e?&ML97l zt*TO`X?%SAG)gvUq4@89^NwTtzyK)y+8Bo;<(=%B7aGmAs;pFk_@iEC*WyFp>51W&NQzpQa7f- zku1yb1;hhne`#5moG{<_vHHzdU-_QdYdN9glz^!yuU9GRF3sZg^}>?+&i=sl`FuVb zj|K-j+oH&1oj4K>Da$krA@RX}R8?Koy3|Mts??H+6e$pM9!x)eb_(b#31_ zObem}Xi)-E8ohSwjn`hN^JJ?(^aAhU7hkkOKlJ_Wf9*kDD#vsb3c9M0cHoKX!A+7= z+>27-AH08m`u(>p*B*r7{A&K>*=a`PaS4+Y;QhaN7>)l^I@H{iiV-(%;Vh)tumYZe;vYD4O z&lFU*$dWA2fNG~5T2ymgwnGnb@PmPbGnUEHe=IjmHl1C>Inh)>04}c9wJL}G&Rh52 z0A~zSY*uT_u)LO^7WsUgetUX3y;@x@mYkC;-!NtxASWk-w&y`wYvrLi_`WL*PHG+m zodObJImgqJ>GkHv`3AL3h1lKQ&$BA4;L#9DZrjf6eE#V8`+tA&==^w7O|Q88^LF@8ID1qdRv8-9ayCyJ$zGoQy{=-+M7h zV~AR&Rd2MtxLo9E5rn;(K=-Azd%fZA)zzZi^7p#I!4`nwd6cAS8U$_A^!R%Zei62O z!?HD_Uf92N=jgRpUfJE7kUV>E|BZJaf4mKRQU4$-;_y7@@mJqCmiz7F$2$jyagv}L z=saUYO-B8G+YUU-6wGtM9%|dJW!wCnH-F~(es^mSc0rs@(CYO2-SM#Z@=srotVWi? z0F3v9Fj1$-XrgF=a zf)mGTioviN>BSaT@2FXY^$@OX}UAr?J5J|b= zI9?F=t+Ys2i%Y1I;FuB!+%<5$f8&5gMHca2|LS$LJzAG|2R(sl&-e2p2d}O!&Uus> zS&8Y0Gk%VRC5|ifooK|KPnh8|jb& zuQ?YCs?K;6ML??;29F+o<|tUNQeDg!S6&FQ^5Zl%g+O!W=#I3qOzz?=f1}dyOxpvq zi?XT-N#g|Vn!oq^J7h6TonID#4y4khW)cmP2`LN{ zXPZS`gT_!UDs5@FOjTINa3+xIn`}3YiGXv!@@6RVFjCrK(CZLOP=E;ytBbr$DqX-8 z3?JCj