diff --git a/src/client/java/su/a71/new_soviet/NewSovietClient.java b/src/client/java/su/a71/new_soviet/NewSovietClient.java index 5bf67b0..86f75d9 100644 --- a/src/client/java/su/a71/new_soviet/NewSovietClient.java +++ b/src/client/java/su/a71/new_soviet/NewSovietClient.java @@ -78,6 +78,8 @@ public class NewSovietClient implements ClientModInitializer { BlockRenderLayerMap.INSTANCE.putBlock(NSE_Blocks.PURPLE_BOUNDARY_MARKER, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.W_MACHINE, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.TELEPHONE, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.RADIO_WAR, 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, diff --git a/src/client/java/su/a71/new_soviet/mixin/client/ItemRendererMixin.java b/src/client/java/su/a71/new_soviet/mixin/client/ItemRendererMixin.java index f173f0a..168890b 100644 --- a/src/client/java/su/a71/new_soviet/mixin/client/ItemRendererMixin.java +++ b/src/client/java/su/a71/new_soviet/mixin/client/ItemRendererMixin.java @@ -20,7 +20,30 @@ public abstract class ItemRendererMixin { public BakedModel useModels(BakedModel value, ItemStack stack, ModelTransformationMode renderMode, boolean leftHanded, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { if (stack.isOf(NSE_Items.CIGARETTE) && (renderMode == ModelTransformationMode.GUI || renderMode == ModelTransformationMode.GROUND)) { return ((ItemRendererAccessor) this).mccourse$getModels().getModelManager().getModel(new ModelIdentifier(NewSoviet.MOD_ID, "cigarette_item", "inventory")); + } else if (stack.isOf(NSE_Items.CIGARETTE) && (renderMode != ModelTransformationMode.GUI && renderMode != ModelTransformationMode.GROUND)) { + return ((ItemRendererAccessor) this).mccourse$getModels().getModelManager().getModel(new ModelIdentifier(NewSoviet.MOD_ID, "cigarette", "inventory")); } + if (stack.isOf(NSE_Items.FRIEND_CIGARETTE) && (renderMode == ModelTransformationMode.GUI || renderMode == ModelTransformationMode.GROUND)) { + return ((ItemRendererAccessor) this).mccourse$getModels().getModelManager().getModel(new ModelIdentifier(NewSoviet.MOD_ID, "cigarette_item", "inventory")); + } else if (stack.isOf(NSE_Items.CIGARETTE) && (renderMode != ModelTransformationMode.GUI && renderMode != ModelTransformationMode.GROUND)) { + return ((ItemRendererAccessor) this).mccourse$getModels().getModelManager().getModel(new ModelIdentifier(NewSoviet.MOD_ID, "cigarette", "inventory")); + } + if (stack.isOf(NSE_Items.DUCHESS_CIGARETTE) && (renderMode == ModelTransformationMode.GUI || renderMode == ModelTransformationMode.GROUND)) { + return ((ItemRendererAccessor) this).mccourse$getModels().getModelManager().getModel(new ModelIdentifier(NewSoviet.MOD_ID, "cigarette_item", "inventory")); + } else if (stack.isOf(NSE_Items.CIGARETTE) && (renderMode != ModelTransformationMode.GUI && renderMode != ModelTransformationMode.GROUND)) { + return ((ItemRendererAccessor) this).mccourse$getModels().getModelManager().getModel(new ModelIdentifier(NewSoviet.MOD_ID, "cigarette", "inventory")); + } + if (stack.isOf(NSE_Items.BELOMOR_CIGARETTE) && (renderMode == ModelTransformationMode.GUI || renderMode == ModelTransformationMode.GROUND)) { + return ((ItemRendererAccessor) this).mccourse$getModels().getModelManager().getModel(new ModelIdentifier(NewSoviet.MOD_ID, "cigarette_item", "inventory")); + } else if (stack.isOf(NSE_Items.CIGARETTE) && (renderMode != ModelTransformationMode.GUI && renderMode != ModelTransformationMode.GROUND)) { + return ((ItemRendererAccessor) this).mccourse$getModels().getModelManager().getModel(new ModelIdentifier(NewSoviet.MOD_ID, "cigarette", "inventory")); + } + if (stack.isOf(NSE_Items.HOMEMADE_CIGARETTE) && (renderMode == ModelTransformationMode.GUI || renderMode == ModelTransformationMode.GROUND)) { + return ((ItemRendererAccessor) this).mccourse$getModels().getModelManager().getModel(new ModelIdentifier(NewSoviet.MOD_ID, "homemade_cigarette_item", "inventory")); + } else if (stack.isOf(NSE_Items.HOMEMADE_CIGARETTE) && (renderMode != ModelTransformationMode.GUI && renderMode != ModelTransformationMode.GROUND)) { + return ((ItemRendererAccessor) this).mccourse$getModels().getModelManager().getModel(new ModelIdentifier(NewSoviet.MOD_ID, "homemade_cigarette", "inventory")); + } + if (stack.isOf(NSE_Blocks.ACACIA_WINDOW.asItem()) && !stack.getOrCreateNbt().getBoolean("broken")) { return ((ItemRendererAccessor) this).mccourse$getModels().getModelManager().getModel(new ModelIdentifier(NewSoviet.MOD_ID, "acacia_window_item", "inventory")); diff --git a/src/client/java/su/a71/new_soviet/mixin/client/ModelLoaderMixin.java b/src/client/java/su/a71/new_soviet/mixin/client/ModelLoaderMixin.java index 6974da6..6d1c453 100644 --- a/src/client/java/su/a71/new_soviet/mixin/client/ModelLoaderMixin.java +++ b/src/client/java/su/a71/new_soviet/mixin/client/ModelLoaderMixin.java @@ -23,7 +23,10 @@ public abstract class ModelLoaderMixin { @Inject(method = "", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/model/ModelLoader;addModel(Lnet/minecraft/client/util/ModelIdentifier;)V", ordinal = 3, shift = At.Shift.AFTER)) public void addModels(BlockColors blockColors, Profiler profiler, Map jsonUnbakedModels, Map> blockStates, CallbackInfo ci) { + this.addModel(new ModelIdentifier(NewSoviet.MOD_ID, "cigarette", "inventory")); this.addModel(new ModelIdentifier(NewSoviet.MOD_ID, "cigarette_item", "inventory")); + this.addModel(new ModelIdentifier(NewSoviet.MOD_ID, "homemade_cigarette", "inventory")); + this.addModel(new ModelIdentifier(NewSoviet.MOD_ID, "homemade_cigarette_item", "inventory")); this.addModel(new ModelIdentifier(NewSoviet.MOD_ID, "oak_window_item", "inventory")); this.addModel(new ModelIdentifier(NewSoviet.MOD_ID, "acacia_window_item", "inventory")); diff --git a/src/main/generated/assets/new_soviet/blockstates/concrete_tiles.json b/src/main/generated/assets/new_soviet/blockstates/concrete_tiles.json new file mode 100644 index 0000000..a77c223 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/concrete_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/concrete_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/concrete_tiles_slab.json b/src/main/generated/assets/new_soviet/blockstates/concrete_tiles_slab.json new file mode 100644 index 0000000..ed5734f --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/concrete_tiles_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "new_soviet:block/concrete_tiles_slab" + }, + "type=double": { + "model": "new_soviet:block/concrete_tiles" + }, + "type=top": { + "model": "new_soviet:block/concrete_tiles_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/concrete_tiles_stairs.json b/src/main/generated/assets/new_soviet/blockstates/concrete_tiles_stairs.json new file mode 100644 index 0000000..ea523de --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/concrete_tiles_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "new_soviet:block/concrete_tiles_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "new_soviet:block/concrete_tiles_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "new_soviet:block/concrete_tiles_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "new_soviet:block/concrete_tiles_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "new_soviet:block/concrete_tiles_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "new_soviet:block/concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "new_soviet:block/concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "new_soviet:block/concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "new_soviet:block/concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "new_soviet:block/concrete_tiles_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "new_soviet:block/concrete_tiles_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "new_soviet:block/concrete_tiles_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "new_soviet:block/concrete_tiles_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "new_soviet:block/concrete_tiles_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "new_soviet:block/concrete_tiles_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "new_soviet:block/concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "new_soviet:block/concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "new_soviet:block/concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "new_soviet:block/concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "new_soviet:block/concrete_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "new_soviet:block/concrete_tiles_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "new_soviet:block/concrete_tiles_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "new_soviet:block/concrete_tiles_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "new_soviet:block/concrete_tiles_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "new_soviet:block/concrete_tiles_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "new_soviet:block/concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "new_soviet:block/concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "new_soviet:block/concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "new_soviet:block/concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "new_soviet:block/concrete_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "new_soviet:block/concrete_tiles_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "new_soviet:block/concrete_tiles_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "new_soviet:block/concrete_tiles_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "new_soviet:block/concrete_tiles_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "new_soviet:block/concrete_tiles_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "new_soviet:block/concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "new_soviet:block/concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "new_soviet:block/concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "new_soviet:block/concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "new_soviet:block/concrete_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/cracked_concrete_tiles.json b/src/main/generated/assets/new_soviet/blockstates/cracked_concrete_tiles.json new file mode 100644 index 0000000..413b344 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/cracked_concrete_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_concrete_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/cracked_concrete_tiles_slab.json b/src/main/generated/assets/new_soviet/blockstates/cracked_concrete_tiles_slab.json new file mode 100644 index 0000000..54033db --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/cracked_concrete_tiles_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "new_soviet:block/cracked_concrete_tiles_slab" + }, + "type=double": { + "model": "new_soviet:block/cracked_concrete_tiles" + }, + "type=top": { + "model": "new_soviet:block/cracked_concrete_tiles_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/cracked_concrete_tiles_stairs.json b/src/main/generated/assets/new_soviet/blockstates/cracked_concrete_tiles_stairs.json new file mode 100644 index 0000000..ead48b5 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/cracked_concrete_tiles_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "new_soviet:block/cracked_concrete_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/mossy_concrete_tiles.json b/src/main/generated/assets/new_soviet/blockstates/mossy_concrete_tiles.json new file mode 100644 index 0000000..f4ce6ee --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/mossy_concrete_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/mossy_concrete_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/mossy_concrete_tiles_slab.json b/src/main/generated/assets/new_soviet/blockstates/mossy_concrete_tiles_slab.json new file mode 100644 index 0000000..1b1e7cc --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/mossy_concrete_tiles_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "new_soviet:block/mossy_concrete_tiles_slab" + }, + "type=double": { + "model": "new_soviet:block/mossy_concrete_tiles" + }, + "type=top": { + "model": "new_soviet:block/mossy_concrete_tiles_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/mossy_concrete_tiles_stairs.json b/src/main/generated/assets/new_soviet/blockstates/mossy_concrete_tiles_stairs.json new file mode 100644 index 0000000..7e65af2 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/mossy_concrete_tiles_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "new_soviet:block/mossy_concrete_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/concrete_tiles.json b/src/main/generated/assets/new_soviet/models/block/concrete_tiles.json new file mode 100644 index 0000000..3abcd37 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/concrete_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/concrete_tiles_slab.json b/src/main/generated/assets/new_soviet/models/block/concrete_tiles_slab.json new file mode 100644 index 0000000..100de96 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/concrete_tiles_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "new_soviet:block/concrete/concrete_tiles", + "side": "new_soviet:block/concrete/concrete_tiles", + "top": "new_soviet:block/concrete/concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/concrete_tiles_slab_top.json b/src/main/generated/assets/new_soviet/models/block/concrete_tiles_slab_top.json new file mode 100644 index 0000000..e0c67bb --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/concrete_tiles_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "new_soviet:block/concrete/concrete_tiles", + "side": "new_soviet:block/concrete/concrete_tiles", + "top": "new_soviet:block/concrete/concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/concrete_tiles_stairs.json b/src/main/generated/assets/new_soviet/models/block/concrete_tiles_stairs.json new file mode 100644 index 0000000..50723a8 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/concrete_tiles_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "new_soviet:block/concrete/concrete_tiles", + "side": "new_soviet:block/concrete/concrete_tiles", + "top": "new_soviet:block/concrete/concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/concrete_tiles_stairs_inner.json b/src/main/generated/assets/new_soviet/models/block/concrete_tiles_stairs_inner.json new file mode 100644 index 0000000..7ebcb9a --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/concrete_tiles_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "new_soviet:block/concrete/concrete_tiles", + "side": "new_soviet:block/concrete/concrete_tiles", + "top": "new_soviet:block/concrete/concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/concrete_tiles_stairs_outer.json b/src/main/generated/assets/new_soviet/models/block/concrete_tiles_stairs_outer.json new file mode 100644 index 0000000..c3fdf90 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/concrete_tiles_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "new_soviet:block/concrete/concrete_tiles", + "side": "new_soviet:block/concrete/concrete_tiles", + "top": "new_soviet:block/concrete/concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles.json new file mode 100644 index 0000000..c5cd234 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/cracked_concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_slab.json b/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_slab.json new file mode 100644 index 0000000..f74cd14 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "new_soviet:block/concrete/cracked_concrete_tiles", + "side": "new_soviet:block/concrete/cracked_concrete_tiles", + "top": "new_soviet:block/concrete/cracked_concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_slab_top.json b/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_slab_top.json new file mode 100644 index 0000000..6cf6111 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "new_soviet:block/concrete/cracked_concrete_tiles", + "side": "new_soviet:block/concrete/cracked_concrete_tiles", + "top": "new_soviet:block/concrete/cracked_concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_stairs.json b/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_stairs.json new file mode 100644 index 0000000..fae59eb --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "new_soviet:block/concrete/cracked_concrete_tiles", + "side": "new_soviet:block/concrete/cracked_concrete_tiles", + "top": "new_soviet:block/concrete/cracked_concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_stairs_inner.json b/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_stairs_inner.json new file mode 100644 index 0000000..6fb6993 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "new_soviet:block/concrete/cracked_concrete_tiles", + "side": "new_soviet:block/concrete/cracked_concrete_tiles", + "top": "new_soviet:block/concrete/cracked_concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_stairs_outer.json b/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_stairs_outer.json new file mode 100644 index 0000000..b6e22c7 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cracked_concrete_tiles_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "new_soviet:block/concrete/cracked_concrete_tiles", + "side": "new_soviet:block/concrete/cracked_concrete_tiles", + "top": "new_soviet:block/concrete/cracked_concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles.json b/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles.json new file mode 100644 index 0000000..d566ef7 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/mossy_concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_slab.json b/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_slab.json new file mode 100644 index 0000000..542beb1 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "new_soviet:block/concrete/mossy_concrete_tiles", + "side": "new_soviet:block/concrete/mossy_concrete_tiles", + "top": "new_soviet:block/concrete/mossy_concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_slab_top.json b/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_slab_top.json new file mode 100644 index 0000000..dfa963a --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "new_soviet:block/concrete/mossy_concrete_tiles", + "side": "new_soviet:block/concrete/mossy_concrete_tiles", + "top": "new_soviet:block/concrete/mossy_concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_stairs.json b/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_stairs.json new file mode 100644 index 0000000..f669cd9 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "new_soviet:block/concrete/mossy_concrete_tiles", + "side": "new_soviet:block/concrete/mossy_concrete_tiles", + "top": "new_soviet:block/concrete/mossy_concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_stairs_inner.json b/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_stairs_inner.json new file mode 100644 index 0000000..33eb21b --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "new_soviet:block/concrete/mossy_concrete_tiles", + "side": "new_soviet:block/concrete/mossy_concrete_tiles", + "top": "new_soviet:block/concrete/mossy_concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_stairs_outer.json b/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_stairs_outer.json new file mode 100644 index 0000000..75d857a --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/mossy_concrete_tiles_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "new_soviet:block/concrete/mossy_concrete_tiles", + "side": "new_soviet:block/concrete/mossy_concrete_tiles", + "top": "new_soviet:block/concrete/mossy_concrete_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/concrete_tiles.json b/src/main/generated/assets/new_soviet/models/item/concrete_tiles.json new file mode 100644 index 0000000..99fea44 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/concrete_tiles.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/concrete_tiles" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/concrete_tiles_slab.json b/src/main/generated/assets/new_soviet/models/item/concrete_tiles_slab.json new file mode 100644 index 0000000..50eaa44 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/concrete_tiles_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/concrete_tiles_slab" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/concrete_tiles_stairs.json b/src/main/generated/assets/new_soviet/models/item/concrete_tiles_stairs.json new file mode 100644 index 0000000..385a483 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/concrete_tiles_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/concrete_tiles_stairs" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/cracked_concrete_tiles.json b/src/main/generated/assets/new_soviet/models/item/cracked_concrete_tiles.json new file mode 100644 index 0000000..adce218 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/cracked_concrete_tiles.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cracked_concrete_tiles" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/cracked_concrete_tiles_slab.json b/src/main/generated/assets/new_soviet/models/item/cracked_concrete_tiles_slab.json new file mode 100644 index 0000000..2347d5f --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/cracked_concrete_tiles_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cracked_concrete_tiles_slab" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/cracked_concrete_tiles_stairs.json b/src/main/generated/assets/new_soviet/models/item/cracked_concrete_tiles_stairs.json new file mode 100644 index 0000000..66b3a90 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/cracked_concrete_tiles_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cracked_concrete_tiles_stairs" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/mossy_concrete_tiles.json b/src/main/generated/assets/new_soviet/models/item/mossy_concrete_tiles.json new file mode 100644 index 0000000..698a411 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/mossy_concrete_tiles.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/mossy_concrete_tiles" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/mossy_concrete_tiles_slab.json b/src/main/generated/assets/new_soviet/models/item/mossy_concrete_tiles_slab.json new file mode 100644 index 0000000..9ee9f79 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/mossy_concrete_tiles_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/mossy_concrete_tiles_slab" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/mossy_concrete_tiles_stairs.json b/src/main/generated/assets/new_soviet/models/item/mossy_concrete_tiles_stairs.json new file mode 100644 index 0000000..67219af --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/mossy_concrete_tiles_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/mossy_concrete_tiles_stairs" +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json b/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json index ed1edd4..7f80e4d 100644 --- a/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json @@ -1,6 +1,9 @@ { "replace": false, "values": [ + "new_soviet:chiseled_acacia_door", + "new_soviet:leather_lined_chiseled_acacia_door", + "new_soviet:white_chiseled_birch_door", "new_soviet:acacia_window", "new_soviet:acacia_pane_window", "new_soviet:birch_window", 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 79209b6..d0e8da1 100644 --- a/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,6 +1,33 @@ { "replace": false, "values": [ + "new_soviet:telephone", + "new_soviet:radio_war", + "new_soviet:white_tiles", + "new_soviet:cracked_white_tiles", + "new_soviet:mossy_white_tiles", + "new_soviet:variated_white_tiles", + "new_soviet:white_tiles_stairs", + "new_soviet:white_tiles_slab", + "new_soviet:cracked_white_tiles_stairs", + "new_soviet:cracked_white_tiles_slab", + "new_soviet:mossy_white_tiles_stairs", + "new_soviet:mossy_white_tiles_slab", + "new_soviet:variated_white_tiles_stairs", + "new_soviet:variated_white_tiles_slab", + "new_soviet:concrete_tiles", + "new_soviet:cracked_concrete_tiles", + "new_soviet:mossy_concrete_tiles", + "new_soviet:concrete_tiles_stairs", + "new_soviet:concrete_tiles_slab", + "new_soviet:cracked_concrete_tiles_stairs", + "new_soviet:cracked_concrete_tiles_slab", + "new_soviet:mossy_concrete_tiles_stairs", + "new_soviet:mossy_concrete_tiles_slab", + "new_soviet:small_yellow_tiles", + "new_soviet:divided_concrete", + "new_soviet:separated_concrete_cross", + "new_soviet:small_cracked_yellow_tiles", "new_soviet:sand_tiles", "new_soviet:handrail", "new_soviet:nii_floor", @@ -228,6 +255,24 @@ "new_soviet:cracked_green_white_tiles_slab", "new_soviet:mossy_green_white_tiles_stairs", "new_soviet:mossy_green_white_tiles_slab", + "new_soviet:white_tiles", + "new_soviet:cracked_white_tiles", + "new_soviet:mossy_white_tiles", + "new_soviet:variated_white_tiles", + "new_soviet:white_tiles_stairs", + "new_soviet:white_tiles_slab", + "new_soviet:cracked_white_tiles_stairs", + "new_soviet:cracked_white_tiles_slab", + "new_soviet:mossy_white_tiles_stairs", + "new_soviet:mossy_white_tiles_slab", + "new_soviet:variated_white_tiles_stairs", + "new_soviet:variated_white_tiles_slab", + "new_soviet:concrete_tiles_stairs", + "new_soviet:concrete_tiles_slab", + "new_soviet:cracked_concrete_tiles_stairs", + "new_soviet:cracked_concrete_tiles_slab", + "new_soviet:mossy_concrete_tiles_stairs", + "new_soviet:mossy_concrete_tiles_slab", "new_soviet:tuff_tiles_stairs", "new_soviet:tuff_tiles_slab", "new_soviet:cracked_tuff_tiles_stairs", diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/acacia_pane_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/acacia_pane_window.json new file mode 100644 index 0000000..f5b1685 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/acacia_pane_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_acacia_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:acacia_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:acacia_pane_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_acacia_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:acacia_pane_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/acacia_pane_window_shapeless.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/acacia_pane_window_shapeless.json new file mode 100644 index 0000000..16f6eaa --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/acacia_pane_window_shapeless.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_acacia_pane_window": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:acacia_pane_window" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_acacia_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:acacia_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:acacia_pane_window_shapeless" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_acacia_pane_window", + "has_acacia_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:acacia_pane_window_shapeless" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/acacia_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/acacia_window.json new file mode 100644 index 0000000..53206f1 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/acacia_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_acacia_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:acacia_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:acacia_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_acacia_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:acacia_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/birch_pane_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/birch_pane_window.json new file mode 100644 index 0000000..9e6ca9a --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/birch_pane_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_birch_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:birch_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:birch_pane_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_birch_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:birch_pane_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/birch_pane_window_shapeless.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/birch_pane_window_shapeless.json new file mode 100644 index 0000000..5da962c --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/birch_pane_window_shapeless.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_birch_pane_window": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:birch_pane_window" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_birch_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:birch_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:birch_pane_window_shapeless" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_birch_pane_window", + "has_birch_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:birch_pane_window_shapeless" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/birch_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/birch_window.json new file mode 100644 index 0000000..7cd2592 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/birch_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_birch_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:birch_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:birch_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_birch_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:birch_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cherry_pane_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cherry_pane_window.json new file mode 100644 index 0000000..d04173c --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cherry_pane_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cherry_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cherry_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cherry_pane_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cherry_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cherry_pane_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cherry_pane_window_shapeless.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cherry_pane_window_shapeless.json new file mode 100644 index 0000000..676ea31 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cherry_pane_window_shapeless.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cherry_pane_window": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cherry_pane_window" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_cherry_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cherry_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cherry_pane_window_shapeless" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cherry_pane_window", + "has_cherry_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cherry_pane_window_shapeless" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cherry_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cherry_window.json new file mode 100644 index 0000000..2823c14 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cherry_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cherry_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cherry_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cherry_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cherry_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cherry_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/chiseled_acacia_door_from_acacia_door_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/chiseled_acacia_door_from_acacia_door_stonecutting.json new file mode 100644 index 0000000..08ccf14 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/chiseled_acacia_door_from_acacia_door_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_acacia_door": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:acacia_door" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:chiseled_acacia_door_from_acacia_door_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_acacia_door", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:chiseled_acacia_door_from_acacia_door_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/crimson_pane_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/crimson_pane_window.json new file mode 100644 index 0000000..3c8533e --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/crimson_pane_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crimson_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:crimson_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:crimson_pane_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_crimson_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:crimson_pane_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/crimson_pane_window_shapeless.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/crimson_pane_window_shapeless.json new file mode 100644 index 0000000..32e7b85 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/crimson_pane_window_shapeless.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crimson_pane_window": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:crimson_pane_window" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:crimson_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:crimson_pane_window_shapeless" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_crimson_pane_window", + "has_crimson_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:crimson_pane_window_shapeless" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/crimson_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/crimson_window.json new file mode 100644 index 0000000..094aaa8 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/crimson_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crimson_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:crimson_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:crimson_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_crimson_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:crimson_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_oak_pane_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_oak_pane_window.json new file mode 100644 index 0000000..e0a6fcf --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_oak_pane_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_oak_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:dark_oak_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:dark_oak_pane_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_oak_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:dark_oak_pane_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_oak_pane_window_shapeless.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_oak_pane_window_shapeless.json new file mode 100644 index 0000000..f2e2ed8 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_oak_pane_window_shapeless.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_oak_pane_window": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dark_oak_pane_window" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dark_oak_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:dark_oak_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:dark_oak_pane_window_shapeless" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_oak_pane_window", + "has_dark_oak_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:dark_oak_pane_window_shapeless" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_oak_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_oak_window.json new file mode 100644 index 0000000..5d4cd8e --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_oak_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_oak_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:dark_oak_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:dark_oak_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_oak_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:dark_oak_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/jungle_pane_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/jungle_pane_window.json new file mode 100644 index 0000000..6701a61 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/jungle_pane_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_jungle_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:jungle_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:jungle_pane_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_jungle_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:jungle_pane_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/jungle_pane_window_shapeless.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/jungle_pane_window_shapeless.json new file mode 100644 index 0000000..470d301 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/jungle_pane_window_shapeless.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_jungle_pane_window": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:jungle_pane_window" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_jungle_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:jungle_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:jungle_pane_window_shapeless" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_jungle_pane_window", + "has_jungle_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:jungle_pane_window_shapeless" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/jungle_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/jungle_window.json new file mode 100644 index 0000000..dd5898d --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/jungle_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_jungle_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:jungle_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:jungle_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_jungle_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:jungle_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/leather_lined_chiseled_acacia_door.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/leather_lined_chiseled_acacia_door.json new file mode 100644 index 0000000..b1cadca --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/leather_lined_chiseled_acacia_door.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_leather": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:leather" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_leather_lined_chiseled_acacia_door": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:leather_lined_chiseled_acacia_door" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:leather_lined_chiseled_acacia_door" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_leather_lined_chiseled_acacia_door", + "has_leather", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:leather_lined_chiseled_acacia_door" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mangrove_pane_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mangrove_pane_window.json new file mode 100644 index 0000000..60c5dc2 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mangrove_pane_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_mangrove_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:mangrove_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:mangrove_pane_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_mangrove_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:mangrove_pane_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mangrove_pane_window_shapeless.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mangrove_pane_window_shapeless.json new file mode 100644 index 0000000..f2c4538 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mangrove_pane_window_shapeless.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_mangrove_pane_window": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mangrove_pane_window" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_mangrove_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:mangrove_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:mangrove_pane_window_shapeless" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_mangrove_pane_window", + "has_mangrove_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:mangrove_pane_window_shapeless" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mangrove_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mangrove_window.json new file mode 100644 index 0000000..5707e43 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mangrove_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_mangrove_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:mangrove_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:mangrove_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_mangrove_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:mangrove_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/oak_pane_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/oak_pane_window.json new file mode 100644 index 0000000..811c70c --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/oak_pane_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:oak_pane_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_oak_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:oak_pane_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/oak_pane_window_shapeless.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/oak_pane_window_shapeless.json new file mode 100644 index 0000000..743e4da --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/oak_pane_window_shapeless.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_oak_pane_window": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:oak_pane_window" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:oak_pane_window_shapeless" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_oak_pane_window", + "has_oak_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:oak_pane_window_shapeless" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/oak_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/oak_window.json new file mode 100644 index 0000000..61c3859 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/oak_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_oak_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:oak_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:oak_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_oak_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:oak_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/spruce_pane_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/spruce_pane_window.json new file mode 100644 index 0000000..7719b91 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/spruce_pane_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_spruce_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:spruce_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:spruce_pane_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_spruce_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:spruce_pane_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/spruce_pane_window_shapeless.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/spruce_pane_window_shapeless.json new file mode 100644 index 0000000..6e8cba3 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/spruce_pane_window_shapeless.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_spruce_pane_window": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:spruce_pane_window" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_spruce_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:spruce_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:spruce_pane_window_shapeless" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_spruce_pane_window", + "has_spruce_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:spruce_pane_window_shapeless" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/spruce_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/spruce_window.json new file mode 100644 index 0000000..ce8436d --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/spruce_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_spruce_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:spruce_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:spruce_window" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_spruce_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:spruce_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_pane_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_pane_window.json new file mode 100644 index 0000000..8e749f9 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_pane_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:warped_pane_window" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_warped_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:warped_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_warped_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:warped_pane_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_pane_window_shapeless.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_pane_window_shapeless.json new file mode 100644 index 0000000..635cc2b --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_pane_window_shapeless.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:warped_pane_window_shapeless" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_warped_pane_window": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:warped_pane_window" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_warped_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:warped_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_warped_pane_window", + "has_warped_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:warped_pane_window_shapeless" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_window.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_window.json new file mode 100644 index 0000000..cfbfa6b --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_window.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:warped_window" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_warped_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:warped_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_warped_slab", + "has_glass_pane", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:warped_window" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/modern_post_lamp_add_ingot.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/modern_post_lamp_add_ingot.json new file mode 100644 index 0000000..572874f --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/decorations/modern_post_lamp_add_ingot.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_caged_post_lamp": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:modern_post_lamp" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_ingot": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:modern_post_lamp" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_modern_post_lamp": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:modern_post_lamp" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:modern_post_lamp_add_ingot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_modern_post_lamp", + "has_caged_post_lamp", + "has_iron_ingot", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:modern_post_lamp_add_ingot" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/modern_post_lamp_basic.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/modern_post_lamp_basic.json new file mode 100644 index 0000000..df48fe7 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/decorations/modern_post_lamp_basic.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_iron_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_nugget": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_nugget" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lamp_post_base": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:lamp_post_base" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lantern": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:lantern" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:modern_post_lamp_basic" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_lamp_post_base", + "has_lantern", + "has_iron_ingot", + "has_iron_nugget", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:modern_post_lamp_basic" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/radio_war.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/radio_war.json new file mode 100644 index 0000000..089b09d --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/decorations/radio_war.json @@ -0,0 +1,74 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_antenna": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:antenna" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_nugget": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_nugget" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_note_block": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:note_block" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:radio_war" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_iron_nugget", + "has_iron_ingot", + "has_antenna", + "has_note_block", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:radio_war" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/telephone.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/telephone.json new file mode 100644 index 0000000..b8bd55b --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/decorations/telephone.json @@ -0,0 +1,87 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_iron_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_nugget": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_nugget" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_trapdoor": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_trapdoor" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_polished_deepslate_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:polished_deepslate_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_redstone": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:redstone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:telephone" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_iron_nugget", + "has_iron_ingot", + "has_polished_deepslate_slab", + "has_iron_trapdoor", + "has_redstone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:telephone" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/w_machine.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/w_machine.json new file mode 100644 index 0000000..a8111df --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/decorations/w_machine.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_iron_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_nugget": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_nugget" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_polished_deepslate_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:polished_deepslate_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:w_machine" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_iron_nugget", + "has_polished_deepslate_slab", + "has_iron_ingot", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:w_machine" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/misc/belomor_cigarette.json b/src/main/generated/data/new_soviet/advancements/recipes/misc/belomor_cigarette.json new file mode 100644 index 0000000..580246b --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/misc/belomor_cigarette.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_makhorka": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:makhorka" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:belomor_cigarette" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_makhorka", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:belomor_cigarette" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/misc/cigarette.json b/src/main/generated/data/new_soviet/advancements/recipes/misc/cigarette.json new file mode 100644 index 0000000..14e2427 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/misc/cigarette.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_makhorka": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:makhorka" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cigarette" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_makhorka", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cigarette" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/misc/duchess_cigarette.json b/src/main/generated/data/new_soviet/advancements/recipes/misc/duchess_cigarette.json new file mode 100644 index 0000000..3214575 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/misc/duchess_cigarette.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_makhorka": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:makhorka" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:duchess_cigarette" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_makhorka", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:duchess_cigarette" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/misc/friend_cigarette.json b/src/main/generated/data/new_soviet/advancements/recipes/misc/friend_cigarette.json new file mode 100644 index 0000000..30b980f --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/misc/friend_cigarette.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_makhorka": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:makhorka" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:friend_cigarette" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_makhorka", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:friend_cigarette" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/misc/homemade_cigarette.json b/src/main/generated/data/new_soviet/advancements/recipes/misc/homemade_cigarette.json new file mode 100644 index 0000000..1995eea --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/misc/homemade_cigarette.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_homemade_cigarette": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:homemade_cigarette" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_makhorka": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:makhorka" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:homemade_cigarette" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_homemade_cigarette", + "has_makhorka", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:homemade_cigarette" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/misc/makhorka.json b/src/main/generated/data/new_soviet/advancements/recipes/misc/makhorka.json new file mode 100644 index 0000000..79db3c9 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/misc/makhorka.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_gunpowder": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:gunpowder" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_makhorka": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:makhorka" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:makhorka" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_makhorka", + "has_gunpowder", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:makhorka" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/concrete_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/concrete_tiles.json new file mode 100644 index 0000000..d802ba5 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/concrete_tiles.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:concrete_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/concrete_tiles_slab.json b/src/main/generated/data/new_soviet/loot_tables/blocks/concrete_tiles_slab.json new file mode 100644 index 0000000..e636c83 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/concrete_tiles_slab.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:concrete_tiles_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/concrete_tiles_stairs.json b/src/main/generated/data/new_soviet/loot_tables/blocks/concrete_tiles_stairs.json new file mode 100644 index 0000000..848dc6f --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/concrete_tiles_stairs.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:concrete_tiles_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_concrete_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_concrete_tiles.json new file mode 100644 index 0000000..95c32b8 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_concrete_tiles.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:cracked_concrete_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_concrete_tiles_slab.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_concrete_tiles_slab.json new file mode 100644 index 0000000..90d4ac8 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_concrete_tiles_slab.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:cracked_concrete_tiles_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_concrete_tiles_stairs.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_concrete_tiles_stairs.json new file mode 100644 index 0000000..8a6274f --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_concrete_tiles_stairs.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:cracked_concrete_tiles_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/divided_concrete.json b/src/main/generated/data/new_soviet/loot_tables/blocks/divided_concrete.json new file mode 100644 index 0000000..ab8e824 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/divided_concrete.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:divided_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_concrete_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_concrete_tiles.json new file mode 100644 index 0000000..bdaaadb --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_concrete_tiles.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:mossy_concrete_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_concrete_tiles_slab.json b/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_concrete_tiles_slab.json new file mode 100644 index 0000000..0035f84 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_concrete_tiles_slab.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:mossy_concrete_tiles_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_concrete_tiles_stairs.json b/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_concrete_tiles_stairs.json new file mode 100644 index 0000000..70cc695 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_concrete_tiles_stairs.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:mossy_concrete_tiles_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/radio_war.json b/src/main/generated/data/new_soviet/loot_tables/blocks/radio_war.json new file mode 100644 index 0000000..df95935 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/radio_war.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:radio_war" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/separated_concrete_cross.json b/src/main/generated/data/new_soviet/loot_tables/blocks/separated_concrete_cross.json new file mode 100644 index 0000000..9db53f2 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/separated_concrete_cross.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:separated_concrete_cross" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/telephone.json b/src/main/generated/data/new_soviet/loot_tables/blocks/telephone.json new file mode 100644 index 0000000..6a2dada --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/telephone.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:telephone" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/acacia_pane_window.json b/src/main/generated/data/new_soviet/recipes/acacia_pane_window.json new file mode 100644 index 0000000..1c65de7 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/acacia_pane_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:acacia_slab" + } + }, + "pattern": [ + " W ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:acacia_pane_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/acacia_pane_window_shapeless.json b/src/main/generated/data/new_soviet/recipes/acacia_pane_window_shapeless.json new file mode 100644 index 0000000..79d8330 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/acacia_pane_window_shapeless.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:acacia_window" + }, + { + "item": "minecraft:acacia_slab" + } + ], + "result": { + "item": "new_soviet:acacia_pane_window" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/acacia_window.json b/src/main/generated/data/new_soviet/recipes/acacia_window.json new file mode 100644 index 0000000..01cba0d --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/acacia_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:acacia_slab" + } + }, + "pattern": [ + " S ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:acacia_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/belomor_cigarette.json b/src/main/generated/data/new_soviet/recipes/belomor_cigarette.json new file mode 100644 index 0000000..e414b54 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/belomor_cigarette.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": { + "item": "minecraft:bamboo" + }, + "K": { + "item": "minecraft:kelp" + }, + "M": { + "item": "new_soviet:makhorka" + }, + "P": { + "item": "minecraft:paper" + } + }, + "pattern": [ + "MKM", + "PBP" + ], + "result": { + "item": "new_soviet:belomor_cigarette" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/birch_pane_window.json b/src/main/generated/data/new_soviet/recipes/birch_pane_window.json new file mode 100644 index 0000000..9fc222f --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/birch_pane_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:birch_slab" + } + }, + "pattern": [ + " W ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:birch_pane_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/birch_pane_window_shapeless.json b/src/main/generated/data/new_soviet/recipes/birch_pane_window_shapeless.json new file mode 100644 index 0000000..5b65c26 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/birch_pane_window_shapeless.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:birch_window" + }, + { + "item": "minecraft:birch_slab" + } + ], + "result": { + "item": "new_soviet:birch_pane_window" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/birch_window.json b/src/main/generated/data/new_soviet/recipes/birch_window.json new file mode 100644 index 0000000..cc1afef --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/birch_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:birch_slab" + } + }, + "pattern": [ + " S ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:birch_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cherry_pane_window.json b/src/main/generated/data/new_soviet/recipes/cherry_pane_window.json new file mode 100644 index 0000000..ccd24d9 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cherry_pane_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:cherry_slab" + } + }, + "pattern": [ + " W ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:cherry_pane_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cherry_pane_window_shapeless.json b/src/main/generated/data/new_soviet/recipes/cherry_pane_window_shapeless.json new file mode 100644 index 0000000..646008d --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cherry_pane_window_shapeless.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:cherry_window" + }, + { + "item": "minecraft:cherry_slab" + } + ], + "result": { + "item": "new_soviet:cherry_pane_window" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cherry_window.json b/src/main/generated/data/new_soviet/recipes/cherry_window.json new file mode 100644 index 0000000..0b80041 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cherry_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:cherry_slab" + } + }, + "pattern": [ + " S ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:cherry_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/chiseled_acacia_door_from_acacia_door_stonecutting.json b/src/main/generated/data/new_soviet/recipes/chiseled_acacia_door_from_acacia_door_stonecutting.json new file mode 100644 index 0000000..c9f26c6 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/chiseled_acacia_door_from_acacia_door_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:acacia_door" + }, + "result": "new_soviet:chiseled_acacia_door" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cigarette.json b/src/main/generated/data/new_soviet/recipes/cigarette.json new file mode 100644 index 0000000..4ffd6f3 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cigarette.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": { + "item": "new_soviet:makhorka" + }, + "P": { + "item": "minecraft:paper" + } + }, + "pattern": [ + "PMP" + ], + "result": { + "item": "new_soviet:cigarette" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/crimson_pane_window.json b/src/main/generated/data/new_soviet/recipes/crimson_pane_window.json new file mode 100644 index 0000000..38ea28c --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/crimson_pane_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:crimson_slab" + } + }, + "pattern": [ + " W ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:crimson_pane_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/crimson_pane_window_shapeless.json b/src/main/generated/data/new_soviet/recipes/crimson_pane_window_shapeless.json new file mode 100644 index 0000000..913215e --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/crimson_pane_window_shapeless.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:crimson_window" + }, + { + "item": "minecraft:crimson_slab" + } + ], + "result": { + "item": "new_soviet:crimson_pane_window" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/crimson_window.json b/src/main/generated/data/new_soviet/recipes/crimson_window.json new file mode 100644 index 0000000..03901d4 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/crimson_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:crimson_slab" + } + }, + "pattern": [ + " S ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:crimson_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dark_oak_pane_window.json b/src/main/generated/data/new_soviet/recipes/dark_oak_pane_window.json new file mode 100644 index 0000000..f53aee9 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dark_oak_pane_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:dark_oak_slab" + } + }, + "pattern": [ + " W ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:dark_oak_pane_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dark_oak_pane_window_shapeless.json b/src/main/generated/data/new_soviet/recipes/dark_oak_pane_window_shapeless.json new file mode 100644 index 0000000..29e3efb --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dark_oak_pane_window_shapeless.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:dark_oak_window" + }, + { + "item": "minecraft:dark_oak_slab" + } + ], + "result": { + "item": "new_soviet:dark_oak_pane_window" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dark_oak_window.json b/src/main/generated/data/new_soviet/recipes/dark_oak_window.json new file mode 100644 index 0000000..aaa8b1c --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dark_oak_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:dark_oak_slab" + } + }, + "pattern": [ + " S ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:dark_oak_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/duchess_cigarette.json b/src/main/generated/data/new_soviet/recipes/duchess_cigarette.json new file mode 100644 index 0000000..a5c2591 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/duchess_cigarette.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "K": { + "item": "minecraft:dried_kelp" + }, + "M": { + "item": "new_soviet:makhorka" + }, + "P": { + "item": "minecraft:paper" + } + }, + "pattern": [ + " M ", + "PMP", + " K " + ], + "result": { + "item": "new_soviet:duchess_cigarette" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/friend_cigarette.json b/src/main/generated/data/new_soviet/recipes/friend_cigarette.json new file mode 100644 index 0000000..53411e8 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/friend_cigarette.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": { + "item": "minecraft:bamboo" + }, + "M": { + "item": "new_soviet:makhorka" + }, + "P": { + "item": "minecraft:paper" + } + }, + "pattern": [ + " M ", + "PBP" + ], + "result": { + "item": "new_soviet:friend_cigarette" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/homemade_cigarette.json b/src/main/generated/data/new_soviet/recipes/homemade_cigarette.json new file mode 100644 index 0000000..87d6756 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/homemade_cigarette.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "new_soviet:makhorka" + }, + { + "item": "minecraft:paper" + } + ], + "result": { + "item": "new_soviet:homemade_cigarette" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/jungle_pane_window.json b/src/main/generated/data/new_soviet/recipes/jungle_pane_window.json new file mode 100644 index 0000000..9577d8e --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/jungle_pane_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:jungle_slab" + } + }, + "pattern": [ + " W ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:jungle_pane_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/jungle_pane_window_shapeless.json b/src/main/generated/data/new_soviet/recipes/jungle_pane_window_shapeless.json new file mode 100644 index 0000000..213a2ec --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/jungle_pane_window_shapeless.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:jungle_window" + }, + { + "item": "minecraft:jungle_slab" + } + ], + "result": { + "item": "new_soviet:jungle_pane_window" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/jungle_window.json b/src/main/generated/data/new_soviet/recipes/jungle_window.json new file mode 100644 index 0000000..6fefa94 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/jungle_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:jungle_slab" + } + }, + "pattern": [ + " S ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:jungle_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/leather_lined_chiseled_acacia_door.json b/src/main/generated/data/new_soviet/recipes/leather_lined_chiseled_acacia_door.json new file mode 100644 index 0000000..70be29e --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/leather_lined_chiseled_acacia_door.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:chiseled_acacia_door" + }, + { + "item": "minecraft:leather" + }, + { + "item": "minecraft:leather" + } + ], + "result": { + "item": "new_soviet:leather_lined_chiseled_acacia_door" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/makhorka.json b/src/main/generated/data/new_soviet/recipes/makhorka.json new file mode 100644 index 0000000..8f4f915 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/makhorka.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "tag": "minecraft:leaves" + }, + { + "item": "minecraft:gunpowder" + } + ], + "result": { + "count": 4, + "item": "new_soviet:makhorka" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/mangrove_pane_window.json b/src/main/generated/data/new_soviet/recipes/mangrove_pane_window.json new file mode 100644 index 0000000..319b23c --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/mangrove_pane_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:mangrove_slab" + } + }, + "pattern": [ + " W ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:mangrove_pane_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/mangrove_pane_window_shapeless.json b/src/main/generated/data/new_soviet/recipes/mangrove_pane_window_shapeless.json new file mode 100644 index 0000000..797cd07 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/mangrove_pane_window_shapeless.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:mangrove_window" + }, + { + "item": "minecraft:mangrove_slab" + } + ], + "result": { + "item": "new_soviet:mangrove_pane_window" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/mangrove_window.json b/src/main/generated/data/new_soviet/recipes/mangrove_window.json new file mode 100644 index 0000000..1d43b6e --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/mangrove_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:mangrove_slab" + } + }, + "pattern": [ + " S ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:mangrove_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/modern_post_lamp_add_ingot.json b/src/main/generated/data/new_soviet/recipes/modern_post_lamp_add_ingot.json new file mode 100644 index 0000000..b68e5d9 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/modern_post_lamp_add_ingot.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "new_soviet:caged_post_lamp" + }, + { + "item": "minecraft:iron_ingot" + }, + { + "item": "minecraft:iron_ingot" + } + ], + "result": { + "item": "new_soviet:modern_post_lamp" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/modern_post_lamp_basic.json b/src/main/generated/data/new_soviet/recipes/modern_post_lamp_basic.json new file mode 100644 index 0000000..684f575 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/modern_post_lamp_basic.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "item": "minecraft:iron_ingot" + }, + "L": { + "item": "minecraft:lantern" + }, + "N": { + "item": "minecraft:iron_nugget" + }, + "P": { + "item": "new_soviet:lamp_post_base" + } + }, + "pattern": [ + "INI", + "LP " + ], + "result": { + "item": "new_soviet:modern_post_lamp" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/oak_pane_window.json b/src/main/generated/data/new_soviet/recipes/oak_pane_window.json new file mode 100644 index 0000000..78f331e --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/oak_pane_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:oak_slab" + } + }, + "pattern": [ + " W ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:oak_pane_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/oak_pane_window_shapeless.json b/src/main/generated/data/new_soviet/recipes/oak_pane_window_shapeless.json new file mode 100644 index 0000000..139a02f --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/oak_pane_window_shapeless.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:oak_window" + }, + { + "item": "minecraft:oak_slab" + } + ], + "result": { + "item": "new_soviet:oak_pane_window" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/oak_window.json b/src/main/generated/data/new_soviet/recipes/oak_window.json new file mode 100644 index 0000000..172ef9b --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/oak_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:oak_slab" + } + }, + "pattern": [ + " S ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:oak_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/radio_receiver.json b/src/main/generated/data/new_soviet/recipes/radio_receiver.json index 8e6a571..841f2cd 100644 --- a/src/main/generated/data/new_soviet/recipes/radio_receiver.json +++ b/src/main/generated/data/new_soviet/recipes/radio_receiver.json @@ -10,12 +10,18 @@ }, "M": { "item": "minecraft:note_block" + }, + "R": { + "item": "minecraft:redstone" + }, + "W": { + "tag": "minecraft:planks" } }, "pattern": [ - " A", - "MMM", - "III" + " A ", + "WMW", + "IRI" ], "result": { "item": "new_soviet:radio_receiver" diff --git a/src/main/generated/data/new_soviet/recipes/radio_war.json b/src/main/generated/data/new_soviet/recipes/radio_war.json new file mode 100644 index 0000000..c6f8963 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/radio_war.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:note_block" + }, + "A": { + "item": "new_soviet:antenna" + }, + "I": { + "item": "minecraft:iron_ingot" + }, + "N": { + "item": "minecraft:iron_nugget" + }, + "R": { + "item": "minecraft:redstone" + } + }, + "pattern": [ + " A ", + "I#I", + "NRN" + ], + "result": { + "item": "new_soviet:radio_war" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/spruce_pane_window.json b/src/main/generated/data/new_soviet/recipes/spruce_pane_window.json new file mode 100644 index 0000000..b2b27c3 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/spruce_pane_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:spruce_slab" + } + }, + "pattern": [ + " W ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:spruce_pane_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/spruce_pane_window_shapeless.json b/src/main/generated/data/new_soviet/recipes/spruce_pane_window_shapeless.json new file mode 100644 index 0000000..35dc37f --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/spruce_pane_window_shapeless.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:spruce_window" + }, + { + "item": "minecraft:spruce_slab" + } + ], + "result": { + "item": "new_soviet:spruce_pane_window" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/spruce_window.json b/src/main/generated/data/new_soviet/recipes/spruce_window.json new file mode 100644 index 0000000..3b7599a --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/spruce_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:spruce_slab" + } + }, + "pattern": [ + " S ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:spruce_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/telephone.json b/src/main/generated/data/new_soviet/recipes/telephone.json new file mode 100644 index 0000000..f4f2650 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/telephone.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "D": { + "item": "minecraft:polished_deepslate_slab" + }, + "I": { + "item": "minecraft:iron_ingot" + }, + "N": { + "item": "minecraft:iron_nugget" + }, + "R": { + "item": "minecraft:redstone" + }, + "T": { + "item": "minecraft:iron_trapdoor" + } + }, + "pattern": [ + "INI", + " T ", + "RDR" + ], + "result": { + "item": "new_soviet:telephone" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/w_machine.json b/src/main/generated/data/new_soviet/recipes/w_machine.json new file mode 100644 index 0000000..a848174 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/w_machine.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "minecraft:ink_sac" + }, + "D": { + "item": "minecraft:polished_deepslate_slab" + }, + "I": { + "item": "minecraft:iron_ingot" + }, + "N": { + "item": "minecraft:iron_nugget" + } + }, + "pattern": [ + " # ", + "IDI", + "NNN" + ], + "result": { + "item": "new_soviet:w_machine" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/warped_pane_window.json b/src/main/generated/data/new_soviet/recipes/warped_pane_window.json new file mode 100644 index 0000000..577539f --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/warped_pane_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:warped_slab" + } + }, + "pattern": [ + " W ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:warped_pane_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/warped_pane_window_shapeless.json b/src/main/generated/data/new_soviet/recipes/warped_pane_window_shapeless.json new file mode 100644 index 0000000..ff2eb47 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/warped_pane_window_shapeless.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:warped_window" + }, + { + "item": "minecraft:warped_slab" + } + ], + "result": { + "item": "new_soviet:warped_pane_window" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/warped_window.json b/src/main/generated/data/new_soviet/recipes/warped_window.json new file mode 100644 index 0000000..41af325 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/warped_window.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "G": { + "item": "minecraft:glass_pane" + }, + "S": { + "item": "minecraft:stick" + }, + "W": { + "item": "minecraft:warped_slab" + } + }, + "pattern": [ + " S ", + "SGS", + " W " + ], + "result": { + "item": "new_soviet:warped_window" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/CustomModelBlock.java b/src/main/java/su/a71/new_soviet/blocks/CustomModelBlock.java new file mode 100644 index 0000000..42bb984 --- /dev/null +++ b/src/main/java/su/a71/new_soviet/blocks/CustomModelBlock.java @@ -0,0 +1,75 @@ +package su.a71.new_soviet.blocks; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.*; +import net.minecraft.block.piston.PistonBehavior; +import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.Properties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldAccess; +import su.a71.new_soviet.util.Shapes; + +public class CustomModelBlock extends HorizontalFacingBlock implements Waterloggable { + public static final BooleanProperty WATERLOGGED; + private final Shapes.HorizontalShape blockShape; + + public CustomModelBlock(AbstractBlock.Settings settings, Shapes.HorizontalShape blockShape) { + super(settings.notSolid()); + setDefaultState(getDefaultState() + .with(Properties.HORIZONTAL_FACING, Direction.NORTH) + .with(WATERLOGGED, false)); + this.blockShape = blockShape; + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(Properties.HORIZONTAL_FACING, WATERLOGGED); + } + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext ctx) { + Direction dir = state.get(FACING); + return switch (dir) { + case NORTH -> blockShape.north(); + case SOUTH -> blockShape.south(); + case WEST -> blockShape.west(); + case EAST -> blockShape.east(); + + default -> VoxelShapes.fullCube(); + }; + } + + @Override + public BlockState getPlacementState(ItemPlacementContext ctx) { + FluidState fluidState = ctx.getWorld().getFluidState(ctx.getBlockPos()); + + return super.getPlacementState(ctx) + .with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite()) + .with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER); + } + + public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + if (state.get(WATERLOGGED)) { + world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); + } + + return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos); + } + + public FluidState getFluidState(BlockState state) { + return state.get(WATERLOGGED) ? Fluids.WATER.getStill(false) : super.getFluidState(state); + } + + static { + WATERLOGGED = Properties.WATERLOGGED; + } +} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/GooBlock.java b/src/main/java/su/a71/new_soviet/blocks/GooBlock.java new file mode 100644 index 0000000..dda19f3 --- /dev/null +++ b/src/main/java/su/a71/new_soviet/blocks/GooBlock.java @@ -0,0 +1,36 @@ +package su.a71.new_soviet.blocks; + +import net.minecraft.block.*; +import net.minecraft.block.piston.PistonBehavior; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.random.Random; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import net.minecraft.world.GameRules; +import net.minecraft.world.World; +import su.a71.new_soviet.registration.NSE_Blocks; +import su.a71.new_soviet.registration.NSE_Sounds; + + +public class GooBlock extends SnowBlock { + private final double entity_speed; + public GooBlock(Settings settings, double entity_speed) { + super(settings.sounds(NSE_Sounds.GOO_SOUNDS).pistonBehavior(PistonBehavior.DESTROY)); + this.entity_speed = entity_speed; + this.setDefaultState((BlockState)((BlockState)this.stateManager.getDefaultState()).with(LAYERS, 1)); + } + + public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + Integer layers_count = 3; + if (state.get(LAYERS) - layers_count <= 0) { + return Block.createCuboidShape(0.0, 0.0, 0.0, 16.0, 0.1, 16.0); + } + return LAYERS_TO_SHAPE[state.get(LAYERS) - layers_count]; + } +} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/WMachineBlock.java b/src/main/java/su/a71/new_soviet/blocks/WMachineBlock.java index 0adeaea..3a5134c 100644 --- a/src/main/java/su/a71/new_soviet/blocks/WMachineBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/WMachineBlock.java @@ -3,6 +3,7 @@ package su.a71.new_soviet.blocks; import net.minecraft.block.*; import net.minecraft.block.piston.PistonBehavior; import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.AirBlockItem; import net.minecraft.item.ItemPlacementContext; @@ -55,6 +56,24 @@ public class WMachineBlock extends HorizontalFacingBlock { }; } + @Override + public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) { + this.spawnBreakParticles(world, player, pos, state); + if (!world.isClient && !player.isCreative()) { + super.onBreak(world, pos, state, player); + + ItemStack itemStack = new ItemStack(this); + + world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), itemStack)); + + if (state.get(PAPER)) { + ItemStack paperStack = new ItemStack(Items.PAPER); + + world.spawnEntity(new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), paperStack)); + } + } + } + @Override public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { if (state.get(PAPER) && player.isSneaking() && player.getInventory().getMainHandStack().getItem() == Blocks.AIR.asItem()) { diff --git a/src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java index 377ed41..353c0db 100644 --- a/src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java @@ -81,6 +81,10 @@ public class LightBulbLampBlock extends LampBlock { if (!state.get(BROKEN)) { world.playSound(null, hit.getBlockPos().getX(), hit.getBlockPos().getY(), hit.getBlockPos().getZ(), NSE_Sounds.LIGHT_BULB_BROKEN_SOUND, SoundCategory.BLOCKS, 0.8f, 1f); } + if (projectile.getOwner().isPlayer()) { + PlayerEntity player = (PlayerEntity) projectile.getOwner(); + world.syncWorldEvent(player, 2001, hit.getBlockPos(), getRawIdFromState(Blocks.LIGHT_GRAY_STAINED_GLASS_PANE.getDefaultState())); + } world.setBlockState(hit.getBlockPos(), state.with(BROKEN, true), 2); super.onProjectileHit(world, state, hit, projectile); } 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 1df7955..ae33f5c 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java @@ -27,6 +27,10 @@ public class BlockLootTables extends FabricBlockLootTableProvider { @Override public void generate() { // Drops for building blocks + addDrop(NSE_Blocks.SAND_TILES); + addDrop(NSE_Blocks.DIVIDED_CONCRETE); + addDrop(NSE_Blocks.SEPARATED_CONCRETE_CROSS); + addDrop(NSE_Blocks.SAND_TILES); addDrop(NSE_Blocks.CONCRETE_PLATE); addDrop(NSE_Blocks.CONCRETE_PLATE_STAIRS); @@ -151,11 +155,17 @@ public class BlockLootTables extends FabricBlockLootTableProvider { addDrop(NSE_Blocks.WHITE_TILES); addDrop(NSE_Blocks.CRACKED_WHITE_TILES); addDrop(NSE_Blocks.MOSSY_WHITE_TILES); + addDrop(NSE_Blocks.CONCRETE_TILES); + addDrop(NSE_Blocks.CRACKED_CONCRETE_TILES); + addDrop(NSE_Blocks.MOSSY_CONCRETE_TILES); addDrop(NSE_Blocks.VARIATED_WHITE_TILES); addDrop(NSE_Blocks.SMALL_WHITE_TILES); addDrop(NSE_Blocks.SMALL_CRACKED_WHITE_TILES); addDrop(NSE_Blocks.GLAZED_WHITE_TILES); addDrop(NSE_Blocks.CRACKED_GLAZED_WHITE_TILES); + addDrop(NSE_Blocks.CONCRETE_TILES); + addDrop(NSE_Blocks.CRACKED_CONCRETE_TILES); + addDrop(NSE_Blocks.MOSSY_CONCRETE_TILES); addDrop(NSE_Blocks.LIGHT_BLUE_BRICKS); addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS); addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS); @@ -256,6 +266,9 @@ public class BlockLootTables extends FabricBlockLootTableProvider { addDrop(NSE_Blocks.MEAT); addDrop(NSE_Blocks.MEAT_EYE); addDrop(NSE_Blocks.MEAT_TEETH); + addDrop(NSE_Blocks.WHITE_CHISELED_BIRCH_DOOR, doorDrops(NSE_Blocks.WHITE_CHISELED_BIRCH_DOOR)); + addDrop(NSE_Blocks.CHISELED_ACACIA_DOOR, doorDrops(NSE_Blocks.CHISELED_ACACIA_DOOR)); + addDrop(NSE_Blocks.LEATHER_LINED_CHISELED_ACACIA_DOOR, doorDrops(NSE_Blocks.LEATHER_LINED_CHISELED_ACACIA_DOOR)); addDrop(NSE_Blocks.CHISELED_BIRCH_DOOR, doorDrops(NSE_Blocks.CHISELED_BIRCH_DOOR)); addDrop(NSE_Blocks.CHISELED_MANGROVE_DOOR, doorDrops(NSE_Blocks.CHISELED_MANGROVE_DOOR)); addDrop(NSE_Blocks.CHISELED_OAK_DOOR, doorDrops(NSE_Blocks.CHISELED_OAK_DOOR)); @@ -424,6 +437,12 @@ public class BlockLootTables extends FabricBlockLootTableProvider { addDrop(NSE_Blocks.MOSSY_WHITE_TILES_STAIRS); addDrop(NSE_Blocks.VARIATED_WHITE_TILES_SLAB); addDrop(NSE_Blocks.VARIATED_WHITE_TILES_STAIRS); + addDrop(NSE_Blocks.CONCRETE_TILES_SLAB); + addDrop(NSE_Blocks.CONCRETE_TILES_STAIRS); + addDrop(NSE_Blocks.CRACKED_CONCRETE_TILES_SLAB); + addDrop(NSE_Blocks.CRACKED_CONCRETE_TILES_STAIRS); + addDrop(NSE_Blocks.MOSSY_CONCRETE_TILES_SLAB); + addDrop(NSE_Blocks.MOSSY_CONCRETE_TILES_STAIRS); addDrop(NSE_Blocks.LIGHT_BLUE_BRICKS_SLAB); addDrop(NSE_Blocks.LIGHT_BLUE_BRICKS_STAIRS); addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_SLAB); @@ -562,6 +581,9 @@ public class BlockLootTables extends FabricBlockLootTableProvider { addDrop(NSE_Blocks.BARBED_WIRE, dropSilkAndNot(Items.IRON_NUGGET, NSE_Blocks.BARBED_WIRE)); addDrop(NSE_Blocks.DIRT_ROAD, dropSilkAndNot(Blocks.DIRT, NSE_Blocks.DIRT_ROAD)); + addDrop(NSE_Custom.TELEPHONE); + addDrop(NSE_Custom.RADIO_WAR); + addDropWithSilkTouch(NSE_Custom.LIGHT_BULB_LAMP); } } \ No newline at end of file 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 2f65c24..94d0dff 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java @@ -21,6 +21,33 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { protected void configure(RegistryWrapper.WrapperLookup arg) { // Blocks mined with a pickaxe getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE) + .add(NSE_Custom.TELEPHONE) + .add(NSE_Custom.RADIO_WAR) + .add(NSE_Blocks.WHITE_TILES) + .add(NSE_Blocks.CRACKED_WHITE_TILES) + .add(NSE_Blocks.MOSSY_WHITE_TILES) + .add(NSE_Blocks.VARIATED_WHITE_TILES) + .add(NSE_Blocks.WHITE_TILES_STAIRS) + .add(NSE_Blocks.WHITE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_WHITE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_WHITE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_WHITE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_WHITE_TILES_SLAB) + .add(NSE_Blocks.VARIATED_WHITE_TILES_STAIRS) + .add(NSE_Blocks.VARIATED_WHITE_TILES_SLAB) + .add(NSE_Blocks.CONCRETE_TILES) + .add(NSE_Blocks.CRACKED_CONCRETE_TILES) + .add(NSE_Blocks.MOSSY_CONCRETE_TILES) + .add(NSE_Blocks.CONCRETE_TILES_STAIRS) + .add(NSE_Blocks.CONCRETE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_CONCRETE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_CONCRETE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_CONCRETE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_CONCRETE_TILES_SLAB) + .add(NSE_Blocks.SMALL_YELLOW_TILES) + .add(NSE_Blocks.DIVIDED_CONCRETE) + .add(NSE_Blocks.SEPARATED_CONCRETE_CROSS) + .add(NSE_Blocks.SMALL_CRACKED_YELLOW_TILES) .add(NSE_Blocks.SAND_TILES) .add(NSE_Blocks.HANDRAIL) .add(NSE_Blocks.NII_FLOOR) @@ -248,6 +275,24 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_SLAB) .add(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_STAIRS) .add(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_SLAB) + .add(NSE_Blocks.WHITE_TILES) + .add(NSE_Blocks.CRACKED_WHITE_TILES) + .add(NSE_Blocks.MOSSY_WHITE_TILES) + .add(NSE_Blocks.VARIATED_WHITE_TILES) + .add(NSE_Blocks.WHITE_TILES_STAIRS) + .add(NSE_Blocks.WHITE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_WHITE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_WHITE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_WHITE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_WHITE_TILES_SLAB) + .add(NSE_Blocks.VARIATED_WHITE_TILES_STAIRS) + .add(NSE_Blocks.VARIATED_WHITE_TILES_SLAB) + .add(NSE_Blocks.CONCRETE_TILES_STAIRS) + .add(NSE_Blocks.CONCRETE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_CONCRETE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_CONCRETE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_CONCRETE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_CONCRETE_TILES_SLAB) .add(NSE_Blocks.TUFF_TILES_STAIRS) .add(NSE_Blocks.TUFF_TILES_SLAB) .add(NSE_Blocks.CRACKED_TUFF_TILES_STAIRS) @@ -343,6 +388,9 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { // Blocks mined with an axe getOrCreateTagBuilder(BlockTags.AXE_MINEABLE) + .add(NSE_Blocks.CHISELED_ACACIA_DOOR) + .add(NSE_Blocks.LEATHER_LINED_CHISELED_ACACIA_DOOR) + .add(NSE_Blocks.WHITE_CHISELED_BIRCH_DOOR) .add(NSE_Blocks.ACACIA_WINDOW) .add(NSE_Blocks.ACACIA_PANE_WINDOW) .add(NSE_Blocks.BIRCH_WINDOW) 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 c837f17..4f15caf 100644 --- a/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java @@ -264,6 +264,9 @@ public class ModelGenerator extends FabricModelProvider { registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.VARIATED_WHITE_TILES, NSE_Blocks.VARIATED_WHITE_TILES_STAIRS, NSE_Blocks.VARIATED_WHITE_TILES_SLAB, "white"); registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CONCRETE_PLATE, NSE_Blocks.CONCRETE_PLATE_STAIRS, NSE_Blocks.CONCRETE_PLATE_SLAB, "concrete"); registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_SPRUCE_PARQUET, NSE_Blocks.HERRINGBONE_SPRUCE_PARQUET_STAIRS, NSE_Blocks.HERRINGBONE_SPRUCE_PARQUET_SLAB, "floor/planks"); + registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CONCRETE_TILES, NSE_Blocks.CONCRETE_TILES_STAIRS, NSE_Blocks.CONCRETE_TILES_SLAB, "concrete"); + registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CRACKED_CONCRETE_TILES, NSE_Blocks.CRACKED_CONCRETE_TILES_STAIRS, NSE_Blocks.CRACKED_CONCRETE_TILES_SLAB, "concrete"); + registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.MOSSY_CONCRETE_TILES, NSE_Blocks.MOSSY_CONCRETE_TILES_STAIRS, NSE_Blocks.MOSSY_CONCRETE_TILES_SLAB, "concrete"); } @Override diff --git a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java index 8fb31d8..4006d36 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -11,6 +11,7 @@ import net.minecraft.item.Items; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.book.RecipeCategory; import net.minecraft.registry.Registries; +import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.ItemTags; import net.minecraft.util.Util; import su.a71.new_soviet.registration.NSE_Blocks; @@ -170,6 +171,29 @@ public class RecipeGenerator extends FabricRecipeProvider { .offerTo(exporter); } + private void windowRecipe(Consumer exporter, ItemConvertible outputWindow, ItemConvertible outputPaneWindow, ItemConvertible planks_slab) { + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, outputWindow, 1) + .input('W', planks_slab).input('S', Items.STICK).input('G', Blocks.GLASS_PANE) + .pattern(" S ") + .pattern("SGS") + .pattern(" W ") + .criterion(hasItem(planks_slab), conditionsFromItem(planks_slab)) + .criterion(hasItem(Blocks.GLASS_PANE), conditionsFromItem(Blocks.GLASS_PANE)) + .offerTo(exporter); + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, outputPaneWindow, 1) + .input('W', planks_slab).input('S', Items.STICK).input('G', Blocks.GLASS_PANE) + .pattern(" W ") + .pattern("SGS") + .pattern(" W ") + .criterion(hasItem(planks_slab), conditionsFromItem(planks_slab)) + .criterion(hasItem(Blocks.GLASS_PANE), conditionsFromItem(Blocks.GLASS_PANE)) + .offerTo(exporter); + ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, outputPaneWindow).input(outputWindow).input(planks_slab).criterion(FabricRecipeProvider.hasItem(outputPaneWindow), + FabricRecipeProvider.conditionsFromItem(outputPaneWindow)).criterion(FabricRecipeProvider.hasItem(planks_slab), + FabricRecipeProvider.conditionsFromItem(planks_slab)) + .offerTo(exporter, Registries.ITEM.getId(outputPaneWindow.asItem()) + "_shapeless"); + } + private void tvRecipe(Consumer exporter, ItemConvertible output, ItemConvertible dye) { ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) .pattern("TAT") @@ -218,6 +242,17 @@ public class RecipeGenerator extends FabricRecipeProvider { tvRecipe(exporter, NSE_Custom.RED_TV, Items.RED_DYE); tvRecipe(exporter, NSE_Custom.GREEN_TV, Items.GREEN_DYE); + windowRecipe(exporter, NSE_Blocks.ACACIA_WINDOW, NSE_Blocks.ACACIA_PANE_WINDOW, Blocks.ACACIA_SLAB); + windowRecipe(exporter, NSE_Blocks.BIRCH_WINDOW, NSE_Blocks.BIRCH_PANE_WINDOW, Blocks.BIRCH_SLAB); + windowRecipe(exporter, NSE_Blocks.CHERRY_WINDOW, NSE_Blocks.CHERRY_PANE_WINDOW, Blocks.CHERRY_SLAB); + windowRecipe(exporter, NSE_Blocks.CRIMSON_WINDOW, NSE_Blocks.CRIMSON_PANE_WINDOW, Blocks.CRIMSON_SLAB); + windowRecipe(exporter, NSE_Blocks.DARK_OAK_WINDOW, NSE_Blocks.DARK_OAK_PANE_WINDOW, Blocks.DARK_OAK_SLAB); + windowRecipe(exporter, NSE_Blocks.JUNGLE_WINDOW, NSE_Blocks.JUNGLE_PANE_WINDOW, Blocks.JUNGLE_SLAB); + windowRecipe(exporter, NSE_Blocks.MANGROVE_WINDOW, NSE_Blocks.MANGROVE_PANE_WINDOW, Blocks.MANGROVE_SLAB); + windowRecipe(exporter, NSE_Blocks.OAK_WINDOW, NSE_Blocks.OAK_PANE_WINDOW, Blocks.OAK_SLAB); + windowRecipe(exporter, NSE_Blocks.SPRUCE_WINDOW, NSE_Blocks.SPRUCE_PANE_WINDOW, Blocks.SPRUCE_SLAB); + windowRecipe(exporter, NSE_Blocks.WARPED_WINDOW, NSE_Blocks.WARPED_PANE_WINDOW, Blocks.WARPED_SLAB); + // Cracked blocks offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_BRICK_TILES, NSE_Blocks.BRICK_TILES); offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GLAZED_BRICK_TILES, NSE_Blocks.GLAZED_BRICK_TILES); @@ -462,14 +497,17 @@ public class RecipeGenerator extends FabricRecipeProvider { offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_OAK_DOOR, Blocks.OAK_DOOR); offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_SPRUCE_DOOR, Blocks.SPRUCE_DOOR); offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_BIRCH_DOOR, Blocks.BIRCH_DOOR); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_ACACIA_DOOR, Blocks.ACACIA_DOOR); ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.RADIO_RECEIVER, 1) - .pattern(" A") - .pattern("MMM") - .pattern("III") + .pattern(" A ") + .pattern("WMW") + .pattern("IRI") .input('M', Blocks.NOTE_BLOCK) .input('A', NSE_Items.ANTENNA) .input('I', Items.IRON_INGOT) + .input('R', Items.REDSTONE) + .input('W', ItemTags.PLANKS) .criterion(RecipeProvider.hasItem(NSE_Items.ANTENNA), RecipeProvider.conditionsFromItem(NSE_Items.ANTENNA)) .criterion(RecipeProvider.hasItem(Items.NOTE_BLOCK), @@ -579,6 +617,42 @@ public class RecipeGenerator extends FabricRecipeProvider { .criterion(hasItem(Blocks.GREEN_WOOL), conditionsFromItem(Blocks.GREEN_WOOL)) .offerTo(exporter); + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.RADIO_WAR, 1) + .input('A', NSE_Items.ANTENNA).input('N', Items.IRON_NUGGET).input('I', Items.IRON_INGOT) + .input('R', Items.REDSTONE).input('#', Blocks.NOTE_BLOCK) + .pattern(" A ") + .pattern("I#I") + .pattern("NRN") + .criterion(hasItem(Items.IRON_NUGGET), conditionsFromItem(Items.IRON_NUGGET)) + .criterion(hasItem(Items.IRON_INGOT), conditionsFromItem(Items.IRON_INGOT)) + .criterion(hasItem(NSE_Items.ANTENNA), conditionsFromItem(NSE_Items.ANTENNA)) + .criterion(hasItem(Blocks.NOTE_BLOCK), conditionsFromItem(Blocks.NOTE_BLOCK)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.TELEPHONE, 1) + .input('N', Items.IRON_NUGGET).input('I', Items.IRON_INGOT) + .input('D', Blocks.POLISHED_DEEPSLATE_SLAB).input('R', Items.REDSTONE).input('T', Blocks.IRON_TRAPDOOR) + .pattern("INI") + .pattern(" T ") + .pattern("RDR") + .criterion(hasItem(Items.IRON_NUGGET), conditionsFromItem(Items.IRON_NUGGET)) + .criterion(hasItem(Items.IRON_INGOT), conditionsFromItem(Items.IRON_INGOT)) + .criterion(hasItem(Blocks.POLISHED_DEEPSLATE_SLAB), conditionsFromItem(Blocks.POLISHED_DEEPSLATE_SLAB)) + .criterion(hasItem(Blocks.IRON_TRAPDOOR), conditionsFromItem(Blocks.IRON_TRAPDOOR)) + .criterion(hasItem(Items.REDSTONE), conditionsFromItem(Items.REDSTONE)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.W_MACHINE, 1) + .input('N', Items.IRON_NUGGET).input('I', Items.IRON_INGOT) + .input('D', Blocks.POLISHED_DEEPSLATE_SLAB).input('#', Items.INK_SAC) + .pattern(" # ") + .pattern("IDI") + .pattern("NNN") + .criterion(hasItem(Items.IRON_NUGGET), conditionsFromItem(Items.IRON_NUGGET)) + .criterion(hasItem(Blocks.POLISHED_DEEPSLATE_SLAB), conditionsFromItem(Blocks.POLISHED_DEEPSLATE_SLAB)) + .criterion(hasItem(Items.IRON_INGOT), conditionsFromItem(Items.IRON_INGOT)) + .offerTo(exporter); + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.BIG_POST_LAMP, 1) .input('P', NSE_Custom.LAMP_POST_BASE).input('S', Blocks.SHROOMLIGHT) .pattern(" S ").pattern(" P ").pattern(" ") @@ -617,12 +691,69 @@ public class RecipeGenerator extends FabricRecipeProvider { .criterion(hasItem(Items.IRON_NUGGET), conditionsFromItem(Items.IRON_NUGGET)) .offerTo(exporter, Registries.ITEM.getId(NSE_Custom.VINTAGE_POST_LAMP.asItem()) + "_basic"); + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.MODERN_POST_LAMP, 1) + .input('P', NSE_Custom.LAMP_POST_BASE).input('N', Items.IRON_NUGGET).input('I', Items.IRON_INGOT).input('L', Blocks.LANTERN) + .pattern("INI").pattern("LP ") + .criterion(hasItem(NSE_Custom.LAMP_POST_BASE), conditionsFromItem(NSE_Custom.LAMP_POST_BASE)) + .criterion(hasItem(Blocks.LANTERN), conditionsFromItem(Blocks.LANTERN)) + .criterion(hasItem(Items.IRON_INGOT), conditionsFromItem(Items.IRON_INGOT)) + .criterion(hasItem(Items.IRON_NUGGET), conditionsFromItem(Items.IRON_NUGGET)) + .offerTo(exporter, Registries.ITEM.getId(NSE_Custom.MODERN_POST_LAMP.asItem()) + "_basic"); + ShapelessRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.VINTAGE_POST_LAMP).input(NSE_Custom.CAGED_POST_LAMP).input(Items.IRON_INGOT).criterion(FabricRecipeProvider.hasItem(NSE_Custom.VINTAGE_POST_LAMP), FabricRecipeProvider.conditionsFromItem(NSE_Custom.VINTAGE_POST_LAMP)).criterion(FabricRecipeProvider.hasItem(NSE_Custom.CAGED_POST_LAMP), FabricRecipeProvider.conditionsFromItem(NSE_Custom.VINTAGE_POST_LAMP)).criterion(FabricRecipeProvider.hasItem(Items.IRON_INGOT), FabricRecipeProvider.conditionsFromItem(NSE_Custom.VINTAGE_POST_LAMP)).offerTo(exporter, Registries.ITEM.getId(NSE_Custom.VINTAGE_POST_LAMP.asItem()) + "_add_ingot"); + ShapelessRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.MODERN_POST_LAMP).input(NSE_Custom.CAGED_POST_LAMP).input(Items.IRON_INGOT).input(Items.IRON_INGOT).criterion(FabricRecipeProvider.hasItem(NSE_Custom.MODERN_POST_LAMP), + FabricRecipeProvider.conditionsFromItem(NSE_Custom.MODERN_POST_LAMP)).criterion(FabricRecipeProvider.hasItem(NSE_Custom.CAGED_POST_LAMP), + FabricRecipeProvider.conditionsFromItem(NSE_Custom.MODERN_POST_LAMP)).criterion(FabricRecipeProvider.hasItem(Items.IRON_INGOT), + FabricRecipeProvider.conditionsFromItem(NSE_Custom.MODERN_POST_LAMP)).offerTo(exporter, Registries.ITEM.getId(NSE_Custom.MODERN_POST_LAMP.asItem()) + "_add_ingot"); + + ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.LEATHER_LINED_CHISELED_ACACIA_DOOR).input(NSE_Blocks.CHISELED_ACACIA_DOOR).input(Items.LEATHER, 2).criterion(FabricRecipeProvider.hasItem(NSE_Blocks.LEATHER_LINED_CHISELED_ACACIA_DOOR), + FabricRecipeProvider.conditionsFromItem(NSE_Blocks.LEATHER_LINED_CHISELED_ACACIA_DOOR)).criterion(FabricRecipeProvider.hasItem(Items.LEATHER), + FabricRecipeProvider.conditionsFromItem(Items.LEATHER)).offerTo(exporter, Registries.ITEM.getId(NSE_Blocks.LEATHER_LINED_CHISELED_ACACIA_DOOR.asItem())); + + + ShapelessRecipeJsonBuilder.create(RecipeCategory.MISC, NSE_Items.MAKHORKA, 4).input(ItemTags.LEAVES).input(Items.GUNPOWDER).criterion(FabricRecipeProvider.hasItem(NSE_Items.MAKHORKA), + FabricRecipeProvider.conditionsFromItem(NSE_Items.MAKHORKA)).criterion(FabricRecipeProvider.hasItem(Items.GUNPOWDER), + FabricRecipeProvider.conditionsFromItem(Items.GUNPOWDER)).offerTo(exporter, Registries.ITEM.getId(NSE_Items.MAKHORKA.asItem())); + + ShapelessRecipeJsonBuilder.create(RecipeCategory.MISC, NSE_Items.HOMEMADE_CIGARETTE).input(NSE_Items.MAKHORKA).input(Items.PAPER).criterion(FabricRecipeProvider.hasItem(NSE_Items.HOMEMADE_CIGARETTE), + FabricRecipeProvider.conditionsFromItem(NSE_Items.HOMEMADE_CIGARETTE)).criterion(FabricRecipeProvider.hasItem(NSE_Items.MAKHORKA), + FabricRecipeProvider.conditionsFromItem(NSE_Items.MAKHORKA)).offerTo(exporter, Registries.ITEM.getId(NSE_Items.HOMEMADE_CIGARETTE.asItem())); + + ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, NSE_Items.CIGARETTE, 1) + .input('P', Items.PAPER).input('M', NSE_Items.MAKHORKA) + .pattern("PMP") + .criterion(hasItem(NSE_Items.MAKHORKA), conditionsFromItem(NSE_Items.MAKHORKA)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, NSE_Items.FRIEND_CIGARETTE, 1) + .input('P', Items.PAPER).input('M', NSE_Items.MAKHORKA).input('B', Items.BAMBOO) + .pattern(" M ") + .pattern("PBP") + .criterion(hasItem(NSE_Items.MAKHORKA), conditionsFromItem(NSE_Items.MAKHORKA)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, NSE_Items.DUCHESS_CIGARETTE, 1) + .input('P', Items.PAPER).input('M', NSE_Items.MAKHORKA).input('K', Items.DRIED_KELP) + .pattern(" M ") + .pattern("PMP") + .pattern(" K ") + .criterion(hasItem(NSE_Items.MAKHORKA), conditionsFromItem(NSE_Items.MAKHORKA)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, NSE_Items.BELOMOR_CIGARETTE, 1) + .input('P', Items.PAPER).input('M', NSE_Items.MAKHORKA) + .input('K', Items.KELP).input('B', Items.BAMBOO) + .pattern("MKM") + .pattern("PBP") + .criterion(hasItem(NSE_Items.MAKHORKA), conditionsFromItem(NSE_Items.MAKHORKA)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.SIREN, 1) .input('R', Items.REDSTONE).input('N', Blocks.NOTE_BLOCK).input('I', Items.IRON_NUGGET) .pattern(" ").pattern("IRI").pattern("NIN") 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 bcca75f..610bcc4 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 @@ -386,6 +386,17 @@ public class NSE_Blocks extends NSE_BaseRegistration { public static final Block CONCRETE_PLATE = new Block(FabricBlockSettings.copy(CONCRETE)); public static final StairsBlock CONCRETE_PLATE_STAIRS = new StairsBlock(CONCRETE_PLATE.getDefaultState(), FabricBlockSettings.copy(ORANGE_CONCRETE)); public static final SlabBlock CONCRETE_PLATE_SLAB = new SlabBlock(FabricBlockSettings.copy(ORANGE_CONCRETE)); + public static final Block SEPARATED_CONCRETE_CROSS = new Block(FabricBlockSettings.copy(CONCRETE)); + public static final PillarBlock DIVIDED_CONCRETE = new PillarBlock(FabricBlockSettings.copy(CONCRETE)); + public static final Block CONCRETE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.GRAY)); + public static final StairsBlock CONCRETE_TILES_STAIRS = new StairsBlock(CONCRETE_TILES.getDefaultState(), FabricBlockSettings.copy(CONCRETE_TILES)); + public static final SlabBlock CONCRETE_TILES_SLAB = new SlabBlock(FabricBlockSettings.copy(CONCRETE_TILES)); + public static final Block CRACKED_CONCRETE_TILES = new Block(FabricBlockSettings.copy(CONCRETE_TILES)); + public static final StairsBlock CRACKED_CONCRETE_TILES_STAIRS = new StairsBlock(CONCRETE_TILES.getDefaultState(), FabricBlockSettings.copy(CONCRETE_TILES)); + public static final SlabBlock CRACKED_CONCRETE_TILES_SLAB = new SlabBlock(FabricBlockSettings.copy(CONCRETE_TILES)); + public static final Block MOSSY_CONCRETE_TILES = new Block(FabricBlockSettings.copy(CONCRETE_TILES)); + public static final StairsBlock MOSSY_CONCRETE_TILES_STAIRS = new StairsBlock(CONCRETE_TILES.getDefaultState(), FabricBlockSettings.copy(CONCRETE_TILES)); + public static final SlabBlock MOSSY_CONCRETE_TILES_SLAB = new SlabBlock(FabricBlockSettings.copy(CONCRETE_TILES)); public static final GravelBlock DIRT_ROAD = new GravelBlock(FabricBlockSettings.copy(Blocks.GRAVEL)); @@ -393,19 +404,19 @@ public class NSE_Blocks extends NSE_BaseRegistration { public static final Block HERRINGBONE_ACACIA_PLANKS = new Block(FabricBlockSettings.copy(Blocks.ACACIA_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock HERRINGBONE_ACACIA_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_ACACIA_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_ACACIA_PLANKS)); public static final SlabBlock HERRINGBONE_ACACIA_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_ACACIA_PLANKS)); - public static final Block CROSS_ACACIA_PLANKS = new Block(FabricBlockSettings.copy(Blocks.ACACIA_PLANKS)); + public static final Block CROSS_ACACIA_PLANKS = new Block(FabricBlockSettings.copy(Blocks.ACACIA_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock CROSS_ACACIA_PLANKS_STAIRS = new StairsBlock(CROSS_ACACIA_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_ACACIA_PLANKS)); public static final SlabBlock CROSS_ACACIA_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_ACACIA_PLANKS)); - public static final Block HERRINGBONE_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.OAK_PLANKS)); + public static final Block HERRINGBONE_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.OAK_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock HERRINGBONE_OAK_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_OAK_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_OAK_PLANKS)); public static final SlabBlock HERRINGBONE_OAK_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_OAK_PLANKS)); - public static final Block CROSS_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.OAK_PLANKS)); + public static final Block CROSS_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.OAK_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock CROSS_OAK_PLANKS_STAIRS = new StairsBlock(CROSS_OAK_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_OAK_PLANKS)); public static final SlabBlock CROSS_OAK_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_OAK_PLANKS)); - public static final Block HERRINGBONE_BIRCH_PLANKS = new Block(FabricBlockSettings.copy(Blocks.BIRCH_PLANKS)); + public static final Block HERRINGBONE_BIRCH_PLANKS = new Block(FabricBlockSettings.copy(Blocks.BIRCH_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock HERRINGBONE_BIRCH_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_BIRCH_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_BIRCH_PLANKS)); public static final SlabBlock HERRINGBONE_BIRCH_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_BIRCH_PLANKS)); - public static final Block CROSS_BIRCH_PLANKS = new Block(FabricBlockSettings.copy(Blocks.BIRCH_PLANKS)); + public static final Block CROSS_BIRCH_PLANKS = new Block(FabricBlockSettings.copy(Blocks.BIRCH_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock CROSS_BIRCH_PLANKS_STAIRS = new StairsBlock(CROSS_BIRCH_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_BIRCH_PLANKS)); public static final SlabBlock CROSS_BIRCH_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_BIRCH_PLANKS)); public static final Block HERRINGBONE_CRIMSON_PLANKS = new Block(FabricBlockSettings.copy(Blocks.CRIMSON_PLANKS)); @@ -420,28 +431,28 @@ public class NSE_Blocks extends NSE_BaseRegistration { public static final Block CROSS_WARPED_PLANKS = new Block(FabricBlockSettings.copy(Blocks.WARPED_PLANKS)); public static final StairsBlock CROSS_WARPED_PLANKS_STAIRS = new StairsBlock(CROSS_WARPED_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_WARPED_PLANKS)); public static final SlabBlock CROSS_WARPED_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_WARPED_PLANKS)); - public static final Block HERRINGBONE_DARK_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.DARK_OAK_PLANKS)); + public static final Block HERRINGBONE_DARK_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.DARK_OAK_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock HERRINGBONE_DARK_OAK_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_DARK_OAK_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PLANKS)); public static final SlabBlock HERRINGBONE_DARK_OAK_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PLANKS)); - public static final Block CROSS_DARK_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.DARK_OAK_PLANKS)); + public static final Block CROSS_DARK_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.DARK_OAK_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock CROSS_DARK_OAK_PLANKS_STAIRS = new StairsBlock(CROSS_DARK_OAK_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_DARK_OAK_PLANKS)); public static final SlabBlock CROSS_DARK_OAK_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_DARK_OAK_PLANKS)); - public static final Block HERRINGBONE_JUNGLE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.JUNGLE_PLANKS)); + public static final Block HERRINGBONE_JUNGLE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.JUNGLE_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock HERRINGBONE_JUNGLE_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_JUNGLE_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_JUNGLE_PLANKS)); public static final SlabBlock HERRINGBONE_JUNGLE_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_JUNGLE_PLANKS)); - public static final Block CROSS_JUNGLE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.JUNGLE_PLANKS)); + public static final Block CROSS_JUNGLE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.JUNGLE_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock CROSS_JUNGLE_PLANKS_STAIRS = new StairsBlock(CROSS_JUNGLE_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_JUNGLE_PLANKS)); public static final SlabBlock CROSS_JUNGLE_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_JUNGLE_PLANKS)); - public static final Block HERRINGBONE_MANGROVE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.MANGROVE_PLANKS)); + public static final Block HERRINGBONE_MANGROVE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.MANGROVE_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock HERRINGBONE_MANGROVE_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_MANGROVE_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_MANGROVE_PLANKS)); public static final SlabBlock HERRINGBONE_MANGROVE_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_MANGROVE_PLANKS)); - public static final Block CROSS_MANGROVE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.MANGROVE_PLANKS)); + public static final Block CROSS_MANGROVE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.MANGROVE_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock CROSS_MANGROVE_PLANKS_STAIRS = new StairsBlock(CROSS_MANGROVE_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_MANGROVE_PLANKS)); public static final SlabBlock CROSS_MANGROVE_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_MANGROVE_PLANKS)); - public static final Block HERRINGBONE_SPRUCE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.SPRUCE_PLANKS)); + public static final Block HERRINGBONE_SPRUCE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.SPRUCE_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock HERRINGBONE_SPRUCE_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_SPRUCE_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_SPRUCE_PLANKS)); public static final SlabBlock HERRINGBONE_SPRUCE_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_SPRUCE_PLANKS)); - public static final Block CROSS_SPRUCE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.SPRUCE_PLANKS)); + public static final Block CROSS_SPRUCE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.SPRUCE_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock CROSS_SPRUCE_PLANKS_STAIRS = new StairsBlock(CROSS_SPRUCE_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_SPRUCE_PLANKS)); public static final SlabBlock CROSS_SPRUCE_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_SPRUCE_PLANKS)); public static final Block HERRINGBONE_CHERRY_PLANKS = new Block(FabricBlockSettings.copy(Blocks.CHERRY_PLANKS)); @@ -459,16 +470,16 @@ public class NSE_Blocks extends NSE_BaseRegistration { public static final Block HERRINGBONE_SPRUCE_PARQUET = new Block(FabricBlockSettings.create().sounds(NSE_Sounds.PARQUET_SOUNDS).strength(2f, 3f).mapColor(MapColor.SPRUCE_BROWN)); public static final StairsBlock HERRINGBONE_SPRUCE_PARQUET_STAIRS = new StairsBlock(HERRINGBONE_SPRUCE_PARQUET.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_SPRUCE_PARQUET)); public static final SlabBlock HERRINGBONE_SPRUCE_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_SPRUCE_PARQUET)); - public static final Block STRAIGHT_OAK_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET)); + public static final Block STRAIGHT_OAK_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock STRAIGHT_OAK_PARQUET_STAIRS = new StairsBlock(STRAIGHT_OAK_PARQUET.getDefaultState(), FabricBlockSettings.copy(STRAIGHT_OAK_PARQUET)); public static final SlabBlock STRAIGHT_OAK_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(STRAIGHT_OAK_PARQUET)); public static final Block SEPARATED_OAK_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET)); public static final StairsBlock SEPARATED_OAK_PARQUET_STAIRS = new StairsBlock(SEPARATED_OAK_PARQUET.getDefaultState(), FabricBlockSettings.copy(SEPARATED_OAK_PARQUET)); public static final SlabBlock SEPARATED_OAK_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(SEPARATED_OAK_PARQUET)); - public static final Block SPRUCE_JUNGLE_CARVED_PARQUET = new Block(FabricBlockSettings.copy(Blocks.BAMBOO_PLANKS)); + public static final Block SPRUCE_JUNGLE_CARVED_PARQUET = new Block(FabricBlockSettings.copy(Blocks.BAMBOO_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock SPRUCE_JUNGLE_CARVED_PARQUET_STAIRS = new StairsBlock(SPRUCE_JUNGLE_CARVED_PARQUET.getDefaultState(), FabricBlockSettings.copy(SPRUCE_JUNGLE_CARVED_PARQUET)); public static final SlabBlock SPRUCE_JUNGLE_CARVED_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(SPRUCE_JUNGLE_CARVED_PARQUET)); - public static final Block DARK_OAK_SPRUCE_CARVED_PARQUET = new Block(FabricBlockSettings.copy(Blocks.BAMBOO_PLANKS)); + public static final Block DARK_OAK_SPRUCE_CARVED_PARQUET = new Block(FabricBlockSettings.copy(Blocks.BAMBOO_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS)); public static final StairsBlock DARK_OAK_SPRUCE_CARVED_PARQUET_STAIRS = new StairsBlock(DARK_OAK_SPRUCE_CARVED_PARQUET.getDefaultState(), FabricBlockSettings.copy(DARK_OAK_SPRUCE_CARVED_PARQUET)); public static final SlabBlock DARK_OAK_SPRUCE_CARVED_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(DARK_OAK_SPRUCE_CARVED_PARQUET)); @@ -580,7 +591,7 @@ public class NSE_Blocks extends NSE_BaseRegistration { public static final Block MEAT = new Block(FabricBlockSettings.create().velocityMultiplier(0.8f).sounds(NSE_Sounds.MEAT_SOUNDS).mapColor(MapColor.DARK_RED).hardness(8f)); public static final Block MEAT_EYE = new Block(FabricBlockSettings.copy(MEAT)); 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)); + public static final GooBlock PURPLE_GOO = new GooBlock(FabricBlockSettings.copy(MEAT).mapColor(MapColor.PURPLE).hardness(1.2f), 0.5f); public static final Block ACACIA_WINDOW = new WindowBlock(FabricBlockSettings.copy(Blocks.OAK_DOOR), false); public static final Block ACACIA_PANE_WINDOW = new WindowBlock(FabricBlockSettings.copy(NSE_Blocks.ACACIA_WINDOW), true); @@ -917,6 +928,17 @@ public class NSE_Blocks extends NSE_BaseRegistration { registerBlock("concrete_plate", () -> CONCRETE_PLATE, NSE_BUILDING_TAB); registerBlock("concrete_plate_stairs", () -> CONCRETE_PLATE_STAIRS, NSE_BUILDING_TAB); registerBlock("concrete_plate_slab", () -> CONCRETE_PLATE_SLAB, NSE_BUILDING_TAB); + registerBlock("concrete_tiles", () -> CONCRETE_TILES, NSE_BUILDING_TAB); + registerBlock("concrete_tiles_stairs", () -> CONCRETE_TILES_STAIRS, NSE_BUILDING_TAB); + registerBlock("concrete_tiles_slab", () -> CONCRETE_TILES_SLAB, NSE_BUILDING_TAB); + registerBlock("cracked_concrete_tiles", () -> CRACKED_CONCRETE_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_concrete_tiles_stairs", () -> CRACKED_CONCRETE_TILES_STAIRS, NSE_BUILDING_TAB); + registerBlock("cracked_concrete_tiles_slab", () -> CRACKED_CONCRETE_TILES_SLAB, NSE_BUILDING_TAB); + registerBlock("mossy_concrete_tiles", () -> MOSSY_CONCRETE_TILES, NSE_BUILDING_TAB); + registerBlock("mossy_concrete_tiles_stairs", () -> MOSSY_CONCRETE_TILES_STAIRS, NSE_BUILDING_TAB); + registerBlock("mossy_concrete_tiles_slab", () -> MOSSY_CONCRETE_TILES_SLAB, NSE_BUILDING_TAB); + registerBlock("separated_concrete_cross", () -> SEPARATED_CONCRETE_CROSS, NSE_BUILDING_TAB); + registerBlock("divided_concrete", () -> DIVIDED_CONCRETE, NSE_BUILDING_TAB); registerBlock("concrete", () -> CONCRETE, NSE_BUILDING_TAB); registerBlock("concrete_stairs", () -> CONCRETE_STAIRS, NSE_BUILDING_TAB); registerBlock("concrete_slab", () -> CONCRETE_SLAB, NSE_BUILDING_TAB); @@ -981,6 +1003,7 @@ public class NSE_Blocks extends NSE_BaseRegistration { registerBlock("cracked_orange_concrete_slab", () -> CRACKED_ORANGE_CONCRETE_SLAB, NSE_BUILDING_TAB); registerBlock("orange_concrete_with_bars", () -> ORANGE_CONCRETE_WITH_BARS, NSE_BUILDING_TAB); + registerBlock("nii_floor", () -> NII_FLOOR, NSE_BUILDING_TAB); registerBlock("nii_floor_stairs", () -> NII_FLOOR_STAIRS, NSE_BUILDING_TAB); registerBlock("nii_floor_slab", () -> NII_FLOOR_SLAB, NSE_BUILDING_TAB); diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java b/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java index de049af..632704e 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java @@ -37,10 +37,18 @@ public class NSE_Custom extends NSE_BaseRegistration { public static final TVBlock RED_TV = new TVBlock(FabricBlockSettings.create().mapColor(MapColor.TERRACOTTA_RED)); public static final TVBlock BROWN_TV = new TVBlock(FabricBlockSettings.create().mapColor(MapColor.TERRACOTTA_BROWN)); public static final TVBlock GREEN_TV = new TVBlock(FabricBlockSettings.create().mapColor(MapColor.TERRACOTTA_GREEN)); + public static final BlockEntityType TV_BLOCK_ENTITY = registerBlockEntity("tv_block_entity", TVBlockEntity::new, TV, RED_TV, BROWN_TV, GREEN_TV); public static final RadioReceiverBlock RADIO_RECEIVER = new RadioReceiverBlock(); + public static final CustomModelBlock TELEPHONE = new CustomModelBlock(FabricBlockSettings.copy(RADIO_RECEIVER).mapColor(MapColor.BLACK).strength(0.9f, 1.5f), new Shapes.HorizontalShape(List.of( + List.of(4.0, 0.0, 4.0, 12.0, 3.0, 12.0), + List.of(5.0, 3.0, 7.0, 11.0, 5.0, 12.0), + List.of(2.0, 5.0, 7.5, 14.0, 8.0, 10.5)))); + public static final CustomModelBlock RADIO_WAR = new CustomModelBlock(FabricBlockSettings.copy(RADIO_RECEIVER).mapColor(MapColor.TERRACOTTA_GREEN).strength(0.9f, 1.5f), new Shapes.HorizontalShape(List.of( + List.of(0.0, 1.0, 4.0, 16.0, 12.0, 14.0)))); + public static final SwitchBlock SWITCH = new SwitchBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.DESTROY).strength(1f, 2f).mapColor(MapColor.TERRACOTTA_WHITE)); public static final SwitchBlock DARK_SWITCH = new SwitchBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.DESTROY).strength(1f, 2f).mapColor(MapColor.TERRACOTTA_WHITE)); public static final TableLampBlock TABLE_LAMP = new TableLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD).strength(0.9f, 1.5f).mapColor(MapColor.WHITE)); @@ -70,7 +78,7 @@ public class NSE_Custom extends NSE_BaseRegistration { List.of(6.5, 7.0, 6.5, 9.5, 9.0, 9.5), List.of(7.0, 9.0, 7.0, 9.0, 12.0, 9.0)))); - public static final Block W_MACHINE = new WMachineBlock(FabricBlockSettings.copy(Blocks.IRON_BLOCK), new Shapes.HorizontalShape(List.of( + public static final Block W_MACHINE = new WMachineBlock(FabricBlockSettings.copy(Blocks.IRON_BLOCK).strength(0.9f, 1.5f), new Shapes.HorizontalShape(List.of( List.of(2.0, 0.0, 2.0, 14.0, 2.0, 14.0), List.of(2.0, 2.0, 7.0, 14.0, 6.0, 14.0), List.of(1.0, 5.0, 12.0, 15.0, 7.0, 14.0), @@ -115,6 +123,9 @@ public class NSE_Custom extends NSE_BaseRegistration { registerBlock("green_tv", () -> GREEN_TV, NSE_CUSTOM_TAB); registerBlock("radio_receiver", () -> RADIO_RECEIVER, NSE_CUSTOM_TAB); + registerBlock("w_machine", () -> W_MACHINE, NSE_CUSTOM_TAB); + registerBlock("telephone", () -> TELEPHONE, NSE_CUSTOM_TAB); + registerBlock("radio_war", () -> RADIO_WAR, NSE_CUSTOM_TAB); registerBlock("table_lamp", () -> TABLE_LAMP, NSE_CUSTOM_TAB); registerBlock("golden_table_lamp", () -> GOLDEN_LAMP, NSE_CUSTOM_TAB); registerBlock("vintage_lamp", () -> VINTAGE_LAMP, NSE_CUSTOM_TAB); @@ -145,6 +156,5 @@ public class NSE_Custom extends NSE_BaseRegistration { registerBlock("black_rook", () -> BLACK_ROOK, NSE_CUSTOM_TAB); registerBlock("black_bishop", () -> BLACK_BISHOP, NSE_CUSTOM_TAB); registerBlock("black_king", () -> BLACK_KING, NSE_CUSTOM_TAB); - registerBlock("w_machine", () -> W_MACHINE, NSE_CUSTOM_TAB); } } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Items.java b/src/main/java/su/a71/new_soviet/registration/NSE_Items.java index 9e1e965..93a8d13 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Items.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Items.java @@ -34,8 +34,16 @@ public class NSE_Items extends NSE_BaseRegistration { public static final Item LIGHT_BULB = new Item(new Item.Settings()); public static final Item ANTENNA = new Item(new Item.Settings()); + public static final Item MAKHORKA = new Item(new Item.Settings()); + public static final Item CIGARETTE_BUTT = new Item(new Item.Settings()); public static final CigaretteItem CIGARETTE = new CigaretteItem(200, NSE_Items.CIGARETTE_BUTT, "item.new_soviet.tooltip.salute", new Item.Settings()); + public static final CigaretteItem DUCHESS_CIGARETTE = new CigaretteItem(310, NSE_Items.CIGARETTE_BUTT, "item.new_soviet.tooltip.duchess", new Item.Settings()); + public static final CigaretteItem FRIEND_CIGARETTE = new CigaretteItem(250, NSE_Items.CIGARETTE_BUTT, "item.new_soviet.tooltip.friend", new Item.Settings()); + public static final CigaretteItem BELOMOR_CIGARETTE = new CigaretteItem(375, NSE_Items.CIGARETTE_BUTT, "item.new_soviet.tooltip.belomor", new Item.Settings()); + + public static final Item HOMEMADE_CIGARETTE_BUTT = new Item(new Item.Settings()); + public static final CigaretteItem HOMEMADE_CIGARETTE = new CigaretteItem(100, NSE_Items.HOMEMADE_CIGARETTE_BUTT, "", new Item.Settings()); public static final MusicDiscItem MUSIC_DISC_USSR_ANTHEM = new MusicDiscItem(1, NSE_Sounds.MUSIC_USSR_ANTHEM, new Item.Settings().maxCount(1), 206); @@ -51,17 +59,23 @@ public class NSE_Items extends NSE_BaseRegistration { public static void init() { Registry.register(Registries.ITEM_GROUP, new Identifier("new_soviet", "items"), NSE_ITEMS_TAB); registerItem("sickle", () -> SICKLE, NSE_ITEMS_TAB); - registerItem("screwdriver", () -> SCREWDRIVER, NSE_ITEMS_TAB); registerItem("rake", () -> RAKE, NSE_ITEMS_TAB); registerItem("concentrate", () -> CONCENTRATE, NSE_ITEMS_TAB); + registerItem("antenna", () -> ANTENNA, NSE_ITEMS_TAB); + registerItem("screwdriver", () -> SCREWDRIVER, NSE_ITEMS_TAB); + registerItem("makhorka", ()-> MAKHORKA, NSE_ITEMS_TAB); + registerItem("cigarette", ()-> CIGARETTE, NSE_ITEMS_TAB); + registerItem("duchess_cigarette", ()-> DUCHESS_CIGARETTE, NSE_ITEMS_TAB); + registerItem("friend_cigarette", ()-> FRIEND_CIGARETTE, NSE_ITEMS_TAB); + registerItem("belomor_cigarette", ()-> BELOMOR_CIGARETTE, NSE_ITEMS_TAB); + registerItem("cigarette_butt", ()-> CIGARETTE_BUTT, NSE_ITEMS_TAB); + registerItem("homemade_cigarette", ()-> HOMEMADE_CIGARETTE, NSE_ITEMS_TAB); + registerItem("homemade_cigarette_butt", ()-> HOMEMADE_CIGARETTE_BUTT, NSE_ITEMS_TAB); registerItem("coconut", () -> COCONUT, null); registerItem("dice_d6", () -> DICE_D6, NSE_ITEMS_TAB); registerItem("dice_d4", () -> DICE_D4, NSE_ITEMS_TAB); registerItem("dice_d20", () -> DICE_D20, NSE_ITEMS_TAB); registerItem("light_bulb_item", () -> LIGHT_BULB, NSE_ITEMS_TAB); - registerItem("antenna", () -> ANTENNA, NSE_ITEMS_TAB); - registerItem("cigarette", ()-> CIGARETTE, NSE_ITEMS_TAB); - registerItem("cigarette_butt", ()-> CIGARETTE_BUTT, NSE_ITEMS_TAB); SICKLE_PATTERN = registerPattern("sickle_pattern", Rarity.UNCOMMON, NSE_ITEMS_TAB); STAR_PATTERN = registerPattern("star_pattern", Rarity.UNCOMMON, NSE_ITEMS_TAB); GRAIN_PATTERN = registerPattern("grain_pattern", Rarity.UNCOMMON, NSE_ITEMS_TAB); diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Sounds.java b/src/main/java/su/a71/new_soviet/registration/NSE_Sounds.java index abb0477..8b0b77f 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Sounds.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Sounds.java @@ -13,13 +13,24 @@ public class NSE_Sounds extends NSE_BaseRegistration { public static SoundEvent SCREWDRIVER_SOUND = registerSoundEvent("screwdriver_sound"); public static SoundEvent PARQUET_STEP = registerSoundEvent("parquet_step"); + + public static SoundEvent MEAT_STEP = registerSoundEvent("meat_step"); + + public static SoundEvent MEAT_BREAK = registerSoundEvent("meat_break"); + + public static SoundEvent MEAT_PLACE = registerSoundEvent("meat_place"); + public static final BlockSoundGroup PARQUET_SOUNDS = new BlockSoundGroup(1f, 1f, BlockSoundGroup.CHERRY_WOOD.getBreakSound(), NSE_Sounds.PARQUET_STEP, BlockSoundGroup.CHERRY_WOOD.getPlaceSound(), BlockSoundGroup.CHERRY_WOOD.getHitSound(), NSE_Sounds.PARQUET_STEP); + public static final BlockSoundGroup GOO_SOUNDS = new BlockSoundGroup(1f, 1f, + BlockSoundGroup.MUD.getBreakSound(), NSE_Sounds.MEAT_STEP, BlockSoundGroup.MUD.getPlaceSound(), + BlockSoundGroup.MUD.getHitSound(), NSE_Sounds.MEAT_STEP); + public static final BlockSoundGroup MEAT_SOUNDS = new BlockSoundGroup(1f, 1f, - BlockSoundGroup.MUD.getBreakSound(), BlockSoundGroup.HONEY.getStepSound(), BlockSoundGroup.MUD.getPlaceSound(), - BlockSoundGroup.MUD.getHitSound(), BlockSoundGroup.HONEY.getStepSound()); + NSE_Sounds.MEAT_BREAK, NSE_Sounds.MEAT_STEP, NSE_Sounds.MEAT_PLACE, + BlockSoundGroup.MUD.getHitSound(), NSE_Sounds.MEAT_STEP); public static SoundEvent SWITCH_PRESS = registerSoundEvent("switch_press"); diff --git a/src/main/resources/assets/new_soviet/blockstates/divided_concrete.json b/src/main/resources/assets/new_soviet/blockstates/divided_concrete.json new file mode 100644 index 0000000..59e4636 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/divided_concrete.json @@ -0,0 +1,13 @@ +{ + "variants": { + "axis=x": { + "model": "new_soviet:block/horizontally_divided_concrete" + }, + "axis=y": { + "model": "new_soviet:block/vertically_divided_concrete" + }, + "axis=z": { + "model": "new_soviet:block/horizontally_divided_concrete" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/radio_war.json b/src/main/resources/assets/new_soviet/blockstates/radio_war.json new file mode 100644 index 0000000..5fc6886 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/radio_war.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "new_soviet:block/radio_war", "uvlock": true }, + "facing=east": { "model": "new_soviet:block/radio_war", "y": 90, "uvlock": false }, + "facing=south": { "model": "new_soviet:block/radio_war", "y": 180, "uvlock": false }, + "facing=west": { "model": "new_soviet:block/radio_war", "y": 270, "uvlock": false } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/separated_concrete_cross.json b/src/main/resources/assets/new_soviet/blockstates/separated_concrete_cross.json new file mode 100644 index 0000000..f32e205 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/separated_concrete_cross.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/separated_concrete_cross" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/telephone.json b/src/main/resources/assets/new_soviet/blockstates/telephone.json new file mode 100644 index 0000000..f15adef --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/telephone.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "new_soviet:block/telephone", "uvlock": true }, + "facing=east": { "model": "new_soviet:block/telephone", "y": 90, "uvlock": false }, + "facing=south": { "model": "new_soviet:block/telephone", "y": 180, "uvlock": false }, + "facing=west": { "model": "new_soviet:block/telephone", "y": 270, "uvlock": false } + } +} \ 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 01057d8..ecc2a95 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -160,9 +160,9 @@ "block.new_soviet.siren.sound.cloister": "Cloister Bell", "block.new_soviet.siren.sound.kuplinov": "Kuplinov Alert", "block.new_soviet.siren.instruction": "Use a screwdriver to change sound", - "item.new_soviet.dice_d6": "Die", - "item.new_soviet.dice_d4": "Die", - "item.new_soviet.dice_d20": "Die", + "item.new_soviet.dice_d6": "Dice", + "item.new_soviet.dice_d4": "Dice", + "item.new_soviet.dice_d20": "Dice", "item.new_soviet.dice_d6.tooltip": "Six sides", "item.new_soviet.dice_d4.tooltip": "Four sides", "item.new_soviet.dice_d20.tooltip": "Twenty sides", @@ -242,8 +242,17 @@ "block.new_soviet.light_beige_wallpaper": "Light Beige Wallpaper Block", "block.new_soviet.purple_goo": "Purple Goo", "subtitles.new_soviet.switch_press": "Switch clicks", + "item.new_soviet.homemade_cigarette": "Homemade Cigarette", + "item.new_soviet.homemade_cigarette_butt": "Butt of a Homemade Cigarette", + "item.new_soviet.makhorka": "Makhorka", "item.new_soviet.cigarette": "Cigarette", + "item.new_soviet.friend_cigarette": "Cigarette", + "item.new_soviet.belomor_cigarette": "Cigarette", + "item.new_soviet.duchess_cigarette": "Cigarette", "item.new_soviet.tooltip.salute": "Salute", + "item.new_soviet.tooltip.belomor": "Belomorkanal", + "item.new_soviet.tooltip.duchess": "Duchess", + "item.new_soviet.tooltip.friend": "Friend", "item.new_soviet.cigarette_butt": "Cigarette butt", "block.new_soviet.white_checker": "White Checker", "block.new_soviet.black_checker": "Black Checker", @@ -545,6 +554,91 @@ "block.new_soviet.warped_pane_window": "Warped Window With a Pane", "block.new_soviet.whitewashed_window": "Whitewashed Window", "block.new_soviet.whitewashed_pane_window": "Whitewashed Window With a Pane", + "block.new_soviet.blue_bricks": "Blue Bricks", + "block.new_soviet.cracked_blue_bricks": "Cracked Blue Bricks", + "block.new_soviet.mossy_blue_bricks": "Mossy Blue Bricks", + "block.new_soviet.blue_bricks_slab": "Blue Brick Slab", + "block.new_soviet.blue_bricks_stairs": "Blue Brick Stairs", + "block.new_soviet.cracked_blue_bricks_slab": "Cracked Blue Brick Slab", + "block.new_soviet.cracked_blue_bricks_stairs": "Cracked Blue Brick Stairs", + "block.new_soviet.mossy_blue_bricks_slab": "Mossy Blue Brick Slab", + "block.new_soviet.mossy_blue_bricks_stairs": "Mossy Blue Brick Stairs", + "block.new_soviet.tile_rest_blue": "Long Blue Tile", + "block.new_soviet.cracked_tile_rest_blue": "Cracked Long Blue Tile", + "block.new_soviet.white_tiles": "White Tiles", + "block.new_soviet.variated_white_tiles": "Variated White Tiles", + "block.new_soviet.cracked_white_tiles": "Cracked White Tiles", + "block.new_soviet.mossy_white_tiles": "Mossy White Tiles", + "block.new_soviet.white_tiles_slab": "White Tile Slab", + "block.new_soviet.white_tiles_stairs": "White Tile Stairs", + "block.new_soviet.cracked_white_tiles_slab": "Cracked White Tile Slab", + "block.new_soviet.cracked_white_tiles_stairs": "Cracked White Tile Stairs", + "block.new_soviet.mossy_white_tiles_slab": "Mossy White Tile Slab", + "block.new_soviet.mossy_white_tiles_stairs": "Mossy White Tile Stairs", + "block.new_soviet.variated_white_tiles_slab": "Variated White Tile Slab", + "block.new_soviet.variated_white_tiles_stairs": "Variated White Tile Stairs", + "block.new_soviet.yellow_bricks": "Yellow Bricks", + "block.new_soviet.yellow_bricks_stairs": "Yellow Bricks Stairs", + "block.new_soviet.yellow_bricks_slab": "Yellow Bricks Slab", + "block.new_soviet.cracked_yellow_bricks": "Cracked Yellow Bricks", + "block.new_soviet.cracked_yellow_bricks_stairs": "Cracked Yellow Bricks Stairs", + "block.new_soviet.cracked_yellow_bricks_slab": "Cracked Yellow Bricks Slab", + "block.new_soviet.mossy_yellow_bricks": "Mossy Yellow Bricks", + "block.new_soviet.mossy_yellow_bricks_stairs": "Mossy Yellow Bricks Stairs", + "block.new_soviet.mossy_yellow_bricks_slab": "Mossy Yellow Bricks Slab", + "block.new_soviet.yellow_bricks_cross": "Yellow Bricks (Cross masonry)", + "block.new_soviet.yellow_bricks_cross_stairs": "Yellow Bricks Stairs (Cross masonry)", + "block.new_soviet.yellow_bricks_cross_slab": "Yellow Bricks Slab (Cross masonry)", + "block.new_soviet.cracked_yellow_bricks_cross": "Cracked Yellow Bricks (Cross masonry)", + "block.new_soviet.cracked_yellow_bricks_cross_stairs": "Cracked Yellow Bricks Stairs (Cross masonry)", + "block.new_soviet.cracked_yellow_bricks_cross_slab": "Cracked Yellow Bricks Slab (Cross masonry)", + "block.new_soviet.mossy_yellow_bricks_cross": "Mossy Yellow Bricks (Cross masonry)", + "block.new_soviet.mossy_yellow_bricks_cross_stairs": "Mossy Yellow Bricks Stairs (Cross masonry)", + "block.new_soviet.mossy_yellow_bricks_cross_slab": "Mossy Yellow Bricks Slab (Cross masonry)", + "block.new_soviet.yellow_bricks_dressed": "Yellow Bricks (Dressing masonry)", + "block.new_soviet.yellow_bricks_dressed_stairs": "Yellow Bricks Stairs (Dressing masonry)", + "block.new_soviet.yellow_bricks_dressed_slab": "Yellow Bricks Slab (Dressing masonry)", + "block.new_soviet.cracked_yellow_bricks_dressed": "Cracked Yellow Bricks (Dressing masonry)", + "block.new_soviet.cracked_yellow_bricks_dressed_stairs": "Cracked Yellow Bricks Stairs (Dressing masonry)", + "block.new_soviet.cracked_yellow_bricks_dressed_slab": "Cracked Yellow Bricks Slab (Dressing masonry)", + "block.new_soviet.mossy_yellow_bricks_dressed": "Mossy Yellow Bricks (Dressing masonry)", + "block.new_soviet.mossy_yellow_bricks_dressed_stairs": "Mossy Yellow Bricks Stairs (Dressing masonry)", + "block.new_soviet.mossy_yellow_bricks_dressed_slab": "Mossy Yellow Bricks Slab (Dressing masonry)", + "block.new_soviet.concrete_tiles": "Concrete Tiles", + "block.new_soviet.cracked_concrete_tiles": "Cracked Concrete Tiles", + "block.new_soviet.mossy_concrete_tiles": "Mossy Concrete Tiles", + "block.new_soviet.concrete_tiles_slab": "Concrete Tile Slab", + "block.new_soviet.concrete_tiles_stairs": "Concrete Tile Stairs", + "block.new_soviet.cracked_concrete_tiles_slab": "Cracked Concrete Tile Slab", + "block.new_soviet.cracked_concrete_tiles_stairs": "Cracked Concrete Tile Stairs", + "block.new_soviet.mossy_concrete_tiles_slab": "Mossy Concrete Tile Slab", + "block.new_soviet.mossy_concrete_tiles_stairs": "Mossy Concrete Tile Stairs", + "block.new_soviet.concrete_plate": "Concrete Plate", + "block.new_soviet.concrete_plate_slab": "Concrete Plate Slab", + "block.new_soviet.concrete_plate_stairs": "Concrete Plate Stairs", + "block.new_soviet.separated_concrete_cross": "Concrete divided into four parts", + "block.new_soviet.divided_concrete": "Concrete divided into two parts", + "block.new_soviet.spruce_jungle_carved_parquet": "Spruce and Jungle Carved Parquet", + "block.new_soviet.spruce_jungle_carved_parquet_slab": "Spruce and Jungle Carved Parquet Slab", + "block.new_soviet.spruce_jungle_carved_parquet_stairs": "Spruce and Jungle Carved Parquet Stairs", + "block.new_soviet.dark_oak_spruce_carved_parquet": "Dark Oak and Spruce Carved Parquet", + "block.new_soviet.dark_oak_spruce_carved_parquet_slab": "Dark Oak and Spruce Carved Parquet Slab", + "block.new_soviet.dark_oak_spruce_carved_parquet_stairs": "Dark Oak and Spruce Carved Parquet Stairs", + "block.new_soviet.herringbone_spruce_parquet": "Herringbone Spruce Parquet", + "block.new_soviet.herringbone_spruce_parquet_slab": "Herringbone Spruce Parquet Slab", + "block.new_soviet.herringbone_spruce_parquet_stairs": "Herringbone Spruce Parquet Stairs", + "block.new_soviet.yellow_red_linoleum": "Yellow-red Linoleum", + "block.new_soviet.yellow_red_linoleum_slab": "Yellow-red Linoleum Slab", + "block.new_soviet.yellow_red_linoleum_stairs": "Yellow-red Linoleum Stairs", + "block.new_soviet.beige_linoleum": "Beige Linoleum", + "block.new_soviet.beige_linoleum_slab": "Beige Linoleum Slab", + "block.new_soviet.beige_linoleum_stairs": "Beige Linoleum Stairs", + "block.new_soviet.chiseled_acacia_door": "Chiseled Acacia Door", + "block.new_soviet.leather_lined_chiseled_acacia_door": "Leather Lined Chiseled Acacia Door", + "block.new_soviet.white_chiseled_birch_door": "Whitewashed Chiseled Birch Door", + "block.new_soviet.w_machine": "Typewriter", + "block.new_soviet.telephone": "Telephone", + "block.new_soviet.radio_war": "Military Radio", "item.new_soviet.window.tooltip": "Broken", "block.new_soviet.window.fixed": "Window blockstate frozen", "block.new_soviet.window.unfixed": "Window blockstate unfrozen", diff --git a/src/main/resources/assets/new_soviet/lang/rpr.json b/src/main/resources/assets/new_soviet/lang/rpr.json index 1e056c6..7b56d71 100644 --- a/src/main/resources/assets/new_soviet/lang/rpr.json +++ b/src/main/resources/assets/new_soviet/lang/rpr.json @@ -233,8 +233,17 @@ "block.new_soviet.light_beige_wallpaper": "Свѣтло-бѣжѣвый блокъ обоев", "block.new_soviet.purple_goo": "Фiолѣтовыя жижа", "subtitles.new_soviet.switch_press": "Нажатiя на выключатѣль", + "item.new_soviet.homemade_cigarette": "Крутка", + "item.new_soviet.homemade_cigarette_butt": "Обгорѣлый окурок", + "item.new_soviet.makhorka": "Махорка", "item.new_soviet.cigarette": "Сигарѣта", + "item.new_soviet.friend_cigarette": "Сигарѣта", + "item.new_soviet.belomor_cigarette": "Сигарѣта", + "item.new_soviet.duchess_cigarette": "Сигарѣта", "item.new_soviet.tooltip.salute": "Салют", + "item.new_soviet.tooltip.belomor": "Бѣломорканал", + "item.new_soviet.tooltip.duchess": "Дюшес", + "item.new_soviet.tooltip.friend": "Друг", "item.new_soviet.cigarette_butt": "Сигарѣтный окурок", "block.new_soviet.white_checker": "Бѣлыя шашка", "block.new_soviet.black_checker": "Чёрныя шашка", @@ -524,6 +533,91 @@ "block.new_soviet.warped_pane_window": "Искажённое окно съ форточкой", "block.new_soviet.whitewashed_window": "Побѣлённое окно", "block.new_soviet.whitewashed_pane_window": "Побѣлённое окно съ форточкой", + "block.new_soviet.blue_bricks": "Синiя кирпичи", + "block.new_soviet.cracked_blue_bricks": "Потрѣчкавшiяся синiя кирпичи", + "block.new_soviet.mossy_blue_bricks": "Замшелые синiя кирпичи", + "block.new_soviet.blue_bricks_slab": "Плита из синiхъ кирпичей", + "block.new_soviet.blue_bricks_stairs": "Ступѣнi из синiхъ кирпичей", + "block.new_soviet.cracked_blue_bricks_slab": "Потрѣскавшыяся плита из синiхъ кирпичей", + "block.new_soviet.cracked_blue_bricks_stairs": "Потрѣскавшiяся ступѣнi из синiхъ кирпичей", + "block.new_soviet.mossy_blue_bricks_slab": "Замшелыя плита из синiхъ кирпичей", + "block.new_soviet.mossy_blue_bricks_stairs": "Замшелые ступѣнi из синiхъ кирпичей", + "block.new_soviet.tile_rest_blue": "Длинныя синяя кафельныя плитка", + "block.new_soviet.cracked_tile_rest_blue": "Потрѣскавшыяся длинныя синяя кафельныя плитка", + "block.new_soviet.white_tiles": "Бѣлыя плитка", + "block.new_soviet.variated_white_tiles": "Смѣшанныя бѣлыя плитка", + "block.new_soviet.cracked_white_tiles": "Потрѣскавшыяся бѣлыя плитка", + "block.new_soviet.mossy_white_tiles": "Замшелыя бѣлыя плитка", + "block.new_soviet.white_tiles_slab": "Плита из бѣлой плитки", + "block.new_soviet.white_tiles_stairs": "Ступѣнi из бѣлой плитки", + "block.new_soviet.cracked_white_tiles_slab": "Потрѣскавшыяся плита из бѣлой плитки", + "block.new_soviet.cracked_white_tiles_stairs": "Потрѣскавшiяся ступѣнi из бѣлой плитки", + "block.new_soviet.mossy_white_tiles_slab": "Замшелыя плита из бѣлой плитки", + "block.new_soviet.mossy_white_tiles_stairs": "Замшелые ступѣнi из бѣлой плитки", + "block.new_soviet.variated_white_tiles_slab": "Плита из смѣшанной бѣлой плитки", + "block.new_soviet.variated_white_tiles_stairs": "Ступѣнi из смѣшанной бѣлой плитки", + "block.new_soviet.yellow_bricks": "Жёлтые кирпичи", + "block.new_soviet.yellow_bricks_stairs": "Ступѣнi из жёлтыхъ кирпичей", + "block.new_soviet.yellow_bricks_slab": "Плита из жёлтыхъ кирпичей", + "block.new_soviet.cracked_yellow_bricks": "Потрѣскавшiяся жёлтые кирпичи", + "block.new_soviet.cracked_yellow_bricks_stairs": "Ступѣнi из потрѣскавшихся жёлтыхъ кирпичей", + "block.new_soviet.cracked_yellow_bricks_slab": "Плита из потрѣскавшихся жёлтыхъ кирпичей", + "block.new_soviet.mossy_yellow_bricks": "Замшелые жёлтые кирпичи", + "block.new_soviet.mossy_yellow_bricks_stairs": "Ступѣнi из замшелыхъ жёлтыхъ кирпичей", + "block.new_soviet.mossy_yellow_bricks_slab": "Плита из замшелыхъ жёлтыхъ кирпичей", + "block.new_soviet.yellow_bricks_cross": "Жёлтые кирпичи (Крѣстовыя кладка)", + "block.new_soviet.yellow_bricks_cross_stairs": "Ступѣнi из жёлтыхъ кирпичей (Крѣстовыя кладка)", + "block.new_soviet.yellow_bricks_cross_slab": "Плита из жёлтыхъ кирпичей (Крѣстовыя кладка)", + "block.new_soviet.cracked_yellow_bricks_cross": "Потрѣскавшiяся жёлтые кирпичи (Крѣстовыя кладка)", + "block.new_soviet.cracked_yellow_bricks_cross_stairs": "Ступѣнi из потрѣскавшихся жёлтыхъ кирпичей (Крѣстовыя кладка)", + "block.new_soviet.cracked_yellow_bricks_cross_slab": "Плита из потрѣскавшихся жёлтыхъ кирпичей (Крѣстовыя кладка)", + "block.new_soviet.mossy_yellow_bricks_cross": "Замшелые жёлтые кирпичи (Крѣстовыя кладка)", + "block.new_soviet.mossy_yellow_bricks_cross_stairs": "Ступѣнi из замшелыхъ жёлтыхъ кирпичей (Крѣстовыя кладка)", + "block.new_soviet.mossy_yellow_bricks_cross_slab": "Плита из замшелыхъ жёлтыхъ кирпичей (Крѣстовыя кладка)", + "block.new_soviet.yellow_bricks_dressed": "Жёлтые кирпичи (Мнагорядныя пѣрѣвязка)", + "block.new_soviet.yellow_bricks_dressed_stairs": "Ступѣнi из жёлтыхъ кирпичей (Мнагорядныя пѣрѣвязка)", + "block.new_soviet.yellow_bricks_dressed_slab": "Плита из жёлтыхъ кирпичей (Мнагорядныя пѣрѣвязка)", + "block.new_soviet.cracked_yellow_bricks_dressed": "Потрѣскавшiяся жёлтые кирпичи (Мнагорядныя пѣрѣвязка)", + "block.new_soviet.cracked_yellow_bricks_dressed_stairs": "Ступѣнi из потрѣскавшихся жёлтыхъ кирпичей (Мнагорядныя пѣрѣвязка)", + "block.new_soviet.cracked_yellow_bricks_dressed_slab": "Плита из потрѣскавшихся жёлтыхъ кирпичей (Мнагорядныя пѣрѣвязка)", + "block.new_soviet.mossy_yellow_bricks_dressed": "Замшелые жёлтые кирпичи (Мнагорядныя пѣрѣвязка)", + "block.new_soviet.mossy_yellow_bricks_dressed_stairs": "Ступѣнi из замшелыхъ жёлтыхъ кирпичей (Мнагорядныя пѣрѣвязка)", + "block.new_soviet.mossy_yellow_bricks_dressed_slab": "Плита из замшелыхъ жёлтыхъ кирпичей (Мнагорядныя пѣрѣвязка)", + "block.new_soviet.concrete_tiles": "Бѣтонныя плитка", + "block.new_soviet.cracked_concrete_tiles": "Потрѣскавшыяся бѣтонныя плитка", + "block.new_soviet.mossy_concrete_tiles": "Замшелыя бѣтонныя плитка", + "block.new_soviet.concrete_tiles_slab": "Плита из бѣтонной плитки", + "block.new_soviet.concrete_tiles_stairs": "Ступѣнi из бѣтонной плитки", + "block.new_soviet.cracked_concrete_tiles_slab": "Потрѣскавшыяся плита из бѣтонной плитки", + "block.new_soviet.cracked_concrete_tiles_stairs": "Потрѣскавшiяся ступѣнi из бѣтонной плитки", + "block.new_soviet.mossy_concrete_tiles_slab": "Замшелыя плита из бѣтонной плитки", + "block.new_soviet.mossy_concrete_tiles_stairs": "Замшелые ступѣнi из бѣтонной плитки", + "block.new_soviet.concrete_plate": "Жѣлѣзобѣтонное основанiя", + "block.new_soviet.concrete_plate_slab": "Плита из жѣлѣзобѣтоннаго основанiя", + "block.new_soviet.concrete_plate_stairs": "Ступѣнi из жѣлѣзобѣтоннаго основанiя", + "block.new_soviet.separated_concrete_cross": "Жѣлѣзобѣтонъ съ прямымъ раздѣлитѣлѣм", + "block.new_soviet.divided_concrete": "Жѣлѣзобѣтонъ съ крѣстовымъ раздѣлитѣлѣм", + "block.new_soviet.spruce_jungle_carved_parquet": "Рѣзной паркѣтъ из тропическаго дѣрѣва и ели", + "block.new_soviet.spruce_jungle_carved_parquet_slab": "Плита из рѣзнго паркѣта из тропическаго дѣрѣва и ели", + "block.new_soviet.spruce_jungle_carved_parquet_stairs": "Ступѣнi из рѣзнго паркѣта из тропическаго дѣрѣва и ели", + "block.new_soviet.dark_oak_spruce_carved_parquet": "Рѣзной паркѣтъ из тѣмнаго дуба и ели", + "block.new_soviet.dark_oak_spruce_carved_parquet_slab": "Плита из рѣзнго паркѣта из тѣмнаго дуба и ели", + "block.new_soviet.dark_oak_spruce_carved_parquet_stairs": "Ступѣнi из рѣзнго паркѣта из тѣмнаго дуба и ели", + "block.new_soviet.herringbone_spruce_parquet": "Паркѣтъ из ели «ёлочкой»", + "block.new_soviet.herringbone_spruce_parquet_slab": "Плита из паркѣта из ели «ёлочкой»", + "block.new_soviet.herringbone_spruce_parquet_stairs": "Ступѣнi из паркѣта из ели «ёлочкой»", + "block.new_soviet.yellow_red_linoleum": "Жёлто-красный линолѣум", + "block.new_soviet.yellow_red_linoleum_slab": "Плита из жёлто-краснаго линолѣума", + "block.new_soviet.yellow_red_linoleum_stairs": "Ступѣнi из жёлто-краснаго линолѣума", + "block.new_soviet.beige_linoleum": "Бѣжѣвый линолѣум", + "block.new_soviet.beige_linoleum_slab": "Плита из бѣжѣваго линолѣума", + "block.new_soviet.beige_linoleum_stairs": "Ступѣнi из бѣжѣваго линолѣума", + "block.new_soviet.chiseled_acacia_door": "Рѣзныя акацiявыя двѣрь", + "block.new_soviet.leather_lined_chiseled_acacia_door": "Обшитыя кожѣй рѣзныя акацiявыя двѣрь", + "block.new_soviet.white_chiseled_birch_door": "Побѣлённыя рѣзныя бѣрѣзовыя двѣрь", + "block.new_soviet.w_machine": "Пѣчатныя машинка", + "block.new_soviet.telephone": "Тѣлѣфон", + "block.new_soviet.radio_war": "Военное радiо", "item.new_soviet.window.tooltip": "Разбито", "block.new_soviet.window.fixed": "Окно зафиксировано", "block.new_soviet.window.unfixed": "Окно не зафиксировано", diff --git a/src/main/resources/assets/new_soviet/lang/ru_ru.json b/src/main/resources/assets/new_soviet/lang/ru_ru.json index 49fb392..c6c10a4 100644 --- a/src/main/resources/assets/new_soviet/lang/ru_ru.json +++ b/src/main/resources/assets/new_soviet/lang/ru_ru.json @@ -242,8 +242,17 @@ "block.new_soviet.light_beige_wallpaper": "Светло-бежевый блок обоев", "block.new_soviet.purple_goo": "Фиолетовая жижа", "subtitles.new_soviet.switch_press": "Нажатие на выключатель", + "item.new_soviet.homemade_cigarette": "Крутка", + "item.new_soviet.homemade_cigarette_butt": "Обгорелый окурок", + "item.new_soviet.makhorka": "Махорка", "item.new_soviet.cigarette": "Сигарета", + "item.new_soviet.friend_cigarette": "Сигарета", + "item.new_soviet.belomor_cigarette": "Сигарета", + "item.new_soviet.duchess_cigarette": "Сигарета", "item.new_soviet.tooltip.salute": "Салют", + "item.new_soviet.tooltip.belomor": "Беломорканал", + "item.new_soviet.tooltip.duchess": "Дюшес", + "item.new_soviet.tooltip.friend": "Друг", "item.new_soviet.cigarette_butt": "Сигаретный окурок", "block.new_soviet.white_checker": "Белая шашка", "block.new_soviet.black_checker": "Чёрная шашка", @@ -545,6 +554,91 @@ "block.new_soviet.warped_pane_window": "Искажённое окно с форточкой", "block.new_soviet.whitewashed_window": "Побелённое окно", "block.new_soviet.whitewashed_pane_window": "Побелённое окно с форточкой", + "block.new_soviet.blue_bricks": "Синие кирпичи", + "block.new_soviet.cracked_blue_bricks": "Потречкавшиеся синие кирпичи", + "block.new_soviet.mossy_blue_bricks": "Замшелые синие кирпичи", + "block.new_soviet.blue_bricks_slab": "Плита из синих кирпичей", + "block.new_soviet.blue_bricks_stairs": "Ступени из синих кирпичей", + "block.new_soviet.cracked_blue_bricks_slab": "Потрескавшаяся плита из синих кирпичей", + "block.new_soviet.cracked_blue_bricks_stairs": "Потрескавшиеся ступени из синих кирпичей", + "block.new_soviet.mossy_blue_bricks_slab": "Замшелая плита из синих кирпичей", + "block.new_soviet.mossy_blue_bricks_stairs": "Замшелые ступени из синих кирпичей", + "block.new_soviet.tile_rest_blue": "Длинная синяя кафельная плитка", + "block.new_soviet.cracked_tile_rest_blue": "Потрескавшаяся длинная синяя кафельная плитка", + "block.new_soviet.white_tiles": "Белая плитка", + "block.new_soviet.variated_white_tiles": "Смешанная белая плитка", + "block.new_soviet.cracked_white_tiles": "Потрескавшаяся белая плитка", + "block.new_soviet.mossy_white_tiles": "Замшелая белая плитка", + "block.new_soviet.white_tiles_slab": "Плита из белой плитки", + "block.new_soviet.white_tiles_stairs": "Ступени из белой плитки", + "block.new_soviet.cracked_white_tiles_slab": "Потрескавшаяся плита из белой плитки", + "block.new_soviet.cracked_white_tiles_stairs": "Потрескавшиеся ступени из белой плитки", + "block.new_soviet.mossy_white_tiles_slab": "Замшелая плита из белой плитки", + "block.new_soviet.mossy_white_tiles_stairs": "Замшелые ступени из белой плитки", + "block.new_soviet.variated_white_tiles_slab": "Плита из смешанной белой плитки", + "block.new_soviet.variated_white_tiles_stairs": "Ступени из смешанной белой плитки", + "block.new_soviet.yellow_bricks": "Жёлтые кирпичи", + "block.new_soviet.yellow_bricks_stairs": "Ступени из жёлтых кирпичей", + "block.new_soviet.yellow_bricks_slab": "Плита из жёлтых кирпичей", + "block.new_soviet.cracked_yellow_bricks": "Потрескавшиеся жёлтые кирпичи", + "block.new_soviet.cracked_yellow_bricks_stairs": "Ступени из потрескавшихся жёлтых кирпичей", + "block.new_soviet.cracked_yellow_bricks_slab": "Плита из потрескавшихся жёлтых кирпичей", + "block.new_soviet.mossy_yellow_bricks": "Замшелые жёлтые кирпичи", + "block.new_soviet.mossy_yellow_bricks_stairs": "Ступени из замшелых жёлтых кирпичей", + "block.new_soviet.mossy_yellow_bricks_slab": "Плита из замшелых жёлтых кирпичей", + "block.new_soviet.yellow_bricks_cross": "Жёлтые кирпичи (Крестовая кладка)", + "block.new_soviet.yellow_bricks_cross_stairs": "Ступени из жёлтых кирпичей (Крестовая кладка)", + "block.new_soviet.yellow_bricks_cross_slab": "Плита из жёлтых кирпичей (Крестовая кладка)", + "block.new_soviet.cracked_yellow_bricks_cross": "Потрескавшиеся жёлтые кирпичи (Крестовая кладка)", + "block.new_soviet.cracked_yellow_bricks_cross_stairs": "Ступени из потрескавшихся жёлтых кирпичей (Крестовая кладка)", + "block.new_soviet.cracked_yellow_bricks_cross_slab": "Плита из потрескавшихся жёлтых кирпичей (Крестовая кладка)", + "block.new_soviet.mossy_yellow_bricks_cross": "Замшелые жёлтые кирпичи (Крестовая кладка)", + "block.new_soviet.mossy_yellow_bricks_cross_stairs": "Ступени из замшелых жёлтых кирпичей (Крестовая кладка)", + "block.new_soviet.mossy_yellow_bricks_cross_slab": "Плита из замшелых жёлтых кирпичей (Крестовая кладка)", + "block.new_soviet.yellow_bricks_dressed": "Жёлтые кирпичи (Многорядная перевязка)", + "block.new_soviet.yellow_bricks_dressed_stairs": "Ступени из жёлтых кирпичей (Многорядная перевязка)", + "block.new_soviet.yellow_bricks_dressed_slab": "Плита из жёлтых кирпичей (Многорядная перевязка)", + "block.new_soviet.cracked_yellow_bricks_dressed": "Потрескавшиеся жёлтые кирпичи (Многорядная перевязка)", + "block.new_soviet.cracked_yellow_bricks_dressed_stairs": "Ступени из потрескавшихся жёлтых кирпичей (Многорядная перевязка)", + "block.new_soviet.cracked_yellow_bricks_dressed_slab": "Плита из потрескавшихся жёлтых кирпичей (Многорядная перевязка)", + "block.new_soviet.mossy_yellow_bricks_dressed": "Замшелые жёлтые кирпичи (Многорядная перевязка)", + "block.new_soviet.mossy_yellow_bricks_dressed_stairs": "Ступени из замшелых жёлтых кирпичей (Многорядная перевязка)", + "block.new_soviet.mossy_yellow_bricks_dressed_slab": "Плита из замшелых жёлтых кирпичей (Многорядная перевязка)", + "block.new_soviet.concrete_tiles": "Бетонная плитка", + "block.new_soviet.cracked_concrete_tiles": "Потрескавшаяся бетонная плитка", + "block.new_soviet.mossy_concrete_tiles": "Замшелая бетонная плитка", + "block.new_soviet.concrete_tiles_slab": "Плита из бетонной плитки", + "block.new_soviet.concrete_tiles_stairs": "Ступени из бетонной плитки", + "block.new_soviet.cracked_concrete_tiles_slab": "Потрескавшаяся плита из бетонной плитки", + "block.new_soviet.cracked_concrete_tiles_stairs": "Потрескавшиеся ступени из бетонной плитки", + "block.new_soviet.mossy_concrete_tiles_slab": "Замшелая плита из бетонной плитки", + "block.new_soviet.mossy_concrete_tiles_stairs": "Замшелые ступени из бетонной плитки", + "block.new_soviet.concrete_plate": "Железобетонное основание", + "block.new_soviet.concrete_plate_slab": "Плита из железобетонного основания", + "block.new_soviet.concrete_plate_stairs": "Ступени из железобетонного основания", + "block.new_soviet.separated_concrete_cross": "Железобетон с прямым разделителем", + "block.new_soviet.divided_concrete": "Железобетон с крестовым разделителем", + "block.new_soviet.spruce_jungle_carved_parquet": "Резной паркет из тропического дерева и ели", + "block.new_soviet.spruce_jungle_carved_parquet_slab": "Плита из резнго паркета из тропического дерева и ели", + "block.new_soviet.spruce_jungle_carved_parquet_stairs": "Ступени из резнго паркета из тропического дерева и ели", + "block.new_soviet.dark_oak_spruce_carved_parquet": "Резной паркет из тёмного дуба и ели", + "block.new_soviet.dark_oak_spruce_carved_parquet_slab": "Плита из резнго паркета из тёмного дуба и ели", + "block.new_soviet.dark_oak_spruce_carved_parquet_stairs": "Ступени из резнго паркета из тёмного дуба и ели", + "block.new_soviet.herringbone_spruce_parquet": "Паркет из ели «ёлочкой»", + "block.new_soviet.herringbone_spruce_parquet_slab": "Плита из паркета из ели «ёлочкой»", + "block.new_soviet.herringbone_spruce_parquet_stairs": "Ступени из паркета из ели «ёлочкой»", + "block.new_soviet.yellow_red_linoleum": "Жёлто-красный линолеум", + "block.new_soviet.yellow_red_linoleum_slab": "Плита из жёлто-красного линолеума", + "block.new_soviet.yellow_red_linoleum_stairs": "Ступени из жёлто-красного линолеума", + "block.new_soviet.beige_linoleum": "Бежевый линолеум", + "block.new_soviet.beige_linoleum_slab": "Плита из бежевого линолеума", + "block.new_soviet.beige_linoleum_stairs": "Ступени из бежевого линолеума", + "block.new_soviet.chiseled_acacia_door": "Резная акациевая дверь", + "block.new_soviet.leather_lined_chiseled_acacia_door": "Обшитая кожей резная акациевая дверь", + "block.new_soviet.white_chiseled_birch_door": "Побелённая резная берёзовая дверь", + "block.new_soviet.w_machine": "Печатная машинка", + "block.new_soviet.telephone": "Телефон", + "block.new_soviet.radio_war": "Военное радио", "item.new_soviet.window.tooltip": "Разбито", "block.new_soviet.window.fixed": "Окно зафиксировано", "block.new_soviet.window.unfixed": "Окно не зафиксировано", diff --git a/src/main/resources/assets/new_soviet/models/block/horizontally_divided_concrete.json b/src/main/resources/assets/new_soviet/models/block/horizontally_divided_concrete.json new file mode 100644 index 0000000..5923ab3 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/horizontally_divided_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/horizontally_divided_concrete" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/radio_war.json b/src/main/resources/assets/new_soviet/models/block/radio_war.json new file mode 100644 index 0000000..5805f73 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/radio_war.json @@ -0,0 +1,128 @@ +{ + "credit": "Made with Blockbench", + "render_type": "cutout", + "texture_size": [48, 32], + "textures": { + "0": "new_soviet:block/radio_war", + "particle": "new_soviet:block/radio_war" + }, + "elements": [ + { + "from": [0, 1, 4], + "to": [16, 12, 14], + "faces": { + "north": {"uv": [0, 0, 5.33333, 5.5], "texture": "#0"}, + "east": {"uv": [8.66667, 0, 5.33333, 5.5], "texture": "#0"}, + "south": {"uv": [0, 5.5, 5.33333, 11], "texture": "#0"}, + "west": {"uv": [5.33333, 5.5, 8.66667, 11], "texture": "#0"}, + "up": {"uv": [8.66667, 0, 14, 5], "texture": "#0"}, + "down": {"uv": [8.66667, 5, 14, 10], "texture": "#0"} + } + }, + { + "from": [3, 0.1, 3], + "to": [5, 0.1, 15], + "faces": { + "north": {"uv": [14.66667, 4.5, 14, 10.5], "texture": "#0"}, + "east": {"uv": [14.66667, 4.5, 14, 10.5], "texture": "#0"}, + "south": {"uv": [14.66667, 4.5, 14, 10.5], "texture": "#0"}, + "west": {"uv": [14.66667, 4.5, 14, 10.5], "texture": "#0"}, + "up": {"uv": [14.66667, 4.5, 14, 10.5], "texture": "#0"}, + "down": {"uv": [14.66667, 4.5, 14, 10.5], "texture": "#0"} + } + }, + { + "from": [4, 0.1, 5], + "to": [4, 1.1, 13], + "faces": { + "north": {"uv": [8.33333, 11, 5.66667, 11.5], "texture": "#0"}, + "east": {"uv": [5.66667, 11, 8.33333, 11.5], "texture": "#0"}, + "south": {"uv": [8.33333, 11, 5.66667, 11.5], "texture": "#0"}, + "west": {"uv": [8.33333, 11, 5.66667, 11.5], "texture": "#0"}, + "up": {"uv": [8.33333, 11, 5.66667, 11.5], "texture": "#0"}, + "down": {"uv": [8.33333, 11, 5.66667, 11.5], "texture": "#0"} + } + }, + { + "from": [12, 0.1, 5], + "to": [12, 1.1, 13], + "faces": { + "north": {"uv": [8.33333, 11, 5.66667, 11.5], "texture": "#0"}, + "east": {"uv": [5.66667, 11, 8.33333, 11.5], "texture": "#0"}, + "south": {"uv": [8.33333, 11, 5.66667, 11.5], "texture": "#0"}, + "west": {"uv": [8.33333, 11, 5.66667, 11.5], "texture": "#0"}, + "up": {"uv": [8.33333, 11, 5.66667, 11.5], "texture": "#0"}, + "down": {"uv": [8.33333, 11, 5.66667, 11.5], "texture": "#0"} + } + }, + { + "from": [11, 0.1, 3], + "to": [13, 0.1, 15], + "faces": { + "north": {"uv": [14.66667, 4.5, 14, 10.5], "texture": "#0"}, + "east": {"uv": [14.66667, 4.5, 14, 10.5], "texture": "#0"}, + "south": {"uv": [14.66667, 4.5, 14, 10.5], "texture": "#0"}, + "west": {"uv": [14.66667, 4.5, 14, 10.5], "texture": "#0"}, + "up": {"uv": [14.66667, 4.5, 14, 10.5], "texture": "#0"}, + "down": {"uv": [14.66667, 4.5, 14, 10.5], "texture": "#0"} + } + }, + { + "from": [-0.05, 4.5, 7], + "to": [-0.05, 6.5, 11], + "faces": { + "north": {"uv": [14, 0, 15.33334, 1], "texture": "#0"}, + "east": {"uv": [15.33334, 0, 14, 1], "texture": "#0"}, + "south": {"uv": [14, 0, 15.33334, 1], "texture": "#0"}, + "west": {"uv": [14, 0, 15.33334, 1], "texture": "#0"}, + "up": {"uv": [14, 0, 15.33334, 1], "texture": "#0"}, + "down": {"uv": [14, 0, 15.33334, 1], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 0, -1.5], + "translation": [-6, 8.75, 5.25] + }, + "thirdperson_lefthand": { + "rotation": [75, 0, -1.5], + "translation": [-6, 8.75, 5.25] + }, + "firstperson_righthand": { + "rotation": [0, 4, 0], + "translation": [7.5, -2.75, -3.25] + }, + "firstperson_lefthand": { + "rotation": [0, 4, 0], + "translation": [7.5, -2.75, -3.25] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [35, 135, 0], + "translation": [-1.25, 0.25, 0], + "scale": [0.65, 0.65, 0.65] + }, + "head": { + "translation": [0, 19.25, 0], + "scale": [1.6, 1.6, 1.6] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -14], + "scale": [2.01, 2.01, 2.01] + } + }, + "groups": [ + { + "name": "root", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "children": [0, 1, 2, 3, 4, 5] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/separated_concrete_cross.json b/src/main/resources/assets/new_soviet/models/block/separated_concrete_cross.json new file mode 100644 index 0000000..d96896c --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/separated_concrete_cross.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/separated_concrete_cross" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/telephone.json b/src/main/resources/assets/new_soviet/models/block/telephone.json index c696bd2..48c8fb2 100644 --- a/src/main/resources/assets/new_soviet/models/block/telephone.json +++ b/src/main/resources/assets/new_soviet/models/block/telephone.json @@ -156,11 +156,13 @@ "translation": [2, 5.5, -2] }, "ground": { - "translation": [0, 5.5, 0] + "translation": [0, 3, 0], + "scale": [0.4, 0.4, 0.4] }, "gui": { "rotation": [35, 135, 0], - "translation": [0, 3.5, 0] + "translation": [0, 3.75, 0], + "scale": [1.2, 1.2, 1.2] }, "head": { "translation": [0, 19.25, 0], diff --git a/src/main/resources/assets/new_soviet/models/block/vertically_divided_concrete.json b/src/main/resources/assets/new_soviet/models/block/vertically_divided_concrete.json new file mode 100644 index 0000000..37b1d19 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/vertically_divided_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/vertically_divided_concrete" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/belomor_cigarette.json b/src/main/resources/assets/new_soviet/models/item/belomor_cigarette.json new file mode 100644 index 0000000..7b17ab1 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/belomor_cigarette.json @@ -0,0 +1,50 @@ +{ + "credit": "Made by Feulim Temly with BlockBench", + "textures": { + "1": "new_soviet:item/cigarette", + "particle": "new_soviet:item/cigarette" + }, + "elements": [ + { + "from": [7.5, 6, 7.5], + "to": [8.5, 10, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#1"}, + "east": {"uv": [1, 0, 2, 4], "texture": "#1"}, + "south": {"uv": [2, 0, 3, 4], "texture": "#1"}, + "west": {"uv": [3, 0, 4, 4], "texture": "#1"}, + "up": {"uv": [1, 5, 0, 4], "texture": "#1"}, + "down": {"uv": [5, 0, 4, 1], "texture": "#1"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [-180, -62, 105], + "translation": [-1.75, -1.55, 0] + }, + "thirdperson_lefthand": { + "rotation": [-180, -62, 105], + "translation": [-1.75, -1.55, 0] + }, + "ground": { + "rotation": [90, 0, 0] + }, + "gui": { + "rotation": [-155, 225, 0], + "scale": [2.5, 2.5, 2.5] + }, + "head": { + "rotation": [90, 0, 0], + "translation": [0, -4.68, -9.75], + "scale": [1.7, 1.7, 1.7] + }, + "fixed": { + "rotation": [0, 180, 0], + "translation": [0, 0, 0.25], + "scale": [2, 2, 2] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/divided_concrete.json b/src/main/resources/assets/new_soviet/models/item/divided_concrete.json new file mode 100644 index 0000000..1d161cd --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/divided_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/vertically_divided_concrete" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/duchess_cigarette.json b/src/main/resources/assets/new_soviet/models/item/duchess_cigarette.json new file mode 100644 index 0000000..7b17ab1 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/duchess_cigarette.json @@ -0,0 +1,50 @@ +{ + "credit": "Made by Feulim Temly with BlockBench", + "textures": { + "1": "new_soviet:item/cigarette", + "particle": "new_soviet:item/cigarette" + }, + "elements": [ + { + "from": [7.5, 6, 7.5], + "to": [8.5, 10, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#1"}, + "east": {"uv": [1, 0, 2, 4], "texture": "#1"}, + "south": {"uv": [2, 0, 3, 4], "texture": "#1"}, + "west": {"uv": [3, 0, 4, 4], "texture": "#1"}, + "up": {"uv": [1, 5, 0, 4], "texture": "#1"}, + "down": {"uv": [5, 0, 4, 1], "texture": "#1"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [-180, -62, 105], + "translation": [-1.75, -1.55, 0] + }, + "thirdperson_lefthand": { + "rotation": [-180, -62, 105], + "translation": [-1.75, -1.55, 0] + }, + "ground": { + "rotation": [90, 0, 0] + }, + "gui": { + "rotation": [-155, 225, 0], + "scale": [2.5, 2.5, 2.5] + }, + "head": { + "rotation": [90, 0, 0], + "translation": [0, -4.68, -9.75], + "scale": [1.7, 1.7, 1.7] + }, + "fixed": { + "rotation": [0, 180, 0], + "translation": [0, 0, 0.25], + "scale": [2, 2, 2] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/friend_cigarette.json b/src/main/resources/assets/new_soviet/models/item/friend_cigarette.json new file mode 100644 index 0000000..7b17ab1 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/friend_cigarette.json @@ -0,0 +1,50 @@ +{ + "credit": "Made by Feulim Temly with BlockBench", + "textures": { + "1": "new_soviet:item/cigarette", + "particle": "new_soviet:item/cigarette" + }, + "elements": [ + { + "from": [7.5, 6, 7.5], + "to": [8.5, 10, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#1"}, + "east": {"uv": [1, 0, 2, 4], "texture": "#1"}, + "south": {"uv": [2, 0, 3, 4], "texture": "#1"}, + "west": {"uv": [3, 0, 4, 4], "texture": "#1"}, + "up": {"uv": [1, 5, 0, 4], "texture": "#1"}, + "down": {"uv": [5, 0, 4, 1], "texture": "#1"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [-180, -62, 105], + "translation": [-1.75, -1.55, 0] + }, + "thirdperson_lefthand": { + "rotation": [-180, -62, 105], + "translation": [-1.75, -1.55, 0] + }, + "ground": { + "rotation": [90, 0, 0] + }, + "gui": { + "rotation": [-155, 225, 0], + "scale": [2.5, 2.5, 2.5] + }, + "head": { + "rotation": [90, 0, 0], + "translation": [0, -4.68, -9.75], + "scale": [1.7, 1.7, 1.7] + }, + "fixed": { + "rotation": [0, 180, 0], + "translation": [0, 0, 0.25], + "scale": [2, 2, 2] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/homemade_cigarette.json b/src/main/resources/assets/new_soviet/models/item/homemade_cigarette.json new file mode 100644 index 0000000..325c359 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/homemade_cigarette.json @@ -0,0 +1,50 @@ +{ + "credit": "Made by Feulim Temly with BlockBench", + "textures": { + "1": "new_soviet:item/homemade_cigarette", + "particle": "new_soviet:item/homemade_cigarette" + }, + "elements": [ + { + "from": [7.5, 6, 7.5], + "to": [8.5, 10, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 4], "texture": "#1"}, + "east": {"uv": [1, 0, 2, 4], "texture": "#1"}, + "south": {"uv": [2, 0, 3, 4], "texture": "#1"}, + "west": {"uv": [3, 0, 4, 4], "texture": "#1"}, + "up": {"uv": [1, 5, 0, 4], "texture": "#1"}, + "down": {"uv": [5, 0, 4, 1], "texture": "#1"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [-180, -62, 105], + "translation": [-1.75, -1.55, 0] + }, + "thirdperson_lefthand": { + "rotation": [-180, -62, 105], + "translation": [-1.75, -1.55, 0] + }, + "ground": { + "rotation": [90, 0, 0] + }, + "gui": { + "rotation": [-155, 225, 0], + "scale": [2.5, 2.5, 2.5] + }, + "head": { + "rotation": [90, 0, 0], + "translation": [0, -4.68, -9.75], + "scale": [1.7, 1.7, 1.7] + }, + "fixed": { + "rotation": [0, 180, 0], + "translation": [0, 0, 0.25], + "scale": [2, 2, 2] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/homemade_cigarette_butt.json b/src/main/resources/assets/new_soviet/models/item/homemade_cigarette_butt.json new file mode 100644 index 0000000..3710655 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/homemade_cigarette_butt.json @@ -0,0 +1,7 @@ +{ + "credit": "Feulim Temly", + "parent": "item/generated", + "textures": { + "layer0": "new_soviet:item/homemade_cigarette_butt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/homemade_cigarette_item.json b/src/main/resources/assets/new_soviet/models/item/homemade_cigarette_item.json new file mode 100644 index 0000000..1e4b805 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/homemade_cigarette_item.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "new_soviet:item/homemade_cigarette_item" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/makhorka.json b/src/main/resources/assets/new_soviet/models/item/makhorka.json new file mode 100644 index 0000000..c916581 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/makhorka.json @@ -0,0 +1,7 @@ +{ + "credit": "Achieved with SORCE", + "parent": "item/generated", + "textures": { + "layer0": "new_soviet:item/makhorka" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/radio_war.json b/src/main/resources/assets/new_soviet/models/item/radio_war.json new file mode 100644 index 0000000..3aaef58 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/radio_war.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/radio_war" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/separated_concrete_cross.json b/src/main/resources/assets/new_soviet/models/item/separated_concrete_cross.json new file mode 100644 index 0000000..57a3001 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/separated_concrete_cross.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/separated_concrete_cross" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/telephone.json b/src/main/resources/assets/new_soviet/models/item/telephone.json new file mode 100644 index 0000000..b46cc73 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/telephone.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/telephone" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/sounds.json b/src/main/resources/assets/new_soviet/sounds.json index d31dddc..5d90383 100644 --- a/src/main/resources/assets/new_soviet/sounds.json +++ b/src/main/resources/assets/new_soviet/sounds.json @@ -63,6 +63,32 @@ "new_soviet:parquet/parquet_step8" ] }, + "meat_step": { + "sounds": [ + "new_soviet:meat/step1", + "new_soviet:meat/step2", + "new_soviet:meat/step3", + "new_soviet:meat/step4", + "new_soviet:meat/step5", + "new_soviet:meat/step6" + ] + }, + "meat_break": { + "sounds": [ + "new_soviet:meat/break1", + "new_soviet:meat/break2", + "new_soviet:meat/break3", + "new_soviet:meat/break4" + ] + }, + "meat_place": { + "sounds": [ + "new_soviet:meat/place1", + "new_soviet:meat/place2", + "new_soviet:meat/place3", + "new_soviet:meat/place4" + ] + }, "switch_press": { "subtitle": "subtitles.new_soviet.switch_press", "sounds": [ diff --git a/src/main/resources/assets/new_soviet/sounds/meat/break1.ogg b/src/main/resources/assets/new_soviet/sounds/meat/break1.ogg new file mode 100644 index 0000000..1fc7eda Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/meat/break1.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/meat/break2.ogg b/src/main/resources/assets/new_soviet/sounds/meat/break2.ogg new file mode 100644 index 0000000..577653e Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/meat/break2.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/meat/break3.ogg b/src/main/resources/assets/new_soviet/sounds/meat/break3.ogg new file mode 100644 index 0000000..9ec84b7 Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/meat/break3.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/meat/break4.ogg b/src/main/resources/assets/new_soviet/sounds/meat/break4.ogg new file mode 100644 index 0000000..9b5e32e Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/meat/break4.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/meat/place.ogg b/src/main/resources/assets/new_soviet/sounds/meat/place.ogg new file mode 100644 index 0000000..f5d5c18 Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/meat/place.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/meat/place1.ogg b/src/main/resources/assets/new_soviet/sounds/meat/place1.ogg new file mode 100644 index 0000000..ee11b78 Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/meat/place1.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/meat/place2.ogg b/src/main/resources/assets/new_soviet/sounds/meat/place2.ogg new file mode 100644 index 0000000..dc1756b Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/meat/place2.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/meat/place4.ogg b/src/main/resources/assets/new_soviet/sounds/meat/place4.ogg new file mode 100644 index 0000000..6de32c2 Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/meat/place4.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/meat/step1.ogg b/src/main/resources/assets/new_soviet/sounds/meat/step1.ogg new file mode 100644 index 0000000..a66faa4 Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/meat/step1.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/meat/step2.ogg b/src/main/resources/assets/new_soviet/sounds/meat/step2.ogg new file mode 100644 index 0000000..28e5ca9 Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/meat/step2.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/meat/step3.ogg b/src/main/resources/assets/new_soviet/sounds/meat/step3.ogg new file mode 100644 index 0000000..43e5d83 Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/meat/step3.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/meat/step4.ogg b/src/main/resources/assets/new_soviet/sounds/meat/step4.ogg new file mode 100644 index 0000000..f29487b Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/meat/step4.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/meat/step5.ogg b/src/main/resources/assets/new_soviet/sounds/meat/step5.ogg new file mode 100644 index 0000000..f5f70d6 Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/meat/step5.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/meat/step6.ogg b/src/main/resources/assets/new_soviet/sounds/meat/step6.ogg new file mode 100644 index 0000000..5d1aebd Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/meat/step6.ogg differ diff --git a/src/main/resources/assets/new_soviet/textures/block/concrete/concrete_tiles.png b/src/main/resources/assets/new_soviet/textures/block/concrete/concrete_tiles.png new file mode 100644 index 0000000..687b61d Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/concrete/concrete_tiles.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/concrete/cracked_concrete_tiles.png b/src/main/resources/assets/new_soviet/textures/block/concrete/cracked_concrete_tiles.png new file mode 100644 index 0000000..49e07a8 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/concrete/cracked_concrete_tiles.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/concrete/horizontally_divided_concrete.png b/src/main/resources/assets/new_soviet/textures/block/concrete/horizontally_divided_concrete.png new file mode 100644 index 0000000..7be9cb3 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/concrete/horizontally_divided_concrete.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/concrete/mossy_concrete_tiles.png b/src/main/resources/assets/new_soviet/textures/block/concrete/mossy_concrete_tiles.png new file mode 100644 index 0000000..238504f Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/concrete/mossy_concrete_tiles.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/concrete/separated_concrete_cross.png b/src/main/resources/assets/new_soviet/textures/block/concrete/separated_concrete_cross.png new file mode 100644 index 0000000..2adc252 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/concrete/separated_concrete_cross.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/concrete/vertically_divided_concrete.png b/src/main/resources/assets/new_soviet/textures/block/concrete/vertically_divided_concrete.png new file mode 100644 index 0000000..780ae4b Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/concrete/vertically_divided_concrete.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/radio_war.png b/src/main/resources/assets/new_soviet/textures/block/radio_war.png new file mode 100644 index 0000000..5035650 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/radio_war.png differ diff --git a/src/main/resources/assets/new_soviet/textures/item/homemade_cigarette.png b/src/main/resources/assets/new_soviet/textures/item/homemade_cigarette.png new file mode 100644 index 0000000..d3babed Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/item/homemade_cigarette.png differ diff --git a/src/main/resources/assets/new_soviet/textures/item/homemade_cigarette_butt.png b/src/main/resources/assets/new_soviet/textures/item/homemade_cigarette_butt.png new file mode 100644 index 0000000..a42befd Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/item/homemade_cigarette_butt.png differ diff --git a/src/main/resources/assets/new_soviet/textures/item/homemade_cigarette_item.png b/src/main/resources/assets/new_soviet/textures/item/homemade_cigarette_item.png new file mode 100644 index 0000000..2a158a4 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/item/homemade_cigarette_item.png differ diff --git a/src/main/resources/assets/new_soviet/textures/item/makhorka.png b/src/main/resources/assets/new_soviet/textures/item/makhorka.png new file mode 100644 index 0000000..98fa9c0 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/item/makhorka.png differ