From b66f074fdbf86bfcfa19482e0878deae55586eeb Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 13 Mar 2021 17:32:47 +0300 Subject: [PATCH] Lucernia & Filalux prototypes --- .../betterend/blocks/FilaluxLanternBlock.java | 11 +++++++++++ .../java/ru/betterend/registry/EndBlocks.java | 7 +++++++ .../ru/betterend/registry/FilaluxBlock.java | 15 +++++++++++++++ .../assets/betterend/blockstates/filalux.json | 7 +++++++ .../betterend/materialmaps/block/filalux.json | 14 ++++++++++++++ .../materialmaps/block/filalux_lantern.json | 3 +++ .../materialmaps/block/lucernia_leaves.json | 3 +++ .../materialmaps/block/lucernia_sapling.json | 3 +++ .../betterend/materialmaps/item/filalux.json | 3 +++ .../materialmaps/item/lucernia_leaves.json | 1 + .../betterend/materialmaps/item/rubinea.json | 1 + .../betterend/models/block/filalux_bottom.json | 6 ++++++ .../betterend/models/block/filalux_middle.json | 6 ++++++ .../assets/betterend/models/item/filalux.json | 6 ++++++ .../betterend/textures/block/filalux_bottom.png | Bin 0 -> 302 bytes .../textures/block/filalux_lantern.png | Bin 302 -> 263 bytes .../textures/block/filalux_lantern_block.png | Bin 263 -> 0 bytes .../textures/block/lucernia_leaves.png | Bin 241 -> 258 bytes 18 files changed, 86 insertions(+) create mode 100644 src/main/java/ru/betterend/blocks/FilaluxLanternBlock.java create mode 100644 src/main/java/ru/betterend/registry/FilaluxBlock.java create mode 100644 src/main/resources/assets/betterend/blockstates/filalux.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/filalux.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/filalux_lantern.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/lucernia_leaves.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/lucernia_sapling.json create mode 100644 src/main/resources/assets/betterend/materialmaps/item/filalux.json create mode 100644 src/main/resources/assets/betterend/materialmaps/item/lucernia_leaves.json create mode 100644 src/main/resources/assets/betterend/materialmaps/item/rubinea.json create mode 100644 src/main/resources/assets/betterend/models/block/filalux_bottom.json create mode 100644 src/main/resources/assets/betterend/models/block/filalux_middle.json create mode 100644 src/main/resources/assets/betterend/models/item/filalux.json create mode 100644 src/main/resources/assets/betterend/textures/block/filalux_bottom.png delete mode 100644 src/main/resources/assets/betterend/textures/block/filalux_lantern_block.png diff --git a/src/main/java/ru/betterend/blocks/FilaluxLanternBlock.java b/src/main/java/ru/betterend/blocks/FilaluxLanternBlock.java new file mode 100644 index 00000000..9bb4a323 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/FilaluxLanternBlock.java @@ -0,0 +1,11 @@ +package ru.betterend.blocks; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Material; +import ru.betterend.blocks.basis.BlockBase; + +public class FilaluxLanternBlock extends BlockBase { + public FilaluxLanternBlock() { + super(FabricBlockSettings.of(Material.WOOD).luminance(15)); + } +} diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 2293e7f3..e3ef0248 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -64,6 +64,7 @@ import ru.betterend.blocks.LacugroveSaplingBlock; import ru.betterend.blocks.LanceleafBlock; import ru.betterend.blocks.LanceleafSeedBlock; import ru.betterend.blocks.LargeAmaranitaBlock; +import ru.betterend.blocks.FilaluxLanternBlock; import ru.betterend.blocks.LumecornBlock; import ru.betterend.blocks.LumecornSeedBlock; import ru.betterend.blocks.MengerSpongeBlock; @@ -233,6 +234,10 @@ public class EndBlocks { public static final Block JELLYSHROOM_CAP_PURPLE = registerBlock("jellyshroom_cap_purple", new JellyshroomCapBlock(217, 142, 255, 164, 0, 255)); public static final WoodenMaterial JELLYSHROOM = new WoodenMaterial("jellyshroom", MaterialColor.PURPLE, MaterialColor.LIGHT_BLUE); + public static final Block LUCERNIA_SAPLING = registerBlock("lucernia_sapling", new TenaneaSaplingBlock()); + public static final Block LUCERNIA_LEAVES = registerBlock("lucernia_leaves", new EndLeavesBlock(LUCERNIA_SAPLING, MaterialColor.ORANGE)); + public static final WoodenMaterial LUCERNIA = new WoodenMaterial("lucernia", MaterialColor.ORANGE, MaterialColor.ORANGE); + // Small Plants // public static final Block UMBRELLA_MOSS = registerBlock("umbrella_moss", new UmbrellaMossBlock()); public static final Block UMBRELLA_MOSS_TALL = registerBlock("umbrella_moss_tall", new UmbrellaMossTallBlock()); @@ -331,6 +336,8 @@ public class EndBlocks { public static final Block BULB_VINE = registerBlock("bulb_vine", new BulbVineBlock()); public static final Block JUNGLE_VINE = registerBlock("jungle_vine", new VineBlock()); public static final Block RUBINEA = registerBlock("rubinea", new VineBlock()); + public static final Block FILALUX = registerBlock("filalux", new FilaluxBlock()); + public static final Block FILALUX_LANTERN = registerBlock("filalux_lantern", new FilaluxLanternBlock()); // Mob-Related public static final Block SILK_MOTH_NEST = registerBlock("silk_moth_nest", new SilkMothNestBlock()); diff --git a/src/main/java/ru/betterend/registry/FilaluxBlock.java b/src/main/java/ru/betterend/registry/FilaluxBlock.java new file mode 100644 index 00000000..6b854712 --- /dev/null +++ b/src/main/java/ru/betterend/registry/FilaluxBlock.java @@ -0,0 +1,15 @@ +package ru.betterend.registry; + +import net.minecraft.block.AbstractBlock; +import ru.betterend.blocks.basis.VineBlock; + +public class FilaluxBlock extends VineBlock { + public FilaluxBlock() { + super(15, true); + } + + @Override + public AbstractBlock.OffsetType getOffsetType() { + return AbstractBlock.OffsetType.NONE; + } +} diff --git a/src/main/resources/assets/betterend/blockstates/filalux.json b/src/main/resources/assets/betterend/blockstates/filalux.json new file mode 100644 index 00000000..d077514e --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/filalux.json @@ -0,0 +1,7 @@ +{ + "variants": { + "shape=top": { "model": "betterend:block/filalux_middle" }, + "shape=middle": { "model": "betterend:block/filalux_middle" }, + "shape=bottom": { "model": "betterend:block/filalux_bottom" } + } +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/filalux.json b/src/main/resources/assets/betterend/materialmaps/block/filalux.json new file mode 100644 index 00000000..3b0f7feb --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/filalux.json @@ -0,0 +1,14 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/filalux_bottom", + "material": "betterend:waving_glow_inc" + }, + { + "sprite": "betterend:block/filalux_middle", + "material": "betterend:waving" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/filalux_lantern.json b/src/main/resources/assets/betterend/materialmaps/block/filalux_lantern.json new file mode 100644 index 00000000..a72e6e79 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/filalux_lantern.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:glow_all" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/lucernia_leaves.json b/src/main/resources/assets/betterend/materialmaps/block/lucernia_leaves.json new file mode 100644 index 00000000..e4224176 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/lucernia_leaves.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:leaves" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/lucernia_sapling.json b/src/main/resources/assets/betterend/materialmaps/block/lucernia_sapling.json new file mode 100644 index 00000000..352de84b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/lucernia_sapling.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_floor" +} diff --git a/src/main/resources/assets/betterend/materialmaps/item/filalux.json b/src/main/resources/assets/betterend/materialmaps/item/filalux.json new file mode 100644 index 00000000..2163812f --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/filalux.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:glow_inc" +} diff --git a/src/main/resources/assets/betterend/materialmaps/item/lucernia_leaves.json b/src/main/resources/assets/betterend/materialmaps/item/lucernia_leaves.json new file mode 100644 index 00000000..69a88e3b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/lucernia_leaves.json @@ -0,0 +1 @@ +{} diff --git a/src/main/resources/assets/betterend/materialmaps/item/rubinea.json b/src/main/resources/assets/betterend/materialmaps/item/rubinea.json new file mode 100644 index 00000000..69a88e3b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/rubinea.json @@ -0,0 +1 @@ +{} diff --git a/src/main/resources/assets/betterend/models/block/filalux_bottom.json b/src/main/resources/assets/betterend/models/block/filalux_bottom.json new file mode 100644 index 00000000..5e85afac --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/filalux_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/filalux_bottom" + } +} diff --git a/src/main/resources/assets/betterend/models/block/filalux_middle.json b/src/main/resources/assets/betterend/models/block/filalux_middle.json new file mode 100644 index 00000000..84ef100c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/filalux_middle.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/filalux_middle" + } +} diff --git a/src/main/resources/assets/betterend/models/item/filalux.json b/src/main/resources/assets/betterend/models/item/filalux.json new file mode 100644 index 00000000..7df95c23 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/filalux.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/filalux_bottom" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/filalux_bottom.png b/src/main/resources/assets/betterend/textures/block/filalux_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..4a47f30b8e077f142e30cac46e5d1da7f269232c GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~rvRT2S0Ei` zZ&v7Q-yY#s5$nIdt9gHK)7@>e?(Ud*{ql_aw^zS-dg#Nu>mNVd%59s~diMX0C;vNa z?Y4RP?2pN~S>E`nW75Ofg0?_Y#7ctvf*Jl}10jvQi-9UCJY5_^B&L@3oEB;};9#hH zvBgQ5v*rK)t66T*wma0z*cong@Eq%DXr3q6Iq`1&y{fkDUjh&9jr>wjEWb3&c;)QV zcD>Tq&dYUu`Z%RK$@EGQo6yoAkJfV=I96}cNtbx~%HeYNPusuD4}46NV6244$rjF6*2UngB@xi7fyC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/filalux_lantern.png b/src/main/resources/assets/betterend/textures/block/filalux_lantern.png index 4a47f30b8e077f142e30cac46e5d1da7f269232c..824b97f5aa0033e83684a4c700628c1dff0f790d 100644 GIT binary patch delta 222 zcmZ3-)Xp@)uwE;`C&ZP3fg#M^tkBoKJ;JT0AYy4>_KkDXZ(m>d;_0FHZ?Ap-_A-3Z z?$)#aH$V6va?)`fP&HpkkY6yve`FBubz1}|Q|Rg97$Pw>w?B}NS&_pf(e0pD_5asp z2Dj(m-Pht0CnD*5QC81kQNmZf7bk+Vdcwc1lu&eg!BIRVdD)B)P0|txdJ|nX9G$T< zF6pU^(76|N@68U*yO`81cA)gJddKg{_RjM6?ZkJlzxS}B@Q|jR^E!1ql!BAKEVvCb9XUqTpSF_xrZFi`bu`}H0;5pXQ&^%ABbK>3l zdsS`QzXTrI8~LT6Sbk}k@ygk!?RurJotNwS^l?gelIfKqHld|K9lP>Y} ymBZ!kpSFLQANZIk$3%37?FfAPu7QJJI=*Bn8`I`;vp}FD7(8A5T-G@yGywoDScH`T diff --git a/src/main/resources/assets/betterend/textures/block/filalux_lantern_block.png b/src/main/resources/assets/betterend/textures/block/filalux_lantern_block.png deleted file mode 100644 index 824b97f5aa0033e83684a4c700628c1dff0f790d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~tpJ}8S0Ei` zZ&v7Q-yY%CQxLJVFZ;&1>9?;heDU{?$4yc;1B*-tA z;Xg76_qr_tlqvLdaSV}|n%f`9$E?WVlIV8OtNQ=zGK1Um@9t}Hi4&1@z9_5buqffH z-is5#Sv_A@N+`O$;3%GwyllpYCTWQTy@@Uxj?UN_m-JLd=-i9C_htv@T}Tiz5C*sZ(n)s**`Ep&V6{o Q2IvR|Pgg&ebxsLQ0LwdV*#H0l delta 200 zcmZo-`p7uJuwFXAC&ZP3fuY*oVVkGV)HPYgLR$&r8!H2 z{DK+&LxDNd>?=UQd`}n05Q(X_6FB)86gikrtN!_aG&;plsBep8V1-3OUXK$$Inwm!fxa&HpS}9xY0> yoY#Eqsf**ejKhr%#anL5otoaCwrA`9hs<}mnWt;6)L#L#o59o7&t;ucLK6UkTv