From 89d822a04532b9593b75c6403a1401af6df43a4f Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Sat, 30 Sep 2023 17:26:30 +0300 Subject: [PATCH] Fix cracked light blue bricks and meat models --- src/main/java/su/a71/new_soviet/blocks/SirenBlock.java | 10 ++++++++++ .../blockstates/cracked_light_blue_bricks_stairs.json | 4 ++-- src/main/resources/assets/new_soviet/lang/en_us.json | 1 + .../models/block/cracked_light_blue_bricks_slab.json | 8 ++++++++ .../block/cracked_light_blue_bricks_slab_top.json | 8 ++++++++ .../models/block/cracked_light_blue_bricks_stairs.json | 8 ++++++++ .../block/cracked_light_blue_bricks_stairs_inner.json | 8 ++++++++ .../block/cracked_light_blue_bricks_stairs_outer.json | 8 ++++++++ .../assets/new_soviet/models/block/meat_eye.json | 2 +- .../assets/new_soviet/models/block/meat_teeth.json | 2 +- .../models/item/cracked_light_blue_bricks_slab.json | 4 ++++ .../models/item/cracked_light_blue_bricks_stairs.json | 4 ++++ 12 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_slab.json create mode 100644 src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_slab_top.json create mode 100644 src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs.json create mode 100644 src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs_inner.json create mode 100644 src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs_outer.json create mode 100644 src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_slab.json create mode 100644 src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_stairs.json diff --git a/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java b/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java index 3f74c5b..9a8e5f4 100644 --- a/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java @@ -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 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; diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_light_blue_bricks_stairs.json b/src/main/resources/assets/new_soviet/blockstates/cracked_light_blue_bricks_stairs.json index bedf6af..bd16698 100644 --- a/src/main/resources/assets/new_soviet/blockstates/cracked_light_blue_bricks_stairs.json +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_light_blue_bricks_stairs.json @@ -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 }, diff --git a/src/main/resources/assets/new_soviet/lang/en_us.json b/src/main/resources/assets/new_soviet/lang/en_us.json index 82eefa5..afde234 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -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", diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_slab.json b/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_slab.json new file mode 100644 index 0000000..cabf4cb --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_slab.json @@ -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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_slab_top.json b/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_slab_top.json new file mode 100644 index 0000000..7a054fd --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_slab_top.json @@ -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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs.json b/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs.json new file mode 100644 index 0000000..aa8f97a --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs.json @@ -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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs_inner.json b/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs_inner.json new file mode 100644 index 0000000..0beb857 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs_inner.json @@ -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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs_outer.json b/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs_outer.json new file mode 100644 index 0000000..6fe8082 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_light_blue_bricks_stairs_outer.json @@ -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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/meat_eye.json b/src/main/resources/assets/new_soviet/models/block/meat_eye.json index 698cd93..5960f2d 100644 --- a/src/main/resources/assets/new_soviet/models/block/meat_eye.json +++ b/src/main/resources/assets/new_soviet/models/block/meat_eye.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/meat_teeth.json b/src/main/resources/assets/new_soviet/models/block/meat_teeth.json index 50269a8..dd3fcdf 100644 --- a/src/main/resources/assets/new_soviet/models/block/meat_teeth.json +++ b/src/main/resources/assets/new_soviet/models/block/meat_teeth.json @@ -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" } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_slab.json b/src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_slab.json new file mode 100644 index 0000000..09288d9 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_slab.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cracked_light_blue_bricks_slab" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_stairs.json b/src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_stairs.json new file mode 100644 index 0000000..db60f9f --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_light_blue_bricks_stairs.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cracked_light_blue_bricks_stairs" +} +