From ca90fd6f6e1c1cc9ae8d91b2d5b715537ea3b70f Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Thu, 1 Sep 2022 14:30:32 +0600
Subject: [PATCH 1/4] Battery inventory slot bg tweaks

---
 .../textures/gui/widgets_18.png               | Bin 1604 -> 1652 bytes
 .../textures/gui/widgets_18.xcf               |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.png
index 805c2d9106caf5418685bd31842150cf0eb71ae2..169db7bb2a58bc99e6109db04d935edbb6b7cd2c 100644
GIT binary patch
delta 1292
zcmV+n1@rpE4D<|;B!7izLqkwWLqi~Na&Km7Y-IodD3N`UJxIe)6opUIid8BOb`WvM
zP+hbjD&i<rEP{p7R%q41<fVVmq#;RhaTHt&4*o1w9bBAsb#N5~!5<JuCnrT0De=Cf
z&?3eQkN0ujJ%{)11B6C}sb*jTP&La)#baVNw<>nOq6a<%5r4p##7sSrUd+I=zV4})
z>MqK&y!-yFJ|%B5z$X&VG2O6;H;898EuHf|ahR1Ph4`F!+@K2*KXP4m`HgeYVS#6c
zjZA8uI7}=SJ6P^uRx(uLY2t{YYLqWzT~;`6aaJoe*19KuVJNSyq`6LO7;!8ifh0u8
zsG*DsEJSJ7NPjVrqVt%Cf5`DC$t9Dk3`ULxRG~t0{NR7^d$wj_YSK*##el9C+x{2<
zx_5zQ-L}7vZM%5__@99*t?jQifZ0#d>uoJ^1oUqM7uRh~-UBXofWaqSG9*Xx(-H~=
z;QfrgDF+PP0=;YQ+*;>2eE>2vtK}Qu;1C!sQueyXyAgw(bNjcaHNPJ*adM60(nunc
zu>muG2nY-4eN__x00eMJL_t(|+U?xEQtLPv24Hz-Z-NSzg2Sm&F*Ioza>-$6(=b$2
z=cizy;xfF=YS;0|iLJ<vA<r|DF)=~NfZu$QWvUQD9SW%HBFz+2RaF&$S^G1D5N>a8
z4{GG;=_!N|!rk57LG3&~KF09)QepVj)&Kr~z=wu@?$?dg&eT?`RlQ!XtGI3NKbZgu
zA%yeu^Q;Em-`}^M-{0S7we#@su=V`r<|eD1=jUgMaKs?$8v=EqcZquBcbl{Gzp~o@
zc>h}kJ|uun&1SQyLkMBHT>3*PFx-tn&?khNp>asnva6l5i_5&=czdl54U<%8rTX)K
z^7D5%ySS|5w!J^qpOVKVfS7eSM}0!NZwO5hK23}3t6uHB{QO;{5=w>DYPG6k`z87_
zG)!_sO8|YM>ZyIw4ymp-n@t^G+x++#m0jxl_wCcZ5SluCKHgrdkGI!iC+gz+xBmm;
z$FHsDabL=My{^tKF6*5B<je;(k7KTXl~44CILSLfm&;|<44t?yK2CW!mI{ig!>3(=
z<a{n!nKVM?<;SnBN8j%;q(5JMGFk<6Ky?s9D7Rv023YFjoFE$`{D!vKu7tV*YKrjL
zH=Nlw^x9PgExv!-s)Y7cKx6br0G;^!NS`6hz7xCT5NuAB&>X_2q;|l>=ew$Z9|TbE
zVCeIjRJD^6K76k5X;wR_`5!?ffDQ_weU(j#fSY0nHpkFt?#o@Qm=iwD`IN==Rp;+F
zes1T`sH6HByFaN(=za56&EsfZffGPS6z6NY=4?uw@Ix<Ok1+%rBfN(8DHR$+)(Oq2
z@@ZE<ZDTJuGztAhLn!BjO}!?6?lbh-9U8}2thno)zwdgSRK?StbZ)K@+7(DS{Yh0o
zC6DXaPVO@Nt`M0+pAPNIq00c8A>CCm=7vVsCHgVKC$4{qCuDn@tLw6RYEGy`f7;>G
zr=7+1)qf8a(2Oe~l}rDSE;U@5YO!KGS>wXL<~H8`FsQ8pL#@U2RcPK&d>Xey`&06`
z1kfis$tY8?bcN7Vb3TJ_W$1AmMrt_L9!iz!&)Dr8C4ky@wdZQz)t<{;?Vrz(&`7Nl
znj(A#pVS2>nNQ_kYz+FF3H~7&vjGJx0T}=Qbod9=>)*3;=+$`u0000<MNUMnLSTYR
C?1nu6

delta 1244
zcmV<21S9+O48#nOB!7fyLqkwWLqi~Na&Km7Y-IodD3N`UJxIeq9K~Nhq(v$P?I5C%
zp*mR*6>*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u9b5%L@B_rr$w|>gO8j3^
zXc6PVaX;SOd)&PPyv-_84F3e6sHUDy#D!dbRS3Kyh!OY^Mt{G^3@w>i%))hi-NVDz
zyBN=MKlkV8lM4m|JOc3?({z(~gLr1s)Hv@GM_5^uiO-40b-Ez&BiAK|-#C|S_VUb#
zo=wjaM~H<|7fW5t%DO^4O&paKmGZqghh@%NoRw;wweQJa7%HeM8LrbDMgmJnA_V~w
z>ZqU!6ERv<QhyAjX+Q4bAF}-^a!KT>fRSSXH7F2mKlmT~?$#(yO*%=TIMDNASs$Z7
zU>9gLEbIH&vRWsA?-{sKJN{Y|nEfQZ(b1wuKzJLtxbA4u9&ot>3_fY1F4~fhrnguG
z-p}Zp^1#3?(7WdJ*51eI1CXVzmT!QALtv~#+3POv4iI+t_V1Z?e?Lfka+U(xc6*bu
z0W*IGFe}f{jvW911VKqeK~#9!?cA|$;z|?-;PKUciBySFthU=KN<$lkM<z;36Q$a2
zwFM#-kKt|ZNM2tXkB6}_@O@GQVPQN(JAcj@n^Yl$IuuaXMTRM+s;Vjgi}r5_Av`}n
zpEStF$43YugqN3>lg4>}e~;mDRbhDT>i>U!;A2BS_jOZ^Gqv@4U2is<s_!;Fr~SJ4
zZ&w>YA%t*$f1fqL*Vory-@m@TW{vaq_V(BJPft%-<9vR8N`x~8QECX(g?>xa6aTik
zdw9$m|FGX>hsHGrPHzC+n(cO5hY-SQwbH5;Xm?`}q=Zm2G)}2nj*U|?IL3xa*Rg-^
z9v<tTzkVOR4IzZ){jOu5BM=1;X9?#hC8SeBXpZn{`tki+(s)0A{T^(ea;um1dR@oy
zOU$Q4APS%>tDf46c1(4(-EQmn+~)mrRCZm*Po2|H2+bWnhyAWP?03Z$>QHOc7gC$e
zrn-B0tV_=)Wgbg!=l&5Vc?)#4T2+6|(20-5uUl@%x`JZv@JX#+QY)L1#>^*oewVV3
zqyjpjI*1{ZTQM{Ptm}SGkWCSOW5;Y)LVW=>NB9i2GefOcslaI-XUu%AeM4FRowz@e
z(!vZa?2;|mk}9DkgwGPh7R>6o;TCKtI8vW;tkt@f@K~Bl4j)uNNdb`(KBa#upDA0g
zC5A@xvD}LlPYIu6XN^udJ)OHhGiE-`ixdUW1&jMNeS0<~7W~-L*Hg4$Q-s&pIdz4`
znCpZtsq#q)hxQ&&>G1{71%^=0g6(=vd`#<gJT%U6v0^;+J@tD&cHv+Qk-LY-y3~B)
zIPKdK)tLaADTKyUDs#-K)Lef`ygv8mGZY$gUaS}w=CRG+v0-p*QUCb<ZSdm3ocXj{
zu=Y6Z+rxfWT~gI_lV`!2i%jKGCd5)hW3G!8hXQ6O45ny>4*T8zK6o1M_sys4xP9+y
z?0XVG7q-YK(=PRe(42cdW2&E&MIEc3u>lZ6D9-1UP3NV4-YY49+Mgk6&(;1^doG`9
zzdU0?qw6}Mxx!~Di#q-(j+_2J6Z}CkvoQrM0T}=Q=<x@o{=|x1YJq$J0000<MNUMn
GLSTaR#97w>

diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.xcf b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.xcf
index 7ef123d92..323ab9612 100644
--- a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.xcf
+++ b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.xcf
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d41fdab2825f979fe7679222779a1e33199bc917265985129a5d26a80a6a76bc
-size 12113
+oid sha256:120b9051effae8f87204fc8265cee032d192a26302f679eb71e40412ce7b153e
+size 12047

From 7c5c37add37cd19e3b4a2dde596c10ddae349ad6 Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Thu, 1 Sep 2022 14:34:16 +0600
Subject: [PATCH 2/4] sword 2d/3d views restored

---
 .../models/item/energy_sword.json             | 333 +-----------------
 .../models/item/energy_sword_3d.json          | 325 +++++++++++++++++
 .../models/item/energy_sword_old.json         |  24 --
 3 files changed, 341 insertions(+), 341 deletions(-)
 create mode 100644 src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json
 delete mode 100644 src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_old.json

diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json
index be31b8d37..8aebb1a64 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json
@@ -1,325 +1,24 @@
 {
-	"textures": {
-		"0": "overdrive_that_matters:item/energy_sword",
-		"1": "overdrive_that_matters:item/energy_sword_charge"
-	},
-	"elements": [
-		{
-			"name": "handle",
-			"from": [7.5, 0, 10],
-			"to": [8.5, 6, 11],
-			"faces": {
-				"north": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"east": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"south": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"west": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
-				"down": {"uv": [0, 14, 0.5, 14.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.7, 11, 10.3],
-			"to": [8.2, 17, 11.2],
-			"faces": {
-				"north": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
-				"east": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
-				"south": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
-				"west": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
-				"down": {"uv": [6, 2.5, 6.5, 3], "texture": "#0"}
-			}
-		},
-		{
-			"name": "handle",
-			"from": [7.6, 0, 8],
-			"to": [8.2, 1, 10],
-			"faces": {
-				"north": {"uv": [2.5, 5, 2.8, 5.5], "texture": "#0"},
-				"east": {"uv": [4, 5, 3, 5.5], "texture": "#0"},
-				"south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
-				"west": {"uv": [3, 5, 4, 5.5], "texture": "#0"},
-				"up": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"},
-				"down": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "handle",
-			"from": [7.6, 5, 8],
-			"to": [8.2, 6, 10],
-			"faces": {
-				"north": {"uv": [2.5, 2.5, 2.8, 3], "texture": "#0"},
-				"east": {"uv": [4, 2.5, 3, 3], "texture": "#0"},
-				"south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
-				"west": {"uv": [3, 2.5, 4, 3], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.3, 1], "texture": "#missing"},
-				"down": {"uv": [2.5, 2.5, 2.8, 3.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "handle",
-			"from": [7.6, 1, 8],
-			"to": [8.2, 5, 9],
-			"faces": {
-				"north": {"uv": [2.5, 3, 2.8, 5], "texture": "#0"},
-				"east": {"uv": [3, 3, 3.5, 5], "texture": "#0"},
-				"south": {"uv": [3, 3, 3.3, 5], "texture": "#0"},
-				"west": {"uv": [3, 3, 3.5, 5], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "button",
-			"from": [7.7, 5, 11],
-			"to": [8.3, 6, 11.4],
-			"faces": {
-				"north": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
-				"east": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"},
-				"south": {"uv": [0.5, 11, 0.8, 11.5], "texture": "#0"},
-				"west": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.3, 0.2], "texture": "#missing"},
-				"down": {"uv": [0.5, 11, 0.8, 11.2], "texture": "#0"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.6, 7, 7.3],
-			"to": [8.4, 12, 11.3],
-			"faces": {
-				"north": {"uv": [0, 8.5, 0.4, 11], "texture": "#0"},
-				"east": {"uv": [15.5, 8.5, 13.5, 11], "texture": "#0"},
-				"south": {"uv": [2, 8.5, 2.4, 11], "texture": "#0"},
-				"west": {"uv": [13.5, 8.5, 15.5, 11], "texture": "#0"},
-				"up": {"uv": [0.5, 8.5, 2, 8.9], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [0, 0, 0.4, 1.5], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.6, 14, 7.3],
-			"to": [8.4, 29, 11.3],
-			"faces": {
-				"north": {"uv": [0, 0, 0.4, 7.5], "texture": "#0"},
-				"east": {"uv": [15.5, 0, 13.5, 7.5], "texture": "#0"},
-				"south": {"uv": [15.6, 0, 16, 7.5], "texture": "#0"},
-				"west": {"uv": [13.5, 0, 15.5, 7.5], "texture": "#0"},
-				"up": {"uv": [0.5, 0, 2, 0.4], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [2, 8.5, 2.4, 10], "texture": "#0"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.6, 12, 7.3],
-			"to": [8.4, 13, 10.8],
-			"faces": {
-				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
-				"east": {"uv": [15.25, 8, 13.5, 8.5], "texture": "#0"},
-				"south": {"uv": [15.5, 8, 15.9, 8.5], "texture": "#0"},
-				"west": {"uv": [13.5, 8, 15.25, 8.5], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.6, 13, 7.3],
-			"to": [8.4, 13.5, 10.8],
-			"faces": {
-				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
-				"east": {"uv": [15.25, 7.75, 13.5, 8], "texture": "#0"},
-				"south": {"uv": [15.5, 7.5, 15.9, 7.75], "texture": "#0"},
-				"west": {"uv": [13.5, 7.75, 15.25, 8], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.6, 13.5, 7.3],
-			"to": [8.4, 14, 11.3],
-			"faces": {
-				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
-				"east": {"uv": [15.5, 7.5, 13.5, 7.75], "texture": "#0"},
-				"south": {"uv": [2, 7.5, 2.4, 7.75], "texture": "#0"},
-				"west": {"uv": [13.5, 7.5, 15.5, 7.75], "texture": "#0"},
-				"up": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"},
-				"down": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "handle",
-			"from": [7, 6, 7],
-			"to": [9, 7, 12],
-			"faces": {
-				"north": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"},
-				"east": {"uv": [3.5, 8, 4, 5.5], "rotation": 90, "texture": "#0"},
-				"south": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"},
-				"west": {"uv": [3.5, 5.5, 4, 8], "rotation": 90, "texture": "#0"},
-				"up": {"uv": [2.5, 8, 3.5, 5.5], "texture": "#0"},
-				"down": {"uv": [2.5, 5.5, 3.5, 8], "texture": "#0"}
-			}
-		},
-		{
-			"name": "battery",
-			"from": [7.3, 7, 9.8],
-			"to": [8.7, 10, 11.8],
-			"faces": {
-				"north": {"uv": [4.5, 0, 5.3, 1.5], "texture": "#0"},
-				"east": {"uv": [3.5, 0, 2.5, 1.5], "texture": "#0"},
-				"south": {"uv": [3.5, 0, 4.3, 1.5], "texture": "#0"},
-				"west": {"uv": [2.5, 0, 3.5, 1.5], "texture": "#0"},
-				"up": {"uv": [2.5, 1.5, 3.5, 2.3], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [0, 0, 0.8, 1], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [9, 7.1, 6.3],
-			"to": [9, 8.1, 12.3],
-			"faces": {
-				"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"east": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
-				"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"west": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
-				"up": {"uv": [0, 0, 0, 3], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 3], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [7, 7.1, 6.3],
-			"to": [7, 8.1, 12.3],
-			"faces": {
-				"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"east": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
-				"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"west": {"uv": [5.5, 8.5, 2.5, 9], "texture": "#0"},
-				"up": {"uv": [0, 0, 0, 3], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 3], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [7, 7.1, 12.3],
-			"to": [9, 8.1, 12.3],
-			"faces": {
-				"north": {"uv": [5.5, 9.5, 6.5, 10], "texture": "#0"},
-				"east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"south": {"uv": [5.5, 9.5, 6.5, 10], "texture": "#0"},
-				"west": {"uv": [0, 0, 0, 0.5], "texture": "#0"},
-				"up": {"uv": [0, 0, 1, 0], "texture": "#missing"},
-				"down": {"uv": [0, 0, 1, 0], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [7, 5.1, 6.3],
-			"to": [7, 7.1, 7.3],
-			"faces": {
-				"north": {"uv": [0, 0, 0, 1], "texture": "#missing"},
-				"east": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
-				"south": {"uv": [0, 0, 0, 1], "texture": "#missing"},
-				"west": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
-				"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [9, 5.1, 6.3],
-			"to": [9, 7.1, 7.3],
-			"faces": {
-				"north": {"uv": [0, 0, 0, 1], "texture": "#missing"},
-				"east": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
-				"south": {"uv": [0, 0, 0, 1], "texture": "#missing"},
-				"west": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
-				"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [7, 5.1, 6.3],
-			"to": [9, 8.1, 6.3],
-			"faces": {
-				"north": {"uv": [7, 8.5, 8.5, 10], "texture": "#0"},
-				"east": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
-				"south": {"uv": [7, 8.5, 8.5, 10], "texture": "#0"},
-				"west": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
-				"up": {"uv": [2.5, 11, 3.5, 11.5], "texture": "#0"},
-				"down": {"uv": [2, 11, 3, 11.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "charge",
-			"from": [7.1, 7, 6.9],
-			"to": [8.8, 29.3, 12],
-			"faces": {
-				"north": {"uv": [2.45, 1, 3.45, 12], "texture": "#1"},
-				"east": {"uv": [0, 1, 2.5, 12], "texture": "#1"},
-				"south": {"uv": [6, 1, 7, 12], "texture": "#1"},
-				"west": {"uv": [3.5, 1, 6, 12], "texture": "#1"},
-				"up": {"uv": [3.5, 0, 6, 1], "rotation": 90, "texture": "#1"},
-				"down": {"uv": [0, 0, 1, 2.5], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "capacitor",
-			"from": [7.5, 7.4, 10.5],
-			"to": [8.5, 8.4, 13.5],
-			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8.5, 12.5]},
-			"faces": {
-				"north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
-				"east": {"uv": [7.5, 0.5, 8, 2], "rotation": 270, "texture": "#0"},
-				"south": {"uv": [7.5, 0, 8, 0.5], "texture": "#0"},
-				"west": {"uv": [7.5, 0.5, 8, 2], "rotation": 90, "texture": "#0"},
-				"up": {"uv": [7.5, 0.5, 8, 2], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [7.5, 0.5, 8, 2], "texture": "#0"}
-			}
-		},
-		{
-			"name": "capacitor",
-			"from": [7.5, 8.9, 11],
-			"to": [8.5, 9.9, 14],
-			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8.5, 12.5]},
-			"faces": {
-				"north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
-				"east": {"uv": [7.5, 0.5, 8, 2], "rotation": 270, "texture": "#0"},
-				"south": {"uv": [7.5, 0, 8, 0.5], "texture": "#0"},
-				"west": {"uv": [7.5, 0.5, 8, 2], "rotation": 90, "texture": "#0"},
-				"up": {"uv": [7.5, 0.5, 8, 2], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [7.5, 0.5, 8, 2], "texture": "#0"}
-			}
+	"loader": "forge:separate_transforms",
+	"gui_light": "front",
+	"base": {
+		"parent": "minecraft:item/handheld",
+		"textures": {
+			"layer0": "overdrive_that_matters:item/swordicon"
 		}
-	],
-	"display": {
-		"thirdperson_righthand": {
-			"translation": [0, 3, -1]
+	},
+	"perspectives": {
+		"third_person_right_hand": {
+			"parent": "overdrive_that_matters:item/energy_sword_3d"
 		},
-		"thirdperson_lefthand": {
-			"translation": [0, 3, -1]
+		"third_person_left_hand": {
+			"parent": "overdrive_that_matters:item/energy_sword_3d"
 		},
-		"firstperson_righthand": {
-			"rotation": [20, 0, 0],
-			"translation": [0, 1.75, -4.25]
+		"first_person_right_hand": {
+			"parent": "overdrive_that_matters:item/energy_sword_3d"
 		},
-		"firstperson_lefthand": {
-			"rotation": [20, 0, 0],
-			"translation": [0, 1.75, -4.25]
-		},
-		"ground": {
-			"rotation": [13, 0, 0],
-			"translation": [0, 5, -2.25]
-		},
-		"gui": {
-			"rotation": [90, 42, -90],
-			"translation": [-4.75, -2.25, 0],
-			"scale": [0.8, 0.8, 0.8]
-		},
-		"fixed": {
-			"rotation": [90, -45, 90],
-			"translation": [5.5, -3.5, -1]
+		"first_person_left_hand": {
+			"parent": "overdrive_that_matters:item/energy_sword_3d"
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json
new file mode 100644
index 000000000..be31b8d37
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json
@@ -0,0 +1,325 @@
+{
+	"textures": {
+		"0": "overdrive_that_matters:item/energy_sword",
+		"1": "overdrive_that_matters:item/energy_sword_charge"
+	},
+	"elements": [
+		{
+			"name": "handle",
+			"from": [7.5, 0, 10],
+			"to": [8.5, 6, 11],
+			"faces": {
+				"north": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
+				"east": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
+				"south": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
+				"west": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
+				"down": {"uv": [0, 14, 0.5, 14.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "blade",
+			"from": [7.7, 11, 10.3],
+			"to": [8.2, 17, 11.2],
+			"faces": {
+				"north": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
+				"east": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
+				"south": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
+				"west": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
+				"down": {"uv": [6, 2.5, 6.5, 3], "texture": "#0"}
+			}
+		},
+		{
+			"name": "handle",
+			"from": [7.6, 0, 8],
+			"to": [8.2, 1, 10],
+			"faces": {
+				"north": {"uv": [2.5, 5, 2.8, 5.5], "texture": "#0"},
+				"east": {"uv": [4, 5, 3, 5.5], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
+				"west": {"uv": [3, 5, 4, 5.5], "texture": "#0"},
+				"up": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"},
+				"down": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "handle",
+			"from": [7.6, 5, 8],
+			"to": [8.2, 6, 10],
+			"faces": {
+				"north": {"uv": [2.5, 2.5, 2.8, 3], "texture": "#0"},
+				"east": {"uv": [4, 2.5, 3, 3], "texture": "#0"},
+				"south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
+				"west": {"uv": [3, 2.5, 4, 3], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.3, 1], "texture": "#missing"},
+				"down": {"uv": [2.5, 2.5, 2.8, 3.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "handle",
+			"from": [7.6, 1, 8],
+			"to": [8.2, 5, 9],
+			"faces": {
+				"north": {"uv": [2.5, 3, 2.8, 5], "texture": "#0"},
+				"east": {"uv": [3, 3, 3.5, 5], "texture": "#0"},
+				"south": {"uv": [3, 3, 3.3, 5], "texture": "#0"},
+				"west": {"uv": [3, 3, 3.5, 5], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "button",
+			"from": [7.7, 5, 11],
+			"to": [8.3, 6, 11.4],
+			"faces": {
+				"north": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
+				"east": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"},
+				"south": {"uv": [0.5, 11, 0.8, 11.5], "texture": "#0"},
+				"west": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.3, 0.2], "texture": "#missing"},
+				"down": {"uv": [0.5, 11, 0.8, 11.2], "texture": "#0"}
+			}
+		},
+		{
+			"name": "blade",
+			"from": [7.6, 7, 7.3],
+			"to": [8.4, 12, 11.3],
+			"faces": {
+				"north": {"uv": [0, 8.5, 0.4, 11], "texture": "#0"},
+				"east": {"uv": [15.5, 8.5, 13.5, 11], "texture": "#0"},
+				"south": {"uv": [2, 8.5, 2.4, 11], "texture": "#0"},
+				"west": {"uv": [13.5, 8.5, 15.5, 11], "texture": "#0"},
+				"up": {"uv": [0.5, 8.5, 2, 8.9], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.4, 1.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "blade",
+			"from": [7.6, 14, 7.3],
+			"to": [8.4, 29, 11.3],
+			"faces": {
+				"north": {"uv": [0, 0, 0.4, 7.5], "texture": "#0"},
+				"east": {"uv": [15.5, 0, 13.5, 7.5], "texture": "#0"},
+				"south": {"uv": [15.6, 0, 16, 7.5], "texture": "#0"},
+				"west": {"uv": [13.5, 0, 15.5, 7.5], "texture": "#0"},
+				"up": {"uv": [0.5, 0, 2, 0.4], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [2, 8.5, 2.4, 10], "texture": "#0"}
+			}
+		},
+		{
+			"name": "blade",
+			"from": [7.6, 12, 7.3],
+			"to": [8.4, 13, 10.8],
+			"faces": {
+				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
+				"east": {"uv": [15.25, 8, 13.5, 8.5], "texture": "#0"},
+				"south": {"uv": [15.5, 8, 15.9, 8.5], "texture": "#0"},
+				"west": {"uv": [13.5, 8, 15.25, 8.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "blade",
+			"from": [7.6, 13, 7.3],
+			"to": [8.4, 13.5, 10.8],
+			"faces": {
+				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
+				"east": {"uv": [15.25, 7.75, 13.5, 8], "texture": "#0"},
+				"south": {"uv": [15.5, 7.5, 15.9, 7.75], "texture": "#0"},
+				"west": {"uv": [13.5, 7.75, 15.25, 8], "texture": "#0"},
+				"up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "blade",
+			"from": [7.6, 13.5, 7.3],
+			"to": [8.4, 14, 11.3],
+			"faces": {
+				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
+				"east": {"uv": [15.5, 7.5, 13.5, 7.75], "texture": "#0"},
+				"south": {"uv": [2, 7.5, 2.4, 7.75], "texture": "#0"},
+				"west": {"uv": [13.5, 7.5, 15.5, 7.75], "texture": "#0"},
+				"up": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"},
+				"down": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "handle",
+			"from": [7, 6, 7],
+			"to": [9, 7, 12],
+			"faces": {
+				"north": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"},
+				"east": {"uv": [3.5, 8, 4, 5.5], "rotation": 90, "texture": "#0"},
+				"south": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"},
+				"west": {"uv": [3.5, 5.5, 4, 8], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [2.5, 8, 3.5, 5.5], "texture": "#0"},
+				"down": {"uv": [2.5, 5.5, 3.5, 8], "texture": "#0"}
+			}
+		},
+		{
+			"name": "battery",
+			"from": [7.3, 7, 9.8],
+			"to": [8.7, 10, 11.8],
+			"faces": {
+				"north": {"uv": [4.5, 0, 5.3, 1.5], "texture": "#0"},
+				"east": {"uv": [3.5, 0, 2.5, 1.5], "texture": "#0"},
+				"south": {"uv": [3.5, 0, 4.3, 1.5], "texture": "#0"},
+				"west": {"uv": [2.5, 0, 3.5, 1.5], "texture": "#0"},
+				"up": {"uv": [2.5, 1.5, 3.5, 2.3], "rotation": 90, "texture": "#0"},
+				"down": {"uv": [0, 0, 0.8, 1], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [9, 7.1, 6.3],
+			"to": [9, 8.1, 12.3],
+			"faces": {
+				"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+				"east": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
+				"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+				"west": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
+				"up": {"uv": [0, 0, 0, 3], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0, 3], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [7, 7.1, 6.3],
+			"to": [7, 8.1, 12.3],
+			"faces": {
+				"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+				"east": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
+				"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+				"west": {"uv": [5.5, 8.5, 2.5, 9], "texture": "#0"},
+				"up": {"uv": [0, 0, 0, 3], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0, 3], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [7, 7.1, 12.3],
+			"to": [9, 8.1, 12.3],
+			"faces": {
+				"north": {"uv": [5.5, 9.5, 6.5, 10], "texture": "#0"},
+				"east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+				"south": {"uv": [5.5, 9.5, 6.5, 10], "texture": "#0"},
+				"west": {"uv": [0, 0, 0, 0.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 1, 0], "texture": "#missing"},
+				"down": {"uv": [0, 0, 1, 0], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [7, 5.1, 6.3],
+			"to": [7, 7.1, 7.3],
+			"faces": {
+				"north": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"east": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
+				"south": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"west": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [9, 5.1, 6.3],
+			"to": [9, 7.1, 7.3],
+			"faces": {
+				"north": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"east": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
+				"south": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"west": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
+				"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [7, 5.1, 6.3],
+			"to": [9, 8.1, 6.3],
+			"faces": {
+				"north": {"uv": [7, 8.5, 8.5, 10], "texture": "#0"},
+				"east": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
+				"south": {"uv": [7, 8.5, 8.5, 10], "texture": "#0"},
+				"west": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
+				"up": {"uv": [2.5, 11, 3.5, 11.5], "texture": "#0"},
+				"down": {"uv": [2, 11, 3, 11.5], "texture": "#0"}
+			}
+		},
+		{
+			"name": "charge",
+			"from": [7.1, 7, 6.9],
+			"to": [8.8, 29.3, 12],
+			"faces": {
+				"north": {"uv": [2.45, 1, 3.45, 12], "texture": "#1"},
+				"east": {"uv": [0, 1, 2.5, 12], "texture": "#1"},
+				"south": {"uv": [6, 1, 7, 12], "texture": "#1"},
+				"west": {"uv": [3.5, 1, 6, 12], "texture": "#1"},
+				"up": {"uv": [3.5, 0, 6, 1], "rotation": 90, "texture": "#1"},
+				"down": {"uv": [0, 0, 1, 2.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "capacitor",
+			"from": [7.5, 7.4, 10.5],
+			"to": [8.5, 8.4, 13.5],
+			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8.5, 12.5]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
+				"east": {"uv": [7.5, 0.5, 8, 2], "rotation": 270, "texture": "#0"},
+				"south": {"uv": [7.5, 0, 8, 0.5], "texture": "#0"},
+				"west": {"uv": [7.5, 0.5, 8, 2], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7.5, 0.5, 8, 2], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [7.5, 0.5, 8, 2], "texture": "#0"}
+			}
+		},
+		{
+			"name": "capacitor",
+			"from": [7.5, 8.9, 11],
+			"to": [8.5, 9.9, 14],
+			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8.5, 12.5]},
+			"faces": {
+				"north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
+				"east": {"uv": [7.5, 0.5, 8, 2], "rotation": 270, "texture": "#0"},
+				"south": {"uv": [7.5, 0, 8, 0.5], "texture": "#0"},
+				"west": {"uv": [7.5, 0.5, 8, 2], "rotation": 90, "texture": "#0"},
+				"up": {"uv": [7.5, 0.5, 8, 2], "rotation": 180, "texture": "#0"},
+				"down": {"uv": [7.5, 0.5, 8, 2], "texture": "#0"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 3, -1]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 3, -1]
+		},
+		"firstperson_righthand": {
+			"rotation": [20, 0, 0],
+			"translation": [0, 1.75, -4.25]
+		},
+		"firstperson_lefthand": {
+			"rotation": [20, 0, 0],
+			"translation": [0, 1.75, -4.25]
+		},
+		"ground": {
+			"rotation": [13, 0, 0],
+			"translation": [0, 5, -2.25]
+		},
+		"gui": {
+			"rotation": [90, 42, -90],
+			"translation": [-4.75, -2.25, 0],
+			"scale": [0.8, 0.8, 0.8]
+		},
+		"fixed": {
+			"rotation": [90, -45, 90],
+			"translation": [5.5, -3.5, -1]
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_old.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_old.json
deleted file mode 100644
index ab0140a49..000000000
--- a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_old.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"loader": "forge:separate-perspective",
-	"gui_light": "front",
-	"base": {
-		"parent": "minecraft:item/handheld",
-		"textures": {
-			"layer0": "overdrive_that_matters:item/swordicon"
-		}
-	},
-	"perspectives": {
-		"third_person_right_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
-		},
-		"third_person_left_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
-		},
-		"first_person_right_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
-		},
-		"first_person_left_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
-		}
-	}
-}
\ No newline at end of file

From 30627a750ae03bb4993b9eddbd9887f8ebe48558 Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Thu, 1 Sep 2022 14:54:50 +0600
Subject: [PATCH 3/4] sword 2d/3d views restored (attempt 2)

---
 .../models/item/energy_sword.json             | 329 +++++++++++++++++-
 .../models/item/energy_sword_3d.json          | 325 -----------------
 .../models/item/energy_sword_inventory.json   |   6 +
 3 files changed, 323 insertions(+), 337 deletions(-)
 delete mode 100644 src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json
 create mode 100644 src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_inventory.json

diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json
index 8aebb1a64..fb912ef96 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json
@@ -1,24 +1,329 @@
 {
 	"loader": "forge:separate_transforms",
 	"gui_light": "front",
-	"base": {
-		"parent": "minecraft:item/handheld",
+	"base":
+	{
+		"parent": "builtin/entity",
 		"textures": {
-			"layer0": "overdrive_that_matters:item/swordicon"
+			"0": "overdrive_that_matters:item/energy_sword",
+			"1": "overdrive_that_matters:item/energy_sword_charge"
+		},
+		"elements": [
+			{
+				"name": "handle",
+				"from": [7.5, 0, 10],
+				"to": [8.5, 6, 11],
+				"faces": {
+					"north": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
+					"east": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
+					"south": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
+					"west": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
+					"up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
+					"down": {"uv": [0, 14, 0.5, 14.5], "texture": "#0"}
+				}
+			},
+			{
+				"name": "blade",
+				"from": [7.7, 11, 10.3],
+				"to": [8.2, 17, 11.2],
+				"faces": {
+					"north": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
+					"east": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
+					"south": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
+					"west": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
+					"up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
+					"down": {"uv": [6, 2.5, 6.5, 3], "texture": "#0"}
+				}
+			},
+			{
+				"name": "handle",
+				"from": [7.6, 0, 8],
+				"to": [8.2, 1, 10],
+				"faces": {
+					"north": {"uv": [2.5, 5, 2.8, 5.5], "texture": "#0"},
+					"east": {"uv": [4, 5, 3, 5.5], "texture": "#0"},
+					"south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
+					"west": {"uv": [3, 5, 4, 5.5], "texture": "#0"},
+					"up": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"},
+					"down": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"}
+				}
+			},
+			{
+				"name": "handle",
+				"from": [7.6, 5, 8],
+				"to": [8.2, 6, 10],
+				"faces": {
+					"north": {"uv": [2.5, 2.5, 2.8, 3], "texture": "#0"},
+					"east": {"uv": [4, 2.5, 3, 3], "texture": "#0"},
+					"south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
+					"west": {"uv": [3, 2.5, 4, 3], "texture": "#0"},
+					"up": {"uv": [0, 0, 0.3, 1], "texture": "#missing"},
+					"down": {"uv": [2.5, 2.5, 2.8, 3.5], "texture": "#0"}
+				}
+			},
+			{
+				"name": "handle",
+				"from": [7.6, 1, 8],
+				"to": [8.2, 5, 9],
+				"faces": {
+					"north": {"uv": [2.5, 3, 2.8, 5], "texture": "#0"},
+					"east": {"uv": [3, 3, 3.5, 5], "texture": "#0"},
+					"south": {"uv": [3, 3, 3.3, 5], "texture": "#0"},
+					"west": {"uv": [3, 3, 3.5, 5], "texture": "#0"},
+					"up": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
+					"down": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"}
+				}
+			},
+			{
+				"name": "button",
+				"from": [7.7, 5, 11],
+				"to": [8.3, 6, 11.4],
+				"faces": {
+					"north": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
+					"east": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"},
+					"south": {"uv": [0.5, 11, 0.8, 11.5], "texture": "#0"},
+					"west": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"},
+					"up": {"uv": [0, 0, 0.3, 0.2], "texture": "#missing"},
+					"down": {"uv": [0.5, 11, 0.8, 11.2], "texture": "#0"}
+				}
+			},
+			{
+				"name": "blade",
+				"from": [7.6, 7, 7.3],
+				"to": [8.4, 12, 11.3],
+				"faces": {
+					"north": {"uv": [0, 8.5, 0.4, 11], "texture": "#0"},
+					"east": {"uv": [15.5, 8.5, 13.5, 11], "texture": "#0"},
+					"south": {"uv": [2, 8.5, 2.4, 11], "texture": "#0"},
+					"west": {"uv": [13.5, 8.5, 15.5, 11], "texture": "#0"},
+					"up": {"uv": [0.5, 8.5, 2, 8.9], "rotation": 90, "texture": "#0"},
+					"down": {"uv": [0, 0, 0.4, 1.5], "texture": "#missing"}
+				}
+			},
+			{
+				"name": "blade",
+				"from": [7.6, 14, 7.3],
+				"to": [8.4, 29, 11.3],
+				"faces": {
+					"north": {"uv": [0, 0, 0.4, 7.5], "texture": "#0"},
+					"east": {"uv": [15.5, 0, 13.5, 7.5], "texture": "#0"},
+					"south": {"uv": [15.6, 0, 16, 7.5], "texture": "#0"},
+					"west": {"uv": [13.5, 0, 15.5, 7.5], "texture": "#0"},
+					"up": {"uv": [0.5, 0, 2, 0.4], "rotation": 90, "texture": "#0"},
+					"down": {"uv": [2, 8.5, 2.4, 10], "texture": "#0"}
+				}
+			},
+			{
+				"name": "blade",
+				"from": [7.6, 12, 7.3],
+				"to": [8.4, 13, 10.8],
+				"faces": {
+					"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
+					"east": {"uv": [15.25, 8, 13.5, 8.5], "texture": "#0"},
+					"south": {"uv": [15.5, 8, 15.9, 8.5], "texture": "#0"},
+					"west": {"uv": [13.5, 8, 15.25, 8.5], "texture": "#0"},
+					"up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"},
+					"down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}
+				}
+			},
+			{
+				"name": "blade",
+				"from": [7.6, 13, 7.3],
+				"to": [8.4, 13.5, 10.8],
+				"faces": {
+					"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
+					"east": {"uv": [15.25, 7.75, 13.5, 8], "texture": "#0"},
+					"south": {"uv": [15.5, 7.5, 15.9, 7.75], "texture": "#0"},
+					"west": {"uv": [13.5, 7.75, 15.25, 8], "texture": "#0"},
+					"up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"},
+					"down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}
+				}
+			},
+			{
+				"name": "blade",
+				"from": [7.6, 13.5, 7.3],
+				"to": [8.4, 14, 11.3],
+				"faces": {
+					"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
+					"east": {"uv": [15.5, 7.5, 13.5, 7.75], "texture": "#0"},
+					"south": {"uv": [2, 7.5, 2.4, 7.75], "texture": "#0"},
+					"west": {"uv": [13.5, 7.5, 15.5, 7.75], "texture": "#0"},
+					"up": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"},
+					"down": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"}
+				}
+			},
+			{
+				"name": "handle",
+				"from": [7, 6, 7],
+				"to": [9, 7, 12],
+				"faces": {
+					"north": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"},
+					"east": {"uv": [3.5, 8, 4, 5.5], "rotation": 90, "texture": "#0"},
+					"south": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"},
+					"west": {"uv": [3.5, 5.5, 4, 8], "rotation": 90, "texture": "#0"},
+					"up": {"uv": [2.5, 8, 3.5, 5.5], "texture": "#0"},
+					"down": {"uv": [2.5, 5.5, 3.5, 8], "texture": "#0"}
+				}
+			},
+			{
+				"name": "battery",
+				"from": [7.3, 7, 9.8],
+				"to": [8.7, 10, 11.8],
+				"faces": {
+					"north": {"uv": [4.5, 0, 5.3, 1.5], "texture": "#0"},
+					"east": {"uv": [3.5, 0, 2.5, 1.5], "texture": "#0"},
+					"south": {"uv": [3.5, 0, 4.3, 1.5], "texture": "#0"},
+					"west": {"uv": [2.5, 0, 3.5, 1.5], "texture": "#0"},
+					"up": {"uv": [2.5, 1.5, 3.5, 2.3], "rotation": 90, "texture": "#0"},
+					"down": {"uv": [0, 0, 0.8, 1], "texture": "#missing"}
+				}
+			},
+			{
+				"name": "frame",
+				"from": [9, 7.1, 6.3],
+				"to": [9, 8.1, 12.3],
+				"faces": {
+					"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+					"east": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
+					"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+					"west": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
+					"up": {"uv": [0, 0, 0, 3], "texture": "#missing"},
+					"down": {"uv": [0, 0, 0, 3], "texture": "#missing"}
+				}
+			},
+			{
+				"name": "frame",
+				"from": [7, 7.1, 6.3],
+				"to": [7, 8.1, 12.3],
+				"faces": {
+					"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+					"east": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
+					"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+					"west": {"uv": [5.5, 8.5, 2.5, 9], "texture": "#0"},
+					"up": {"uv": [0, 0, 0, 3], "texture": "#missing"},
+					"down": {"uv": [0, 0, 0, 3], "texture": "#missing"}
+				}
+			},
+			{
+				"name": "frame",
+				"from": [7, 7.1, 12.3],
+				"to": [9, 8.1, 12.3],
+				"faces": {
+					"north": {"uv": [5.5, 9.5, 6.5, 10], "texture": "#0"},
+					"east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+					"south": {"uv": [5.5, 9.5, 6.5, 10], "texture": "#0"},
+					"west": {"uv": [0, 0, 0, 0.5], "texture": "#0"},
+					"up": {"uv": [0, 0, 1, 0], "texture": "#missing"},
+					"down": {"uv": [0, 0, 1, 0], "texture": "#missing"}
+				}
+			},
+			{
+				"name": "frame",
+				"from": [7, 5.1, 6.3],
+				"to": [7, 7.1, 7.3],
+				"faces": {
+					"north": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+					"east": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
+					"south": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+					"west": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
+					"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+					"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
+				}
+			},
+			{
+				"name": "frame",
+				"from": [9, 5.1, 6.3],
+				"to": [9, 7.1, 7.3],
+				"faces": {
+					"north": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+					"east": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
+					"south": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+					"west": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
+					"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
+					"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
+				}
+			},
+			{
+				"name": "frame",
+				"from": [7, 5.1, 6.3],
+				"to": [9, 8.1, 6.3],
+				"faces": {
+					"north": {"uv": [7, 8.5, 8.5, 10], "texture": "#0"},
+					"east": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
+					"south": {"uv": [7, 8.5, 8.5, 10], "texture": "#0"},
+					"west": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
+					"up": {"uv": [2.5, 11, 3.5, 11.5], "texture": "#0"},
+					"down": {"uv": [2, 11, 3, 11.5], "texture": "#0"}
+				}
+			},
+			{
+				"name": "charge",
+				"from": [7.1, 7, 6.9],
+				"to": [8.8, 29.3, 12],
+				"faces": {
+					"north": {"uv": [2.45, 1, 3.45, 12], "texture": "#1"},
+					"east": {"uv": [0, 1, 2.5, 12], "texture": "#1"},
+					"south": {"uv": [6, 1, 7, 12], "texture": "#1"},
+					"west": {"uv": [3.5, 1, 6, 12], "texture": "#1"},
+					"up": {"uv": [3.5, 0, 6, 1], "rotation": 90, "texture": "#1"},
+					"down": {"uv": [0, 0, 1, 2.5], "texture": "#missing"}
+				}
+			},
+			{
+				"name": "capacitor",
+				"from": [7.5, 7.4, 10.5],
+				"to": [8.5, 8.4, 13.5],
+				"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8.5, 12.5]},
+				"faces": {
+					"north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
+					"east": {"uv": [7.5, 0.5, 8, 2], "rotation": 270, "texture": "#0"},
+					"south": {"uv": [7.5, 0, 8, 0.5], "texture": "#0"},
+					"west": {"uv": [7.5, 0.5, 8, 2], "rotation": 90, "texture": "#0"},
+					"up": {"uv": [7.5, 0.5, 8, 2], "rotation": 180, "texture": "#0"},
+					"down": {"uv": [7.5, 0.5, 8, 2], "texture": "#0"}
+				}
+			},
+			{
+				"name": "capacitor",
+				"from": [7.5, 8.9, 11],
+				"to": [8.5, 9.9, 14],
+				"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8.5, 12.5]},
+				"faces": {
+					"north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
+					"east": {"uv": [7.5, 0.5, 8, 2], "rotation": 270, "texture": "#0"},
+					"south": {"uv": [7.5, 0, 8, 0.5], "texture": "#0"},
+					"west": {"uv": [7.5, 0.5, 8, 2], "rotation": 90, "texture": "#0"},
+					"up": {"uv": [7.5, 0.5, 8, 2], "rotation": 180, "texture": "#0"},
+					"down": {"uv": [7.5, 0.5, 8, 2], "texture": "#0"}
+				}
+			}
+		],
+		"display": {
+			"thirdperson_righthand": {
+				"translation": [0, 3, -1]
+			},
+			"thirdperson_lefthand": {
+				"translation": [0, 3, -1]
+			},
+			"firstperson_righthand": {
+				"rotation": [20, 0, 0],
+				"translation": [0, 1.75, -4.25]
+			},
+			"firstperson_lefthand": {
+				"rotation": [20, 0, 0],
+				"translation": [0, 1.75, -4.25]
+			}
 		}
 	},
 	"perspectives": {
-		"third_person_right_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
+		"gui": {
+			"parent": "overdrive_that_matters:item/energy_sword_inventory"
 		},
-		"third_person_left_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
+		"fixed": {
+			"parent": "overdrive_that_matters:item/energy_sword_inventory"
 		},
-		"first_person_right_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
-		},
-		"first_person_left_hand": {
-			"parent": "overdrive_that_matters:item/energy_sword_3d"
+		"ground": {
+			"parent": "overdrive_that_matters:item/energy_sword_inventory"
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json
deleted file mode 100644
index be31b8d37..000000000
--- a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json
+++ /dev/null
@@ -1,325 +0,0 @@
-{
-	"textures": {
-		"0": "overdrive_that_matters:item/energy_sword",
-		"1": "overdrive_that_matters:item/energy_sword_charge"
-	},
-	"elements": [
-		{
-			"name": "handle",
-			"from": [7.5, 0, 10],
-			"to": [8.5, 6, 11],
-			"faces": {
-				"north": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"east": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"south": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"west": {"uv": [0, 11, 0.5, 14], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
-				"down": {"uv": [0, 14, 0.5, 14.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.7, 11, 10.3],
-			"to": [8.2, 17, 11.2],
-			"faces": {
-				"north": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
-				"east": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
-				"south": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
-				"west": {"uv": [5.5, 0, 6, 3], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
-				"down": {"uv": [6, 2.5, 6.5, 3], "texture": "#0"}
-			}
-		},
-		{
-			"name": "handle",
-			"from": [7.6, 0, 8],
-			"to": [8.2, 1, 10],
-			"faces": {
-				"north": {"uv": [2.5, 5, 2.8, 5.5], "texture": "#0"},
-				"east": {"uv": [4, 5, 3, 5.5], "texture": "#0"},
-				"south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
-				"west": {"uv": [3, 5, 4, 5.5], "texture": "#0"},
-				"up": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"},
-				"down": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "handle",
-			"from": [7.6, 5, 8],
-			"to": [8.2, 6, 10],
-			"faces": {
-				"north": {"uv": [2.5, 2.5, 2.8, 3], "texture": "#0"},
-				"east": {"uv": [4, 2.5, 3, 3], "texture": "#0"},
-				"south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
-				"west": {"uv": [3, 2.5, 4, 3], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.3, 1], "texture": "#missing"},
-				"down": {"uv": [2.5, 2.5, 2.8, 3.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "handle",
-			"from": [7.6, 1, 8],
-			"to": [8.2, 5, 9],
-			"faces": {
-				"north": {"uv": [2.5, 3, 2.8, 5], "texture": "#0"},
-				"east": {"uv": [3, 3, 3.5, 5], "texture": "#0"},
-				"south": {"uv": [3, 3, 3.3, 5], "texture": "#0"},
-				"west": {"uv": [3, 3, 3.5, 5], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "button",
-			"from": [7.7, 5, 11],
-			"to": [8.3, 6, 11.4],
-			"faces": {
-				"north": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"},
-				"east": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"},
-				"south": {"uv": [0.5, 11, 0.8, 11.5], "texture": "#0"},
-				"west": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.3, 0.2], "texture": "#missing"},
-				"down": {"uv": [0.5, 11, 0.8, 11.2], "texture": "#0"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.6, 7, 7.3],
-			"to": [8.4, 12, 11.3],
-			"faces": {
-				"north": {"uv": [0, 8.5, 0.4, 11], "texture": "#0"},
-				"east": {"uv": [15.5, 8.5, 13.5, 11], "texture": "#0"},
-				"south": {"uv": [2, 8.5, 2.4, 11], "texture": "#0"},
-				"west": {"uv": [13.5, 8.5, 15.5, 11], "texture": "#0"},
-				"up": {"uv": [0.5, 8.5, 2, 8.9], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [0, 0, 0.4, 1.5], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.6, 14, 7.3],
-			"to": [8.4, 29, 11.3],
-			"faces": {
-				"north": {"uv": [0, 0, 0.4, 7.5], "texture": "#0"},
-				"east": {"uv": [15.5, 0, 13.5, 7.5], "texture": "#0"},
-				"south": {"uv": [15.6, 0, 16, 7.5], "texture": "#0"},
-				"west": {"uv": [13.5, 0, 15.5, 7.5], "texture": "#0"},
-				"up": {"uv": [0.5, 0, 2, 0.4], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [2, 8.5, 2.4, 10], "texture": "#0"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.6, 12, 7.3],
-			"to": [8.4, 13, 10.8],
-			"faces": {
-				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
-				"east": {"uv": [15.25, 8, 13.5, 8.5], "texture": "#0"},
-				"south": {"uv": [15.5, 8, 15.9, 8.5], "texture": "#0"},
-				"west": {"uv": [13.5, 8, 15.25, 8.5], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.6, 13, 7.3],
-			"to": [8.4, 13.5, 10.8],
-			"faces": {
-				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
-				"east": {"uv": [15.25, 7.75, 13.5, 8], "texture": "#0"},
-				"south": {"uv": [15.5, 7.5, 15.9, 7.75], "texture": "#0"},
-				"west": {"uv": [13.5, 7.75, 15.25, 8], "texture": "#0"},
-				"up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "blade",
-			"from": [7.6, 13.5, 7.3],
-			"to": [8.4, 14, 11.3],
-			"faces": {
-				"north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"},
-				"east": {"uv": [15.5, 7.5, 13.5, 7.75], "texture": "#0"},
-				"south": {"uv": [2, 7.5, 2.4, 7.75], "texture": "#0"},
-				"west": {"uv": [13.5, 7.5, 15.5, 7.75], "texture": "#0"},
-				"up": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"},
-				"down": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "handle",
-			"from": [7, 6, 7],
-			"to": [9, 7, 12],
-			"faces": {
-				"north": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"},
-				"east": {"uv": [3.5, 8, 4, 5.5], "rotation": 90, "texture": "#0"},
-				"south": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"},
-				"west": {"uv": [3.5, 5.5, 4, 8], "rotation": 90, "texture": "#0"},
-				"up": {"uv": [2.5, 8, 3.5, 5.5], "texture": "#0"},
-				"down": {"uv": [2.5, 5.5, 3.5, 8], "texture": "#0"}
-			}
-		},
-		{
-			"name": "battery",
-			"from": [7.3, 7, 9.8],
-			"to": [8.7, 10, 11.8],
-			"faces": {
-				"north": {"uv": [4.5, 0, 5.3, 1.5], "texture": "#0"},
-				"east": {"uv": [3.5, 0, 2.5, 1.5], "texture": "#0"},
-				"south": {"uv": [3.5, 0, 4.3, 1.5], "texture": "#0"},
-				"west": {"uv": [2.5, 0, 3.5, 1.5], "texture": "#0"},
-				"up": {"uv": [2.5, 1.5, 3.5, 2.3], "rotation": 90, "texture": "#0"},
-				"down": {"uv": [0, 0, 0.8, 1], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [9, 7.1, 6.3],
-			"to": [9, 8.1, 12.3],
-			"faces": {
-				"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"east": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
-				"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"west": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
-				"up": {"uv": [0, 0, 0, 3], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 3], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [7, 7.1, 6.3],
-			"to": [7, 8.1, 12.3],
-			"faces": {
-				"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"east": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"},
-				"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"west": {"uv": [5.5, 8.5, 2.5, 9], "texture": "#0"},
-				"up": {"uv": [0, 0, 0, 3], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 3], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [7, 7.1, 12.3],
-			"to": [9, 8.1, 12.3],
-			"faces": {
-				"north": {"uv": [5.5, 9.5, 6.5, 10], "texture": "#0"},
-				"east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"south": {"uv": [5.5, 9.5, 6.5, 10], "texture": "#0"},
-				"west": {"uv": [0, 0, 0, 0.5], "texture": "#0"},
-				"up": {"uv": [0, 0, 1, 0], "texture": "#missing"},
-				"down": {"uv": [0, 0, 1, 0], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [7, 5.1, 6.3],
-			"to": [7, 7.1, 7.3],
-			"faces": {
-				"north": {"uv": [0, 0, 0, 1], "texture": "#missing"},
-				"east": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
-				"south": {"uv": [0, 0, 0, 1], "texture": "#missing"},
-				"west": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
-				"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [9, 5.1, 6.3],
-			"to": [9, 7.1, 7.3],
-			"faces": {
-				"north": {"uv": [0, 0, 0, 1], "texture": "#missing"},
-				"east": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
-				"south": {"uv": [0, 0, 0, 1], "texture": "#missing"},
-				"west": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"},
-				"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
-				"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "frame",
-			"from": [7, 5.1, 6.3],
-			"to": [9, 8.1, 6.3],
-			"faces": {
-				"north": {"uv": [7, 8.5, 8.5, 10], "texture": "#0"},
-				"east": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
-				"south": {"uv": [7, 8.5, 8.5, 10], "texture": "#0"},
-				"west": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
-				"up": {"uv": [2.5, 11, 3.5, 11.5], "texture": "#0"},
-				"down": {"uv": [2, 11, 3, 11.5], "texture": "#0"}
-			}
-		},
-		{
-			"name": "charge",
-			"from": [7.1, 7, 6.9],
-			"to": [8.8, 29.3, 12],
-			"faces": {
-				"north": {"uv": [2.45, 1, 3.45, 12], "texture": "#1"},
-				"east": {"uv": [0, 1, 2.5, 12], "texture": "#1"},
-				"south": {"uv": [6, 1, 7, 12], "texture": "#1"},
-				"west": {"uv": [3.5, 1, 6, 12], "texture": "#1"},
-				"up": {"uv": [3.5, 0, 6, 1], "rotation": 90, "texture": "#1"},
-				"down": {"uv": [0, 0, 1, 2.5], "texture": "#missing"}
-			}
-		},
-		{
-			"name": "capacitor",
-			"from": [7.5, 7.4, 10.5],
-			"to": [8.5, 8.4, 13.5],
-			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8.5, 12.5]},
-			"faces": {
-				"north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
-				"east": {"uv": [7.5, 0.5, 8, 2], "rotation": 270, "texture": "#0"},
-				"south": {"uv": [7.5, 0, 8, 0.5], "texture": "#0"},
-				"west": {"uv": [7.5, 0.5, 8, 2], "rotation": 90, "texture": "#0"},
-				"up": {"uv": [7.5, 0.5, 8, 2], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [7.5, 0.5, 8, 2], "texture": "#0"}
-			}
-		},
-		{
-			"name": "capacitor",
-			"from": [7.5, 8.9, 11],
-			"to": [8.5, 9.9, 14],
-			"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8.5, 12.5]},
-			"faces": {
-				"north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
-				"east": {"uv": [7.5, 0.5, 8, 2], "rotation": 270, "texture": "#0"},
-				"south": {"uv": [7.5, 0, 8, 0.5], "texture": "#0"},
-				"west": {"uv": [7.5, 0.5, 8, 2], "rotation": 90, "texture": "#0"},
-				"up": {"uv": [7.5, 0.5, 8, 2], "rotation": 180, "texture": "#0"},
-				"down": {"uv": [7.5, 0.5, 8, 2], "texture": "#0"}
-			}
-		}
-	],
-	"display": {
-		"thirdperson_righthand": {
-			"translation": [0, 3, -1]
-		},
-		"thirdperson_lefthand": {
-			"translation": [0, 3, -1]
-		},
-		"firstperson_righthand": {
-			"rotation": [20, 0, 0],
-			"translation": [0, 1.75, -4.25]
-		},
-		"firstperson_lefthand": {
-			"rotation": [20, 0, 0],
-			"translation": [0, 1.75, -4.25]
-		},
-		"ground": {
-			"rotation": [13, 0, 0],
-			"translation": [0, 5, -2.25]
-		},
-		"gui": {
-			"rotation": [90, 42, -90],
-			"translation": [-4.75, -2.25, 0],
-			"scale": [0.8, 0.8, 0.8]
-		},
-		"fixed": {
-			"rotation": [90, -45, 90],
-			"translation": [5.5, -3.5, -1]
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_inventory.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_inventory.json
new file mode 100644
index 000000000..82c5c827c
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_inventory.json
@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "overdrive_that_matters:item/swordicon"
+	}
+}
\ No newline at end of file

From 459621980098680b9399f7fcd0633ed3db103aa3 Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Thu, 1 Sep 2022 15:22:04 +0600
Subject: [PATCH 4/4] sword 2d/3d views restored (attempt 3)

---
 .../assets/overdrive_that_matters/models/item/energy_sword.json  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json
index fb912ef96..0d04921d2 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json
@@ -3,7 +3,6 @@
 	"gui_light": "front",
 	"base":
 	{
-		"parent": "builtin/entity",
 		"textures": {
 			"0": "overdrive_that_matters:item/energy_sword",
 			"1": "overdrive_that_matters:item/energy_sword_charge"