Fix cracked light blue bricks and meat models

TODO.md

@@ -2,10 +2,9 @@
 * Add fences
 * Add windows
 * Add (with functionality) present appliance/furniture/electronics textures
-* Add advancements (with datagen)
 * What's switch type 2?
 * Cigarette and handrail are BROKEN and the code is a MESS sorry, but it needs CLEANUP
-* Concrete with bars should have proper hitbox, placeable upside down, and act like dripstone
+* Fix concrete with bars hitbox
 * Fix post lamp hitboxes
 * Add credits in models
 

src/client/java/su/a71/new_soviet/NewSovietClient.java

@@ -21,12 +21,18 @@ public class NewSovietClient implements ClientModInitializer {
         BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.VINTAGE_LAMP, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.CEILING_FAN, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.SIREN, RenderLayer.getCutout());
-
         BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.CAGED_POST_LAMP, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.MODERN_POST_LAMP, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.BIG_POST_LAMP, RenderLayer.getCutout());
         BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.VINTAGE_POST_LAMP, RenderLayer.getCutout());
 
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.RED_CONCRETE_WITH_BARS, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.GREEN_CONCRETE_WITH_BARS, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.WHITE_CONCRETE_WITH_BARS, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.BEIGE_CONCRETE_WITH_BARS, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.YELLOW_CONCRETE_WITH_BARS, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.BLUE_CONCRETE_WITH_BARS, RenderLayer.getCutout());
+
         BlockEntityRendererRegistry.register(NSE_Custom.TV_BLOCK_ENTITY, TVBlockEntityRenderer::new);
     }
 }

src/main/java/su/a71/new_soviet/blocks/ConcreteWithBarsBlock.java

@@ -1,26 +1,71 @@
 package su.a71.new_soviet.blocks;
 
-import net.minecraft.block.Block;
+import net.minecraft.block.*;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.enums.Thickness;
-import net.minecraft.block.HorizontalFacingBlock;
+import net.minecraft.entity.Entity;
+import net.minecraft.fluid.FluidState;
+import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.state.StateManager;
+import net.minecraft.state.property.BooleanProperty;
+import net.minecraft.state.property.DirectionProperty;
 import net.minecraft.state.property.Properties;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldAccess;
+import net.minecraft.world.WorldView;
+import org.jetbrains.annotations.Nullable;
+
+public class ConcreteWithBarsBlock extends HorizontalFacingBlock implements Waterloggable {
+    public static final DirectionProperty VERTICAL_DIRECTION;
+    public static final BooleanProperty WATERLOGGED;
 
-public class ConcreteWithBarsBlock extends HorizontalFacingBlock {
     public ConcreteWithBarsBlock(Settings settings) {
         super(settings);
-        setDefaultState(getDefaultState().with(Properties.HORIZONTAL_FACING, Direction.NORTH));
+        setDefaultState(getDefaultState()
+                .with(Properties.HORIZONTAL_FACING, Direction.NORTH)
+                .with(VERTICAL_DIRECTION, Direction.UP)
+                .with(WATERLOGGED, false));
     }
 
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
-        builder.add(Properties.HORIZONTAL_FACING);
+        builder.add(Properties.HORIZONTAL_FACING, VERTICAL_DIRECTION, WATERLOGGED);
     }
 
     @Override
     public BlockState getPlacementState(ItemPlacementContext ctx) {
-        return super.getPlacementState(ctx).with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite());
+        FluidState fluidState = ctx.getWorld().getFluidState(ctx.getBlockPos());
+
+        return super.getPlacementState(ctx)
+                .with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite())
+                .with(VERTICAL_DIRECTION, ctx.getVerticalPlayerLookDirection().getOpposite())
+                .with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER);
+    }
+
+    public void onLandedUpon(World world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {
+        if (state.get(VERTICAL_DIRECTION) == Direction.UP) {
+            entity.handleFallDamage(fallDistance + 2.0F, 2.0F, world.getDamageSources().stalagmite());
+        } else {
+            super.onLandedUpon(world, state, pos, entity, fallDistance);
+        }
+    }
+
+    @Override
+    public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) {
+        if (state.get(WATERLOGGED)) {
+            world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world));
+        }
+        return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos);
+    }
+
+    public FluidState getFluidState(BlockState state) {
+        return state.get(WATERLOGGED) ? Fluids.WATER.getStill(false) : super.getFluidState(state);
+    }
+
+    static {
+        VERTICAL_DIRECTION = Properties.VERTICAL_DIRECTION;
+        WATERLOGGED = Properties.WATERLOGGED;
     }
 }

src/main/java/su/a71/new_soviet/blocks/LandMineBlock.java

@@ -30,6 +30,7 @@ import su.a71.new_soviet.NewSoviet;
 public class LandMineBlock extends HorizontalFacingBlock implements Waterloggable {
     public static final BooleanProperty WATERLOGGED;
     protected static final VoxelShape SHAPE;
+    public float explosion_power = 4.0f;
 
     public LandMineBlock(Settings settings) {
         super(settings);
@@ -69,34 +70,34 @@ public class LandMineBlock extends HorizontalFacingBlock implements Waterloggabl
         }
     }
 
-    // We would have a 25% chance of explosion on break with a shovel, but I can't implement brushing yet.
+    // 20% chance of explosion on break without a shovel
     public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) {
-//        if (!world.isClient() && !player.isCreative() && !(player.getHandItems().iterator().next().getItem() instanceof ShovelItem)) {
+        if (!world.isClient() && !player.isCreative() && !(player.getHandItems().iterator().next().getItem() instanceof ShovelItem)) {
-//            if (NewSoviet.RANDOM.nextBetween(1, 4) != 1) {
+            if (NewSoviet.RANDOM.nextBetween(1, 5) == 1) {
-//                explode(world, pos);
+                explode(world, pos);
-//            }
+            }
-//        }
+        }
         super.onBreak(world, pos, state, player);
     }
 
-    // Only chain explode every 2/3rd of times to nerf instant long range explosions
+    // Only chain explode every 20% of times to prevent instant&long explosion chains
     @Override
     public void onDestroyedByExplosion(World world, BlockPos pos, Explosion explosion) {
         if (!world.isClient) {
-            int chance = NewSoviet.RANDOM.nextBetween(0, 2);
+            int chance = NewSoviet.RANDOM.nextBetween(1, 5);
-            if (chance != 0) {
+            if (chance == 1) {
                 explode(world, pos);
             }
         }
         super.onDestroyedByExplosion(world, pos, explosion);
     }
 
-    // Without a shovel, 80% chance of explosion on breaking start
+    // Without a shovel, 5% chance of explosion on breaking start
     @Override
     public void onBlockBreakStart(BlockState state, World world, BlockPos pos, PlayerEntity player) {
         if (!world.isClient() && !(player.getHandItems().iterator().next().getItem() instanceof ShovelItem))
         {
-            if (NewSoviet.RANDOM.nextBetween(1, 10) < 2) {
+            if (NewSoviet.RANDOM.nextBetween(1, 100) < 5) {
                 explode(world, pos);
             }
         }
@@ -114,8 +115,7 @@ public class LandMineBlock extends HorizontalFacingBlock implements Waterloggabl
     public void explode(World world, BlockPos pos) {
         if (world.isClient()) return;
         world.removeBlock(pos, false);
-        float f = 4.0F;
+        world.createExplosion(null, pos.getX(), pos.getY(), pos.getZ(), explosion_power, World.ExplosionSourceType.TNT);
-        world.createExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 4.0F, World.ExplosionSourceType.TNT);
     }
 
     @Nullable
@@ -152,8 +152,6 @@ public class LandMineBlock extends HorizontalFacingBlock implements Waterloggabl
 
     static {
         SHAPE = Block.createCuboidShape(4, 0, 4, 12, 4, 12); // VoxelShapes.cuboid(0.4, 0, 0.4, 0.6, 0.3, 0.6);  //
-
-//        SHAPE = Block.createCuboidShape(5, 0, 5, 11, 3, 11); // VoxelShapes.cuboid(0.4, 0, 0.4, 0.6, 0.3, 0.6);  //
         WATERLOGGED = Properties.WATERLOGGED;
     }
 }

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<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;

src/main/java/su/a71/new_soviet/registration/NSE_Custom.java

@@ -39,6 +39,7 @@ public class NSE_Custom extends NSE_BaseRegistration {
     public static final RadioReceiverBlock RADIO_RECEIVER = new RadioReceiverBlock();
 
     public static final SwitchBlock SWITCH = new SwitchBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.DESTROY).strength(1f, 2f).mapColor(MapColor.TERRACOTTA_WHITE));
+    public static final SwitchBlock DARK_SWITCH = new SwitchBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.DESTROY).strength(1f, 2f).mapColor(MapColor.TERRACOTTA_WHITE));
     public static final TableLampBlock TABLE_LAMP = new TableLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD).strength(0.9f, 1.5f).mapColor(MapColor.WHITE));
     public static final GoldenTableLampBlock GOLDEN_LAMP = new GoldenTableLampBlock(FabricBlockSettings.copy(TABLE_LAMP).sounds(BlockSoundGroup.METAL).mapColor(MapColor.GOLD));
     public static final TableLampBlock VINTAGE_LAMP = new VintageLampBlock(FabricBlockSettings.copy(TABLE_LAMP).sounds(BlockSoundGroup.METAL).mapColor(MapColor.TERRACOTTA_BROWN));
@@ -115,6 +116,7 @@ public class NSE_Custom extends NSE_BaseRegistration {
         registerBlock("siren", () -> SIREN, NSE_CUSTOM_TAB);
         registerBlock("landmine", () -> LANDMINE, NSE_CUSTOM_TAB);
         registerBlock("switch", () -> SWITCH, NSE_CUSTOM_TAB);
+        registerBlock("dark_switch", () -> DARK_SWITCH, NSE_CUSTOM_TAB);
         registerBlock("white_checker", () -> WHITE_CHECKER, NSE_CUSTOM_TAB);
         registerBlock("black_checker", () -> BLACK_CHECKER, NSE_CUSTOM_TAB);
         registerBlock("white_pawn", () -> WHITE_PAWN, NSE_CUSTOM_TAB);

src/main/resources/assets/new_soviet/blockstates/beige_concrete_with_bars.json

@@ -1,8 +1,12 @@
 {
   "variants": {
-    "facing=north": { "model": "new_soviet:block/beige_concrete_with_bars", "uvlock": true },
+    "facing=north,vertical_direction=up": { "model": "new_soviet:block/beige_concrete_with_bars", "uvlock": false },
-    "facing=east":  { "model": "new_soviet:block/beige_concrete_with_bars", "y":  90, "uvlock": false },
+    "facing=east,vertical_direction=up":  { "model": "new_soviet:block/beige_concrete_with_bars", "y":  90, "uvlock": false },
-    "facing=south": { "model": "new_soviet:block/beige_concrete_with_bars", "y": 180, "uvlock": false },
+    "facing=south,vertical_direction=up": { "model": "new_soviet:block/beige_concrete_with_bars", "y": 180, "uvlock": false },
-    "facing=west":  { "model": "new_soviet:block/beige_concrete_with_bars", "y": 270, "uvlock": false }
+    "facing=west,vertical_direction=up":  { "model": "new_soviet:block/beige_concrete_with_bars", "y": 270, "uvlock": false },
+    "facing=north,vertical_direction=down": { "model": "new_soviet:block/beige_concrete_with_bars", "x": 180, "uvlock": false },
+    "facing=east,vertical_direction=down":  { "model": "new_soviet:block/beige_concrete_with_bars", "x": 180, "y":  90, "uvlock": false },
+    "facing=south,vertical_direction=down": { "model": "new_soviet:block/beige_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
+    "facing=west,vertical_direction=down":  { "model": "new_soviet:block/beige_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
   }
 }

src/main/resources/assets/new_soviet/blockstates/blue_concrete_with_bars.json

@@ -1,8 +1,12 @@
 {
   "variants": {
-    "facing=north": { "model": "new_soviet:block/blue_concrete_with_bars", "uvlock": true },
+    "facing=north,vertical_direction=up": { "model": "new_soviet:block/blue_concrete_with_bars", "uvlock": false },
-    "facing=east":  { "model": "new_soviet:block/blue_concrete_with_bars", "y":  90, "uvlock": false },
+    "facing=east,vertical_direction=up":  { "model": "new_soviet:block/blue_concrete_with_bars", "y":  90, "uvlock": false },
-    "facing=south": { "model": "new_soviet:block/blue_concrete_with_bars", "y": 180, "uvlock": false },
+    "facing=south,vertical_direction=up": { "model": "new_soviet:block/blue_concrete_with_bars", "y": 180, "uvlock": false },
-    "facing=west":  { "model": "new_soviet:block/blue_concrete_with_bars", "y": 270, "uvlock": false }
+    "facing=west,vertical_direction=up":  { "model": "new_soviet:block/blue_concrete_with_bars", "y": 270, "uvlock": false },
+    "facing=north,vertical_direction=down": { "model": "new_soviet:block/blue_concrete_with_bars", "x": 180, "uvlock": false },
+    "facing=east,vertical_direction=down":  { "model": "new_soviet:block/blue_concrete_with_bars", "x": 180, "y":  90, "uvlock": false },
+    "facing=south,vertical_direction=down": { "model": "new_soviet:block/blue_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
+    "facing=west,vertical_direction=down":  { "model": "new_soviet:block/blue_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
   }
 }

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
     },

src/main/resources/assets/new_soviet/blockstates/dark_switch.json

@@ -0,0 +1,110 @@
+{
+  "variants": {
+    "face=ceiling,facing=east,powered=false": {
+      "model": "new_soviet:block/switch_type_2_on",
+      "x": 90,
+      "y": 270
+    },
+    "face=ceiling,facing=east,powered=true": {
+      "model": "new_soviet:block/switch_type_2_off",
+      "x": 90,
+      "y": 270
+    },
+    "face=ceiling,facing=north,powered=false": {
+      "model": "new_soviet:block/switch_type_2_on",
+      "x": 90,
+      "y": 180
+    },
+    "face=ceiling,facing=north,powered=true": {
+      "model": "new_soviet:block/switch_type_2_off",
+      "x": 90,
+      "y": 180
+    },
+    "face=ceiling,facing=south,powered=false": {
+      "model": "new_soviet:block/switch_type_2_on",
+      "x": 90
+    },
+    "face=ceiling,facing=south,powered=true": {
+      "model": "new_soviet:block/switch_type_2_off",
+      "x": 90
+    },
+    "face=ceiling,facing=west,powered=false": {
+      "model": "new_soviet:block/switch_type_2_on",
+      "x": 90,
+      "y": 90
+    },
+    "face=ceiling,facing=west,powered=true": {
+      "model": "new_soviet:block/switch_type_2_off",
+      "x": 90,
+      "y": 90
+    },
+    "face=floor,facing=east,powered=false": {
+      "model": "new_soviet:block/switch_type_2_on",
+      "x": -90,
+      "y": 90
+    },
+    "face=floor,facing=east,powered=true": {
+      "model": "new_soviet:block/switch_type_2_off",
+      "x": -90,
+      "y": 90
+    },
+    "face=floor,facing=north,powered=false": {
+      "model": "new_soviet:block/switch_type_2_on",
+      "x": -90
+    },
+    "face=floor,facing=north,powered=true": {
+      "model": "new_soviet:block/switch_type_2_off",
+      "x": -90
+    },
+    "face=floor,facing=south,powered=false": {
+      "model": "new_soviet:block/switch_type_2_on",
+      "x": -90,
+      "y": 180
+    },
+    "face=floor,facing=south,powered=true": {
+      "model": "new_soviet:block/switch_type_2_off",
+      "x": -90,
+      "y": 180
+    },
+    "face=floor,facing=west,powered=false": {
+      "model": "new_soviet:block/switch_type_2_on",
+      "x": -90,
+      "y": 270
+    },
+    "face=floor,facing=west,powered=true": {
+      "model": "new_soviet:block/switch_type_2_off",
+      "x": -90,
+      "y": 270
+    },
+    "face=wall,facing=east,powered=false": {
+      "model": "new_soviet:block/switch_type_2_on",
+      "y": 90
+    },
+    "face=wall,facing=east,powered=true": {
+      "model": "new_soviet:block/switch_type_2_off",
+      "y": 90
+    },
+    "face=wall,facing=north,powered=false": {
+      "model": "new_soviet:block/switch_type_2_on"
+    },
+    "face=wall,facing=north,powered=true": {
+      "model": "new_soviet:block/switch_type_2_off"
+    },
+    "face=wall,facing=south,powered=false": {
+      "model": "new_soviet:block/switch_type_2_on",
+      "y": 180
+    },
+    "face=wall,facing=south,powered=true": {
+      "model": "new_soviet:block/switch_type_2_off",
+      "y": 180
+    },
+    "face=wall,facing=west,powered=false": {
+      "model": "new_soviet:block/switch_type_2_on",
+      "y": 270
+    },
+    "face=wall,facing=west,powered=true": {
+      "model": "new_soviet:block/switch_type_2_off",
+      "y": 270
+    }
+  }
+}

src/main/resources/assets/new_soviet/blockstates/green_concrete_with_bars.json

@@ -1,8 +1,12 @@
 {
   "variants": {
-    "facing=north": { "model": "new_soviet:block/green_concrete_with_bars", "uvlock": true },
+    "facing=north,vertical_direction=up": { "model": "new_soviet:block/green_concrete_with_bars", "uvlock": false },
-    "facing=east":  { "model": "new_soviet:block/green_concrete_with_bars", "y":  90, "uvlock": false },
+    "facing=east,vertical_direction=up":  { "model": "new_soviet:block/green_concrete_with_bars", "y":  90, "uvlock": false },
-    "facing=south": { "model": "new_soviet:block/green_concrete_with_bars", "y": 180, "uvlock": false },
+    "facing=south,vertical_direction=up": { "model": "new_soviet:block/green_concrete_with_bars", "y": 180, "uvlock": false },
-    "facing=west":  { "model": "new_soviet:block/green_concrete_with_bars", "y": 270, "uvlock": false }
+    "facing=west,vertical_direction=up":  { "model": "new_soviet:block/green_concrete_with_bars", "y": 270, "uvlock": false },
+    "facing=north,vertical_direction=down": { "model": "new_soviet:block/green_concrete_with_bars", "x": 180, "uvlock": false },
+    "facing=east,vertical_direction=down":  { "model": "new_soviet:block/green_concrete_with_bars", "x": 180, "y":  90, "uvlock": false },
+    "facing=south,vertical_direction=down": { "model": "new_soviet:block/green_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
+    "facing=west,vertical_direction=down":  { "model": "new_soviet:block/green_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
   }
 }

src/main/resources/assets/new_soviet/blockstates/red_concrete_with_bars.json

@@ -1,8 +1,12 @@
 {
   "variants": {
-    "facing=north": { "model": "new_soviet:block/red_concrete_with_bars", "uvlock": true },
+    "facing=north,vertical_direction=up": { "model": "new_soviet:block/red_concrete_with_bars", "uvlock": false },
-    "facing=east":  { "model": "new_soviet:block/red_concrete_with_bars", "y":  90, "uvlock": false },
+    "facing=east,vertical_direction=up":  { "model": "new_soviet:block/red_concrete_with_bars", "y":  90, "uvlock": false },
-    "facing=south": { "model": "new_soviet:block/red_concrete_with_bars", "y": 180, "uvlock": false },
+    "facing=south,vertical_direction=up": { "model": "new_soviet:block/red_concrete_with_bars", "y": 180, "uvlock": false },
-    "facing=west":  { "model": "new_soviet:block/red_concrete_with_bars", "y": 270, "uvlock": false }
+    "facing=west,vertical_direction=up":  { "model": "new_soviet:block/red_concrete_with_bars", "y": 270, "uvlock": false },
+    "facing=north,vertical_direction=down": { "model": "new_soviet:block/red_concrete_with_bars", "x": 180, "uvlock": false },
+    "facing=east,vertical_direction=down":  { "model": "new_soviet:block/red_concrete_with_bars", "x": 180, "y":  90, "uvlock": false },
+    "facing=south,vertical_direction=down": { "model": "new_soviet:block/red_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
+    "facing=west,vertical_direction=down":  { "model": "new_soviet:block/red_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
   }
 }

src/main/resources/assets/new_soviet/blockstates/white_concrete_with_bars.json

@@ -1,8 +1,12 @@
 {
   "variants": {
-    "facing=north": { "model": "new_soviet:block/white_concrete_with_bars", "uvlock": true },
+    "facing=north,vertical_direction=up": { "model": "new_soviet:block/white_concrete_with_bars", "uvlock": false },
-    "facing=east":  { "model": "new_soviet:block/white_concrete_with_bars", "y":  90, "uvlock": false },
+    "facing=east,vertical_direction=up":  { "model": "new_soviet:block/white_concrete_with_bars", "y":  90, "uvlock": false },
-    "facing=south": { "model": "new_soviet:block/white_concrete_with_bars", "y": 180, "uvlock": false },
+    "facing=south,vertical_direction=up": { "model": "new_soviet:block/white_concrete_with_bars", "y": 180, "uvlock": false },
-    "facing=west":  { "model": "new_soviet:block/white_concrete_with_bars", "y": 270, "uvlock": false }
+    "facing=west,vertical_direction=up":  { "model": "new_soviet:block/white_concrete_with_bars", "y": 270, "uvlock": false },
+    "facing=north,vertical_direction=down": { "model": "new_soviet:block/white_concrete_with_bars", "x": 180, "uvlock": false },
+    "facing=east,vertical_direction=down":  { "model": "new_soviet:block/white_concrete_with_bars", "x": 180, "y":  90, "uvlock": false },
+    "facing=south,vertical_direction=down": { "model": "new_soviet:block/white_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
+    "facing=west,vertical_direction=down":  { "model": "new_soviet:block/white_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
   }
 }

src/main/resources/assets/new_soviet/blockstates/yellow_concrete_with_bars.json

@@ -1,8 +1,12 @@
 {
   "variants": {
-    "facing=north": { "model": "new_soviet:block/yellow_concrete_with_bars", "uvlock": true },
+    "facing=north,vertical_direction=up": { "model": "new_soviet:block/yellow_concrete_with_bars", "uvlock": false },
-    "facing=east":  { "model": "new_soviet:block/yellow_concrete_with_bars", "y":  90, "uvlock": false },
+    "facing=east,vertical_direction=up":  { "model": "new_soviet:block/yellow_concrete_with_bars", "y":  90, "uvlock": false },
-    "facing=south": { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 180, "uvlock": false },
+    "facing=south,vertical_direction=up": { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 180, "uvlock": false },
-    "facing=west":  { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 270, "uvlock": false }
+    "facing=west,vertical_direction=up":  { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 270, "uvlock": false },
+    "facing=north,vertical_direction=down": { "model": "new_soviet:block/yellow_concrete_with_bars", "x": 180, "uvlock": false },
+    "facing=east,vertical_direction=down":  { "model": "new_soviet:block/yellow_concrete_with_bars", "x": 180, "y":  90, "uvlock": false },
+    "facing=south,vertical_direction=down": { "model": "new_soviet:block/yellow_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
+    "facing=west,vertical_direction=down":  { "model": "new_soviet:block/yellow_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
   }
 }

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",
@@ -199,6 +200,7 @@
   "subtitles.new_soviet.item_rake_till": "Rake tills",
   "item.new_soviet.concentrate": "Nutrient Block",
   "block.new_soviet.switch": "Switch",
+  "block.new_soviet.dark_switch": "Dark Switch",
   "block.new_soviet.nii_wall_1": "Diorite RI Wall",
   "block.new_soviet.cracked_nii_wall_1": "Cracked Diorite RI Wall",
   "block.new_soviet.nii_wall_2": "RI Wall",

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

src/main/resources/assets/new_soviet/models/block/golden_table_lamp.json

@@ -241,12 +241,17 @@
 			}
 		}
 	],
+	"display": {
+		"gui": {
+			"rotation": [30, 225, 0],
+			"translation": [-0.5, 1.5, 0]
+		}
+	},
 	"groups": [
 		{
 			"name": "group",
 			"origin": [8, 0, 8],
 			"color": 0,
-			"nbt": "{}",
 			"children": [
 				0,
 				1,
@@ -261,7 +266,6 @@
 					"name": "group",
 					"origin": [8, 8, 8],
 					"color": 0,
-					"nbt": "{}",
 					"children": [9, 10, 11, 12, 13, 14, 15, 16, 17]
 				}
 			]

src/main/resources/assets/new_soviet/models/block/lamp_post.json

@@ -112,42 +112,24 @@
 	],
 	"display": {
 		"thirdperson_righthand": {
-			"rotation": [75, 45, 0],
+			"translation": [0, 3, 1],
-			"translation": [0, -0.5, 0],
+			"scale": [0.55, 0.55, 0.55]
-			"scale": [0.375, 0.375, 0.375]
 		},
 		"thirdperson_lefthand": {
-			"rotation": [75, 45, 0],
+			"translation": [0, 3, 1],
-			"translation": [0, -0.5, 0],
+			"scale": [0.55, 0.55, 0.55]
-			"scale": [0.375, 0.375, 0.375]
-		},
-		"firstperson_righthand": {
-			"rotation": [0, 45, 0],
-			"translation": [1.75, 2, 0],
-			"scale": [0.4, 0.4, 0.4]
-		},
-		"firstperson_lefthand": {
-			"rotation": [0, 45, 0],
-			"translation": [1.75, 2, 0],
-			"scale": [0.4, 0.4, 0.4]
 		},
 		"ground": {
-			"translation": [0, -1.75, 0],
+			"translation": [0, 2, 0],
-			"scale": [0.25, 0.25, 0.25]
+			"scale": [0.5, 0.5, 0.5]
 		},
 		"gui": {
 			"rotation": [30, 225, 0],
-			"translation": [-2.5, 1.5, 0],
+			"translation": [-3.5, 1, 0],
-			"scale": [0.625, 0.625, 0.625]
+			"scale": [0.8, 0.8, 0.8]
 		},
 		"head": {
-			"rotation": [85, -180, 90],
+			"translation": [0, 11, 0]
-			"translation": [-7, 22.5, 8]
-		},
-		"fixed": {
-			"rotation": [-90, 0, 0],
-			"translation": [0, 0, -16],
-			"scale": [2, 2, 2]
 		}
 	},
 	"groups": [
@@ -155,7 +137,6 @@
 			"name": "group",
 			"origin": [0, 0, 0],
 			"color": 0,
-			"nbt": "{}",
 			"children": [0, 1, 2, 3, 4, 5]
 		},
 		6,

src/main/resources/assets/new_soviet/models/block/lamp_post_2.json

@@ -91,42 +91,24 @@
 	],
 	"display": {
 		"thirdperson_righthand": {
-			"rotation": [75, 45, 0],
+			"translation": [0, 3, 1],
-			"translation": [0, -0.5, 0],
+			"scale": [0.55, 0.55, 0.55]
-			"scale": [0.375, 0.375, 0.375]
 		},
 		"thirdperson_lefthand": {
-			"rotation": [75, 45, 0],
+			"translation": [0, 3, 1],
-			"translation": [0, -0.5, 0],
+			"scale": [0.55, 0.55, 0.55]
-			"scale": [0.375, 0.375, 0.375]
-		},
-		"firstperson_righthand": {
-			"rotation": [0, 45, 0],
-			"translation": [1.75, 2, 0],
-			"scale": [0.4, 0.4, 0.4]
-		},
-		"firstperson_lefthand": {
-			"rotation": [0, 45, 0],
-			"translation": [1.75, 2, 0],
-			"scale": [0.4, 0.4, 0.4]
 		},
 		"ground": {
-			"translation": [0, -1, 0],
+			"translation": [0, 2, 0],
-			"scale": [0.25, 0.25, 0.25]
+			"scale": [0.5, 0.5, 0.5]
 		},
 		"gui": {
 			"rotation": [30, 225, 0],
-			"translation": [-2.5, 1.5, 0],
+			"translation": [-3.5, 1, 0],
-			"scale": [0.625, 0.625, 0.625]
+			"scale": [0.8, 0.8, 0.8]
 		},
 		"head": {
-			"rotation": [75, -180, 90],
+			"translation": [0, 11, 0]
-			"translation": [-7, 22.5, 8]
-		},
-		"fixed": {
-			"rotation": [-90, 0, 0],
-			"translation": [0, 0, -16],
-			"scale": [2, 2, 2]
 		}
 	},
 	"groups": [
@@ -134,7 +116,6 @@
 			"name": "group",
 			"origin": [0, 0, 0],
 			"color": 0,
-			"nbt": "{}",
 			"children": [0, 1, 2, 3]
 		},
 		4,

src/main/resources/assets/new_soviet/models/block/lamp_post_3.json

@@ -63,41 +63,24 @@
 	],
 	"display": {
 		"thirdperson_righthand": {
-			"rotation": [75, 45, 0],
+			"translation": [0, 3, 1],
-			"translation": [0, 1, 0],
+			"scale": [0.55, 0.55, 0.55]
-			"scale": [0.375, 0.375, 0.375]
 		},
 		"thirdperson_lefthand": {
-			"rotation": [75, 45, 0],
+			"translation": [0, 3, 1],
-			"translation": [0, 1, 0],
+			"scale": [0.55, 0.55, 0.55]
-			"scale": [0.375, 0.375, 0.375]
-		},
-		"firstperson_righthand": {
-			"rotation": [0, 45, 0],
-			"translation": [1.75, 2, 0],
-			"scale": [0.4, 0.4, 0.4]
-		},
-		"firstperson_lefthand": {
-			"rotation": [0, 45, 0],
-			"translation": [1.75, 2, 0],
-			"scale": [0.4, 0.4, 0.4]
 		},
 		"ground": {
-			"translation": [0, -2, 0],
+			"translation": [0, 2, 0],
-			"scale": [0.25, 0.25, 0.25]
+			"scale": [0.5, 0.5, 0.5]
 		},
 		"gui": {
 			"rotation": [30, 225, 0],
-			"scale": [0.625, 0.625, 0.625]
+			"translation": [0, -1, 0],
+			"scale": [0.8, 0.8, 0.8]
 		},
 		"head": {
-			"rotation": [-90, -180, 0],
+			"translation": [0, 11, 0]
-			"translation": [-7, 22.5, 14.5]
-		},
-		"fixed": {
-			"rotation": [-90, 0, 0],
-			"translation": [0, 0, -16],
-			"scale": [2, 2, 2]
 		}
 	},
 	"groups": [
@@ -105,7 +88,6 @@
 			"name": "group",
 			"origin": [0, 0, 0],
 			"color": 0,
-			"nbt": "{}",
 			"children": [0, 1, 2]
 		},
 		3,

src/main/resources/assets/new_soviet/models/block/lamp_post_4.json

@@ -85,12 +85,33 @@
 			}
 		}
 	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"ground": {
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"gui": {
+			"rotation": [30, 225, 0],
+			"translation": [-3.5, 1, 0],
+			"scale": [0.8, 0.8, 0.8]
+		},
+		"head": {
+			"translation": [0, 11, 0]
+		}
+	},
 	"groups": [
 		{
 			"name": "group",
 			"origin": [8, 8, 8],
 			"color": 0,
-			"nbt": "{}",
 			"children": [
 				0,
 				1,
@@ -101,7 +122,6 @@
 					"name": "group",
 					"origin": [8, 8, 8],
 					"color": 0,
-					"nbt": "{}",
 					"children": [5, 6]
 				}
 			]

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"
   }
 }

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"
   }
 }

src/main/resources/assets/new_soviet/models/block/switch_type_1_off.json

@@ -79,7 +79,6 @@
 			"name": "group",
 			"origin": [0, 0, 0],
 			"color": 0,
-			"nbt": "{}",
 			"children": [0, 1, 2]
 		}
 	]

src/main/resources/assets/new_soviet/models/block/switch_type_2_off.json

@@ -1,8 +1,8 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"0": "switch_type_2",
+		"0": "new_soviet:block/custom/switches/switch_type_2",
-		"particle": "switch_type_2"
+		"particle": "new_soviet:block/custom/switches/switch_type_2"
 	},
 	"elements": [
 		{
@@ -44,14 +44,43 @@
 			}
 		}
 	],
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [90, 0, 0],
+			"translation": [0, 8, 0]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [90, 0, 0],
+			"translation": [0, 8, 0]
+		},
+		"firstperson_righthand": {
+			"rotation": [-73, 180, 0],
+			"translation": [0, 9.25, 1.5]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-70, 180, 0],
+			"translation": [0, 9.25, 1.5]
+		},
+		"ground": {
+			"rotation": [90, 0, 0],
+			"translation": [0, 5, 0]
+		},
+		"gui": {
+			"rotation": [-44, 180, 45],
+			"translation": [0, 5, 0],
+			"scale": [2, 2, 1]
+		},
+		"fixed": {
+			"translation": [0, 0, -6.75],
+			"scale": [2, 2, 1]
+		}
+	},
 	"groups": [
 		0,
 		{
 			"name": "group",
 			"origin": [0, 2, 0],
 			"color": 0,
-			"nbt": "{}",
-			"armAnimationEnabled": false,
 			"children": [1, 2]
 		}
 	]

src/main/resources/assets/new_soviet/models/block/switch_type_2_on.json

@@ -1,8 +1,8 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"0": "switch_type_2",
+		"0": "new_soviet:block/custom/switches/switch_type_2",
-		"particle": "switch_type_2"
+		"particle": "new_soviet:block/custom/switches/switch_type_2"
 	},
 	"elements": [
 		{

src/main/resources/assets/new_soviet/models/block/vintage_lamp.json

@@ -77,12 +77,43 @@
 			}
 		}
 	],
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 3, 1],
+			"scale": [0.55, 0.55, 0.55]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, -90, 25],
+			"translation": [1.13, 3.2, 1.13],
+			"scale": [0.68, 0.68, 0.68]
+		},
+		"ground": {
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"gui": {
+			"rotation": [30, 225, 0],
+			"translation": [0, -1, 0],
+			"scale": [0.7, 0.7, 0.7]
+		},
+		"fixed": {
+			"rotation": [0, 180, 0]
+		}
+	},
 	"groups": [
 		{
 			"name": "head",
 			"origin": [8, 16, 8],
 			"color": 0,
-			"nbt": "{}",
 			"children": [0, 1, 2, 3, 4]
 		}
 	]

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"
+}
+

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"
+}
+

src/main/resources/assets/new_soviet/models/item/dark_switch.json

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

src/main/resources/assets/new_soviet/textures/block/custom/switches/switch_type_1_off.json

@@ -1,58 +0,0 @@
-{
-	"credit": "Made with Blockbench",
-	"textures": {
-		"0": "switch_type_1",
-		"particle": "switch_type_1"
-	},
-	"elements": [
-		{
-			"from": [5.5, 5.5, 15],
-			"to": [10.5, 10.5, 16],
-			"faces": {
-				"north": {"uv": [0, 0, 5, 5], "texture": "#0"},
-				"east": {"uv": [5, 0, 6, 5], "texture": "#0"},
-				"south": {"uv": [0, 5, 5, 10], "texture": "#0"},
-				"west": {"uv": [5, 5, 6, 10], "texture": "#0"},
-				"up": {"uv": [11, 1, 6, 0], "texture": "#0"},
-				"down": {"uv": [11, 1, 6, 2], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7.502, 7, 14.55],
-			"to": [8.502, 9, 15.55],
-			"rotation": {"angle": -22.5, "axis": "x", "origin": [7.525, 8, 14.55]},
-			"faces": {
-				"north": {"uv": [6, 2, 7, 4], "texture": "#0"},
-				"east": {"uv": [6, 4, 7, 6], "texture": "#0"},
-				"south": {"uv": [6, 6, 7, 8], "texture": "#0"},
-				"west": {"uv": [7, 2, 8, 4], "texture": "#0"},
-				"up": {"uv": [8, 5, 7, 4], "texture": "#0"},
-				"down": {"uv": [8, 5, 7, 6], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7.5, 7, 14.55],
-			"to": [8.5, 8, 15.55],
-			"rotation": {"angle": 0, "axis": "x", "origin": [7.525, 8, 14.55]},
-			"faces": {
-				"north": {"uv": [7, 6, 8, 7], "texture": "#0"},
-				"east": {"uv": [7, 7, 8, 8], "texture": "#0"},
-				"south": {"uv": [8, 2, 9, 3], "texture": "#0"},
-				"west": {"uv": [8, 3, 9, 4], "texture": "#0"},
-				"up": {"uv": [9, 5, 8, 4], "texture": "#0"},
-				"down": {"uv": [9, 5, 8, 6], "texture": "#0"}
-			}
-		}
-	],
-	"groups": [
-		0,
-		{
-			"name": "group",
-			"origin": [0, 0, 0],
-			"color": 0,
-			"nbt": "{}",
-			"armAnimationEnabled": false,
-			"children": [1, 2]
-		}
-	]
-}

src/main/resources/assets/new_soviet/textures/block/custom/switches/switch_type_1_on.json

@@ -1,58 +0,0 @@
-{
-	"credit": "Made with Blockbench",
-	"textures": {
-		"0": "switch_type_1",
-		"particle": "switch_type_1"
-	},
-	"elements": [
-		{
-			"from": [5.5, 5.5, 15],
-			"to": [10.5, 10.5, 16],
-			"faces": {
-				"north": {"uv": [0, 0, 5, 5], "texture": "#0"},
-				"east": {"uv": [5, 0, 6, 5], "texture": "#0"},
-				"south": {"uv": [0, 5, 5, 10], "texture": "#0"},
-				"west": {"uv": [5, 5, 6, 10], "texture": "#0"},
-				"up": {"uv": [11, 1, 6, 0], "texture": "#0"},
-				"down": {"uv": [11, 1, 6, 2], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7.502, 7, 14.55],
-			"to": [8.502, 9, 15.55],
-			"rotation": {"angle": 0, "axis": "x", "origin": [7.525, 8, 14.55]},
-			"faces": {
-				"north": {"uv": [6, 2, 7, 4], "texture": "#0"},
-				"east": {"uv": [6, 4, 7, 6], "texture": "#0"},
-				"south": {"uv": [6, 6, 7, 8], "texture": "#0"},
-				"west": {"uv": [7, 2, 8, 4], "texture": "#0"},
-				"up": {"uv": [8, 5, 7, 4], "texture": "#0"},
-				"down": {"uv": [8, 5, 7, 6], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7.5, 7, 14.55],
-			"to": [8.5, 8, 15.55],
-			"rotation": {"angle": 22.5, "axis": "x", "origin": [7.525, 8, 14.55]},
-			"faces": {
-				"north": {"uv": [7, 6, 8, 7], "texture": "#0"},
-				"east": {"uv": [7, 7, 8, 8], "texture": "#0"},
-				"south": {"uv": [8, 2, 9, 3], "texture": "#0"},
-				"west": {"uv": [8, 3, 9, 4], "texture": "#0"},
-				"up": {"uv": [9, 5, 8, 4], "texture": "#0"},
-				"down": {"uv": [9, 5, 8, 6], "texture": "#0"}
-			}
-		}
-	],
-	"groups": [
-		0,
-		{
-			"name": "group",
-			"origin": [0, 0, 0],
-			"color": 0,
-			"nbt": "{}",
-			"armAnimationEnabled": false,
-			"children": [1, 2]
-		}
-	]
-}

src/main/resources/fabric.mod.json

@@ -27,7 +27,7 @@
 		]
 	},
 	"depends": {
-		"fabricloader": ">=0.14.21",
+		"fabricloader": ">=0.14.22",
 		"minecraft": "~1.20.1",
 		"java": ">=17",
 		"fabric-api": "*"