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

Dragon bones block

Browse source
This commit is contained in:
paulevsGitch 2021-03-13 01:37:50 +03:00
parent e71caa23f1
commit 2a4b4f9c5a
25 changed files with 71 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/betterend/blocks/LargeAmaranitaBlock.java
View file

@ -41,7 +41,7 @@ public class LargeAmaranitaBlock extends EndPlantBlock {
@Override
protected boolean isTerrain(BlockState state) {
return state.isOf(EndBlocks.SANGNUM) || state.isOf(EndBlocks.MOSSY_OBSIDIAN) || state.isOf(EndBlocks.MOSSY_BONE);
return state.isOf(EndBlocks.SANGNUM) || state.isOf(EndBlocks.MOSSY_OBSIDIAN) || state.isOf(EndBlocks.MOSSY_DRAGON_BONE);
}
@Override

7
src/main/java/ru/betterend/blocks/MossyBoneBlock.java → src/main/java/ru/betterend/blocks/MossyDragonBoneBlock.java
View file

@ -19,9 +19,10 @@ import net.minecraft.util.math.Direction;
import net.minecraft.world.WorldView;
import net.minecraft.world.chunk.light.ChunkLightProvider;
import ru.betterend.blocks.basis.EndPillarBlock;
import ru.betterend.registry.EndBlocks;
public class MossyBoneBlock extends EndPillarBlock {
public MossyBoneBlock() {
public class MossyDragonBoneBlock extends EndPillarBlock {
public MossyDragonBoneBlock() {
super(FabricBlockSettings.copyOf(Blocks.BONE_BLOCK).hardness(0.5F).ticksRandomly());
}
@ -31,7 +32,7 @@ public class MossyBoneBlock extends EndPillarBlock {
if (tool != null && EnchantmentHelper.getLevel(Enchantments.SILK_TOUCH, tool) > 0) {
return Collections.singletonList(new ItemStack(this));
}
return Collections.singletonList(new ItemStack(Blocks.BONE_BLOCK));
return Collections.singletonList(new ItemStack(EndBlocks.DRAGON_BONE_BLOCK));
}
@Override

2
src/main/java/ru/betterend/blocks/SmallAmaranitaBlock.java
View file

@ -22,7 +22,7 @@ public class SmallAmaranitaBlock extends EndPlantBlock {
@Override
protected boolean isTerrain(BlockState state) {
return state.isOf(EndBlocks.SANGNUM) || state.isOf(EndBlocks.MOSSY_OBSIDIAN) || state.isOf(EndBlocks.MOSSY_BONE);
return state.isOf(EndBlocks.SANGNUM) || state.isOf(EndBlocks.MOSSY_OBSIDIAN) || state.isOf(EndBlocks.MOSSY_DRAGON_BONE);
}
@Override

6
src/main/java/ru/betterend/blocks/basis/EndPillarBlock.java
View file

@ -4,6 +4,8 @@ import java.io.Reader;
import java.util.Collections;
import java.util.List;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.PillarBlock;
import net.minecraft.item.ItemStack;
@ -18,6 +20,10 @@ public class EndPillarBlock extends PillarBlock implements BlockPatterned {
super(settings);
}
public EndPillarBlock(Block block) {
super(FabricBlockSettings.copyOf(block));
}
@Override
public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
return Collections.singletonList(new ItemStack(this));

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

@ -69,7 +69,7 @@ import ru.betterend.blocks.LumecornSeedBlock;
import ru.betterend.blocks.MengerSpongeBlock;
import ru.betterend.blocks.MengerSpongeWetBlock;
import ru.betterend.blocks.MissingTileBlock;
import ru.betterend.blocks.MossyBoneBlock;
import ru.betterend.blocks.MossyDragonBoneBlock;
import ru.betterend.blocks.MossyGlowshroomCapBlock;
import ru.betterend.blocks.MossyGlowshroomSaplingBlock;
import ru.betterend.blocks.MossyObsidian;
@ -103,7 +103,10 @@ import ru.betterend.blocks.basis.EndCropBlock;
import ru.betterend.blocks.basis.EndFurnaceBlock;
import ru.betterend.blocks.basis.EndLeavesBlock;
import ru.betterend.blocks.basis.EndOreBlock;
import ru.betterend.blocks.basis.EndPillarBlock;
import ru.betterend.blocks.basis.EndSignBlock;
import ru.betterend.blocks.basis.EndSlabBlock;
import ru.betterend.blocks.basis.EndStairsBlock;
import ru.betterend.blocks.basis.EndUnderwaterWallPlantBlock;
import ru.betterend.blocks.basis.EndWallPlantBlock;
import ru.betterend.blocks.basis.FurBlock;
@ -150,7 +153,10 @@ public class EndBlocks {
public static final Block RUTISCUS_PATH = registerBlock("rutiscus_path", new EndPathBlock(RUTISCUS));
public static final Block MOSSY_OBSIDIAN = registerBlock("mossy_obsidian", new MossyObsidian());
public static final Block MOSSY_BONE = registerBlock("mossy_bone", new MossyBoneBlock());
public static final Block DRAGON_BONE_BLOCK = registerBlock("dragon_bone_block", new EndPillarBlock(Blocks.BONE_BLOCK));
public static final Block DRAGON_BONE_STAIRS = registerBlock("dragon_bone_stairs", new EndStairsBlock(DRAGON_BONE_BLOCK));
public static final Block DRAGON_BONE_SLAB = registerBlock("dragon_bone_slab", new EndSlabBlock(DRAGON_BONE_BLOCK));
public static final Block MOSSY_DRAGON_BONE = registerBlock("mossy_dragon_bone", new MossyDragonBoneBlock());
// Rocks //
public static final StoneMaterial FLAVOLITE = new StoneMaterial("flavolite", MaterialColor.SAND);
@ -244,8 +250,8 @@ public class EndBlocks {
public static final Block SALTEAGO = registerBlock("salteago", new TerrainPlantBlock(END_MOSS));
public static final Block VAIOLUSH_FERN = registerBlock("vaiolush_fern", new TerrainPlantBlock(END_MOSS));
public static final Block FRACTURN = registerBlock("fracturn", new TerrainPlantBlock(END_MOSS));
public static final Block CLAWFERN = registerBlock("clawfern", new TerrainPlantBlock(SANGNUM, MOSSY_OBSIDIAN, MOSSY_BONE));
public static final Block GLOBULAGUS = registerBlock("globulagus", new TerrainPlantBlock(SANGNUM, MOSSY_OBSIDIAN, MOSSY_BONE));
public static final Block CLAWFERN = registerBlock("clawfern", new TerrainPlantBlock(SANGNUM, MOSSY_OBSIDIAN, MOSSY_DRAGON_BONE));
public static final Block GLOBULAGUS = registerBlock("globulagus", new TerrainPlantBlock(SANGNUM, MOSSY_OBSIDIAN, MOSSY_DRAGON_BONE));
public static final Block ORANGO = registerBlock("orango", new TerrainPlantBlock(RUTISCUS));
public static final Block AERIDIUM = registerBlock("aeridium", new TerrainPlantBlock(RUTISCUS));
public static final Block LUTEBUS = registerBlock("lutebus", new TerrainPlantBlock(RUTISCUS));

6
src/main/java/ru/betterend/util/BonemealUtil.java
View file

@ -52,9 +52,9 @@ public class BonemealUtil {
addBonemealGrass(EndBlocks.SANGNUM, EndBlocks.CLAWFERN);
addBonemealGrass(EndBlocks.SANGNUM, EndBlocks.SMALL_AMARANITA_MUSHROOM, 0.1F);
addBonemealGrass(EndBlocks.MOSSY_BONE, EndBlocks.GLOBULAGUS);
addBonemealGrass(EndBlocks.MOSSY_BONE, EndBlocks.CLAWFERN);
addBonemealGrass(EndBlocks.MOSSY_BONE, EndBlocks.SMALL_AMARANITA_MUSHROOM, 0.1F);
addBonemealGrass(EndBlocks.MOSSY_DRAGON_BONE, EndBlocks.GLOBULAGUS);
addBonemealGrass(EndBlocks.MOSSY_DRAGON_BONE, EndBlocks.CLAWFERN);
addBonemealGrass(EndBlocks.MOSSY_DRAGON_BONE, EndBlocks.SMALL_AMARANITA_MUSHROOM, 0.1F);
addBonemealGrass(EndBlocks.MOSSY_OBSIDIAN, EndBlocks.GLOBULAGUS);
addBonemealGrass(EndBlocks.MOSSY_OBSIDIAN, EndBlocks.CLAWFERN);

7
src/main/resources/assets/betterend/blockstates/mossy_bone.json
View file

@ -1,7 +0,0 @@
{
"variants": {
"axis=x": { "model": "betterend:block/mossy_bone_hor", "y": 90 },
"axis=y": { "model": "betterend:block/mossy_bone_ver" },
"axis=z": { "model": "betterend:block/mossy_bone_hor" }
}
}

7
src/main/resources/assets/betterend/blockstates/mossy_dragon_bone.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"axis=x": { "model": "betterend:block/mossy_dragon_bone_hor", "y": 90 },
"axis=y": { "model": "betterend:block/mossy_dragon_bone_ver" },
"axis=z": { "model": "betterend:block/mossy_dragon_bone_hor" }
}
}

7
src/main/resources/assets/betterend/lang/en_us.json
View file

@ -765,5 +765,10 @@
"biome.betterend.empty_end_cave": "Empty End Cave",
"biome.betterend.empty_smaragdant_cave": "Empty Smaragdant Cave",
"biome.betterend.lush_aurora_cave": "Lush Aurora Cave",
"biome.betterend.lush_smaragdant_cave": "Lush Smaragdant Cave"
"biome.betterend.lush_smaragdant_cave": "Lush Smaragdant Cave",
"block.betterend.dragon_bone_block": "Dragon Bone Block",
"block.betterend.dragon_bone_slab": "Dragon Bone Slab",
"block.betterend.dragon_bone_stairs": "Dragon Bone Stairs",
"block.betterend.mossy_dragon_bone": "Mossy Dragon Bone"
}

7
src/main/resources/assets/betterend/lang/ru_ru.json
View file

@ -785,5 +785,10 @@
"biome.betterend.empty_end_cave": "Пустая пещера Энда",
"biome.betterend.empty_smaragdant_cave": "Пустая смарагдантовая пещера",
"biome.betterend.lush_aurora_cave": "Пышная пещера авроры",
"biome.betterend.lush_smaragdant_cave": "Пышная смарагдантовая пещера"
"biome.betterend.lush_smaragdant_cave": "Пышная смарагдантовая пещера",
"block.betterend.dragon_bone_block": "Блок драконьих костей",
"block.betterend.dragon_bone_slab": "Плита из блока драконьих костей",
"block.betterend.dragon_bone_stairs": "Ступени из блока драконьих костей",
"block.betterend.mossy_dragon_bone": "Замшелые драконьи кости"
}

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

@ -1,12 +0,0 @@
{
"parent": "block/cube",
"textures": {
"down": "block/bone_block_side",
"east": "betterend:block/mossy_bone_side_ver",
"north": "betterend:block/mossy_bone_cut",
"particle": "betterend:block/mossy_bone_side_ver",
"south": "betterend:block/mossy_bone_cut",
"up": "betterend:block/sangnum_top",
"west": "betterend:block/mossy_bone_side_ver"
}
}

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

@ -1,12 +0,0 @@
{
"parent": "block/cube",
"textures": {
"down": "block/bone_block_top",
"east": "betterend:block/mossy_bone_side_ver",
"north": "betterend:block/mossy_bone_side_ver",
"particle": "betterend:block/mossy_bone_side_ver",
"south": "betterend:block/mossy_bone_side_ver",
"up": "betterend:block/sangnum_top",
"west": "betterend:block/mossy_bone_side_ver"
}
}

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

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"down": "betterend:block/dragon_bone_block_side",
"east": "betterend:block/mossy_dragon_bone_side_ver",
"north": "betterend:block/mossy_dragon_bone_cut",
"particle": "betterend:block/mossy_dragon_bone_side_ver",
"south": "betterend:block/mossy_dragon_bone_cut",
"up": "betterend:block/sangnum_top",
"west": "betterend:block/mossy_dragon_bone_side_ver"
}
}

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

@ -0,0 +1,12 @@
{
"parent": "block/cube",
"textures": {
"down": "betterend:block/dragon_bone_block_top",
"east": "betterend:block/mossy_dragon_bone_side_ver",
"north": "betterend:block/mossy_dragon_bone_side_ver",
"particle": "betterend:block/mossy_dragon_bone_side_ver",
"south": "betterend:block/mossy_dragon_bone_side_ver",
"up": "betterend:block/sangnum_top",
"west": "betterend:block/mossy_dragon_bone_side_ver"
}
}

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

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

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

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

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 238 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 266 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 277 B

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 268 B

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 251 B

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 251 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 269 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 552 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 292 B