From 5bd4abebfbd4e660735781d957cb5ee0b86a57bf Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 10 Dec 2020 11:34:15 +0300 Subject: [PATCH] Amber moss & grass, helix sapling --- .../blocks/BlockHelixTreeLeaves.java | 28 ++++++++++++++++++ .../blocks/BlockHelixTreeSapling.java | 12 ++++++++ .../java/ru/betterend/registry/EndBlocks.java | 10 +++++-- .../ru/betterend/registry/EndFeatures.java | 1 + .../betterend/world/biome/BiomeAmberLand.java | 3 +- .../betterend/blockstates/amber_grass.json | 8 ++--- .../blockstates/amber_grass_path.json | 10 ------- .../betterend/blockstates/amber_moss.json | 10 +++++++ .../blockstates/amber_moss_path.json | 10 +++++++ .../betterend/blockstates/bushy_grass.json | 6 +++- .../betterend/models/block/amber_grass.json | 12 -------- .../models/block/amber_grass_01.json | 6 ++++ .../models/block/amber_grass_02.json | 6 ++++ .../models/block/amber_grass_03.json | 6 ++++ .../models/block/amber_grass_04.json | 6 ++++ .../models/block/amber_grass_path.json | 7 ----- .../betterend/models/block/amber_moss.json | 12 ++++++++ .../models/block/amber_moss_path.json | 7 +++++ .../models/block/bushy_grass_02.json | 4 +-- .../models/block/bushy_grass_03.json | 4 +-- .../models/block/bushy_grass_04.json | 4 +-- .../models/block/bushy_grass_05.json | 6 ++++ .../models/block/bushy_grass_06.json | 6 ++++ .../models/block/bushy_grass_07.json | 6 ++++ .../models/block/bushy_grass_08.json | 6 ++++ .../betterend/models/item/amber_grass.json | 5 +++- .../models/item/amber_grass_path.json | 3 -- .../betterend/models/item/amber_moss.json | 3 ++ .../models/item/amber_moss_path.json | 3 ++ .../betterend/textures/block/amber_grass.png | Bin 0 -> 384 bytes .../textures/block/amber_grass_side.png | Bin 514 -> 0 bytes .../textures/block/amber_grass_top.png | Bin 608 -> 0 bytes .../textures/block/amber_moss_side.png | Bin 0 -> 312 bytes .../textures/block/amber_moss_top.png | Bin 0 -> 277 bytes 34 files changed, 162 insertions(+), 48 deletions(-) create mode 100644 src/main/java/ru/betterend/blocks/BlockHelixTreeLeaves.java create mode 100644 src/main/java/ru/betterend/blocks/BlockHelixTreeSapling.java delete mode 100644 src/main/resources/assets/betterend/blockstates/amber_grass_path.json create mode 100644 src/main/resources/assets/betterend/blockstates/amber_moss.json create mode 100644 src/main/resources/assets/betterend/blockstates/amber_moss_path.json delete mode 100644 src/main/resources/assets/betterend/models/block/amber_grass.json create mode 100644 src/main/resources/assets/betterend/models/block/amber_grass_01.json create mode 100644 src/main/resources/assets/betterend/models/block/amber_grass_02.json create mode 100644 src/main/resources/assets/betterend/models/block/amber_grass_03.json create mode 100644 src/main/resources/assets/betterend/models/block/amber_grass_04.json delete mode 100644 src/main/resources/assets/betterend/models/block/amber_grass_path.json create mode 100644 src/main/resources/assets/betterend/models/block/amber_moss.json create mode 100644 src/main/resources/assets/betterend/models/block/amber_moss_path.json create mode 100644 src/main/resources/assets/betterend/models/block/bushy_grass_05.json create mode 100644 src/main/resources/assets/betterend/models/block/bushy_grass_06.json create mode 100644 src/main/resources/assets/betterend/models/block/bushy_grass_07.json create mode 100644 src/main/resources/assets/betterend/models/block/bushy_grass_08.json delete mode 100644 src/main/resources/assets/betterend/models/item/amber_grass_path.json create mode 100644 src/main/resources/assets/betterend/models/item/amber_moss.json create mode 100644 src/main/resources/assets/betterend/models/item/amber_moss_path.json create mode 100644 src/main/resources/assets/betterend/textures/block/amber_grass.png delete mode 100644 src/main/resources/assets/betterend/textures/block/amber_grass_side.png delete mode 100644 src/main/resources/assets/betterend/textures/block/amber_grass_top.png create mode 100644 src/main/resources/assets/betterend/textures/block/amber_moss_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/amber_moss_top.png diff --git a/src/main/java/ru/betterend/blocks/BlockHelixTreeLeaves.java b/src/main/java/ru/betterend/blocks/BlockHelixTreeLeaves.java new file mode 100644 index 00000000..ad39aa5a --- /dev/null +++ b/src/main/java/ru/betterend/blocks/BlockHelixTreeLeaves.java @@ -0,0 +1,28 @@ +package ru.betterend.blocks; + +import java.util.Collections; +import java.util.List; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockState; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext; +import net.minecraft.sound.BlockSoundGroup; +import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.registry.EndBlocks; + +public class BlockHelixTreeLeaves extends BlockBase { + public BlockHelixTreeLeaves() { + super(FabricBlockSettings.of(Material.LEAVES) + .strength(0.2F) + .sounds(BlockSoundGroup.GRASS) + .materialColor(MaterialColor.ORANGE)); + } + + @Override + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + return Collections.singletonList(new ItemStack(EndBlocks.HELIX_TREE_SAPLING)); + } +} diff --git a/src/main/java/ru/betterend/blocks/BlockHelixTreeSapling.java b/src/main/java/ru/betterend/blocks/BlockHelixTreeSapling.java new file mode 100644 index 00000000..754e7316 --- /dev/null +++ b/src/main/java/ru/betterend/blocks/BlockHelixTreeSapling.java @@ -0,0 +1,12 @@ +package ru.betterend.blocks; + +import net.minecraft.world.gen.feature.Feature; +import ru.betterend.blocks.basis.BlockFeatureSapling; +import ru.betterend.registry.EndFeatures; + +public class BlockHelixTreeSapling extends BlockFeatureSapling { + @Override + protected Feature getFeature() { + return EndFeatures.HELIX_TREE.getFeature(); + } +} diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index c8068758..0bff39e5 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -28,6 +28,8 @@ import ru.betterend.blocks.BlockEndLotusSeed; import ru.betterend.blocks.BlockEndLotusStem; import ru.betterend.blocks.BlockEndstoneDust; import ru.betterend.blocks.BlockGlowingMoss; +import ru.betterend.blocks.BlockHelixTreeLeaves; +import ru.betterend.blocks.BlockHelixTreeSapling; import ru.betterend.blocks.BlockHydralux; import ru.betterend.blocks.BlockHydraluxPetal; import ru.betterend.blocks.BlockHydraluxPetalColored; @@ -90,7 +92,7 @@ public class EndBlocks { public static final Block CRYSTAL_MOSS = registerBlock("crystal_moss", new BlockTerrain(MaterialColor.PINK)); public static final Block SHADOW_GRASS = registerBlock("shadow_grass", new BlockShadowGrass()); public static final Block PINK_MOSS = registerBlock("pink_moss", new BlockTerrain(MaterialColor.PINK)); - public static final Block AMBER_GRASS = registerBlock("amber_grass", new BlockTerrain(MaterialColor.ORANGE)); + public static final Block AMBER_MOSS = registerBlock("amber_moss", new BlockTerrain(MaterialColor.ORANGE)); // Roads // public static final Block END_MYCELIUM_PATH = registerBlock("end_mycelium_path", new BlockPath(END_MYCELIUM)); @@ -100,7 +102,7 @@ public class EndBlocks { public static final Block CRYSTAL_MOSS_PATH = registerBlock("crystal_moss_path", new BlockPath(CRYSTAL_MOSS)); public static final Block SHADOW_GRASS_PATH = registerBlock("shadow_grass_path", new BlockPath(SHADOW_GRASS)); public static final Block PINK_MOSS_PATH = registerBlock("pink_moss_path", new BlockPath(PINK_MOSS)); - public static final Block AMBER_GRASS_PATH = registerBlock("amber_grass_path", new BlockPath(AMBER_GRASS)); + public static final Block AMBER_MOSS_PATH = registerBlock("amber_moss_path", new BlockPath(AMBER_MOSS)); // Rocks // public static final StoneMaterial FLAVOLITE = new StoneMaterial("flavolite", MaterialColor.SAND); @@ -151,7 +153,8 @@ public class EndBlocks { public static final Block TENANEA_OUTER_LEAVES = registerBlock("tenanea_outer_leaves", new BlockFur(TENANEA_SAPLING, 32)); public static final WoodenMaterial TENANEA = new WoodenMaterial("tenanea", MaterialColor.BROWN, MaterialColor.PINK); - public static final Block HELIX_TREE_LEAVES = registerBlock("helix_tree_leaves", new BlockLeaves(TENANEA_SAPLING, MaterialColor.ORANGE)); + public static final Block HELIX_TREE_SAPLING = registerBlock("helix_tree_sapling", new BlockHelixTreeSapling()); + public static final Block HELIX_TREE_LEAVES = registerBlock("helix_tree_leaves", new BlockHelixTreeLeaves()); public static final WoodenMaterial HELIX_TREE = new WoodenMaterial("helix_tree", MaterialColor.GRAY, MaterialColor.ORANGE); // Small Plants // @@ -163,6 +166,7 @@ public class EndBlocks { public static final Block CRYSTAL_GRASS = registerBlock("crystal_grass", new BlockTerrainPlant(CRYSTAL_MOSS)); public static final Block SHADOW_PLANT = registerBlock("shadow_plant", new BlockTerrainPlant(SHADOW_GRASS)); public static final Block BUSHY_GRASS = registerBlock("bushy_grass", new BlockTerrainPlant(PINK_MOSS)); + public static final Block AMBER_GRASS = registerBlock("amber_grass", new BlockTerrainPlant(AMBER_MOSS)); public static final Block BLUE_VINE_SEED = registerBlock("blue_vine_seed", new BlockBlueVineSeed()); public static final Block BLUE_VINE = registerBlockNI("blue_vine", new BlockBlueVine()); diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index b67ce48a..e9630a76 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -69,6 +69,7 @@ public class EndFeatures { public static final EndFeature SHADOW_BERRY = new EndFeature("shadow_berry", new SinglePlantFeature(EndBlocks.SHADOW_BERRY, 2), 1); public static final EndFeature BUSHY_GRASS = new EndFeature("bushy_grass", new SinglePlantFeature(EndBlocks.BUSHY_GRASS, 8, false), 20); public static final EndFeature BUSHY_GRASS_WG = new EndFeature("bushy_grass_wg", new SinglePlantFeature(EndBlocks.BUSHY_GRASS, 5), 10); + public static final EndFeature AMBER_GRASS = new EndFeature("amber_grass", new SinglePlantFeature(EndBlocks.AMBER_GRASS, 6), 9); // Vines // 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/BiomeAmberLand.java b/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java index adeec9b4..df8238e9 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java +++ b/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java @@ -11,10 +11,11 @@ public class BiomeAmberLand extends EndBiome { .setFogColor(255, 184, 71) .setFogDensity(2.0F) .setPlantsColor(122, 45, 122) - .setSurface(EndBlocks.AMBER_GRASS) + .setSurface(EndBlocks.AMBER_MOSS) .addFeature(EndFeatures.AMBER_ORE) .addFeature(EndFeatures.END_LAKE_RARE) .addFeature(EndFeatures.HELIX_TREE) + .addFeature(EndFeatures.AMBER_GRASS) .addFeature(EndFeatures.CHARNIA_ORANGE) .addFeature(EndFeatures.CHARNIA_RED) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) diff --git a/src/main/resources/assets/betterend/blockstates/amber_grass.json b/src/main/resources/assets/betterend/blockstates/amber_grass.json index cba709e2..7e3bfe92 100644 --- a/src/main/resources/assets/betterend/blockstates/amber_grass.json +++ b/src/main/resources/assets/betterend/blockstates/amber_grass.json @@ -1,10 +1,10 @@ { "variants": { "": [ - { "model": "betterend:block/amber_grass" }, - { "model": "betterend:block/amber_grass", "y": 90 }, - { "model": "betterend:block/amber_grass", "y": 180 }, - { "model": "betterend:block/amber_grass", "y": 270 } + { "model": "betterend:block/amber_grass_01" }, + { "model": "betterend:block/amber_grass_02" }, + { "model": "betterend:block/amber_grass_03" }, + { "model": "betterend:block/amber_grass_04" } ] } } diff --git a/src/main/resources/assets/betterend/blockstates/amber_grass_path.json b/src/main/resources/assets/betterend/blockstates/amber_grass_path.json deleted file mode 100644 index eff86e57..00000000 --- a/src/main/resources/assets/betterend/blockstates/amber_grass_path.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "": [ - { "model": "betterend:block/amber_grass_path" }, - { "model": "betterend:block/amber_grass_path", "y": 90 }, - { "model": "betterend:block/amber_grass_path", "y": 180 }, - { "model": "betterend:block/amber_grass_path", "y": 270 } - ] - } -} diff --git a/src/main/resources/assets/betterend/blockstates/amber_moss.json b/src/main/resources/assets/betterend/blockstates/amber_moss.json new file mode 100644 index 00000000..7ac1176a --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/amber_moss.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/amber_moss" }, + { "model": "betterend:block/amber_moss", "y": 90 }, + { "model": "betterend:block/amber_moss", "y": 180 }, + { "model": "betterend:block/amber_moss", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/amber_moss_path.json b/src/main/resources/assets/betterend/blockstates/amber_moss_path.json new file mode 100644 index 00000000..05c91bc5 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/amber_moss_path.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/amber_moss_path" }, + { "model": "betterend:block/amber_moss_path", "y": 90 }, + { "model": "betterend:block/amber_moss_path", "y": 180 }, + { "model": "betterend:block/amber_moss_path", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/bushy_grass.json b/src/main/resources/assets/betterend/blockstates/bushy_grass.json index 5ec2c27e..8b3ef85e 100644 --- a/src/main/resources/assets/betterend/blockstates/bushy_grass.json +++ b/src/main/resources/assets/betterend/blockstates/bushy_grass.json @@ -4,7 +4,11 @@ { "model": "betterend:block/bushy_grass_01" }, { "model": "betterend:block/bushy_grass_02" }, { "model": "betterend:block/bushy_grass_03" }, - { "model": "betterend:block/bushy_grass_04" } + { "model": "betterend:block/bushy_grass_04" }, + { "model": "betterend:block/bushy_grass_05" }, + { "model": "betterend:block/bushy_grass_06" }, + { "model": "betterend:block/bushy_grass_07" }, + { "model": "betterend:block/bushy_grass_08" } ] } } diff --git a/src/main/resources/assets/betterend/models/block/amber_grass.json b/src/main/resources/assets/betterend/models/block/amber_grass.json deleted file mode 100644 index f07bc3e5..00000000 --- a/src/main/resources/assets/betterend/models/block/amber_grass.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "block/end_stone", - "east": "betterend:block/amber_grass_side", - "north": "betterend:block/amber_grass_side", - "particle": "betterend:block/amber_grass_side", - "south": "betterend:block/amber_grass_side", - "up": "betterend:block/amber_grass_top", - "west": "betterend:block/amber_grass_side" - } -} diff --git a/src/main/resources/assets/betterend/models/block/amber_grass_01.json b/src/main/resources/assets/betterend/models/block/amber_grass_01.json new file mode 100644 index 00000000..3ec63604 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_grass_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/amber_grass" + } +} diff --git a/src/main/resources/assets/betterend/models/block/amber_grass_02.json b/src/main/resources/assets/betterend/models/block/amber_grass_02.json new file mode 100644 index 00000000..88835ed6 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_grass_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/amber_grass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/amber_grass_03.json b/src/main/resources/assets/betterend/models/block/amber_grass_03.json new file mode 100644 index 00000000..a6812a51 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_grass_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/amber_grass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/amber_grass_04.json b/src/main/resources/assets/betterend/models/block/amber_grass_04.json new file mode 100644 index 00000000..81e6258f --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_grass_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/amber_grass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/amber_grass_path.json b/src/main/resources/assets/betterend/models/block/amber_grass_path.json deleted file mode 100644 index 9d18071c..00000000 --- a/src/main/resources/assets/betterend/models/block/amber_grass_path.json +++ /dev/null @@ -1,7 +0,0 @@ -{ "parent": "betterend:block/path", - "textures": { - "top": "betterend:block/amber_grass_path_top", - "side": "betterend:block/amber_grass_side", - "bottom": "block/end_stone" - } -} diff --git a/src/main/resources/assets/betterend/models/block/amber_moss.json b/src/main/resources/assets/betterend/models/block/amber_moss.json new file mode 100644 index 00000000..b1f69f5a --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_moss.json @@ -0,0 +1,12 @@ +{ + "parent": "block/cube", + "textures": { + "down": "block/end_stone", + "east": "betterend:block/amber_moss_side", + "north": "betterend:block/amber_moss_side", + "particle": "betterend:block/amber_moss_side", + "south": "betterend:block/amber_moss_side", + "up": "betterend:block/amber_moss_top", + "west": "betterend:block/amber_moss_side" + } +} diff --git a/src/main/resources/assets/betterend/models/block/amber_moss_path.json b/src/main/resources/assets/betterend/models/block/amber_moss_path.json new file mode 100644 index 00000000..386d0b10 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/amber_moss_path.json @@ -0,0 +1,7 @@ +{ "parent": "betterend:block/path", + "textures": { + "top": "betterend:block/amber_moss_path_top", + "side": "betterend:block/amber_moss_side", + "bottom": "block/end_stone" + } +} diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_02.json b/src/main/resources/assets/betterend/models/block/bushy_grass_02.json index c9030aa4..3e0eb1ac 100644 --- a/src/main/resources/assets/betterend/models/block/bushy_grass_02.json +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_02.json @@ -1,6 +1,6 @@ { - "parent": "betterend:block/crop_block", + "parent": "block/cross", "textures": { - "texture": "betterend:block/bushy_grass_2" + "cross": "betterend:block/bushy_grass_2" } } diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_03.json b/src/main/resources/assets/betterend/models/block/bushy_grass_03.json index 1fda0f2c..b5202b74 100644 --- a/src/main/resources/assets/betterend/models/block/bushy_grass_03.json +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_03.json @@ -1,6 +1,6 @@ { - "parent": "betterend:block/cross_inverted", + "parent": "betterend:block/crop_block", "textures": { - "cross": "betterend:block/bushy_grass_1" + "texture": "betterend:block/bushy_grass_1" } } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_04.json b/src/main/resources/assets/betterend/models/block/bushy_grass_04.json index be730e67..8583a174 100644 --- a/src/main/resources/assets/betterend/models/block/bushy_grass_04.json +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_04.json @@ -1,6 +1,6 @@ { - "parent": "betterend:block/crop_block_inverted", + "parent": "betterend:block/crop_block", "textures": { "texture": "betterend:block/bushy_grass_2" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_05.json b/src/main/resources/assets/betterend/models/block/bushy_grass_05.json new file mode 100644 index 00000000..1fda0f2c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_05.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/bushy_grass_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_06.json b/src/main/resources/assets/betterend/models/block/bushy_grass_06.json new file mode 100644 index 00000000..f4a39dcb --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_06.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/bushy_grass_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_07.json b/src/main/resources/assets/betterend/models/block/bushy_grass_07.json new file mode 100644 index 00000000..63411e9c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_07.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/bushy_grass_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_08.json b/src/main/resources/assets/betterend/models/block/bushy_grass_08.json new file mode 100644 index 00000000..e1dc50ef --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_08.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/bushy_grass_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/amber_grass.json b/src/main/resources/assets/betterend/models/item/amber_grass.json index a06dc96e..b7ea546b 100644 --- a/src/main/resources/assets/betterend/models/item/amber_grass.json +++ b/src/main/resources/assets/betterend/models/item/amber_grass.json @@ -1,3 +1,6 @@ { - "parent": "betterend:block/amber_grass" + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/amber_grass" + } } diff --git a/src/main/resources/assets/betterend/models/item/amber_grass_path.json b/src/main/resources/assets/betterend/models/item/amber_grass_path.json deleted file mode 100644 index 9e0ac1ac..00000000 --- a/src/main/resources/assets/betterend/models/item/amber_grass_path.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "betterend:block/amber_grass_path" -} diff --git a/src/main/resources/assets/betterend/models/item/amber_moss.json b/src/main/resources/assets/betterend/models/item/amber_moss.json new file mode 100644 index 00000000..66b13b8b --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/amber_moss.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/amber_moss" +} diff --git a/src/main/resources/assets/betterend/models/item/amber_moss_path.json b/src/main/resources/assets/betterend/models/item/amber_moss_path.json new file mode 100644 index 00000000..2d67d753 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/amber_moss_path.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/amber_moss_path" +} diff --git a/src/main/resources/assets/betterend/textures/block/amber_grass.png b/src/main/resources/assets/betterend/textures/block/amber_grass.png new file mode 100644 index 0000000000000000000000000000000000000000..ef285ab255ee4980e03750c00f909216b084220e GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4Wgbdjv*HQ$$$R;w`W#u;Pjfz`y&0oE+c0R zZqW|oYt;<%INQP7)&U(Yw| zCrF7iNHc6=Oc6femf~!8=P%1KbN>Bl9PjoqY-4GWl$3nf$YsW`gdkhqK z5qe+3F^4hLZo~9*K9icGnZUBrJT*UcILuktCg?UXZeTQ!c92S#bz^5;6L00GF8(v@ zj5%TlnFW^#F5zTzXqzHi!DuGKl2CL)uNi1JXXNM8+jRoOw02Za=6;tX&>+pQ`Q_p7 z`xERq{`@(1?!r?AMm~dxb*wwNBo%lzO!>=y>CZED?HT-wCh|6)jITY$nda;wDZ!9) XYsQXtrsa{qP-F0P^>bP0l+XkK9SDb1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/amber_grass_side.png b/src/main/resources/assets/betterend/textures/block/amber_grass_side.png deleted file mode 100644 index acb5e7223a570e0b7c79f655f22177a4d198617d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 514 zcmV+d0{#7oP)MJj@p5J4Mx?m$)-DXOv?WU|FER3x z3q)~2QJ9M*X~*}R@BHdH=lq`M`Fy|6^E={g+;ZYF-3^)_NAi@gQ}I{ez3xbfT@EQ{ zorhgn1hyIs%6V^eqe=vt(k}aQK;I1HDp$jxS8J0avsQ4y){IcQ@qV%t^|PMrrE1+y zOS(W3bY>iPn?US$WcnHmPow!CGuB^ki5wW&cEExw2t2T%H#BI3Ix>I#mC9xrX|#^C z#i$pH)jCx`GmY@nB!yjBuM;ZaE>GC3PsIvq3l^Ag(VM+im+Wga#7mlHp(+t5V%e_W zYcoEMTE6BBu;hweFYpK0ix1H>NKX&kalK}7)o%_or(+j^<-S)6(Wd6dQxsh+K=EVR ziaDz0e=KM)g03-d@zC5jP}<{UXq5G5V` z*(J>jNRGn^2%0hBElEpDb}2(k;KMCZm7ILbJID?H0O`l!=33a;ivR!s07*qoM6N<$ Ef|eoZo&W#< diff --git a/src/main/resources/assets/betterend/textures/block/amber_grass_top.png b/src/main/resources/assets/betterend/textures/block/amber_grass_top.png deleted file mode 100644 index ca10f863645860fefec92265b5937fa3d2c1d97c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 608 zcmV-m0-ybfP)%&F=U26P)F7tSnEJVTPDDnRniob2}W7ruhaj8TB zsQPBL(*Mg%K-FtPL_W^c1*+SZBy~7V`fk4kQ2bnh{1ShG-SLtPK+e8IsZ%*}Kov*R zWwu0#KWb5ZKVA3FT64ICAGd`Ajet0T0f>RdK+Fc}0ZJTBm-(~9vVov^Z14T2m%=oThu?zH3B+vS%4q|Fa&_s0ZoEh0@iapQ}%MHB2+)vh|A^5JL4pQ zZeakb{;|yXRgVTR1b`C1R+xNSYy=d1KTQ|N0O^5Q3sens8w14De{0P?&C!3}rGB?w z6{s2*AVBinM6J6Gss~bKAYO-QfEfUB?uVKB5H2uUHiLs0=vrWK1LFkZbx^PZ5zse4 z1Avymy#cfVs0U=v6m1{_VkgiZhW$y>+hQaj)`21$=5-(&i2klIg;)p*n0$q=3yna2 z07_gal7~2bFVJ3C1S4ArBnoAG<>#-UX`ue=zjxat8q2R<6q%IQORj0000iUf*|3=Wu8a(b)P-fef8Fqd(W0Uygv2aw=Lg( z?FA}_fGIcj>H=Au1s;*b3=DjSK$uZf!>a)(IMLI^F+}1r?}>xFO$HKd7uGMj=Y65r z&?mu)vA4P+E0Hnh(B5r{4BopMgeS~D5PQ?>{zu1Yu4h+Qu^%7Y( zy&_H#^JDxza}V^FFEh1v-f!*exIN-b@{JP$`_3KP_L=jvw$HSjhS$nJKic=kZ%c7& yn!j>>j*Q`QfAK>b7RAR3UwZSw$Ifl?8UDNfOa#pI(}BKbVDNPHb6Mw<&;$TN^mU>D literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/amber_moss_top.png b/src/main/resources/assets/betterend/textures/block/amber_moss_top.png new file mode 100644 index 0000000000000000000000000000000000000000..c32912a520ba60a6bc18f37c216f538b0195544f GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFiUf*@g_Fn%yYzTXF^g0sLQvY3H^?+^$xifVW@ z00r|rT^vIsF7x&r6l6B!I5O=C7egNt-y=4e%MKfUuh*=Geu8S2m kYdu-^b*{e$o6(N#Kji(J_-$(xTfpx1boFyt=akR{0Be3u{{R30 literal 0 HcmV?d00001