From 859d9dd05dcc66441f5be3c67123cc48023ceca4 Mon Sep 17 00:00:00 2001
From: Forstride <forstride@gmail.com>
Date: Sun, 4 Aug 2019 23:34:08 -0400
Subject: [PATCH] "Fixed" Flowering Oak leaf model in Fast graphics

---
 .../models/block/flowering_oak_leaves.json    |   4 +--
 .../block/flowering_oak_leaves_fast.json      |   6 ----
 .../models/block/leaves_overlay.json          |  26 +++++++++---------
 .../textures/blocks/flowering_oak_leaves.png  | Bin 355 -> 541 bytes
 .../blocks/flowering_oak_leaves_fast.png      | Bin 388 -> 0 bytes
 5 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves_fast.json
 delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves_fast.png

diff --git a/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves.json
index 4a91fb76c..b181a2447 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves.json
@@ -1,7 +1,7 @@
 {
     "parent": "biomesoplenty:block/leaves_overlay",
     "textures": {
-        "under": "biomesoplenty:blocks/flowering_oak_leaves",
-        "over": "biomesoplenty:blocks/flowering_oak_leaves_overlay"
+        "leaves": "biomesoplenty:blocks/flowering_oak_leaves",
+        "overlay": "biomesoplenty:blocks/flowering_oak_leaves_overlay"
     }
 }
diff --git a/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves_fast.json b/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves_fast.json
deleted file mode 100644
index 160e138fa..000000000
--- a/src/main/resources/assets/biomesoplenty/models/block/flowering_oak_leaves_fast.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/leaves",
-    "textures": {
-        "all": "biomesoplenty:blocks/flowering_oak_leaves_fast"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/models/block/leaves_overlay.json b/src/main/resources/assets/biomesoplenty/models/block/leaves_overlay.json
index 1512542f8..180e6f975 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/leaves_overlay.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/leaves_overlay.json
@@ -1,29 +1,29 @@
 {
     "parent": "block/block",
     "textures": {
-        "particle": "#under"
+        "particle": "#leaves"
     },
     "elements": [
         {   "from": [ 0, 0, 0 ],
             "to": [ 16, 16, 16 ],
             "faces": {
-                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#under", "tintindex": 1 },
-                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#under", "tintindex": 1 },
-                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#under", "tintindex": 1 },
-                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#under", "tintindex": 1 },
-                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#under", "tintindex": 1 },
-                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#under", "tintindex": 1 }
+                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay"},
+                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay"},
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay"},
+                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay"},
+                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay"},
+                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay"}
             }
         },
         {   "from": [ 0, 0, 0 ],
             "to": [ 16, 16, 16 ],
             "faces": {
-                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#over", "cullface": "down"},
-                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#over", "cullface": "up"},
-                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#over", "cullface": "north"},
-                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#over", "cullface": "south"},
-                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#over", "cullface": "west"},
-                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#over", "cullface": "east"}
+                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#leaves", "tintindex": 1 },
+                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#leaves", "tintindex": 1 },
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaves", "tintindex": 1 },
+                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#leaves", "tintindex": 1 },
+                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#leaves", "tintindex": 1 },
+                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#leaves", "tintindex": 1 }
             }
         }
     ]
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves.png b/src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves.png
index 7bff4ce9bd7282d149c60cfc44c323c8f5e9b8e0..de02b3651133815027eff6c8da22ec4d7fbd6243 100644
GIT binary patch
delta 492
zcmV<I0Tce?0-XeqBnkm@Qb$4nuFf3kks%v@zW@LZzX3P}QzQTY0kTO%K~y+Tb&@el
z13?gl_x2BnT|fj6twc19m6#$3DJ=9K*a)T-ku(;zK}4{+ppA`+7SX~YU{XY^L`Y?&
zTqUHFQ~`^N_YL<#67WH?x3lx!yq%q(yjvc)6wzfAG@cuS(ncwWYLUgtd*z^VSh4Sa
z-cQfvSMwHQPj0Kxa-JY$f{+pHymegs89RikC)FTa2;J256e$MC@mK7MrJ^$;P^F!N
zecyh3NccvCB)Ot`zuynquWdUAo<CW}=K0ZaLSi@{Iw}KP5&P(NgWv0AH@mcAJcNx*
zb(G}-5XWk^H6V1+Yz}(_Y*X0U_A^g^>+XB=#VzJ?Mx;SF64WO|=m+j_<+<n8=~;3&
z7n%Lh2C2ai<c=6*c;wn$sPukwpQsA=2UMV<oZwdd0TlA1l}N7N)`y1><Um!4(LC+V
z0jjKWfXL)55Z9{!y^_}(^UKamX!5Qq!pd`+i&VtMceLY>NziL>6%rxPNJJ%920Ubf
z>H|(RiK<dqD|j_ijyPvEf-3yyMl*sixhl%{m>ObQO(6xgnZ9g0mdD<6N5K?R3>%i&
iW=1qfx)y6xiw1wQba3dSWJNRp0000<MNUMnLSTZW7~|Oh

delta 307
zcmV-30nGlL1mgmbB#|)~f5HF&4#EKyC`y0;000<tMObuGZ)S9NVRB^vaA9d~bS`dX
zbRaY?F)lX!P6_A$007}hL_t(IPj!&(4Z=VSLpv-#x&Z1b?I@Ml?dXg04pW4saEa}F
zlx2OagIF${ue09$*atzrJ-0#Nkpp<)%iLVSfrx6nS<_7J!h)N~e-UlUt9SvNQH19E
z=eR{K@zYH13vBMP;Gn$byJ*mu7v%-yXtR&P&4_urru4uO)O8_AZh<tY)$lnGZPpYD
zn&sp*=Md}9zu9oeeJig)or|YPPGfQmamj3G6wePPx3*Sriv#ka2}y;_fzA0@a`j?P
z;@>quuS=^hn<euCDa@S~(pQ9L2&04xUgGIZ&!zjZk2e%ZzQDAe#LfT!002ovPDHLk
FV1g#}k-7i?

diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves_fast.png b/src/main/resources/assets/biomesoplenty/textures/blocks/flowering_oak_leaves_fast.png
deleted file mode 100644
index d4ad8851fe17213286da1a28ebec9c508b69631b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 388
zcmV-~0ek+5P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006O%
z3;baP00009a7bBm000ia000ia0czHX2><{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J
zG%hhNHvLWs=l}o#0!c(cR5(v<lEDqaKnw)a44v^v11POrgeW8uX@eT_<(21=v2IQ#
zV9Bz*Uax&ohVeR9d^l`*E)mOIDo#G#ri#N6!{CAkxnW@n(zHj+HN)gC40F?K+oI`E
zzKXc-dtf?P-*A48Tf`85KQ6K4XBcH-fQLEU$}oiP>)M|ZMv;}l7|a)W0Y*-*i%{Sw
z)6Az!l0y!LQ^$oQc?+OUZ4aJ;^m<KUL$a8-<Sb$x0sxvK=dDDYIxp@`at1Soh)d+;
zkKNzn)-!=21@cAR1a0ITW0-#=KTE-gkTdY_8vhZwE{(Z7ESN8V%s<k~FJ1tW0rY4b
i<|Urq;J&oXrG5Y(5B!TH{bL{i0000<MNUMnLSTZH3YvBR