Fix cracked light blue bricks and meat models
This commit is contained in:
parent
f29f4daf80
commit
89d822a045
12 changed files with 63 additions and 4 deletions
|
@ -1,12 +1,15 @@
|
||||||
package su.a71.new_soviet.blocks;
|
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.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
|
||||||
import net.minecraft.block.*;
|
import net.minecraft.block.*;
|
||||||
import net.minecraft.block.piston.PistonBehavior;
|
import net.minecraft.block.piston.PistonBehavior;
|
||||||
|
import net.minecraft.client.item.TooltipContext;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
import net.minecraft.fluid.FluidState;
|
import net.minecraft.fluid.FluidState;
|
||||||
import net.minecraft.fluid.Fluids;
|
import net.minecraft.fluid.Fluids;
|
||||||
import net.minecraft.item.ItemPlacementContext;
|
import net.minecraft.item.ItemPlacementContext;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.server.world.ServerWorld;
|
import net.minecraft.server.world.ServerWorld;
|
||||||
import net.minecraft.sound.BlockSoundGroup;
|
import net.minecraft.sound.BlockSoundGroup;
|
||||||
import net.minecraft.sound.SoundCategory;
|
import net.minecraft.sound.SoundCategory;
|
||||||
|
@ -29,6 +32,7 @@ import net.minecraft.world.World;
|
||||||
import net.minecraft.world.WorldAccess;
|
import net.minecraft.world.WorldAccess;
|
||||||
import net.minecraft.world.WorldView;
|
import net.minecraft.world.WorldView;
|
||||||
|
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
import su.a71.new_soviet.registration.NSE_Sounds;
|
import su.a71.new_soviet.registration.NSE_Sounds;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
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);
|
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 {
|
static {
|
||||||
ON = RedstoneTorchBlock.LIT;
|
ON = RedstoneTorchBlock.LIT;
|
||||||
WATERLOGGED = Properties.WATERLOGGED;
|
WATERLOGGED = Properties.WATERLOGGED;
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
"model": "new_soviet:block/cracked_light_blue_bricks_stairs_outer"
|
"model": "new_soviet:block/cracked_light_blue_bricks_stairs_outer"
|
||||||
},
|
},
|
||||||
"facing=east,half=bottom,shape=straight": {
|
"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": {
|
"facing=east,half=top,shape=inner_left": {
|
||||||
"model": "new_soviet:block/cracked_light_blue_bricks_stairs_inner",
|
"model": "new_soviet:block/cracked_light_blue_bricks_stairs_inner",
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
"y": 90
|
"y": 90
|
||||||
},
|
},
|
||||||
"facing=east,half=top,shape=straight": {
|
"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,
|
"uvlock": true,
|
||||||
"x": 180
|
"x": 180
|
||||||
},
|
},
|
||||||
|
|
|
@ -151,6 +151,7 @@
|
||||||
"block.new_soviet.ceiling_fan": "Ceiling Fan",
|
"block.new_soviet.ceiling_fan": "Ceiling Fan",
|
||||||
"block.new_soviet.siren": "Siren",
|
"block.new_soviet.siren": "Siren",
|
||||||
"block.new_soviet.siren.set": "Siren sound set to: %s",
|
"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_d6": "Die",
|
||||||
"item.new_soviet.dice_d4": "Die",
|
"item.new_soviet.dice_d4": "Die",
|
||||||
"item.new_soviet.dice_d20": "Die",
|
"item.new_soviet.dice_d20": "Die",
|
||||||
|
|
|
@ -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"
|
||||||
|
}
|
||||||
|
}
|
|
@ -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"
|
||||||
|
}
|
||||||
|
}
|
|
@ -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"
|
||||||
|
}
|
||||||
|
}
|
|
@ -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"
|
||||||
|
}
|
||||||
|
}
|
|
@ -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,6 +2,6 @@
|
||||||
"parent": "block/cube_all",
|
"parent": "block/cube_all",
|
||||||
"textures": {
|
"textures": {
|
||||||
"all": "new_soviet:block/meat/meat_eye",
|
"all": "new_soviet:block/meat/meat_eye",
|
||||||
"particle": "new_soviet:block/meat/meat"
|
"particle": "new_soviet:block/meat/meat_1"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -2,6 +2,6 @@
|
||||||
"parent": "block/cube_all",
|
"parent": "block/cube_all",
|
||||||
"textures": {
|
"textures": {
|
||||||
"all": "new_soviet:block/meat/meat_teeth",
|
"all": "new_soviet:block/meat/meat_teeth",
|
||||||
"particle": "new_soviet:block/meat/meat"
|
"particle": "new_soviet:block/meat/meat_1"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -0,0 +1,4 @@
|
||||||
|
{
|
||||||
|
"parent": "new_soviet:block/cracked_light_blue_bricks_slab"
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
{
|
||||||
|
"parent": "new_soviet:block/cracked_light_blue_bricks_stairs"
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue