diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 2347774a..7548fd3a 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -245,6 +245,7 @@ public class EndBlocks { public static final Block TWISTED_MOSS = registerBlock("twisted_moss", new BlockWallPlant()); public static final Block TUBE_WORM = registerBlock("tube_worm", new BlockUnderwaterWallPlant()); public static final Block BULB_MOSS = registerBlock("bulb_moss", new BlockWallPlant(12)); + public static final Block JUNGLE_FERN = registerBlock("jungle_fern", new BlockWallPlant()); // Crops // public static final Block SHADOW_BERRY = registerBlock("shadow_berry", new BlockShadowBerry()); diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index 35d64f26..8bf0f4ec 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -107,6 +107,7 @@ public class EndFeatures { public static final EndFeature BULB_MOSS_WOOD = new EndFeature("bulb_moss_wood", new WallPlantOnLogFeature(EndBlocks.BULB_MOSS, 6), 15); public static final EndFeature SMALL_JELLYSHROOM_WALL = new EndFeature("small_jellyshroom_wall", new WallPlantFeature(EndBlocks.SMALL_JELLYSHROOM, 4), 4); public static final EndFeature SMALL_JELLYSHROOM_WOOD = new EndFeature("small_jellyshroom_wood", new WallPlantOnLogFeature(EndBlocks.SMALL_JELLYSHROOM, 4), 8); + public static final EndFeature JUNGLE_FERN_WOOD = new EndFeature("jungle_fern_wood", new WallPlantOnLogFeature(EndBlocks.JUNGLE_FERN, 4), 8); // Water // public static final EndFeature BUBBLE_CORAL = new EndFeature("bubble_coral", new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, 6), 10); diff --git a/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java b/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java index 9506418f..f9153373 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java +++ b/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java @@ -18,6 +18,7 @@ public class BiomeUmbrellaJungle extends EndBiome { .addFeature(EndFeatures.JUNGLE_GRASS) .addFeature(EndFeatures.CYAN_MOSS) .addFeature(EndFeatures.CYAN_MOSS_WOOD) + .addFeature(EndFeatures.JUNGLE_FERN_WOOD) .addFeature(EndFeatures.SMALL_JELLYSHROOM_WALL) .addFeature(EndFeatures.SMALL_JELLYSHROOM_WOOD) .addFeature(EndFeatures.SMALL_JELLYSHROOM_CEIL) diff --git a/src/main/resources/assets/betterend/blockstates/jungle_fern.json b/src/main/resources/assets/betterend/blockstates/jungle_fern.json new file mode 100644 index 00000000..2abe9492 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/jungle_fern.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "betterend:block/jungle_fern", "y": 180 }, + "facing=south": { "model": "betterend:block/jungle_fern" }, + "facing=east": { "model": "betterend:block/jungle_fern", "y": 270 }, + "facing=west": { "model": "betterend:block/jungle_fern", "y": 90 } + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index e3165444..2547499b 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -522,5 +522,6 @@ "block.betterend.twisted_umbrella_moss_tall": "Twisted Umbrella Moss Tall", "block.betterend.umbrella_tree_cluster": "Umbrella Tree Cluster", "block.betterend.umbrella_tree_cluster_empty": "Empty Umbrella Tree Cluster", - "block.betterend.jungle_vine": "Jungle Vine" + "block.betterend.jungle_vine": "Jungle Vine", + "block.betterend.jungle_fern": "Jungle Fern" } diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 0b007db6..3dcb9835 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -524,5 +524,6 @@ "block.betterend.twisted_umbrella_moss_tall": "Высокий закрученный зонтичный мох", "block.betterend.umbrella_tree_cluster": "Кластер зонтичного дерева", "block.betterend.umbrella_tree_cluster_empty": "Пустой кластер хонтичного дерева", - "block.betterend.jungle_vine": "Лоза джунглей" + "block.betterend.jungle_vine": "Лоза джунглей", + "block.betterend.jungle_fern": "Папоротник джунглей" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/jungle_fern.json b/src/main/resources/assets/betterend/materialmaps/block/jungle_fern.json new file mode 100644 index 00000000..6c554732 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/jungle_fern.json @@ -0,0 +1,18 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/jungle_fern_leaf", + "material": "betterend:waving_wall" + }, + { + "sprite": "betterend:block/jungle_fern_middle", + "material": "betterend:waving_wall" + }, + { + "sprite": "betterend:block/jungle_fern_spore", + "material": "betterend:waving_small" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/jungle_fern.json b/src/main/resources/assets/betterend/models/block/jungle_fern.json new file mode 100644 index 00000000..5410c746 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/jungle_fern.json @@ -0,0 +1,129 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/jungle_fern_leaf", + "texture": "betterend:block/jungle_fern_leaf", + "spore": "betterend:block/jungle_fern_spore", + "texture1": "betterend:block/jungle_fern_middle" + }, + "elements": [ + { + "__comment": "PlaneY3", + "from": [ 0, 8, 0 ], + "to": [ 16, 8.001, 8 ], + "rotation": { "origin": [ 0, 8, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 16, 16, 0, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 8, 7.875, -7 ], + "to": [ 16, 7.876, 9 ], + "rotation": { "origin": [ 8, 7.875, -7 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "rotation": 90 } + } + }, + { + "__comment": "PlaneY6", + "from": [ 0, 7.874, -7 ], + "to": [ 8, 7.875, 9 ], + "rotation": { "origin": [ 8, 7.875, -7 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 16, 0, 8 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 16, 16, 8 ], "texture": "#texture", "rotation": 90 } + } + }, + { + "__comment": "PlaneY8", + "from": [ 0, 11, 7.375 ], + "to": [ 16, 11.001, 15.375 ], + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 8 ], "texture": "#texture" }, + "up": { "uv": [ 16, 8, 0, 0 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY9", + "from": [ 15.25, 10.875, -7 ], + "to": [ 23.25, 10.876, 9 ], + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 8 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 0, 16, 8 ], "texture": "#texture", "rotation": 90 } + } + }, + { + "__comment": "PlaneY9", + "from": [ -7.25, 10.875, -7 ], + "to": [ 0.75, 10.876, 9 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 8, 16, 0 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 8, 16, 0 ], "texture": "#texture", "rotation": 90 } + } + }, + { + "__comment": "PlaneX11", + "from": [ 8, -5, 0 ], + "to": [ 8.001, 11, 16 ], + "rotation": { "origin": [ 8, -5, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#spore" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX11", + "from": [ 8, -5, 0 ], + "to": [ 8.001, 11, 16 ], + "rotation": { "origin": [ 8, -5, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#spore" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneY9", + "from": [ 8.5, 8, -10 ], + "to": [ 24.5, 8.001, 6 ], + "rotation": { "origin": [ 24.5, 8, 6 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY9", + "from": [ -13.0001, 7.625, 1.5 ], + "to": [ 2.9999, 7.626, 17.5 ], + "rotation": { "origin": [ 3, 7.625, 17.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneZ12", + "from": [ 0, 8, 0.5 ], + "to": [ 16, 24, 0.501 ], + "rotation": { "origin": [ 0, 8, 0.5 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/jungle_fern_leaf.png b/src/main/resources/assets/betterend/textures/block/jungle_fern_leaf.png new file mode 100644 index 00000000..52a1e00a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/jungle_fern_leaf.png differ diff --git a/src/main/resources/assets/betterend/textures/block/jungle_fern_middle.png b/src/main/resources/assets/betterend/textures/block/jungle_fern_middle.png new file mode 100644 index 00000000..0731ac00 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/jungle_fern_middle.png differ diff --git a/src/main/resources/assets/betterend/textures/block/jungle_fern_spore.png b/src/main/resources/assets/betterend/textures/block/jungle_fern_spore.png new file mode 100644 index 00000000..114400bd Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/jungle_fern_spore.png differ