From b47728cbd6d01e974792c33998cfda118f248bfd Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 8 Nov 2020 13:40:30 +0300 Subject: [PATCH] Fixes --- .../blocks/complex/StoneMaterial.java | 8 +- .../ru/betterend/recipe/CraftingRecipes.java | 386 +++++++++--------- .../java/ru/betterend/registry/EndBlocks.java | 4 +- .../ru/betterend/registry/EndEntities.java | 6 +- .../registry/EndEntitiesRenders.java | 4 +- .../world/biome/BiomeShadowForest.java | 2 +- 6 files changed, 205 insertions(+), 205 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java index 4cd48ca9..77382814 100644 --- a/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/StoneMaterial.java @@ -12,7 +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.BlockStoneLantern; import ru.betterend.blocks.basis.BlockStonePressurePlate; import ru.betterend.blocks.basis.BlockWall; import ru.betterend.recipe.CraftingRecipes; @@ -33,7 +33,7 @@ public class StoneMaterial { public final Block button; public final Block pressure_plate; public final Block pedestal; - //public final Block lantern; + public final Block lantern; public final Block bricks; public final Block brick_stairs; @@ -53,7 +53,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)); + 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)); @@ -76,7 +76,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('#', EndItems.CRYSTAL_SHARDS).addMaterial('S', slab, brick_slab).setGroup("end_stone_lanterns").build(); + GridRecipe.make(name + "_lantern", lantern).setShape("S", "#", "S").addMaterial('#', EndItems.CRYSTAL_SHARDS).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/recipe/CraftingRecipes.java b/src/main/java/ru/betterend/recipe/CraftingRecipes.java index b9e4efb5..e247bdd6 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -1,193 +1,193 @@ -package ru.betterend.recipe; - -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.Items; -import ru.betterend.recipe.builders.GridRecipe; -import ru.betterend.registry.EndBlocks; -import ru.betterend.registry.EndItems; - -public class CraftingRecipes { - - public static void register() { - GridRecipe.make("ender_pearl_to_block", EndBlocks.ENDER_BLOCK) - .setShape(new String[] { "OO", "OO" }) - .addMaterial('O', Items.ENDER_PEARL) - .build(); - GridRecipe.make("ender_block_to_pearl", Items.ENDER_PEARL) - .addMaterial('#', EndBlocks.ENDER_BLOCK) - .setOutputCount(4) - .setList("#") - .build(); - - GridRecipe.make("end_stone_smelter", EndBlocks.END_STONE_SMELTER) - .setShape(new String[] { "###", "V V", "###" }) - .addMaterial('#', Blocks.END_STONE_BRICKS) - .addMaterial('V', Items.BUCKET) - .build(); - - registerPedestal("andesite_pedestal", EndBlocks.ANDESITE_PEDESTAL, Blocks.POLISHED_ANDESITE_SLAB, Blocks.POLISHED_ANDESITE); - registerPedestal("diorite_pedestal", EndBlocks.DIORITE_PEDESTAL, Blocks.POLISHED_DIORITE_SLAB, Blocks.POLISHED_DIORITE); - registerPedestal("granite_pedestal", EndBlocks.GRANITE_PEDESTAL, Blocks.POLISHED_GRANITE_SLAB, Blocks.POLISHED_GRANITE); - registerPedestal("quartz_pedestal", EndBlocks.QUARTZ_PEDESTAL, Blocks.QUARTZ_SLAB, Blocks.QUARTZ_PILLAR); - registerPedestal("purpur_pedestal", EndBlocks.PURPUR_PEDESTAL, Blocks.PURPUR_SLAB, Blocks.PURPUR_PILLAR); - - GridRecipe.make("infusion_pedestal", EndBlocks.INFUSION_PEDESTAL) - .setShape(new String[] { " Y ", "O#O", " # " }) - .addMaterial('O', Items.ENDER_PEARL) - .addMaterial('Y', Items.ENDER_EYE) - .addMaterial('#', Blocks.OBSIDIAN) - .build(); - - String material = "terminite"; - GridRecipe.make(material + "_block", EndBlocks.TERMINITE_BLOCK) - .setShape(new String[] { "III", "III", "III" }) - .addMaterial('I', EndItems.TERMINITE_INGOT) - .build(); - GridRecipe.make(material + "_block_to_ingot", EndItems.TERMINITE_INGOT) - .addMaterial('#', EndBlocks.TERMINITE_BLOCK) - .setOutputCount(9) - .setList("#") - .build(); - - registerHelmet(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_HELMET); - registerChestplate(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_CHESTPLATE); - registerLeggings(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_LEGGINGS); - registerBoots(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_BOOTS); - registerShovel(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_SHOVEL); - registerSword(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_SWORD); - registerPickaxe(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_PICKAXE); - registerAxe(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_AXE); - registerHoe(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_HOE); - registerHammer(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_HAMMER); - - material = "aeternium"; - GridRecipe.make(material + "_block", EndBlocks.AETERNIUM_BLOCK) - .setShape(new String[] { "III", "III", "III" }) - .addMaterial('I', EndItems.AETERNIUM_INGOT) - .build(); - GridRecipe.make(material + "_block_to_ingot", EndItems.AETERNIUM_INGOT) - .addMaterial('#', EndBlocks.AETERNIUM_BLOCK) - .setOutputCount(9) - .setList("#") - .build(); - - registerHelmet(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_HELMET); - registerChestplate(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_CHESTPLATE); - registerLeggings(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_LEGGINGS); - registerBoots(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_BOOTS); - registerShovel(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_SHOVEL); - registerSword(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_SWORD); - registerPickaxe(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_PICKAXE); - registerAxe(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_AXE); - registerHoe(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_HOE); - registerHammer(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_HAMMER); - - registerHammer("iron", Items.IRON_INGOT, EndItems.IRON_HAMMER); - registerHammer("golden", Items.GOLD_INGOT, EndItems.GOLDEN_HAMMER); - registerHammer("diamond", Items.DIAMOND, EndItems.DIAMOND_HAMMER); - registerHammer("netherite", Items.NETHERITE_INGOT, EndItems.NETHERITE_HAMMER); - - GridRecipe.make("blue_vine_seed_dye", Items.BLUE_DYE).setList("#").addMaterial('#', EndBlocks.BLUE_VINE_SEED).build(); - GridRecipe.make("creeping_moss_dye", Items.CYAN_DYE).setList("#").addMaterial('#', EndBlocks.CREEPING_MOSS).build(); - GridRecipe.make("umbrella_moss_dye", Items.YELLOW_DYE).setList("#").addMaterial('#', EndBlocks.UMBRELLA_MOSS).build(); - GridRecipe.make("umbrella_moss_tall_dye", Items.YELLOW_DYE).setList("#").addMaterial('#', EndBlocks.UMBRELLA_MOSS_TALL).build(); - GridRecipe.make("shadow_plant_dye", Items.BLACK_DYE).setList("#").addMaterial('#', EndBlocks.SHADOW_PLANT).build(); - - GridRecipe.make("paper", Items.PAPER).setShape("###").addMaterial('#', EndItems.END_LILY_LEAF_DRIED).setOutputCount(3).build(); - - GridRecipe.make("aurora_block", EndBlocks.AURORA_CRYSTAL).setShape("##", "##").addMaterial('#', EndItems.CRYSTAL_SHARDS).build(); - GridRecipe.make("lotus_block", EndBlocks.END_LOTUS.log).setShape("##", "##").addMaterial('#', EndBlocks.END_LOTUS_STEM).build(); - 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('#', EndItems.CRYSTAL_SHARDS).addMaterial('S', Blocks.END_STONE_BRICK_SLAB).setGroup("end_stone_lanterns").build(); - } - - public static void registerPedestal(String name, Block pedestal, Block slab, Block pillar) { - GridRecipe.make(name, pedestal) - .setShape(new String[] { "S", "#", "S" }) - .addMaterial('S', slab) - .addMaterial('#', pillar) - .setOutputCount(2) - .build(); - } - - private static void registerHelmet(String name, Item material, Item result) { - GridRecipe.make(name + "_helmet", result) - .setShape(new String[] { "III", "I I" }) - .addMaterial('I', material) - .build(); - } - - private static void registerChestplate(String name, Item material, Item result) { - GridRecipe.make(name + "_chestplate", result) - .setShape(new String[] { "I I", "III", "III" }) - .addMaterial('I', material) - .build(); - } - - private static void registerLeggings(String name, Item material, Item result) { - GridRecipe.make(name + "_leggings", result) - .setShape(new String[] { "III", "I I", "I I" }) - .addMaterial('I', material) - .build(); - } - - private static void registerBoots(String name, Item material, Item result) { - GridRecipe.make(name + "_boots", result) - .setShape(new String[] { "I I", "I I" }) - .addMaterial('I', material) - .build(); - } - - private static void registerShovel(String name, Item material, Item result) { - GridRecipe.make(name + "_shovel", result) - .setShape(new String[] { "I", "#", "#" }) - .addMaterial('I', material) - .addMaterial('#', Items.STICK) - .build(); - } - - private static void registerSword(String name, Item material, Item result) { - GridRecipe.make(name + "_sword", result) - .setShape(new String[] { "I", "I", "#" }) - .addMaterial('I', material) - .addMaterial('#', Items.STICK) - .build(); - } - - private static void registerPickaxe(String name, Item material, Item result) { - GridRecipe.make(name + "_pickaxe", result) - .setShape(new String[] { "III", " # ", " # " }) - .addMaterial('I', material) - .addMaterial('#', Items.STICK) - .build(); - } - - private static void registerAxe(String name, Item material, Item result) { - GridRecipe.make(name + "_axe", result) - .setShape(new String[] { "II", "#I", "# " }) - .addMaterial('I', material) - .addMaterial('#', Items.STICK) - .build(); - } - - private static void registerHoe(String name, Item material, Item result) { - GridRecipe.make(name + "_hoe", result) - .setShape(new String[] { "II", "# ", "# " }) - .addMaterial('I', material) - .addMaterial('#', Items.STICK) - .build(); - } - - private static void registerHammer(String name, Item material, Item result) { - GridRecipe.make(name + "_hammer", result) - .setShape(new String[] { "I I", "I#I", " # " }) - .addMaterial('I', material) - .addMaterial('#', Items.STICK) - .build(); - } -} +package ru.betterend.recipe; + +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import ru.betterend.recipe.builders.GridRecipe; +import ru.betterend.registry.EndBlocks; +import ru.betterend.registry.EndItems; + +public class CraftingRecipes { + + public static void register() { + GridRecipe.make("ender_pearl_to_block", EndBlocks.ENDER_BLOCK) + .setShape(new String[] { "OO", "OO" }) + .addMaterial('O', Items.ENDER_PEARL) + .build(); + GridRecipe.make("ender_block_to_pearl", Items.ENDER_PEARL) + .addMaterial('#', EndBlocks.ENDER_BLOCK) + .setOutputCount(4) + .setList("#") + .build(); + + GridRecipe.make("end_stone_smelter", EndBlocks.END_STONE_SMELTER) + .setShape(new String[] { "###", "V V", "###" }) + .addMaterial('#', Blocks.END_STONE_BRICKS) + .addMaterial('V', Items.BUCKET) + .build(); + + registerPedestal("andesite_pedestal", EndBlocks.ANDESITE_PEDESTAL, Blocks.POLISHED_ANDESITE_SLAB, Blocks.POLISHED_ANDESITE); + registerPedestal("diorite_pedestal", EndBlocks.DIORITE_PEDESTAL, Blocks.POLISHED_DIORITE_SLAB, Blocks.POLISHED_DIORITE); + registerPedestal("granite_pedestal", EndBlocks.GRANITE_PEDESTAL, Blocks.POLISHED_GRANITE_SLAB, Blocks.POLISHED_GRANITE); + registerPedestal("quartz_pedestal", EndBlocks.QUARTZ_PEDESTAL, Blocks.QUARTZ_SLAB, Blocks.QUARTZ_PILLAR); + registerPedestal("purpur_pedestal", EndBlocks.PURPUR_PEDESTAL, Blocks.PURPUR_SLAB, Blocks.PURPUR_PILLAR); + + GridRecipe.make("infusion_pedestal", EndBlocks.INFUSION_PEDESTAL) + .setShape(new String[] { " Y ", "O#O", " # " }) + .addMaterial('O', Items.ENDER_PEARL) + .addMaterial('Y', Items.ENDER_EYE) + .addMaterial('#', Blocks.OBSIDIAN) + .build(); + + String material = "terminite"; + GridRecipe.make(material + "_block", EndBlocks.TERMINITE_BLOCK) + .setShape(new String[] { "III", "III", "III" }) + .addMaterial('I', EndItems.TERMINITE_INGOT) + .build(); + GridRecipe.make(material + "_block_to_ingot", EndItems.TERMINITE_INGOT) + .addMaterial('#', EndBlocks.TERMINITE_BLOCK) + .setOutputCount(9) + .setList("#") + .build(); + + registerHelmet(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_HELMET); + registerChestplate(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_CHESTPLATE); + registerLeggings(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_LEGGINGS); + registerBoots(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_BOOTS); + registerShovel(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_SHOVEL); + registerSword(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_SWORD); + registerPickaxe(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_PICKAXE); + registerAxe(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_AXE); + registerHoe(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_HOE); + registerHammer(material, EndItems.TERMINITE_INGOT, EndItems.TERMINITE_HAMMER); + + material = "aeternium"; + GridRecipe.make(material + "_block", EndBlocks.AETERNIUM_BLOCK) + .setShape(new String[] { "III", "III", "III" }) + .addMaterial('I', EndItems.AETERNIUM_INGOT) + .build(); + GridRecipe.make(material + "_block_to_ingot", EndItems.AETERNIUM_INGOT) + .addMaterial('#', EndBlocks.AETERNIUM_BLOCK) + .setOutputCount(9) + .setList("#") + .build(); + + registerHelmet(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_HELMET); + registerChestplate(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_CHESTPLATE); + registerLeggings(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_LEGGINGS); + registerBoots(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_BOOTS); + registerShovel(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_SHOVEL); + registerSword(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_SWORD); + registerPickaxe(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_PICKAXE); + registerAxe(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_AXE); + registerHoe(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_HOE); + registerHammer(material, EndItems.AETERNIUM_INGOT, EndItems.AETERNIUM_HAMMER); + + registerHammer("iron", Items.IRON_INGOT, EndItems.IRON_HAMMER); + registerHammer("golden", Items.GOLD_INGOT, EndItems.GOLDEN_HAMMER); + registerHammer("diamond", Items.DIAMOND, EndItems.DIAMOND_HAMMER); + registerHammer("netherite", Items.NETHERITE_INGOT, EndItems.NETHERITE_HAMMER); + + GridRecipe.make("blue_vine_seed_dye", Items.BLUE_DYE).setList("#").addMaterial('#', EndBlocks.BLUE_VINE_SEED).build(); + GridRecipe.make("creeping_moss_dye", Items.CYAN_DYE).setList("#").addMaterial('#', EndBlocks.CREEPING_MOSS).build(); + GridRecipe.make("umbrella_moss_dye", Items.YELLOW_DYE).setList("#").addMaterial('#', EndBlocks.UMBRELLA_MOSS).build(); + GridRecipe.make("umbrella_moss_tall_dye", Items.YELLOW_DYE).setList("#").addMaterial('#', EndBlocks.UMBRELLA_MOSS_TALL).build(); + GridRecipe.make("shadow_plant_dye", Items.BLACK_DYE).setList("#").addMaterial('#', EndBlocks.SHADOW_PLANT).build(); + + GridRecipe.make("paper", Items.PAPER).setShape("###").addMaterial('#', EndItems.END_LILY_LEAF_DRIED).setOutputCount(3).build(); + + GridRecipe.make("aurora_block", EndBlocks.AURORA_CRYSTAL).setShape("##", "##").addMaterial('#', EndItems.CRYSTAL_SHARDS).build(); + GridRecipe.make("lotus_block", EndBlocks.END_LOTUS.log).setShape("##", "##").addMaterial('#', EndBlocks.END_LOTUS_STEM).build(); + 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('#', EndItems.CRYSTAL_SHARDS).addMaterial('S', Blocks.END_STONE_BRICK_SLAB).setGroup("end_stone_lanterns").build(); + } + + public static void registerPedestal(String name, Block pedestal, Block slab, Block pillar) { + GridRecipe.make(name, pedestal) + .setShape(new String[] { "S", "#", "S" }) + .addMaterial('S', slab) + .addMaterial('#', pillar) + .setOutputCount(2) + .build(); + } + + private static void registerHelmet(String name, Item material, Item result) { + GridRecipe.make(name + "_helmet", result) + .setShape(new String[] { "III", "I I" }) + .addMaterial('I', material) + .build(); + } + + private static void registerChestplate(String name, Item material, Item result) { + GridRecipe.make(name + "_chestplate", result) + .setShape(new String[] { "I I", "III", "III" }) + .addMaterial('I', material) + .build(); + } + + private static void registerLeggings(String name, Item material, Item result) { + GridRecipe.make(name + "_leggings", result) + .setShape(new String[] { "III", "I I", "I I" }) + .addMaterial('I', material) + .build(); + } + + private static void registerBoots(String name, Item material, Item result) { + GridRecipe.make(name + "_boots", result) + .setShape(new String[] { "I I", "I I" }) + .addMaterial('I', material) + .build(); + } + + private static void registerShovel(String name, Item material, Item result) { + GridRecipe.make(name + "_shovel", result) + .setShape(new String[] { "I", "#", "#" }) + .addMaterial('I', material) + .addMaterial('#', Items.STICK) + .build(); + } + + private static void registerSword(String name, Item material, Item result) { + GridRecipe.make(name + "_sword", result) + .setShape(new String[] { "I", "I", "#" }) + .addMaterial('I', material) + .addMaterial('#', Items.STICK) + .build(); + } + + private static void registerPickaxe(String name, Item material, Item result) { + GridRecipe.make(name + "_pickaxe", result) + .setShape(new String[] { "III", " # ", " # " }) + .addMaterial('I', material) + .addMaterial('#', Items.STICK) + .build(); + } + + private static void registerAxe(String name, Item material, Item result) { + GridRecipe.make(name + "_axe", result) + .setShape(new String[] { "II", "#I", "# " }) + .addMaterial('I', material) + .addMaterial('#', Items.STICK) + .build(); + } + + private static void registerHoe(String name, Item material, Item result) { + GridRecipe.make(name + "_hoe", result) + .setShape(new String[] { "II", "# ", "# " }) + .addMaterial('I', material) + .addMaterial('#', Items.STICK) + .build(); + } + + private static void registerHammer(String name, Item material, Item result) { + GridRecipe.make(name + "_hammer", result) + .setShape(new String[] { "I I", "I#I", " # " }) + .addMaterial('I', material) + .addMaterial('#', Items.STICK) + .build(); + } +} diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 1405b49c..9ac89e8e 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -51,7 +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.BlockStoneLantern; import ru.betterend.blocks.basis.BlockVine; import ru.betterend.blocks.basis.BlockWallMushroom; import ru.betterend.blocks.basis.BlockWallPlant; @@ -157,7 +157,7 @@ public class EndBlocks { 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)); + 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/java/ru/betterend/registry/EndEntities.java b/src/main/java/ru/betterend/registry/EndEntities.java index b0c0ad26..601d9fb5 100644 --- a/src/main/java/ru/betterend/registry/EndEntities.java +++ b/src/main/java/ru/betterend/registry/EndEntities.java @@ -15,7 +15,7 @@ import ru.betterend.BetterEnd; import ru.betterend.entity.EntityDragonfly; import ru.betterend.entity.EntityEndFish; import ru.betterend.entity.EntityEndSlime; -//import ru.betterend.entity.EntityShadowWalker; +import ru.betterend.entity.EntityShadowWalker; import ru.betterend.util.MHelper; import ru.betterend.util.SpawnHelper; @@ -23,12 +23,12 @@ public class EndEntities { public static final EntityType DRAGONFLY = register("dragonfly", SpawnGroup.AMBIENT, 0.6F, 0.5F, EntityDragonfly::new, EntityDragonfly.createMobAttributes(), true, MHelper.color(32, 42, 176), MHelper.color(115, 225, 249)); public static final EntityType END_SLIME = register("end_slime", SpawnGroup.MONSTER, 2F, 2F, EntityEndSlime::new, EntityEndSlime.createMobAttributes(), false, MHelper.color(28, 28, 28), MHelper.color(99, 11, 99)); public static final EntityType END_FISH = register("end_fish", SpawnGroup.WATER_AMBIENT, 0.5F, 0.5F, EntityEndFish::new, EntityEndFish.createMobAttributes(), true, MHelper.color(3, 50, 76), MHelper.color(120, 206, 255)); - //public static final EntityType SHADOW_WALKER = register("shadow_walker", SpawnGroup.MONSTER, 0.6F, 1.95F, EntityShadowWalker::new, EntityShadowWalker.createMobAttributes(), true, MHelper.color(30, 30, 30), MHelper.color(5, 5, 5)); + public static final EntityType SHADOW_WALKER = register("shadow_walker", SpawnGroup.MONSTER, 0.6F, 1.95F, EntityShadowWalker::new, EntityShadowWalker.createMobAttributes(), true, MHelper.color(30, 30, 30), MHelper.color(5, 5, 5)); public static void register() { SpawnHelper.restrictionLand(END_SLIME, EntityEndSlime::canSpawn); SpawnHelper.restrictionWater(END_FISH, EntityEndFish::canSpawn); - //SpawnHelper.restrictionLand(SHADOW_WALKER, HostileEntity::canSpawnInDark); + SpawnHelper.restrictionLand(SHADOW_WALKER, HostileEntity::canSpawnInDark); } protected static EntityType register(String name, SpawnGroup group, float width, float height, EntityFactory entity) { diff --git a/src/main/java/ru/betterend/registry/EndEntitiesRenders.java b/src/main/java/ru/betterend/registry/EndEntitiesRenders.java index 8a36eaa6..e72afbdf 100644 --- a/src/main/java/ru/betterend/registry/EndEntitiesRenders.java +++ b/src/main/java/ru/betterend/registry/EndEntitiesRenders.java @@ -6,7 +6,7 @@ import net.minecraft.entity.EntityType; import ru.betterend.entity.render.RendererEntityDragonfly; import ru.betterend.entity.render.RendererEntityEndFish; import ru.betterend.entity.render.RendererEntityEndSlime; -//import ru.betterend.entity.render.RendererEntityShadowWalker; +import ru.betterend.entity.render.RendererEntityShadowWalker; public class EndEntitiesRenders { @@ -14,7 +14,7 @@ public class EndEntitiesRenders { register(EndEntities.DRAGONFLY, RendererEntityDragonfly.class); register(EndEntities.END_SLIME, RendererEntityEndSlime.class); register(EndEntities.END_FISH, RendererEntityEndFish.class); - //register(EndEntities.SHADOW_WALKER, RendererEntityShadowWalker.class); + register(EndEntities.SHADOW_WALKER, RendererEntityShadowWalker.class); } private static void register(EntityType type, Class> renderer) { diff --git a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java index 27170f1e..7d1816e9 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java @@ -32,7 +32,7 @@ public class BiomeShadowForest extends EndBiome { .addFeature(EndFeatures.TAIL_MOSS) .addFeature(EndFeatures.TAIL_MOSS_WOOD) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) - //.addMobSpawn(EndEntities.SHADOW_WALKER, 80, 2, 4) + .addMobSpawn(EndEntities.SHADOW_WALKER, 80, 2, 4) .addMobSpawn(EntityType.ENDERMAN, 40, 1, 4) .addMobSpawn(EntityType.PHANTOM, 1, 1, 2)); }