From c07961af314a258f533694aed0de6c986f855961 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Sat, 30 Sep 2023 19:34:47 +0300 Subject: [PATCH] Add iron bars --- TODO.md | 1 - recipeTODO.txt | 1 + .../su/a71/new_soviet/NewSovietClient.java | 5 + .../loot_tables/blocks/blue_iron_bars.json | 20 ++++ .../loot_tables/blocks/dark_switch.json | 20 ++++ .../blocks/rusty_blue_iron_bars.json | 20 ++++ .../loot_tables/blocks/vintage_iron_bars.json | 20 ++++ .../data/new_soviet/tags/blocks/switches.json | 7 ++ .../su/a71/new_soviet/blocks/SirenBlock.java | 2 +- .../new_soviet/datagen/BlockLootTables.java | 4 + .../new_soviet/datagen/BlockTagGenerator.java | 4 + .../new_soviet/datagen/ModelGenerator.java | 15 +++ .../new_soviet/registration/NSE_Blocks.java | 13 ++- .../a71/new_soviet/registration/NSE_Tags.java | 1 + .../blockstates/blue_iron_bars.json | 100 ++++++++++++++++++ .../blockstates/rusty_blue_iron_bars.json | 100 ++++++++++++++++++ .../blockstates/vintage_iron_bars.json | 100 ++++++++++++++++++ .../assets/new_soviet/lang/en_us.json | 3 + .../block/fences/blue_iron_bars_cap.json | 24 +++++ .../block/fences/blue_iron_bars_cap_alt.json | 24 +++++ .../block/fences/blue_iron_bars_post.json | 23 ++++ .../fences/blue_iron_bars_post_ends.json | 23 ++++ .../block/fences/blue_iron_bars_side.json | 37 +++++++ .../block/fences/blue_iron_bars_side_alt.json | 39 +++++++ .../fences/rusty_blue_iron_bars_cap.json | 24 +++++ .../fences/rusty_blue_iron_bars_cap_alt.json | 24 +++++ .../fences/rusty_blue_iron_bars_post.json | 23 ++++ .../rusty_blue_iron_bars_post_ends.json | 23 ++++ .../fences/rusty_blue_iron_bars_side.json | 37 +++++++ .../fences/rusty_blue_iron_bars_side_alt.json | 39 +++++++ .../block/fences/vintage_iron_bars_cap.json | 24 +++++ .../fences/vintage_iron_bars_cap_alt.json | 24 +++++ .../block/fences/vintage_iron_bars_post.json | 23 ++++ .../fences/vintage_iron_bars_post_ends.json | 23 ++++ .../block/fences/vintage_iron_bars_side.json | 37 +++++++ .../fences/vintage_iron_bars_side_alt.json | 39 +++++++ .../models/item/blue_iron_bars.json | 6 ++ .../models/item/rusty_blue_iron_bars.json | 6 ++ .../models/item/vintage_iron_bars.json | 6 ++ .../fences/{fence2.png => blue_iron_bars.png} | Bin ...ce2_rusty.png => rusty_blue_iron_bars.png} | Bin .../{fence1.png => vintage_iron_bars.png} | Bin 42 files changed, 959 insertions(+), 5 deletions(-) create mode 100644 src/main/generated/data/new_soviet/loot_tables/blocks/blue_iron_bars.json create mode 100644 src/main/generated/data/new_soviet/loot_tables/blocks/dark_switch.json create mode 100644 src/main/generated/data/new_soviet/loot_tables/blocks/rusty_blue_iron_bars.json create mode 100644 src/main/generated/data/new_soviet/loot_tables/blocks/vintage_iron_bars.json create mode 100644 src/main/generated/data/new_soviet/tags/blocks/switches.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/blue_iron_bars.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/rusty_blue_iron_bars.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/vintage_iron_bars.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_cap.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_cap_alt.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_post.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_post_ends.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_side.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_side_alt.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_cap.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_cap_alt.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_post.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_post_ends.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_side.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_side_alt.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_cap.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_cap_alt.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_post.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_post_ends.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_side.json create mode 100644 src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_side_alt.json create mode 100644 src/main/resources/assets/new_soviet/models/item/blue_iron_bars.json create mode 100644 src/main/resources/assets/new_soviet/models/item/rusty_blue_iron_bars.json create mode 100644 src/main/resources/assets/new_soviet/models/item/vintage_iron_bars.json rename src/main/resources/assets/new_soviet/textures/block/fences/{fence2.png => blue_iron_bars.png} (100%) rename src/main/resources/assets/new_soviet/textures/block/fences/{fence2_rusty.png => rusty_blue_iron_bars.png} (100%) rename src/main/resources/assets/new_soviet/textures/block/fences/{fence1.png => vintage_iron_bars.png} (100%) diff --git a/TODO.md b/TODO.md index 942cc1d..32f0278 100644 --- a/TODO.md +++ b/TODO.md @@ -2,7 +2,6 @@ * Add fences * Add windows * Add (with functionality) present appliance/furniture/electronics textures -* What's switch type 2? * Cigarette and handrail are BROKEN and the code is a MESS sorry, but it needs CLEANUP * Fix concrete with bars hitbox * Fix post lamp hitboxes diff --git a/recipeTODO.txt b/recipeTODO.txt index 10b39d5..4f2b4d1 100644 --- a/recipeTODO.txt +++ b/recipeTODO.txt @@ -16,3 +16,4 @@ * no landmine recipe - intended * switch recipe * checkers and chess recipe +* bars/iron fences diff --git a/src/client/java/su/a71/new_soviet/NewSovietClient.java b/src/client/java/su/a71/new_soviet/NewSovietClient.java index 6c96871..272e0a2 100644 --- a/src/client/java/su/a71/new_soviet/NewSovietClient.java +++ b/src/client/java/su/a71/new_soviet/NewSovietClient.java @@ -26,6 +26,11 @@ public class NewSovietClient implements ClientModInitializer { 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.BLUE_IRON_BARS, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.RUSTY_BLUE_IRON_BARS, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.VINTAGE_IRON_BARS, RenderLayer.getCutout()); + + // TODO: Needed? 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()); diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/blue_iron_bars.json b/src/main/generated/data/new_soviet/loot_tables/blocks/blue_iron_bars.json new file mode 100644 index 0000000..9ee5097 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/blue_iron_bars.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:blue_iron_bars" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/dark_switch.json b/src/main/generated/data/new_soviet/loot_tables/blocks/dark_switch.json new file mode 100644 index 0000000..a6cc1d1 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/dark_switch.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:dark_switch" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/rusty_blue_iron_bars.json b/src/main/generated/data/new_soviet/loot_tables/blocks/rusty_blue_iron_bars.json new file mode 100644 index 0000000..43efb88 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/rusty_blue_iron_bars.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:rusty_blue_iron_bars" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/vintage_iron_bars.json b/src/main/generated/data/new_soviet/loot_tables/blocks/vintage_iron_bars.json new file mode 100644 index 0000000..43e7966 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/vintage_iron_bars.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:vintage_iron_bars" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/tags/blocks/switches.json b/src/main/generated/data/new_soviet/tags/blocks/switches.json new file mode 100644 index 0000000..5a86ddc --- /dev/null +++ b/src/main/generated/data/new_soviet/tags/blocks/switches.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "new_soviet:switch", + "new_soviet:dark_switch" + ] +} \ No newline at end of file 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 9a8e5f4..a95bebf 100644 --- a/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java @@ -157,7 +157,7 @@ public class SirenBlock extends HorizontalFacingBlock implements Waterloggable { @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 + tooltip.add(Text.translatable("block.new_soviet.siren.instruction")); // TODO: Pull keybindings in case user changed RMB to whatever super.appendTooltip(stack, world, tooltip, options); } diff --git a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java index 44c7676..a129457 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java @@ -178,6 +178,9 @@ public class BlockLootTables extends FabricBlockLootTableProvider { addDrop(NSE_Blocks.BROWN_WALLPAPER); addDrop(NSE_Blocks.GREEN_WALLPAPER); addDrop(NSE_Blocks.HANDRAIL); + addDrop(NSE_Blocks.BLUE_IRON_BARS); + addDrop(NSE_Blocks.RUSTY_BLUE_IRON_BARS); + addDrop(NSE_Blocks.VINTAGE_IRON_BARS); // Drops for furniture/electronics/appliances addDrop(NSE_Custom.WHITE_PAWN); @@ -202,6 +205,7 @@ public class BlockLootTables extends FabricBlockLootTableProvider { addDrop(NSE_Custom.VINTAGE_LAMP); addDrop(NSE_Custom.CEILING_FAN); addDrop(NSE_Custom.SWITCH); + addDrop(NSE_Custom.DARK_SWITCH); // Generated stairs and slabs drops addDrop(NSE_Blocks.SAND_TILES_SLAB); diff --git a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java index 5cf8f1a..6031f15 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java @@ -395,6 +395,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Custom.RED_TV) .add(NSE_Custom.BROWN_TV); + getOrCreateTagBuilder(NSE_Tags.Blocks.SWITCHES) + .add(NSE_Custom.SWITCH) + .add(NSE_Custom.DARK_SWITCH); + getOrCreateTagBuilder(NSE_Tags.Blocks.POST_LAMPS) .add(NSE_Custom.CAGED_POST_LAMP) .add(NSE_Custom.VINTAGE_POST_LAMP) diff --git a/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java b/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java index ff37a8a..8e0a733 100644 --- a/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java @@ -4,10 +4,13 @@ package su.a71.new_soviet.datagen; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; import net.minecraft.block.Block; +import net.minecraft.block.PaneBlock; import net.minecraft.block.SlabBlock; import net.minecraft.block.StairsBlock; import net.minecraft.data.client.*; +import net.minecraft.item.Item; import net.minecraft.registry.Registries; +import net.minecraft.state.property.Properties; import net.minecraft.util.Identifier; import su.a71.new_soviet.registration.NSE_Blocks; @@ -58,6 +61,18 @@ public class ModelGenerator extends FabricModelProvider { blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createStairsBlockState(stairs, stairs_model_inner, stairs_model, stairs_model_outer)); } +// public final void registerPaneFence(BlockStateModelGenerator blockStateModelGenerator, PaneBlock block, String texturePath) { +// TextureMap textureMap = (new TextureMap()).put(TextureKey.PANE, getId(block)).put(TextureKey.EDGE, getSubId(top, "_top")); +// Identifier identifier = Models.TEMPLATE_GLASS_PANE_POST.upload(glassPane, textureMap, this.modelCollector); +// Identifier identifier2 = Models.TEMPLATE_GLASS_PANE_SIDE.upload(glassPane, textureMap, this.modelCollector); +// Identifier identifier3 = Models.TEMPLATE_GLASS_PANE_SIDE_ALT.upload(glassPane, textureMap, this.modelCollector); +// Identifier identifier4 = Models.TEMPLATE_GLASS_PANE_NOSIDE.upload(glassPane, textureMap, this.modelCollector); +// Identifier identifier5 = Models.TEMPLATE_GLASS_PANE_NOSIDE_ALT.upload(glassPane, textureMap, this.modelCollector); +// Item item = glassPane.asItem(); +// Models.GENERATED.upload(ModelIds.getItemModelId(item), TextureMap.layer0(glass), this.modelCollector); +// this.blockStateCollector.accept(MultipartBlockStateSupplier.create(glassPane).with(BlockStateVariant.create().put(VariantSettings.MODEL, identifier)).with(When.create().set(Properties.NORTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, identifier2)).with(When.create().set(Properties.EAST, true), BlockStateVariant.create().put(VariantSettings.MODEL, identifier2).put(VariantSettings.Y, VariantSettings.Rotation.R90)).with(When.create().set(Properties.SOUTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, identifier3)).with(When.create().set(Properties.WEST, true), BlockStateVariant.create().put(VariantSettings.MODEL, identifier3).put(VariantSettings.Y, VariantSettings.Rotation.R90)).with(When.create().set(Properties.NORTH, false), BlockStateVariant.create().put(VariantSettings.MODEL, identifier4)).with(When.create().set(Properties.EAST, false), BlockStateVariant.create().put(VariantSettings.MODEL, identifier5)).with(When.create().set(Properties.SOUTH, false), BlockStateVariant.create().put(VariantSettings.MODEL, identifier5).put(VariantSettings.Y, VariantSettings.Rotation.R90)).with(When.create().set(Properties.WEST, false), BlockStateVariant.create().put(VariantSettings.MODEL, identifier4).put(VariantSettings.Y, VariantSettings.Rotation.R270))); +// } + @Override public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) { registerDoor(blockStateModelGenerator, NSE_Blocks.CHISELED_BIRCH_DOOR); diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java b/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java index da03663..66b156f 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java @@ -423,6 +423,11 @@ public class NSE_Blocks extends NSE_BaseRegistration { public static final BarrelBlock CRATE = new BarrelBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.CHISELED_BOOKSHELF).nonOpaque().mapColor(MapColor.OAK_TAN).hardness(1.8f)); public static final WallBlock CONCRETE_WALL = new WallBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).mapColor(MapColor.STONE_GRAY)); + public static final HandrailBlock HANDRAIL = new HandrailBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.COPPER).hardness(4f).nonOpaque()); + public static final PaneBlock BLUE_IRON_BARS = new PaneBlock(FabricBlockSettings.copy(Blocks.IRON_BARS)); + public static final PaneBlock RUSTY_BLUE_IRON_BARS = new PaneBlock(FabricBlockSettings.copy(BLUE_IRON_BARS)); + public static final PaneBlock VINTAGE_IRON_BARS = new PaneBlock(FabricBlockSettings.copy(Blocks.IRON_BARS)); + // WALLPAPER BLOCKS ========== public static final Block GREEN_WALLPAPER = new Block(FabricBlockSettings.create().sounds(NSE_Sounds.WALLPAPER_BLOCK_SOUNDS).nonOpaque().mapColor(MapColor.DARK_GREEN).hardness(10f)); public static final Block BROWN_WALLPAPER = new Block(FabricBlockSettings.copy(GREEN_WALLPAPER).mapColor(MapColor.BROWN)); @@ -434,8 +439,6 @@ public class NSE_Blocks extends NSE_BaseRegistration { public static final Block MEAT_TEETH = new Block(FabricBlockSettings.copy(MEAT)); public static final SnowBlock PURPLE_GOO = new SnowBlock(FabricBlockSettings.copy(MEAT).mapColor(MapColor.PURPLE).hardness(1.2f).nonOpaque()); - public static final HandrailBlock HANDRAIL = new HandrailBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.COPPER).hardness(4f).nonOpaque()); - private static final ItemGroup NSE_BUILDING_TAB = FabricItemGroup.builder() .icon(() -> new ItemStack(CALCITE_TILES)) .displayName(Text.translatable("itemGroup.new_soviet.building_blocks")) @@ -848,6 +851,11 @@ public class NSE_Blocks extends NSE_BaseRegistration { registerBlock("crate", () -> CRATE, NSE_BUILDING_TAB); registerBlock("concrete_wall", () -> CONCRETE_WALL, NSE_BUILDING_TAB); // FIXME: 29.08.2023 This wall's top texture is a bit broken + registerBlock("handrail", () -> HANDRAIL, NSE_BUILDING_TAB); + registerBlock("blue_iron_bars", () -> BLUE_IRON_BARS, NSE_BUILDING_TAB); + registerBlock("rusty_blue_iron_bars", () -> RUSTY_BLUE_IRON_BARS, NSE_BUILDING_TAB); + registerBlock("vintage_iron_bars", () -> VINTAGE_IRON_BARS, NSE_BUILDING_TAB); + registerBlock("green_wallpaper", () -> GREEN_WALLPAPER, NSE_BUILDING_TAB); registerBlock("brown_wallpaper", () -> BROWN_WALLPAPER, NSE_BUILDING_TAB); registerBlock("beige_wallpaper", () -> BEIGE_WALLPAPER, NSE_BUILDING_TAB); @@ -856,7 +864,6 @@ public class NSE_Blocks extends NSE_BaseRegistration { registerBlock("meat_eye", () -> MEAT_EYE, NSE_BUILDING_TAB); registerBlock("meat_teeth", () -> MEAT_TEETH, NSE_BUILDING_TAB); registerBlock("purple_goo", () -> PURPLE_GOO, NSE_BUILDING_TAB); - registerBlock("handrail", () -> HANDRAIL, NSE_BUILDING_TAB); flammableInit(); } diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Tags.java b/src/main/java/su/a71/new_soviet/registration/NSE_Tags.java index c31f200..096dc06 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Tags.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Tags.java @@ -10,6 +10,7 @@ public class NSE_Tags extends NSE_BaseRegistration{ public static final TagKey TV = createBlockTag("tv"); public static final TagKey POST_LAMPS = createBlockTag("post_lamps"); + public static final TagKey SWITCHES = createBlockTag("switches"); } public static class Items { diff --git a/src/main/resources/assets/new_soviet/blockstates/blue_iron_bars.json b/src/main/resources/assets/new_soviet/blockstates/blue_iron_bars.json new file mode 100644 index 0000000..58cc759 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/blue_iron_bars.json @@ -0,0 +1,100 @@ +{ + "multipart": [ + { + "apply": { + "model": "new_soviet:block/fences/blue_iron_bars_post_ends" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/blue_iron_bars_post" + }, + "when": { + "east": "false", + "north": "false", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/blue_iron_bars_cap" + }, + "when": { + "east": "false", + "north": "true", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/blue_iron_bars_cap", + "y": 90 + }, + "when": { + "east": "true", + "north": "false", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/blue_iron_bars_cap_alt" + }, + "when": { + "east": "false", + "north": "false", + "south": "true", + "west": "false" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/blue_iron_bars_cap_alt", + "y": 90 + }, + "when": { + "east": "false", + "north": "false", + "south": "false", + "west": "true" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/blue_iron_bars_side" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/blue_iron_bars_side", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/blue_iron_bars_side_alt" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/blue_iron_bars_side_alt", + "y": 90 + }, + "when": { + "west": "true" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/rusty_blue_iron_bars.json b/src/main/resources/assets/new_soviet/blockstates/rusty_blue_iron_bars.json new file mode 100644 index 0000000..50590d1 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/rusty_blue_iron_bars.json @@ -0,0 +1,100 @@ +{ + "multipart": [ + { + "apply": { + "model": "new_soviet:block/fences/rusty_blue_iron_bars_post_ends" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/rusty_blue_iron_bars_post" + }, + "when": { + "east": "false", + "north": "false", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/rusty_blue_iron_bars_cap" + }, + "when": { + "east": "false", + "north": "true", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/rusty_blue_iron_bars_cap", + "y": 90 + }, + "when": { + "east": "true", + "north": "false", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/rusty_blue_iron_bars_cap_alt" + }, + "when": { + "east": "false", + "north": "false", + "south": "true", + "west": "false" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/rusty_blue_iron_bars_cap_alt", + "y": 90 + }, + "when": { + "east": "false", + "north": "false", + "south": "false", + "west": "true" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/rusty_blue_iron_bars_side" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/rusty_blue_iron_bars_side", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/rusty_blue_iron_bars_side_alt" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/rusty_blue_iron_bars_side_alt", + "y": 90 + }, + "when": { + "west": "true" + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/vintage_iron_bars.json b/src/main/resources/assets/new_soviet/blockstates/vintage_iron_bars.json new file mode 100644 index 0000000..6a3e50f --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/vintage_iron_bars.json @@ -0,0 +1,100 @@ +{ + "multipart": [ + { + "apply": { + "model": "new_soviet:block/fences/vintage_iron_bars_post_ends" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/vintage_iron_bars_post" + }, + "when": { + "east": "false", + "north": "false", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/vintage_iron_bars_cap" + }, + "when": { + "east": "false", + "north": "true", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/vintage_iron_bars_cap", + "y": 90 + }, + "when": { + "east": "true", + "north": "false", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/vintage_iron_bars_cap_alt" + }, + "when": { + "east": "false", + "north": "false", + "south": "true", + "west": "false" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/vintage_iron_bars_cap_alt", + "y": 90 + }, + "when": { + "east": "false", + "north": "false", + "south": "false", + "west": "true" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/vintage_iron_bars_side" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/vintage_iron_bars_side", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/vintage_iron_bars_side_alt" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "new_soviet:block/fences/vintage_iron_bars_side_alt", + "y": 90 + }, + "when": { + "west": "true" + } + } + ] +} \ No newline at end of file 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 afde234..853411d 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -447,6 +447,9 @@ "block.new_soviet.modern_post_lamp": "Modern Post Lamp", "block.new_soviet.big_post_lamp": "Big Post Lamp", "block.new_soviet.vintage_post_lamp": "Vintage Post Lamp", + "block.new_soviet.blue_iron_bars": "Blue Iron Bars", + "block.new_soviet.rusty_blue_iron_bars": "Rusty Blue Iron Bars", + "block.new_soviet.vintage_iron_bars": "Vintage Iron Bars", "advancement.new_soviet.root.name": "A New Era", "advancement.new_soviet.root.desc": "Time to create something great" diff --git a/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_cap.json b/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_cap.json new file mode 100644 index 0000000..1fabee4 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/blue_iron_bars", + "bars": "new_soviet:block/fences/blue_iron_bars", + "edge": "new_soviet:block/fences/blue_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_cap_alt.json b/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_cap_alt.json new file mode 100644 index 0000000..52dbeb3 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/blue_iron_bars", + "bars": "new_soviet:block/fences/blue_iron_bars", + "edge": "new_soviet:block/fences/blue_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_post.json b/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_post.json new file mode 100644 index 0000000..35c3caf --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/blue_iron_bars", + "bars": "new_soviet:block/fences/blue_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_post_ends.json b/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_post_ends.json new file mode 100644 index 0000000..135df50 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/blue_iron_bars", + "edge": "new_soviet:block/fences/blue_iron_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_side.json b/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_side.json new file mode 100644 index 0000000..9fb8b38 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/blue_iron_bars", + "bars": "new_soviet:block/fences/blue_iron_bars", + "edge": "new_soviet:block/fences/blue_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_side_alt.json b/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_side_alt.json new file mode 100644 index 0000000..52f545c --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/blue_iron_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/blue_iron_bars", + "bars": "new_soviet:block/fences/blue_iron_bars", + "edge": "new_soviet:block/fences/blue_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_cap.json b/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_cap.json new file mode 100644 index 0000000..6036bb0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/rusty_blue_iron_bars", + "bars": "new_soviet:block/fences/rusty_blue_iron_bars", + "edge": "new_soviet:block/fences/rusty_blue_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_cap_alt.json b/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_cap_alt.json new file mode 100644 index 0000000..8f93479 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/rusty_blue_iron_bars", + "bars": "new_soviet:block/fences/rusty_blue_iron_bars", + "edge": "new_soviet:block/fences/rusty_blue_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_post.json b/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_post.json new file mode 100644 index 0000000..ea30f01 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/rusty_blue_iron_bars", + "bars": "new_soviet:block/fences/rusty_blue_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_post_ends.json b/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_post_ends.json new file mode 100644 index 0000000..68aeaf5 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/rusty_blue_iron_bars", + "edge": "new_soviet:block/fences/rusty_blue_iron_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_side.json b/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_side.json new file mode 100644 index 0000000..ef231a7 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/rusty_blue_iron_bars", + "bars": "new_soviet:block/fences/rusty_blue_iron_bars", + "edge": "new_soviet:block/fences/rusty_blue_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_side_alt.json b/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_side_alt.json new file mode 100644 index 0000000..950efb3 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/rusty_blue_iron_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/rusty_blue_iron_bars", + "bars": "new_soviet:block/fences/rusty_blue_iron_bars", + "edge": "new_soviet:block/fences/rusty_blue_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_cap.json b/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_cap.json new file mode 100644 index 0000000..74fdd6f --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_cap.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/vintage_iron_bars", + "bars": "new_soviet:block/fences/vintage_iron_bars", + "edge": "new_soviet:block/fences/vintage_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 8, 0, 7, 16 ], "texture": "#bars" }, + "east": { "uv": [ 7, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_cap_alt.json b/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_cap_alt.json new file mode 100644 index 0000000..83571c1 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_cap_alt.json @@ -0,0 +1,24 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/vintage_iron_bars", + "bars": "new_soviet:block/fences/vintage_iron_bars", + "edge": "new_soviet:block/fences/vintage_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 8, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_post.json b/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_post.json new file mode 100644 index 0000000..42ba588 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_post.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/vintage_iron_bars", + "bars": "new_soviet:block/fences/vintage_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 7 ], + "to": [ 8, 16, 9 ], + "faces": { + "west": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "east": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 8 ], + "to": [ 9, 16, 8 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#bars" }, + "south": { "uv": [ 9, 0, 7, 16 ], "texture": "#bars" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_post_ends.json b/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_post_ends.json new file mode 100644 index 0000000..b4a9da4 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_post_ends.json @@ -0,0 +1,23 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/vintage_iron_bars", + "edge": "new_soviet:block/fences/vintage_iron_bars" + }, + "elements": [ + { "from": [ 7, 0.001, 7 ], + "to": [ 9, 0.001, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 7 ], + "to": [ 9, 15.999, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_side.json b/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_side.json new file mode 100644 index 0000000..5461323 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_side.json @@ -0,0 +1,37 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/vintage_iron_bars", + "bars": "new_soviet:block/fences/vintage_iron_bars", + "edge": "new_soviet:block/fences/vintage_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 0 ], + "to": [ 8, 16, 8 ], + "faces": { + "west": { "uv": [ 16, 0, 8, 16 ], "texture": "#bars" }, + "east": { "uv": [ 8, 0, 16, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" } + } + }, + { "from": [ 7, 0.001, 0 ], + "to": [ 9, 0.001, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 0 ], + "to": [ 9, 15.999, 7 ], + "faces": { + "down": { "uv": [ 9, 0, 7, 7 ], "texture": "#edge" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_side_alt.json b/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_side_alt.json new file mode 100644 index 0000000..6850895 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/fences/vintage_iron_bars_side_alt.json @@ -0,0 +1,39 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "new_soviet:block/fences/vintage_iron_bars", + "bars": "new_soviet:block/fences/vintage_iron_bars", + "edge": "new_soviet:block/fences/vintage_iron_bars" + }, + "elements": [ + { "from": [ 8, 0, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "west": { "uv": [ 8, 0, 0, 16 ], "texture": "#bars" }, + "east": { "uv": [ 0, 0, 8, 16 ], "texture": "#bars" } + } + }, + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 0.001, 9 ], + "to": [ 9, 0.001, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + }, + { "from": [ 7, 15.999, 9 ], + "to": [ 9, 15.999, 16 ], + "faces": { + "down": { "uv": [ 9, 9, 7, 16 ], "texture": "#edge" }, + "up": { "uv": [ 7, 9, 9, 16 ], "texture": "#edge" } + } + } + ] +} diff --git a/src/main/resources/assets/new_soviet/models/item/blue_iron_bars.json b/src/main/resources/assets/new_soviet/models/item/blue_iron_bars.json new file mode 100644 index 0000000..eb4a1d3 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/blue_iron_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "new_soviet:block/fences/blue_iron_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/rusty_blue_iron_bars.json b/src/main/resources/assets/new_soviet/models/item/rusty_blue_iron_bars.json new file mode 100644 index 0000000..9d10f6d --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/rusty_blue_iron_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "new_soviet:block/fences/rusty_blue_iron_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/vintage_iron_bars.json b/src/main/resources/assets/new_soviet/models/item/vintage_iron_bars.json new file mode 100644 index 0000000..054a2d1 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/vintage_iron_bars.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "new_soviet:block/fences/vintage_iron_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/textures/block/fences/fence2.png b/src/main/resources/assets/new_soviet/textures/block/fences/blue_iron_bars.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/fences/fence2.png rename to src/main/resources/assets/new_soviet/textures/block/fences/blue_iron_bars.png diff --git a/src/main/resources/assets/new_soviet/textures/block/fences/fence2_rusty.png b/src/main/resources/assets/new_soviet/textures/block/fences/rusty_blue_iron_bars.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/fences/fence2_rusty.png rename to src/main/resources/assets/new_soviet/textures/block/fences/rusty_blue_iron_bars.png diff --git a/src/main/resources/assets/new_soviet/textures/block/fences/fence1.png b/src/main/resources/assets/new_soviet/textures/block/fences/vintage_iron_bars.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/fences/fence1.png rename to src/main/resources/assets/new_soviet/textures/block/fences/vintage_iron_bars.png