diff --git a/src/main/java/ru/betterend/blocks/basis/BlockWallMushroom.java b/src/main/java/ru/betterend/blocks/basis/BlockWallMushroom.java index 0971f4d1..b88feaee 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockWallMushroom.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockWallMushroom.java @@ -1,8 +1,15 @@ package ru.betterend.blocks.basis; +import java.util.List; + +import com.google.common.collect.Lists; + import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; +import net.minecraft.block.BlockState; import net.minecraft.block.Material; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; import net.minecraft.sound.BlockSoundGroup; public class BlockWallMushroom extends BlockWallPlant { @@ -19,4 +26,9 @@ public class BlockWallMushroom extends BlockWallPlant { .blockVision((state, world, pos) -> { return false; }) .noCollision()); } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + return Lists.newArrayList(new ItemStack(this)); + } } diff --git a/src/main/java/ru/betterend/blocks/basis/BlockWallPlant.java b/src/main/java/ru/betterend/blocks/basis/BlockWallPlant.java index 390591f8..2d986dec 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockWallPlant.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockWallPlant.java @@ -113,11 +113,6 @@ public class BlockWallPlant extends BlockPlant { } } - @Override - public List getDroppedStacks(BlockState state, LootContext.Builder builder) { - return Lists.newArrayList(new ItemStack(this)); - } - @Override public BlockState rotate(BlockState state, BlockRotation rotation) { return BlocksHelper.rotateHorizontal(state, rotation, FACING); diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 31b7a8e6..f4409edb 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -52,6 +52,7 @@ import ru.betterend.blocks.basis.BlockOre; import ru.betterend.blocks.basis.BlockSimpleLeaves; import ru.betterend.blocks.basis.BlockVine; import ru.betterend.blocks.basis.BlockWallMushroom; +import ru.betterend.blocks.basis.BlockWallPlant; import ru.betterend.blocks.complex.StoneMaterial; import ru.betterend.blocks.complex.WoodenMaterial; import ru.betterend.tab.CreativeTab; @@ -135,6 +136,8 @@ public class EndBlocks { // Wall Plants // public static final Block PURPLE_POLYPORE = registerBlock("purple_polypore", new BlockWallMushroom(13)); + public static final Block TAIL_MOSS = registerBlock("tail_moss", new BlockWallPlant()); + public static final Block CYAN_MOSS = registerBlock("cyan_moss", new BlockWallPlant(13)); // 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 30de34b0..d6f34c27 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -59,6 +59,7 @@ public class EndFeatures { // Wall Plants // public static final EndFeature PURPLE_POLYPORE = new EndFeature("purple_polypore", new WallPlantOnLogFeature(EndBlocks.PURPLE_POLYPORE, 3), 5); public static final EndFeature PURPLE_POLYPORE_DENSE = new EndFeature("purple_polypore_dense", new WallPlantOnLogFeature(EndBlocks.PURPLE_POLYPORE, 5), 15); + //public static final EndFeature TAIL_MOSS = new EndFeature("tail_moss", new WallPlantOnLogFeature(EndBlocks.PURPLE_POLYPORE, 3), 5); // Water // public static final EndFeature BUBBLE_CORAL = new EndFeature("bubble_coral", new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, 10), 10); diff --git a/src/main/resources/assets/betterend/blockstates/cyan_moss.json b/src/main/resources/assets/betterend/blockstates/cyan_moss.json new file mode 100644 index 00000000..e4b59477 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/cyan_moss.json @@ -0,0 +1,24 @@ +{ + "variants": { + "facing=north": [ + { "model": "betterend:block/cyan_moss_01", "y": 180 }, + { "model": "betterend:block/cyan_moss_02", "y": 180 }, + { "model": "betterend:block/cyan_moss_03", "y": 180 } + ], + "facing=south": [ + { "model": "betterend:block/cyan_moss_01" }, + { "model": "betterend:block/cyan_moss_02" }, + { "model": "betterend:block/cyan_moss_03" } + ], + "facing=east": [ + { "model": "betterend:block/cyan_moss_01", "y": 270 }, + { "model": "betterend:block/cyan_moss_02", "y": 270 }, + { "model": "betterend:block/cyan_moss_03", "y": 270 } + ], + "facing=west": [ + { "model": "betterend:block/cyan_moss_01", "y": 90 }, + { "model": "betterend:block/cyan_moss_02", "y": 90 }, + { "model": "betterend:block/cyan_moss_03", "y": 90 } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/tail_moss.json b/src/main/resources/assets/betterend/blockstates/tail_moss.json new file mode 100644 index 00000000..aefb970b --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/tail_moss.json @@ -0,0 +1,24 @@ +{ + "variants": { + "facing=north": [ + { "model": "betterend:block/tail_moss_01", "y": 180 }, + { "model": "betterend:block/tail_moss_02", "y": 180 }, + { "model": "betterend:block/tail_moss_03", "y": 180 } + ], + "facing=south": [ + { "model": "betterend:block/tail_moss_01" }, + { "model": "betterend:block/tail_moss_02" }, + { "model": "betterend:block/tail_moss_03" } + ], + "facing=east": [ + { "model": "betterend:block/tail_moss_01", "y": 270 }, + { "model": "betterend:block/tail_moss_02", "y": 270 }, + { "model": "betterend:block/tail_moss_03", "y": 270 } + ], + "facing=west": [ + { "model": "betterend:block/tail_moss_01", "y": 90 }, + { "model": "betterend:block/tail_moss_02", "y": 90 }, + { "model": "betterend:block/tail_moss_03", "y": 90 } + ] + } +} diff --git a/src/main/resources/assets/betterend/models/block/cyan_moss_01.json b/src/main/resources/assets/betterend/models/block/cyan_moss_01.json new file mode 100644 index 00000000..12c236d5 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/cyan_moss_01.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/wall_moss_01", + "textures": { + "texture": "betterend:block/cyan_moss" + } +} diff --git a/src/main/resources/assets/betterend/models/block/cyan_moss_02.json b/src/main/resources/assets/betterend/models/block/cyan_moss_02.json new file mode 100644 index 00000000..b39428c6 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/cyan_moss_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/wall_moss_02", + "textures": { + "texture": "betterend:block/cyan_moss" + } +} diff --git a/src/main/resources/assets/betterend/models/block/cyan_moss_03.json b/src/main/resources/assets/betterend/models/block/cyan_moss_03.json new file mode 100644 index 00000000..6ec38431 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/cyan_moss_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/wall_moss_03", + "textures": { + "texture": "betterend:block/cyan_moss" + } +} diff --git a/src/main/resources/assets/betterend/models/block/tail_moss_01.json b/src/main/resources/assets/betterend/models/block/tail_moss_01.json new file mode 100644 index 00000000..4d952370 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tail_moss_01.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/wall_moss_01", + "textures": { + "texture": "betterend:block/tail_moss" + } +} diff --git a/src/main/resources/assets/betterend/models/block/tail_moss_02.json b/src/main/resources/assets/betterend/models/block/tail_moss_02.json new file mode 100644 index 00000000..757f5c9e --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tail_moss_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/wall_moss_02", + "textures": { + "texture": "betterend:block/tail_moss" + } +} diff --git a/src/main/resources/assets/betterend/models/block/tail_moss_03.json b/src/main/resources/assets/betterend/models/block/tail_moss_03.json new file mode 100644 index 00000000..0fe35216 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tail_moss_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/wall_moss_03", + "textures": { + "texture": "betterend:block/tail_moss" + } +} diff --git a/src/main/resources/assets/betterend/models/block/wall_moss_01.json b/src/main/resources/assets/betterend/models/block/wall_moss_01.json new file mode 100644 index 00000000..7e918bb7 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/wall_moss_01.json @@ -0,0 +1,96 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 3, 15, 0 ], + "to": [ 19, 15.001, 16 ], + "rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, 11, 0 ], + "to": [ 17, 11.001, 16 ], + "rotation": { "origin": [ 1, 11, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, -10, 0 ], + "to": [ 17, 6, 0.001 ], + "rotation": { "origin": [ 1, 6, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -3, 13.5, 0 ], + "to": [ 13, 13.501, 16 ], + "rotation": { "origin": [ -3, 13.5, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, 1, 0 ], + "to": [ 17, 1.001, 16 ], + "rotation": { "origin": [ 1, 1, 0 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -1, -9, 0 ], + "to": [ 15, 7, 0.001 ], + "rotation": { "origin": [ -1, 7, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -1.5, 16, 0 ], + "to": [ 14.5, 16.001, 16 ], + "rotation": { "origin": [ -1.5, 16, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -2, 0.5, 0 ], + "to": [ 14, 0.501, 16 ], + "rotation": { "origin": [ -2, 0.5, 0 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/wall_moss_02.json b/src/main/resources/assets/betterend/models/block/wall_moss_02.json new file mode 100644 index 00000000..fbc6976f --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/wall_moss_02.json @@ -0,0 +1,63 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 3, 15, 0 ], + "to": [ 19, 15.001, 16 ], + "rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -15, 0 ], + "to": [ 16, 1, 0.001 ], + "rotation": { "origin": [ 0, 1, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -2, -12, 0 ], + "to": [ 14, 4, 0.001 ], + "rotation": { "origin": [ -2, 4, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -9, 0 ], + "to": [ 16, 7, 0.001 ], + "rotation": { "origin": [ 0, 7, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -3, 0 ], + "to": [ 16, 13, 0.001 ], + "rotation": { "origin": [ 0, 13, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/wall_moss_03.json b/src/main/resources/assets/betterend/models/block/wall_moss_03.json new file mode 100644 index 00000000..bf779746 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/wall_moss_03.json @@ -0,0 +1,63 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ -1, 0, 0 ], + "to": [ 15, 16, 0.001 ], + "rotation": { "origin": [ -1, 16, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 2, -3, 0 ], + "to": [ 18, 13, 0.001 ], + "rotation": { "origin": [ 2, 13, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -8, 0 ], + "to": [ 16, 8, 0.001 ], + "rotation": { "origin": [ 0, 8, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -3, -12, 0 ], + "to": [ 13, 4, 0.001 ], + "rotation": { "origin": [ -3, 4, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 3, -15, 0 ], + "to": [ 19, 1, 0.001 ], + "rotation": { "origin": [ 3, 1, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/cyan_moss.png b/src/main/resources/assets/betterend/textures/block/cyan_moss.png new file mode 100644 index 00000000..08fd70ea Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/cyan_moss.png differ diff --git a/src/main/resources/assets/betterend/textures/block/tail_moss.png b/src/main/resources/assets/betterend/textures/block/tail_moss.png new file mode 100644 index 00000000..2cef32ba Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/tail_moss.png differ