Ethyl/New-Soviet-Era
Ethyl/New-Soviet-Era
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix cracked light blue bricks and meat models

Browse source
This commit is contained in:
Andrew-71 2023-09-30 17:26:30 +03:00
parent f29f4daf80
commit 89d822a045
12 changed files with 63 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/su/a71/new_soviet/blocks/SirenBlock.java
View file

@ -1,12 +1,15 @@
package su.a71.new_soviet.blocks;
import com.mojang.authlib.minecraft.client.MinecraftClient;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.*;
import net.minecraft.block.piston.PistonBehavior;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.fluid.FluidState;
import net.minecraft.fluid.Fluids;
import net.minecraft.item.ItemPlacementContext;
import net.minecraft.item.ItemStack;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.sound.SoundCategory;
@ -29,6 +32,7 @@ import net.minecraft.world.World;
import net.minecraft.world.WorldAccess;
import net.minecraft.world.WorldView;
import org.jetbrains.annotations.Nullable;
import su.a71.new_soviet.registration.NSE_Sounds;
import java.util.ArrayList;
@ -151,6 +155,12 @@ public class SirenBlock extends HorizontalFacingBlock implements Waterloggable {
return state.get(WATERLOGGED) ? Fluids.WATER.getStill(false) : super.getFluidState(state);
}
@Override
public void appendTooltip(ItemStack stack, @Nullable BlockView world, List<Text> tooltip, TooltipContext options) {
tooltip.add(Text.translatable("block.new_soviet.siren.instruction")); // TODO: Pull keybinds in case user changed RMB to whatever
super.appendTooltip(stack, world, tooltip, options);
}
static {
ON = RedstoneTorchBlock.LIT;
WATERLOGGED = Properties.WATERLOGGED;

4
src/main/resources/assets/new_soviet/blockstates/cracked_light_blue_bricks_stairs.json
View file

@ -17,7 +17,7 @@
"model": "new_soviet:block/cracked_light_blue_bricks_stairs_outer"
},
"facing=east,half=bottom,shape=straight": {
"model": "new_soviet:block/cracked_light_blue_bricks_stairs_stairs"
"model": "new_soviet:block/cracked_light_blue_bricks_stairs"
},
"facing=east,half=top,shape=inner_left": {
"model": "new_soviet:block/cracked_light_blue_bricks_stairs_inner",
@ -42,7 +42,7 @@
"y": 90
},
"facing=east,half=top,shape=straight": {
"model": "new_soviet:block/cracked_light_blue_bricks_stairs_stairs",
"model": "new_soviet:block/cracked_light_blue_bricks_stairs",
"uvlock": true,
"x": 180
},

1
src/main/resources/assets/new_soviet/lang/en_us.json
View file

@ -151,6 +151,7 @@
"block.new_soviet.ceiling_fan": "Ceiling Fan",
"block.new_soviet.siren": "Siren",
"block.new_soviet.siren.set": "Siren sound set to: %s",
"block.new_soviet.siren.instruction": "Right click while sneaking to change sound",
"item.new_soviet.dice_d6": "Die",
"item.new_soviet.dice_d4": "Die",
"item.new_soviet.dice_d20": "Die",

8
src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_slab.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/slab",
"textures": {
"bottom": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1",
"side": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1",
"top": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1"
}
}

8
src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_slab_top.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/slab_top",
"textures": {
"bottom": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1",
"side": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1",
"top": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1"
}
}

8
src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/stairs",
"textures": {
"bottom": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1",
"side": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1",
"top": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1"
}
}

8
src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs_inner.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/inner_stairs",
"textures": {
"bottom": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1",
"side": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1",
"top": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1"
}
}

8
src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs_outer.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/outer_stairs",
"textures": {
"bottom": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1",
"side": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1",
"top": "new_soviet:block/light_blue/variated/cracked_light_blue_bricks_1"
}
}

2
src/main/resources/assets/new_soviet/models/block/meat_eye.json
View file

@ -2,6 +2,6 @@
"parent": "block/cube_all",
"textures": {
"all": "new_soviet:block/meat/meat_eye",
"particle": "new_soviet:block/meat/meat"
"particle": "new_soviet:block/meat/meat_1"
}
}

2
src/main/resources/assets/new_soviet/models/block/meat_teeth.json
View file

@ -2,6 +2,6 @@
"parent": "block/cube_all",
"textures": {
"all": "new_soviet:block/meat/meat_teeth",
"particle": "new_soviet:block/meat/meat"
"particle": "new_soviet:block/meat/meat_1"
}
}

4
src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_slab.json Normal file
View file

@ -0,0 +1,4 @@
{
"parent": "new_soviet:block/cracked_light_blue_bricks_slab"
}

4
src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_stairs.json Normal file
View file

@ -0,0 +1,4 @@
{
"parent": "new_soviet:block/cracked_light_blue_bricks_stairs"
}