diff --git a/src/main/java/ru/betterend/blocks/FilaluxLanternBlock.java b/src/main/java/ru/betterend/blocks/FilaluxLanternBlock.java index 9bb4a323..0363bd80 100644 --- a/src/main/java/ru/betterend/blocks/FilaluxLanternBlock.java +++ b/src/main/java/ru/betterend/blocks/FilaluxLanternBlock.java @@ -1,11 +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 FilaluxLanternBlock extends BlockBase { public FilaluxLanternBlock() { - super(FabricBlockSettings.of(Material.WOOD).luminance(15)); + super(FabricBlockSettings.of(Material.WOOD).luminance(15).sounds(BlockSoundGroup.WOOD).breakByTool(FabricToolTags.AXES)); } } diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index e128b0c5..4ca3195c 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -171,6 +171,7 @@ public class EndFeatures { // Terrain // public static final EndFeature END_LAKE = EndFeature.makeLakeFeature("end_lake", new EndLakeFeature(), 4); + public static final EndFeature END_LAKE_NORMAL = EndFeature.makeLakeFeature("end_lake_normal", new EndLakeFeature(), 20); public static final EndFeature END_LAKE_RARE = EndFeature.makeLakeFeature("end_lake_rare", new EndLakeFeature(), 40); public static final EndFeature ROUND_CAVE = EndFeature.makeRawGenFeature("round_cave", new RoundCaveFeature(), 2); public static final EndFeature SPIRE = EndFeature.makeRawGenFeature("spire", new SpireFeature(), 2); diff --git a/src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java b/src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java index da8dd315..c2aebccf 100644 --- a/src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java +++ b/src/main/java/ru/betterend/world/biome/land/LanternWoodsBiome.java @@ -10,14 +10,14 @@ import ru.betterend.registry.EndSounds; public class LanternWoodsBiome extends EndBiome { public LanternWoodsBiome() { super(new BiomeDefinition("lantern_woods") - .setFogColor(132, 35, 13) + .setFogColor(189, 82, 70) .setFogDensity(1.1F) - .setWaterAndFogColor(113, 88, 53) - .setPlantsColor(237, 122, 66) + .setWaterAndFogColor(171, 234, 226) + .setPlantsColor(254, 85, 57) .setSurface(EndBlocks.RUTISCUS) .setMusic(EndSounds.MUSIC_FOREST) - .setParticles(EndParticles.GLOWING_SPHERE, 0.0005F) - .addFeature(EndFeatures.END_LAKE_RARE) + .setParticles(EndParticles.GLOWING_SPHERE, 0.001F) + .addFeature(EndFeatures.END_LAKE_NORMAL) .addFeature(EndFeatures.LUCERNIA) .addFeature(EndFeatures.LUCERNIA_BUSH) .addFeature(EndFeatures.FILALUX) diff --git a/src/main/resources/assets/betterend/blockstates/lucernia_bark.json b/src/main/resources/assets/betterend/blockstates/lucernia_bark.json new file mode 100644 index 00000000..57d7d613 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/lucernia_bark.json @@ -0,0 +1,22 @@ +{ + "variants": { + "axis=x": [ + { "model": "betterend:block/lucernia_bark", "x": 90, "y": 90, "weight": 16 }, + { "model": "betterend:block/lucernia_bark_2", "x": 90, "y": 90 }, + { "model": "betterend:block/lucernia_bark_3", "x": 90, "y": 90, "weight": 16 }, + { "model": "betterend:block/lucernia_bark_4", "x": 90, "y": 90 } + ], + "axis=y": [ + { "model": "betterend:block/lucernia_bark", "weight": 16 }, + { "model": "betterend:block/lucernia_bark_2" }, + { "model": "betterend:block/lucernia_bark_3", "weight": 16 }, + { "model": "betterend:block/lucernia_bark_4" } + ], + "axis=z": [ + { "model": "betterend:block/lucernia_bark", "x": 90, "weight": 16 }, + { "model": "betterend:block/lucernia_bark_2", "x": 90 }, + { "model": "betterend:block/lucernia_bark_3", "x": 90, "weight": 16 }, + { "model": "betterend:block/lucernia_bark_4", "x": 90 } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/lucernia_log.json b/src/main/resources/assets/betterend/blockstates/lucernia_log.json new file mode 100644 index 00000000..7052ea7b --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/lucernia_log.json @@ -0,0 +1,22 @@ +{ + "variants": { + "axis=x": [ + { "model": "betterend:block/lucernia_log", "x": 90, "y": 90, "weight": 16 }, + { "model": "betterend:block/lucernia_log_2", "x": 90, "y": 90 }, + { "model": "betterend:block/lucernia_log_3", "x": 90, "y": 90, "weight": 16 }, + { "model": "betterend:block/lucernia_log_4", "x": 90, "y": 90 } + ], + "axis=y": [ + { "model": "betterend:block/lucernia_log", "weight": 16 }, + { "model": "betterend:block/lucernia_log_2" }, + { "model": "betterend:block/lucernia_log_3", "weight": 16 }, + { "model": "betterend:block/lucernia_log_4" } + ], + "axis=z": [ + { "model": "betterend:block/lucernia_log", "x": 90, "weight": 16 }, + { "model": "betterend:block/lucernia_log_2", "x": 90 }, + { "model": "betterend:block/lucernia_log_3", "x": 90, "weight": 16 }, + { "model": "betterend:block/lucernia_log_4", "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 5d3d64ee..bd178a0d 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -770,5 +770,33 @@ "block.betterend.dragon_bone_block": "Dragon Bone Block", "block.betterend.dragon_bone_slab": "Dragon Bone Slab", "block.betterend.dragon_bone_stairs": "Dragon Bone Stairs", - "block.betterend.mossy_dragon_bone": "Mossy Dragon Bone" + "block.betterend.mossy_dragon_bone": "Mossy Dragon Bone", + + "biome.betterend.lantern_woods": "Lantern Woods", + "block.betterend.filalux": "Filalux", + "block.betterend.filalux_lantern": "Filalux Lantern", + "block.betterend.filalux_wings": "Filalux Wings", + "block.betterend.lucernia_bark": "Lucernia Bark", + "block.betterend.lucernia_barrel": "Lucernia Barrel", + "block.betterend.lucernia_bookshelf": "Lucernia Bookshelf", + "block.betterend.lucernia_button": "Lucernia Button", + "block.betterend.lucernia_chest": "Lucernia Chest", + "block.betterend.lucernia_composter": "Lucernia Composter", + "block.betterend.lucernia_crafting_table": "Lucernia Crafting Table", + "block.betterend.lucernia_door": "Lucernia Door", + "block.betterend.lucernia_fence": "Lucernia Fence", + "block.betterend.lucernia_gate": "Lucernia Gate", + "block.betterend.lucernia_ladder": "Lucernia Ladder", + "block.betterend.lucernia_leaves": "Lucernia Leaves", + "block.betterend.lucernia_log": "Lucernia Log", + "block.betterend.lucernia_outer_leaves": "Lucernia Outer Leaves", + "block.betterend.lucernia_planks": "Lucernia Planks", + "block.betterend.lucernia_plate": "Lucernia Pressure Plate", + "block.betterend.lucernia_sapling": "Lucernia Sapling", + "block.betterend.lucernia_sign": "Lucernia Sign", + "block.betterend.lucernia_slab": "Lucernia Slab", + "block.betterend.lucernia_stairs": "Lucernia Stairs", + "block.betterend.lucernia_stripped_bark": "Stripped Lucernia Bark", + "block.betterend.lucernia_stripped_log": "Stripped Lucernia Log", + "block.betterend.lucernia_trapdoor": "Lucernia Trapdoor" } diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 8ab69546..6b7d44db 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -790,5 +790,33 @@ "block.betterend.dragon_bone_block": "Блок драконьих костей", "block.betterend.dragon_bone_slab": "Плита из блока драконьих костей", "block.betterend.dragon_bone_stairs": "Ступени из блока драконьих костей", - "block.betterend.mossy_dragon_bone": "Замшелые драконьи кости" + "block.betterend.mossy_dragon_bone": "Замшелые драконьи кости", + + "biome.betterend.lantern_woods": "Лес фонарей", + "block.betterend.filalux": "Филалюкс", + "block.betterend.filalux_lantern": "Филалюксовый фонарь", + "block.betterend.filalux_wings": "Филалюксовые крылья", + "block.betterend.lucernia_bark": "Кора люцернии", + "block.betterend.lucernia_barrel": "Бочка из люцернии", + "block.betterend.lucernia_bookshelf": "Книжные полки из люцернии", + "block.betterend.lucernia_button": "Кнопка из люцернии", + "block.betterend.lucernia_chest": "Сундук из люцернии", + "block.betterend.lucernia_composter": "Компостер из люцернии", + "block.betterend.lucernia_crafting_table": "Верстак из люцернии", + "block.betterend.lucernia_door": "Дверь из люцернии", + "block.betterend.lucernia_fence": "Забор из люцернии", + "block.betterend.lucernia_gate": "Калитка из люцернии", + "block.betterend.lucernia_ladder": "Лестница из люцернии", + "block.betterend.lucernia_leaves": "Листья люцернии", + "block.betterend.lucernia_log": "Бревно люцернии", + "block.betterend.lucernia_outer_leaves": "Внешние листья люцернии", + "block.betterend.lucernia_planks": "Доски из люцернии", + "block.betterend.lucernia_plate": "Нажимная плита из люцернии", + "block.betterend.lucernia_sapling": "Саженец люцернии", + "block.betterend.lucernia_sign": "Табличка из люцернии", + "block.betterend.lucernia_slab": "Плита из люцернии", + "block.betterend.lucernia_stairs": "Ступени из люцернии", + "block.betterend.lucernia_stripped_bark": "Обтёсанная кора люцернии", + "block.betterend.lucernia_stripped_log": "Обтёсанное бревно люцернии", + "block.betterend.lucernia_trapdoor": "Люцерниевый люк" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/lucernia_bark.json b/src/main/resources/assets/betterend/models/block/lucernia_bark.json new file mode 100644 index 00000000..d8d8534f --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_bark.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lucernia_log_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lucernia_bark_2.json b/src/main/resources/assets/betterend/models/block/lucernia_bark_2.json new file mode 100644 index 00000000..700cf84a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_bark_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lucernia_log_side_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lucernia_bark_3.json b/src/main/resources/assets/betterend/models/block/lucernia_bark_3.json new file mode 100644 index 00000000..1c98b56f --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_bark_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_mirrored_all", + "textures": { + "all": "betterend:block/lucernia_log_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lucernia_bark_4.json b/src/main/resources/assets/betterend/models/block/lucernia_bark_4.json new file mode 100644 index 00000000..f9a8a676 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_bark_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_mirrored_all", + "textures": { + "all": "betterend:block/lucernia_log_side_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lucernia_log.json b/src/main/resources/assets/betterend/models/block/lucernia_log.json new file mode 100644 index 00000000..c1db80eb --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_log.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/lucernia_log_top", + "east": "betterend:block/lucernia_log_side", + "north": "betterend:block/lucernia_log_side", + "particle": "betterend:block/lucernia_log_side", + "south": "betterend:block/lucernia_log_side", + "up": "betterend:block/lucernia_log_top", + "west": "betterend:block/lucernia_log_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lucernia_log_2.json b/src/main/resources/assets/betterend/models/block/lucernia_log_2.json new file mode 100644 index 00000000..27176afb --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_log_2.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "betterend:block/lucernia_log_top", + "east": "betterend:block/lucernia_log_side_2", + "north": "betterend:block/lucernia_log_side_2", + "particle": "betterend:block/lucernia_log_side_2", + "south": "betterend:block/lucernia_log_side_2", + "up": "betterend:block/lucernia_log_top", + "west": "betterend:block/lucernia_log_side_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lucernia_log_3.json b/src/main/resources/assets/betterend/models/block/lucernia_log_3.json new file mode 100644 index 00000000..e36e41b0 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_log_3.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube_mirrored", + "textures": { + "down": "betterend:block/lucernia_log_top", + "east": "betterend:block/lucernia_log_side", + "north": "betterend:block/lucernia_log_side", + "particle": "betterend:block/lucernia_log_side", + "south": "betterend:block/lucernia_log_side", + "up": "betterend:block/lucernia_log_top", + "west": "betterend:block/lucernia_log_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/lucernia_log_4.json b/src/main/resources/assets/betterend/models/block/lucernia_log_4.json new file mode 100644 index 00000000..2c32bf88 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/lucernia_log_4.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube_mirrored", + "textures": { + "down": "betterend:block/lucernia_log_top", + "east": "betterend:block/lucernia_log_side_2", + "north": "betterend:block/lucernia_log_side_2", + "particle": "betterend:block/lucernia_log_side_2", + "south": "betterend:block/lucernia_log_side_2", + "up": "betterend:block/lucernia_log_top", + "west": "betterend:block/lucernia_log_side_2" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_barrel_bottom.png b/src/main/resources/assets/betterend/textures/block/lucernia_barrel_bottom.png new file mode 100644 index 00000000..ebf9c25b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_barrel_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_barrel_side.png b/src/main/resources/assets/betterend/textures/block/lucernia_barrel_side.png new file mode 100644 index 00000000..4728ebe1 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_barrel_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_barrel_top.png b/src/main/resources/assets/betterend/textures/block/lucernia_barrel_top.png new file mode 100644 index 00000000..06f0efcb Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_barrel_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_barrel_top_open.png b/src/main/resources/assets/betterend/textures/block/lucernia_barrel_top_open.png new file mode 100644 index 00000000..1277cfd2 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_barrel_top_open.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_bookshelf.png b/src/main/resources/assets/betterend/textures/block/lucernia_bookshelf.png new file mode 100644 index 00000000..178ef8a2 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_bookshelf.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_composter_bottom.png b/src/main/resources/assets/betterend/textures/block/lucernia_composter_bottom.png new file mode 100644 index 00000000..ba01caa6 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_composter_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_composter_side.png b/src/main/resources/assets/betterend/textures/block/lucernia_composter_side.png new file mode 100644 index 00000000..399370e3 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_composter_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_composter_top.png b/src/main/resources/assets/betterend/textures/block/lucernia_composter_top.png new file mode 100644 index 00000000..d0b7d449 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_composter_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_crafting_table_bottom.png b/src/main/resources/assets/betterend/textures/block/lucernia_crafting_table_bottom.png new file mode 100644 index 00000000..44a4f2cd Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_crafting_table_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_crafting_table_front.png b/src/main/resources/assets/betterend/textures/block/lucernia_crafting_table_front.png new file mode 100644 index 00000000..d631193b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_crafting_table_front.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_crafting_table_side.png b/src/main/resources/assets/betterend/textures/block/lucernia_crafting_table_side.png new file mode 100644 index 00000000..6463c47c Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_crafting_table_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_crafting_table_top.png b/src/main/resources/assets/betterend/textures/block/lucernia_crafting_table_top.png new file mode 100644 index 00000000..7fac3128 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_crafting_table_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_ladder.png b/src/main/resources/assets/betterend/textures/block/lucernia_ladder.png new file mode 100644 index 00000000..8cee0918 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_ladder.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_log_side.png b/src/main/resources/assets/betterend/textures/block/lucernia_log_side.png index 50bdeba6..5c0665bd 100644 Binary files a/src/main/resources/assets/betterend/textures/block/lucernia_log_side.png and b/src/main/resources/assets/betterend/textures/block/lucernia_log_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_log_side_2.png b/src/main/resources/assets/betterend/textures/block/lucernia_log_side_2.png new file mode 100644 index 00000000..ec51aed9 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_log_side_2.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_log_top.png b/src/main/resources/assets/betterend/textures/block/lucernia_log_top.png index d9e4f84a..502c1b70 100644 Binary files a/src/main/resources/assets/betterend/textures/block/lucernia_log_top.png and b/src/main/resources/assets/betterend/textures/block/lucernia_log_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_planks.png b/src/main/resources/assets/betterend/textures/block/lucernia_planks.png index 9d911b72..1d58c5a2 100644 Binary files a/src/main/resources/assets/betterend/textures/block/lucernia_planks.png and b/src/main/resources/assets/betterend/textures/block/lucernia_planks.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_stripped_log_side.png b/src/main/resources/assets/betterend/textures/block/lucernia_stripped_log_side.png new file mode 100644 index 00000000..b861bd9b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_stripped_log_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_stripped_log_top.png b/src/main/resources/assets/betterend/textures/block/lucernia_stripped_log_top.png new file mode 100644 index 00000000..22ef5578 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/lucernia_stripped_log_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/rutiscus_top.png b/src/main/resources/assets/betterend/textures/block/rutiscus_top.png deleted file mode 100644 index 916ab998..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/rutiscus_top.png and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/entity/chest/lucernia_chest.png b/src/main/resources/assets/betterend/textures/entity/chest/lucernia_chest.png new file mode 100644 index 00000000..008e73c4 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/chest/lucernia_chest.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/chest/lucernia_chest_left.png b/src/main/resources/assets/betterend/textures/entity/chest/lucernia_chest_left.png new file mode 100644 index 00000000..54b7154b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/chest/lucernia_chest_left.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/chest/lucernia_chest_right.png b/src/main/resources/assets/betterend/textures/entity/chest/lucernia_chest_right.png new file mode 100644 index 00000000..01d16c64 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/chest/lucernia_chest_right.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/sign/lucernia_sign.png b/src/main/resources/assets/betterend/textures/entity/sign/lucernia_sign.png new file mode 100644 index 00000000..e4003bd1 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/sign/lucernia_sign.png differ diff --git a/src/main/resources/assets/betterend/textures/item/lucernia_sign.png b/src/main/resources/assets/betterend/textures/item/lucernia_sign.png new file mode 100644 index 00000000..36c11d16 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/lucernia_sign.png differ