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 00000000..4a47f30b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/filalux_bottom.png differ 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 4a47f30b..824b97f5 100644 Binary files a/src/main/resources/assets/betterend/textures/block/filalux_lantern.png and b/src/main/resources/assets/betterend/textures/block/filalux_lantern.png differ 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 824b97f5..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/filalux_lantern_block.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_leaves.png b/src/main/resources/assets/betterend/textures/block/lucernia_leaves.png index 626abc19..4fdfc22c 100644 Binary files a/src/main/resources/assets/betterend/textures/block/lucernia_leaves.png and b/src/main/resources/assets/betterend/textures/block/lucernia_leaves.png differ