From 6de1d29ffcc861ae38719ebb7e9c21e869cbd60e Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 10 Dec 2020 21:36:13 +0300 Subject: [PATCH] Missing textures, shaders --- .../betterend/blocks/BlockGlowingPillarSeed.java | 14 ++++++++++++++ .../blocks/basis/BlockPlantWithAge.java | 6 +++++- .../blockstates/glowing_pillar_seed.json | 8 ++++++++ .../block/glowing_pillar_leaves.json | 3 +++ ...ophor.json => glowing_pillar_luminophor.json} | 0 .../materialmaps/block/glowing_pillar_seed.json | 3 +++ .../models/block/glowing_pillar_seed_0.json | 6 ++++++ .../models/block/glowing_pillar_seed_1.json | 6 ++++++ .../models/block/glowing_pillar_seed_2.json | 6 ++++++ .../models/block/glowing_pillar_seed_3.json | 6 ++++++ .../models/item/glowing_pillar_seed.json | 6 ++++++ .../textures/block/glowing_pillar_seed_0.png | Bin 0 -> 2142 bytes .../textures/block/glowing_pillar_seed_1.png | Bin 0 -> 2165 bytes .../textures/block/glowing_pillar_seed_2.png | Bin 0 -> 2283 bytes .../textures/block/glowing_pillar_seed_3.png | Bin 0 -> 2435 bytes .../textures/item/glowing_pillar_seed.png | Bin 0 -> 2268 bytes 16 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/betterend/blockstates/glowing_pillar_seed.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_leaves.json rename src/main/resources/assets/betterend/materialmaps/block/{helix_tree_luminophor.json => glowing_pillar_luminophor.json} (100%) create mode 100644 src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_seed.json create mode 100644 src/main/resources/assets/betterend/models/block/glowing_pillar_seed_0.json create mode 100644 src/main/resources/assets/betterend/models/block/glowing_pillar_seed_1.json create mode 100644 src/main/resources/assets/betterend/models/block/glowing_pillar_seed_2.json create mode 100644 src/main/resources/assets/betterend/models/block/glowing_pillar_seed_3.json create mode 100644 src/main/resources/assets/betterend/models/item/glowing_pillar_seed.json create mode 100644 src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_0.png create mode 100644 src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_1.png create mode 100644 src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_2.png create mode 100644 src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_3.png create mode 100644 src/main/resources/assets/betterend/textures/item/glowing_pillar_seed.png diff --git a/src/main/java/ru/betterend/blocks/BlockGlowingPillarSeed.java b/src/main/java/ru/betterend/blocks/BlockGlowingPillarSeed.java index 9efc0fd4..7bb20c66 100644 --- a/src/main/java/ru/betterend/blocks/BlockGlowingPillarSeed.java +++ b/src/main/java/ru/betterend/blocks/BlockGlowingPillarSeed.java @@ -2,7 +2,11 @@ package ru.betterend.blocks; import java.util.Random; +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.sound.BlockSoundGroup; import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos.Mutable; @@ -15,6 +19,16 @@ import ru.betterend.util.BlocksHelper; import ru.betterend.util.MHelper; public class BlockGlowingPillarSeed extends BlockPlantWithAge { + public BlockGlowingPillarSeed() { + super(FabricBlockSettings.of(Material.PLANT) + .luminance((state) -> { return state.get(AGE) * 3 + 3; }) + .breakByTool(FabricToolTags.SHEARS) + .sounds(BlockSoundGroup.GRASS) + .breakByHand(true) + .ticksRandomly() + .noCollision()); + } + @Override public void growAdult(StructureWorldAccess world, Random random, BlockPos pos) { int height = MHelper.randRange(1, 2, random); diff --git a/src/main/java/ru/betterend/blocks/basis/BlockPlantWithAge.java b/src/main/java/ru/betterend/blocks/basis/BlockPlantWithAge.java index 00a347f7..2d13df0d 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockPlantWithAge.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockPlantWithAge.java @@ -18,7 +18,7 @@ public abstract class BlockPlantWithAge extends BlockPlant { public static final IntProperty AGE = IntProperty.of("age", 0, 3); public BlockPlantWithAge() { - super(FabricBlockSettings.of(Material.PLANT) + this(FabricBlockSettings.of(Material.PLANT) .breakByTool(FabricToolTags.SHEARS) .sounds(BlockSoundGroup.GRASS) .breakByHand(true) @@ -26,6 +26,10 @@ public abstract class BlockPlantWithAge extends BlockPlant { .noCollision()); } + public BlockPlantWithAge(FabricBlockSettings settings) { + super(settings); + } + @Override protected void appendProperties(StateManager.Builder stateManager) { stateManager.add(AGE); diff --git a/src/main/resources/assets/betterend/blockstates/glowing_pillar_seed.json b/src/main/resources/assets/betterend/blockstates/glowing_pillar_seed.json new file mode 100644 index 00000000..e8f26ae9 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/glowing_pillar_seed.json @@ -0,0 +1,8 @@ +{ + "variants": { + "age=0": { "model": "betterend:block/glowing_pillar_seed_0" }, + "age=1": { "model": "betterend:block/glowing_pillar_seed_1" }, + "age=2": { "model": "betterend:block/glowing_pillar_seed_2" }, + "age=3": { "model": "betterend:block/glowing_pillar_seed_3" } + } +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_leaves.json b/src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_leaves.json new file mode 100644 index 00000000..f50cc590 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_leaves.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_wall_glow_all" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/helix_tree_luminophor.json b/src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_luminophor.json similarity index 100% rename from src/main/resources/assets/betterend/materialmaps/block/helix_tree_luminophor.json rename to src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_luminophor.json diff --git a/src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_seed.json b/src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_seed.json new file mode 100644 index 00000000..6ea7e2b4 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/glowing_pillar_seed.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_floor_glow_inc" +} diff --git a/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_0.json b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_0.json new file mode 100644 index 00000000..50c56fac --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_0.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/glowing_pillar_seed_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_1.json b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_1.json new file mode 100644 index 00000000..b4eff720 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/glowing_pillar_seed_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_2.json b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_2.json new file mode 100644 index 00000000..d433e150 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/glowing_pillar_seed_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_3.json b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_3.json new file mode 100644 index 00000000..336ffab0 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/glowing_pillar_seed_3.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/glowing_pillar_seed_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/glowing_pillar_seed.json b/src/main/resources/assets/betterend/models/item/glowing_pillar_seed.json new file mode 100644 index 00000000..08d1672b --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/glowing_pillar_seed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:item/glowing_pillar_seed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_0.png b/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_0.png new file mode 100644 index 0000000000000000000000000000000000000000..2caba256b83f0a80eff446e0305c862b7f407f4b GIT binary patch literal 2142 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_3.png b/src/main/resources/assets/betterend/textures/block/glowing_pillar_seed_3.png new file mode 100644 index 0000000000000000000000000000000000000000..208e8b419060b02a7d695b925e7403897baf1a05 GIT binary patch literal 2435 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 literal 0 HcmV?d00001