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

Fixes, sponge model

Browse source
This commit is contained in:
paulevsGitch 2020-12-06 14:48:50 +03:00
parent 570fcd9194
commit 86a2459b0f
17 changed files with 135 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/ru/betterend/blocks/BlockMengerSponge.java
View file

@ -19,14 +19,14 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldAccess;
import ru.betterend.blocks.basis.BlockBase; import ru.betterend.blocks.basis.BlockBaseNotFull;
import ru.betterend.client.render.ERenderLayer; import ru.betterend.client.render.ERenderLayer;
import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.interfaces.IRenderTypeable;
import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndBlocks;
public class BlockMengerSponge extends BlockBase implements IRenderTypeable { public class BlockMengerSponge extends BlockBaseNotFull implements IRenderTypeable {
public BlockMengerSponge() { public BlockMengerSponge() {
super(FabricBlockSettings.copyOf(Blocks.SPONGE)); super(FabricBlockSettings.copyOf(Blocks.SPONGE).nonOpaque());
} }
@Override @Override

13
src/main/java/ru/betterend/blocks/BlockMengerSpongeWet.java
View file

@ -8,20 +8,22 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.fluid.FluidState;
import net.minecraft.fluid.Fluids;
import net.minecraft.particle.ParticleTypes; import net.minecraft.particle.ParticleTypes;
import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundCategory;
import net.minecraft.sound.SoundEvents; import net.minecraft.sound.SoundEvents;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.minecraft.world.World; import net.minecraft.world.World;
import ru.betterend.blocks.basis.BlockBase; import ru.betterend.blocks.basis.BlockBaseNotFull;
import ru.betterend.client.render.ERenderLayer; import ru.betterend.client.render.ERenderLayer;
import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.interfaces.IRenderTypeable;
import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndBlocks;
public class BlockMengerSpongeWet extends BlockBase implements IRenderTypeable { public class BlockMengerSpongeWet extends BlockBaseNotFull implements IRenderTypeable {
public BlockMengerSpongeWet() { public BlockMengerSpongeWet() {
super(FabricBlockSettings.copyOf(Blocks.WET_SPONGE)); super(FabricBlockSettings.copyOf(Blocks.WET_SPONGE).nonOpaque());
} }
@Override @Override
@ -80,4 +82,9 @@ public class BlockMengerSpongeWet extends BlockBase implements IRenderTypeable {
public ERenderLayer getRenderLayer() { public ERenderLayer getRenderLayer() {
return ERenderLayer.CUTOUT; return ERenderLayer.CUTOUT;
} }
@Override
public FluidState getFluidState(BlockState state) {
return Fluids.WATER.getStill(false);
}
} }

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

@ -415,5 +415,11 @@
"block.betterend.menger_sponge": "Menger Sponge", "block.betterend.menger_sponge": "Menger Sponge",
"block.betterend.menger_sponge_wet": "Wet Menger Sponge", "block.betterend.menger_sponge_wet": "Wet Menger Sponge",
"block.betterend.tube_worm": "Tube Worm" "block.betterend.tube_worm": "Tube Worm",
"block.betterend.charnia_cyan": "Cyan Charnia",
"block.betterend.charnia_light_blue": "Light Blue Charnia",
"block.betterend.charnia_orange": "Orange Charnia",
"block.betterend.charnia_purple": "Purple Charnia",
"block.betterend.charnia_red": "Red Charnia"
} }

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

@ -417,5 +417,11 @@
"block.betterend.menger_sponge": "Губка Менгера", "block.betterend.menger_sponge": "Губка Менгера",
"block.betterend.menger_sponge_wet": "Мокрая губка Менгера", "block.betterend.menger_sponge_wet": "Мокрая губка Менгера",
"block.betterend.tube_worm": "Трубчатый червь" "block.betterend.tube_worm": "Трубчатый червь",
"block.betterend.charnia_cyan": "Циановая чарния",
"block.betterend.charnia_light_blue": "Голубая чарния",
"block.betterend.charnia_orange": "Оранжевая чарния",
"block.betterend.charnia_purple": "Пурпурная чарния",
"block.betterend.charnia_red": "Красная чарния"
} }

156
src/main/resources/assets/betterend/models/block/menger_sponge.json
View file

@ -9,141 +9,141 @@
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 0, 0, 0 ], "from": [ 0, 0, 0 ],
"to": [ 5, 5, 16 ], "to": [ 6, 6, 16 ],
"faces": { "faces": {
"down": { "uv": [ 0, 0, 5, 16 ], "texture": "#texture", "cullface": "down" }, "down": { "uv": [ 0, 0, 6, 16 ], "texture": "#texture", "cullface": "down" },
"up": { "uv": [ 0, 0, 5, 16 ], "texture": "#texture" }, "up": { "uv": [ 0, 0, 6, 16 ], "texture": "#texture" },
"north": { "uv": [ 11, 11, 16, 16 ], "texture": "#texture", "cullface": "north" }, "north": { "uv": [ 10, 10, 16, 16 ], "texture": "#texture", "cullface": "north" },
"south": { "uv": [ 0, 11, 5, 16 ], "texture": "#texture", "cullface": "south" }, "south": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture", "cullface": "south" },
"west": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture", "cullface": "west" }, "west": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "west" },
"east": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture" } "east": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture" }
} }
}, },
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 11, 0, 0 ], "from": [ 10, 0, 0 ],
"to": [ 16, 5, 16 ], "to": [ 16, 6, 16 ],
"faces": { "faces": {
"down": { "uv": [ 11, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, "down": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture", "cullface": "down" },
"up": { "uv": [ 11, 0, 16, 16 ], "texture": "#texture" }, "up": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" },
"north": { "uv": [ 0, 11, 5, 16 ], "texture": "#texture", "cullface": "north" }, "north": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture", "cullface": "north" },
"south": { "uv": [ 11, 11, 16, 16 ], "texture": "#texture", "cullface": "south" }, "south": { "uv": [ 10, 10, 16, 16 ], "texture": "#texture", "cullface": "south" },
"west": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture" }, "west": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture" },
"east": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture", "cullface": "east" } "east": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "east" }
} }
}, },
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 5, 0, 0 ], "from": [ 6, 0, 0 ],
"to": [ 11, 5, 5 ], "to": [ 10, 6, 6 ],
"faces": { "faces": {
"down": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture", "cullface": "down" }, "down": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture", "cullface": "down" },
"up": { "uv": [ 5, 0, 11, 5 ], "texture": "#texture" }, "up": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture" },
"north": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture", "cullface": "north" }, "north": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture", "cullface": "north" },
"south": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture" } "south": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture" }
} }
}, },
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 5, 0, 11 ], "from": [ 6, 0, 10 ],
"to": [ 11, 5, 16 ], "to": [ 10, 6, 16 ],
"faces": { "faces": {
"down": { "uv": [ 5, 0, 11, 5 ], "texture": "#texture", "cullface": "down" }, "down": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture", "cullface": "down" },
"up": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture" }, "up": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture" },
"north": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture" }, "north": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture" },
"south": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture", "cullface": "south" } "south": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture", "cullface": "south" }
} }
}, },
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 5, 11, 11 ], "from": [ 6, 10, 10 ],
"to": [ 11, 16, 16 ], "to": [ 10, 16, 16 ],
"faces": { "faces": {
"down": { "uv": [ 5, 0, 11, 5 ], "texture": "#texture" }, "down": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture" },
"up": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture", "cullface": "up" }, "up": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture", "cullface": "up" },
"north": { "uv": [ 5, 0, 11, 5 ], "texture": "#texture" }, "north": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture" },
"south": { "uv": [ 5, 0, 11, 5 ], "texture": "#texture", "cullface": "south" } "south": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture", "cullface": "south" }
} }
}, },
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 0, 11, 0 ], "from": [ 0, 10, 0 ],
"to": [ 5, 16, 16 ], "to": [ 6, 16, 16 ],
"faces": { "faces": {
"down": { "uv": [ 0, 0, 5, 16 ], "texture": "#texture" }, "down": { "uv": [ 0, 0, 6, 16 ], "texture": "#texture" },
"up": { "uv": [ 0, 0, 5, 16 ], "texture": "#texture", "cullface": "up" }, "up": { "uv": [ 0, 0, 6, 16 ], "texture": "#texture", "cullface": "up" },
"north": { "uv": [ 11, 11, 16, 16 ], "texture": "#texture", "cullface": "north" }, "north": { "uv": [ 10, 0, 16, 6 ], "texture": "#texture", "cullface": "north" },
"south": { "uv": [ 0, 11, 5, 16 ], "texture": "#texture", "cullface": "south" }, "south": { "uv": [ 0, 0, 6, 6 ], "texture": "#texture", "cullface": "south" },
"west": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture", "cullface": "west" }, "west": { "uv": [ 0, 0, 16, 6 ], "texture": "#texture", "cullface": "west" },
"east": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture" } "east": { "uv": [ 0, 0, 16, 6 ], "texture": "#texture" }
} }
}, },
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 11, 11, 0 ], "from": [ 10, 10, 0 ],
"to": [ 16, 16, 16 ], "to": [ 16, 16, 16 ],
"faces": { "faces": {
"down": { "uv": [ 11, 0, 16, 16 ], "texture": "#texture" }, "down": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" },
"up": { "uv": [ 11, 0, 16, 16 ], "texture": "#texture", "cullface": "up" }, "up": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture", "cullface": "up" },
"north": { "uv": [ 0, 11, 5, 16 ], "texture": "#texture", "cullface": "north" }, "north": { "uv": [ 0, 0, 6, 6 ], "texture": "#texture", "cullface": "north" },
"south": { "uv": [ 11, 11, 16, 16 ], "texture": "#texture", "cullface": "south" }, "south": { "uv": [ 10, 0, 16, 6 ], "texture": "#texture", "cullface": "south" },
"west": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture" }, "west": { "uv": [ 0, 0, 16, 6 ], "texture": "#texture" },
"east": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture", "cullface": "east" } "east": { "uv": [ 0, 0, 16, 6 ], "texture": "#texture", "cullface": "east" }
} }
}, },
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 5, 11, 0 ], "from": [ 6, 10, 0 ],
"to": [ 11, 16, 5 ], "to": [ 10, 16, 6 ],
"faces": { "faces": {
"down": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture" }, "down": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture" },
"up": { "uv": [ 5, 0, 11, 5 ], "texture": "#texture", "cullface": "up" }, "up": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture", "cullface": "up" },
"north": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture", "cullface": "north" }, "north": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture", "cullface": "north" },
"south": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture" } "south": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture" }
} }
}, },
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 0, 5, 0 ], "from": [ 0, 6, 0 ],
"to": [ 5, 11, 5 ], "to": [ 6, 10, 6 ],
"faces": { "faces": {
"north": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture", "cullface": "north" }, "north": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture", "cullface": "north" },
"south": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture" }, "south": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture" },
"west": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture", "cullface": "west" }, "west": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture", "cullface": "west" },
"east": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture" } "east": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture" }
} }
}, },
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 11, 5, 0 ], "from": [ 10, 6, 0 ],
"to": [ 16, 11, 5 ], "to": [ 16, 10, 6 ],
"faces": { "faces": {
"north": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture", "cullface": "north" }, "north": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture", "cullface": "north" },
"south": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture" }, "south": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture" },
"west": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture" }, "west": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture" },
"east": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture", "cullface": "east" } "east": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture", "cullface": "east" }
} }
}, },
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 11, 5, 11 ], "from": [ 10, 6, 10 ],
"to": [ 16, 11, 16 ], "to": [ 16, 10, 16 ],
"faces": { "faces": {
"north": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture" }, "north": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture" },
"south": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture", "cullface": "south" }, "south": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture", "cullface": "south" },
"west": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture" }, "west": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture" },
"east": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture", "cullface": "east" } "east": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture", "cullface": "east" }
} }
}, },
{ {
"__comment": "Box1", "__comment": "Box1",
"from": [ 0, 5, 11 ], "from": [ 0, 6, 10 ],
"to": [ 5, 11, 16 ], "to": [ 6, 10, 16 ],
"faces": { "faces": {
"north": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture" }, "north": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture" },
"south": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture", "cullface": "south" }, "south": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture", "cullface": "south" },
"west": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture", "cullface": "west" }, "west": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture", "cullface": "west" },
"east": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture" } "east": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture" }
} }
} }
] ]

6
src/main/resources/assets/betterend/models/item/charnia_cyan.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:item/charnia_cyan"
}
}

6
src/main/resources/assets/betterend/models/item/charnia_light_blue.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:item/charnia_light_blue"
}
}

6
src/main/resources/assets/betterend/models/item/charnia_orange.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:item/charnia_orange"
}
}

6
src/main/resources/assets/betterend/models/item/charnia_purple.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:item/charnia_purple"
}
}

6
src/main/resources/assets/betterend/models/item/charnia_red.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:item/charnia_red"
}
}

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 396 B

Before After
Before After

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 358 B

Before After
Before After

BIN
src/main/resources/assets/betterend/textures/item/charnia_cyan.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/main/resources/assets/betterend/textures/item/charnia_light_blue.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
src/main/resources/assets/betterend/textures/item/charnia_orange.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
src/main/resources/assets/betterend/textures/item/charnia_purple.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
src/main/resources/assets/betterend/textures/item/charnia_red.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB