From 3553e6504d7c2b6dd1cde1df1d7810d007384be2 Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Fri, 12 Feb 2021 15:42:14 +0300
Subject: [PATCH] Flavolite furnace, missing shaders, some pick stacks

---
 .../blocks/GlowingPillarRootsBlock.java          |  11 +++++++++++
 .../java/ru/betterend/blocks/LumecornBlock.java  |  12 ++++++++++++
 .../materialmaps/block/eternal_pedestal.json     |   3 +++
 .../assets/betterend/patterns/block/furnace.json |   2 +-
 .../block/flavolite_furnace_fron_on.png.mcmeta   |  12 ++++++++++++
 .../textures/block/flavolite_furnace_front.png   | Bin 0 -> 679 bytes
 .../block/flavolite_furnace_front_on.png         | Bin 0 -> 2640 bytes
 .../textures/block/flavolite_furnace_side.png    | Bin 0 -> 620 bytes
 .../textures/block/flavolite_furnace_top.png     | Bin 0 -> 561 bytes
 9 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/assets/betterend/materialmaps/block/eternal_pedestal.json
 create mode 100644 src/main/resources/assets/betterend/textures/block/flavolite_furnace_fron_on.png.mcmeta
 create mode 100644 src/main/resources/assets/betterend/textures/block/flavolite_furnace_front.png
 create mode 100644 src/main/resources/assets/betterend/textures/block/flavolite_furnace_front_on.png
 create mode 100644 src/main/resources/assets/betterend/textures/block/flavolite_furnace_side.png
 create mode 100644 src/main/resources/assets/betterend/textures/block/flavolite_furnace_top.png

diff --git a/src/main/java/ru/betterend/blocks/GlowingPillarRootsBlock.java b/src/main/java/ru/betterend/blocks/GlowingPillarRootsBlock.java
index bd7264eb..c6e5d493 100644
--- a/src/main/java/ru/betterend/blocks/GlowingPillarRootsBlock.java
+++ b/src/main/java/ru/betterend/blocks/GlowingPillarRootsBlock.java
@@ -1,9 +1,14 @@
 package ru.betterend.blocks;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.item.ItemStack;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.EnumProperty;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.BlockView;
 import ru.betterend.blocks.BlockProperties.TripleShape;
 import ru.betterend.blocks.basis.UpDownPlantBlock;
 import ru.betterend.registry.EndBlocks;
@@ -20,4 +25,10 @@ public class GlowingPillarRootsBlock extends UpDownPlantBlock {
 	protected boolean isTerrain(BlockState state) {
 		return state.isOf(EndBlocks.AMBER_MOSS);
 	}
+	
+	@Override
+	@Environment(EnvType.CLIENT)
+	public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) {
+		return new ItemStack(EndBlocks.GLOWING_PILLAR_SEED);
+	}
 }
diff --git a/src/main/java/ru/betterend/blocks/LumecornBlock.java b/src/main/java/ru/betterend/blocks/LumecornBlock.java
index 0011b4ce..c29c2c95 100644
--- a/src/main/java/ru/betterend/blocks/LumecornBlock.java
+++ b/src/main/java/ru/betterend/blocks/LumecornBlock.java
@@ -3,6 +3,8 @@ package ru.betterend.blocks;
 import java.util.Collections;
 import java.util.List;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.block.Block;
@@ -100,4 +102,14 @@ public class LumecornBlock extends BlockBaseNotFull implements IRenderTypeable {
 			return Collections.emptyList();
 		}
 	}
+	
+	@Override
+	@Environment(EnvType.CLIENT)
+	public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) {
+		LumecornShape shape = state.get(SHAPE);
+		if (shape == LumecornShape.BOTTOM_BIG || shape == LumecornShape.BOTTOM_SMALL || shape == LumecornShape.MIDDLE) {
+			return new ItemStack(EndBlocks.LUMECORN_SEED);
+		}
+		return new ItemStack(EndItems.LUMECORN_ROD);
+	}
 }
diff --git a/src/main/resources/assets/betterend/materialmaps/block/eternal_pedestal.json b/src/main/resources/assets/betterend/materialmaps/block/eternal_pedestal.json
new file mode 100644
index 00000000..5d23c84f
--- /dev/null
+++ b/src/main/resources/assets/betterend/materialmaps/block/eternal_pedestal.json
@@ -0,0 +1,3 @@
+{
+	"defaultMaterial": "betterend:glow_purple"
+}
diff --git a/src/main/resources/assets/betterend/patterns/block/furnace.json b/src/main/resources/assets/betterend/patterns/block/furnace.json
index accba1f5..be5bece7 100644
--- a/src/main/resources/assets/betterend/patterns/block/furnace.json
+++ b/src/main/resources/assets/betterend/patterns/block/furnace.json
@@ -4,6 +4,6 @@
 		"top": "betterend:block/%top%",
 		"front": "betterend:block/%front%",
 		"side": "betterend:block/%side%",
-		"bottom": "betterend:block/%bottom%"
+		"bottom": "betterend:block/%top%"
 	}
 }
diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_furnace_fron_on.png.mcmeta b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_fron_on.png.mcmeta
new file mode 100644
index 00000000..98b9ae71
--- /dev/null
+++ b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_fron_on.png.mcmeta
@@ -0,0 +1,12 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 8,
+    "frames": [
+      0,
+      1,
+      2,
+      3
+    ]
+  }
+}
diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_furnace_front.png b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..210567575e07efaac6d70e0196bd57966c9fde19
GIT binary patch
literal 679
zcmV;Y0$BZtP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px%VM#<mR5*=Ylgo}9MHGg=YWJxwUos@hYS=_<2ofxK0v0TTkb<&^ly^j7G#GIc
z;vrxG#2RJBapG~@ZhPGA(^ccHEZS}*)asOUe$`+9#VjYkM-x2&x7Ct#a36qZEGBxA
z7)WBEF+yX6Xe<CG`gZ>a1o-!#zxedw7dY1kDgab>)T#hv&e0p5BKv}Mv0^s6BsI}f
ztCBf~h-G^95`YkDM6zxU!6RaM`1uLzVnya00BM=OVm7-Z1kYe_hv{U(Xf(uH%Pxte
zO+}us02qyiEM8wSpHC67h-8@j#ZR%!U$I!snNB8HYdL>D#yR2rqZ;`3yKk^o`0}eq
z%r5?>DBhAJF`%kgo8f)vz(d#P-pL6r>thnZIpO^InC-SCZCZUqENNrfm%OhDw*lt_
zlL-6RzTD4*ekORIc5IHA5IhNhI|w4Fpc)w1lzt|dBxT>gt`1cG7S({YmVGiL%UaRX
zXe_Eq2sPFUPo6$TY`^uI{ehkTKo1i=b*(LfV~9jDMx!C)voXJ&k1_1|_55dk`2I%#
z{`}<+#%E)^Z-dn_NMh)`w$`HB-t&A#sk@H$ao%oAk{GCKZEY<6JBv4~Yi6@cu3lVV
zt>Aq)WI^a<Blh){JTJO0eEs+tN9)b|UHE?=j_evE+*V6^!_!WKZnxKz_}!+9^Y#1<
zAAfS6<!pj;4prr&yLXvhz2w1Xr&P;}L$H*an{`{JS`|GMrYtw4O+{U6$EsGPs&42t
zWe09us7d{9!+Kp%mK#JeLh#JryrwALc6rb9YX*Zm_}zxZV*WwF-T}BIZpWA6R3rcZ
N002ovPDHLkV1g(PLGl0q

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_furnace_front_on.png b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_front_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..57455f2674fd81508434c47bed8249aaf0418af6
GIT binary patch
literal 2640
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
TZ7t65&ll*shF$SZ<o168+;1ki

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_furnace_side.png b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b99c12fecfddebf71675468c45f4aec97f0c789
GIT binary patch
literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px%CP_p=R5*=Ylgn<?Kp2I;u{~oqPHCHV(;|V`Py}pv0$!ZQU{ged+J-b~Nt%o8
zjQ@!}EbI&wJIgcY=v?Ng#rT_7UI5rv3zES(0A3lC7b5S7yrWf`R%yI404Oir{R0r-
z$IW-%Uw<acj(`dPYj@Pv0+41Iaej$zR;*XgOs97w$_ur%q*;d6hROXc0M6BDorZ7c
z1g#C%pI)(EJ(Fe`07<$0&2)N)bHZS7%w#-fILtA|u!}rNTd`a|127!sJU!eopHI-*
zpmj==k6v?i^(KIgF^IU{=N?bY+2{fQ5y$<{8$N#dN}j)>s<uRtcUWsNCJjJiG$KOe
z8x##?vFVA0q9{q)E+4H8Nvm|vUgP#10YID%adpw3Nl)C795Bua5kS@lq7#iV8e>c#
zDvC1rKb$pDPMUV1Ctew>wK!K}OvmhriF`wB45N_=3J&&^7wX#LoOCsIe$tRWGy(8Z
zz9*(EHbmb2QxJI<x;}Umafk?KqYJb-LeYf(MNtxYM_t>l#+Mn)W{(s_Nl}y-V{o#g
zRWTyMa=8k5?4toEC#PN2FSqdj9uDeSrP)^t;`}n~Al!}H64`CSbAFu9xO#WaVmc<v
zGOV?noSrhdzvb<RORB}Mej}FccHNDswieqDrYtukZAD$%psKc(s@f8_WdL_A)FiUo
zuwJhy%MDtmI48_!53E*y!h2sX9~lgek==%;r+En7IpHtgX<Y!E2!_%C0000<MNUMn
GLSTYRlMv4U

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/betterend/textures/block/flavolite_furnace_top.png b/src/main/resources/assets/betterend/textures/block/flavolite_furnace_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb000c3ac0459419d9e7fa62c0a5d435746aa8e2
GIT binary patch
literal 561
zcmV-10?z%3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$>q$gGR5*==lQC}-K@^0)-Mf8v@tK4i5fVY7Boff@3y>(OXyG656G2q`2AUvJ
zkOY%};y7W?-g|3%Db79uh10F}y&1ik(U^;)kI5tjU_QMdAKU{V8NnpQrie|ErEx5c
zBN+j}B<=RsK!7iYpLu-njI!JUrT~O6qYVLoqAba(2e`$AtH~v!(J{G6N*e-2S>l{<
zdh!i`7+ahx`ge?qbHc&XZLTJl6lDoO-i*I98XXg(G8o+9^yrA;utG$b*+jmaG9F(7
zFdSC=`f<$p`6<o`&K20Ie#rj*qaG|GsK%AfIf;zjdJh2A$jR43o;-g+Rc$k!{>IuA
z2_Ya-^gt1Zs$$au!-B?NuZR`z8}eo6k8?u4G;YP-66YNOKvoQitzXS_Mck3BF)=C@
zpj;W^a)*dRM0z6cn_mBVwy+gN(V3nnBZLr$u|=d~PGs1$AQPdkrN3Y;&m^U712JkB
zW2dL+-G@aFxOsjeqw&|+6#rgeQ|z-|YgCP>D!cU_PPQ;C`hV{mY>KpP=wiI-!P(hQ
zyl?QnK}3i;V`(x}mGOAe`!Tlzc6RP|QUBkCPaod*X;gy&yY(K8zsCE9S(x$a&AZKA
zc=`J6<}$(NF3hJF8_OhHw{_u`GS&6{f4cAo?s!bxD|!!q00000NkvXXu0mjfrUeA5

literal 0
HcmV?d00001