From 1985750261fb08717c6966fbef7904d2db465108 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Mon, 25 Jan 2021 06:58:30 +0300 Subject: [PATCH] Metal lanterns --- .../blocks/BulbVineLanternBlock.java | 46 +++++++++++- .../blocks/BulbVineLanternColoredBlock.java | 28 +------ ...ndelierBlock.java => ChandelierBlock.java} | 8 +- .../blocks/complex/MetalMaterial.java | 40 ++++++++-- .../java/ru/betterend/patterns/Patterns.java | 4 +- .../ru/betterend/recipe/CraftingRecipes.java | 5 +- .../recipe/builders/FurnaceRecipe.java | 10 +++ .../java/ru/betterend/registry/EndBlocks.java | 7 +- .../blockstates/thallasium_anvil.json | 19 +++++ .../assets/betterend/lang/en_us.json | 52 ++++++++----- .../assets/betterend/lang/ru_ru.json | 52 ++++++++----- .../materialmaps/block/bulb_lantern.json | 3 - .../materialmaps/block/iron_bulb_lantern.json | 10 +++ ...lack.json => iron_bulb_lantern_black.json} | 0 ..._blue.json => iron_bulb_lantern_blue.json} | 0 ...rown.json => iron_bulb_lantern_brown.json} | 0 ..._cyan.json => iron_bulb_lantern_cyan.json} | 0 ..._gray.json => iron_bulb_lantern_gray.json} | 0 ...reen.json => iron_bulb_lantern_green.json} | 0 ...json => iron_bulb_lantern_light_blue.json} | 0 ...json => iron_bulb_lantern_light_gray.json} | 0 ..._lime.json => iron_bulb_lantern_lime.json} | 0 ...ta.json => iron_bulb_lantern_magenta.json} | 0 ...nge.json => iron_bulb_lantern_orange.json} | 0 ..._pink.json => iron_bulb_lantern_pink.json} | 0 ...ple.json => iron_bulb_lantern_purple.json} | 0 ...rn_red.json => iron_bulb_lantern_red.json} | 0 ...hite.json => iron_bulb_lantern_white.json} | 0 ...low.json => iron_bulb_lantern_yellow.json} | 0 .../block/thallasium_bulb_lantern.json | 10 +++ .../block/thallasium_bulb_lantern_black.json | 10 +++ .../block/thallasium_bulb_lantern_blue.json | 10 +++ .../block/thallasium_bulb_lantern_brown.json | 10 +++ .../block/thallasium_bulb_lantern_cyan.json | 10 +++ .../block/thallasium_bulb_lantern_gray.json | 10 +++ .../block/thallasium_bulb_lantern_green.json | 10 +++ .../thallasium_bulb_lantern_light_blue.json | 10 +++ .../thallasium_bulb_lantern_light_gray.json | 10 +++ .../block/thallasium_bulb_lantern_lime.json | 10 +++ .../thallasium_bulb_lantern_magenta.json | 10 +++ .../block/thallasium_bulb_lantern_orange.json | 10 +++ .../block/thallasium_bulb_lantern_pink.json | 10 +++ .../block/thallasium_bulb_lantern_purple.json | 10 +++ .../block/thallasium_bulb_lantern_red.json | 10 +++ .../block/thallasium_bulb_lantern_white.json | 10 +++ .../block/thallasium_bulb_lantern_yellow.json | 10 +++ .../models/block/bulb_vine_lantern_ceil.json | 58 --------------- .../models/block/bulb_vine_lantern_floor.json | 56 -------------- .../models/block/thallasium_anvil.json | 69 ++++++++++++++++++ .../models/item/thallasium_anvil.json | 3 + .../block/bulb_lantern_ceil.json} | 4 +- .../block/bulb_lantern_floor.json} | 4 +- .../patterns/blockstate/bulb_lantern.json | 4 +- .../textures/block/bulb_vine_lantern.png | Bin 422 -> 0 bytes .../textures/block/bulb_vine_lantern_bulb.png | Bin 0 -> 766 bytes ...meta => bulb_vine_lantern_bulb.png.mcmeta} | 0 ...l.png => iron_bulb_vine_lantern_metal.png} | Bin .../textures/block/thallasium_anvil.png | Bin 380 -> 0 bytes .../textures/block/thallasium_anvil_back.png | Bin 0 -> 423 bytes .../block/thallasium_anvil_bottom.png | Bin 0 -> 328 bytes .../textures/block/thallasium_anvil_front.png | Bin 0 -> 456 bytes .../textures/block/thallasium_anvil_panel.png | Bin 0 -> 561 bytes .../textures/block/thallasium_anvil_top.png | Bin 316 -> 329 bytes .../thallasium_bulb_vine_lantern_metal.png | Bin 0 -> 402 bytes .../block/thallasium_chandelier_e.png | Bin 138 -> 1470 bytes .../block/thallasium_chandelier_wall_e.png | Bin 150 -> 1456 bytes .../textures/item/thallasium_nugget.png | Bin 0 -> 1488 bytes .../{block => item}/thermal fungus.png | Bin 68 files changed, 446 insertions(+), 206 deletions(-) rename src/main/java/ru/betterend/blocks/{ThallasiumChandelierBlock.java => ChandelierBlock.java} (79%) create mode 100644 src/main/resources/assets/betterend/blockstates/thallasium_anvil.json delete mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_lantern.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern.json rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_black.json => iron_bulb_lantern_black.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_blue.json => iron_bulb_lantern_blue.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_brown.json => iron_bulb_lantern_brown.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_cyan.json => iron_bulb_lantern_cyan.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_gray.json => iron_bulb_lantern_gray.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_green.json => iron_bulb_lantern_green.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_light_blue.json => iron_bulb_lantern_light_blue.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_light_gray.json => iron_bulb_lantern_light_gray.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_lime.json => iron_bulb_lantern_lime.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_magenta.json => iron_bulb_lantern_magenta.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_orange.json => iron_bulb_lantern_orange.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_pink.json => iron_bulb_lantern_pink.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_purple.json => iron_bulb_lantern_purple.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_red.json => iron_bulb_lantern_red.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_white.json => iron_bulb_lantern_white.json} (100%) rename src/main/resources/assets/betterend/materialmaps/block/{bulb_lantern_yellow.json => iron_bulb_lantern_yellow.json} (100%) create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_black.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_blue.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_brown.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_cyan.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_gray.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_green.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_light_blue.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_light_gray.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_lime.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_magenta.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_orange.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_pink.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_purple.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_red.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_white.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_yellow.json delete mode 100644 src/main/resources/assets/betterend/models/block/bulb_vine_lantern_ceil.json delete mode 100644 src/main/resources/assets/betterend/models/block/bulb_vine_lantern_floor.json create mode 100644 src/main/resources/assets/betterend/models/block/thallasium_anvil.json create mode 100644 src/main/resources/assets/betterend/models/item/thallasium_anvil.json rename src/main/resources/assets/betterend/{models/block/bulb_lantern_colored_ceil.json => patterns/block/bulb_lantern_ceil.json} (95%) rename src/main/resources/assets/betterend/{models/block/bulb_lantern_colored_floor.json => patterns/block/bulb_lantern_floor.json} (95%) delete mode 100644 src/main/resources/assets/betterend/textures/block/bulb_vine_lantern.png create mode 100644 src/main/resources/assets/betterend/textures/block/bulb_vine_lantern_bulb.png rename src/main/resources/assets/betterend/textures/block/{bulb_vine_lantern.png.mcmeta => bulb_vine_lantern_bulb.png.mcmeta} (100%) rename src/main/resources/assets/betterend/textures/block/{bulb_vine_lantern_metal.png => iron_bulb_vine_lantern_metal.png} (100%) delete mode 100644 src/main/resources/assets/betterend/textures/block/thallasium_anvil.png create mode 100644 src/main/resources/assets/betterend/textures/block/thallasium_anvil_back.png create mode 100644 src/main/resources/assets/betterend/textures/block/thallasium_anvil_bottom.png create mode 100644 src/main/resources/assets/betterend/textures/block/thallasium_anvil_front.png create mode 100644 src/main/resources/assets/betterend/textures/block/thallasium_anvil_panel.png create mode 100644 src/main/resources/assets/betterend/textures/block/thallasium_bulb_vine_lantern_metal.png create mode 100644 src/main/resources/assets/betterend/textures/item/thallasium_nugget.png rename src/main/resources/assets/betterend/textures/{block => item}/thermal fungus.png (100%) diff --git a/src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java b/src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java index 1a6f715c..00775b1f 100644 --- a/src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java +++ b/src/main/java/ru/betterend/blocks/BulbVineLanternBlock.java @@ -1,5 +1,10 @@ package ru.betterend.blocks; +import java.io.Reader; +import java.util.Map; + +import com.google.common.collect.Maps; + import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.block.Block; @@ -8,14 +13,18 @@ import net.minecraft.block.Material; import net.minecraft.block.MaterialColor; import net.minecraft.block.ShapeContext; import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.registry.Registry; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import ru.betterend.blocks.basis.EndLanternBlock; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; +import ru.betterend.patterns.BlockPatterned; +import ru.betterend.patterns.Patterns; -public class BulbVineLanternBlock extends EndLanternBlock implements IRenderTypeable { +public class BulbVineLanternBlock extends EndLanternBlock implements IRenderTypeable, BlockPatterned { private static final VoxelShape SHAPE_CEIL = Block.createCuboidShape(4, 4, 4, 12, 16, 12); private static final VoxelShape SHAPE_FLOOR = Block.createCuboidShape(4, 0, 4, 12, 12, 12); @@ -43,4 +52,39 @@ public class BulbVineLanternBlock extends EndLanternBlock implements IRenderType public ERenderLayer getRenderLayer() { return ERenderLayer.CUTOUT; } + + @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); + Map map = Maps.newHashMap(); + map.put("%glow%", getGlowTexture()); + map.put("%metal%", getMetalTexture(blockId)); + if (block.contains("item") || block.contains("ceil")) { + return Patterns.createJson(Patterns.BLOCK_BULB_LANTERN_CEIL, map); + } + else { + return Patterns.createJson(Patterns.BLOCK_BULB_LANTERN_FLOOR, map); + } + } + + protected String getMetalTexture(Identifier blockId) { + String name = blockId.getPath(); + name = name.substring(0, name.indexOf('_')); + return name + "_bulb_vine_lantern_metal"; + } + + protected String getGlowTexture() { + return "bulb_vine_lantern_bulb"; + } + + @Override + public Identifier statePatternId() { + return Patterns.STATE_BULB_LANTERN; + } } diff --git a/src/main/java/ru/betterend/blocks/BulbVineLanternColoredBlock.java b/src/main/java/ru/betterend/blocks/BulbVineLanternColoredBlock.java index edcbbbb3..99d18dd5 100644 --- a/src/main/java/ru/betterend/blocks/BulbVineLanternColoredBlock.java +++ b/src/main/java/ru/betterend/blocks/BulbVineLanternColoredBlock.java @@ -1,16 +1,11 @@ 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 BulbVineLanternColoredBlock extends BulbVineLanternBlock implements IColorProvider, BlockPatterned { +public class BulbVineLanternColoredBlock extends BulbVineLanternBlock implements IColorProvider { public BulbVineLanternColoredBlock(FabricBlockSettings settings) { super(settings); } @@ -30,24 +25,7 @@ public class BulbVineLanternColoredBlock extends BulbVineLanternBlock implements } @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) { - String path = "betterend:block/bulb_lantern_colored"; - if (block.contains("item") || block.contains("ceil")) { - return Patterns.createJson(Patterns.BLOCK_BULB_LANTERN_COLORED_CEIL, path, path); - } - else { - return Patterns.createJson(Patterns.BLOCK_BULB_LANTERN_COLORED_FLOOR, path, path); - } - } - - @Override - public Identifier statePatternId() { - return Patterns.STATE_BULB_LANTERN; + protected String getGlowTexture() { + return "bulb_vine_lantern_overlay"; } } diff --git a/src/main/java/ru/betterend/blocks/ThallasiumChandelierBlock.java b/src/main/java/ru/betterend/blocks/ChandelierBlock.java similarity index 79% rename from src/main/java/ru/betterend/blocks/ThallasiumChandelierBlock.java rename to src/main/java/ru/betterend/blocks/ChandelierBlock.java index d11573f7..6d7a3ffb 100644 --- a/src/main/java/ru/betterend/blocks/ThallasiumChandelierBlock.java +++ b/src/main/java/ru/betterend/blocks/ChandelierBlock.java @@ -7,8 +7,6 @@ import com.google.common.collect.Maps; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.MaterialColor; import net.minecraft.block.ShapeContext; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; @@ -19,11 +17,11 @@ import ru.betterend.blocks.basis.AttachedBlock; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; -public class ThallasiumChandelierBlock extends AttachedBlock implements IRenderTypeable { +public class ChandelierBlock extends AttachedBlock implements IRenderTypeable { private static final EnumMap BOUNDING_SHAPES = Maps.newEnumMap(Direction.class); - public ThallasiumChandelierBlock() { - super(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).materialColor(MaterialColor.BLUE).noCollision().nonOpaque().requiresTool().luminance(15)); + public ChandelierBlock(FabricBlockSettings settings) { + super(settings.noCollision().nonOpaque().requiresTool().luminance(15)); } @Override diff --git a/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java b/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java index 29d2e49e..a186e3eb 100644 --- a/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java @@ -7,7 +7,11 @@ import net.minecraft.block.MaterialColor; import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.item.ToolMaterial; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.tag.BlockTags; +import ru.betterend.blocks.BulbVineLanternBlock; +import ru.betterend.blocks.BulbVineLanternColoredBlock; +import ru.betterend.blocks.ChandelierBlock; import ru.betterend.blocks.basis.BlockBase; import ru.betterend.blocks.basis.EndAnvilBlock; import ru.betterend.blocks.basis.EndChainBlock; @@ -42,6 +46,11 @@ public class MetalMaterial { public final Block stairs; public final Block slab; + public final Block chandelier; + public final Block bulb_lantern; + public final ColoredMaterial bulb_lantern_colored; + + public final Item nugget; public final Item ingot; public final Item shovel; public final Item sword; @@ -51,19 +60,25 @@ public class MetalMaterial { public MetalMaterial(String name, MaterialColor color, ToolMaterial material) { FabricBlockSettings materialBlock = FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).materialColor(color); + FabricBlockSettings lantern = FabricBlockSettings.copyOf(materialBlock).sounds(BlockSoundGroup.LANTERN).hardness(1).resistance(1).luminance(15); ore = EndBlocks.registerBlock(name + "_ore", new BlockBase(FabricBlockSettings.copyOf(Blocks.END_STONE))); block = EndBlocks.registerBlock(name + "_block", new BlockBase(materialBlock)); tile = EndBlocks.registerBlock(name + "_tile", new BlockBase(materialBlock)); - bars = EndBlocks.registerBlock(name + "_bars", new EndMetalPaneBlock(block)); - plate = EndBlocks.registerBlock(name + "_plate", new EndWoodenPlateBlock(block)); + stairs = EndBlocks.registerBlock(name + "_stairs", new EndStairsBlock(tile)); + slab = EndBlocks.registerBlock(name + "_slab", new EndSlabBlock(tile)); door = EndBlocks.registerBlock(name + "_door", new EndDoorBlock(block)); trapdoor = EndBlocks.registerBlock(name + "_trapdoor", new EndTrapdoorBlock(block)); anvil = EndBlocks.registerBlock(name + "_anvil", new EndAnvilBlock(color)); + bars = EndBlocks.registerBlock(name + "_bars", new EndMetalPaneBlock(block)); chain = EndBlocks.registerBlock(name + "_chain", new EndChainBlock(color)); - stairs = EndBlocks.registerBlock(name + "_stairs", new EndStairsBlock(tile)); - slab = EndBlocks.registerBlock(name + "_slab", new EndSlabBlock(tile)); + plate = EndBlocks.registerBlock(name + "_plate", new EndWoodenPlateBlock(block)); + chandelier = EndBlocks.registerBlock(name + "_chandelier", new ChandelierBlock(materialBlock)); + bulb_lantern = EndBlocks.registerBlock(name + "_bulb_lantern", new BulbVineLanternBlock(lantern)); + bulb_lantern_colored = new ColoredMaterial(BulbVineLanternColoredBlock::new, bulb_lantern, false); + + nugget = EndItems.registerItem(name + "_nugget"); ingot = EndItems.registerItem(name + "_ingot"); shovel = EndItems.registerTool(name + "_shovel", new EndShovelItem(material, 1.5F, -3.0F, EndItems.makeItemSettings())); sword = EndItems.registerTool(name + "_sword", new EndSwordItem(material, 3, -2.4F, EndItems.makeItemSettings())); @@ -71,9 +86,10 @@ public class MetalMaterial { axe = EndItems.registerTool(name + "_axe", new EndAxeItem(material, 6.0F, -3.0F, EndItems.makeItemSettings())); hoe = EndItems.registerTool(name + "_hoe", new EndHoeItem(material, -3, 0.0F, EndItems.makeItemSettings())); - FurnaceRecipe.make("thallasium_ingot_furnace", ore, ingot).build(); + FurnaceRecipe.make("thallasium_ingot_furnace", ore, ingot).build(true); AlloyingRecipe.Builder.create("thallasium_ingot").setInput(ore, ore).setOutput(ingot, 3).setExpiriense(2.1F).build(); + GridRecipe.make(name + "_ingot_from_nuggets", ingot).setShape("###", "###", "###").addMaterial('#', nugget).setGroup("end_metal_ingots_nug").build(); GridRecipe.make(name + "_block", block).setShape("###", "###", "###").addMaterial('#', ingot).setGroup("end_metal_blocks").build(); GridRecipe.make(name + "_ingot_from_block", ingot).setOutputCount(9).setList("#").addMaterial('#', block).setGroup("end_metal_ingots").build(); @@ -82,14 +98,24 @@ public class MetalMaterial { GridRecipe.make(name + "_plate", plate).setShape("##").addMaterial('#', ingot).setGroup("end_metal_plates").build(); GridRecipe.make(name + "_door", door).setOutputCount(3).setOutputCount(16).setShape("##", "##", "##").addMaterial('#', ingot).setGroup("end_metal_doors").build(); GridRecipe.make(name + "_trapdoor", trapdoor).setShape("##", "##").addMaterial('#', ingot).setGroup("end_metal_trapdoors").build(); - GridRecipe.make(name + "_stairs", stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', block).setGroup("end_metal_stairs").build(); - GridRecipe.make(name + "_slab", slab).setOutputCount(6).setShape("###").addMaterial('#', block).setGroup("end_metal_slabs").build(); + GridRecipe.make(name + "_stairs", stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', block, tile).setGroup("end_metal_stairs").build(); + GridRecipe.make(name + "_slab", slab).setOutputCount(6).setShape("###").addMaterial('#', block, tile).setGroup("end_metal_slabs").build(); + GridRecipe.make(name + "_chain", chain).setShape("N", "#", "N").addMaterial('#', ingot).addMaterial('N', nugget).setGroup("end_metal_chain").build(); + GridRecipe.make(name + "_anvil", anvil).setOutputCount(3).setShape("###", " I ", "III").addMaterial('#', block, tile).addMaterial('I', ingot).setGroup("end_metal_anvil").build(); + GridRecipe.make(name + "bulb_lantern", bulb_lantern).setShape("C", "I", "#").addMaterial('C', chain).addMaterial('I', ingot).addMaterial('#', EndItems.GLOWING_BULB).build(); GridRecipe.make(name + "_axe", axe).setShape("##", "#I", " I").addMaterial('#', ingot).addMaterial('I', Items.STICK).build(); GridRecipe.make(name + "_hoe", hoe).setShape("##", " I", " I").addMaterial('#', ingot).addMaterial('I', Items.STICK).build(); GridRecipe.make(name + "_pickaxe", pickaxe).setShape("###", " I ", " I ").addMaterial('#', ingot).addMaterial('I', Items.STICK).build(); GridRecipe.make(name + "_sword", sword).setShape("#", "#", "I").addMaterial('#', ingot).addMaterial('I', Items.STICK).build(); + GridRecipe.make(name + "_chandelier", chandelier).setShape("I#I", " # ").addMaterial('#', ingot).addMaterial('I', EndItems.LUMECORN_ROD).setGroup("end_metal_chandelier").build(); + + FurnaceRecipe.make(name + "_axe_ingot", axe, nugget).build(true); + FurnaceRecipe.make(name + "_hoe_ingot", hoe, nugget).build(true); + FurnaceRecipe.make(name + "_pickaxe_ingot", pickaxe, nugget).build(true); + FurnaceRecipe.make(name + "_sword_ingot", sword, nugget).build(true); + TagHelper.addTag(BlockTags.ANVIL, anvil); } } \ No newline at end of file diff --git a/src/main/java/ru/betterend/patterns/Patterns.java b/src/main/java/ru/betterend/patterns/Patterns.java index 30ed7436..94722c6f 100644 --- a/src/main/java/ru/betterend/patterns/Patterns.java +++ b/src/main/java/ru/betterend/patterns/Patterns.java @@ -82,8 +82,8 @@ 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_FLOOR = BetterEnd.makeID("models/block/bulb_lantern_colored_floor.json"); - public final static Identifier BLOCK_BULB_LANTERN_COLORED_CEIL = BetterEnd.makeID("models/block/bulb_lantern_colored_ceil.json"); + public final static Identifier BLOCK_BULB_LANTERN_FLOOR = BetterEnd.makeID("patterns/block/bulb_lantern_floor.json"); + public final static Identifier BLOCK_BULB_LANTERN_CEIL = BetterEnd.makeID("patterns/block/bulb_lantern_ceil.json"); public final static Identifier BLOCK_PETAL_COLORED = BetterEnd.makeID("models/block/block_petal_colored.json"); public final static Identifier BLOCK_COMPOSTER = BetterEnd.makeID("patterns/block/composter.json"); public final static Identifier BLOCK_COLORED = BetterEnd.makeID("patterns/block/block_colored.json"); diff --git a/src/main/java/ru/betterend/recipe/CraftingRecipes.java b/src/main/java/ru/betterend/recipe/CraftingRecipes.java index 1cfccd12..b5cafe59 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -117,7 +117,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_LANTERN).addMaterial('C', Items.CHAIN).addMaterial('I', Items.IRON_INGOT).setShape("C", "I", "#").addMaterial('#', EndItems.GLOWING_BULB).build(); + GridRecipe.make("bulb_lantern", EndBlocks.IRON_BULB_LANTERN).setShape("C", "I", "#").addMaterial('C', Items.CHAIN).addMaterial('I', Items.IRON_INGOT).addMaterial('#', EndItems.GLOWING_BULB).build(); GridRecipe.make("twisted_moss_dye", Items.PINK_DYE).setList("#").addMaterial('#', EndBlocks.TWISTED_MOSS).build(); GridRecipe.make("byshy_grass_dye", Items.MAGENTA_DYE).setList("#").addMaterial('#', EndBlocks.BUSHY_GRASS).build(); GridRecipe.make("tail_moss_dye", Items.GRAY_DYE).setList("#").addMaterial('#', EndBlocks.TAIL_MOSS).build(); @@ -190,9 +190,6 @@ public class CraftingRecipes { GridRecipe.make("fiber_string", Items.STRING).setOutputCount(6).setShape("#", "#", "#").addMaterial('#', EndItems.SILK_FIBER).build(); - GridRecipe.make("thallasium_chandelier", EndBlocks.THALLASIUM_CHANDELIER).setShape("I#I", " # ") - .addMaterial('#', EndBlocks.THALLASIUM.ingot).addMaterial('I', EndItems.LUMECORN_ROD).build(); - GridRecipe.make("ender_eye_amber", Items.ENDER_EYE) .setShape("SAS", "APA", "SAS") .addMaterial('S', EndItems.CRYSTAL_SHARDS) diff --git a/src/main/java/ru/betterend/recipe/builders/FurnaceRecipe.java b/src/main/java/ru/betterend/recipe/builders/FurnaceRecipe.java index 474466f6..b56d8e9a 100644 --- a/src/main/java/ru/betterend/recipe/builders/FurnaceRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/FurnaceRecipe.java @@ -2,6 +2,7 @@ package ru.betterend.recipe.builders; import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; +import net.minecraft.recipe.BlastingRecipe; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeType; import net.minecraft.recipe.SmeltingRecipe; @@ -58,10 +59,19 @@ public class FurnaceRecipe { } public void build() { + build(false); + } + + public void build(boolean blasting) { if (exist) { Identifier id = BetterEnd.makeID(name); SmeltingRecipe recipe = new SmeltingRecipe(id, group, Ingredient.ofItems(input), new ItemStack(output, count), xp, time); EndRecipeManager.addRecipe(RecipeType.SMELTING, recipe); + + if (blasting) { + BlastingRecipe recipe2 = new BlastingRecipe(id, group, Ingredient.ofItems(input), new ItemStack(output, count), xp, time / 2); + EndRecipeManager.addRecipe(RecipeType.BLASTING, recipe2); + } } else { BetterEnd.LOGGER.debug("Smelting recipe {} couldn't be added", name); diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index abad7f6c..033b6bc3 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -78,7 +78,6 @@ import ru.betterend.blocks.TenaneaFlowersBlock; import ru.betterend.blocks.TenaneaSaplingBlock; import ru.betterend.blocks.TerminiteBlock; import ru.betterend.blocks.TerrainPlantBlock; -import ru.betterend.blocks.ThallasiumChandelierBlock; import ru.betterend.blocks.TwistedUmbrellaMossBlock; import ru.betterend.blocks.TwistedUmbrellaMossTallBlock; import ru.betterend.blocks.UmbrellaMossBlock; @@ -305,10 +304,8 @@ public class EndBlocks { public static final Block END_STONE_LANTERN = registerBlock("end_stone_lantern", new StoneLanternBlock(Blocks.END_STONE)); public static final Block BLACKSTONE_LANTERN = registerBlock("blackstone_lantern", new StoneLanternBlock(Blocks.BLACKSTONE)); - public static final Block BULB_LANTERN = registerBlock("bulb_lantern", new BulbVineLanternBlock()); - public static final ColoredMaterial BULB_LANTERN_COLORED = new ColoredMaterial(BulbVineLanternColoredBlock::new, BULB_LANTERN, false); - - public static final Block THALLASIUM_CHANDELIER = registerBlock("thallasium_chandelier", new ThallasiumChandelierBlock()); + 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); // 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_anvil.json b/src/main/resources/assets/betterend/blockstates/thallasium_anvil.json new file mode 100644 index 00000000..917cb573 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/thallasium_anvil.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "betterend:block/thallasium_anvil", + "y": 270 + }, + "facing=north": { + "model": "betterend:block/thallasium_anvil", + "y": 180 + }, + "facing=south": { + "model": "betterend:block/thallasium_anvil" + }, + "facing=west": { + "model": "betterend:block/thallasium_anvil", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index f77ae1b5..e0839b80 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -358,26 +358,44 @@ "block.betterend.twisted_moss": "Twisted Moss", "block.betterend.bulb_vine": "Bulb Vine", - "block.betterend.bulb_lantern": "Bulb Lantern", "block.betterend.bulb_vine_seed": "Bulb Vine Seed", "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", + "block.betterend.iron_bulb_lantern": "Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_black": "Black Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_blue": "Blue Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_brown": "Brown Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_cyan": "Cyan Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_gray": "Gray Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_green": "Green Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_light_blue": "Light Blue Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_light_gray": "Light Gray Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_lime": "Lime Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_magenta": "Magenta Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_orange": "Orange Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_pink": "Pink Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_purple": "Purple Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_red": "Red Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_white": "White Iron Bulb Lantern", + "block.betterend.iron_bulb_lantern_yellow": "Yellow Iron 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", + "block.betterend.thallasium_bulb_lantern_brown": "Brown Thallasium Bulb Lantern", + "block.betterend.thallasium_bulb_lantern_cyan": "Cyan Thallasium Bulb Lantern", + "block.betterend.thallasium_bulb_lantern_gray": "Gray Thallasium Bulb Lantern", + "block.betterend.thallasium_bulb_lantern_green": "Green Thallasium Bulb Lantern", + "block.betterend.thallasium_bulb_lantern_light_blue": "Light Blue Thallasium Bulb Lantern", + "block.betterend.thallasium_bulb_lantern_light_gray": "Light Gray Thallasium Bulb Lantern", + "block.betterend.thallasium_bulb_lantern_lime": "Lime Thallasium Bulb Lantern", + "block.betterend.thallasium_bulb_lantern_magenta": "Magenta Thallasium Bulb Lantern", + "block.betterend.thallasium_bulb_lantern_orange": "Orange Thallasium Bulb Lantern", + "block.betterend.thallasium_bulb_lantern_pink": "Pink Thallasium Bulb Lantern", + "block.betterend.thallasium_bulb_lantern_purple": "Purple Thallasium Bulb Lantern", + "block.betterend.thallasium_bulb_lantern_red": "Red Thallasium Bulb Lantern", + "block.betterend.thallasium_bulb_lantern_white": "White Thallasium Bulb Lantern", + "block.betterend.thallasium_bulb_lantern_yellow": "Yellow Thallasium Bulb Lantern", "block.betterend.bushy_grass": "Bushy Grass", diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index a1b1774c..f9540b90 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -360,26 +360,44 @@ "block.betterend.twisted_moss": "Закрученный мох", "block.betterend.bulb_vine": "Луковичная лоза", - "block.betterend.bulb_lantern": "Луковичный фонарь", "block.betterend.bulb_vine_seed": "Семя луковичной лозы", "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": "Жёлтый луковичный фонарь", + "block.betterend.iron_bulb_lantern": "Железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_black": "Чёрный железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_blue": "Синий железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_brown": "Коричневый железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_cyan": "Циановый железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_gray": "Серый железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_green": "Зелёный железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_light_blue": "Голубой железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_light_gray": "Светло-серый железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_lime": "Лаймовый железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_magenta": "Фиолетовый железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_orange": "Оранжевый железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_pink": "Розовый железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_purple": "Пурпурный железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_red": "Красный железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_white": "Белый железный луковичный фонарь", + "block.betterend.iron_bulb_lantern_yellow": "Жёлтый железный луковичный фонарь", + + "block.betterend.thallasium_bulb_lantern": "Талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_black": "Чёрный талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_blue": "Синий талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_brown": "Коричневый талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_cyan": "Циановый талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_gray": "Серый талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_green": "Зелёный талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_light_blue": "Голубой талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_light_gray": "Светло-серый талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_lime": "Лаймовый талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_magenta": "Фиолетовый талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_orange": "Оранжевый талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_pink": "Розовый талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_purple": "Пурпурный талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_red": "Красный талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_white": "Белый талласиевый луковичный фонарь", + "block.betterend.thallasium_bulb_lantern_yellow": "Жёлтый талласиевый луковичный фонарь", "block.betterend.bushy_grass": "Густая трава", diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern.json deleted file mode 100644 index 2163812f..00000000 --- a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "defaultMaterial": "betterend:glow_inc" -} diff --git a/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern.json new file mode 100644 index 00000000..f84c70f5 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_bulb", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_black.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_black.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_black.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_black.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_blue.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_blue.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_blue.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_blue.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_brown.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_brown.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_brown.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_brown.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_cyan.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_cyan.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_cyan.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_cyan.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_gray.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_gray.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_gray.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_gray.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_green.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_green.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_green.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_green.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_light_blue.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_light_blue.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_light_blue.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_light_blue.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_light_gray.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_light_gray.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_light_gray.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_light_gray.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_lime.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_lime.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_lime.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_lime.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_magenta.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_magenta.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_magenta.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_magenta.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_orange.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_orange.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_orange.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_orange.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_pink.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_pink.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_pink.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_pink.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_purple.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_purple.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_purple.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_purple.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_red.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_red.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_red.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_red.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_white.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_white.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_white.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_white.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_yellow.json b/src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_yellow.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/bulb_lantern_yellow.json rename to src/main/resources/assets/betterend/materialmaps/block/iron_bulb_lantern_yellow.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern.json new file mode 100644 index 00000000..f84c70f5 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern.json @@ -0,0 +1,10 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_vine_lantern_bulb", + "material": "betterend:glow_all" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_black.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_black.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_blue.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_blue.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_brown.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_brown.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_cyan.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_cyan.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_gray.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_gray.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_green.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_green.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_light_blue.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_light_blue.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_light_gray.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_light_gray.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_lime.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_lime.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_magenta.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_magenta.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_orange.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_orange.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_pink.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_pink.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_purple.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_purple.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_red.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_red.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_white.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_white.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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/thallasium_bulb_lantern_yellow.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_bulb_lantern_yellow.json new file mode 100644 index 00000000..8e6f0041 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_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_vine_lantern_ceil.json b/src/main/resources/assets/betterend/models/block/bulb_vine_lantern_ceil.json deleted file mode 100644 index cac5d4b2..00000000 --- a/src/main/resources/assets/betterend/models/block/bulb_vine_lantern_ceil.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "betterend:block/bulb_vine_lantern", - "texture": "betterend:block/bulb_vine_lantern" - }, - "elements": [ - { - "__comment": "Box1", - "from": [ 4, 4, 4 ], - "to": [ 12, 12, 12 ], - "shade": false, - "faces": { - "down": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" }, - "north": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "Box11", - "from": [ 6, 12, 6 ], - "to": [ 10, 13, 10 ], - "faces": { - "up": { "uv": [ 10, 8, 14, 12 ], "texture": "#texture" }, - "north": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" }, - "south": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" }, - "west": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" }, - "east": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" } - } - }, - { - "__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": "#texture" }, - "east": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" } - } - }, - { - "__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": "#texture" }, - "east": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bulb_vine_lantern_floor.json b/src/main/resources/assets/betterend/models/block/bulb_vine_lantern_floor.json deleted file mode 100644 index ddbed87f..00000000 --- a/src/main/resources/assets/betterend/models/block/bulb_vine_lantern_floor.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "textures": { - "particle": "betterend:block/bulb_vine_lantern", - "texture": "betterend:block/bulb_vine_lantern" - }, - "elements": [ - { - "from": [ 4, 0, 4 ], - "to": [ 12, 8, 12 ], - "shade": false, - "faces": { - "down": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" }, - "north": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" } - } - }, - { - "from": [ 6, 8, 6 ], - "to": [ 10, 9, 10 ], - "faces": { - "up": { "uv": [ 10, 8, 14, 12 ], "texture": "#texture" }, - "north": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" }, - "south": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" }, - "west": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" }, - "east": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX15", - "from": [ 7, 9, 7 ], - "to": [ 7.001, 12, 10 ], - "rotation": { "origin": [ 7, 13, 7 ], "axis": "y", "angle": 45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" }, - "east": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" } - } - }, - { - "__comment": "PlaneX15", - "from": [ 9, 9, 7 ], - "to": [ 9.001, 12, 10 ], - "rotation": { "origin": [ 9, 13, 7 ], "axis": "y", "angle": -45 }, - "shade": false, - "faces": { - "west": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" }, - "east": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/thallasium_anvil.json b/src/main/resources/assets/betterend/models/block/thallasium_anvil.json new file mode 100644 index 00000000..dfbf1030 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/thallasium_anvil.json @@ -0,0 +1,69 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/thallasium_anvil_front", + "front": "betterend:block/thallasium_anvil_front", + "back": "betterend:block/thallasium_anvil_back", + "top": "betterend:block/thallasium_anvil_top", + "panel": "betterend:block/thallasium_anvil_panel", + "bottom": "betterend:block/thallasium_anvil_bottom" + }, + "elements": [ + { + "__comment": "Bottom", + "from": [ 2, 0, 2 ], + "to": [ 14, 4, 14 ], + "faces": { + "down": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 2, 2, 14, 14 ], "texture": "#panel" }, + "north": { "uv": [ 2, 12, 14, 16 ], "texture": "#back" }, + "south": { "uv": [ 2, 12, 14, 16 ], "texture": "#back" }, + "west": { "uv": [ 2, 12, 14, 16 ], "texture": "#front" }, + "east": { "uv": [ 2, 12, 14, 16 ], "texture": "#front" } + } + }, + { + "__comment": "Plate", + "from": [ 4, 4, 3 ], + "to": [ 12, 5, 13 ], + "faces": { + "up": { "uv": [ 4, 3, 12, 13 ], "texture": "#panel" }, + "north": { "uv": [ 4, 11, 12, 12 ], "texture": "#back" }, + "south": { "uv": [ 4, 11, 12, 12 ], "texture": "#back" }, + "west": { "uv": [ 3, 11, 13, 12 ], "texture": "#front" }, + "east": { "uv": [ 3, 11, 13, 12 ], "texture": "#front" } + } + }, + { + "__comment": "Support", + "from": [ 6, 5, 4 ], + "to": [ 10, 10, 12 ], + "faces": { + "north": { "uv": [ 6, 6, 10, 11 ], "texture": "#back" }, + "south": { "uv": [ 6, 6, 10, 11 ], "texture": "#back" }, + "west": { "uv": [ 4, 6, 12, 11 ], "texture": "#front" }, + "east": { "uv": [ 4, 6, 12, 11 ], "texture": "#front" } + } + }, + { + "__comment": "Top", + "from": [ 3, 10, 0 ], + "to": [ 13, 16, 16 ], + "faces": { + "down": { "uv": [ 3, 0, 13, 16 ], "texture": "#top" }, + "up": { "uv": [ 3, 0, 13, 16 ], "texture": "#top" }, + "north": { "uv": [ 3, 0, 13, 6 ], "texture": "#back" }, + "south": { "uv": [ 3, 0, 13, 6 ], "texture": "#back" }, + "west": { "uv": [ 0, 0, 16, 6 ], "texture": "#front" }, + "east": { "uv": [ 0, 0, 16, 6 ], "texture": "#front" } + } + } + ], + "display": { + "fixed": { + "rotation": [ 0, 90, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/thallasium_anvil.json b/src/main/resources/assets/betterend/models/item/thallasium_anvil.json new file mode 100644 index 00000000..acefa708 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/thallasium_anvil.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/thallasium_anvil" +} diff --git a/src/main/resources/assets/betterend/models/block/bulb_lantern_colored_ceil.json b/src/main/resources/assets/betterend/patterns/block/bulb_lantern_ceil.json similarity index 95% rename from src/main/resources/assets/betterend/models/block/bulb_lantern_colored_ceil.json rename to src/main/resources/assets/betterend/patterns/block/bulb_lantern_ceil.json index 7bb4eab5..2fbd730d 100644 --- a/src/main/resources/assets/betterend/models/block/bulb_lantern_colored_ceil.json +++ b/src/main/resources/assets/betterend/patterns/block/bulb_lantern_ceil.json @@ -2,8 +2,8 @@ "__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", + "overlay": "betterend:block/%glow%", + "metal": "betterend:block/%metal%", "particle": "#overlay" }, "elements": [ diff --git a/src/main/resources/assets/betterend/models/block/bulb_lantern_colored_floor.json b/src/main/resources/assets/betterend/patterns/block/bulb_lantern_floor.json similarity index 95% rename from src/main/resources/assets/betterend/models/block/bulb_lantern_colored_floor.json rename to src/main/resources/assets/betterend/patterns/block/bulb_lantern_floor.json index a2ff75fe..eff565eb 100644 --- a/src/main/resources/assets/betterend/models/block/bulb_lantern_colored_floor.json +++ b/src/main/resources/assets/betterend/patterns/block/bulb_lantern_floor.json @@ -2,8 +2,8 @@ "__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", + "overlay": "betterend:block/%glow%", + "metal": "betterend:block/%metal%", "particle": "#overlay" }, "elements": [ diff --git a/src/main/resources/assets/betterend/patterns/blockstate/bulb_lantern.json b/src/main/resources/assets/betterend/patterns/blockstate/bulb_lantern.json index 5948df50..f8917353 100644 --- a/src/main/resources/assets/betterend/patterns/blockstate/bulb_lantern.json +++ b/src/main/resources/assets/betterend/patterns/blockstate/bulb_lantern.json @@ -1,6 +1,6 @@ { "variants": { - "is_floor=false": { "model": "%block%_ceil" }, - "is_floor=true": { "model": "%block%_floor" } + "is_floor=false": { "model": "betterend:pattern/%block%/%block%_ceil" }, + "is_floor=true": { "model": "betterend:pattern/%block%/%block%_floor" } } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/bulb_vine_lantern.png b/src/main/resources/assets/betterend/textures/block/bulb_vine_lantern.png deleted file mode 100644 index ac1adf8dc0a835523be7d1051ad2738a03f63e18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 422 zcmV;X0a^ZuP)+3!Kv)XKQ43HbC~A3E-V%cGW5+; zF<~fL=+_POTSY#`aE}0ZDkm}sV+t7CJ34aNK4>b zj7pF+5pRGAT~-qS{r0>1ZQ|83&b@Gc95nMC^v}1TxHG3S1GpDlJI9?lokakf&Qm3f z05+XP0GrN#0cNspqD^PB2j;2)QW+6yu42GV=E3?trm}V~8z|p%@{_xd%jN+>n)m=s za@0Wa@4SEAf=Vm>ouFU7<#Is&l!97S`a7w=N+_PQ%jN-I8&6hAH7-Ha#K(jZie*OS z5bz=SPxHX0vv?j%=_~@+bQb;2Hl4-uU`l7vJh16}^*o58NY4Y5j#mc!0K(d(>ATcc Qi2wiq07*qoM6N<$f{pdRoB#j- diff --git a/src/main/resources/assets/betterend/textures/block/bulb_vine_lantern_bulb.png b/src/main/resources/assets/betterend/textures/block/bulb_vine_lantern_bulb.png new file mode 100644 index 0000000000000000000000000000000000000000..761259c6bde855466f49c712f4494a3e2665731a GIT binary patch literal 766 zcmVDi87{`C_U3j@CH3wITWa+@x31#%m;PnQCi&3joawV6+17jo@x*)k?Xa#}65Cm$P zn532Jln!)Yb~;7s&>4gZa$7>5A!na+_c0)cT$Bbw82VqHbobu7@B9D1`@sRF01AZy z0KHxh0N?j>o9-{&lQZXL)bjNu(MEIX^V90Pi}P~$_))ce!N$f0#uxySBq0n#f*=6E zTFc7KrpQ(XTA{R}R4J>~)zw!OOixdfrYT910AP&4^E@UeCjq#-*b+35K{iOy;~q*W z%!gL#QTj~dEf7$i0)ecblJ>R$(8HdSB*7SiF@_{baz2!6pD6$lK^qTkJWikeRBc}X z5QZV1=izxCVHg77oWnUsb8bOOm9ol`6o68tteRIAB$vX_u%VoDxm5OgzqYo<8$DQG zU#Hz}9^?ZN$}dt$BS=Y^l-m*rKl*7EC(yRy@VAPBJ5Vyz_z0$QyW0Am1W z&dsP{&ehno+bL{UWixGVj?HYJK8HXk@C6bgt4B0{lP%&j8w+Qbv3q6&h5Xy)Yh zS5JIWRKq!dS3lIwb*T3@NX|JroerH&XWM1p_wjw7);B9+t)=D0iNw-h<@zHnWL6Va8-+~8U ze05fJA3S5w8<2_c;?FLX3tx`TgT{qxQmxli{Lc&e-5%9?O*PJ6`#2zd}185qA@!s)p~7o9^Cr+hD;ng!Xaz$v}WSi5pG|aKL8JQ*{WMfZG*^#A|>07*qoM6N<$g4O(OCjbBd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/bulb_vine_lantern.png.mcmeta b/src/main/resources/assets/betterend/textures/block/bulb_vine_lantern_bulb.png.mcmeta similarity index 100% rename from src/main/resources/assets/betterend/textures/block/bulb_vine_lantern.png.mcmeta rename to src/main/resources/assets/betterend/textures/block/bulb_vine_lantern_bulb.png.mcmeta diff --git a/src/main/resources/assets/betterend/textures/block/bulb_vine_lantern_metal.png b/src/main/resources/assets/betterend/textures/block/iron_bulb_vine_lantern_metal.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/bulb_vine_lantern_metal.png rename to src/main/resources/assets/betterend/textures/block/iron_bulb_vine_lantern_metal.png diff --git a/src/main/resources/assets/betterend/textures/block/thallasium_anvil.png b/src/main/resources/assets/betterend/textures/block/thallasium_anvil.png deleted file mode 100644 index 2d582f321b10d1dbaf3e86780ff00205e284aa01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 380 zcmV-?0fYXDP)Px$Hc3Q5R5*=wl0j>PFc5{mb{DfmgF@Lup~wEC{)ztMUV2=*hqjHz5Z^+giPje4;4!7c zl#Z|WH}+Eq`12{}poxS;TZ^H`pHBcxA+XZA-EcX70M{wVPh+e6 zXgk@~by9KgBx{*Mm_wAA-U4YmV#$;a_xQxl+Bt)rwYh`trWZ!%u~{UoVttl;BuEWj z5XdTPpjNd8!gUJra#2>M5J>zj*e&2ffs8WCzd@>1Q8&vBbVs?ESeCZ9QJ_iW@;Z|> aQ0f<$pVQ#vUoGGO0000Px$VM#5Q_W7oKo}f~B(SEoskDjQ(3=;3uIfR25g$UmdRJe-n-9Pvz|EL= zkw)T46GH$&!KSrRn}A&pb~oK_AnBa;+w9Eu?d)t03DoKh3IK}Z0{|jJMY0ZE4*+m` zcAR6JC8Th$WuZdW@D}{y^NZrgo8T2d)gUNo>#&$sr9T zy^$n;1XF=rA$bI&@qB^M^#rm-3Ie%3oJkW%9@xzmg3%bnETbQHBW4)@r0xr`e{n<4 zpC9RU|B3FNUeS5yBo7#hy2i(56J!#I3>EF+44r|CqON5ZP#hnffeVWicz`kqgs#V5 zVUc-KGMHiMdoz)T%M*dai(0)w6~{+ps8aTey2jUOAt48Qha2d1zfr21LU{gzWndCc zv3;~7{0APx$0!c(cR5*>zk}+<=KoCWrA(6;N!YJSrbfl!@7Mz4OMRJPdAl!kTk_IU)ia-Wo z9NAX9SaK|<+LhOMrF3Mf(X8IgpT7gw4o4-E*Y^@Ycmw^|>A3)8QLJk+I03MFdvO46 zs@-PKQ+!zvCMD-MInrW#-cmoT3Z@}j`HB`2$3KR@j z;mwycJTMxl$-o8tu?YYekG$pvot|rz{ke}AJqTS_=3XeU!S#Bhf-H&~cdo;}ER1h8 z6x1izz3^qhZu@OF5zvM;O%9V%o2)_~k_=9SNlCx!7=~5XIm(Px$f=NU{R5*==lTAwkK^%u4CxvxwQ#Or?LMkW-g5GX*>E$EUm#98Lr#^ttu}fWp zE-3_^0ujZ^)kWK!1ar4byUglZbDG)ZdFKEB%}ngDaO(jG+X28ejnG{E*K2ne9&vz_ zmLR{g%*Je-x*RaC&rz2HYSmB5w!}3JmQ0;wdYS2|81woBPjBCp?urOuJLKmw3Oqqw z4rqONlx+#{3#UTxSEq}#nh4i4BH^!2mz0(m3ok5AqUW**AQEoKJ~MhE5-!`4)`y3* zn#7JTuRT8?X*B`Rb6J3~YjwniKkT1fd273?kvkV}?s+^v2{B?=pk>k{@N?M;Rr066 zHH{Eld2I(lYMJ!^0%1ELSPe4jB8>=o?M~41@G1No;`Zr1zMdYNF?|+&`2?Li_Px$>q$gGR5*=wlRb+XK^Vt>u6wY~MR!?UIVIt+J+MfbBUK=QE7Io^ByB!Ns#A;ozD`xWkC6GNajXz_%2eom-VmH-F}t=l}9Ng;(Ex?D%(_*#dxVSpM(b zNCkiw_!y~ho!Np?GvvGx(09Z&3c#=vO>N+B-G1MFT`&h52ixW!zsipnp^LLgiK}0pC^VB*Apec#~Oy@f* z;jp+rS|g&G^`u%Uq!PAa*>+y4#OgmRz8%B>T(lyxraGSBII{)Q`3^7e8S52Z;2#zL z`YmaN0x$5XRtk85Pk*#dB^asf?{#rv>E(+vIeEF67fwdmNJYs%#Ykm~mnzxw!brtX zZ!l6Z)~i&47x=V7VLJo1^Pv|25BGlnNX+Ung^XU7_w67)N@1us=y<|dulCGzja0PH zTzc`uW-G66xXVpsegYGdQqS1BfQ_-&=^l-8=1+#p>zh3@T`%yN&Ud_h|Hhh^PhqJN z#yTW1D=rR}383)u(^tFB8BKUxsyudxi>St5o`?vo$^~e@00000NkvXXu0mjfbo~S2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/thallasium_anvil_top.png b/src/main/resources/assets/betterend/textures/block/thallasium_anvil_top.png index 4eed87bb13d6f617baa44d1ce4d608846367535a..b83f089dbe19a8dec8bbabaffa03664cfe24449d 100644 GIT binary patch delta 290 zcmV+-0p0$*0?7i9Fn<99Nkl*P#Bqzcmv*mm*CkL zkaz&f%E*Gm%7&0itGE><0}vJ*`4Sxd$+z$LoZqs*s`KkbXU55TYj4pu8h|ucEG{pE zS>MB}le(hJ1c&l~m)#euO~=#olGC$e%1m%~^WdCMoXL9o3x7{~_(Q*2q7(l*rgQWx3_2fo0wcm+@36+DXh+yEO(5Q|Lq!pJE=o3>d_g;Cqb*gQY8!4D46vmGCbgiHzKk@Gf3I3G>IM4Rz%h b2moJ;Fpzb| diff --git a/src/main/resources/assets/betterend/textures/block/thallasium_bulb_vine_lantern_metal.png b/src/main/resources/assets/betterend/textures/block/thallasium_bulb_vine_lantern_metal.png new file mode 100644 index 0000000000000000000000000000000000000000..c110d90384ec19f5e00150907eef79f6d7cf8f84 GIT binary patch literal 402 zcmV;D0d4+?P)Px$Oi4sRR5*>LQ!#48KoFceMS?xsoC+5vwbLm05BY(cX(EJV%k| zXq*d;M1=kNT_ie1Rv*Oo=bK1$ibZS$5#c6MDoi^Ur?8>D_5S(Q&yQQdwfS)?cGJv9 z)<6OX&7<)Iqwxgi;uPd_1A1Ui_6ygrTCF;77(hf}Gb>?l0AM%Ge18~ovTYcj&^ESl zF5J9aE<2ty&O!V;#-Y0xu@U?AyI`fhGL; zvM)h$L%+b>Y&HwBD{D|$gZ4Qc4=&|wtsPcyEoZHDhi3!BfT5fjky6O&gXsGr%d*6# wPJLw!w(+gMdwlVgHQ3atZ~uoxr=6Ga3n(wyksAWc&+Ly#M_8I#^(oTp0 z2?i#RSojw}VgMut23`_Ohy`{QSO9gP5|nbz!ve&!md^M3?)$xemnJ8U_HG{7%yC?A zajY=K<}LBqm}383iz|ptn}V^E5y$mCipQF3`}=lq-1PH;gz zthIzYwuEcg!#<4|R!Oiyl~58@$#1BW>mLL#*IHI06)7ED=)c25PdaGRWuSzzl)C)2{E3Mzrs{H@JW(HhEQ6 z6&5l<&6H#vY8j}?`(+KvavN$9$1TtQ2C8L$fU>M{5Ji6lJ2otn&_m2-*FzO71%8DG zi6>#6)JVt#GwrmN7M2BzengRP<6^<&nc1T2I#4w1Qijci&ZR z7tY#2yiEEK+a#R~`>cJ1tWTX>uGU$PJ6kM_l!l($ODik6b-R1k$zR{yeY*1S)p*aI z3z_#5U#3z2hL>PCeY^J_mrkdzr(V~d-CEn9TmIPhRy?#}&-M>rKcBkzDL0&db!gyG zW%rB2PhRf2x!nI|Yicg_`N~!K{NwePcPgn#q31~NwmYmFpGlp#@oeeVc-&!&qZ5Uj IhfiPl1`-C&xBvhE delta 109 zcmV-z0FwW{3yJ}dBxX@bL_t(|+GF_t|33q%c=g-k|A83HCQI}AFZVzO{3qLh2Y+7w zhq;0*+d&4vTtSinvz}}LYldMEpHu_DhJb7a(I7s_VStWD4Hz|mDh2=mP09oceW3(+ P00000NkvXXu0mjf)QK$U diff --git a/src/main/resources/assets/betterend/textures/block/thallasium_chandelier_wall_e.png b/src/main/resources/assets/betterend/textures/block/thallasium_chandelier_wall_e.png index fc23c16ebb1e3345d568ac33960b49cfccc60ec0..41c321e9e93cac3c61dfcdf0fe327713c77922ef 100644 GIT binary patch literal 1456 zcmbVM%Wu?17&lT0Z3Iy(RYHVA2Gc_ewa1UmZal(-u$z*V>NE-~B^8G~)R2;a1lndg5goJu2SJX=nRf{V+fIv(uWU9jUL>*5Utd{=Pj0-?_*86n^g{E1zeYHgh|F4}5oe=D4Q4^*C&7s?Fe2 z!enGpE}O#aM+u-c?aX37p=?Vi)D-P7_VwRy?&&DxzP>RZSV2-1op5C*6&H6_8*FEb zd0bySi_Y{35JW;z)Q`GxM*6-!wq3)riB%@9hsKW%+EU&k>$OkDx?tz)9ij8V==n{r$EI#@b#Axa9`I2(rv0*3oE!M17T zE)9X46}V(O?GBZ5hDBFIB32n-?E;&0q>@=jzJj{AenA0*HV6tGFSR9#3Kf}Jz6NfL z1M*UI))*uLuZv7>r%Wtg12a$N-Xx@&3aVtyG8vkTS!WZ&)Sb&J)KvZMnpnzW#;QIJDeB%g=XnP$2r2mrc5iFA})uX9cYD2XCPeoy{ALrdTas~g>%i-N~ zojZZUILMd99D+?T$wUm}D}_0A>YE=f!Hi?|+EQcTF1w5lJlWr$+uhjnpUvHAHPL%N z4tfvwrf)8MKlSKX{r=$_55E24;JwACk7j-~&mH>U*dNdSy7bkbi)X7ppPRkiK5_s2 vouB5eKRx=(`%_yWuymqc!Mn5870uMN-5vYZjdl84K2z(7BvmImr%oQXVFzd+{ux1zr@kuoRYzW9^5Dns!3}7(8fk?PU00000NkvXXu0mjf66h|9 diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_nugget.png b/src/main/resources/assets/betterend/textures/item/thallasium_nugget.png new file mode 100644 index 0000000000000000000000000000000000000000..f9a9c2092135b8b8f6f6e96e60d90b829992fb75 GIT binary patch literal 1488 zcmbVMU5M019G|0QvGy#MN)ZJOxfX0|b|%SwWiUOqoAYj=xjW9Kx4t=-%46k%AAAvdB8cKS*^f|)^(!!$uiyOs z-~W^Iv(wwQ?%E0f*jAmf7R0qzjtGki0Q3x=5P$a+wUb~41D|DP5|EA@M?8l zw?D@Y^RvWdOElZ{LxBe1z+^Wh&NAiF5^Z{cDc}3~vMhP7DKF-2WQP^n@@7^edT4dF z=BzF|hAU5gDjn!zLEuwPq^{o%V%#<5J}(yQh`=;VG)(`*@EJz zIZY}WS+#%+Ew^9NkXnSO2vuD{Dn9k zq9#-g!+=PGnx+VZ688d5x=IjFj2J8$JCPT1j|Eb~NS4?NH)Wyezyv=`X@hv^CgCvH zB_UL^C^4xIbe$9zu0-v=aMyvfO??{hSYXu@E4*aeDg2qVzMrCFK6OlJG_>uR=(yGk zDO{j2TZtSxbxcT{7%3LE7-w;d{f`~#b!ttBD-k7}MK#9Sqd?7%SfolN2~0`ax99~f z>%<==f`)IXML0EO4QZ+fnWE)uD2KHIR?#O&#|RCewnzn+aPo3s=6a3Z3!$!q8!YmP zaFpkhCWT?p>`Sw4Tn%DQ0*6*DQx>XbJYp(`J%DZ zK$_u<-doIBNrE_f@4n*uxyTbmMB1;2&`*;7U+!0)~gJhZZA+bq284X1HibS7!|J~cN=y6|Gt#Yk&&3U}JIr+wiCyxFO z)-(0ojkPNJ{^H!kb#UhIv-RB>FZklCtNMd;7pIHkzlpQ;@#&0Teg|#deYAIc?(&n& zkIg$=TmR#yGhd$_(?2$U-BkwXAKw3K@yLT)-)x-J!JXqf!L3u5_Ow75qF-=t$KmZ) g4z6WRU$AbDfeNO7{_{a~PttR%Q?u3&pB-6y3P|JEDgXcg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/thermal fungus.png b/src/main/resources/assets/betterend/textures/item/thermal fungus.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/thermal fungus.png rename to src/main/resources/assets/betterend/textures/item/thermal fungus.png