MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Amber moss & grass, helix sapling

Browse source
This commit is contained in:
paulevsGitch 2020-12-10 11:34:15 +03:00
parent f35146610b
commit 5bd4abebfb
34 changed files with 162 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/main/java/ru/betterend/blocks/BlockHelixTreeLeaves.java Normal file
View file

@ -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<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
return Collections.singletonList(new ItemStack(EndBlocks.HELIX_TREE_SAPLING));
}
}

12
src/main/java/ru/betterend/blocks/BlockHelixTreeSapling.java Normal file
View file

@ -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();
}
}

10
src/main/java/ru/betterend/registry/EndBlocks.java
View file

@ -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());

1
src/main/java/ru/betterend/registry/EndFeatures.java
View file

@ -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);

3
src/main/java/ru/betterend/world/biome/BiomeAmberLand.java
View file

@ -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)

8
src/main/resources/assets/betterend/blockstates/amber_grass.json
View file

@ -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" }
]
}
}

10
src/main/resources/assets/betterend/blockstates/amber_grass_path.json
View file

@ -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 }
]
}
}

10
src/main/resources/assets/betterend/blockstates/amber_moss.json Normal file
View file

@ -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 }
]
}
}

10
src/main/resources/assets/betterend/blockstates/amber_moss_path.json Normal file
View file

@ -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 }
]
}
}

6
src/main/resources/assets/betterend/blockstates/bushy_grass.json
View file

@ -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" }
]
}
}

12
src/main/resources/assets/betterend/models/block/amber_grass.json
View file

@ -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"
}
}

6
src/main/resources/assets/betterend/models/block/amber_grass_01.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "betterend:block/amber_grass"
}
}

6
src/main/resources/assets/betterend/models/block/amber_grass_02.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/crop_block",
"textures": {
"texture": "betterend:block/amber_grass"
}
}

6
src/main/resources/assets/betterend/models/block/amber_grass_03.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/cross_inverted",
"textures": {
"cross": "betterend:block/amber_grass"
}
}

6
src/main/resources/assets/betterend/models/block/amber_grass_04.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/crop_block_inverted",
"textures": {
"texture": "betterend:block/amber_grass"
}
}

7
src/main/resources/assets/betterend/models/block/amber_grass_path.json
View file

@ -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"
}
}

12
src/main/resources/assets/betterend/models/block/amber_moss.json Normal file
View file

@ -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"
}
}

7
src/main/resources/assets/betterend/models/block/amber_moss_path.json Normal file
View file

@ -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"
}
}

4
src/main/resources/assets/betterend/models/block/bushy_grass_02.json
View file

@ -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"
}
}

4
src/main/resources/assets/betterend/models/block/bushy_grass_03.json
View file

@ -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"
}
}

4
src/main/resources/assets/betterend/models/block/bushy_grass_04.json
View file

@ -1,6 +1,6 @@
{
"parent": "betterend:block/crop_block_inverted",
"parent": "betterend:block/crop_block",
"textures": {
"texture": "betterend:block/bushy_grass_2"
}
}
}

6
src/main/resources/assets/betterend/models/block/bushy_grass_05.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/cross_inverted",
"textures": {
"cross": "betterend:block/bushy_grass_1"
}
}

6
src/main/resources/assets/betterend/models/block/bushy_grass_06.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/cross_inverted",
"textures": {
"cross": "betterend:block/bushy_grass_2"
}
}

6
src/main/resources/assets/betterend/models/block/bushy_grass_07.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/crop_block_inverted",
"textures": {
"texture": "betterend:block/bushy_grass_1"
}
}

6
src/main/resources/assets/betterend/models/block/bushy_grass_08.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/crop_block_inverted",
"textures": {
"texture": "betterend:block/bushy_grass_2"
}
}

5
src/main/resources/assets/betterend/models/item/amber_grass.json
View file

@ -1,3 +1,6 @@
{
"parent": "betterend:block/amber_grass"
"parent": "item/generated",
"textures": {
"layer0": "betterend:block/amber_grass"
}
}

3
src/main/resources/assets/betterend/models/item/amber_grass_path.json
View file

@ -1,3 +0,0 @@
{
"parent": "betterend:block/amber_grass_path"
}

3
src/main/resources/assets/betterend/models/item/amber_moss.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "betterend:block/amber_moss"
}

3
src/main/resources/assets/betterend/models/item/amber_moss_path.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "betterend:block/amber_moss_path"
}

BIN
src/main/resources/assets/betterend/textures/block/amber_grass.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 384 B

BIN
src/main/resources/assets/betterend/textures/block/amber_grass_side.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 514 B

BIN
src/main/resources/assets/betterend/textures/block/amber_grass_top.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 608 B

BIN
src/main/resources/assets/betterend/textures/block/amber_moss_side.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 312 B

BIN
src/main/resources/assets/betterend/textures/block/amber_moss_top.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 277 B