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

Bubble coral update

Browse source
This commit is contained in:
paulevsGitch 2020-10-08 19:43:54 +03:00
parent 67f0dac3be
commit 29d8a7e39b
10 changed files with 367 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/ru/betterend/blocks/BlockBubbleCoral.java Normal file
View file

@ -0,0 +1,24 @@
package ru.betterend.blocks;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
import net.minecraft.block.AbstractBlock;
import net.minecraft.block.Material;
import net.minecraft.sound.BlockSoundGroup;
import ru.betterend.blocks.basis.BlockUnderwaterPlant;
public class BlockBubbleCoral extends BlockUnderwaterPlant {
public BlockBubbleCoral() {
super(FabricBlockSettings.of(Material.UNDERWATER_PLANT)
.breakByTool(FabricToolTags.SHEARS)
.sounds(BlockSoundGroup.CORAL)
.breakByHand(true)
.lightLevel(12)
.noCollision());
}
@Override
public AbstractBlock.OffsetType getOffsetType() {
return AbstractBlock.OffsetType.NONE;
}
}

4
src/main/java/ru/betterend/blocks/basis/BlockUnderwaterPlant.java
View file

@ -58,6 +58,10 @@ public class BlockUnderwaterPlant extends BlockBaseNotFull implements IRenderTyp
.breakByHand(true) .breakByHand(true)
.noCollision()); .noCollision());
} }
public BlockUnderwaterPlant(Settings settings) {
super(settings);
}
@Override @Override
public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) { public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) {

4
src/main/java/ru/betterend/registry/BlockRegistry.java
View file

@ -11,6 +11,7 @@ import ru.betterend.blocks.AuroraCrystalBlock;
import ru.betterend.blocks.BlockBlueVine; import ru.betterend.blocks.BlockBlueVine;
import ru.betterend.blocks.BlockBlueVineLantern; import ru.betterend.blocks.BlockBlueVineLantern;
import ru.betterend.blocks.BlockBlueVineSeed; import ru.betterend.blocks.BlockBlueVineSeed;
import ru.betterend.blocks.BlockBubbleCoral;
import ru.betterend.blocks.BlockEndstoneDust; import ru.betterend.blocks.BlockEndstoneDust;
import ru.betterend.blocks.BlockGlowingMoss; import ru.betterend.blocks.BlockGlowingMoss;
import ru.betterend.blocks.BlockMossyGlowshroomCap; import ru.betterend.blocks.BlockMossyGlowshroomCap;
@ -26,7 +27,6 @@ import ru.betterend.blocks.EndStoneSmelter;
import ru.betterend.blocks.EnderBlock; import ru.betterend.blocks.EnderBlock;
import ru.betterend.blocks.TerminiteBlock; import ru.betterend.blocks.TerminiteBlock;
import ru.betterend.blocks.basis.BlockGlowingFur; import ru.betterend.blocks.basis.BlockGlowingFur;
import ru.betterend.blocks.basis.BlockUnderwaterPlant;
import ru.betterend.blocks.basis.BlockVine; import ru.betterend.blocks.basis.BlockVine;
import ru.betterend.blocks.complex.WoodenMaterial; import ru.betterend.blocks.complex.WoodenMaterial;
import ru.betterend.tab.CreativeTab; import ru.betterend.tab.CreativeTab;
@ -59,7 +59,7 @@ public class BlockRegistry {
public static final Block BLUE_VINE_LANTERN = registerBlock("blue_vine_lantern", new BlockBlueVineLantern()); public static final Block BLUE_VINE_LANTERN = registerBlock("blue_vine_lantern", new BlockBlueVineLantern());
public static final Block BLUE_VINE_FUR = registerBlock("blue_vine_fur", new BlockGlowingFur(BLUE_VINE_SEED, 3)); public static final Block BLUE_VINE_FUR = registerBlock("blue_vine_fur", new BlockGlowingFur(BLUE_VINE_SEED, 3));
public static final Block BUBBLE_CORAL = registerBlock("bubble_coral", new BlockUnderwaterPlant(12)); public static final Block BUBBLE_CORAL = registerBlock("bubble_coral", new BlockBubbleCoral());
// Vines // // Vines //
public static final Block DENSE_VINE = registerBlock("dense_vine", new BlockVine(15, true)); public static final Block DENSE_VINE = registerBlock("dense_vine", new BlockVine(15, true));

14
src/main/resources/assets/betterend/blockstates/bubble_coral.json
View file

@ -1,8 +1,18 @@
{ {
"variants": { "variants": {
"": [ "": [
{ "model": "betterend:block/bubble_coral" }, { "model": "betterend:block/bubble_coral_1" },
{ "model": "betterend:block/bubble_coral_2" } { "model": "betterend:block/bubble_coral_1", "y": 90 },
{ "model": "betterend:block/bubble_coral_1", "y": 180 },
{ "model": "betterend:block/bubble_coral_1", "y": 270 },
{ "model": "betterend:block/bubble_coral_2" },
{ "model": "betterend:block/bubble_coral_2", "y": 90 },
{ "model": "betterend:block/bubble_coral_2", "y": 180 },
{ "model": "betterend:block/bubble_coral_2", "y": 270 },
{ "model": "betterend:block/bubble_coral_3" },
{ "model": "betterend:block/bubble_coral_3", "y": 90 },
{ "model": "betterend:block/bubble_coral_3", "y": 180 },
{ "model": "betterend:block/bubble_coral_3", "y": 270 }
] ]
} }
} }

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

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

127
src/main/resources/assets/betterend/models/block/bubble_coral_1.json Normal file
View file

@ -0,0 +1,127 @@
{
"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
"parent": "block/block",
"textures": {
"particle": "betterend:block/bubble_coral",
"texture": "betterend:block/bubble_coral"
},
"elements": [
{
"__comment": "Box1",
"from": [ 4, 0, 2 ],
"to": [ 9, 10, 7 ],
"faces": {
"down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" },
"up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" },
"north": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" },
"south": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" },
"west": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" },
"east": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 10, 0, 5 ],
"to": [ 14, 7, 9 ],
"faces": {
"down": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" },
"up": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" },
"north": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" },
"south": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" },
"west": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" },
"east": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 4, 0, 8 ],
"to": [ 9, 8, 13 ],
"faces": {
"down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" },
"up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" },
"north": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" },
"south": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" },
"west": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" },
"east": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 0, 0, 5 ],
"to": [ 3, 5, 8 ],
"faces": {
"down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" },
"up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" },
"north": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" },
"south": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" },
"west": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" },
"east": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 0, 0, 12 ],
"to": [ 3, 5, 15 ],
"faces": {
"down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" },
"up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" },
"north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 12, 0, 10 ],
"to": [ 15, 5, 13 ],
"faces": {
"down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" },
"up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" },
"north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 12, 0, 1 ],
"to": [ 14, 4, 3 ],
"faces": {
"down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
"up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
"north": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" },
"south": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" },
"west": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" },
"east": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 1, 0, 1 ],
"to": [ 3, 4, 3 ],
"faces": {
"down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
"up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
"north": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" },
"south": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" },
"west": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" },
"east": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 9, 0, 14 ],
"to": [ 11, 4, 16 ],
"faces": {
"down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
"up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
"north": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" },
"south": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" },
"west": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" },
"east": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }
}
}
]
}

98
src/main/resources/assets/betterend/models/block/bubble_coral_2.json
View file

@ -1,6 +1,100 @@
{ {
"parent": "betterend:block/crop_block_inverted", "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
"textures": { "textures": {
"particle": "betterend:block/bubble_coral",
"texture": "betterend:block/bubble_coral" "texture": "betterend:block/bubble_coral"
} },
"elements": [
{
"__comment": "Box1",
"from": [ 2, 0, 1 ],
"to": [ 7, 10, 6 ],
"faces": {
"down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" },
"up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" },
"north": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" },
"south": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" },
"west": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" },
"east": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 10, 0, 2 ],
"to": [ 14, 7, 6 ],
"faces": {
"down": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" },
"up": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" },
"north": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" },
"south": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" },
"west": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" },
"east": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 6, 0, 8 ],
"to": [ 11, 8, 13 ],
"faces": {
"down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" },
"up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" },
"north": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" },
"south": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" },
"west": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" },
"east": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 2, 0, 8 ],
"to": [ 5, 5, 11 ],
"faces": {
"down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" },
"up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" },
"north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 12, 0, 12 ],
"to": [ 15, 5, 15 ],
"faces": {
"down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" },
"up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" },
"north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 13, 0, 8 ],
"to": [ 15, 4, 10 ],
"faces": {
"down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
"up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
"north": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" },
"south": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" },
"west": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" },
"east": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 3, 0, 13 ],
"to": [ 5, 4, 15 ],
"faces": {
"down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
"up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
"north": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" },
"south": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" },
"west": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" },
"east": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }
}
}
]
} }

100
src/main/resources/assets/betterend/models/block/bubble_coral_3.json Normal file
View file

@ -0,0 +1,100 @@
{
"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
"textures": {
"particle": "betterend:block/bubble_coral",
"texture": "betterend:block/bubble_coral"
},
"elements": [
{
"__comment": "Box1",
"from": [ 3, 0, 1 ],
"to": [ 8, 10, 6 ],
"faces": {
"down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" },
"up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" },
"north": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" },
"south": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" },
"west": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" },
"east": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 10, 0, 11 ],
"to": [ 14, 7, 15 ],
"faces": {
"down": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" },
"up": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" },
"north": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" },
"south": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" },
"west": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" },
"east": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 3, 0, 8 ],
"to": [ 8, 8, 13 ],
"faces": {
"down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" },
"up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" },
"north": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" },
"south": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" },
"west": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" },
"east": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 11, 0, 1 ],
"to": [ 14, 5, 4 ],
"faces": {
"down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" },
"up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" },
"north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" },
"east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 1, 0, 14 ],
"to": [ 3, 4, 16 ],
"faces": {
"down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
"up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
"north": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" },
"south": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" },
"west": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" },
"east": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 0, 0, 4 ],
"to": [ 2, 4, 6 ],
"faces": {
"down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
"up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
"north": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" },
"south": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" },
"west": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" },
"east": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }
}
},
{
"__comment": "Box1",
"from": [ 9, 0, 5 ],
"to": [ 14, 12, 10 ],
"faces": {
"down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" },
"up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" },
"north": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" },
"south": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" },
"west": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" },
"east": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" }
}
}
]
}

7
src/main/resources/assets/betterend/models/item/bubble_coral.json
View file

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

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before After
Before After