From 5da69761583ab13a59174a59fcd36b43517865d7 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Mon, 25 Jan 2021 07:31:55 +0300 Subject: [PATCH] Chandeliers --- .../ru/betterend/blocks/ChandelierBlock.java | 39 ++++- .../blocks/complex/MetalMaterial.java | 2 +- .../java/ru/betterend/patterns/Patterns.java | 4 + .../ru/betterend/recipe/CraftingRecipes.java | 3 + .../java/ru/betterend/registry/EndBlocks.java | 6 + .../blockstates/thallasium_chandelier.json | 10 -- .../assets/betterend/lang/en_us.json | 24 +++- .../assets/betterend/lang/ru_ru.json | 24 +++- .../lights/item/gold_chandelier.json | 7 + .../lights/item/iron_chandelier.json | 7 + .../betterend/lights/item/lumecorn_rod.json | 2 +- .../lights/item/thallasium_chandelier.json | 7 + .../materialmaps/block/gold_chandelier.json | 3 + .../materialmaps/block/iron_chandelier.json | 3 + .../materialmaps/item/gold_chandelier.json | 3 + .../materialmaps/item/iron_chandelier.json | 3 + .../item/thallasium_chandelier.json | 4 +- .../models/item/thallasium_chandelier.json | 6 - .../patterns/block/chandelier_ceil.json | 134 ++++++++++++++++++ .../patterns/block/chandelier_floor.json | 133 +++++++++++++++++ .../patterns/block/chandelier_wall.json | 105 ++++++++++++++ .../patterns/blockstate/chandelier.json | 10 ++ .../block/gold_bulb_vine_lantern_metal.png | Bin 0 -> 420 bytes .../textures/block/gold_chandelier_ceil.png | Bin 0 -> 314 bytes .../textures/block/gold_chandelier_floor.png | Bin 0 -> 471 bytes .../textures/block/gold_chandelier_wall.png | Bin 0 -> 352 bytes .../textures/block/iron_chandelier_ceil.png | Bin 0 -> 340 bytes .../textures/block/iron_chandelier_floor.png | Bin 0 -> 502 bytes .../textures/block/iron_chandelier_wall.png | Bin 0 -> 373 bytes ...er.png => thallasium_chandelier_floor.png} | Bin .../textures/item/gold_chandelier.png | Bin 0 -> 341 bytes .../textures/item/iron_chandelier.png | Bin 0 -> 369 bytes .../textures/item/thallasium_chandelier.png | Bin 228 -> 399 bytes .../item/thallasium_chandelier_item.png | Bin 399 -> 0 bytes 34 files changed, 515 insertions(+), 24 deletions(-) delete mode 100644 src/main/resources/assets/betterend/blockstates/thallasium_chandelier.json create mode 100644 src/main/resources/assets/betterend/lights/item/gold_chandelier.json create mode 100644 src/main/resources/assets/betterend/lights/item/iron_chandelier.json create mode 100644 src/main/resources/assets/betterend/lights/item/thallasium_chandelier.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/gold_chandelier.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/iron_chandelier.json create mode 100644 src/main/resources/assets/betterend/materialmaps/item/gold_chandelier.json create mode 100644 src/main/resources/assets/betterend/materialmaps/item/iron_chandelier.json delete mode 100644 src/main/resources/assets/betterend/models/item/thallasium_chandelier.json create mode 100644 src/main/resources/assets/betterend/patterns/block/chandelier_ceil.json create mode 100644 src/main/resources/assets/betterend/patterns/block/chandelier_floor.json create mode 100644 src/main/resources/assets/betterend/patterns/block/chandelier_wall.json create mode 100644 src/main/resources/assets/betterend/patterns/blockstate/chandelier.json create mode 100644 src/main/resources/assets/betterend/textures/block/gold_bulb_vine_lantern_metal.png create mode 100644 src/main/resources/assets/betterend/textures/block/gold_chandelier_ceil.png create mode 100644 src/main/resources/assets/betterend/textures/block/gold_chandelier_floor.png create mode 100644 src/main/resources/assets/betterend/textures/block/gold_chandelier_wall.png create mode 100644 src/main/resources/assets/betterend/textures/block/iron_chandelier_ceil.png create mode 100644 src/main/resources/assets/betterend/textures/block/iron_chandelier_floor.png create mode 100644 src/main/resources/assets/betterend/textures/block/iron_chandelier_wall.png rename src/main/resources/assets/betterend/textures/block/{thallasium_chandelier.png => thallasium_chandelier_floor.png} (100%) create mode 100644 src/main/resources/assets/betterend/textures/item/gold_chandelier.png create mode 100644 src/main/resources/assets/betterend/textures/item/iron_chandelier.png delete mode 100644 src/main/resources/assets/betterend/textures/item/thallasium_chandelier_item.png diff --git a/src/main/java/ru/betterend/blocks/ChandelierBlock.java b/src/main/java/ru/betterend/blocks/ChandelierBlock.java index 6d7a3ffb..aa711298 100644 --- a/src/main/java/ru/betterend/blocks/ChandelierBlock.java +++ b/src/main/java/ru/betterend/blocks/ChandelierBlock.java @@ -1,5 +1,6 @@ package ru.betterend.blocks; +import java.io.Reader; import java.util.EnumMap; import com.google.common.collect.Maps; @@ -8,20 +9,24 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.registry.Registry; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import ru.betterend.blocks.basis.AttachedBlock; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; +import ru.betterend.patterns.BlockPatterned; +import ru.betterend.patterns.Patterns; -public class ChandelierBlock extends AttachedBlock implements IRenderTypeable { +public class ChandelierBlock extends AttachedBlock implements IRenderTypeable, BlockPatterned { private static final EnumMap BOUNDING_SHAPES = Maps.newEnumMap(Direction.class); - public ChandelierBlock(FabricBlockSettings settings) { - super(settings.noCollision().nonOpaque().requiresTool().luminance(15)); + public ChandelierBlock(Block source) { + super(FabricBlockSettings.copyOf(source).noCollision().nonOpaque().requiresTool().luminance(15)); } @Override @@ -34,6 +39,34 @@ public class ChandelierBlock extends AttachedBlock implements IRenderTypeable { return BOUNDING_SHAPES.get(state.get(FACING)); } + @Override + public String getStatesPattern(Reader data) { + Identifier blockId = Registry.BLOCK.getId(this); + return Patterns.createJson(data, blockId.getPath(), blockId.getPath()); + } + + @Override + public String getModelPattern(String block) { + Identifier blockId = Registry.BLOCK.getId(this); + if (block.contains("item")) { + return Patterns.createJson(Patterns.ITEM_GENERATED, "item/" + blockId.getPath()); + } + else if (block.contains("ceil")) { + return Patterns.createJson(Patterns.BLOCK_CHANDELIER_CEIL, blockId.getPath()); + } + else if (block.contains("wall")) { + return Patterns.createJson(Patterns.BLOCK_CHANDELIER_WALL, blockId.getPath()); + } + else { + return Patterns.createJson(Patterns.BLOCK_CHANDELIER_FLOOR, blockId.getPath()); + } + } + + @Override + public Identifier statePatternId() { + return Patterns.STATE_CHANDELIER; + } + static { BOUNDING_SHAPES.put(Direction.UP, Block.createCuboidShape(5, 0, 5, 11, 13, 11)); BOUNDING_SHAPES.put(Direction.DOWN, Block.createCuboidShape(5, 3, 5, 11, 16, 11)); diff --git a/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java b/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java index a186e3eb..c451d59b 100644 --- a/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java @@ -74,7 +74,7 @@ public class MetalMaterial { chain = EndBlocks.registerBlock(name + "_chain", new EndChainBlock(color)); plate = EndBlocks.registerBlock(name + "_plate", new EndWoodenPlateBlock(block)); - chandelier = EndBlocks.registerBlock(name + "_chandelier", new ChandelierBlock(materialBlock)); + chandelier = EndBlocks.registerBlock(name + "_chandelier", new ChandelierBlock(block)); bulb_lantern = EndBlocks.registerBlock(name + "_bulb_lantern", new BulbVineLanternBlock(lantern)); bulb_lantern_colored = new ColoredMaterial(BulbVineLanternColoredBlock::new, bulb_lantern, false); diff --git a/src/main/java/ru/betterend/patterns/Patterns.java b/src/main/java/ru/betterend/patterns/Patterns.java index 94722c6f..3493a0ff 100644 --- a/src/main/java/ru/betterend/patterns/Patterns.java +++ b/src/main/java/ru/betterend/patterns/Patterns.java @@ -41,6 +41,7 @@ public class Patterns { public final static Identifier STATE_BARS = BetterEnd.makeID("patterns/blockstate/bars.json"); public final static Identifier STATE_ANVIL = BetterEnd.makeID("patterns/blockstate/anvil.json"); public final static Identifier STATE_CHAIN = BetterEnd.makeID("patterns/blockstate/chain.json"); + public final static Identifier STATE_CHANDELIER = BetterEnd.makeID("patterns/blockstate/chandelier.json"); //Models Block public final static Identifier BLOCK_EMPTY = BetterEnd.makeID("patterns/block/empty.json"); @@ -91,6 +92,9 @@ public class Patterns { public final static Identifier BLOCK_BARS_SIDE = BetterEnd.makeID("patterns/block/bars_side.json"); public final static Identifier BLOCK_ANVIL = BetterEnd.makeID("patterns/block/anvil.json"); public final static Identifier BLOCK_CHAIN = BetterEnd.makeID("patterns/block/chain.json"); + public final static Identifier BLOCK_CHANDELIER_FLOOR = BetterEnd.makeID("patterns/block/chandelier_floor.json"); + public final static Identifier BLOCK_CHANDELIER_WALL = BetterEnd.makeID("patterns/block/chandelier_wall.json"); + public final static Identifier BLOCK_CHANDELIER_CEIL = BetterEnd.makeID("patterns/block/chandelier_ceil.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 b5cafe59..897399e5 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -196,6 +196,9 @@ public class CraftingRecipes { .addMaterial('A', EndItems.AMBER_GEM) .addMaterial('P', Items.ENDER_PEARL) .build(); + + GridRecipe.make("iron_chandelier", EndBlocks.IRON_CHANDELIER).setShape("I#I", " # ").addMaterial('#', Items.IRON_INGOT).addMaterial('I', EndItems.LUMECORN_ROD).setGroup("end_metal_chandelier").build(); + GridRecipe.make("gold_chandelier", EndBlocks.GOLD_CHANDELIER).setShape("I#I", " # ").addMaterial('#', Items.GOLD_INGOT).addMaterial('I', EndItems.LUMECORN_ROD).setGroup("end_metal_chandelier").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 033b6bc3..5489b217 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -20,6 +20,7 @@ import ru.betterend.blocks.BulbVineBlock; import ru.betterend.blocks.BulbVineLanternBlock; import ru.betterend.blocks.BulbVineLanternColoredBlock; import ru.betterend.blocks.BulbVineSeedBlock; +import ru.betterend.blocks.ChandelierBlock; import ru.betterend.blocks.CharniaBlock; import ru.betterend.blocks.ChorusGrassBlock; import ru.betterend.blocks.DenseEmeraldIceBlock; @@ -306,6 +307,11 @@ public class EndBlocks { public static final Block IRON_BULB_LANTERN = registerBlock("iron_bulb_lantern", new BulbVineLanternBlock()); public static final ColoredMaterial IRON_BULB_LANTERN_COLORED = new ColoredMaterial(BulbVineLanternColoredBlock::new, IRON_BULB_LANTERN, false); + public static final Block GOLD_BULB_LANTERN = registerBlock("gold_bulb_lantern", new BulbVineLanternBlock()); + public static final ColoredMaterial GOLD_BULB_LANTERN_COLORED = new ColoredMaterial(BulbVineLanternColoredBlock::new, GOLD_BULB_LANTERN, false); + + public static final Block IRON_CHANDELIER = EndBlocks.registerBlock("iron_chandelier", new ChandelierBlock(Blocks.GOLD_BLOCK)); + public static final Block GOLD_CHANDELIER = EndBlocks.registerBlock("gold_chandelier", new ChandelierBlock(Blocks.GOLD_BLOCK)); // 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/thallasium_chandelier.json b/src/main/resources/assets/betterend/blockstates/thallasium_chandelier.json deleted file mode 100644 index 1d3659ef..00000000 --- a/src/main/resources/assets/betterend/blockstates/thallasium_chandelier.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=up": { "model": "betterend:block/thallasium_chandelier" }, - "facing=down": { "model": "betterend:block/thallasium_chandelier_ceil" }, - "facing=north": { "model": "betterend:block/thallasium_chandelier_wall", "y": 180 }, - "facing=south": { "model": "betterend:block/thallasium_chandelier_wall" }, - "facing=east": { "model": "betterend:block/thallasium_chandelier_wall", "y": 270 }, - "facing=west": { "model": "betterend:block/thallasium_chandelier_wall", "y": 90 } - } -} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index e0839b80..fd331ffe 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -379,6 +379,24 @@ "block.betterend.iron_bulb_lantern_white": "White Iron Bulb Lantern", "block.betterend.iron_bulb_lantern_yellow": "Yellow Iron Bulb Lantern", + "block.betterend.gold_bulb_lantern": "Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_black": "Black Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_blue": "Blue Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_brown": "Brown Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_cyan": "Cyan Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_gray": "Gray Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_green": "Green Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_light_blue": "Light Blue Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_light_gray": "Light Gray Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_lime": "Lime Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_magenta": "Magenta Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_orange": "Orange Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_pink": "Pink Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_purple": "Purple Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_red": "Red Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_white": "White Gold Bulb Lantern", + "block.betterend.gold_bulb_lantern_yellow": "Yellow Gold Bulb Lantern", + "block.betterend.thallasium_bulb_lantern": "Thallasium Bulb Lantern", "block.betterend.thallasium_bulb_lantern_black": "Black Thallasium Bulb Lantern", "block.betterend.thallasium_bulb_lantern_blue": "Blue Thallasium Bulb Lantern", @@ -616,5 +634,9 @@ "block.betterend.thallasium_anvil": "Thallasium Anvil", "block.betterend.thallasium_chain": "Thallasium Chain", "block.betterend.thallasium_slab": "Thallasium Slab", - "block.betterend.thallasium_stairs": "Thallasium Stairs" + "block.betterend.thallasium_stairs": "Thallasium Stairs", + + "block.betterend.gold_chandelier": "Gold Chandelier", + "block.betterend.iron_chandelier": "Iron Chandelier", + "item.betterend.thallasium_nugget": "Thallasium Nugget" } diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index f9540b90..d7126914 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -381,6 +381,24 @@ "block.betterend.iron_bulb_lantern_white": "Белый железный луковичный фонарь", "block.betterend.iron_bulb_lantern_yellow": "Жёлтый железный луковичный фонарь", + "block.betterend.gold_bulb_lantern": "Золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_black": "Чёрный золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_blue": "Синий золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_brown": "Коричневый золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_cyan": "Циановый золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_gray": "Серый золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_green": "Зелёный золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_light_blue": "Голубой золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_light_gray": "Светло-серый золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_lime": "Лаймовый золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_magenta": "Фиолетовый золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_orange": "Оранжевый золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_pink": "Розовый золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_purple": "Пурпурный золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_red": "Красный золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_white": "Белый золотой луковичный фонарь", + "block.betterend.gold_bulb_lantern_yellow": "Жёлтый золотой луковичный фонарь", + "block.betterend.thallasium_bulb_lantern": "Талласиевый луковичный фонарь", "block.betterend.thallasium_bulb_lantern_black": "Чёрный талласиевый луковичный фонарь", "block.betterend.thallasium_bulb_lantern_blue": "Синий талласиевый луковичный фонарь", @@ -618,5 +636,9 @@ "block.betterend.thallasium_anvil": "Талласиевая наковальня", "block.betterend.thallasium_chain": "Талласиевая цепь", "block.betterend.thallasium_slab": "Талласиевая плита", - "block.betterend.thallasium_stairs": "Талласиевые ступени" + "block.betterend.thallasium_stairs": "Талласиевые ступени", + + "block.betterend.gold_chandelier": "Золотой канделябр", + "block.betterend.iron_chandelier": "Железный канделябр", + "item.betterend.thallasium_nugget": "Талласиевый самородок" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lights/item/gold_chandelier.json b/src/main/resources/assets/betterend/lights/item/gold_chandelier.json new file mode 100644 index 00000000..044e62bf --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/gold_chandelier.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.2, + "red": 0.5, + "green": 1.0, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/iron_chandelier.json b/src/main/resources/assets/betterend/lights/item/iron_chandelier.json new file mode 100644 index 00000000..044e62bf --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/iron_chandelier.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.2, + "red": 0.5, + "green": 1.0, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/lights/item/lumecorn_rod.json b/src/main/resources/assets/betterend/lights/item/lumecorn_rod.json index 44c23281..044e62bf 100644 --- a/src/main/resources/assets/betterend/lights/item/lumecorn_rod.json +++ b/src/main/resources/assets/betterend/lights/item/lumecorn_rod.json @@ -1,5 +1,5 @@ { - "intensity": 0.5, + "intensity": 0.2, "red": 0.5, "green": 1.0, "blue": 0.0, diff --git a/src/main/resources/assets/betterend/lights/item/thallasium_chandelier.json b/src/main/resources/assets/betterend/lights/item/thallasium_chandelier.json new file mode 100644 index 00000000..044e62bf --- /dev/null +++ b/src/main/resources/assets/betterend/lights/item/thallasium_chandelier.json @@ -0,0 +1,7 @@ +{ + "intensity": 0.2, + "red": 0.5, + "green": 1.0, + "blue": 0.0, + "worksInFluid": true +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/gold_chandelier.json b/src/main/resources/assets/betterend/materialmaps/block/gold_chandelier.json new file mode 100644 index 00000000..73a05561 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/gold_chandelier.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:glow_green" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/iron_chandelier.json b/src/main/resources/assets/betterend/materialmaps/block/iron_chandelier.json new file mode 100644 index 00000000..73a05561 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/iron_chandelier.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:glow_green" +} diff --git a/src/main/resources/assets/betterend/materialmaps/item/gold_chandelier.json b/src/main/resources/assets/betterend/materialmaps/item/gold_chandelier.json new file mode 100644 index 00000000..73a05561 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/gold_chandelier.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:glow_green" +} diff --git a/src/main/resources/assets/betterend/materialmaps/item/iron_chandelier.json b/src/main/resources/assets/betterend/materialmaps/item/iron_chandelier.json new file mode 100644 index 00000000..73a05561 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/iron_chandelier.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:glow_green" +} diff --git a/src/main/resources/assets/betterend/materialmaps/item/thallasium_chandelier.json b/src/main/resources/assets/betterend/materialmaps/item/thallasium_chandelier.json index 69a88e3b..73a05561 100644 --- a/src/main/resources/assets/betterend/materialmaps/item/thallasium_chandelier.json +++ b/src/main/resources/assets/betterend/materialmaps/item/thallasium_chandelier.json @@ -1 +1,3 @@ -{} +{ + "defaultMaterial": "betterend:glow_green" +} diff --git a/src/main/resources/assets/betterend/models/item/thallasium_chandelier.json b/src/main/resources/assets/betterend/models/item/thallasium_chandelier.json deleted file mode 100644 index 7668a892..00000000 --- a/src/main/resources/assets/betterend/models/item/thallasium_chandelier.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "betterend:item/thallasium_chandelier" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/chandelier_ceil.json b/src/main/resources/assets/betterend/patterns/block/chandelier_ceil.json new file mode 100644 index 00000000..d39683f3 --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/block/chandelier_ceil.json @@ -0,0 +1,134 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/%texture%_ceil", + "texture": "betterend:block/%texture%_ceil", + "rod": "betterend:block/%texture%_floor" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 6, 15, 6 ], + "to": [ 10, 16, 10 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 4, 4 ], "texture": "#rod" }, + "up": { "uv": [ 0, 0, 4, 4 ], "texture": "#rod" }, + "north": { "uv": [ 0, 4, 4, 5 ], "texture": "#rod" }, + "south": { "uv": [ 0, 4, 4, 5 ], "texture": "#rod" }, + "west": { "uv": [ 0, 4, 4, 5 ], "texture": "#rod" }, + "east": { "uv": [ 0, 4, 4, 5 ], "texture": "#rod" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 2, 2, 2 ], + "to": [ 2.001, 15, 19 ], + "rotation": { "origin": [ 2, 2, 2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 14, 2, 2 ], + "to": [ 14.001, 15, 19 ], + "rotation": { "origin": [ 14, 2, 2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 2, 3, 2 ], + "to": [ 2.001, 9, 7.5 ], + "rotation": { "origin": [ 2, 3, 2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" }, + "east": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 6, 3, 2 ], + "to": [ 6.001, 9, 7.5 ], + "rotation": { "origin": [ 6, 3, 2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" }, + "east": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 14, 3, 2 ], + "to": [ 14.001, 9, 7.5 ], + "rotation": { "origin": [ 14, 3, 2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" }, + "east": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 10, 3, 2 ], + "to": [ 10.001, 9, 7.5 ], + "rotation": { "origin": [ 10, 3, 2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" }, + "east": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 2, 3, 10 ], + "to": [ 2.001, 9, 15.5 ], + "rotation": { "origin": [ 2, 3, 10 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" }, + "east": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 6, 3, 10 ], + "to": [ 6.001, 9, 15.5 ], + "rotation": { "origin": [ 6, 3, 10 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" }, + "east": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 14, 3, 10 ], + "to": [ 14.001, 9, 15.5 ], + "rotation": { "origin": [ 14, 3, 10 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" }, + "east": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 10, 3, 10 ], + "to": [ 10.001, 9, 15.5 ], + "rotation": { "origin": [ 10, 3, 10 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" }, + "east": { "uv": [ 11, 6, 16, 0 ], "texture": "#rod" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/chandelier_floor.json b/src/main/resources/assets/betterend/patterns/block/chandelier_floor.json new file mode 100644 index 00000000..54123380 --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/block/chandelier_floor.json @@ -0,0 +1,133 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/%texture%_floor", + "texture": "betterend:block/%texture%_floor" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 6, 0, 6 ], + "to": [ 10, 1, 10 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 0, 4, 4 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 4, 4 ], "texture": "#texture" }, + "north": { "uv": [ 0, 4, 4, 5 ], "texture": "#texture" }, + "south": { "uv": [ 0, 4, 4, 5 ], "texture": "#texture" }, + "west": { "uv": [ 0, 4, 4, 5 ], "texture": "#texture" }, + "east": { "uv": [ 0, 4, 4, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 2, 1, 2 ], + "to": [ 2.001, 10, 19 ], + "rotation": { "origin": [ 2, 1, 2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 14, 1, 2 ], + "to": [ 14.001, 10, 19 ], + "rotation": { "origin": [ 14, 1, 2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 2, 10, 2 ], + "to": [ 2.001, 16, 7.5 ], + "rotation": { "origin": [ 2, 10, 2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, + "east": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 6, 10, 2 ], + "to": [ 6.001, 16, 7.5 ], + "rotation": { "origin": [ 6, 10, 2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, + "east": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 10, 10, 2 ], + "to": [ 10.001, 16, 7.5 ], + "rotation": { "origin": [ 10, 10, 2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, + "east": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 14, 10, 2 ], + "to": [ 14.001, 16, 7.5 ], + "rotation": { "origin": [ 14, 10, 2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, + "east": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 2, 10, 10 ], + "to": [ 2.001, 16, 15.5 ], + "rotation": { "origin": [ 2, 10, 10 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, + "east": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 6, 10, 10 ], + "to": [ 6.001, 16, 15.5 ], + "rotation": { "origin": [ 6, 10, 10 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, + "east": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 10, 10, 10 ], + "to": [ 10.001, 16, 15.5 ], + "rotation": { "origin": [ 10, 10, 10 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, + "east": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX5", + "from": [ 14, 10, 10 ], + "to": [ 14.001, 16, 15.5 ], + "rotation": { "origin": [ 14, 10, 10 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, + "east": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/block/chandelier_wall.json b/src/main/resources/assets/betterend/patterns/block/chandelier_wall.json new file mode 100644 index 00000000..e469fb1f --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/block/chandelier_wall.json @@ -0,0 +1,105 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/%texture%_wall", + "texture": "betterend:block/%texture%_wall" + }, + "elements": [ + { + "__comment": "PlaneZ2", + "from": [ 4, 2, 2 ], + "to": [ 12, 8, 2.001 ], + "shade": false, + "faces": { + "north": { "uv": [ 4, 8, 12, 14 ], "texture": "#texture" }, + "south": { "uv": [ 4, 8, 12, 14 ], "texture": "#texture" } + } + }, + { + "__comment": "Box3", + "from": [ 7, 3, 0 ], + "to": [ 9, 5, 3 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 8, 2, 11 ], "texture": "#texture" }, + "up": { "uv": [ 0, 11, 2, 8 ], "texture": "#texture" }, + "north": { "uv": [ 7, 11, 9, 13 ], "texture": "#texture" }, + "south": { "uv": [ 7, 11, 9, 13 ], "texture": "#texture" }, + "west": { "uv": [ 0, 11, 2, 8 ], "texture": "#texture", "rotation": 270 }, + "east": { "uv": [ 0, 8, 2, 11 ], "texture": "#texture", "rotation": 270 } + } + }, + { + "__comment": "Box4", + "from": [ 3, 6, 1 ], + "to": [ 5, 9, 3 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 0, 8, 2, 11 ], "texture": "#texture" }, + "south": { "uv": [ 0, 8, 2, 11 ], "texture": "#texture" }, + "west": { "uv": [ 0, 8, 2, 11 ], "texture": "#texture" }, + "east": { "uv": [ 0, 8, 2, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Box4", + "from": [ 11, 6, 1 ], + "to": [ 13, 9, 3 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 0, 8, 2, 11 ], "texture": "#texture" }, + "south": { "uv": [ 0, 8, 2, 11 ], "texture": "#texture" }, + "west": { "uv": [ 0, 8, 2, 11 ], "texture": "#texture" }, + "east": { "uv": [ 0, 8, 2, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX6", + "from": [ 2, 9, 0 ], + "to": [ 2.001, 15, 5.5 ], + "rotation": { "origin": [ 2, 9, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, + "east": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX6", + "from": [ 6, 9, 0 ], + "to": [ 6.001, 15, 5.5 ], + "rotation": { "origin": [ 6, 9, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, + "east": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX6", + "from": [ 10, 9, 0 ], + "to": [ 10.001, 15, 5.5 ], + "rotation": { "origin": [ 10, 9, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, + "east": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX6", + "from": [ 14, 9, 0 ], + "to": [ 14.001, 15, 5.5 ], + "rotation": { "origin": [ 14, 9, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" }, + "east": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/patterns/blockstate/chandelier.json b/src/main/resources/assets/betterend/patterns/blockstate/chandelier.json new file mode 100644 index 00000000..c8b5b577 --- /dev/null +++ b/src/main/resources/assets/betterend/patterns/blockstate/chandelier.json @@ -0,0 +1,10 @@ +{ + "variants": { + "facing=up": { "model": "betterend:pattern/%block%/%block%_floor" }, + "facing=down": { "model": "betterend:pattern/%block%/%block%_ceil" }, + "facing=north": { "model": "betterend:pattern/%block%/%block%_wall", "y": 180 }, + "facing=south": { "model": "betterend:pattern/%block%/%block%_wall" }, + "facing=east": { "model": "betterend:pattern/%block%/%block%_wall", "y": 270 }, + "facing=west": { "model": "betterend:pattern/%block%/%block%_wall", "y": 90 } + } +} diff --git a/src/main/resources/assets/betterend/textures/block/gold_bulb_vine_lantern_metal.png b/src/main/resources/assets/betterend/textures/block/gold_bulb_vine_lantern_metal.png new file mode 100644 index 0000000000000000000000000000000000000000..c16377fbfb9ba54973436185d95a6a59a408229d GIT binary patch literal 420 zcmV;V0bBlwP)Px$UP(kjR5*>LlRs<1P!z>~FFdNmz%vkta|;G%cMF{h>FVl-=;+{7`XOAM^8q@v zU!n?K9Rev5h`~tUb@4s_w3wl1d2lZG-gD34iR$f6*Gl4gA*U#d6q(lmT&p{^l9t%7 z*X-A8$|ALmwUW5Qr6BN$pSyzST@d(;XOXCtM7mx`S)_b^K&!0)sCHWhBaU0YpL9IY z!fcNxS|oF!$wC|enb)-19je`yYPY4;?pXPzfeRSUxhz~mk|bxZ9Z)N2Hyb6!8-Qdk z^siwD&M}4!M$nIP`cckcbac8bQhRe8$7i0DMT+=$j7@hxzT66TxD-aIX&%oaar5vc zoTi)&TrY&chrq}6LTjXSz3^(zO>j)ZWx;U0UeC%V+d#JA^qeyf{>nMe^JWFta#l*6 z@y0+qpebhq*9(cCyW%oVDf61ebfw8cl2Px#^hrcPR5*?8lCf$6K@>&LBtk#~L9n-wU@cfmAl;@~$zP;P>tEQV^$P?mEAa;e z+k`ZmGB6?m6&7@_#WE|4Gm;`@PB+7S@7+7|3<0tvlDWNs`Xj98n8w6}v_aBYOWQ?T zmo(n4l3>-Bo32fYX- M07*qoM6N<$g5VB?d;kCd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/gold_chandelier_floor.png b/src/main/resources/assets/betterend/textures/block/gold_chandelier_floor.png new file mode 100644 index 0000000000000000000000000000000000000000..0782f2b5bb59cdfb66cbada49eff7a349c958008 GIT binary patch literal 471 zcmV;|0Vw{7P)Px$kx4{BR5*>5le68@u7`}yIXJcbwWg~{5 zC}<<1jTQl0LD7Jw5V9`8TqR~KPIlcjM&iJ-!_?Re5R_X zDhKwpx<2~3rH%8rR&q(z;G>vrotF~;jfO{YYBqrU3jk)3ezUxTwgM765--VKG0y0rnCql7<^f#I@3Y_d zL>hfQ3#ySwn}29M2x#R~D)lNKg@Pw*WM~Y4YWdZ)TWZo5PZ(hGQUW8?ich9!=|TG2 z?N)NARcdm)w<>G98||2-0IpsgOAO2(T?FR>EjN&fQxV_J-Mp?UxbMPkKQepwDPx$8c9S!R5*>jlCes|U=)SFzXXbt1O-Qj7UB!INuap6>Ff9wc?9G_%l?Gg(o;e78RL|KS&r+ql)-6Pn!s0000Px$4oO5oR5*?8k+Dj{P!xv03r;2-8kZ`8;u4VJ&E6pZ|M|~<4F%L2u_|lpyibQXuE+V= zu_>x8#IFVlYLOPzEag2)qTT5!neI3x-S#hxG4m!;f!)0W0jbr&(<1;c&x1_E_qtTF z8Fw|?@G%`_8kgNN0F_lAfUC<>lW{P48)L2I;jV8av3+<#>HbCllZ`ENeY6ii7`0@r zT@=e#29jvTUDX@0l6xMxAtsE5ujx52z=Zqh}&44dH&F#ij` mBH1~pMe?hGiuV8KkN5-)!D%a=eSPx$ut`KgR5*>5l0Rz{Q5400cNtJKJ3Gv5p~w;ul5K*BLK1C6LYi1bBKQg7m$0)) zl}`}CPcWi|Xpt0&)oQU8TS>r(4!hILJd*vFz{0gyXR@=K$a<>ByXT&J-#Jh2Ev>3k zase<&OryRpqj#V8-U@%AssIE@O`rJ>1fbxQTz(ujh*}|)*?9n*l1tPIX`dW3jv%S& z+?DGDNlgJPyXZ4h^ZeJ2D(6885p_1s<(#C=3%w;rV6SC&#%oJiiRU!EPV`nQJN0#LX<$ zRP5}m4?wSDuq-PlmdLwA4w{GP2_U0Bv$$FRM!AKP)Px$FG)l}R5*>jk-bU-Q4oc{8y3W5K@!0q2&4%qZNyd(Y_t%?2hc{r7tx3C5t72r z!crj#0UJ>;5r0Flxw|I2>n7D$#9gwo3b*l8Gca?`nKNJj5kW+#>bgXA#)JT%<}{={ zHBZfH2!JwKuIjq1%#`E4)qgN|@DoM^Zm4mG-nbrmxS_@}6jZH`JIPPa;)WVP8D#+D zPb3)s8s6AG5PhgFm;UGfB8}xAPx$4@pEpR5*>@lCev}P#DC2F9a(FQ6~qNf`TG~OI%%C1cz?!4xOF-FY2nRgJ8i$ zK?G+j_y-uI=%ApGGzhUV*!CPWK^p=QH*b0$clX`9$AkX^N$fqG=qR|9q|&@KES#%M z)9kbggNFHRL9^4+%H$$bqvHU%D-`kBf-nwJk}wW($wj>VO=HfVt^`n@*)Vkp2D_h0 z*0ur6{^MzyY#2TO$gfFJLhRpRzw{VcUP4jAd;6B&gw0rW0YwQ`^(^!Kd_+IQymfJ0 z&m13YnslzLwTz<79y?iYa^7e@MnAg3HO!-0@*C100000NkvXXu0mjfATyDa literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/iron_chandelier.png b/src/main/resources/assets/betterend/textures/item/iron_chandelier.png new file mode 100644 index 0000000000000000000000000000000000000000..e0b7a132efb0fcfd4b5376cd0e9c7b05ea4e36d5 GIT binary patch literal 369 zcmV-%0gnEOP)Px$D@jB_R5*>@l08eqP#A^Jl|XbzYjvooi%=YNa!|KSS%MCM{D%0W`WG6vjvd6M z(Lo1saVbb>Ba(!Cv|TQ|4($y|ukma2nJ%37o^$R8@P8m8bp1Z{!XXjSr+P0OO8VOB zU`K7kjl9~RRlP89BacoukI-7z06?nXMjmz4wxkyZ@jMhF;&~_~*Xc|wx_-ZKcJ?k9 zV+^L{P%s|h@qWOTGa{K??O#?60Kl{yn&uI*Gy&%vt*vbY6CbL&0Yy=;vwMJP9^rOy zUF=iJ2Elj)&N-eQZWsXQhE20P#>?{^1Avn=gE;4vqg5J|(G8ojGywo;jbc P00000NkvXXu0mjfKboIW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_chandelier.png b/src/main/resources/assets/betterend/textures/item/thallasium_chandelier.png index fe4202a6357a229d8724536c35bc1a21413e51fe..77827afc5ec5af381c6c649ae61a120022f7f6f6 100644 GIT binary patch delta 372 zcmV-)0gL|R0gnTaB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pGBuPX;R5(v#{Qv(y10{e7N|O!11~4)*f;prBm>v`t%znD{|C)Cv zzmbf+8gZYhC7$R{00?WFdq~KAQ}i5(`0-Yz;kxdaE&j_&3hpWB4b;%MflU3Fc2R)(2|<=|u^|Q#U^{eE;~BVPA*~ zW6JSUj4=M5v~55}kQj`Q3{YHv4xHBP`44gl$gqg{?NCt!!0-YxsK0&bzZ4fU!?SOH z8Qy;S4|g^)!0-Yxc=GrQ*h_~mz5<5{P5?3m7XW#|W!8F}3aH`*umR))1_l6vRJIUG S2Z+o70000G0|F^1I1ZIQ8VDdPl5~dNx2PxK1Z26B%9zidFxdepq+KSILATOBa zPKJjA$pB-Y^%Cr5P0B_Vvrafk?I&hyef|K<_~}u`ZVY0000^RC~5EuFF1Xemtkg()`Fu7Ck}Ey zN@~&3tK7l(e*gYf&!(F%7^d4;NIBNc`I^Gr!Ea_6dQ1Av%Qoxj2mi2%#u~_ruqjA! zNL)^-kvLG5$kuS+%<}O6@pT{DAKvufvK;upWVB*`?aTcl;>L$J=hsW#tNX=YZe|1$ulV$X`-XSB{ywI5PCo`CR&j>P pgQ?f5=5Vce#JYj;2{RiTLsQ5$0WbEBGr&M(@O1TaS?83{1ORTqnlAtV