diff --git a/src/client/java/su/a71/new_soviet/NewSovietClient.java b/src/client/java/su/a71/new_soviet/NewSovietClient.java index 7eac903..b985c71 100644 --- a/src/client/java/su/a71/new_soviet/NewSovietClient.java +++ b/src/client/java/su/a71/new_soviet/NewSovietClient.java @@ -4,18 +4,12 @@ import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; -import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry; import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; -import net.minecraft.block.TallPlantBlock; -import net.minecraft.block.enums.DoubleBlockHalf; -import net.minecraft.client.color.world.BiomeColors; -import net.minecraft.client.color.world.GrassColors; import net.minecraft.client.render.RenderLayer; +import su.a71.new_soviet.blocks.BoundaryMarkerBlock; import su.a71.new_soviet.registration.NSE_Blocks; import su.a71.new_soviet.registration.NSE_Custom; -import net.minecraft.client.color.block.BlockColors; - @Environment(EnvType.CLIENT) public class NewSovietClient implements ClientModInitializer { @@ -47,6 +41,28 @@ public class NewSovietClient implements ClientModInitializer { // BlockEntityRendererRegistry.register(NSE_Custom.TV_BLOCK_ENTITY, TVBlockEntityRenderer::new); - ColorProviderRegistry.BLOCK.register((state, view, pos, tintIndex) -> 0xeb4034, NSE_Blocks.BLUE_BOUNDARY_MARKER); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.WHITE_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.LIGHT_GRAY_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.GRAY_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.BLACK_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.BLUE_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.LIGHT_BLUE_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.GREEN_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.LIME_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.BROWN_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.CYAN_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.RED_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.ORANGE_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.YELLOW_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.PINK_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.MAGENTA_BOUNDARY_MARKER, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.PURPLE_BOUNDARY_MARKER, RenderLayer.getCutout()); + + ColorProviderRegistry.BLOCK.register((state, view, pos, tintIndex) -> BoundaryMarkerBlock.getColour(state.get(BoundaryMarkerBlock.COLOUR)), NSE_Blocks.LIGHT_BLUE_BOUNDARY_MARKER, NSE_Blocks.WHITE_BOUNDARY_MARKER, NSE_Blocks.LIGHT_GRAY_BOUNDARY_MARKER, + NSE_Blocks.GRAY_BOUNDARY_MARKER, NSE_Blocks.BLACK_BOUNDARY_MARKER, NSE_Blocks.BLUE_BOUNDARY_MARKER, + NSE_Blocks.GREEN_BOUNDARY_MARKER, NSE_Blocks.LIME_BOUNDARY_MARKER, NSE_Blocks.BROWN_BOUNDARY_MARKER, + NSE_Blocks.CYAN_BOUNDARY_MARKER, NSE_Blocks.RED_BOUNDARY_MARKER, NSE_Blocks.ORANGE_BOUNDARY_MARKER, + NSE_Blocks.YELLOW_BOUNDARY_MARKER, NSE_Blocks.PINK_BOUNDARY_MARKER, NSE_Blocks.MAGENTA_BOUNDARY_MARKER, + NSE_Blocks.PURPLE_BOUNDARY_MARKER); } } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json index fbe6fc6..6eea78c 100644 --- a/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -272,6 +272,22 @@ "new_soviet:light_bulb_lamp", "new_soviet:blue_iron_bars", "new_soviet:rusty_blue_iron_bars", - "new_soviet:vintage_iron_bars" + "new_soviet:vintage_iron_bars", + "new_soviet:blue_boundary_marker", + "new_soviet:white_boundary_marker", + "new_soviet:light_blue_boundary_marker", + "new_soviet:black_boundary_marker", + "new_soviet:purple_boundary_marker", + "new_soviet:magenta_boundary_marker", + "new_soviet:pink_boundary_marker", + "new_soviet:cyan_boundary_marker", + "new_soviet:light_gray_boundary_marker", + "new_soviet:gray_boundary_marker", + "new_soviet:brown_boundary_marker", + "new_soviet:green_boundary_marker", + "new_soviet:lime_boundary_marker", + "new_soviet:yellow_boundary_marker", + "new_soviet:red_boundary_marker", + "new_soviet:orange_boundary_marker" ] } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/black_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/black_boundary_marker.json new file mode 100644 index 0000000..50d7ff1 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/black_boundary_marker.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:black_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/blue_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/blue_boundary_marker.json new file mode 100644 index 0000000..e729dd5 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/blue_boundary_marker.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_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/brown_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/brown_boundary_marker.json new file mode 100644 index 0000000..de307bb --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/brown_boundary_marker.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:brown_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cyan_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cyan_boundary_marker.json new file mode 100644 index 0000000..f0cbcde --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cyan_boundary_marker.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:cyan_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/gray_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/gray_boundary_marker.json new file mode 100644 index 0000000..870ff0e --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/gray_boundary_marker.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:gray_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/green_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/green_boundary_marker.json new file mode 100644 index 0000000..728d968 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/green_boundary_marker.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:green_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/light_blue_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/light_blue_boundary_marker.json new file mode 100644 index 0000000..36a5985 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/light_blue_boundary_marker.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:light_blue_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/light_gray_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/light_gray_boundary_marker.json new file mode 100644 index 0000000..7b3ac16 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/light_gray_boundary_marker.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:light_gray_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/lime_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/lime_boundary_marker.json new file mode 100644 index 0000000..930e6d6 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/lime_boundary_marker.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:lime_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/magenta_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/magenta_boundary_marker.json new file mode 100644 index 0000000..2e6935b --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/magenta_boundary_marker.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:magenta_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/orange_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/orange_boundary_marker.json new file mode 100644 index 0000000..5d8c04a --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/orange_boundary_marker.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:orange_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/pink_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/pink_boundary_marker.json new file mode 100644 index 0000000..fcd0c68 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/pink_boundary_marker.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:pink_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/purple_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/purple_boundary_marker.json new file mode 100644 index 0000000..839c959 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/purple_boundary_marker.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:purple_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/red_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/red_boundary_marker.json new file mode 100644 index 0000000..14694fb --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/red_boundary_marker.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:red_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/white_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/white_boundary_marker.json new file mode 100644 index 0000000..6029376 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/white_boundary_marker.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:white_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/yellow_boundary_marker.json b/src/main/generated/data/new_soviet/loot_tables/blocks/yellow_boundary_marker.json new file mode 100644 index 0000000..e90cd00 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/yellow_boundary_marker.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:yellow_boundary_marker" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/tags/blocks/boundary_markers.json b/src/main/generated/data/new_soviet/tags/blocks/boundary_markers.json new file mode 100644 index 0000000..b064970 --- /dev/null +++ b/src/main/generated/data/new_soviet/tags/blocks/boundary_markers.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "new_soviet:blue_boundary_marker", + "new_soviet:white_boundary_marker", + "new_soviet:light_blue_boundary_marker", + "new_soviet:black_boundary_marker", + "new_soviet:purple_boundary_marker", + "new_soviet:magenta_boundary_marker", + "new_soviet:pink_boundary_marker", + "new_soviet:cyan_boundary_marker", + "new_soviet:light_gray_boundary_marker", + "new_soviet:gray_boundary_marker", + "new_soviet:brown_boundary_marker", + "new_soviet:green_boundary_marker", + "new_soviet:lime_boundary_marker", + "new_soviet:yellow_boundary_marker", + "new_soviet:red_boundary_marker", + "new_soviet:orange_boundary_marker" + ] +} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/BoundaryMarkerBlock.java b/src/main/java/su/a71/new_soviet/blocks/BoundaryMarkerBlock.java index 4463a2b..b8ccd18 100644 --- a/src/main/java/su/a71/new_soviet/blocks/BoundaryMarkerBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/BoundaryMarkerBlock.java @@ -1,20 +1,19 @@ package su.a71.new_soviet.blocks; import net.minecraft.block.*; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; +import net.minecraft.item.BucketItem; import net.minecraft.item.DyeItem; -import net.minecraft.item.ItemPlacementContext; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; -import net.minecraft.state.property.DirectionProperty; import net.minecraft.state.property.IntProperty; import net.minecraft.state.property.Properties; import net.minecraft.util.ActionResult; +import net.minecraft.util.DyeColor; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; @@ -50,11 +49,14 @@ public class BoundaryMarkerBlock extends Block implements Waterloggable { public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { if (player.getInventory().getMainHandStack().getItem() instanceof DyeItem) { if (!world.isClient()) { + int id = ((DyeItem) player.getInventory().getMainHandStack().getItem()).getColor().getId(); + if (id == state.get(COLOUR)) + return ActionResult.CONSUME; if (!player.isCreative()) { player.getInventory().getMainHandStack().decrement(1); } + world.setBlockState(pos, state.with(COLOUR, id)); world.playSound((PlayerEntity)null, pos, SoundEvents.ITEM_DYE_USE, SoundCategory.BLOCKS, 1.0F, 1.0F); -// world.setBlockState(pos, state.with(COLOUR, player.getInventory().getMainHandStack().getItem())) } return ActionResult.SUCCESS; } @@ -76,6 +78,29 @@ public class BoundaryMarkerBlock extends Block implements Waterloggable { static { WATERLOGGED = Properties.WATERLOGGED; SHAPE = Block.createCuboidShape(5, 0, 5, 11, 16, 11); - COLOUR = IntProperty.of("border_colour", 0, 16); // 0 - undyed, 1-16 = dyes + COLOUR = IntProperty.of("border_colour", 0, 15); // 0-16 = dyes + } + + // DyeColor IDs with better colours + public static int getColour(int id) { + return switch (id) { + case 0 -> 0xffffff; + case 1 -> 0xb67134; + case 2 -> 0xab4d8b; + case 3 -> 0x398b9c; + case 4 -> 0xb08732; + case 5 -> 0x489d1b; + case 6 -> 0xcf7a92; + case 7 -> 0x353e42; + case 8 -> 0x777771; + case 9 -> 0x18797e; + case 10 -> 0x813995; + case 11 -> 0x354a85; + case 12 -> 0x614332; + case 13 -> 0x1b6031; + case 14 -> 0x8b2030; + case 15 -> 0x272228; + default -> 0xffffff; + }; } } diff --git a/src/main/java/su/a71/new_soviet/datagen/Advancements.java b/src/main/java/su/a71/new_soviet/datagen/Advancements.java index 66f9bff..c7812fe 100644 --- a/src/main/java/su/a71/new_soviet/datagen/Advancements.java +++ b/src/main/java/su/a71/new_soviet/datagen/Advancements.java @@ -11,6 +11,7 @@ import net.minecraft.predicate.entity.DamageSourcePredicate; import net.minecraft.predicate.entity.EntityEquipmentPredicate; import net.minecraft.predicate.entity.EntityPredicate; import net.minecraft.predicate.item.ItemPredicate; +import net.minecraft.registry.tag.ItemTags; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import su.a71.new_soviet.NewSoviet; 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 a129457..21cbf62 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java @@ -181,6 +181,22 @@ public class BlockLootTables extends FabricBlockLootTableProvider { addDrop(NSE_Blocks.BLUE_IRON_BARS); addDrop(NSE_Blocks.RUSTY_BLUE_IRON_BARS); addDrop(NSE_Blocks.VINTAGE_IRON_BARS); + addDrop(NSE_Blocks.BLUE_BOUNDARY_MARKER); + addDrop(NSE_Blocks.WHITE_BOUNDARY_MARKER); + addDrop(NSE_Blocks.LIGHT_BLUE_BOUNDARY_MARKER); + addDrop(NSE_Blocks.BLACK_BOUNDARY_MARKER); + addDrop(NSE_Blocks.PURPLE_BOUNDARY_MARKER); + addDrop(NSE_Blocks.MAGENTA_BOUNDARY_MARKER); + addDrop(NSE_Blocks.PINK_BOUNDARY_MARKER); + addDrop(NSE_Blocks.CYAN_BOUNDARY_MARKER); + addDrop(NSE_Blocks.LIGHT_GRAY_BOUNDARY_MARKER); + addDrop(NSE_Blocks.GRAY_BOUNDARY_MARKER); + addDrop(NSE_Blocks.BROWN_BOUNDARY_MARKER); + addDrop(NSE_Blocks.GREEN_BOUNDARY_MARKER); + addDrop(NSE_Blocks.LIME_BOUNDARY_MARKER); + addDrop(NSE_Blocks.YELLOW_BOUNDARY_MARKER); + addDrop(NSE_Blocks.RED_BOUNDARY_MARKER); + addDrop(NSE_Blocks.ORANGE_BOUNDARY_MARKER); // Drops for furniture/electronics/appliances addDrop(NSE_Custom.WHITE_PAWN); 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 8fe9fa7..0f8630e 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java @@ -292,7 +292,23 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Custom.LIGHT_BULB_LAMP) .add(NSE_Blocks.BLUE_IRON_BARS) .add(NSE_Blocks.RUSTY_BLUE_IRON_BARS) - .add(NSE_Blocks.VINTAGE_IRON_BARS); + .add(NSE_Blocks.VINTAGE_IRON_BARS) + .add(NSE_Blocks.BLUE_BOUNDARY_MARKER) + .add(NSE_Blocks.WHITE_BOUNDARY_MARKER) + .add(NSE_Blocks.LIGHT_BLUE_BOUNDARY_MARKER) + .add(NSE_Blocks.BLACK_BOUNDARY_MARKER) + .add(NSE_Blocks.PURPLE_BOUNDARY_MARKER) + .add(NSE_Blocks.MAGENTA_BOUNDARY_MARKER) + .add(NSE_Blocks.PINK_BOUNDARY_MARKER) + .add(NSE_Blocks.CYAN_BOUNDARY_MARKER) + .add(NSE_Blocks.LIGHT_GRAY_BOUNDARY_MARKER) + .add(NSE_Blocks.GRAY_BOUNDARY_MARKER) + .add(NSE_Blocks.BROWN_BOUNDARY_MARKER) + .add(NSE_Blocks.GREEN_BOUNDARY_MARKER) + .add(NSE_Blocks.LIME_BOUNDARY_MARKER) + .add(NSE_Blocks.YELLOW_BOUNDARY_MARKER) + .add(NSE_Blocks.RED_BOUNDARY_MARKER) + .add(NSE_Blocks.ORANGE_BOUNDARY_MARKER); // Blocks mined with an axe getOrCreateTagBuilder(BlockTags.AXE_MINEABLE) @@ -683,5 +699,23 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB) .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB) .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB); + + getOrCreateTagBuilder(NSE_Tags.Blocks.BOUNDARY_MARKERS) + .add(NSE_Blocks.BLUE_BOUNDARY_MARKER) + .add(NSE_Blocks.WHITE_BOUNDARY_MARKER) + .add(NSE_Blocks.LIGHT_BLUE_BOUNDARY_MARKER) + .add(NSE_Blocks.BLACK_BOUNDARY_MARKER) + .add(NSE_Blocks.PURPLE_BOUNDARY_MARKER) + .add(NSE_Blocks.MAGENTA_BOUNDARY_MARKER) + .add(NSE_Blocks.PINK_BOUNDARY_MARKER) + .add(NSE_Blocks.CYAN_BOUNDARY_MARKER) + .add(NSE_Blocks.LIGHT_GRAY_BOUNDARY_MARKER) + .add(NSE_Blocks.GRAY_BOUNDARY_MARKER) + .add(NSE_Blocks.BROWN_BOUNDARY_MARKER) + .add(NSE_Blocks.GREEN_BOUNDARY_MARKER) + .add(NSE_Blocks.LIME_BOUNDARY_MARKER) + .add(NSE_Blocks.YELLOW_BOUNDARY_MARKER) + .add(NSE_Blocks.RED_BOUNDARY_MARKER) + .add(NSE_Blocks.ORANGE_BOUNDARY_MARKER); } } \ No newline at end of file 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 3e39213..6032996 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 @@ -404,7 +404,22 @@ public class NSE_Blocks extends NSE_BaseRegistration { public static final StairsBlock NII_FLOOR_STAIRS = new StairsBlock(NII_FLOOR.getDefaultState(), FabricBlockSettings.copy(NII_FLOOR)); public static final SlabBlock NII_FLOOR_SLAB = new SlabBlock(FabricBlockSettings.copy(NII_FLOOR)); - public static final Block BLUE_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).hardness(1.5f).resistance(4f).requiresTool().mapColor(MapColor.TERRACOTTA_BLUE)); + public static final Block WHITE_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).hardness(1.5f).resistance(4f).requiresTool().mapColor(MapColor.WHITE)); + public static final Block LIGHT_GRAY_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.LIGHT_GRAY)); + public static final Block GRAY_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.GRAY)); + public static final Block BLACK_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.BLACK)); + public static final Block BLUE_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.WHITE)); + public static final Block LIGHT_BLUE_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.LIGHT_BLUE)); + public static final Block GREEN_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.GREEN)); + public static final Block LIME_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.LIME)); + public static final Block BROWN_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.BROWN)); + public static final Block CYAN_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.CYAN)); + public static final Block RED_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.RED)); + public static final Block ORANGE_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.ORANGE)); + public static final Block YELLOW_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.YELLOW)); + public static final Block PINK_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.PINK)); + public static final Block MAGENTA_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.MAGENTA)); + public static final Block PURPLE_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.PURPLE)); // Industrial ========== public static final Block INDUSTRIAL_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.BLACK)); @@ -834,7 +849,22 @@ public class NSE_Blocks extends NSE_BaseRegistration { registerBlock("chiseled_spruce_door", () -> CHISELED_SPRUCE_DOOR, NSE_BUILDING_TAB); registerBlock("chiseled_birch_door", () -> CHISELED_BIRCH_DOOR, NSE_BUILDING_TAB); + registerBlock("white_boundary_marker", () -> WHITE_BOUNDARY_MARKER, NSE_BUILDING_TAB); + registerBlock("light_gray_boundary_marker", () -> LIGHT_GRAY_BOUNDARY_MARKER, NSE_BUILDING_TAB); + registerBlock("gray_boundary_marker", () -> GRAY_BOUNDARY_MARKER, NSE_BUILDING_TAB); + registerBlock("black_boundary_marker", () -> BLACK_BOUNDARY_MARKER, NSE_BUILDING_TAB); registerBlock("blue_boundary_marker", () -> BLUE_BOUNDARY_MARKER, NSE_BUILDING_TAB); + registerBlock("light_blue_boundary_marker", () -> LIGHT_BLUE_BOUNDARY_MARKER, NSE_BUILDING_TAB); + registerBlock("green_boundary_marker", () -> GREEN_BOUNDARY_MARKER, NSE_BUILDING_TAB); + registerBlock("lime_boundary_marker", () -> LIME_BOUNDARY_MARKER, NSE_BUILDING_TAB); + registerBlock("brown_boundary_marker", () -> BROWN_BOUNDARY_MARKER, NSE_BUILDING_TAB); + registerBlock("cyan_boundary_marker", () -> CYAN_BOUNDARY_MARKER, NSE_BUILDING_TAB); + registerBlock("red_boundary_marker", () -> RED_BOUNDARY_MARKER, NSE_BUILDING_TAB); + registerBlock("orange_boundary_marker", () -> ORANGE_BOUNDARY_MARKER, NSE_BUILDING_TAB); + registerBlock("yellow_boundary_marker", () -> YELLOW_BOUNDARY_MARKER, NSE_BUILDING_TAB); + registerBlock("pink_boundary_marker", () -> PINK_BOUNDARY_MARKER, NSE_BUILDING_TAB); + registerBlock("magenta_boundary_marker", () -> MAGENTA_BOUNDARY_MARKER, NSE_BUILDING_TAB); + registerBlock("purple_boundary_marker", () -> PURPLE_BOUNDARY_MARKER, NSE_BUILDING_TAB); registerBlock("industrial_warning", () -> INDUSTRIAL_WARNING, NSE_BUILDING_TAB); registerBlock("gray_warning", () -> GRAY_WARNING, NSE_BUILDING_TAB); 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 096dc06..e2a8fc3 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 @@ -11,6 +11,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 final TagKey BOUNDARY_MARKERS = createBlockTag("boundary_markers"); } public static class Items { diff --git a/src/main/resources/assets/new_soviet/blockstates/black_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/black_boundary_marker.json new file mode 100644 index 0000000..b12e7d7 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/black_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/black_boundary_marker" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/brown_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/brown_boundary_marker.json new file mode 100644 index 0000000..fef4b51 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/brown_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/brown_boundary_marker" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cyan_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/cyan_boundary_marker.json new file mode 100644 index 0000000..d2f1d30 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cyan_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/cyan_boundary_marker" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/gray_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/gray_boundary_marker.json new file mode 100644 index 0000000..beab48c --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/gray_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/gray_boundary_marker" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/green_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/green_boundary_marker.json new file mode 100644 index 0000000..e895994 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/green_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/green_boundary_marker" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/light_blue_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/light_blue_boundary_marker.json new file mode 100644 index 0000000..3ec67e3 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/light_blue_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/light_blue_boundary_marker" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/light_gray_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/light_gray_boundary_marker.json new file mode 100644 index 0000000..66ebc67 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/light_gray_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/light_gray_boundary_marker" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/lime_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/lime_boundary_marker.json new file mode 100644 index 0000000..0e90ac4 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/lime_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/lime_boundary_marker" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/magenta_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/magenta_boundary_marker.json new file mode 100644 index 0000000..31be4a4 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/magenta_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/magenta_boundary_marker" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/orange_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/orange_boundary_marker.json new file mode 100644 index 0000000..0942488 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/orange_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/orange_boundary_marker" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/pink_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/pink_boundary_marker.json new file mode 100644 index 0000000..3987cae --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/pink_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/pink_boundary_marker" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/purple_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/purple_boundary_marker.json new file mode 100644 index 0000000..ef0700c --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/purple_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/purple_boundary_marker" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/red_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/red_boundary_marker.json new file mode 100644 index 0000000..147418b --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/red_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/red_boundary_marker" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/white_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/white_boundary_marker.json new file mode 100644 index 0000000..d9d1278 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/white_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/white_boundary_marker" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/yellow_boundary_marker.json b/src/main/resources/assets/new_soviet/blockstates/yellow_boundary_marker.json new file mode 100644 index 0000000..6bb538c --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/yellow_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/boundary/yellow_boundary_marker" + } + } +} \ 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 40977c9..cdc2093 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -451,7 +451,21 @@ "block.new_soviet.rusty_blue_iron_bars": "Rusty Blue Iron Bars", "block.new_soviet.vintage_iron_bars": "Vintage Iron Bars", "block.new_soviet.blue_boundary_marker": "Blue Boundary Marker", - + "block.new_soviet.black_boundary_marker": "Black Boundary Marker", + "block.new_soviet.brown_boundary_marker": "Brown Boundary Marker", + "block.new_soviet.red_boundary_marker": "Red Boundary Marker", + "block.new_soviet.purple_boundary_marker": "Purple Boundary Marker", + "block.new_soviet.magenta_boundary_marker": "Magenta Boundary Marker", + "block.new_soviet.pink_boundary_marker": "Pink Boundary Marker", + "block.new_soviet.light_blue_boundary_marker": "Light Blue Boundary Marker", + "block.new_soviet.green_boundary_marker": "Green Boundary Marker", + "block.new_soviet.white_boundary_marker": "White Boundary Marker", + "block.new_soviet.light_gray_boundary_marker": "Light Gray Boundary Marker", + "block.new_soviet.gray_boundary_marker": "Gray Boundary Marker", + "block.new_soviet.lime_boundary_marker": "Lime Boundary Marker", + "block.new_soviet.yellow_boundary_marker": "Yellow Boundary Marker", + "block.new_soviet.orange_boundary_marker": "Orange Boundary Marker", + "block.new_soviet.cyan_boundary_marker": "Cyan Boundary Marker", "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/boundary/black_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/black_boundary_marker.json new file mode 100644 index 0000000..5d59782 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/black_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_black", + "particle": "new_soviet:block/boundary_marker/boundary_black" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/blue_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/blue_boundary_marker.json index b30530d..5d81d96 100644 --- a/src/main/resources/assets/new_soviet/models/block/boundary/blue_boundary_marker.json +++ b/src/main/resources/assets/new_soviet/models/block/boundary/blue_boundary_marker.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "credit": "Made by Andrew_7_1 with BlockBench", "textures": { "0": "new_soviet:block/boundary_marker/boundary_blue", "1": "new_soviet:block/boundary_marker/boundary_overlay", @@ -7,7 +7,7 @@ }, "elements": [ { - "name": "overlay_cube", + "name": "overlay", "from": [5, 0, 5], "to": [11, 16, 11], "faces": { diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/brown_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/brown_boundary_marker.json new file mode 100644 index 0000000..f44ba72 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/brown_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_brown", + "particle": "new_soviet:block/boundary_marker/boundary_brown" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/cyan_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/cyan_boundary_marker.json new file mode 100644 index 0000000..2acd12b --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/cyan_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_cyan", + "particle": "new_soviet:block/boundary_marker/boundary_cyan" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/gray_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/gray_boundary_marker.json new file mode 100644 index 0000000..01daf44 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/gray_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_gray", + "particle": "new_soviet:block/boundary_marker/boundary_gray" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/green_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/green_boundary_marker.json new file mode 100644 index 0000000..25fdc4c --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/green_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_green", + "particle": "new_soviet:block/boundary_marker/boundary_green" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/light_blue_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/light_blue_boundary_marker.json new file mode 100644 index 0000000..1f8a718 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/light_blue_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_light_blue", + "particle": "new_soviet:block/boundary_marker/boundary_light_blue" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/light_gray_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/light_gray_boundary_marker.json new file mode 100644 index 0000000..fb52020 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/light_gray_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_light_gray", + "particle": "new_soviet:block/boundary_marker/boundary_light_gray" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/lime_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/lime_boundary_marker.json new file mode 100644 index 0000000..21b7f79 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/lime_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_lime", + "particle": "new_soviet:block/boundary_marker/boundary_lime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/magenta_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/magenta_boundary_marker.json new file mode 100644 index 0000000..257c41d --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/magenta_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_magenta", + "particle": "new_soviet:block/boundary_marker/boundary_magenta" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/orange_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/orange_boundary_marker.json new file mode 100644 index 0000000..637c390 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/orange_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_orange", + "particle": "new_soviet:block/boundary_marker/boundary_orange" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/pink_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/pink_boundary_marker.json new file mode 100644 index 0000000..2137175 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/pink_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_pink", + "particle": "new_soviet:block/boundary_marker/boundary_pink" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/purple_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/purple_boundary_marker.json new file mode 100644 index 0000000..6c54298 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/purple_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_purple", + "particle": "new_soviet:block/boundary_marker/boundary_purple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/red_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/red_boundary_marker.json new file mode 100644 index 0000000..c8d3acd --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/red_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_red", + "particle": "new_soviet:block/boundary_marker/boundary_red" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/white_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/white_boundary_marker.json new file mode 100644 index 0000000..b790537 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/white_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_white", + "particle": "new_soviet:block/boundary_marker/boundary_white" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/boundary/yellow_boundary_marker.json b/src/main/resources/assets/new_soviet/models/block/boundary/yellow_boundary_marker.json new file mode 100644 index 0000000..3fb0dab --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/boundary/yellow_boundary_marker.json @@ -0,0 +1,7 @@ +{ + "parent": "new_soviet:block/boundary/blue_boundary_marker", + "textures": { + "0": "new_soviet:block/boundary_marker/boundary_yellow", + "particle": "new_soviet:block/boundary_marker/boundary_yellow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/light_bulb_on.json b/src/main/resources/assets/new_soviet/models/block/light_bulb_on.json index cff42a3..b2eacc2 100644 --- a/src/main/resources/assets/new_soviet/models/block/light_bulb_on.json +++ b/src/main/resources/assets/new_soviet/models/block/light_bulb_on.json @@ -112,7 +112,6 @@ "name": "group", "origin": [16, 8, 16], "color": 0, - "nbt": "{}", "children": [0, 1, 2, 3, 4] } ] diff --git a/src/main/resources/assets/new_soviet/models/item/black_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/black_boundary_marker.json new file mode 100644 index 0000000..95836ec --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/black_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/black_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/brown_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/brown_boundary_marker.json new file mode 100644 index 0000000..09d0238 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/brown_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/brown_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/cyan_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/cyan_boundary_marker.json new file mode 100644 index 0000000..46ef474 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cyan_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/cyan_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/gray_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/gray_boundary_marker.json new file mode 100644 index 0000000..de9d061 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/gray_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/gray_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/green_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/green_boundary_marker.json new file mode 100644 index 0000000..2e96a26 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/green_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/green_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/light_blue_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/light_blue_boundary_marker.json new file mode 100644 index 0000000..2e52cf6 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/light_blue_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/light_blue_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/light_gray_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/light_gray_boundary_marker.json new file mode 100644 index 0000000..00aede0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/light_gray_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/light_gray_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/lime_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/lime_boundary_marker.json new file mode 100644 index 0000000..eb5a9f0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/lime_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/lime_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/magenta_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/magenta_boundary_marker.json new file mode 100644 index 0000000..e7ce4ab --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/magenta_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/magenta_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/orange_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/orange_boundary_marker.json new file mode 100644 index 0000000..2c52ba2 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/orange_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/orange_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/pink_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/pink_boundary_marker.json new file mode 100644 index 0000000..f8ca0d7 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/pink_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/pink_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/purple_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/purple_boundary_marker.json new file mode 100644 index 0000000..c7700cc --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/purple_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/purple_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/red_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/red_boundary_marker.json new file mode 100644 index 0000000..d18402c --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/red_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/red_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/white_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/white_boundary_marker.json new file mode 100644 index 0000000..7bd7cc7 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/white_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/white_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/yellow_boundary_marker.json b/src/main/resources/assets/new_soviet/models/item/yellow_boundary_marker.json new file mode 100644 index 0000000..066182a --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/yellow_boundary_marker.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/boundary/yellow_boundary_marker" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_black.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_black.png index 32fdd65..0352d9b 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_black.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_black.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_brown.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_brown.png index c7876ec..afa92b6 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_brown.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_brown.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_cyan.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_cyan.png index b137201..de7c86d 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_cyan.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_cyan.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_gray.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_gray.png index 64f217e..c20a5eb 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_gray.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_gray.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_green.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_green.png index 9d8f7f5..1451e1f 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_green.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_green.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_light_blue.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_light_blue.png index 255f7f4..c0ef729 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_light_blue.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_light_blue.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_light_gray.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_light_gray.png index 41e1856..4908f66 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_light_gray.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_light_gray.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_lime.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_lime.png index 8276ffd..7684a75 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_lime.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_lime.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_magenta.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_magenta.png index 0ab88bc..71f9548 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_magenta.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_magenta.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_orange.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_orange.png index e2e0b31..8276984 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_orange.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_orange.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_pink.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_pink.png index 21ddb80..bb60fb5 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_pink.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_pink.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_purple.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_purple.png index ce0aeca..e33affd 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_purple.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_purple.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_red.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_red.png index 7226506..267e360 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_red.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_red.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_white.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_white.png index 3c56315..9a3500a 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_white.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_white.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_yellow.png b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_yellow.png index de24ca3..cd8fa22 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_yellow.png and b/src/main/resources/assets/new_soviet/textures/block/boundary_marker/boundary_yellow.png differ