From 33992530103afeee690df3f7b89ab3e191d9b294 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 27 Nov 2020 01:50:11 +0300 Subject: [PATCH] Colored lanterns --- .../blocks/BlockBulbVineLantern.java | 6 +- .../blocks/BlockBulbVineLanternColored.java | 54 +++++++++++++ .../blocks/complex/ColoredMaterial.java | 33 ++++++++ .../java/ru/betterend/patterns/Patterns.java | 2 + .../ru/betterend/recipe/CraftingRecipes.java | 2 +- .../java/ru/betterend/registry/EndBlocks.java | 6 +- ...lb_vine_lantern.json => bulb_lantern.json} | 0 .../assets/betterend/lang/en_us.json | 21 ++++- .../assets/betterend/lang/ru_ru.json | 21 ++++- ...lb_vine_lantern.json => bulb_lantern.json} | 0 .../block/bulb_lantern_black.json | 10 +++ .../materialmaps/block/bulb_lantern_blue.json | 10 +++ .../block/bulb_lantern_brown.json | 10 +++ .../materialmaps/block/bulb_lantern_cyan.json | 10 +++ .../materialmaps/block/bulb_lantern_gray.json | 10 +++ .../block/bulb_lantern_green.json | 10 +++ .../block/bulb_lantern_light_blue.json | 10 +++ .../block/bulb_lantern_light_gray.json | 10 +++ .../materialmaps/block/bulb_lantern_lime.json | 10 +++ .../block/bulb_lantern_magenta.json | 10 +++ .../block/bulb_lantern_orange.json | 10 +++ .../materialmaps/block/bulb_lantern_pink.json | 10 +++ .../block/bulb_lantern_purple.json | 10 +++ .../materialmaps/block/bulb_lantern_red.json | 10 +++ .../block/bulb_lantern_white.json | 10 +++ .../block/bulb_lantern_yellow.json | 10 +++ .../models/block/bulb_lantern_colored.json | 73 ++++++++++++++++++ ...lb_vine_lantern.json => bulb_lantern.json} | 0 .../patterns/blockstate/pattern_direct.json | 7 ++ .../block/bulb_vine_lantern_metal.png | Bin 0 -> 1862 bytes .../block/bulb_vine_lantern_overlay.png | Bin 0 -> 2054 bytes 31 files changed, 378 insertions(+), 7 deletions(-) create mode 100644 src/main/java/ru/betterend/blocks/BlockBulbVineLanternColored.java create mode 100644 src/main/java/ru/betterend/blocks/complex/ColoredMaterial.java rename src/main/resources/assets/betterend/blockstates/{bulb_vine_lantern.json => bulb_lantern.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_vine_lantern.json => bulb_lantern.json} (100%) create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_black.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_blue.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_brown.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_cyan.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_gray.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_green.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_light_blue.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_light_gray.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_lime.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_magenta.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_orange.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_pink.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_purple.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_red.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_white.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_yellow.json create mode 100644 src/main/resources/assets/betterend/models/block/bulb_lantern_colored.json rename src/main/resources/assets/betterend/models/item/{bulb_vine_lantern.json => bulb_lantern.json} (100%) create mode 100644 src/main/resources/assets/betterend/patterns/blockstate/pattern_direct.json create mode 100644 src/main/resources/assets/betterend/textures/block/bulb_vine_lantern_metal.png create mode 100644 src/main/resources/assets/betterend/textures/block/bulb_vine_lantern_overlay.png diff --git a/src/main/java/ru/betterend/blocks/BlockBulbVineLantern.java b/src/main/java/ru/betterend/blocks/BlockBulbVineLantern.java index 2ddb7490..1a1474f8 100644 --- a/src/main/java/ru/betterend/blocks/BlockBulbVineLantern.java +++ b/src/main/java/ru/betterend/blocks/BlockBulbVineLantern.java @@ -30,7 +30,7 @@ public class BlockBulbVineLantern extends BlockBaseNotFull implements IRenderTyp public static final BooleanProperty WATERLOGGED = Properties.WATERLOGGED; public BlockBulbVineLantern() { - super(FabricBlockSettings.of(Material.METAL) + this(FabricBlockSettings.of(Material.METAL) .sounds(BlockSoundGroup.LANTERN) .hardness(1) .resistance(1) @@ -40,6 +40,10 @@ public class BlockBulbVineLantern extends BlockBaseNotFull implements IRenderTyp .luminance(15)); } + public BlockBulbVineLantern(FabricBlockSettings settings) { + super(settings); + } + @Override protected void appendProperties(StateManager.Builder stateManager) { stateManager.add(WATERLOGGED); diff --git a/src/main/java/ru/betterend/blocks/BlockBulbVineLanternColored.java b/src/main/java/ru/betterend/blocks/BlockBulbVineLanternColored.java new file mode 100644 index 00000000..5ae788a5 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/BlockBulbVineLanternColored.java @@ -0,0 +1,54 @@ +package ru.betterend.blocks; + +import java.io.Reader; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.client.color.block.BlockColorProvider; +import net.minecraft.client.color.item.ItemColorProvider; +import net.minecraft.util.Identifier; +import ru.betterend.interfaces.IColorProvider; +import ru.betterend.patterns.BlockPatterned; +import ru.betterend.patterns.Patterns; + +public class BlockBulbVineLanternColored extends BlockBulbVineLantern implements IColorProvider, BlockPatterned { + private final BlockColorProvider blockProvider; + private final ItemColorProvider itemProvider; + + public BlockBulbVineLanternColored(FabricBlockSettings settings) { + super(settings); + + blockProvider = (state, world, pos, tintIndex) -> { + return this.getDefaultMaterialColor().color; + }; + + itemProvider = (stack, tintIndex) -> { + return this.getDefaultMaterialColor().color; + }; + } + + @Override + public BlockColorProvider getProvider() { + return blockProvider; + } + + @Override + public ItemColorProvider getItemProvider() { + return itemProvider; + } + + @Override + public String getStatesPattern(Reader data) { + String path = "betterend:block/bulb_lantern_colored"; + return Patterns.createJson(data, path, path); + } + + @Override + public String getModelPattern(String block) { + return Patterns.createJson(Patterns.BLOCK_BULB_LANTERN_COLORED, "", ""); + } + + @Override + public Identifier statePatternId() { + return Patterns.STATE_DIRECT; + } +} diff --git a/src/main/java/ru/betterend/blocks/complex/ColoredMaterial.java b/src/main/java/ru/betterend/blocks/complex/ColoredMaterial.java new file mode 100644 index 00000000..b18f23e9 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/complex/ColoredMaterial.java @@ -0,0 +1,33 @@ +package ru.betterend.blocks.complex; + +import java.util.Map; +import java.util.function.Function; + +import com.google.common.collect.Maps; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.item.DyeItem; +import net.minecraft.util.DyeColor; +import net.minecraft.util.registry.Registry; +import ru.betterend.recipe.builders.GridRecipe; +import ru.betterend.registry.EndBlocks; + +public class ColoredMaterial { + private final Map colors = Maps.newEnumMap(DyeColor.class); + + public ColoredMaterial(Function constructor, Block source) { + String id = Registry.BLOCK.getId(source).getPath(); + for (DyeColor color: DyeColor.values()) { + Block block = constructor.apply(FabricBlockSettings.copyOf(source).materialColor(color)); + String blockName = id + "_" + color.getName(); + EndBlocks.registerBlock(blockName, block); + GridRecipe.make(blockName, block).setList("#D").addMaterial('#', source).addMaterial('D', DyeItem.byColor(color)).build(); + colors.put(color, block); + } + } + + public Block getByColor(DyeColor color) { + return colors.get(color); + } +} diff --git a/src/main/java/ru/betterend/patterns/Patterns.java b/src/main/java/ru/betterend/patterns/Patterns.java index b4ce2357..498f9bcf 100644 --- a/src/main/java/ru/betterend/patterns/Patterns.java +++ b/src/main/java/ru/betterend/patterns/Patterns.java @@ -33,6 +33,7 @@ public class Patterns { public final static Identifier STATE_BARREL = BetterEnd.makeID("patterns/blockstate/pattern_barrel.json"); public final static Identifier STATE_PEDESTAL = BetterEnd.makeID("patterns/blockstate/pattern_pedestal.json"); public final static Identifier STATE_STONE_LANTERN = BetterEnd.makeID("patterns/blockstate/stone_lantern.json"); + public final static Identifier STATE_DIRECT = BetterEnd.makeID("patterns/blockstate/pattern_direct.json"); //Models Block public final static Identifier BLOCK_EMPTY = BetterEnd.makeID("patterns/block/pattern_empty.json"); @@ -74,6 +75,7 @@ public class Patterns { public final static Identifier BLOCK_BOOKSHELF = BetterEnd.makeID("patterns/block/bookshelf.json"); public final static Identifier BLOCK_STONE_LANTERN_CEIL = BetterEnd.makeID("patterns/block/stone_lantern_ceil.json"); public final static Identifier BLOCK_STONE_LANTERN_FLOOR = BetterEnd.makeID("patterns/block/stone_lantern_floor.json"); + public final static Identifier BLOCK_BULB_LANTERN_COLORED = BetterEnd.makeID("models/block/bulb_lantern_colored.json"); //Models Item public final static Identifier ITEM_WALL = BetterEnd.makeID("patterns/item/pattern_wall.json"); diff --git a/src/main/java/ru/betterend/recipe/CraftingRecipes.java b/src/main/java/ru/betterend/recipe/CraftingRecipes.java index 01318f32..939025cd 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -113,7 +113,7 @@ public class CraftingRecipes { GridRecipe.make("amber_gem", EndItems.AMBER_GEM).setShape("##", "##").addMaterial('#', EndItems.RAW_AMBER).build(); GridRecipe.make("amber_block", EndBlocks.AMBER_BLOCK).setShape("###", "###", "###").addMaterial('#', EndItems.AMBER_GEM).build(); - GridRecipe.make("bulb_lantern", EndBlocks.BULB_VINE_LANTERN).addMaterial('C', Items.CHAIN).addMaterial('I', Items.IRON_INGOT).setShape("C", "I", "#").addMaterial('#', EndItems.GLOWING_BULB).build(); + GridRecipe.make("bulb_lantern", EndBlocks.BULB_LANTERN).addMaterial('C', Items.CHAIN).addMaterial('I', Items.IRON_INGOT).setShape("C", "I", "#").addMaterial('#', EndItems.GLOWING_BULB).build(); } private static void registerLantern(String name, Block lantern, Block slab) { diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index a4a944a1..02bb347f 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -17,6 +17,7 @@ import ru.betterend.blocks.BlockBlueVineSeed; import ru.betterend.blocks.BlockBubbleCoral; import ru.betterend.blocks.BlockBulbVine; import ru.betterend.blocks.BlockBulbVineLantern; +import ru.betterend.blocks.BlockBulbVineLanternColored; import ru.betterend.blocks.BlockBulbVineSeed; import ru.betterend.blocks.BlockChorusGrass; import ru.betterend.blocks.BlockDragonTreeSapling; @@ -61,6 +62,7 @@ import ru.betterend.blocks.basis.BlockStoneLantern; import ru.betterend.blocks.basis.BlockVine; import ru.betterend.blocks.basis.BlockWallMushroom; import ru.betterend.blocks.basis.BlockWallPlant; +import ru.betterend.blocks.complex.ColoredMaterial; import ru.betterend.blocks.complex.StoneMaterial; import ru.betterend.blocks.complex.WoodenMaterial; import ru.betterend.config.MainConfig; @@ -189,7 +191,9 @@ public class EndBlocks { public static final Block PURPUR_LANTERN = registerBlock("purpur_lantern", new BlockStoneLantern(Blocks.PURPUR_BLOCK)); public static final Block END_STONE_LANTERN = registerBlock("end_stone_lantern", new BlockStoneLantern(Blocks.END_STONE)); public static final Block BLACKSTONE_LANTERN = registerBlock("blackstone_lantern", new BlockStoneLantern(Blocks.BLACKSTONE)); - public static final Block BULB_VINE_LANTERN = registerBlock("bulb_vine_lantern", new BlockBulbVineLantern()); + + public static final Block BULB_LANTERN = registerBlock("bulb_lantern", new BlockBulbVineLantern()); + public static final ColoredMaterial BULB_LANTERN_COLORED = new ColoredMaterial(BlockBulbVineLanternColored::new, BULB_LANTERN); // Blocks With Entity // public static final Block END_STONE_SMELTER = registerBlock("end_stone_smelter", new EndStoneSmelter()); diff --git a/src/main/resources/assets/betterend/blockstates/bulb_vine_lantern.json b/src/main/resources/assets/betterend/blockstates/bulb_lantern.json similarity index 100% rename from src/main/resources/assets/betterend/blockstates/bulb_vine_lantern.json rename to src/main/resources/assets/betterend/blockstates/bulb_lantern.json diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 71aca5a6..cb3b133c 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -341,7 +341,24 @@ "block.betterend.twisted_moss": "Twisted Moss", "block.betterend.bulb_vine": "Bulb Vine", - "block.betterend.bulb_vine_lantern": "Bulb Vine Lantern", + "block.betterend.bulb_lantern": "Bulb Lantern", "block.betterend.bulb_vine_seed": "Bulb Vine Seed", - "item.betterend.glowing_bulb": "Glowing Bulb" + "item.betterend.glowing_bulb": "Glowing Bulb", + + "block.betterend.bulb_lantern_black": "Black Bulb Lantern", + "block.betterend.bulb_lantern_blue": "Blue Bulb Lantern", + "block.betterend.bulb_lantern_brown": "Brown Bulb Lantern", + "block.betterend.bulb_lantern_cyan": "Cyan Bulb Lantern", + "block.betterend.bulb_lantern_gray": "Gray Bulb Lantern", + "block.betterend.bulb_lantern_green": "Green Bulb Lantern", + "block.betterend.bulb_lantern_light_blue": "Light Blue Bulb Lantern", + "block.betterend.bulb_lantern_light_gray": "Light Gray Bulb Lantern", + "block.betterend.bulb_lantern_lime": "Lime Bulb Lantern", + "block.betterend.bulb_lantern_magenta": "Magenta Bulb Lantern", + "block.betterend.bulb_lantern_orange": "Orange Bulb Lantern", + "block.betterend.bulb_lantern_pink": "Pink Bulb Lantern", + "block.betterend.bulb_lantern_purple": "Purple Bulb Lantern", + "block.betterend.bulb_lantern_red": "Red Bulb Lantern", + "block.betterend.bulb_lantern_white": "White Bulb Lantern", + "block.betterend.bulb_lantern_yellow": "Yellow Bulb Lantern" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index cff9f24c..fc6ca788 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -343,7 +343,24 @@ "block.betterend.twisted_moss": "Закрученный мох", "block.betterend.bulb_vine": "Луковичная лоза", - "block.betterend.bulb_vine_lantern": "Фонарь из светящейся луковицы", + "block.betterend.bulb_lantern": "Луковичный фонарь", "block.betterend.bulb_vine_seed": "Семя луковичной лозы", - "item.betterend.glowing_bulb": "Светящаяся луковица" + "item.betterend.glowing_bulb": "Светящаяся луковица", + + "block.betterend.bulb_lantern_black": "Чёрный луковичный фонарь", + "block.betterend.bulb_lantern_blue": "Синий луковичный фонарь", + "block.betterend.bulb_lantern_brown": "Коричневый луковичный фонарь", + "block.betterend.bulb_lantern_cyan": "Циановый луковичный фонарь", + "block.betterend.bulb_lantern_gray": "Серый луковичный фонарь", + "block.betterend.bulb_lantern_green": "Зелёный луковичный фонарь", + "block.betterend.bulb_lantern_light_blue": "Голубой луковичный фонарь", + "block.betterend.bulb_lantern_light_gray": "Светло-серый луковичный фонарь", + "block.betterend.bulb_lantern_lime": "Лаймовый луковичный фонарь", + "block.betterend.bulb_lantern_magenta": "Фиолетовый луковичный фонарь", + "block.betterend.bulb_lantern_orange": "Оранжевый луковичный фонарь", + "block.betterend.bulb_lantern_pink": "Розовый луковичный фонарь", + "block.betterend.bulb_lantern_purple": "Пурпурный луковичный фонарь", + "block.betterend.bulb_lantern_red": "Красный луковичный фонарь", + "block.betterend.bulb_lantern_white": "Белый луковичный фонарь", + "block.betterend.bulb_lantern_yellow": "Жёлтый луковичный фонарь" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_vine_lantern.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_vine_lantern.json rename to src/main/resources/assets/betterend/materialmaps/block/bulb_lantern.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_black.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_black.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_black.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_blue.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_blue.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_blue.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_brown.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_brown.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_brown.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_cyan.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_cyan.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_cyan.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_gray.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_gray.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_gray.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_green.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_green.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_green.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_light_blue.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_light_blue.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_light_blue.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_light_gray.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_light_gray.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_light_gray.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_lime.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_lime.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_lime.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_magenta.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_magenta.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_magenta.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_orange.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_orange.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_orange.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_pink.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_pink.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_pink.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_purple.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_purple.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_purple.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_red.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_red.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_red.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_white.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_white.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_white.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_yellow.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_yellow.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_yellow.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_overlay", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bulb_lantern_colored.json b/src/main/resources/assets/betterend/models/block/bulb_lantern_colored.json new file mode 100644 index 00000000..7bb4eab5 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bulb_lantern_colored.json @@ -0,0 +1,73 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "overlay": "betterend:block/bulb_vine_lantern_overlay", + "metal": "betterend:block/bulb_vine_lantern_metal", + "particle": "#overlay" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 4, 4, 4 ], + "to": [ 12, 12, 12 ], + "shade": false, + "faces": { + "down": { "uv": [ 8, 0, 16, 8 ], "texture": "#metal" }, + "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#metal" }, + "north": { "uv": [ 0, 8, 8, 16 ], "texture": "#metal" }, + "south": { "uv": [ 0, 8, 8, 16 ], "texture": "#metal" }, + "west": { "uv": [ 0, 8, 8, 16 ], "texture": "#metal" }, + "east": { "uv": [ 0, 8, 8, 16 ], "texture": "#metal" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 4, 4 ], + "to": [ 12, 12, 12 ], + "shade": false, + "faces": { + "down": { "uv": [ 8, 0, 16, 8 ], "texture": "#overlay", "tintindex": 0 }, + "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#overlay", "tintindex": 0 }, + "north": { "uv": [ 0, 8, 8, 16 ], "texture": "#overlay", "tintindex": 0 }, + "south": { "uv": [ 0, 8, 8, 16 ], "texture": "#overlay", "tintindex": 0 }, + "west": { "uv": [ 0, 8, 8, 16 ], "texture": "#overlay", "tintindex": 0 }, + "east": { "uv": [ 0, 8, 8, 16 ], "texture": "#overlay", "tintindex": 0 } + } + }, + { + "__comment": "Box11", + "from": [ 6, 12, 6 ], + "to": [ 10, 13, 10 ], + "faces": { + "up": { "uv": [ 10, 8, 14, 12 ], "texture": "#metal" }, + "north": { "uv": [ 10, 12, 14, 13 ], "texture": "#metal" }, + "south": { "uv": [ 10, 12, 14, 13 ], "texture": "#metal" }, + "west": { "uv": [ 10, 12, 14, 13 ], "texture": "#metal" }, + "east": { "uv": [ 10, 12, 14, 13 ], "texture": "#metal" } + } + }, + { + "__comment": "PlaneX15", + "from": [ 7, 13, 7 ], + "to": [ 7.001, 16, 10 ], + "rotation": { "origin": [ 7, 13, 7 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 13, 13, 16 ], "texture": "#metal" }, + "east": { "uv": [ 10, 13, 13, 16 ], "texture": "#metal" } + } + }, + { + "__comment": "PlaneX15", + "from": [ 9, 13, 7 ], + "to": [ 9.001, 16, 10 ], + "rotation": { "origin": [ 9, 13, 7 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 13, 13, 16 ], "texture": "#metal" }, + "east": { "uv": [ 10, 13, 13, 16 ], "texture": "#metal" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/bulb_vine_lantern.json b/src/main/resources/assets/betterend/models/item/bulb_lantern.json similarity index 100% rename from src/main/resources/assets/betterend/models/item/bulb_vine_lantern.json rename to src/main/resources/assets/betterend/models/item/bulb_lantern.json diff --git a/src/main/resources/assets/betterend/patterns/blockstate/pattern_direct.json b/src/main/resources/assets/betterend/patterns/blockstate/pattern_direct.json new file mode 100644 index 00000000..7b035ca2 --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/blockstate/pattern_direct.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "%block%" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/bulb_vine_lantern_metal.png b/src/main/resources/assets/betterend/textures/block/bulb_vine_lantern_metal.png new file mode 100644 index 0000000000000000000000000000000000000000..3b9a8b87c72a0a1f8859b80c9a94bf6aad0efe1b GIT binary patch literal 1862 zcmbVNeQeZZ9PV)9F`W*KWTI&8j837~kL!K3a>Lu*-#JBC+ySlr!YkRx9 z8CfzXgc+D(3=zpx{xTs!K_QB9%s5=g;#V{w5u(#S#IIzDMB+z?zP&HU9JqK%uW#Gu zeV*s{(O-9Vc5JAxTUCc)Sbcju)`iXu?%`RA{%=437eJ?FX1vG7uxoF0j~Z;>{zeSD z`ZF!j?R1L|3bK*$0>zM^H=i*P8pGDD&znH*g$^#kq^5_7*>_J6xTb`O&3=&<%_vN1 z@c|2N8t6#K1HCe@5bIm;b$J01WS|4^d?u~iLOx6sc?Gm~Z&L(bggCunBH{|--C`#m zH7tnxy#Z2YI2I4`UM4{EEVmYCX(mX~L5lH_G$YUf!N=p}AA!^?MHRYY50tggRhURQ zjww)7E|>G>d|ty!QVh@Y6wOjBOCkhm7jy^YN!@O$FvOrOTbk);hK{?8Kr*sUm_SZT zA!N)dt!|gogc3&Ofk`o5+6}1)ROBko%v$N9xFS<94Kq-8Y=mX1STkifhMh7lLtTA* zi2zEiC{{HV^peR`C2XgyAB9m)$bx7)Q7|FZ1#Kg1$*`>-*=%y7F@>lFfn!(+!$?;O z)mgEON26|GLU{9LO;?PZeb1adFa{hLCRm!KNroZWK!WuN93ybPHMCEl=@L{l6iqG6 zg9Z~cjS7s=mq1b1D8K>#307o5HLMIkF>4u+gp{c#3A~y~A!?)z3kf54zM>0J6xwy$ z0lEy^V_^b??bS3zfV?cLGOdyx81{p z?A947MESP1Kt2|wT;88cK}33m;+NEILv?b%f{`T3-D3KSx}1L-^k3Qi;;LD)HP8LO z`|*FeFDFM%0X+%P1f>W!9?G3HrP5IIt5$qAXD(IXXxO>S>Xbzn)j17yL~Wrd{OIl# zt1+zRmiAaA5t=^wTx4XJZfINMIWRPGaD3#InT>k~mW1~Q&7U@Y`t*jryYGF?v**+e ztF`Sn?|3!Y64$zZ{bf*zG?>#zz7Jh5eDXXlejY!a-E#Vc&68d;(ipGx-DTVGr;4+7Ce*YdI4L~L8nV0~xbq`?1tLw^G=P-&O| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/bulb_vine_lantern_overlay.png b/src/main/resources/assets/betterend/textures/block/bulb_vine_lantern_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..281e72863e8c953128bdd68813f8fcb2350fa31e GIT binary patch literal 2054 zcmbVN3vkn99PfBc*citq%Hz0O4B9J?G><-$qu^+V8?J+GoeTvv{gSqUHtCXV?J6)u zCW7cxCUSGT!Ql->PsJTF4?P|t&jU{I#bC!nxgnekL>S7r`K9YBASh?=(tJsN-|zSP zKl0DAnT3yKq>WC~>2w+Sd9Gr39;O|GQsIC0_~J{o0YDt8W;o(+&Ja z@RX@#?g9o#AtTF4UfviDg&|s}n=~aFX2E=3MZCOU5FKdemaQlva1L~q#Z9=wPCg*y z#bmxDR_Fn-`GDroDU*>&Q3eu(c$Gz>p`fTRQ3o35W#C%7jiX2$qRw}qIhr6+=AMZ- zC7DMoMk@wLGlke_BWWdQ$~+OF2-1cVHk>qJ1j!Iq#zZ5D9}3lE&c_tHrX{rCl>-f^ zYM8R`35v_Qt!aQEgD^i6F_}ofpbF3Ckm~qNHt4gv* zl7fAOn%QR=aXPia*b&1lLFA-}GVZ25yo*(N2TBnXfsrIeSv{1AF_VnhG=VTN1knq1 zOPt`Vx(#ac5CkkRV&)i(KKc0+wYP< zg;rc`e{Y|25`Y|kt6EqK2fUOG<2gWJR$%sFH1K&bGw_l$!2+L;Wc%1=$O3%T*x=2q znkx=6@+9XY?3@`hd3{#QOPC4FPIDFva6SuQO@x)>NUfpcJ;LM(3anmL;uR_3%M+`h zfW+H^VS(1}4isp0<~cNRTew3$?nybZKN8>}>Aw`eS6z{OYJ`>f96!w6z4RA;H~$J- z`S0%Ut(v{IZgc<7e*B;A6UhMqR`m05g5sza53bFc-qPT=S1tbRrn%Gyhr>==CZ{aC zNX}_qgw!&e!cF?>uXMVUWBINekNwq};{9UVqr)ASKdJIOKkRFL_2QlN)dA1@=k#yY z*X}{*=1y;GE^S*h^@q|~3sRbP3{A;BH5<`SPwpA}%%N)yO7=Sa%E4{FS{oF@ z@_tLm)bcT4OZ(}b6V;{bj?^tQ^cZS3eE7P*@Uw|~&tG|Ra^;rBFWx!Oyt7>#(abv5 zP8#%7ddTuyqqAFowbNm4Ty{ntH!4i(qs^O`tc>w>hF9JcqD5)*%CgSxs(W!HxR6^k z;LO02BTBl`3|#{Yg0nN0AJ0BD^ts1H{$x5qr~?G5oT#Y>uyuW`3HQZ zMb7D&nZB%1fvlGoZN&!|cdZ>B8p?IF=j|w3^2o;QRqMQ)f7w?*WA|!FIfQ3!8vUbx zMWcP?oYsExn8tmzWBlunWWI2~SJIi;a&*W~m&#TQdTrt4rtAyb1Lhs`Hcef{UyF5Z zqsl98