From 835b3dc812484b3013668651c8344b563b45246c Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 7 Nov 2020 23:39:12 +0300 Subject: [PATCH] Stone lanterns --- .../ru/betterend/blocks/AuroraCrystalBlock.java | 2 +- .../ru/betterend/blocks/complex/StoneMaterial.java | 4 ++++ .../java/ru/betterend/interfaces/Patterned.java | 3 +++ .../java/ru/betterend/recipe/CraftingRecipes.java | 2 ++ src/main/java/ru/betterend/registry/EndBlocks.java | 13 ++++++++----- src/main/resources/assets/betterend/lang/en_us.json | 6 +++++- src/main/resources/assets/betterend/lang/ru_ru.json | 6 +++++- 7 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java b/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java index 7cee4e63..ba5edf0c 100644 --- a/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java +++ b/src/main/java/ru/betterend/blocks/AuroraCrystalBlock.java @@ -26,7 +26,7 @@ import ru.betterend.registry.EndItems; import ru.betterend.util.MHelper; public class AuroraCrystalBlock extends AbstractGlassBlock implements IRenderTypeable, IColorProvider { - private static final Vec3i[] COLORS; + public static final Vec3i[] COLORS; private static final int MIN_DROP = 1; private static final int MAX_DROP = 4; diff --git a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java index 5d057cd1..6eb70ac6 100644 --- a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java @@ -12,6 +12,7 @@ import ru.betterend.blocks.basis.BlockPillar; import ru.betterend.blocks.basis.BlockSlab; import ru.betterend.blocks.basis.BlockStairs; import ru.betterend.blocks.basis.BlockStoneButton; +import ru.betterend.blocks.basis.BlockStoneLantern; import ru.betterend.blocks.basis.BlockStonePressurePlate; import ru.betterend.blocks.basis.BlockWall; import ru.betterend.recipe.CraftingRecipes; @@ -31,6 +32,7 @@ public class StoneMaterial { public final Block button; public final Block pressure_plate; public final Block pedestal; + public final Block lantern; public final Block bricks; public final Block brick_stairs; @@ -50,6 +52,7 @@ public class StoneMaterial { button = EndBlocks.registerBlock(name + "_button", new BlockStoneButton(stone)); pressure_plate = EndBlocks.registerBlock(name + "_plate", new BlockStonePressurePlate(stone)); pedestal = EndBlocks.registerBlock(name + "_pedestal", new EndPedestal(stone)); + lantern = EndBlocks.registerBlock(name + "_lantern", new BlockStoneLantern(stone)); bricks = EndBlocks.registerBlock(name + "_bricks", new BlockBase(material)); brick_stairs = EndBlocks.registerBlock(name + "_bricks_stairs", new BlockStairs(bricks)); @@ -72,6 +75,7 @@ public class StoneMaterial { GridRecipe.make(name + "_button", button).setList("#").addMaterial('#', stone).setGroup("end_stone_buttons").build(); GridRecipe.make(name + "_pressure_plate", pressure_plate).setShape("##").addMaterial('#', stone).setGroup("end_stone_plates").build(); + GridRecipe.make(name + "_lantern", lantern).setShape("S", "#", "S").addMaterial('#', EndBlocks.AURORA_CRYSTAL).addMaterial('S', slab, brick_slab).setGroup("end_stone_lanterns").build(); CraftingRecipes.registerPedestal(name + "_pedestal", pedestal, slab, pillar); diff --git a/src/main/java/ru/betterend/interfaces/Patterned.java b/src/main/java/ru/betterend/interfaces/Patterned.java index 035343df..548a054e 100644 --- a/src/main/java/ru/betterend/interfaces/Patterned.java +++ b/src/main/java/ru/betterend/interfaces/Patterned.java @@ -31,6 +31,7 @@ public interface Patterned { public final static Identifier LADDER_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_ladder.json"); public final static Identifier BARREL_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_barrel.json"); public final static Identifier PEDESTAL_STATES_PATTERN = BetterEnd.makeID("patterns/blockstate/pattern_pedestal.json"); + public final static Identifier BLOCKSTATE_STONE_LANTERN = BetterEnd.makeID("patterns/blockstate/stone_lantern.json"); //Models Block public final static Identifier EMPTY_MODEL = BetterEnd.makeID("patterns/block/pattern_empty.json"); @@ -70,6 +71,8 @@ public interface Patterned { public final static Identifier PEDESTAL_MODEL_BOTTOM = BetterEnd.makeID("patterns/block/pattern_pedestal_bottom.json"); public final static Identifier PEDESTAL_MODEL_PILLAR = BetterEnd.makeID("patterns/block/pattern_pedestal_pillar.json"); public final static Identifier BOOKSHELF = BetterEnd.makeID("patterns/block/bookshelf.json"); + public final static Identifier STONE_LANTERN_CEIL = BetterEnd.makeID("patterns/block/stone_lantern_ceil.json"); + public final static Identifier STONE_LANTERN_FLOOR = BetterEnd.makeID("patterns/block/stone_lantern_floor.json"); //Models Item public final static Identifier WALL_ITEM_MODEL = 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 85307d89..0e8a6fe2 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -102,6 +102,8 @@ public class CraftingRecipes { GridRecipe.make("needlegrass_stick", Items.STICK).setList("#").setOutputCount(2).addMaterial('#', EndBlocks.NEEDLEGRASS).build(); GridRecipe.make("shadow_berry_seeds", EndBlocks.SHADOW_BERRY).setList("#").setOutputCount(4).addMaterial('#', EndItems.SHADOW_BERRY_RAW).build(); GridRecipe.make("purple_polypore_dye", Items.PURPLE_DYE).setList("#").addMaterial('#', EndBlocks.PURPLE_POLYPORE).build(); + + GridRecipe.make("end_stone_lantern", EndBlocks.LANTERN_END_STONE).setShape("S", "#", "S").addMaterial('#', EndBlocks.AURORA_CRYSTAL).addMaterial('S', Blocks.END_STONE_BRICK_SLAB).setGroup("end_stone_lanterns").build(); } public static void registerPedestal(String name, Block pedestal, Block slab, Block pillar) { diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 4b03e41c..97d174fc 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -51,6 +51,7 @@ import ru.betterend.blocks.basis.BlockGlowingFur; import ru.betterend.blocks.basis.BlockLeaves; import ru.betterend.blocks.basis.BlockOre; import ru.betterend.blocks.basis.BlockSimpleLeaves; +import ru.betterend.blocks.basis.BlockStoneLantern; import ru.betterend.blocks.basis.BlockVine; import ru.betterend.blocks.basis.BlockWallMushroom; import ru.betterend.blocks.basis.BlockWallPlant; @@ -76,6 +77,12 @@ public class EndBlocks { public static final Block CRYSTAL_MOSS_PATH = registerBlock("crystal_moss_path", new BlockPath(CRYSTAL_MOSS)); public static final Block SHADOW_GRASS_PATH = registerBlock("shadow_grass_path", new BlockPath(SHADOW_GRASS)); + // Materials // + public static final Block TERMINITE_BLOCK = registerBlock("terminite_block", new TerminiteBlock()); + public static final Block AETERNIUM_BLOCK = registerBlock("aeternium_block", new AeterniumBlock()); + public static final Block ENDER_BLOCK = registerBlock("ender_block", new EnderBlock()); + public static final Block AURORA_CRYSTAL = registerBlock("aurora_crystal", new AuroraCrystalBlock()); + // Rocks // public static final StoneMaterial FLAVOLITE = new StoneMaterial("flavolite", MaterialColor.SAND); public static final StoneMaterial VIOLECITE = new StoneMaterial("violecite", MaterialColor.PURPLE); @@ -150,11 +157,7 @@ public class EndBlocks { // Ores // public static final Block ENDER_ORE = registerBlock("ender_ore", new BlockOre(EndItems.ENDER_DUST, 1, 3)); - // Materials // - public static final Block TERMINITE_BLOCK = registerBlock("terminite_block", new TerminiteBlock()); - public static final Block AETERNIUM_BLOCK = registerBlock("aeternium_block", new AeterniumBlock()); - public static final Block ENDER_BLOCK = registerBlock("ender_block", new EnderBlock()); - public static final Block AURORA_CRYSTAL = registerBlock("aurora_crystal", new AuroraCrystalBlock()); + public static final Block LANTERN_END_STONE = registerBlock("lantern_end_stone", new BlockStoneLantern(Blocks.END_STONE)); // Blocks With Entity // public static final Block END_STONE_SMELTER = registerBlock("end_stone_smelter", new EndStoneSmelter()); diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 9d7f5c3b..69907759 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -278,5 +278,9 @@ "block.betterend.purple_polypore": "Purple Polypore", "block.betterend.cyan_moss": "Cyan Moss", - "block.betterend.tail_moss": "Tail Moss" + "block.betterend.tail_moss": "Tail Moss", + + "block.betterend.flavolite_lantern": "Flavolite Lantern", + "block.betterend.lantern_end_stone": "End Stone Lantern", + "block.betterend.violecite_lantern": "Violecite Lantern" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 15201e60..0cf11fef 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -280,5 +280,9 @@ "block.betterend.purple_polypore": "Пурпурный трутовик", "block.betterend.cyan_moss": "Циановый мох", - "block.betterend.tail_moss": "Хвостовидный мох" + "block.betterend.tail_moss": "Хвостовидный мох", + + "block.betterend.flavolite_lantern": "Флаволитовый фонарь", + "block.betterend.lantern_end_stone": "Фонарь из камня края", + "block.betterend.violecite_lantern": "Виолецитовый фонарь" } \ No newline at end of file