From 40e9a9d2f39223b668f7e87da7f1a91fa6410595 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sun, 3 Feb 2019 19:37:56 +0200
Subject: [PATCH] Adjusted textures and models for mugs

---
 .../unicopia/models/item/apple_cider.json     |  22 ++++++++++++++++
 .../assets/unicopia/models/item/mug.json      |  24 +++++++++++++++++-
 .../unicopia/textures/items/apple_cider.png   | Bin 3063 -> 3070 bytes
 .../assets/unicopia/textures/items/mug.png    | Bin 3032 -> 3044 bytes
 4 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/assets/unicopia/models/item/apple_cider.json b/src/main/resources/assets/unicopia/models/item/apple_cider.json
index 56bf34bd..100f88a1 100644
--- a/src/main/resources/assets/unicopia/models/item/apple_cider.json
+++ b/src/main/resources/assets/unicopia/models/item/apple_cider.json
@@ -2,5 +2,27 @@
     "parent": "item/generated",
     "textures": {
         "layer0": "unicopia:items/apple_cider"
+    },
+    "display": {
+        "thirdperson_righthand": {
+            "rotation": [ 0, -90, -55 ],
+            "translation": [ 0, 4.0, 0.5 ],
+            "scale": [ 0.85, 0.85, 0.85 ]
+        },
+        "thirdperson_lefthand": {
+            "rotation": [ 0, 90, 55 ],
+            "translation": [ 0, 4.0, 0.5 ],
+            "scale": [ 0.85, 0.85, 0.85 ]
+        },
+        "firstperson_righthand": {
+            "rotation": [ 0, -90, 25 ],
+            "translation": [ 1.13, 3.2, 1.13 ],
+            "scale": [ 0.68, 0.68, 0.68 ]
+        },
+        "firstperson_lefthand": {
+            "rotation": [ 0, 90, -25 ],
+            "translation": [ 1.13, 3.2, 1.13 ],
+            "scale": [ 0.68, 0.68, 0.68 ]
+        }
     }
 }
diff --git a/src/main/resources/assets/unicopia/models/item/mug.json b/src/main/resources/assets/unicopia/models/item/mug.json
index 0a318674..fa757e62 100644
--- a/src/main/resources/assets/unicopia/models/item/mug.json
+++ b/src/main/resources/assets/unicopia/models/item/mug.json
@@ -1,6 +1,28 @@
 {
-    "parent": "item/generated",
+    "parent": "item/handheld",
     "textures": {
         "layer0": "unicopia:items/mug"
+    },
+    "display": {
+        "thirdperson_righthand": {
+            "rotation": [ 0, -90, -55 ],
+            "translation": [ 0, 4.0, 0.5 ],
+            "scale": [ 0.85, 0.85, 0.85 ]
+        },
+        "thirdperson_lefthand": {
+            "rotation": [ 0, 90, 55 ],
+            "translation": [ 0, 4.0, 0.5 ],
+            "scale": [ 0.85, 0.85, 0.85 ]
+        },
+        "firstperson_righthand": {
+            "rotation": [ 0, -90, 25 ],
+            "translation": [ 1.13, 3.2, 1.13 ],
+            "scale": [ 0.68, 0.68, 0.68 ]
+        },
+        "firstperson_lefthand": {
+            "rotation": [ 0, 90, -25 ],
+            "translation": [ 1.13, 3.2, 1.13 ],
+            "scale": [ 0.68, 0.68, 0.68 ]
+        }
     }
 }
diff --git a/src/main/resources/assets/unicopia/textures/items/apple_cider.png b/src/main/resources/assets/unicopia/textures/items/apple_cider.png
index 7115002b7c7500293955b67f6e2f575d59e331bd..de93aecce6707249b12aa444de7292febba54712 100644
GIT binary patch
delta 354
zcmV-o0iFK$7ycKprV4*UNkl<ZILoDzze)o^5XQfe#KI$YonT`Kh?S_IVCy4T*r<h)
z7qE<lrLDrffS5wlSP52&2v!OfvDARXCh;1%TlT=aVl2+x?EMLxIMv?ne7~LjW{#K{
z{|aVC5u~+RE2SePCL(><@1Aqa7OEumUVUkYvH$>Sz~JqMqtJiD<kYlIlv1Kf5;0qt
zTi&2Tz_54AQRt;gG$B#wq0@E&00$>eWCALtNF@Ql*6zNB#B7cAf|wZ}FBjZtyO^)n
z;0FSZofx>X-UI+V-=D${L`t}K_(-~f*~M)F+*~W}u3QZRpw}jB;x8?K?F$V$J6hu$
zKqaUf96NcEd81m&`TWXPK;}W&sAM;kk!Gm3J9Y`cxbOp!s;+gMbfL6~zhb&x_$D<>
zg%ylU5{7uRerR^{gOvT58k;i!fcMKm;kP-;KkrVS-}qg(7ytkO07*qoM6N<$f{G@q
Ax&QzG

delta 347
zcmV-h0i^!^7xx#irV4*NNkl<ZILoDzy-EW?6otPVk}b0AZnu~wK~O7+g`%y6zJX0*
z5%2{9Ht_*0Y$EsqqJ`L4*x1`f5VQ?~Y!zY?bcvuT#%ji$W!EKmU|@dkIrrSlTv1B#
zFDRub66tMtxjfNi5wQZI=PRQ+Q!W*m(pcM<qyUgD@bYx4Dl&g%rd(XtHTU12Z#dPE
z+VZaC3Y;8nDu7m}i&G6PauQB8WMOGX%6WCql#7!fUtgY?w^pZX_Qt`*@s`!e!1q|+
zJ^<kH{v3e!kC?#s7)CLzPM3PKZ952j&jf0sCZ$ntwgsT1v+JN?6wmby$^hdD1inqy
zF4C^j2}<*18&6YyduKV&SZUa`>a5B4Ob5OGK!#C_UTNZAFeMzFKFHnbmjIHmT8ONl
t2v9Vl((4cMXJK)#2EgmhDD#{grXOa?mixI@CQ|?a002ovPDHLkV1jS@r!fEk

diff --git a/src/main/resources/assets/unicopia/textures/items/mug.png b/src/main/resources/assets/unicopia/textures/items/mug.png
index 2bf433f01c25aaaaf1ab559b990a9582714ad93b..28614a54965cf2762c384b5890f0bf58dd487174 100644
GIT binary patch
delta 328
zcmV-O0k{6x7vvYPrV4*4Nkl<ZILoDzuTKLp6vw}Bxgl73mor>2Tu8{&0tf>C1_A|+
ze_~4}hXsp-2^<y$4h3!&NXXP+hTJt>vQ0e1(O%0+atqJ&*Y|z;`fW?hjDH0)!v|^a
ziAs5-lZnVI4hJ`wa|3l!W-i@1SpWcV0i)M@%qC;3tgacMQVM@{QkZiCTf2vTz{lGI
z`j=e>fF$;p{P|V1or`C(0f8-QrUEZR=>;Tl39%ypfZ1g12&1qtFw3RWPh#Mzx33*1
z0H^`L#`bZg8;e3=fI4c+T)9486bf9Q9q<A`3$nZvX1O$DTciE30c0;!jo|l0GZoH`
zx{{);0Qf7iTslD2wa=euDHDH^>8>>;{g}KJlqN|lx$Hll4jjGrGi@HN0|4G{N8Yjh
al)nLs3yRVUk)BWh0000<MNUMnLSTa8=8r-E

delta 316
zcmV-C0mJ^}7uXlDrV4)@Nkl<ZILl-F|NlP&Md1Jc{|tl-DL3K8sgDt+nURqZMZv?1
zOX2L_|G61h8NV{f>qny)z`($O-GDn6HZZU<er5RmpPPZ3n;S0v>)R^^HZCy+NmW<e
z26Pme{byicU=SC??wyzKA#{9ZE2D&p3j+%_MdE@8h3G&{o|k{&*2B+mKHPx$&1V16
z6*4d|Fns*<nSq}V!AABD0|NsC6S5|LK3=$DLO@P03Sq#47W4lwjmXX;2C%>ahMx~r
zGt9Z@&PTU^i4@zA0+taY5Rn58-4(cE0PceF-jj^C9)4zkVRVi70Ne`|eWw_=>ilG6
zU|?Xxl?Jc@Y$-I6fq{X6P!?q@?>&h-FDQmcGB7YOFx+4B94j9=GXVgEZiJf!5-Ya=
O0000<MNUMnLSTXel#GA?