diff --git a/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomHymenophore.java b/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomHymenophore.java new file mode 100644 index 00000000..bb1daf0a --- /dev/null +++ b/src/main/java/ru/betterend/blocks/BlockMossyGlowshroomHymenophore.java @@ -0,0 +1,13 @@ +package ru.betterend.blocks; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; +import net.minecraft.block.Material; +import net.minecraft.sound.BlockSoundGroup; +import ru.betterend.blocks.basis.BlockBase; + +public class BlockMossyGlowshroomHymenophore extends BlockBase { + public BlockMossyGlowshroomHymenophore() { + super(FabricBlockSettings.of(Material.WOOD).breakByTool(FabricToolTags.AXES).sounds(BlockSoundGroup.WART_BLOCK).lightLevel(15)); + } +} diff --git a/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java b/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java index a936534b..b3b14ec0 100644 --- a/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/WoodenMaterial.java @@ -1,6 +1,7 @@ package ru.betterend.blocks.complex; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.block.Block; import net.minecraft.block.Material; import net.minecraft.block.MaterialColor; @@ -56,7 +57,7 @@ public class WoodenMaterial public WoodenMaterial(String name, MaterialColor woodColor, MaterialColor planksColor) { - FabricBlockSettings materialPlanks = FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).materialColor(planksColor); + FabricBlockSettings materialPlanks = FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).breakByTool(FabricToolTags.AXES).materialColor(planksColor); log_striped = BlockRegistry.registerBlock(name + "_striped_log", new BlockPillar(materialPlanks)); bark_striped = BlockRegistry.registerBlock(name + "_striped_bark", new BlockPillar(materialPlanks)); diff --git a/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java b/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java index e35e91ed..6f4e7b3d 100644 --- a/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java +++ b/src/main/java/ru/betterend/blocks/entities/EndStoneSmelterBlockEntity.java @@ -15,7 +15,6 @@ import net.minecraft.inventory.SidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.recipe.AbstractCookingRecipe; import net.minecraft.recipe.Recipe; import net.minecraft.recipe.RecipeFinder; import net.minecraft.recipe.RecipeInputProvider; @@ -27,7 +26,6 @@ import net.minecraft.text.TranslatableText; import net.minecraft.util.Tickable; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.Direction; - import ru.betterend.BetterEnd; public class EndStoneSmelterBlockEntity extends LockableContainerBlockEntity implements SidedInventory, RecipeUnlocker, RecipeInputProvider, Tickable { diff --git a/src/main/java/ru/betterend/registry/BlockRegistry.java b/src/main/java/ru/betterend/registry/BlockRegistry.java index a64b1792..2af34de6 100644 --- a/src/main/java/ru/betterend/registry/BlockRegistry.java +++ b/src/main/java/ru/betterend/registry/BlockRegistry.java @@ -9,6 +9,7 @@ import net.minecraft.util.registry.Registry; import ru.betterend.BetterEnd; import ru.betterend.blocks.AeterniumBlock; import ru.betterend.blocks.BlockEndstoneDust; +import ru.betterend.blocks.BlockMossyGlowshroomHymenophore; import ru.betterend.blocks.BlockOre; import ru.betterend.blocks.BlockTerrain; import ru.betterend.blocks.EndStoneSmelter; @@ -24,6 +25,7 @@ public class BlockRegistry { public static final Block END_MOSS = registerBlock("end_moss", new BlockTerrain(MaterialColor.CYAN)); // Wooden Materials // + public static final Block MOSSY_GLOWSHROOM_HYMENOPHORE = registerBlock("mossy_glowshroom_hymenophore", new BlockMossyGlowshroomHymenophore()); public static final WoodenMaterial MOSSY_GLOWSHROOM = new WoodenMaterial("mossy_glowshroom", MaterialColor.GRAY, MaterialColor.WOOD); // Ores // diff --git a/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_bark.json b/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_bark.json index 64948404..40daf0c1 100644 --- a/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_bark.json +++ b/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_bark.json @@ -1,16 +1,25 @@ { "variants": { - "axis=x": { - "model": "betterend:block/mossy_glowshroom_bark", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "betterend:block/mossy_glowshroom_bark" - }, - "axis=z": { - "model": "betterend:block/mossy_glowshroom_bark", - "x": 90 - } + "axis=x": [ + { "model": "betterend:block/mossy_glowshroom_bark", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_bark_2", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_bark_3", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_bark_4", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_bark_5", "x": 90, "y": 90 } + ], + "axis=y": [ + { "model": "betterend:block/mossy_glowshroom_bark" }, + { "model": "betterend:block/mossy_glowshroom_bark_2" }, + { "model": "betterend:block/mossy_glowshroom_bark_3" }, + { "model": "betterend:block/mossy_glowshroom_bark_4" }, + { "model": "betterend:block/mossy_glowshroom_bark_5" } + ], + "axis=z": [ + { "model": "betterend:block/mossy_glowshroom_bark", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_bark_2", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_bark_3", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_bark_4", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_bark_5", "x": 90 } + ] } } diff --git a/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_hymenophore.json b/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_hymenophore.json new file mode 100644 index 00000000..9dd6099f --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_hymenophore.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/mossy_glowshroom_hymenophore_1" }, + { "model": "betterend:block/mossy_glowshroom_hymenophore_2" }, + { "model": "betterend:block/mossy_glowshroom_hymenophore_3" }, + { "model": "betterend:block/mossy_glowshroom_hymenophore_4" } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_log.json b/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_log.json index 463deb98..6bc7481a 100644 --- a/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_log.json +++ b/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_log.json @@ -1,16 +1,25 @@ { "variants": { - "axis=x": { - "model": "betterend:block/mossy_glowshroom_log", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "betterend:block/mossy_glowshroom_log" - }, - "axis=z": { - "model": "betterend:block/mossy_glowshroom_log", - "x": 90 - } + "axis=x": [ + { "model": "betterend:block/mossy_glowshroom_log", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_log_2", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_log_3", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_log_4", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_log_5", "x": 90, "y": 90 } + ], + "axis=y": [ + { "model": "betterend:block/mossy_glowshroom_log" }, + { "model": "betterend:block/mossy_glowshroom_log_2" }, + { "model": "betterend:block/mossy_glowshroom_log_3" }, + { "model": "betterend:block/mossy_glowshroom_log_4" }, + { "model": "betterend:block/mossy_glowshroom_log_5" } + ], + "axis=z": [ + { "model": "betterend:block/mossy_glowshroom_log", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_log_2", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_log_3", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_log_4", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_log_5", "x": 90 } + ] } } diff --git a/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_striped_bark.json b/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_striped_bark.json index d64d622c..18f27ded 100644 --- a/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_striped_bark.json +++ b/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_striped_bark.json @@ -1,16 +1,25 @@ { "variants": { - "axis=x": { - "model": "betterend:block/mossy_glowshroom_striped_bark", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "betterend:block/mossy_glowshroom_striped_bark" - }, - "axis=z": { - "model": "betterend:block/mossy_glowshroom_striped_bark", - "x": 90 - } + "axis=x": [ + { "model": "betterend:block/mossy_glowshroom_striped_bark", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_bark_2", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_bark_3", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_bark_4", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_bark_5", "x": 90, "y": 90 } + ], + "axis=y": [ + { "model": "betterend:block/mossy_glowshroom_striped_bark" }, + { "model": "betterend:block/mossy_glowshroom_striped_bark_2" }, + { "model": "betterend:block/mossy_glowshroom_striped_bark_3" }, + { "model": "betterend:block/mossy_glowshroom_striped_bark_4" }, + { "model": "betterend:block/mossy_glowshroom_striped_bark_5" } + ], + "axis=z": [ + { "model": "betterend:block/mossy_glowshroom_striped_bark", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_bark_2", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_bark_3", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_bark_4", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_bark_5", "x": 90 } + ] } } diff --git a/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_striped_log.json b/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_striped_log.json index 3a19ce95..215a1344 100644 --- a/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_striped_log.json +++ b/src/main/resources/assets/betterend/blockstates/mossy_glowshroom_striped_log.json @@ -1,16 +1,25 @@ { "variants": { - "axis=x": { - "model": "betterend:block/mossy_glowshroom_striped_log", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "betterend:block/mossy_glowshroom_striped_log" - }, - "axis=z": { - "model": "betterend:block/mossy_glowshroom_striped_log", - "x": 90 - } + "axis=x": [ + { "model": "betterend:block/mossy_glowshroom_striped_log", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_log_2", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_log_3", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_log_4", "x": 90, "y": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_log_5", "x": 90, "y": 90 } + ], + "axis=y": [ + { "model": "betterend:block/mossy_glowshroom_striped_log" }, + { "model": "betterend:block/mossy_glowshroom_striped_log_2" }, + { "model": "betterend:block/mossy_glowshroom_striped_log_3" }, + { "model": "betterend:block/mossy_glowshroom_striped_log_4" }, + { "model": "betterend:block/mossy_glowshroom_striped_log_5" } + ], + "axis=z": [ + { "model": "betterend:block/mossy_glowshroom_striped_log", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_log_2", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_log_3", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_log_4", "x": 90 }, + { "model": "betterend:block/mossy_glowshroom_striped_log_5", "x": 90 } + ] } } diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 3c1b7438..dde27ac4 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -1,11 +1,20 @@ { - "block.betterend.aeternium_block": "Aeternium Block", - "block.betterend.end_moss": "End Moss", + "itemGroup.betterend.items": "Better End", + "block.betterend.end_mycelium": "End Mycelium", - "block.betterend.end_stone_smelter": "End Stone Smelter", - "block.betterend.ender_block": "Ender Block", - "block.betterend.ender_ore": "Ender Ore", + "block.betterend.end_moss": "End Moss", "block.betterend.endstone_dust": "End Stone Dust", + "block.betterend.ender_ore": "Ender Ore", + "block.betterend.terminite_block": "Terminite Block", + "block.betterend.aeternium_block": "Aeternium Block", + "block.betterend.ender_block": "Ender Block", + "block.betterend.end_stone_smelter": "End Stone Smelter", + + "item.betterend.ender_dust": "Ender Dust", + "item.betterend.terminite_ingot": "Terminite Ingot", + "item.betterend.aeternium_ingot": "Aeternium Ingot", + + "block.betterend.mossy_glowshroom_hymenophore": "Mossy Glowshroom Hymenophore", "block.betterend.mossy_glowshroom_bark": "Mossy Glowshroom Bark", "block.betterend.mossy_glowshroom_barrel": "Mossy Glowshroom Barrel", "block.betterend.mossy_glowshroom_button": "Mossy Glowshroom Button", @@ -23,10 +32,5 @@ "block.betterend.mossy_glowshroom_stairs": "Mossy Glowshroom Stairs", "block.betterend.mossy_glowshroom_striped_bark": "Mossy Glowshroom Striped Bark", "block.betterend.mossy_glowshroom_striped_log": "Mossy Glowshroom Striped Log", - "block.betterend.mossy_glowshroom_trapdoor": "Mossy Glowshroom Trapdoor", - "block.betterend.terminite_block": "Terminite Block", - "item.betterend.aeternium_ingot": "Aeternium Ingot", - "item.betterend.ender_dust": "Ender Dust", - "item.betterend.terminite_ingot": "Terminite Ingot", - "itemGroup.betterend.items": "Better End" -} + "block.betterend.mossy_glowshroom_trapdoor": "Mossy Glowshroom Trapdoor" +} \ 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 e248db65..20f7e604 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -1,32 +1,36 @@ { - "block.betterend.aeternium_block": "\u0411\u043b\u043e\u043a \u042d\u0442\u0435\u0440\u0438\u044f", - "block.betterend.end_moss": "\u041c\u043e\u0445 \u043a\u0440\u0430\u044f", - "block.betterend.end_mycelium": "\u041c\u0438\u0446\u0435\u043b\u0438\u0439 \u043a\u0440\u0430\u044f", - "block.betterend.end_stone_smelter": "\u041f\u043b\u0430\u0432\u0438\u043b\u044c\u043d\u044f \u0438\u0437 \u043a\u0430\u043c\u043d\u044f \u041a\u0440\u0430\u044f", - "block.betterend.ender_block": "\u0411\u043b\u043e\u043a \u041a\u0440\u0430\u044f", - "block.betterend.ender_ore": "\u0420\u0443\u0434\u0430 \u041a\u0440\u0430\u044f", - "block.betterend.endstone_dust": "\u042d\u043d\u0434\u0435\u0440\u043d\u044f\u043a\u043e\u0432\u0430\u044f \u043f\u044b\u043b\u044c", - "block.betterend.mossy_glowshroom_bark": "\u041a\u043e\u0440\u0430 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_barrel": "\u0411\u043e\u0447\u043a\u0430 \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_button": "\u041a\u043d\u043e\u043f\u043a\u0430 \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_chest": "\u0421\u0443\u043d\u0434\u0443\u043a \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_crafting_table": "\u0412\u0435\u0440\u0441\u0442\u0430\u043a \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_door": "\u0414\u0432\u0435\u0440\u044c \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_fence": "\u0417\u0430\u0431\u043e\u0440 \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_gate": "\u041a\u0430\u043b\u0438\u0442\u043a\u0430 \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_ladder": "\u041b\u0435\u0441\u0442\u043d\u0438\u0446\u0430 \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_log": "\u0411\u0440\u0435\u0432\u043d\u043e \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_planks": "\u0414\u043e\u0441\u043a\u0438 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_plate": "\u041d\u0430\u0436\u0438\u043c\u043d\u0430\u044f \u043f\u043b\u0438\u0442\u0430 \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_sign": "\u0422\u0430\u0431\u043b\u0438\u0447\u043a\u0430 \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_slab": "\u041f\u043b\u0438\u0442\u0430 \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_stairs": "\u0421\u0442\u0443\u043f\u0435\u043d\u0438 \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_striped_bark": "\u041e\u0431\u0442\u0451\u0441\u0430\u043d\u043d\u0430\u044f \u043a\u043e\u0440\u0430 \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_striped_log": "\u041e\u0431\u0442\u0451\u0441\u0430\u043d\u043d\u043e\u0435 \u0431\u0440\u0435\u0432\u043d\u043e \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.mossy_glowshroom_trapdoor": "\u041b\u044e\u043a \u0438\u0437 \u043c\u0448\u0438\u0441\u0442\u043e\u0433\u043e \u0441\u0432\u0435\u0442\u043e\u0433\u0440\u0438\u0431\u0430", - "block.betterend.terminite_block": "\u0411\u043b\u043e\u043a \u0422\u0435\u0440\u043c\u0438\u043d\u0438\u0442\u0430", - "item.betterend.aeternium_ingot": "\u042d\u0442\u0435\u0440\u0438\u0435\u0432\u044b\u0439 \u0441\u043b\u0438\u0442\u043e\u043a", - "item.betterend.ender_dust": "\u041f\u044b\u043b\u044c \u041a\u0440\u0430\u044f", - "item.betterend.terminite_ingot": "\u0422\u0435\u0440\u043c\u0438\u043d\u0438\u0442\u043e\u0432\u044b\u0439 \u0441\u043b\u0438\u0442\u043e\u043a", - "itemGroup.betterend.items": "\u0423\u043b\u0443\u0447\u0448\u0435\u043d\u043d\u044b\u0439 \u041a\u0440\u0430\u0439" -} + "itemGroup.betterend.items": "Улучшенный Край", + + "block.betterend.end_mycelium": "Мицелий края", + "block.betterend.end_moss": "Мох края", + "block.betterend.endstone_dust": "Эндерняковая пыль", + "block.betterend.ender_ore": "Руда Края", + "block.betterend.terminite_block": "Блок Терминита", + "block.betterend.aeternium_block": "Блок Этерия", + "block.betterend.ender_block": "Блок Края", + "block.betterend.end_stone_smelter": "Плавильня из камня Края", + + "item.betterend.ender_dust": "Пыль Края", + "item.betterend.terminite_ingot": "Терминитовый слиток", + "item.betterend.aeternium_ingot": "Этериевый слиток", + + "block.betterend.mossy_glowshroom_hymenophore": "Гименофор мшистого светогриба", + "block.betterend.mossy_glowshroom_bark": "Кора мшистого светогриба", + "block.betterend.mossy_glowshroom_barrel": "Бочка из мшистого светогриба", + "block.betterend.mossy_glowshroom_button": "Кнопка из мшистого светогриба", + "block.betterend.mossy_glowshroom_chest": "Сундук из мшистого светогриба", + "block.betterend.mossy_glowshroom_crafting_table": "Верстак из мшистого светогриба", + "block.betterend.mossy_glowshroom_door": "Дверь из мшистого светогриба", + "block.betterend.mossy_glowshroom_fence": "Забор из мшистого светогриба", + "block.betterend.mossy_glowshroom_gate": "Калитка из мшистого светогриба", + "block.betterend.mossy_glowshroom_ladder": "Лестница из мшистого светогриба", + "block.betterend.mossy_glowshroom_log": "Бревно мшистого светогриба", + "block.betterend.mossy_glowshroom_planks": "Доски мшистого светогриба", + "block.betterend.mossy_glowshroom_plate": "Нажимная плита из мшистого светогриба", + "block.betterend.mossy_glowshroom_sign": "Табличка из мшистого светогриба", + "block.betterend.mossy_glowshroom_slab": "Плита из мшистого светогриба", + "block.betterend.mossy_glowshroom_stairs": "Ступени из мшистого светогриба", + "block.betterend.mossy_glowshroom_striped_bark": "Обтёсанная кора из мшистого светогриба", + "block.betterend.mossy_glowshroom_striped_log": "Обтёсанное бревно из мшистого светогриба", + "block.betterend.mossy_glowshroom_trapdoor": "Люк из мшистого светогриба" +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark_2.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark_2.json new file mode 100644 index 00000000..7c132ccb --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_log_side_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark_3.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark_3.json new file mode 100644 index 00000000..c98ee61f --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_log_side_3" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark_4.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark_4.json new file mode 100644 index 00000000..ffc8cc48 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_log_side_4" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark_5.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark_5.json new file mode 100644 index 00000000..1a4c718c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_bark_5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_log_side_5" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_hymenophore_1.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_hymenophore_1.json new file mode 100644 index 00000000..3049938f --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_hymenophore_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_hymenophore_1" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_hymenophore_2.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_hymenophore_2.json new file mode 100644 index 00000000..52c99750 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_hymenophore_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_hymenophore_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_hymenophore_3.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_hymenophore_3.json new file mode 100644 index 00000000..70623681 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_hymenophore_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_hymenophore_3" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_hymenophore_4.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_hymenophore_4.json new file mode 100644 index 00000000..a18de4d5 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_hymenophore_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_hymenophore_4" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log_2.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log_2.json new file mode 100644 index 00000000..305df572 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log_2.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/mossy_glowshroom_log_top", + "east": "betterend:block/mossy_glowshroom_log_side_2", + "north": "betterend:block/mossy_glowshroom_log_side_2", + "particle": "betterend:block/mossy_glowshroom_log_side_2", + "south": "betterend:block/mossy_glowshroom_log_side_2", + "up": "betterend:block/mossy_glowshroom_log_top", + "west": "betterend:block/mossy_glowshroom_log_side_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log_3.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log_3.json new file mode 100644 index 00000000..75cea541 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log_3.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/mossy_glowshroom_log_top", + "east": "betterend:block/mossy_glowshroom_log_side_3", + "north": "betterend:block/mossy_glowshroom_log_side_3", + "particle": "betterend:block/mossy_glowshroom_log_side_3", + "south": "betterend:block/mossy_glowshroom_log_side_3", + "up": "betterend:block/mossy_glowshroom_log_top", + "west": "betterend:block/mossy_glowshroom_log_side_3" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log_4.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log_4.json new file mode 100644 index 00000000..23d589af --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log_4.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/mossy_glowshroom_log_top", + "east": "betterend:block/mossy_glowshroom_log_side_4", + "north": "betterend:block/mossy_glowshroom_log_side_4", + "particle": "betterend:block/mossy_glowshroom_log_side_4", + "south": "betterend:block/mossy_glowshroom_log_side_4", + "up": "betterend:block/mossy_glowshroom_log_top", + "west": "betterend:block/mossy_glowshroom_log_side_4" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log_5.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log_5.json new file mode 100644 index 00000000..86cdb543 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_log_5.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/mossy_glowshroom_log_top", + "east": "betterend:block/mossy_glowshroom_log_side_5", + "north": "betterend:block/mossy_glowshroom_log_side_5", + "particle": "betterend:block/mossy_glowshroom_log_side_5", + "south": "betterend:block/mossy_glowshroom_log_side_5", + "up": "betterend:block/mossy_glowshroom_log_top", + "west": "betterend:block/mossy_glowshroom_log_side_5" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark_2.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark_2.json new file mode 100644 index 00000000..7b1d382a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_striped_log_side_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark_3.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark_3.json new file mode 100644 index 00000000..1342539d --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_striped_log_side_3" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark_4.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark_4.json new file mode 100644 index 00000000..7e351481 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_striped_log_side_4" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark_5.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark_5.json new file mode 100644 index 00000000..0566a2ce --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_bark_5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/mossy_glowshroom_striped_log_side_5" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log_2.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log_2.json new file mode 100644 index 00000000..9a80e4b3 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log_2.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/mossy_glowshroom_log_top", + "east": "betterend:block/mossy_glowshroom_striped_log_side_2", + "north": "betterend:block/mossy_glowshroom_striped_log_side_2", + "particle": "betterend:block/mossy_glowshroom_striped_log_side_2", + "south": "betterend:block/mossy_glowshroom_striped_log_side_2", + "up": "betterend:block/mossy_glowshroom_log_top", + "west": "betterend:block/mossy_glowshroom_striped_log_side_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log_3.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log_3.json new file mode 100644 index 00000000..fdae2e1f --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log_3.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/mossy_glowshroom_log_top", + "east": "betterend:block/mossy_glowshroom_striped_log_side_3", + "north": "betterend:block/mossy_glowshroom_striped_log_side_3", + "particle": "betterend:block/mossy_glowshroom_striped_log_side_3", + "south": "betterend:block/mossy_glowshroom_striped_log_side_3", + "up": "betterend:block/mossy_glowshroom_log_top", + "west": "betterend:block/mossy_glowshroom_striped_log_side_3" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log_4.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log_4.json new file mode 100644 index 00000000..8d3c6a0b --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log_4.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/mossy_glowshroom_log_top", + "east": "betterend:block/mossy_glowshroom_striped_log_side_4", + "north": "betterend:block/mossy_glowshroom_striped_log_side_4", + "particle": "betterend:block/mossy_glowshroom_striped_log_side_4", + "south": "betterend:block/mossy_glowshroom_striped_log_side_4", + "up": "betterend:block/mossy_glowshroom_log_top", + "west": "betterend:block/mossy_glowshroom_striped_log_side_4" + } +} diff --git a/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log_5.json b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log_5.json new file mode 100644 index 00000000..024381a9 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/mossy_glowshroom_striped_log_5.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/mossy_glowshroom_log_top", + "east": "betterend:block/mossy_glowshroom_striped_log_side_5", + "north": "betterend:block/mossy_glowshroom_striped_log_side_5", + "particle": "betterend:block/mossy_glowshroom_striped_log_side_5", + "south": "betterend:block/mossy_glowshroom_striped_log_side_5", + "up": "betterend:block/mossy_glowshroom_log_top", + "west": "betterend:block/mossy_glowshroom_striped_log_side_5" + } +} diff --git a/src/main/resources/assets/betterend/models/item/mossy_glowshroom_hymenophore.json b/src/main/resources/assets/betterend/models/item/mossy_glowshroom_hymenophore.json new file mode 100644 index 00000000..77029bec --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/mossy_glowshroom_hymenophore.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/mossy_glowshroom_hymenophore_1" +} diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_1.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_1.png new file mode 100644 index 00000000..cb490ec2 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_2.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_2.png new file mode 100644 index 00000000..20a15d29 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_3.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_3.png new file mode 100644 index 00000000..28c7d2eb Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_3.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_4.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_4.png new file mode 100644 index 00000000..be7189e7 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_hymenophore_4.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side.png index 7c68d507..b9859e8f 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png new file mode 100644 index 00000000..d993d7a2 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_3.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_3.png new file mode 100644 index 00000000..0a24225f Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_3.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_4.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_4.png new file mode 100644 index 00000000..95112942 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_4.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png new file mode 100644 index 00000000..71bacf23 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_side_5.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_top.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_top.png index 82dfbe18..f70a7871 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_top.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_log_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side.png index 8bbab1b4..cfd12247 100644 Binary files a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side.png and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side_2.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side_2.png new file mode 100644 index 00000000..7569a321 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side_3.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side_3.png new file mode 100644 index 00000000..1a001c45 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side_3.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side_4.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side_4.png new file mode 100644 index 00000000..0182318e Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side_4.png differ diff --git a/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side_5.png b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side_5.png new file mode 100644 index 00000000..cdf30588 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/mossy_glowshroom_striped_log_side_5.png differ