diff --git a/src/main/java/ru/betterend/blocks/BlockMurkweed.java b/src/main/java/ru/betterend/blocks/BlockMurkweed.java new file mode 100644 index 00000000..e4de7c34 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/BlockMurkweed.java @@ -0,0 +1,34 @@ +package ru.betterend.blocks; + +import java.util.Random; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.BlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import ru.betterend.blocks.basis.BlockPlant; + +public class BlockMurkweed extends BlockPlant { + @Override + @Environment(EnvType.CLIENT) + public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { + double x = pos.getX() + random.nextDouble(); + double y = pos.getY() + random.nextDouble() * 0.5 + 0.5; + double z = pos.getZ() + random.nextDouble(); + double v = random.nextDouble() * 0.1; + world.addParticle(ParticleTypes.ENTITY_EFFECT, x, y, z, v, v, v); + } + + @Override + public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) { + if (entity instanceof LivingEntity && !((LivingEntity) entity).hasStatusEffect(StatusEffects.BLINDNESS)) { + ((LivingEntity) entity).addStatusEffect(new StatusEffectInstance(StatusEffects.BLINDNESS, 100)); + } + } +} diff --git a/src/main/java/ru/betterend/blocks/BlockNeedlegrass.java b/src/main/java/ru/betterend/blocks/BlockNeedlegrass.java new file mode 100644 index 00000000..f5eeee98 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/BlockNeedlegrass.java @@ -0,0 +1,41 @@ +package ru.betterend.blocks; + +import java.util.List; + +import com.google.common.collect.Lists; + +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; +import net.minecraft.block.BlockState; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.loot.context.LootContext; +import net.minecraft.loot.context.LootContextParameters; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import ru.betterend.blocks.basis.BlockPlant; +import ru.betterend.util.MHelper; + +public class BlockNeedlegrass extends BlockPlant { + @Override + public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) { + if (entity instanceof LivingEntity) { + entity.damage(DamageSource.CACTUS, 0.1F); + } + } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + ItemStack tool = builder.get(LootContextParameters.TOOL); + if (tool != null && tool.getItem().isIn(FabricToolTags.SHEARS) || EnchantmentHelper.getLevel(Enchantments.SILK_TOUCH, tool) > 0) { + return Lists.newArrayList(new ItemStack(this)); + } + else { + return Lists.newArrayList(new ItemStack(Items.STICK, MHelper.randRange(0, 2, MHelper.RANDOM))); + } + } +} diff --git a/src/main/java/ru/betterend/recipe/CraftingRecipes.java b/src/main/java/ru/betterend/recipe/CraftingRecipes.java index 6c67d8fa..9bb903e7 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -92,6 +92,7 @@ public class CraftingRecipes { 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(); } public static void registerPedestal(String name, Block pedestal, Block slab, Block pillar) { diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 33dcb32f..c6c5b3bb 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -29,6 +29,8 @@ import ru.betterend.blocks.BlockMossyGlowshroomCap; import ru.betterend.blocks.BlockMossyGlowshroomHymenophore; import ru.betterend.blocks.BlockMossyGlowshroomSapling; import ru.betterend.blocks.BlockPath; +import ru.betterend.blocks.BlockMurkweed; +import ru.betterend.blocks.BlockNeedlegrass; import ru.betterend.blocks.BlockPythadendronSapling; import ru.betterend.blocks.BlockShadowGrass; import ru.betterend.blocks.BlockTerrain; @@ -126,6 +128,9 @@ public class EndBlocks { public static final Block CAVE_BUSH = registerBlock("cave_bush", new BlockSimpleLeaves(MaterialColor.MAGENTA)); + public static final Block MURKWEED = registerBlock("murkweed", new BlockMurkweed()); + public static final Block NEEDLEGRASS = registerBlock("needlegrass", new BlockNeedlegrass()); + // Vines // public static final Block DENSE_VINE = registerBlock("dense_vine", new BlockVine(15, true)); diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index be1c65c2..d665031b 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -37,7 +37,7 @@ public class EndFeatures { // Bushes // public static final EndFeature PYTHADENDRON_BUSH = new EndFeature("pythadendron_bush", new PythadendronBushFeature(), 4); - public static final EndFeature DRAGON_TREE_BUSH = new EndFeature("dragon_tree_bush", new DragonTreeBushFeature(), 12); + public static final EndFeature DRAGON_TREE_BUSH = new EndFeature("dragon_tree_bush", new DragonTreeBushFeature(), 15); // Plants // public static final EndFeature UMBRELLA_MOSS = new EndFeature("umbrella_moss", new DoublePlantFeature(EndBlocks.UMBRELLA_MOSS, EndBlocks.UMBRELLA_MOSS_TALL, 5), 5); @@ -46,7 +46,9 @@ public class EndFeatures { public static final EndFeature CHORUS_GRASS = new EndFeature("chorus_grass", new SinglePlantFeature(EndBlocks.CHORUS_GRASS, 4), 5); public static final EndFeature CAVE_GRASS = new EndFeature("cave_grass", new CavePlantFeature(EndBlocks.CAVE_GRASS, 7), 7); public static final EndFeature CRYSTAL_GRASS = new EndFeature("crystal_grass", new SinglePlantFeature(EndBlocks.CRYSTAL_GRASS, 8, false), 5); - public static final EndFeature SHADOW_PLANT = new EndFeature("shadow_plant", new SinglePlantFeature(EndBlocks.SHADOW_PLANT, 4), 7); + public static final EndFeature SHADOW_PLANT = new EndFeature("shadow_plant", new SinglePlantFeature(EndBlocks.SHADOW_PLANT, 6), 7); + public static final EndFeature MURKWEED = new EndFeature("murkweed", new SinglePlantFeature(EndBlocks.MURKWEED, 4), 2); + public static final EndFeature NEEDLEGRASS = new EndFeature("needlegrass", new SinglePlantFeature(EndBlocks.NEEDLEGRASS, 4), 2); public static final EndFeature DENSE_VINE = new EndFeature("dense_vine", new VineFeature(EndBlocks.DENSE_VINE, 24), 3); diff --git a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java index 91ac8ce5..a7dfa96f 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java @@ -21,6 +21,8 @@ public class BiomeShadowForest extends EndBiome { .addFeature(EndFeatures.DRAGON_TREE) .addFeature(EndFeatures.DRAGON_TREE_BUSH) .addFeature(EndFeatures.SHADOW_PLANT) + .addFeature(EndFeatures.MURKWEED) + .addFeature(EndFeatures.NEEDLEGRASS) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addMobSpawn(EntityType.ENDERMAN, 80, 1, 4) .addMobSpawn(EntityType.PHANTOM, 1, 1, 2)); diff --git a/src/main/resources/assets/betterend/blockstates/murkweed.json b/src/main/resources/assets/betterend/blockstates/murkweed.json new file mode 100644 index 00000000..40d3397e --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/murkweed.json @@ -0,0 +1,18 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/murkweed_01" }, + { "model": "betterend:block/murkweed_02" }, + { "model": "betterend:block/murkweed_03" }, + { "model": "betterend:block/murkweed_01", "y": 90 }, + { "model": "betterend:block/murkweed_02", "y": 90 }, + { "model": "betterend:block/murkweed_03", "y": 90 }, + { "model": "betterend:block/murkweed_01", "y": 180 }, + { "model": "betterend:block/murkweed_02", "y": 180 }, + { "model": "betterend:block/murkweed_03", "y": 180 }, + { "model": "betterend:block/murkweed_01", "y": 270 }, + { "model": "betterend:block/murkweed_02", "y": 270 }, + { "model": "betterend:block/murkweed_03", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/needlegrass.json b/src/main/resources/assets/betterend/blockstates/needlegrass.json new file mode 100644 index 00000000..d39ceabf --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/needlegrass.json @@ -0,0 +1,14 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/needlegrass_01" }, + { "model": "betterend:block/needlegrass_02" }, + { "model": "betterend:block/needlegrass_03" }, + { "model": "betterend:block/needlegrass_04" }, + { "model": "betterend:block/needlegrass_05" }, + { "model": "betterend:block/needlegrass_06" }, + { "model": "betterend:block/needlegrass_07" }, + { "model": "betterend:block/needlegrass_08" } + ] + } +} diff --git a/src/main/resources/assets/betterend/models/block/murkweed_01.json b/src/main/resources/assets/betterend/models/block/murkweed_01.json new file mode 100644 index 00000000..3855ff83 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/murkweed_01.json @@ -0,0 +1,257 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/murkweed", + "texture": "betterend:block/murkweed" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 2, 11, 2.5 ], + "to": [ 6, 15, 6.5 ], + "faces": { + "down": { "uv": [ 4, 12, 8, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 4, 12 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 15, 3.5 ], + "to": [ 5, 15.5, 5.5 ], + "faces": { + "north": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "south": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "west": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "east": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2.5, 15.5, 3 ], + "to": [ 5.5, 16, 6 ], + "faces": { + "down": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "up": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "north": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "south": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "west": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "east": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 2, 0, 2 ], + "to": [ 2.001, 11, 8 ], + "rotation": { "origin": [ 2, 0, 2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 6, 0, 2 ], + "to": [ 6.001, 11, 8 ], + "rotation": { "origin": [ 6, 0, 2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 10, 0, 1 ], + "to": [ 10.001, 8, 7 ], + "rotation": { "origin": [ 10, 0, 1 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 14, 0, 1 ], + "to": [ 14.001, 8, 7 ], + "rotation": { "origin": [ 14, 0, 1 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 6, 0, 7 ], + "to": [ 6.001, 9, 13 ], + "rotation": { "origin": [ 6, 0, 7 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 10, 0, 7 ], + "to": [ 10.001, 9, 13 ], + "rotation": { "origin": [ 10, 0, 7 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 0, 0, 10 ], + "to": [ 0.001, 5, 16 ], + "rotation": { "origin": [ 0, 0, 10 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 4, 0, 10 ], + "to": [ 4.001, 5, 16 ], + "rotation": { "origin": [ 4, 0, 10 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 11, 0, 11 ], + "to": [ 11.001, 7, 17 ], + "rotation": { "origin": [ 11, 0, 11 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 9, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 9, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 15, 0, 11 ], + "to": [ 15.001, 7, 17 ], + "rotation": { "origin": [ 15, 0, 11 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 9, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 9, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 6, 9, 7.5 ], + "to": [ 10, 13, 11.5 ], + "faces": { + "down": { "uv": [ 4, 12, 8, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 4, 12 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 7, 13, 8.5 ], + "to": [ 9, 13.5, 10.5 ], + "faces": { + "north": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "south": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "west": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "east": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 6.5, 13.5, 8 ], + "to": [ 9.5, 14, 11 ], + "faces": { + "down": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "up": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "north": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "south": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "west": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "east": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10.5, 8, 1.5 ], + "to": [ 13.5, 12, 4.5 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 7, 11 ], + "to": [ 15, 11, 15 ], + "faces": { + "down": { "uv": [ 4, 12, 8, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 4, 12 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 12, 11, 12 ], + "to": [ 14, 11.5, 14 ], + "faces": { + "north": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "south": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "west": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "east": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 11.5, 11.5, 11.5 ], + "to": [ 14.5, 12, 14.5 ], + "faces": { + "down": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "up": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "north": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "south": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "west": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "east": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 0.5, 5, 10.5 ], + "to": [ 3.5, 9, 13.5 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/murkweed_02.json b/src/main/resources/assets/betterend/models/block/murkweed_02.json new file mode 100644 index 00000000..b4e66e5a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/murkweed_02.json @@ -0,0 +1,174 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/murkweed", + "texture": "betterend:block/murkweed" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 6, 11, 6 ], + "to": [ 10, 15, 10 ], + "faces": { + "down": { "uv": [ 4, 12, 8, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 4, 12 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 7, 15, 7 ], + "to": [ 9, 15.5, 9 ], + "faces": { + "north": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "south": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "west": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" }, + "east": { "uv": [ 1, 7.5, 3, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 6.5, 15.5, 6.5 ], + "to": [ 9.5, 16, 9.5 ], + "faces": { + "down": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "up": { "uv": [ 0, 4, 3, 7 ], "texture": "#texture" }, + "north": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "south": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "west": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" }, + "east": { "uv": [ 0, 6.5, 3, 7 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 6, 0, 5.5 ], + "to": [ 6.001, 11, 11.5 ], + "rotation": { "origin": [ 6, 0, 5.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 10, 0, 5.5 ], + "to": [ 10.001, 11, 11.5 ], + "rotation": { "origin": [ 10, 0, 5.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 10, 0, 1 ], + "to": [ 10.001, 8, 7 ], + "rotation": { "origin": [ 10, 0, 1 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 14, 0, 1 ], + "to": [ 14.001, 8, 7 ], + "rotation": { "origin": [ 14, 0, 1 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 0.5, 0, 1.5 ], + "to": [ 0.501, 5, 7.5 ], + "rotation": { "origin": [ 0.5, 0, 1.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 4.5, 0, 1.5 ], + "to": [ 4.501, 5, 7.5 ], + "rotation": { "origin": [ 4.5, 0, 1.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10.5, 8, 1.5 ], + "to": [ 13.5, 12, 4.5 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 5, 2 ], + "to": [ 4, 9, 5 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 5.5, 5, 12 ], + "to": [ 8.5, 9, 15 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 9, 0, 11.5 ], + "to": [ 9.001, 5, 17.5 ], + "rotation": { "origin": [ 9, 0, 11.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 5, 0, 11.5 ], + "to": [ 5.001, 5, 17.5 ], + "rotation": { "origin": [ 5, 0, 11.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/murkweed_03.json b/src/main/resources/assets/betterend/models/block/murkweed_03.json new file mode 100644 index 00000000..a2209221 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/murkweed_03.json @@ -0,0 +1,181 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/murkweed", + "texture": "betterend:block/murkweed" + }, + "elements": [ + { + "__comment": "PlaneX4", + "from": [ 8.5, 0, 4.5 ], + "to": [ 8.501, 8, 10.5 ], + "rotation": { "origin": [ 8.5, 0, 4.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 12.5, 0, 4.5 ], + "to": [ 12.501, 8, 10.5 ], + "rotation": { "origin": [ 12.5, 0, 4.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 4, 16, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 1.5, 0, 2.5 ], + "to": [ 1.501, 5, 8.5 ], + "rotation": { "origin": [ 1.5, 0, 2.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 5.5, 0, 2.5 ], + "to": [ 5.501, 5, 8.5 ], + "rotation": { "origin": [ 5.5, 0, 2.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 8, 5 ], + "to": [ 12, 12, 8 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 5, 3 ], + "to": [ 5, 9, 6 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 5, 5, 11 ], + "to": [ 8, 9, 14 ], + "faces": { + "down": { "uv": [ 4, 12, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 0, 8, 3, 11 ], "texture": "#texture" }, + "north": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 12, 4, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 8.5, 0, 10.5 ], + "to": [ 8.501, 5, 16.5 ], + "rotation": { "origin": [ 8.5, 0, 10.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 4.5, 0, 10.5 ], + "to": [ 4.501, 5, 16.5 ], + "rotation": { "origin": [ 4.5, 0, 10.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" }, + "east": { "uv": [ 10, 8, 16, 13 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 15, 0, 10.5 ], + "to": [ 15.001, 5, 16.5 ], + "rotation": { "origin": [ 15, 0, 10.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 11, 0, 10.5 ], + "to": [ 11.001, 5, 16.5 ], + "rotation": { "origin": [ 11, 0, 10.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 0, 0, 8 ], + "to": [ 0.001, 5, 14 ], + "rotation": { "origin": [ 0, 0, 8 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 4, 0, 8 ], + "to": [ 4.001, 5, 14 ], + "rotation": { "origin": [ 4, 0, 8 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 7, 0, 0.5 ], + "to": [ 7.001, 5, 6.5 ], + "rotation": { "origin": [ 7, 0, 0.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX4", + "from": [ 11, 0, 0.5 ], + "to": [ 11.001, 5, 6.5 ], + "rotation": { "origin": [ 11, 0, 0.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" }, + "east": { "uv": [ 10, 0, 16, 5 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/needlegrass_01.json b/src/main/resources/assets/betterend/models/block/needlegrass_01.json new file mode 100644 index 00000000..cebe68e3 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/needlegrass_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/needlegrass_01" + } +} diff --git a/src/main/resources/assets/betterend/models/block/needlegrass_02.json b/src/main/resources/assets/betterend/models/block/needlegrass_02.json new file mode 100644 index 00000000..78d943f4 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/needlegrass_02.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/needlegrass_02" + } +} diff --git a/src/main/resources/assets/betterend/models/block/needlegrass_03.json b/src/main/resources/assets/betterend/models/block/needlegrass_03.json new file mode 100644 index 00000000..4cb0b29b --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/needlegrass_03.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/needlegrass_03" + } +} diff --git a/src/main/resources/assets/betterend/models/block/needlegrass_04.json b/src/main/resources/assets/betterend/models/block/needlegrass_04.json new file mode 100644 index 00000000..2153e053 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/needlegrass_04.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/needlegrass_04" + } +} diff --git a/src/main/resources/assets/betterend/models/block/needlegrass_05.json b/src/main/resources/assets/betterend/models/block/needlegrass_05.json new file mode 100644 index 00000000..159c4a9b --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/needlegrass_05.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/needlegrass_01" + } +} diff --git a/src/main/resources/assets/betterend/models/block/needlegrass_06.json b/src/main/resources/assets/betterend/models/block/needlegrass_06.json new file mode 100644 index 00000000..8078115e --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/needlegrass_06.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/needlegrass_02" + } +} diff --git a/src/main/resources/assets/betterend/models/block/needlegrass_07.json b/src/main/resources/assets/betterend/models/block/needlegrass_07.json new file mode 100644 index 00000000..e1b35233 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/needlegrass_07.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/needlegrass_03" + } +} diff --git a/src/main/resources/assets/betterend/models/block/needlegrass_08.json b/src/main/resources/assets/betterend/models/block/needlegrass_08.json new file mode 100644 index 00000000..077012fb --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/needlegrass_08.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/needlegrass_04" + } +} diff --git a/src/main/resources/assets/betterend/models/item/murkweed.json b/src/main/resources/assets/betterend/models/item/murkweed.json new file mode 100644 index 00000000..dcc908dd --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/murkweed.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/murkweed" + } +} diff --git a/src/main/resources/assets/betterend/models/item/needlegrass.json b/src/main/resources/assets/betterend/models/item/needlegrass.json new file mode 100644 index 00000000..2d492955 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/needlegrass.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/needlegrass_01" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/murkweed.png b/src/main/resources/assets/betterend/textures/block/murkweed.png new file mode 100644 index 00000000..977b6f48 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/murkweed.png differ diff --git a/src/main/resources/assets/betterend/textures/block/needlegrass_01.png b/src/main/resources/assets/betterend/textures/block/needlegrass_01.png new file mode 100644 index 00000000..ae5a02f8 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/needlegrass_01.png differ diff --git a/src/main/resources/assets/betterend/textures/block/needlegrass_02.png b/src/main/resources/assets/betterend/textures/block/needlegrass_02.png new file mode 100644 index 00000000..6b4e6e53 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/needlegrass_02.png differ diff --git a/src/main/resources/assets/betterend/textures/block/needlegrass_03.png b/src/main/resources/assets/betterend/textures/block/needlegrass_03.png new file mode 100644 index 00000000..cd81c635 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/needlegrass_03.png differ diff --git a/src/main/resources/assets/betterend/textures/block/needlegrass_04.png b/src/main/resources/assets/betterend/textures/block/needlegrass_04.png new file mode 100644 index 00000000..5e31a9fb Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/needlegrass_04.png differ diff --git a/src/main/resources/assets/betterend/textures/block/twisted_vine.png b/src/main/resources/assets/betterend/textures/block/twisted_vine.png new file mode 100644 index 00000000..6ddca5b6 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/twisted_vine.png differ diff --git a/src/main/resources/assets/betterend/textures/item/murkweed.png b/src/main/resources/assets/betterend/textures/item/murkweed.png new file mode 100644 index 00000000..f6354876 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/murkweed.png differ