From 6be5ed3d1b92af319fe4b39d5adf2902f0419978 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Thu, 30 Jan 2020 22:16:04 +0100 Subject: [PATCH] Added Connected Glass Blocks and Panes - Added vertically connected glass blocks for all wood variants - Added horizontal and vertical connected windows in a neutral style - Fixed Oxidizing blocks not progressing when next to enclosed blocks --- .../java/com/simibubi/create/AllBlocks.java | 59 +++++++------ src/main/java/com/simibubi/create/AllCTs.java | 81 ++++++++++++++++++ .../foundation/block/connected/CTModel.java | 2 +- .../connected/ConnectedTextureBehaviour.java | 44 +++++----- .../foundation/world/OxidizingBlock.java | 5 +- .../contraptions/RotationPropagator.java | 2 +- .../chassis/LinearChassisBlock.java | 4 +- .../components/crafter/InputCTBehaviour.java | 2 +- .../create/modules/palettes/CTGlassBlock.java | 27 +++++- .../modules/palettes/CTGlassPaneBlock.java | 70 +++++++++++++++ .../palettes/HorizontalCTGlassBlock.java | 24 ++++++ .../modules/palettes/LayeredCTBlock.java | 11 ++- .../palettes/VerticalCTGlassBlock.java | 29 +++++++ .../create/blockstates/acacia_glass.json | 5 ++ .../create/blockstates/acacia_glass_pane.json | 31 +++++++ .../create/blockstates/birch_glass.json | 5 ++ .../create/blockstates/birch_glass_pane.json | 31 +++++++ .../create/blockstates/dark_oak_glass.json | 5 ++ .../blockstates/dark_oak_glass_pane.json | 31 +++++++ .../create/blockstates/framed_glass_pane.json | 31 +++++++ .../blockstates/horizontal_framed_glass.json | 5 ++ .../horizontal_framed_glass_pane.json | 31 +++++++ .../assets/create/blockstates/iron_glass.json | 5 ++ .../create/blockstates/iron_glass_pane.json | 31 +++++++ .../create/blockstates/jungle_glass.json | 5 ++ .../create/blockstates/jungle_glass_pane.json | 31 +++++++ .../assets/create/blockstates/oak_glass.json | 5 ++ .../create/blockstates/oak_glass_pane.json | 31 +++++++ .../create/blockstates/spruce_glass.json | 5 ++ .../create/blockstates/spruce_glass_pane.json | 31 +++++++ .../create/blockstates/tiled_glass_pane.json | 20 +++-- .../blockstates/vertical_framed_glass.json | 5 ++ .../vertical_framed_glass_pane.json | 31 +++++++ .../resources/assets/create/lang/en_us.json | 22 ++++- .../models/block/palettes/acacia_glass.json | 7 ++ .../models/block/palettes/birch_glass.json | 7 ++ .../models/block/palettes/dark_oak_glass.json | 7 ++ .../models/block/palettes/iron_glass.json | 7 ++ .../models/block/palettes/jungle_glass.json | 7 ++ .../models/block/palettes/oak_glass.json | 7 ++ .../block/palettes/pane/acacia/noside.json | 6 ++ .../palettes/pane/acacia/noside_alt.json | 6 ++ .../block/palettes/pane/acacia/post.json | 7 ++ .../block/palettes/pane/acacia/side.json | 7 ++ .../block/palettes/pane/acacia/side_alt.json | 7 ++ .../block/palettes/pane/birch/noside.json | 6 ++ .../block/palettes/pane/birch/noside_alt.json | 6 ++ .../block/palettes/pane/birch/post.json | 7 ++ .../block/palettes/pane/birch/side.json | 7 ++ .../block/palettes/pane/birch/side_alt.json | 7 ++ .../block/palettes/pane/dark_oak/noside.json | 6 ++ .../palettes/pane/dark_oak/noside_alt.json | 6 ++ .../block/palettes/pane/dark_oak/post.json | 7 ++ .../block/palettes/pane/dark_oak/side.json | 7 ++ .../palettes/pane/dark_oak/side_alt.json | 7 ++ .../block/palettes/pane/glass/noside.json | 6 ++ .../block/palettes/pane/glass/noside_alt.json | 6 ++ .../block/palettes/pane/glass/post.json | 7 ++ .../block/palettes/pane/glass/side.json | 7 ++ .../block/palettes/pane/glass/side_alt.json | 7 ++ .../block/palettes/pane/iron/noside.json | 6 ++ .../block/palettes/pane/iron/noside_alt.json | 6 ++ .../models/block/palettes/pane/iron/post.json | 7 ++ .../models/block/palettes/pane/iron/side.json | 7 ++ .../block/palettes/pane/iron/side_alt.json | 7 ++ .../block/palettes/pane/jungle/noside.json | 6 ++ .../palettes/pane/jungle/noside_alt.json | 6 ++ .../block/palettes/pane/jungle/post.json | 7 ++ .../block/palettes/pane/jungle/side.json | 7 ++ .../block/palettes/pane/jungle/side_alt.json | 7 ++ .../block/palettes/pane/oak/noside.json | 6 ++ .../block/palettes/pane/oak/noside_alt.json | 6 ++ .../models/block/palettes/pane/oak/post.json | 7 ++ .../models/block/palettes/pane/oak/side.json | 7 ++ .../block/palettes/pane/oak/side_alt.json | 7 ++ .../block/palettes/pane/spruce/noside.json | 6 ++ .../palettes/pane/spruce/noside_alt.json | 6 ++ .../block/palettes/pane/spruce/post.json | 7 ++ .../block/palettes/pane/spruce/side.json | 7 ++ .../block/palettes/pane/spruce/side_alt.json | 7 ++ .../block/palettes/pane/template/noside.json | 6 ++ .../palettes/pane/template/noside_alt.json | 6 ++ .../block/palettes/pane/template/post.json | 7 ++ .../block/palettes/pane/template/side.json | 7 ++ .../palettes/pane/template/side_alt.json | 7 ++ .../tiled/noside.json} | 0 .../tiled/noside_alt.json} | 0 .../tiled/post.json} | 0 .../tiled/side.json} | 0 .../tiled/side_alt.json} | 0 .../models/block/palettes/spruce_glass.json | 7 ++ .../block/template_glass_pane_noside.json | 14 +++ .../block/template_glass_pane_noside_alt.json | 14 +++ .../block/template_glass_pane_post.json | 15 ++++ .../block/template_glass_pane_side.json | 18 ++++ .../block/template_glass_pane_side_alt.json | 18 ++++ .../create/models/item/acacia_glass.json | 3 + .../create/models/item/acacia_glass_pane.json | 7 ++ .../create/models/item/birch_glass.json | 3 + .../create/models/item/birch_glass_pane.json | 7 ++ .../create/models/item/dark_oak_glass.json | 3 + .../models/item/dark_oak_glass_pane.json | 7 ++ .../create/models/item/framed_glass_pane.json | 7 ++ .../models/item/horizontal_framed_glass.json | 7 ++ .../item/horizontal_framed_glass_pane.json | 7 ++ .../assets/create/models/item/iron_glass.json | 3 + .../create/models/item/iron_glass_pane.json | 7 ++ .../create/models/item/jungle_glass.json | 3 + .../create/models/item/jungle_glass_pane.json | 7 ++ .../assets/create/models/item/oak_glass.json | 3 + .../create/models/item/oak_glass_pane.json | 7 ++ .../assets/create/models/item/pane.json | 23 +++++ .../create/models/item/spruce_glass.json | 3 + .../create/models/item/spruce_glass_pane.json | 7 ++ .../create/models/item/tiled_glass_pane.json | 9 +- .../models/item/vertical_framed_glass.json | 7 ++ .../item/vertical_framed_glass_pane.json | 7 ++ .../create/textures/block/acacia_window.png | Bin 0 -> 337 bytes .../create/textures/block/birch_window.png | Bin 0 -> 500 bytes .../textures/block/connected/CT_TEMPLATE.png | Bin 0 -> 1706 bytes .../block/connected/acacia_window.png | Bin 0 -> 627 bytes .../textures/block/connected/birch_window.png | Bin 0 -> 935 bytes .../block/connected/dark_oak_window.png | Bin 0 -> 718 bytes .../textures/block/connected/frGlassTM.png | Bin 0 -> 720 bytes .../textures/block/connected/framed_glass.png | Bin 3185 -> 1557 bytes .../connected/horizontal_framed_glass.png | Bin 0 -> 537 bytes .../textures/block/connected/iron_window.png | Bin 0 -> 1193 bytes .../block/connected/jungle_window.png | Bin 0 -> 947 bytes .../textures/block/connected/oak_window.png | Bin 662 -> 751 bytes .../block/connected/spruce_window.png | Bin 0 -> 977 bytes .../block/connected/vertical_framed_glass.png | Bin 0 -> 568 bytes .../create/textures/block/dark_oak_window.png | Bin 0 -> 464 bytes .../create/textures/block/framed_glass.png | Bin 478 -> 324 bytes .../textures/block/framed_glass_pane_top.png | Bin 0 -> 229 bytes .../block/horizontal_framed_glass.png | Bin 0 -> 275 bytes .../create/textures/block/iron_window.png | Bin 0 -> 689 bytes .../create/textures/block/iron_window_top.png | Bin 0 -> 686 bytes .../create/textures/block/jungle_window.png | Bin 0 -> 456 bytes .../create/textures/block/oak_window.png | Bin 0 -> 435 bytes .../create/textures/block/spruce_window.png | Bin 0 -> 593 bytes .../textures/block/vertical_framed_glass.png | Bin 0 -> 286 bytes .../loot_tables/blocks/acacia_glass.json | 19 ++++ .../loot_tables/blocks/acacia_glass_pane.json | 19 ++++ .../loot_tables/blocks/birch_glass.json | 19 ++++ .../loot_tables/blocks/birch_glass_pane.json | 19 ++++ .../loot_tables/blocks/dark_oak_glass.json | 19 ++++ .../blocks/dark_oak_glass_pane.json | 19 ++++ .../loot_tables/blocks/framed_glass_pane.json | 29 +++++++ .../blocks/horizontal_framed_glass.json | 29 +++++++ .../blocks/horizontal_framed_glass_pane.json | 29 +++++++ .../create/loot_tables/blocks/iron_glass.json | 19 ++++ .../loot_tables/blocks/iron_glass_pane.json | 19 ++++ .../loot_tables/blocks/jungle_glass.json | 19 ++++ .../loot_tables/blocks/jungle_glass_pane.json | 19 ++++ .../create/loot_tables/blocks/oak_glass.json | 19 ++++ .../loot_tables/blocks/oak_glass_pane.json | 19 ++++ .../loot_tables/blocks/spruce_glass.json | 19 ++++ .../loot_tables/blocks/spruce_glass_pane.json | 19 ++++ .../blocks/vertical_framed_glass.json | 29 +++++++ .../blocks/vertical_framed_glass_pane.json | 29 +++++++ .../palettes/acacia_glass.json | 26 ++++++ .../palettes/acacia_glass_pane.json | 22 +++++ .../crafting_shaped/palettes/birch_glass.json | 26 ++++++ .../palettes/birch_glass_pane.json | 22 +++++ .../palettes/dark_oak_glass.json | 26 ++++++ .../palettes/dark_oak_glass_pane.json | 22 +++++ .../palettes/dolomite_wall.json | 2 +- .../palettes/framed_glass_pane.json | 22 +++++ .../palettes/gabbro_bricks_wall.json | 2 +- .../crafting_shaped/palettes/gabbro_wall.json | 2 +- .../horizontal_framed_glass_pane.json | 22 +++++ .../crafting_shaped/palettes/iron_glass.json | 26 ++++++ .../palettes/iron_glass_pane.json | 22 +++++ .../palettes/jungle_glass.json | 26 ++++++ .../palettes/jungle_glass_pane.json | 22 +++++ .../palettes/limestone_bricks_wall.json | 2 +- .../palettes/limestone_wall.json | 2 +- .../crafting_shaped/palettes/oak_glass.json | 26 ++++++ .../palettes/oak_glass_pane.json | 22 +++++ .../palettes/spruce_glass.json | 26 ++++++ .../palettes/spruce_glass_pane.json | 22 +++++ .../palettes/vertical_framed_glass_pane.json | 22 +++++ .../weathered_limestone_bricks_wall.json | 2 +- .../palettes/weathered_limestone_wall.json | 2 +- .../smelting/{dolomite.json => diorite.json} | 0 .../smelting/{bread.json => dough.json} | 0 .../create/recipes/smelting/framed_glass.json | 14 +++ .../recipes/smelting/framed_glass_pane.json | 14 +++ .../smelting/{gabbro.json => granite.json} | 0 .../smelting/horizontal_framed_glass.json | 14 +++ .../horizontal_framed_glass_pane.json | 14 +++ .../{limestone.json => limesand.json} | 0 .../create/recipes/smelting/tiled_glass.json | 14 +++ .../recipes/smelting/tiled_glass_pane.json | 14 +++ .../smelting/vertical_framed_glass.json | 14 +++ .../smelting/vertical_framed_glass_pane.json | 14 +++ .../recipes/stonecutting/framed_glass.json | 14 +++ .../stonecutting/framed_glass_pane.json | 14 +++ .../stonecutting/horizontal_framed_glass.json | 14 +++ .../horizontal_framed_glass_pane.json | 14 +++ .../stonecutting/vertical_framed_glass.json | 14 +++ .../vertical_framed_glass_pane.json | 14 +++ 202 files changed, 2259 insertions(+), 83 deletions(-) create mode 100644 src/main/java/com/simibubi/create/AllCTs.java create mode 100644 src/main/java/com/simibubi/create/modules/palettes/CTGlassPaneBlock.java create mode 100644 src/main/java/com/simibubi/create/modules/palettes/HorizontalCTGlassBlock.java create mode 100644 src/main/java/com/simibubi/create/modules/palettes/VerticalCTGlassBlock.java create mode 100644 src/main/resources/assets/create/blockstates/acacia_glass.json create mode 100644 src/main/resources/assets/create/blockstates/acacia_glass_pane.json create mode 100644 src/main/resources/assets/create/blockstates/birch_glass.json create mode 100644 src/main/resources/assets/create/blockstates/birch_glass_pane.json create mode 100644 src/main/resources/assets/create/blockstates/dark_oak_glass.json create mode 100644 src/main/resources/assets/create/blockstates/dark_oak_glass_pane.json create mode 100644 src/main/resources/assets/create/blockstates/framed_glass_pane.json create mode 100644 src/main/resources/assets/create/blockstates/horizontal_framed_glass.json create mode 100644 src/main/resources/assets/create/blockstates/horizontal_framed_glass_pane.json create mode 100644 src/main/resources/assets/create/blockstates/iron_glass.json create mode 100644 src/main/resources/assets/create/blockstates/iron_glass_pane.json create mode 100644 src/main/resources/assets/create/blockstates/jungle_glass.json create mode 100644 src/main/resources/assets/create/blockstates/jungle_glass_pane.json create mode 100644 src/main/resources/assets/create/blockstates/oak_glass.json create mode 100644 src/main/resources/assets/create/blockstates/oak_glass_pane.json create mode 100644 src/main/resources/assets/create/blockstates/spruce_glass.json create mode 100644 src/main/resources/assets/create/blockstates/spruce_glass_pane.json create mode 100644 src/main/resources/assets/create/blockstates/vertical_framed_glass.json create mode 100644 src/main/resources/assets/create/blockstates/vertical_framed_glass_pane.json create mode 100644 src/main/resources/assets/create/models/block/palettes/acacia_glass.json create mode 100644 src/main/resources/assets/create/models/block/palettes/birch_glass.json create mode 100644 src/main/resources/assets/create/models/block/palettes/dark_oak_glass.json create mode 100644 src/main/resources/assets/create/models/block/palettes/iron_glass.json create mode 100644 src/main/resources/assets/create/models/block/palettes/jungle_glass.json create mode 100644 src/main/resources/assets/create/models/block/palettes/oak_glass.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/acacia/noside.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/acacia/noside_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/acacia/post.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/acacia/side.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/acacia/side_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/birch/noside.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/birch/noside_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/birch/post.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/birch/side.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/birch/side_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/dark_oak/post.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/glass/noside.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/glass/noside_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/glass/post.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/glass/side.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/glass/side_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/iron/noside.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/iron/noside_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/iron/post.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/iron/side.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/iron/side_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/jungle/noside.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/jungle/noside_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/jungle/post.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/jungle/side.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/jungle/side_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/oak/noside.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/oak/noside_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/oak/post.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/oak/side.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/oak/side_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/spruce/noside.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/spruce/noside_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/spruce/post.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/spruce/side.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/spruce/side_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/template/noside.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/template/noside_alt.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/template/post.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/template/side.json create mode 100644 src/main/resources/assets/create/models/block/palettes/pane/template/side_alt.json rename src/main/resources/assets/create/models/block/palettes/{tiled_glass_pane_noside.json => pane/tiled/noside.json} (100%) rename src/main/resources/assets/create/models/block/palettes/{tiled_glass_pane_noside_alt.json => pane/tiled/noside_alt.json} (100%) rename src/main/resources/assets/create/models/block/palettes/{tiled_glass_pane_post.json => pane/tiled/post.json} (100%) rename src/main/resources/assets/create/models/block/palettes/{tiled_glass_pane_side.json => pane/tiled/side.json} (100%) rename src/main/resources/assets/create/models/block/palettes/{tiled_glass_pane_side_alt.json => pane/tiled/side_alt.json} (100%) create mode 100644 src/main/resources/assets/create/models/block/palettes/spruce_glass.json create mode 100644 src/main/resources/assets/create/models/block/template_glass_pane_noside.json create mode 100644 src/main/resources/assets/create/models/block/template_glass_pane_noside_alt.json create mode 100644 src/main/resources/assets/create/models/block/template_glass_pane_post.json create mode 100644 src/main/resources/assets/create/models/block/template_glass_pane_side.json create mode 100644 src/main/resources/assets/create/models/block/template_glass_pane_side_alt.json create mode 100644 src/main/resources/assets/create/models/item/acacia_glass.json create mode 100644 src/main/resources/assets/create/models/item/acacia_glass_pane.json create mode 100644 src/main/resources/assets/create/models/item/birch_glass.json create mode 100644 src/main/resources/assets/create/models/item/birch_glass_pane.json create mode 100644 src/main/resources/assets/create/models/item/dark_oak_glass.json create mode 100644 src/main/resources/assets/create/models/item/dark_oak_glass_pane.json create mode 100644 src/main/resources/assets/create/models/item/framed_glass_pane.json create mode 100644 src/main/resources/assets/create/models/item/horizontal_framed_glass.json create mode 100644 src/main/resources/assets/create/models/item/horizontal_framed_glass_pane.json create mode 100644 src/main/resources/assets/create/models/item/iron_glass.json create mode 100644 src/main/resources/assets/create/models/item/iron_glass_pane.json create mode 100644 src/main/resources/assets/create/models/item/jungle_glass.json create mode 100644 src/main/resources/assets/create/models/item/jungle_glass_pane.json create mode 100644 src/main/resources/assets/create/models/item/oak_glass.json create mode 100644 src/main/resources/assets/create/models/item/oak_glass_pane.json create mode 100644 src/main/resources/assets/create/models/item/pane.json create mode 100644 src/main/resources/assets/create/models/item/spruce_glass.json create mode 100644 src/main/resources/assets/create/models/item/spruce_glass_pane.json create mode 100644 src/main/resources/assets/create/models/item/vertical_framed_glass.json create mode 100644 src/main/resources/assets/create/models/item/vertical_framed_glass_pane.json create mode 100644 src/main/resources/assets/create/textures/block/acacia_window.png create mode 100644 src/main/resources/assets/create/textures/block/birch_window.png create mode 100644 src/main/resources/assets/create/textures/block/connected/CT_TEMPLATE.png create mode 100644 src/main/resources/assets/create/textures/block/connected/acacia_window.png create mode 100644 src/main/resources/assets/create/textures/block/connected/birch_window.png create mode 100644 src/main/resources/assets/create/textures/block/connected/dark_oak_window.png create mode 100644 src/main/resources/assets/create/textures/block/connected/frGlassTM.png create mode 100644 src/main/resources/assets/create/textures/block/connected/horizontal_framed_glass.png create mode 100644 src/main/resources/assets/create/textures/block/connected/iron_window.png create mode 100644 src/main/resources/assets/create/textures/block/connected/jungle_window.png create mode 100644 src/main/resources/assets/create/textures/block/connected/spruce_window.png create mode 100644 src/main/resources/assets/create/textures/block/connected/vertical_framed_glass.png create mode 100644 src/main/resources/assets/create/textures/block/dark_oak_window.png create mode 100644 src/main/resources/assets/create/textures/block/framed_glass_pane_top.png create mode 100644 src/main/resources/assets/create/textures/block/horizontal_framed_glass.png create mode 100644 src/main/resources/assets/create/textures/block/iron_window.png create mode 100644 src/main/resources/assets/create/textures/block/iron_window_top.png create mode 100644 src/main/resources/assets/create/textures/block/jungle_window.png create mode 100644 src/main/resources/assets/create/textures/block/oak_window.png create mode 100644 src/main/resources/assets/create/textures/block/spruce_window.png create mode 100644 src/main/resources/assets/create/textures/block/vertical_framed_glass.png create mode 100644 src/main/resources/data/create/loot_tables/blocks/acacia_glass.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/acacia_glass_pane.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/birch_glass.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/birch_glass_pane.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/dark_oak_glass.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/dark_oak_glass_pane.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/framed_glass_pane.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/horizontal_framed_glass.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/horizontal_framed_glass_pane.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/iron_glass.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/iron_glass_pane.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/jungle_glass.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/jungle_glass_pane.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/oak_glass.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/oak_glass_pane.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/spruce_glass.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/spruce_glass_pane.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/vertical_framed_glass.json create mode 100644 src/main/resources/data/create/loot_tables/blocks/vertical_framed_glass_pane.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass_pane.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass_pane.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass_pane.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/framed_glass_pane.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/horizontal_framed_glass_pane.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass_pane.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass_pane.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass_pane.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass_pane.json create mode 100644 src/main/resources/data/create/recipes/crafting_shaped/palettes/vertical_framed_glass_pane.json rename src/main/resources/data/create/recipes/smelting/{dolomite.json => diorite.json} (100%) rename src/main/resources/data/create/recipes/smelting/{bread.json => dough.json} (100%) create mode 100644 src/main/resources/data/create/recipes/smelting/framed_glass.json create mode 100644 src/main/resources/data/create/recipes/smelting/framed_glass_pane.json rename src/main/resources/data/create/recipes/smelting/{gabbro.json => granite.json} (100%) create mode 100644 src/main/resources/data/create/recipes/smelting/horizontal_framed_glass.json create mode 100644 src/main/resources/data/create/recipes/smelting/horizontal_framed_glass_pane.json rename src/main/resources/data/create/recipes/smelting/{limestone.json => limesand.json} (100%) create mode 100644 src/main/resources/data/create/recipes/smelting/tiled_glass.json create mode 100644 src/main/resources/data/create/recipes/smelting/tiled_glass_pane.json create mode 100644 src/main/resources/data/create/recipes/smelting/vertical_framed_glass.json create mode 100644 src/main/resources/data/create/recipes/smelting/vertical_framed_glass_pane.json create mode 100644 src/main/resources/data/create/recipes/stonecutting/framed_glass.json create mode 100644 src/main/resources/data/create/recipes/stonecutting/framed_glass_pane.json create mode 100644 src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass.json create mode 100644 src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass_pane.json create mode 100644 src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass.json create mode 100644 src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass_pane.json diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index f189fed6a..727e20b5d 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -7,8 +7,6 @@ import com.simibubi.create.foundation.block.ProperStairsBlock; import com.simibubi.create.foundation.block.RenderUtilityAxisBlock; import com.simibubi.create.foundation.block.RenderUtilityBlock; import com.simibubi.create.foundation.block.RenderUtilityDirectionalBlock; -import com.simibubi.create.foundation.block.connected.CTSpriteShifter; -import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.world.OxidizingBlock; import com.simibubi.create.modules.IModule; @@ -68,8 +66,11 @@ import com.simibubi.create.modules.logistics.block.inventories.FlexcrateBlock; import com.simibubi.create.modules.logistics.block.transposer.LinkedTransposerBlock; import com.simibubi.create.modules.logistics.block.transposer.TransposerBlock; import com.simibubi.create.modules.palettes.CTGlassBlock; +import com.simibubi.create.modules.palettes.CTGlassPaneBlock; import com.simibubi.create.modules.palettes.GlassPaneBlock; +import com.simibubi.create.modules.palettes.HorizontalCTGlassBlock; import com.simibubi.create.modules.palettes.LayeredCTBlock; +import com.simibubi.create.modules.palettes.VerticalCTGlassBlock; import com.simibubi.create.modules.palettes.VolcanicRockBlock; import com.simibubi.create.modules.schematics.block.CreativeCrateBlock; import com.simibubi.create.modules.schematics.block.SchematicTableBlock; @@ -90,7 +91,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.color.BlockColors; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ToolType; @@ -208,22 +208,37 @@ public enum AllBlocks { __PALETTES__(), TILED_GLASS(new GlassBlock(Properties.from(Blocks.GLASS))), + FRAMED_GLASS(new CTGlassBlock(AllCTs.FRAMED_GLASS, false)), + HORIZONTAL_FRAMED_GLASS(new HorizontalCTGlassBlock(AllCTs.HORIZONTAL_FRAMED_GLASS, AllCTs.FRAMED_GLASS, false)), + VERTICAL_FRAMED_GLASS(new VerticalCTGlassBlock(AllCTs.VERTICAL_FRAMED_GLASS, false)), + + OAK_GLASS(new VerticalCTGlassBlock(AllCTs.OAK_GLASS, false)), + SPRUCE_GLASS(new VerticalCTGlassBlock(AllCTs.SPRUCE_GLASS, false)), + BIRCH_GLASS(new VerticalCTGlassBlock(AllCTs.BIRCH_GLASS, true)), + JUNGLE_GLASS(new VerticalCTGlassBlock(AllCTs.JUNGLE_GLASS, false)), + DARK_OAK_GLASS(new VerticalCTGlassBlock(AllCTs.DARK_OAK_GLASS, false)), + ACACIA_GLASS(new VerticalCTGlassBlock(AllCTs.ACACIA_GLASS, false)), + IRON_GLASS(new VerticalCTGlassBlock(AllCTs.IRON_GLASS, false)), + TILED_GLASS_PANE(new GlassPaneBlock(Properties.from(Blocks.GLASS))), - FRAMED_GLASS(new CTGlassBlock(true)), + FRAMED_GLASS_PANE(new CTGlassPaneBlock(FRAMED_GLASS.block)), + HORIZONTAL_FRAMED_GLASS_PANE(new CTGlassPaneBlock(HORIZONTAL_FRAMED_GLASS.block)), + VERTICAL_FRAMED_GLASS_PANE(new CTGlassPaneBlock(VERTICAL_FRAMED_GLASS.block)), + OAK_GLASS_PANE(new CTGlassPaneBlock(OAK_GLASS.block)), + SPRUCE_GLASS_PANE(new CTGlassPaneBlock(SPRUCE_GLASS.block)), + BIRCH_GLASS_PANE(new CTGlassPaneBlock(BIRCH_GLASS.block)), + JUNGLE_GLASS_PANE(new CTGlassPaneBlock(JUNGLE_GLASS.block)), + DARK_OAK_GLASS_PANE(new CTGlassPaneBlock(DARK_OAK_GLASS.block)), + ACACIA_GLASS_PANE(new CTGlassPaneBlock(ACACIA_GLASS.block)), + IRON_GLASS_PANE(new CTGlassPaneBlock(IRON_GLASS.block)), GRANITE_BRICKS(new Block(Properties.from(Blocks.GRANITE))), - GRANITE_LAYERS(new LayeredCTBlock(Properties.from(Blocks.GRANITE), - CTSpriteShifter.get(CTType.HORIZONTAL, "granite_layers"), - CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, new ResourceLocation("block/polished_granite"), "polished_granite"))), + GRANITE_LAYERS(new LayeredCTBlock(Properties.from(Blocks.GRANITE), AllCTs.GRANITE_LAYERS, AllCTs.POLISHED_GRANITE)), DIORITE_BRICKS(new Block(Properties.from(Blocks.DIORITE))), - DIORITE_LAYERS(new LayeredCTBlock(Properties.from(Blocks.DIORITE), - CTSpriteShifter.get(CTType.HORIZONTAL, "diorite_layers"), - CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, new ResourceLocation("block/polished_diorite"), "polished_diorite"))), + DIORITE_LAYERS(new LayeredCTBlock(Properties.from(Blocks.DIORITE), AllCTs.DIORITE_LAYERS, AllCTs.POLISHED_DIORITE)), ANDESITE_BRICKS(new Block(Properties.from(Blocks.ANDESITE))), - ANDESITE_LAYERS(new LayeredCTBlock(Properties.from(Blocks.ANDESITE), - CTSpriteShifter.get(CTType.HORIZONTAL, "andesite_layers"), - CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, new ResourceLocation("block/polished_andesite"), - "polished_andesite"))), + ANDESITE_LAYERS( + new LayeredCTBlock(Properties.from(Blocks.ANDESITE), AllCTs.ANDESITE_LAYERS, AllCTs.POLISHED_ANDESITE)), GABBRO(new Block(Properties.from(Blocks.GRANITE)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), POLISHED_GABBRO(new Block(Properties.from(GABBRO.block))), @@ -232,32 +247,26 @@ public enum AllBlocks { INDENTED_GABBRO(new Block(Properties.from(GABBRO.block)), ComesWith.SLAB), SLIGHTLY_MOSSY_GABBRO_BRICKS(new Block(Properties.from(GABBRO.block))), MOSSY_GABBRO_BRICKS(new Block(Properties.from(GABBRO.block))), - GABBRO_LAYERS( - new LayeredCTBlock(Properties.from(GABBRO.block), CTSpriteShifter.get(CTType.HORIZONTAL, "gabbro_layers"), - CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, "polished_gabbro"))), + GABBRO_LAYERS(new LayeredCTBlock(Properties.from(GABBRO.block), AllCTs.GABBRO_LAYERS, AllCTs.POLISHED_GABBRO)), LIMESAND(new FallingBlock(Properties.from(Blocks.SAND))), LIMESTONE(new Block(Properties.from(Blocks.SANDSTONE)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), LIMESTONE_BRICKS(new Block(Properties.from(LIMESTONE.block)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), POLISHED_LIMESTONE(new Block(Properties.from(LIMESTONE.block)), ComesWith.SLAB), LIMESTONE_PILLAR(new RotatedPillarBlock(Properties.from(LIMESTONE.block))), - LIMESTONE_LAYERS(new LayeredCTBlock(Properties.from(LIMESTONE.block), - CTSpriteShifter.get(CTType.HORIZONTAL, "limestone_layers"), - CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, "polished_limestone"))), + LIMESTONE_LAYERS( + new LayeredCTBlock(Properties.from(LIMESTONE.block), AllCTs.LIMESTONE_LAYERS, AllCTs.POLISHED_LIMESTONE)), WEATHERED_LIMESTONE(new Block(Properties.from(Blocks.ANDESITE)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), WEATHERED_LIMESTONE_BRICKS(new Block(Properties.from(WEATHERED_LIMESTONE.block)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), POLISHED_WEATHERED_LIMESTONE(new Block(Properties.from(WEATHERED_LIMESTONE.block)), ComesWith.SLAB), WEATHERED_LIMESTONE_PILLAR(new RotatedPillarBlock(Properties.from(WEATHERED_LIMESTONE.block))), WEATHERED_LIMESTONE_LAYERS(new LayeredCTBlock(Properties.from(WEATHERED_LIMESTONE.block), - CTSpriteShifter.get(CTType.HORIZONTAL, "weathered_limestone_layers"), - CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, "polished_weathered_limestone"))), + AllCTs.WEATHERED_LIMESTONE_LAYERS, AllCTs.POLISHED_WEATHERED_LIMESTONE)), DOLOMITE(new Block(Properties.from(Blocks.QUARTZ_BLOCK)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL), DOLOMITE_BRICKS(new Block(Properties.from(DOLOMITE.block))), POLISHED_DOLOMITE(new Block(Properties.from(DOLOMITE.block))), DOLOMITE_PILLAR(new RotatedPillarBlock(Properties.from(DOLOMITE.block))), - DOLOMITE_LAYERS(new LayeredCTBlock(Properties.from(DOLOMITE.block), - CTSpriteShifter.get(CTType.HORIZONTAL, "dolomite_layers"), - CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, "polished_dolomite"))), + DOLOMITE_LAYERS(new LayeredCTBlock(Properties.from(DOLOMITE.block), AllCTs.DOLOMITE_LAYERS, AllCTs.POLISHED_DOLOMITE)), VOLCANIC_ROCK(new VolcanicRockBlock()), diff --git a/src/main/java/com/simibubi/create/AllCTs.java b/src/main/java/com/simibubi/create/AllCTs.java new file mode 100644 index 000000000..acb9c3717 --- /dev/null +++ b/src/main/java/com/simibubi/create/AllCTs.java @@ -0,0 +1,81 @@ +package com.simibubi.create; + +import static com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType.HORIZONTAL; +import static com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType.OMNIDIRECTIONAL; +import static com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType.VERTICAL; + +import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; +import com.simibubi.create.foundation.block.connected.CTSpriteShifter; +import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType; + +import net.minecraft.util.ResourceLocation; + +public enum AllCTs { + + FRAMED_GLASS(omni("framed_glass")), + HORIZONTAL_FRAMED_GLASS(custom(HORIZONTAL, "framed_glass", "horizontal_framed_glass")), + VERTICAL_FRAMED_GLASS(custom(VERTICAL, "framed_glass", "vertical_framed_glass")), + + OAK_GLASS(vertical("oak_window")), + SPRUCE_GLASS(vertical("spruce_window")), + BIRCH_GLASS(vertical("birch_window")), + JUNGLE_GLASS(vertical("jungle_window")), + DARK_OAK_GLASS(vertical("dark_oak_window")), + ACACIA_GLASS(vertical("acacia_window")), + ACACIA_GLASS_DENSE(vertical("acacia_window_dense")), + IRON_GLASS(vertical("iron_window")), + + GRANITE_LAYERS(layers("granite")), + DIORITE_LAYERS(layers("diorite")), + ANDESITE_LAYERS(layers("andesite")), + GABBRO_LAYERS(layers("gabbro")), + DOLOMITE_LAYERS(layers("dolomite")), + LIMESTONE_LAYERS(layers("limestone")), + WEATHERED_LIMESTONE_LAYERS(layers("weathered_limestone")), + + POLISHED_GRANITE(polishedVanilla("granite")), + POLISHED_DIORITE(polishedVanilla("diorite")), + POLISHED_ANDESITE(polishedVanilla("andesite")), + POLISHED_GABBRO(polished("gabbro")), + POLISHED_DOLOMITE(polished("dolomite")), + POLISHED_LIMESTONE(polished("limestone")), + POLISHED_WEATHERED_LIMESTONE(polished("weathered_limestone")), + + ; + + private CTSpriteShiftEntry entry; + + private AllCTs(CTSpriteShiftEntry entry) { + this.entry = entry; + } + + public CTSpriteShiftEntry get() { + return entry; + } + + static CTSpriteShiftEntry omni(String name) { + return CTSpriteShifter.get(OMNIDIRECTIONAL, name); + } + + static CTSpriteShiftEntry custom(CTType type, String from, String to) { + return CTSpriteShifter.get(type, from, to); + } + + static CTSpriteShiftEntry vertical(String blockname) { + return CTSpriteShifter.get(VERTICAL, blockname); + } + + static CTSpriteShiftEntry layers(String prefix) { + return CTSpriteShifter.get(HORIZONTAL, prefix + "_layers"); + } + + static CTSpriteShiftEntry polished(String blockname) { + return omni("polished_" + blockname); + } + + static CTSpriteShiftEntry polishedVanilla(String blockname) { + return CTSpriteShifter.get(OMNIDIRECTIONAL, new ResourceLocation("block/polished_" + blockname), + "polished_" + blockname); + } + +} diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java b/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java index c74e53728..a340d1ac8 100644 --- a/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java +++ b/src/main/java/com/simibubi/create/foundation/block/connected/CTModel.java @@ -55,7 +55,7 @@ public class CTModel extends BakedModelWrapper { CTData data = new CTData(); for (Direction face : Direction.values()) { - if (!Block.shouldSideBeRendered(state, world, pos, face)) + if (state.isNormalCube(world, pos) && !Block.shouldSideBeRendered(state, world, pos, face)) continue; CTSpriteShiftEntry spriteShift = behaviour.get(state, face); if (spriteShift == null) diff --git a/src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java b/src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java index a3a2068c8..02d3149d0 100644 --- a/src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/block/connected/ConnectedTextureBehaviour.java @@ -17,13 +17,21 @@ public abstract class ConnectedTextureBehaviour { } public abstract CTSpriteShiftEntry get(BlockState state, Direction direction); - + public abstract Iterable getAllCTShifts(); - protected boolean shouldFlipUVs(BlockState state, Direction face) { + protected boolean reverseUVs(BlockState state, Direction face) { return false; } + protected boolean reverseUVsHorizontally(BlockState state, Direction face) { + return reverseUVs(state, face); + } + + protected boolean reverseUVsVertically(BlockState state, Direction face) { + return reverseUVs(state, face); + } + public boolean connectsTo(BlockState state, BlockState other, IEnviromentBlockReader reader, BlockPos pos, BlockPos otherPos, Direction face) { @@ -54,27 +62,21 @@ public abstract class ConnectedTextureBehaviour { BlockPos p = pos.offset(horizontal, x).offset(vertical, y); return connectsTo(state, reader.getBlockState(p), reader, pos, p, face); }; + + boolean flipH = reverseUVsHorizontally(state, face); + boolean flipV = reverseUVsVertically(state, face); + int sh = flipH ? -1 : 1; + int sv = flipV ? -1 : 1; - boolean up = connection.test(0, 1); - boolean down = connection.test(0, -1); - boolean left = connection.test(-1, 0); - boolean right = connection.test(1, 0); - boolean topLeft = connection.test(-1, 1); - boolean topRight = connection.test(1, 1); - boolean bottomLeft = connection.test(-1, -1); - boolean bottomRight = connection.test(1, -1); - - boolean flip = shouldFlipUVs(state, face); CTContext context = new CTContext(); - - context.up = flip ? down : up; - context.down = flip ? up : down; - context.left = flip ? right : left; - context.right = flip ? left : right; - context.topLeft = flip ? bottomRight : topLeft; - context.topRight = flip ? bottomLeft : topRight; - context.bottomLeft = flip ? topRight : bottomLeft; - context.bottomRight = flip ? topLeft : bottomRight; + context.up = connection.test(0, sv); + context.down = connection.test(0, -sv); + context.left = connection.test(-sh, 0); + context.right = connection.test(sh, 0); + context.topLeft = connection.test(-sh, sv); + context.topRight = connection.test(sh, sv); + context.bottomLeft = connection.test(-sh, -sv); + context.bottomRight = connection.test(sh, -sv); return context; } diff --git a/src/main/java/com/simibubi/create/foundation/world/OxidizingBlock.java b/src/main/java/com/simibubi/create/foundation/world/OxidizingBlock.java index be85f0595..50decb45a 100644 --- a/src/main/java/com/simibubi/create/foundation/world/OxidizingBlock.java +++ b/src/main/java/com/simibubi/create/foundation/world/OxidizingBlock.java @@ -45,11 +45,10 @@ public class OxidizingBlock extends Block { if (!worldIn.isBlockPresent(neighbourPos)) continue; BlockState neighborState = worldIn.getBlockState(neighbourPos); - if (neighborState.has(OXIDIZATION)) { + if (neighborState.has(OXIDIZATION) && neighborState.get(OXIDIZATION) != 0) { neighbors.add(neighborState.get(OXIDIZATION)); } - if (Block.hasSolidSide(neighborState, worldIn, neighbourPos, - facing.getOpposite())) { + if (Block.hasSolidSide(neighborState, worldIn, neighbourPos, facing.getOpposite())) { continue; } canIncrease = true; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java b/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java index f756e1910..a160a5f7f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java @@ -209,7 +209,7 @@ public class RotationPropagator { && (newSpeed != 0 && neighbourTE.speed != 0); boolean tooFast = Math.abs(newSpeed) > parameters.maxRotationSpeed.get(); - boolean speedChangedTooOften = updateTE.speedChangeCounter > 25; + boolean speedChangedTooOften = updateTE.speedChangeCounter > 50; if (tooFast || speedChangedTooOften) { world.destroyBlock(pos, true); return; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java index 52be464b9..65cd8d2dd 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java @@ -97,10 +97,10 @@ public class LinearChassisBlock extends AbstractChassisBlock implements IHaveCon } @Override - public boolean shouldFlipUVs(BlockState state, Direction face) { + public boolean reverseUVs(BlockState state, Direction face) { if (state.get(AXIS).isHorizontal() && face.getAxisDirection() == AxisDirection.POSITIVE) return true; - return super.shouldFlipUVs(state, face); + return super.reverseUVs(state, face); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/InputCTBehaviour.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/InputCTBehaviour.java index 80bf4d996..e3b9574ef 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/InputCTBehaviour.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/InputCTBehaviour.java @@ -43,7 +43,7 @@ public class InputCTBehaviour extends ConnectedTextureBehaviour { } @Override - protected boolean shouldFlipUVs(BlockState state, Direction direction) { + protected boolean reverseUVs(BlockState state, Direction direction) { if (!direction.getAxis().isVertical()) return false; Direction facing = state.get(HORIZONTAL_FACING); diff --git a/src/main/java/com/simibubi/create/modules/palettes/CTGlassBlock.java b/src/main/java/com/simibubi/create/modules/palettes/CTGlassBlock.java index 0c853b816..b7799aa6a 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/CTGlassBlock.java +++ b/src/main/java/com/simibubi/create/modules/palettes/CTGlassBlock.java @@ -1,22 +1,41 @@ package com.simibubi.create.modules.palettes; -import com.simibubi.create.foundation.block.connected.CTSpriteShifter; -import com.simibubi.create.foundation.block.connected.CTSpriteShifter.CTType; +import com.simibubi.create.AllCTs; +import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; import com.simibubi.create.foundation.block.connected.IHaveConnectedTextures; import com.simibubi.create.foundation.block.connected.StandardCTBehaviour; +import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.GlassBlock; import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.Direction; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; public class CTGlassBlock extends GlassBlock implements IHaveConnectedTextures { private boolean hasAlpha; + protected ConnectedTextureBehaviour behaviour; - public CTGlassBlock(boolean hasAlpha) { + public CTGlassBlock(AllCTs spriteShift, boolean hasAlpha) { super(Properties.from(Blocks.GLASS)); this.hasAlpha = hasAlpha; + this.behaviour = createBehaviour(spriteShift.get()); + } + + @OnlyIn(Dist.CLIENT) + @Override + public boolean isSideInvisible(BlockState state, BlockState adjacentBlockState, Direction side) { + return adjacentBlockState.getBlock() instanceof CTGlassBlock + ? (!state.canRenderInLayer(BlockRenderLayer.TRANSLUCENT) && side.getAxis().isHorizontal() + || state.getBlock() == adjacentBlockState.getBlock()) + : super.isSideInvisible(state, adjacentBlockState, side); + } + + public ConnectedTextureBehaviour createBehaviour(CTSpriteShiftEntry spriteShift) { + return new StandardCTBehaviour(spriteShift); } @Override @@ -26,7 +45,7 @@ public class CTGlassBlock extends GlassBlock implements IHaveConnectedTextures { @Override public ConnectedTextureBehaviour getBehaviour() { - return new StandardCTBehaviour(CTSpriteShifter.get(CTType.OMNIDIRECTIONAL, getRegistryName().getPath())); + return behaviour; } } diff --git a/src/main/java/com/simibubi/create/modules/palettes/CTGlassPaneBlock.java b/src/main/java/com/simibubi/create/modules/palettes/CTGlassPaneBlock.java new file mode 100644 index 000000000..91e01c4b2 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/palettes/CTGlassPaneBlock.java @@ -0,0 +1,70 @@ +package com.simibubi.create.modules.palettes; + +import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; +import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; +import com.simibubi.create.foundation.block.connected.IHaveConnectedTextures; +import com.simibubi.create.foundation.block.connected.StandardCTBehaviour; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.Direction; +import net.minecraft.util.Direction.AxisDirection; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IEnviromentBlockReader; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +public class CTGlassPaneBlock extends GlassPaneBlock implements IHaveConnectedTextures { + + protected CTGlassBlock ctGlass; + protected ConnectedTextureBehaviour behaviour; + + public CTGlassPaneBlock(Block ctGlass) { + super(Properties.from(Blocks.GLASS)); + this.ctGlass = (CTGlassBlock) ctGlass; + behaviour = createBehaviour(); + } + + @Override + @OnlyIn(Dist.CLIENT) + public boolean isSideInvisible(BlockState state, BlockState adjacentBlockState, Direction side) { + if (side.getAxis().isVertical()) + return adjacentBlockState == state; + return super.isSideInvisible(state, adjacentBlockState, side); + } + + + + protected ConnectedTextureBehaviour createBehaviour() { + for (CTSpriteShiftEntry ctSpriteShiftEntry : ctGlass.getBehaviour().getAllCTShifts()) { + return new StandardCTBehaviour(ctSpriteShiftEntry) { + @Override + public boolean connectsTo(BlockState state, BlockState other, IEnviromentBlockReader reader, + BlockPos pos, BlockPos otherPos, Direction face) { + return state.getBlock() == other.getBlock(); + } + + @Override + protected boolean reverseUVsHorizontally(BlockState state, net.minecraft.util.Direction face) { + if (face.getAxisDirection() == AxisDirection.NEGATIVE) + return true; + return super.reverseUVsHorizontally(state, face); + } + }; + } + return null; + } + + @Override + public BlockRenderLayer getRenderLayer() { + return ctGlass.getRenderLayer(); + } + + @Override + public ConnectedTextureBehaviour getBehaviour() { + return behaviour; + } + +} diff --git a/src/main/java/com/simibubi/create/modules/palettes/HorizontalCTGlassBlock.java b/src/main/java/com/simibubi/create/modules/palettes/HorizontalCTGlassBlock.java new file mode 100644 index 000000000..3c6665ee2 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/palettes/HorizontalCTGlassBlock.java @@ -0,0 +1,24 @@ +package com.simibubi.create.modules.palettes; + +import javax.annotation.Nullable; + +import com.simibubi.create.AllCTs; +import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; +import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; + +public class HorizontalCTGlassBlock extends CTGlassBlock { + + private AllCTs topShift; + + public HorizontalCTGlassBlock(AllCTs layerShift, @Nullable AllCTs topShift, boolean hasAlpha) { + super(layerShift, hasAlpha); + this.topShift = topShift; + behaviour = createBehaviour(layerShift.get()); + } + + @Override + public ConnectedTextureBehaviour createBehaviour(CTSpriteShiftEntry spriteShift) { + return new LayeredCTBlock.LayeredCTBehaviour(spriteShift, topShift == null ? null : topShift.get()); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/palettes/LayeredCTBlock.java b/src/main/java/com/simibubi/create/modules/palettes/LayeredCTBlock.java index 06b79772c..c5b988416 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/LayeredCTBlock.java +++ b/src/main/java/com/simibubi/create/modules/palettes/LayeredCTBlock.java @@ -2,6 +2,9 @@ package com.simibubi.create.modules.palettes; import java.util.Arrays; +import javax.annotation.Nullable; + +import com.simibubi.create.AllCTs; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; import com.simibubi.create.foundation.block.connected.IHaveConnectedTextures; @@ -14,13 +17,13 @@ public class LayeredCTBlock extends Block implements IHaveConnectedTextures { private LayeredCTBehaviour behaviour; - public LayeredCTBlock(Properties properties, CTSpriteShiftEntry layerShift) { + public LayeredCTBlock(Properties properties, AllCTs layerShift) { this(properties, layerShift, null); } - public LayeredCTBlock(Properties properties, CTSpriteShiftEntry layerShift, CTSpriteShiftEntry topShift) { + public LayeredCTBlock(Properties properties, AllCTs layerShift, @Nullable AllCTs topShift) { super(properties); - behaviour = new LayeredCTBehaviour(layerShift, topShift); + behaviour = new LayeredCTBehaviour(layerShift.get(), topShift == null ? null : topShift.get()); } @Override @@ -28,7 +31,7 @@ public class LayeredCTBlock extends Block implements IHaveConnectedTextures { return behaviour; } - private static class LayeredCTBehaviour extends ConnectedTextureBehaviour { + static class LayeredCTBehaviour extends ConnectedTextureBehaviour { CTSpriteShiftEntry topShift; CTSpriteShiftEntry layerShift; diff --git a/src/main/java/com/simibubi/create/modules/palettes/VerticalCTGlassBlock.java b/src/main/java/com/simibubi/create/modules/palettes/VerticalCTGlassBlock.java new file mode 100644 index 000000000..4c2a67f38 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/palettes/VerticalCTGlassBlock.java @@ -0,0 +1,29 @@ +package com.simibubi.create.modules.palettes; + +import com.simibubi.create.AllCTs; +import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; +import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; +import com.simibubi.create.foundation.block.connected.StandardCTBehaviour; + +import net.minecraft.block.BlockState; +import net.minecraft.util.Direction; + +public class VerticalCTGlassBlock extends CTGlassBlock { + + public VerticalCTGlassBlock(AllCTs spriteShift, boolean hasAlpha) { + super(spriteShift, hasAlpha); + } + + @Override + public ConnectedTextureBehaviour createBehaviour(CTSpriteShiftEntry spriteShift) { + return new StandardCTBehaviour(spriteShift) { + @Override + public CTSpriteShiftEntry get(BlockState state, Direction direction) { + if (direction.getAxis().isVertical()) + return null; + return super.get(state, direction); + } + }; + } + +} diff --git a/src/main/resources/assets/create/blockstates/acacia_glass.json b/src/main/resources/assets/create/blockstates/acacia_glass.json new file mode 100644 index 000000000..564ce1fc7 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/acacia_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/acacia_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/acacia_glass_pane.json b/src/main/resources/assets/create/blockstates/acacia_glass_pane.json new file mode 100644 index 000000000..d9a76fd9a --- /dev/null +++ b/src/main/resources/assets/create/blockstates/acacia_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/acacia/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/acacia/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/acacia/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/acacia/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/acacia/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/acacia/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/acacia/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/acacia/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/acacia/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/birch_glass.json b/src/main/resources/assets/create/blockstates/birch_glass.json new file mode 100644 index 000000000..b82e4daad --- /dev/null +++ b/src/main/resources/assets/create/blockstates/birch_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/birch_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/birch_glass_pane.json b/src/main/resources/assets/create/blockstates/birch_glass_pane.json new file mode 100644 index 000000000..64a3b7775 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/birch_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/birch/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/birch/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/birch/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/birch/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/birch/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/birch/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/birch/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/birch/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/birch/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/dark_oak_glass.json b/src/main/resources/assets/create/blockstates/dark_oak_glass.json new file mode 100644 index 000000000..582ba57ba --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dark_oak_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/dark_oak_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dark_oak_glass_pane.json b/src/main/resources/assets/create/blockstates/dark_oak_glass_pane.json new file mode 100644 index 000000000..3e493e69b --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dark_oak_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/dark_oak/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/dark_oak/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/dark_oak/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/dark_oak/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/dark_oak/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/dark_oak/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/dark_oak/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/dark_oak/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/dark_oak/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/framed_glass_pane.json b/src/main/resources/assets/create/blockstates/framed_glass_pane.json new file mode 100644 index 000000000..5b06a185f --- /dev/null +++ b/src/main/resources/assets/create/blockstates/framed_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/glass/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/glass/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/glass/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/glass/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/glass/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/horizontal_framed_glass.json b/src/main/resources/assets/create/blockstates/horizontal_framed_glass.json new file mode 100644 index 000000000..cf1f52360 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/horizontal_framed_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/framed_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/horizontal_framed_glass_pane.json b/src/main/resources/assets/create/blockstates/horizontal_framed_glass_pane.json new file mode 100644 index 000000000..5b06a185f --- /dev/null +++ b/src/main/resources/assets/create/blockstates/horizontal_framed_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/glass/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/glass/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/glass/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/glass/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/glass/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/iron_glass.json b/src/main/resources/assets/create/blockstates/iron_glass.json new file mode 100644 index 000000000..004ad939e --- /dev/null +++ b/src/main/resources/assets/create/blockstates/iron_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/iron_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/iron_glass_pane.json b/src/main/resources/assets/create/blockstates/iron_glass_pane.json new file mode 100644 index 000000000..483e2f00a --- /dev/null +++ b/src/main/resources/assets/create/blockstates/iron_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/iron/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/iron/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/iron/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/iron/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/iron/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/iron/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/iron/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/iron/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/iron/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/jungle_glass.json b/src/main/resources/assets/create/blockstates/jungle_glass.json new file mode 100644 index 000000000..58105bec3 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/jungle_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/jungle_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/jungle_glass_pane.json b/src/main/resources/assets/create/blockstates/jungle_glass_pane.json new file mode 100644 index 000000000..3fc23b581 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/jungle_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/jungle/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/jungle/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/jungle/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/jungle/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/jungle/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/jungle/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/jungle/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/jungle/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/jungle/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/oak_glass.json b/src/main/resources/assets/create/blockstates/oak_glass.json new file mode 100644 index 000000000..8c41631a7 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/oak_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/oak_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/oak_glass_pane.json b/src/main/resources/assets/create/blockstates/oak_glass_pane.json new file mode 100644 index 000000000..cf33158b0 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/oak_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/oak/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/oak/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/oak/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/oak/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/oak/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/oak/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/oak/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/oak/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/oak/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/spruce_glass.json b/src/main/resources/assets/create/blockstates/spruce_glass.json new file mode 100644 index 000000000..1c83f35a6 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/spruce_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/spruce_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/spruce_glass_pane.json b/src/main/resources/assets/create/blockstates/spruce_glass_pane.json new file mode 100644 index 000000000..4d9a8d957 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/spruce_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/spruce/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/spruce/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/spruce/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/spruce/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/spruce/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/spruce/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/spruce/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/spruce/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/spruce/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/blockstates/tiled_glass_pane.json b/src/main/resources/assets/create/blockstates/tiled_glass_pane.json index d26d11966..2371e27b6 100644 --- a/src/main/resources/assets/create/blockstates/tiled_glass_pane.json +++ b/src/main/resources/assets/create/blockstates/tiled_glass_pane.json @@ -1,29 +1,31 @@ { "multipart": [ - { "apply": { "model": "create:block/palettes/tiled_glass_pane_post" }}, + { + "apply": { "model": "create:block/palettes/pane/tiled/post" } + }, { "when": { "north": true }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_side" } + "apply": { "model": "create:block/palettes/pane/tiled/side" } }, { "when": { "east": true }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_side", "y": 90 } + "apply": { "model": "create:block/palettes/pane/tiled/side", "y": 90 } }, { "when": { "south": true }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_side_alt" } + "apply": { "model": "create:block/palettes/pane/tiled/side_alt" } }, { "when": { "west": true }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_side_alt", "y": 90 } + "apply": { "model": "create:block/palettes/pane/tiled/side_alt", "y": 90 } }, { "when": { "north": false }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_noside" } + "apply": { "model": "create:block/palettes/pane/tiled/noside" } }, { "when": { "east": false }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_noside_alt" } + "apply": { "model": "create:block/palettes/pane/tiled/noside_alt" } }, { "when": { "south": false }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_noside_alt", "y": 90 } + "apply": { "model": "create:block/palettes/pane/tiled/noside_alt", "y": 90 } }, { "when": { "west": false }, - "apply": { "model": "create:block/palettes/tiled_glass_pane_noside", "y": 270 } + "apply": { "model": "create:block/palettes/pane/tiled/noside", "y": 270 } } ] } diff --git a/src/main/resources/assets/create/blockstates/vertical_framed_glass.json b/src/main/resources/assets/create/blockstates/vertical_framed_glass.json new file mode 100644 index 000000000..cf1f52360 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/vertical_framed_glass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/framed_glass" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/vertical_framed_glass_pane.json b/src/main/resources/assets/create/blockstates/vertical_framed_glass_pane.json new file mode 100644 index 000000000..5b06a185f --- /dev/null +++ b/src/main/resources/assets/create/blockstates/vertical_framed_glass_pane.json @@ -0,0 +1,31 @@ +{ + "multipart": [ + { + "apply": { "model": "create:block/palettes/pane/glass/post" } + }, + { "when": { "north": true }, + "apply": { "model": "create:block/palettes/pane/glass/side" } + }, + { "when": { "east": true }, + "apply": { "model": "create:block/palettes/pane/glass/side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "create:block/palettes/pane/glass/side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "create:block/palettes/pane/glass/side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside" } + }, + { "when": { "east": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "create:block/palettes/pane/glass/noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/create/lang/en_us.json b/src/main/resources/assets/create/lang/en_us.json index 7bf97213e..b75ab0ff1 100644 --- a/src/main/resources/assets/create/lang/en_us.json +++ b/src/main/resources/assets/create/lang/en_us.json @@ -135,8 +135,28 @@ "block.create.belt_tunnel": "Conveyor Tunnel", "block.create.tiled_glass": "Tiled Glass", + "block.create.framed_glass": "Large Glass Window", + "block.create.vertical_framed_glass": "Vertical Glass Window", + "block.create.horizontal_framed_glass": "Horizontal Glass Window", + "block.create.oak_glass": "Oak Window", + "block.create.spruce_glass": "Spruce Window", + "block.create.birch_glass": "Birch Window", + "block.create.jungle_glass": "Jungle Window", + "block.create.dark_oak_glass": "Dark Oak Window", + "block.create.acacia_glass": "Acacia Window", + "block.create.iron_glass": "Ornate Iron Window", + "block.create.tiled_glass_pane": "Tiled Glass Pane", - "block.create.framed_glass": "Framed Glass", + "block.create.framed_glass_pane": "Large Glass Window Pane", + "block.create.vertical_framed_glass_pane": "Vertical Glass Window Pane", + "block.create.horizontal_framed_glass_pane": "Horizontal Glass Window Pane", + "block.create.oak_glass_pane": "Oak Window Pane", + "block.create.spruce_glass_pane": "Spruce Window Pane", + "block.create.birch_glass_pane": "Birch Window Pane", + "block.create.jungle_glass_pane": "Jungle Window Pane", + "block.create.dark_oak_glass_pane": "Dark Oak Window Pane", + "block.create.acacia_glass_pane": "Acacia Window Pane", + "block.create.iron_glass_pane": "Ornate Iron Window Pane", "block.create.window_in_a_block": "Block with Glass Pane", "block.create.andesite_bricks": "Andesite Bricks", diff --git a/src/main/resources/assets/create/models/block/palettes/acacia_glass.json b/src/main/resources/assets/create/models/block/palettes/acacia_glass.json new file mode 100644 index 000000000..9c7053ebc --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/acacia_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/acacia_planks", + "side": "create:block/acacia_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/birch_glass.json b/src/main/resources/assets/create/models/block/palettes/birch_glass.json new file mode 100644 index 000000000..0ab44ec14 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/birch_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/birch_planks", + "side": "create:block/birch_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_oak_glass.json b/src/main/resources/assets/create/models/block/palettes/dark_oak_glass.json new file mode 100644 index 000000000..2165748c0 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_oak_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/dark_oak_planks", + "side": "create:block/dark_oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/iron_glass.json b/src/main/resources/assets/create/models/block/palettes/iron_glass.json new file mode 100644 index 000000000..a2df32363 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/iron_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/iron_window_top", + "side": "create:block/iron_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/jungle_glass.json b/src/main/resources/assets/create/models/block/palettes/jungle_glass.json new file mode 100644 index 000000000..038764c69 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/jungle_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/jungle_planks", + "side": "create:block/jungle_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/oak_glass.json b/src/main/resources/assets/create/models/block/palettes/oak_glass.json new file mode 100644 index 000000000..e65a926e4 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/oak_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/oak_planks", + "side": "create:block/oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/acacia/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/acacia/noside.json new file mode 100644 index 000000000..968018a78 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/acacia/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/acacia_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/acacia/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/acacia/noside_alt.json new file mode 100644 index 000000000..bb15f7d35 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/acacia/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/acacia_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/acacia/post.json b/src/main/resources/assets/create/models/block/palettes/pane/acacia/post.json new file mode 100644 index 000000000..7fb566f36 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/acacia/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "block/acacia_planks", + "pane": "create:block/acacia_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/acacia/side.json b/src/main/resources/assets/create/models/block/palettes/pane/acacia/side.json new file mode 100644 index 000000000..68b589af4 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/acacia/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "block/acacia_planks", + "pane": "create:block/acacia_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/acacia/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/acacia/side_alt.json new file mode 100644 index 000000000..3ce093762 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/acacia/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "block/acacia_planks", + "pane": "create:block/acacia_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/birch/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/birch/noside.json new file mode 100644 index 000000000..a4461d6bc --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/birch/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/birch_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/birch/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/birch/noside_alt.json new file mode 100644 index 000000000..6cef11fc8 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/birch/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/birch_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/birch/post.json b/src/main/resources/assets/create/models/block/palettes/pane/birch/post.json new file mode 100644 index 000000000..ad721efa7 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/birch/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "block/birch_planks", + "pane": "create:block/birch_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/birch/side.json b/src/main/resources/assets/create/models/block/palettes/pane/birch/side.json new file mode 100644 index 000000000..a06a3819a --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/birch/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "block/birch_planks", + "pane": "create:block/birch_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/birch/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/birch/side_alt.json new file mode 100644 index 000000000..480e1db41 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/birch/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "block/birch_planks", + "pane": "create:block/birch_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside.json new file mode 100644 index 000000000..73ff4a970 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/dark_oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside_alt.json new file mode 100644 index 000000000..6c11888ac --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/dark_oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/post.json b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/post.json new file mode 100644 index 000000000..8e2483b40 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "block/dark_oak_planks", + "pane": "create:block/dark_oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side.json b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side.json new file mode 100644 index 000000000..57b35838f --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "block/dark_oak_planks", + "pane": "create:block/dark_oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side_alt.json new file mode 100644 index 000000000..4a1587b11 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "block/dark_oak_planks", + "pane": "create:block/dark_oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/glass/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/glass/noside.json new file mode 100644 index 000000000..4be41d479 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/glass/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/framed_glass" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/glass/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/glass/noside_alt.json new file mode 100644 index 000000000..94a226f8b --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/glass/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/framed_glass" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/glass/post.json b/src/main/resources/assets/create/models/block/palettes/pane/glass/post.json new file mode 100644 index 000000000..85a852cd0 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/glass/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "create:block/framed_glass_pane_top", + "pane": "create:block/framed_glass" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/glass/side.json b/src/main/resources/assets/create/models/block/palettes/pane/glass/side.json new file mode 100644 index 000000000..44b09f7e0 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/glass/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "create:block/framed_glass_pane_top", + "pane": "create:block/framed_glass" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/glass/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/glass/side_alt.json new file mode 100644 index 000000000..772d74110 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/glass/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "create:block/framed_glass_pane_top", + "pane": "create:block/framed_glass" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/iron/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/iron/noside.json new file mode 100644 index 000000000..b3bee435d --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/iron/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/iron_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/iron/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/iron/noside_alt.json new file mode 100644 index 000000000..17eeac60f --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/iron/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/iron_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/iron/post.json b/src/main/resources/assets/create/models/block/palettes/pane/iron/post.json new file mode 100644 index 000000000..621833c48 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/iron/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "create:block/gabbro", + "pane": "create:block/iron_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/iron/side.json b/src/main/resources/assets/create/models/block/palettes/pane/iron/side.json new file mode 100644 index 000000000..ca3e18292 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/iron/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "create:block/gabbro", + "pane": "create:block/iron_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/iron/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/iron/side_alt.json new file mode 100644 index 000000000..6ac3639eb --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/iron/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "create:block/gabbro", + "pane": "create:block/iron_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/jungle/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/jungle/noside.json new file mode 100644 index 000000000..90b479d26 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/jungle/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/jungle_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/jungle/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/jungle/noside_alt.json new file mode 100644 index 000000000..310d6c49f --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/jungle/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/jungle_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/jungle/post.json b/src/main/resources/assets/create/models/block/palettes/pane/jungle/post.json new file mode 100644 index 000000000..0e0a5db3d --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/jungle/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "block/jungle_planks", + "pane": "create:block/jungle_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/jungle/side.json b/src/main/resources/assets/create/models/block/palettes/pane/jungle/side.json new file mode 100644 index 000000000..58e36e0e6 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/jungle/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "block/jungle_planks", + "pane": "create:block/jungle_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/jungle/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/jungle/side_alt.json new file mode 100644 index 000000000..013a1ef5e --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/jungle/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "block/jungle_planks", + "pane": "create:block/jungle_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/oak/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/oak/noside.json new file mode 100644 index 000000000..b63921435 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/oak/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/oak/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/oak/noside_alt.json new file mode 100644 index 000000000..6e42a3c1a --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/oak/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/oak/post.json b/src/main/resources/assets/create/models/block/palettes/pane/oak/post.json new file mode 100644 index 000000000..e582cccc0 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/oak/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "block/oak_planks", + "pane": "create:block/oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/oak/side.json b/src/main/resources/assets/create/models/block/palettes/pane/oak/side.json new file mode 100644 index 000000000..ce403c8b4 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/oak/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "block/oak_planks", + "pane": "create:block/oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/oak/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/oak/side_alt.json new file mode 100644 index 000000000..da42e2d92 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/oak/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "block/oak_planks", + "pane": "create:block/oak_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/spruce/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/spruce/noside.json new file mode 100644 index 000000000..f46fbbfeb --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/spruce/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/spruce_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/spruce/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/spruce/noside_alt.json new file mode 100644 index 000000000..a13d6bcc6 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/spruce/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/spruce_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/spruce/post.json b/src/main/resources/assets/create/models/block/palettes/pane/spruce/post.json new file mode 100644 index 000000000..abb6d0ea8 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/spruce/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "block/spruce_log", + "pane": "create:block/spruce_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/spruce/side.json b/src/main/resources/assets/create/models/block/palettes/pane/spruce/side.json new file mode 100644 index 000000000..98067f28b --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/spruce/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "block/spruce_log", + "pane": "create:block/spruce_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/spruce/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/spruce/side_alt.json new file mode 100644 index 000000000..1623b750c --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/spruce/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "block/spruce_log", + "pane": "create:block/spruce_window" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/template/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/template/noside.json new file mode 100644 index 000000000..bfb3b3003 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/template/noside.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside", + "textures": { + "pane": "create:block/$PANE" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/template/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/template/noside_alt.json new file mode 100644 index 000000000..194fca211 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/template/noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/$PANE" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/template/post.json b/src/main/resources/assets/create/models/block/palettes/pane/template/post.json new file mode 100644 index 000000000..acf7ff4a4 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/template/post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_post", + "textures": { + "edge": "block/$EDGE", + "pane": "create:block/$PANE" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/template/side.json b/src/main/resources/assets/create/models/block/palettes/pane/template/side.json new file mode 100644 index 000000000..88a47ff9f --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/template/side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side", + "textures": { + "edge": "block/$EDGE", + "pane": "create:block/$PANE" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/template/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/template/side_alt.json new file mode 100644 index 000000000..4b4582f4e --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/pane/template/side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/template_glass_pane_side_alt", + "textures": { + "edge": "block/$EDGE", + "pane": "create:block/$PANE" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_noside.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/noside.json similarity index 100% rename from src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_noside.json rename to src/main/resources/assets/create/models/block/palettes/pane/tiled/noside.json diff --git a/src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/noside_alt.json similarity index 100% rename from src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_noside_alt.json rename to src/main/resources/assets/create/models/block/palettes/pane/tiled/noside_alt.json diff --git a/src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_post.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/post.json similarity index 100% rename from src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_post.json rename to src/main/resources/assets/create/models/block/palettes/pane/tiled/post.json diff --git a/src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_side.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/side.json similarity index 100% rename from src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_side.json rename to src/main/resources/assets/create/models/block/palettes/pane/tiled/side.json diff --git a/src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/side_alt.json similarity index 100% rename from src/main/resources/assets/create/models/block/palettes/tiled_glass_pane_side_alt.json rename to src/main/resources/assets/create/models/block/palettes/pane/tiled/side_alt.json diff --git a/src/main/resources/assets/create/models/block/palettes/spruce_glass.json b/src/main/resources/assets/create/models/block/palettes/spruce_glass.json new file mode 100644 index 000000000..2a63ee140 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/spruce_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "block/spruce_log_top", + "side": "create:block/spruce_window" + } +} diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_noside.json b/src/main/resources/assets/create/models/block/template_glass_pane_noside.json new file mode 100644 index 000000000..af16ff940 --- /dev/null +++ b/src/main/resources/assets/create/models/block/template_glass_pane_noside.json @@ -0,0 +1,14 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#pane" + }, + "elements": [ + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 9 ], + "faces": { + "north": { "uv": [ 9, 0, 7, 16 ], "texture": "#pane" } + } + } + ] +} diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_noside_alt.json b/src/main/resources/assets/create/models/block/template_glass_pane_noside_alt.json new file mode 100644 index 000000000..771d69420 --- /dev/null +++ b/src/main/resources/assets/create/models/block/template_glass_pane_noside_alt.json @@ -0,0 +1,14 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#pane" + }, + "elements": [ + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 9 ], + "faces": { + "east": { "uv": [ 7, 0, 9, 16 ], "texture": "#pane" } + } + } + ] +} diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_post.json b/src/main/resources/assets/create/models/block/template_glass_pane_post.json new file mode 100644 index 000000000..039229cbe --- /dev/null +++ b/src/main/resources/assets/create/models/block/template_glass_pane_post.json @@ -0,0 +1,15 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#pane" + }, + "elements": [ + { "from": [ 7, 0, 7 ], + "to": [ 9, 16, 9 ], + "faces": { + "down": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge", "cullface": "down" }, + "up": { "uv": [ 7, 7, 9, 9 ], "texture": "#edge", "cullface": "up" } + } + } + ] +} diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_side.json b/src/main/resources/assets/create/models/block/template_glass_pane_side.json new file mode 100644 index 000000000..8d409abb3 --- /dev/null +++ b/src/main/resources/assets/create/models/block/template_glass_pane_side.json @@ -0,0 +1,18 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#pane" + }, + "elements": [ + { "from": [ 7, 0, 0 ], + "to": [ 9, 16, 7 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge", "cullface": "down" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge", "cullface": "up" }, + "north": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "north" }, + "west": { "uv": [ 16, 0, 9, 16 ], "texture": "#pane" }, + "east": { "uv": [ 9, 0, 16, 16 ], "texture": "#pane" } + } + } + ] +} diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_side_alt.json b/src/main/resources/assets/create/models/block/template_glass_pane_side_alt.json new file mode 100644 index 000000000..487efacf7 --- /dev/null +++ b/src/main/resources/assets/create/models/block/template_glass_pane_side_alt.json @@ -0,0 +1,18 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#pane" + }, + "elements": [ + { "from": [ 7, 0, 9 ], + "to": [ 9, 16, 16 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge", "cullface": "down" }, + "up": { "uv": [ 7, 0, 9, 7 ], "texture": "#edge", "cullface": "up" }, + "south": { "uv": [ 7, 0, 9, 16 ], "texture": "#edge", "cullface": "south" }, + "west": { "uv": [ 7, 0, 0, 16 ], "texture": "#pane" }, + "east": { "uv": [ 0, 0, 7, 16 ], "texture": "#pane" } + } + } + ] +} diff --git a/src/main/resources/assets/create/models/item/acacia_glass.json b/src/main/resources/assets/create/models/item/acacia_glass.json new file mode 100644 index 000000000..36830d048 --- /dev/null +++ b/src/main/resources/assets/create/models/item/acacia_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/acacia_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/acacia_glass_pane.json b/src/main/resources/assets/create/models/item/acacia_glass_pane.json new file mode 100644 index 000000000..4ee856b67 --- /dev/null +++ b/src/main/resources/assets/create/models/item/acacia_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/acacia_window", + "edge": "block/acacia_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/birch_glass.json b/src/main/resources/assets/create/models/item/birch_glass.json new file mode 100644 index 000000000..9e07dbc93 --- /dev/null +++ b/src/main/resources/assets/create/models/item/birch_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/birch_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/birch_glass_pane.json b/src/main/resources/assets/create/models/item/birch_glass_pane.json new file mode 100644 index 000000000..694da2f9d --- /dev/null +++ b/src/main/resources/assets/create/models/item/birch_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/birch_window", + "edge": "block/birch_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/dark_oak_glass.json b/src/main/resources/assets/create/models/item/dark_oak_glass.json new file mode 100644 index 000000000..ea5ffeee0 --- /dev/null +++ b/src/main/resources/assets/create/models/item/dark_oak_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/dark_oak_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/dark_oak_glass_pane.json b/src/main/resources/assets/create/models/item/dark_oak_glass_pane.json new file mode 100644 index 000000000..b15f84f31 --- /dev/null +++ b/src/main/resources/assets/create/models/item/dark_oak_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/dark_oak_window", + "edge": "block/dark_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/framed_glass_pane.json b/src/main/resources/assets/create/models/item/framed_glass_pane.json new file mode 100644 index 000000000..5c7debab3 --- /dev/null +++ b/src/main/resources/assets/create/models/item/framed_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/framed_glass", + "edge": "create:block/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/horizontal_framed_glass.json b/src/main/resources/assets/create/models/item/horizontal_framed_glass.json new file mode 100644 index 000000000..f3c072902 --- /dev/null +++ b/src/main/resources/assets/create/models/item/horizontal_framed_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/framed_glass", + "side": "create:block/horizontal_framed_glass" + } +} diff --git a/src/main/resources/assets/create/models/item/horizontal_framed_glass_pane.json b/src/main/resources/assets/create/models/item/horizontal_framed_glass_pane.json new file mode 100644 index 000000000..c632d820c --- /dev/null +++ b/src/main/resources/assets/create/models/item/horizontal_framed_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/horizontal_framed_glass", + "edge": "create:block/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/iron_glass.json b/src/main/resources/assets/create/models/item/iron_glass.json new file mode 100644 index 000000000..7c9850f60 --- /dev/null +++ b/src/main/resources/assets/create/models/item/iron_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/iron_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/iron_glass_pane.json b/src/main/resources/assets/create/models/item/iron_glass_pane.json new file mode 100644 index 000000000..2758d1965 --- /dev/null +++ b/src/main/resources/assets/create/models/item/iron_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/iron_window", + "edge": "create:block/gabbro" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/jungle_glass.json b/src/main/resources/assets/create/models/item/jungle_glass.json new file mode 100644 index 000000000..33678acee --- /dev/null +++ b/src/main/resources/assets/create/models/item/jungle_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/jungle_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/jungle_glass_pane.json b/src/main/resources/assets/create/models/item/jungle_glass_pane.json new file mode 100644 index 000000000..f14f5667e --- /dev/null +++ b/src/main/resources/assets/create/models/item/jungle_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/jungle_window", + "edge": "block/jungle_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/oak_glass.json b/src/main/resources/assets/create/models/item/oak_glass.json new file mode 100644 index 000000000..1d0b3cd9b --- /dev/null +++ b/src/main/resources/assets/create/models/item/oak_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/oak_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/oak_glass_pane.json b/src/main/resources/assets/create/models/item/oak_glass_pane.json new file mode 100644 index 000000000..8e7be69b9 --- /dev/null +++ b/src/main/resources/assets/create/models/item/oak_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/oak_window", + "edge": "block/oak_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/pane.json b/src/main/resources/assets/create/models/item/pane.json new file mode 100644 index 000000000..ba4c3bf0b --- /dev/null +++ b/src/main/resources/assets/create/models/item/pane.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "#edge", + "1": "#pane", + "particle": "#pane" + }, + "elements": [ + { + "from": [0, 0, 7], + "to": [16, 16, 9], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [7, 0, 9, 16], "rotation": 180, "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [7, 0, 9, 16], "rotation": 180, "texture": "#0"}, + "up": {"uv": [7, 0, 9, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [7, 0, 9, 16], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/spruce_glass.json b/src/main/resources/assets/create/models/item/spruce_glass.json new file mode 100644 index 000000000..61516407d --- /dev/null +++ b/src/main/resources/assets/create/models/item/spruce_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/spruce_glass" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/spruce_glass_pane.json b/src/main/resources/assets/create/models/item/spruce_glass_pane.json new file mode 100644 index 000000000..221576c36 --- /dev/null +++ b/src/main/resources/assets/create/models/item/spruce_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/spruce_window", + "edge": "block/spruce_log" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/tiled_glass_pane.json b/src/main/resources/assets/create/models/item/tiled_glass_pane.json index c9cd61f76..4b8269ba7 100644 --- a/src/main/resources/assets/create/models/item/tiled_glass_pane.json +++ b/src/main/resources/assets/create/models/item/tiled_glass_pane.json @@ -1,6 +1,7 @@ { - "parent": "item/generated", - "textures": { - "layer0": "create:block/tiled_glass" - } + "parent": "create:item/pane", + "textures": { + "pane": "create:block/tiled_glass", + "edge": "block/glass_pane_top" + } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/vertical_framed_glass.json b/src/main/resources/assets/create/models/item/vertical_framed_glass.json new file mode 100644 index 000000000..966f5bfa9 --- /dev/null +++ b/src/main/resources/assets/create/models/item/vertical_framed_glass.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/framed_glass", + "side": "create:block/vertical_framed_glass" + } +} diff --git a/src/main/resources/assets/create/models/item/vertical_framed_glass_pane.json b/src/main/resources/assets/create/models/item/vertical_framed_glass_pane.json new file mode 100644 index 000000000..0ac498a9b --- /dev/null +++ b/src/main/resources/assets/create/models/item/vertical_framed_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/vertical_framed_glass", + "edge": "create:block/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/acacia_window.png b/src/main/resources/assets/create/textures/block/acacia_window.png new file mode 100644 index 0000000000000000000000000000000000000000..d4789b289100a9d1dc1e766cd7e27422db6b4bdc GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDEfH31!Z9ZwB;4@Db#}EtuWSiJ`|Nmcqf1k(Tz_C+YsSBA> zObrS?zYS+Qw%9f9|NVV`PJC#8sU9+;v9Y~T)~7zPp=06a#0RHl=kxSfUi;Ht}VMizCpF~sqq0G2F3~59#4%MeVo`{)HpR125p2cK`f^J{$^D{V%X8eE9#r-ryM93}s0G(U~aEn?4MAr77gUYAb9 fReb(v%*^m<*VJE4To+FOeaztL>gTe~DWM4fneT{E literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/birch_window.png b/src/main/resources/assets/create/textures/block/birch_window.png new file mode 100644 index 0000000000000000000000000000000000000000..4020f4578b2b924bf34e73c1c6dad9c4e6aa7d4e GIT binary patch literal 500 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 JPDHLkV1kDksrmo_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/connected/dark_oak_window.png b/src/main/resources/assets/create/textures/block/connected/dark_oak_window.png new file mode 100644 index 0000000000000000000000000000000000000000..c9a76c119912641f87328dd965cb38c989f15a3e GIT binary patch literal 718 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/connected/iron_window.png b/src/main/resources/assets/create/textures/block/connected/iron_window.png new file mode 100644 index 0000000000000000000000000000000000000000..593bcecf8c49db4990eaf3df0556e8f6a9ca0bd7 GIT binary patch literal 1193 zcmV;a1XlZrP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf1U^YbK~z{rt(Jdm zQ&kklzkSxOTf1&^jLv3T?3_x4g|HF!2a^#n%t%Ox1~8GJk(fXP7Nc+*R9|Zc=mhtZn=Fe&vwsG(wuvH&&|E( zymQVyo@bxlW;Qi6B3K?mJpKo6k2Pa-WEjcG37Dpd(eVVL^$jwwYq%AOv5PV;@%i!H zkKbeQ!WO*p_5mzuX~zEj2R$f&O`F!6$A0cbXWL?Um$k3NK;N%;ZucH*`5Je|8b!X@ z^@&KGZ4YfkT_lP~q)z6Qp^(TzxODlF$UvYR1`q%G*kQc9V>?ct?Dwc&ZMX)HZrF&& zAKn6v2Tq;NShwNc)v{-NbOgi07v#VAUn3%mVQMM~gBJAlpF`J|pJUI9&ztiW#LVR@ zmzhs(-HM|B;MSFkimp!yVQR*+XMl&4h?%r(;b4Vmp)(G$_ z3-<1N$Fup72Ti*6mS`hh|KI>V{_qR2`o49mO&&aSVbJ77c{rg3KHrTp{`2CfNW#NA z+uI+rra9EsRO9^6Fbu;3!}?F)C3rY3SBDdh`Crp*^F@cB$XY_Eyh3C}d6~$)AARb0 zI8iacK$Z)rVEd};J(HI2cwuKwH1oe*Z@nfuoU1+6;fP4Z=KI$=9!_qa8x~m-2*DUh zrxjhQ4%aQWqdY-f?wR~2B^gBQG2q1b#KeqD2eDCK8xd=Ie(A}4TPNQC?2vpS?g^C! z+^1o*DTd}~46O@W@xYo+FbiZg4_u>8TWg!_302K?ord1y$B)dU)$ar7?K>m2z*^6O zk%-Lb^XWf=ns8sOx9{cyFPc$r2^m$aZhUGE7kQjyI7ql*_U zSS0fkCr^kZ;k#GhnK1xxo&{e8t7kk+FCuKR&|R;X58A2yWIB!=gtqxd^UApY$D;lA7C1jVoI^fIHvLc)(_~< zF;O|64?f2V*ZqL~IVSmXUMJ@{R?Ma!us_Fz^aEMXF$Zq?0sC`YNI#JE9J}oYTtCNd z`vJGlvFm<7HKoO*q0*J6RP_V<4!$ea=>cYkYt*4G_r&8vnJk#iCy*>Cq#s}tL6}}j zhkIB^im8P5+8~wC8aws_M9*#A-Gx>{eScOZ%vVVAq35>lLWR8&+R^vxmC&dtu%ppY zg~V4H%v%Zni>w$J8ayKtCl}f~9aTt@iNA9yVIf?rgdzM3sQ~0Si++wm00000NkvXX Hu0mjftpYwy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/connected/jungle_window.png b/src/main/resources/assets/create/textures/block/connected/jungle_window.png new file mode 100644 index 0000000000000000000000000000000000000000..5ed48cd2346eee2cf8105a994031f74d6c3c374b GIT binary patch literal 947 zcmV;k15EshP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf14v0kK~z{r&6Z7Q z6G0TmUzTWsAKOU3ON&(xdXgf72YbjxJgTS{Z+;v+DR?Rh-o*A&MD!%>MFe{&h#*!F z2}A_Nc=2E)rO>p8DlKjjl|)+C{ZDqn+u5DX#v1SsVQ1$z?`3D^&Ab=8bK$5>js|-B z@t_~opR_%>jk>#gsaC5|zVJ!(gG&a1LvM5MXyo!F9UmQyi4Ip&vrlX@_lOpXiw&O1 zWGJ0Zdw6`MyiQiRN-O0h+TF8Lz|Tu-WaSE!GLzyR$}h`zhdJYk>hGz9z&_+9`7^b)MxIX1LwzS`O7K|_IA-0=ee)=(z62TtM|kcW1zvpGx3x>NPC8cDPIle zam@C_%?G|EyfIm{N6J~M)_w&p@x*k+ww~X2R^YeW1Dm_{t!q~r>uiMyXp?yrWmm1EKxGC)$Q>MTPC^s=TYpz4f%z>ueZL5CE_#K*w}Deb#cyZ zp{VwT+x9uY3{+*aS+~_(QSFV+j+EQ<3wzjZZs2U|1lDfe*n%jMQOtw26$ROgAe3iY zRe#Tb2qMmTum*9iDE0=92`(R!v{`!tUlBBeu8#V(%=xiH2OGvgoGYq*Y-a4N zT{(P?R!bGpA%y|BZcC*SwUfuj&K$9kT##5~GFtpv5ebJUBmQ1bM&x<_Tl?7D?MpV! zqiLonk?^KABqK=eha`hGWB*U;fv!{6>Eh{=p5SU$4@^uywD-+>c71c@P0$vYr!2zPW8E=;F!R4y)f&}u^13^;rxhj?OJ09scioGWpaR;qR zy=GC6sNw|)RuF2`1F8eeK+Wgefy&i8o^yFhctIk0qaIKlKw$XEJya_i$#n|jSRt^M z>VbABGzgK&z;zdmf#kX^QaLY3AaM%N&^b_(iRwV|pb5xi1BG!B1G)jYsdRgcAd*}+f#!Ue{s6D) VyEby8<4^zq002ovPDHLkV1j-?yEOm+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/connected/oak_window.png b/src/main/resources/assets/create/textures/block/connected/oak_window.png index 467f31b3dc35133e45730d5feb401269f29141c4..68f87f93e42a538d6e5ff75d40e95b2428cf4463 100644 GIT binary patch delta 677 zcmV;W0$Tl+1@8rrR)2&^L_t(oN5z)UZqq;z#wU*B$VqBkQVB)$#EFNf#E}yM3Go8u z&Vd6LZV0X*aYx*GL-d6}2nvBVRH+Jf(x?jgCcEuqz24YyBYuZ?*I#D6e`a>3_VLZ5 zDb46c8+cHXp7T?ZP7;2GjTS#Ot*}m?`bX5e^Gv;22@0Jb(RmiV5UtT`wUYAG~${g?hcnvK550 z6%1*l-ew7!P1VZ6+Jwl*s_~)64F1)TQBR+cB)})zc@ny6>wuS)hf~A`b(E z%|N}Lg8@`Cqkl=@8(4rue;n;`n!h_*^YGJ+Bklk>0FasuxdWzcC(5^lh6V5hH0A&} z>pX0lv@MD!x6mBm;74DzvOq&vnnzFu*e~pWNfd9YRu-352A;t1w0P`G^abUzcWD_P zD1wZTRWR*244aLH>bfzV6ldtN4`#70HE9oxeE?4M`+ww=|F8_3m%HqvcDSHPduX8c z{^h;t`R!fqfMhhLWPHZ$t!wiHH84Kl*FB0mZB8cr;W1UQ=Lz)U>ny-2kQHqiQG*Pq z_0M0v@(xt7=LzWB41>v=tq9U)75o2Q4^-L#)B~s|-~+CVnWuHX?Ojbh;L4aT4O~e* z&@(cojDL4mHsyN&1FWkaD3VRrS`RGCrkPw|4p3wT5@}nMwbldejr`q%#y+6>R;tzm zqjY|M*w9+(bS%*qR31U#D9dMB#s|t`-i#)VAU}ejU4&s7WQbw~RqYp?a2aNlEOSB= zn|-MxSS8FPHhVsTquITlhf4#lBhUqj4XstGh#rv5bT-tKv)`kCWm45DUp)2900000 LNkvXXu0mjf1Y%8f delta 587 zcmV-R0<`__1(pSnR(~r=L_t(oN9~rePQx$|hTQ-|D?nAdz|f8?42%q!5UdQm00ZJ7 zm=HrBpbHBN55U&GLk9-vh*SxobO0eWssw5WghKy|FLhJfN@_tDJ}HXrKUdp#=W`2} zXZw+mY*kA1E|%BnJsy50Z550&Z{bL`7PF@X9QnJlE5vC0Eq_~6#$WLy#kF_>=J_R{ z1-RJL0?x1Q0-q6 zdOg{ihc#DwPfds*2$Fyd@DmIN-)IJG;?t@CDLT{6Xtai0eJfI^C zL)n_grZHLUt$z#P9q53@=i5XUd*cFhNyFH*JWvRb#V86Ym;h%MZJUN4P)|W#$OF1_ z%o9|rRqCsxHB%kP;z4X+l}0ACS}huEx7*YQJc&&MCNFin-N>e)U$|`?N89B%S>TfD z=7#n{VM@i7M8{2#=L(r_2h0)IG;aA)3_!e-~-LJS52IWmR4 zWYXU6oACk;Pp{?hEO6h%U9vX|H05OBbs#U~0bLUD1nQN`q%~6#X7M04@c(~c$^QqM Z;s?}&@v0jqGyVVo002ovPDHLkV1j=$5p)0m diff --git a/src/main/resources/assets/create/textures/block/connected/spruce_window.png b/src/main/resources/assets/create/textures/block/connected/spruce_window.png new file mode 100644 index 0000000000000000000000000000000000000000..7c2fad33a1dc147998dd767cae0e545d194089f1 GIT binary patch literal 977 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 JPDHLkV1mxB!p{Hz diff --git a/src/main/resources/assets/create/textures/block/framed_glass_pane_top.png b/src/main/resources/assets/create/textures/block/framed_glass_pane_top.png new file mode 100644 index 0000000000000000000000000000000000000000..1b42f026cbf54278d53db3fe3a7d399cca13e0de GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!75J|#}EtusB3vO`tgzgny=;O0ssmk~NcXyZb=-bsK zws0jfbnR_0Ej(bLp*VGWIpfS5PaS7$Yvf>RVVbmnvE>re+r17P4@?^hg3=Ng7!D{E V7i{}#E(CN1gQu&X%Q~loCIBhpPN4t* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/horizontal_framed_glass.png b/src/main/resources/assets/create/textures/block/horizontal_framed_glass.png new file mode 100644 index 0000000000000000000000000000000000000000..d24ea95996d318701836aff4aa3edd6fdfce9faf GIT binary patch literal 275 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/spruce_window.png b/src/main/resources/assets/create/textures/block/spruce_window.png new file mode 100644 index 0000000000000000000000000000000000000000..e19bf97561d12644ad8962060b69a5d5e281c3e9 GIT binary patch literal 593 zcmV-X0Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0p>|WK~y+Tg_F-q zTR{-VXOkCSjFB3DRcypdXgrjNieU9DLZOHOl~TOaYY|M)i|9e!NW{me zsX+z(S*noCf2Z5xFUl9L*fH7`rn4)H3>YAqRaDN6LsRUyzPkFTrr9(}QN5=)9Z=!o znsvCCkU^q7C?|)zWomg@)*!4esRdX5TMt|KpnpD&QUhrtRZa26awJuPM(a@q%H}45 zNdGv^eEi_1o!Q+H>6H~Zn_iTA>uaul?(?(|eG?Rmwvzo@692~Tt_XF!|Kyk`^sTy) zK96w=yJ?2FiCjXpTE_OGGuYqWWE<_{_Q2by z|FN{O#kYse0H1*y0ND29@$~}dZ>hO|GBosW1i4&}GMS8XQY4c}-becrBAd;!?1e{p zpf|>&3((=`(CK5ekB$o}z`LGKx-UOC20{VuGG*~f}1^E978PplVdj3{jFy+I(RueUoyghM^;vr ztyWaDt-JhPgX)LI@A3PLEhJtT$?PbQOk^-(kUGMVn#AhRTOfYF{>zL;&Qoeqdn*4k zwyND^C~?@t_-0N_!7P7=2_?*Rb^qCx+t*guGw3<6A3n$sP_%@_z_XjP`La33fsC4l z>CL>YX^cA^q8ug9Ffs;2{r~e=d`dfKf|R4fjQ;kT0 bA;BQE!0E8jiN8!h=QDV^`njxgN@xNAScYGE literal 0 HcmV?d00001 diff --git a/src/main/resources/data/create/loot_tables/blocks/acacia_glass.json b/src/main/resources/data/create/loot_tables/blocks/acacia_glass.json new file mode 100644 index 000000000..7ef422fd0 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/acacia_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:acacia_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/acacia_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/acacia_glass_pane.json new file mode 100644 index 000000000..3b202a989 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/acacia_glass_pane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:acacia_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/birch_glass.json b/src/main/resources/data/create/loot_tables/blocks/birch_glass.json new file mode 100644 index 000000000..4d8932ca1 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/birch_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:birch_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/birch_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/birch_glass_pane.json new file mode 100644 index 000000000..dee0b289d --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/birch_glass_pane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:birch_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/dark_oak_glass.json b/src/main/resources/data/create/loot_tables/blocks/dark_oak_glass.json new file mode 100644 index 000000000..e90196415 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/dark_oak_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:dark_oak_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/dark_oak_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/dark_oak_glass_pane.json new file mode 100644 index 000000000..5200f9c80 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/dark_oak_glass_pane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:dark_oak_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/framed_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/framed_glass_pane.json new file mode 100644 index 000000000..6f9a53469 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/framed_glass_pane.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:framed_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/horizontal_framed_glass.json b/src/main/resources/data/create/loot_tables/blocks/horizontal_framed_glass.json new file mode 100644 index 000000000..8043511ee --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/horizontal_framed_glass.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:horizontal_framed_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/horizontal_framed_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/horizontal_framed_glass_pane.json new file mode 100644 index 000000000..99d31d4b7 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/horizontal_framed_glass_pane.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:horizontal_framed_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/iron_glass.json b/src/main/resources/data/create/loot_tables/blocks/iron_glass.json new file mode 100644 index 000000000..fe9436387 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/iron_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:iron_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/iron_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/iron_glass_pane.json new file mode 100644 index 000000000..8ea376231 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/iron_glass_pane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:iron_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/jungle_glass.json b/src/main/resources/data/create/loot_tables/blocks/jungle_glass.json new file mode 100644 index 000000000..07bcbedad --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/jungle_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:jungle_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/jungle_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/jungle_glass_pane.json new file mode 100644 index 000000000..8db321b96 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/jungle_glass_pane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:jungle_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/oak_glass.json b/src/main/resources/data/create/loot_tables/blocks/oak_glass.json new file mode 100644 index 000000000..355f49440 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/oak_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:oak_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/oak_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/oak_glass_pane.json new file mode 100644 index 000000000..7c0e840a4 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/oak_glass_pane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:oak_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/spruce_glass.json b/src/main/resources/data/create/loot_tables/blocks/spruce_glass.json new file mode 100644 index 000000000..45f929e3e --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/spruce_glass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:spruce_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/spruce_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/spruce_glass_pane.json new file mode 100644 index 000000000..e5bc370e2 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/spruce_glass_pane.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:spruce_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/vertical_framed_glass.json b/src/main/resources/data/create/loot_tables/blocks/vertical_framed_glass.json new file mode 100644 index 000000000..ee02fe589 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/vertical_framed_glass.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:vertical_framed_glass" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/vertical_framed_glass_pane.json b/src/main/resources/data/create/loot_tables/blocks/vertical_framed_glass_pane.json new file mode 100644 index 000000000..05208f24c --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/vertical_framed_glass_pane.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:vertical_framed_glass_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass.json new file mode 100644 index 000000000..ee9aa413f --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "tag": "forge:glass" + }, + "W": { + "item": "minecraft:acacia_planks" + } + }, + "result": { + "item": "create:acacia_glass", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass_pane.json new file mode 100644 index 000000000..da116603a --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/acacia_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:acacia_glass" + } + }, + "result": { + "item": "create:acacia_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass.json new file mode 100644 index 000000000..5048cb608 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "tag": "forge:glass" + }, + "W": { + "item": "minecraft:birch_planks" + } + }, + "result": { + "item": "create:birch_glass", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass_pane.json new file mode 100644 index 000000000..ada5713f3 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/birch_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:birch_glass" + } + }, + "result": { + "item": "create:birch_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass.json new file mode 100644 index 000000000..562a94005 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "tag": "forge:glass" + }, + "W": { + "item": "minecraft:dark_oak_planks" + } + }, + "result": { + "item": "create:dark_oak_glass", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass_pane.json new file mode 100644 index 000000000..ba2ffe6cb --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_oak_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:dark_oak_glass" + } + }, + "result": { + "item": "create:dark_oak_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_wall.json index 604b66f73..f34e747b6 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dolomite_wall.json @@ -11,7 +11,7 @@ }, "result": { "item": "create:dolomite_wall", - "count": 12 + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/framed_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/framed_glass_pane.json new file mode 100644 index 000000000..a9bb02d74 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/framed_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:framed_glass" + } + }, + "result": { + "item": "create:framed_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_wall.json index 78eb249e4..c9b9cdcbf 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_bricks_wall.json @@ -11,7 +11,7 @@ }, "result": { "item": "create:gabbro_bricks_wall", - "count": 12 + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_wall.json index cec9db652..dbf3db7d3 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/gabbro_wall.json @@ -11,7 +11,7 @@ }, "result": { "item": "create:gabbro_wall", - "count": 12 + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/horizontal_framed_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/horizontal_framed_glass_pane.json new file mode 100644 index 000000000..276621f48 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/horizontal_framed_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:horizontal_framed_glass" + } + }, + "result": { + "item": "create:horizontal_framed_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass.json new file mode 100644 index 000000000..cb3d7180c --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "tag": "forge:glass" + }, + "W": { + "item": "create:andesite_alloy" + } + }, + "result": { + "item": "create:iron_glass", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass_pane.json new file mode 100644 index 000000000..ed5ab6e84 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/iron_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:iron_glass" + } + }, + "result": { + "item": "create:iron_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass.json new file mode 100644 index 000000000..f15383737 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "tag": "forge:glass" + }, + "W": { + "item": "minecraft:jungle_planks" + } + }, + "result": { + "item": "create:jungle_glass", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass_pane.json new file mode 100644 index 000000000..da5a5a4e2 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/jungle_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:jungle_glass" + } + }, + "result": { + "item": "create:jungle_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_wall.json index 089e27eb4..3ad232736 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_bricks_wall.json @@ -11,7 +11,7 @@ }, "result": { "item": "create:limestone_bricks_wall", - "count": 12 + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_wall.json index 8b35a34ff..1fc316735 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/limestone_wall.json @@ -11,7 +11,7 @@ }, "result": { "item": "create:limestone_wall", - "count": 12 + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass.json new file mode 100644 index 000000000..abaa47387 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "tag": "forge:glass" + }, + "W": { + "item": "minecraft:oak_planks" + } + }, + "result": { + "item": "create:oak_glass", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass_pane.json new file mode 100644 index 000000000..2a4ad1e7a --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/oak_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:oak_glass" + } + }, + "result": { + "item": "create:oak_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass.json new file mode 100644 index 000000000..6152517b9 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "tag": "forge:glass" + }, + "W": { + "item": "minecraft:spruce_planks" + } + }, + "result": { + "item": "create:spruce_glass", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass_pane.json new file mode 100644 index 000000000..6854031c5 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/spruce_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:spruce_glass" + } + }, + "result": { + "item": "create:spruce_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/vertical_framed_glass_pane.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/vertical_framed_glass_pane.json new file mode 100644 index 000000000..d2e1854a7 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/vertical_framed_glass_pane.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:vertical_framed_glass" + } + }, + "result": { + "item": "create:vertical_framed_glass_pane", + "count": 16 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_wall.json index 45e99caef..c0833d7b8 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_bricks_wall.json @@ -11,7 +11,7 @@ }, "result": { "item": "create:weathered_limestone_bricks_wall", - "count": 12 + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_wall.json index 86be2dc18..239b0ac10 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_wall.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/weathered_limestone_wall.json @@ -11,7 +11,7 @@ }, "result": { "item": "create:weathered_limestone_wall", - "count": 12 + "count": 6 }, "conditions": [ { diff --git a/src/main/resources/data/create/recipes/smelting/dolomite.json b/src/main/resources/data/create/recipes/smelting/diorite.json similarity index 100% rename from src/main/resources/data/create/recipes/smelting/dolomite.json rename to src/main/resources/data/create/recipes/smelting/diorite.json diff --git a/src/main/resources/data/create/recipes/smelting/bread.json b/src/main/resources/data/create/recipes/smelting/dough.json similarity index 100% rename from src/main/resources/data/create/recipes/smelting/bread.json rename to src/main/resources/data/create/recipes/smelting/dough.json diff --git a/src/main/resources/data/create/recipes/smelting/framed_glass.json b/src/main/resources/data/create/recipes/smelting/framed_glass.json new file mode 100644 index 000000000..409c71227 --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/framed_glass.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:framed_glass" + }, + "result": "minecraft:glass", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/framed_glass_pane.json b/src/main/resources/data/create/recipes/smelting/framed_glass_pane.json new file mode 100644 index 000000000..f1fff7a63 --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/framed_glass_pane.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:framed_glass_pane" + }, + "result": "minecraft:glass_pane", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/gabbro.json b/src/main/resources/data/create/recipes/smelting/granite.json similarity index 100% rename from src/main/resources/data/create/recipes/smelting/gabbro.json rename to src/main/resources/data/create/recipes/smelting/granite.json diff --git a/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass.json b/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass.json new file mode 100644 index 000000000..863c9fdc3 --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:horizontal_framed_glass" + }, + "result": "minecraft:glass", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass_pane.json b/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass_pane.json new file mode 100644 index 000000000..471c8fe8f --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/horizontal_framed_glass_pane.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:horizontal_framed_glass_pane" + }, + "result": "minecraft:glass_pane", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/limestone.json b/src/main/resources/data/create/recipes/smelting/limesand.json similarity index 100% rename from src/main/resources/data/create/recipes/smelting/limestone.json rename to src/main/resources/data/create/recipes/smelting/limesand.json diff --git a/src/main/resources/data/create/recipes/smelting/tiled_glass.json b/src/main/resources/data/create/recipes/smelting/tiled_glass.json new file mode 100644 index 000000000..0b08b9391 --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/tiled_glass.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:tiled_glass" + }, + "result": "minecraft:glass", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/tiled_glass_pane.json b/src/main/resources/data/create/recipes/smelting/tiled_glass_pane.json new file mode 100644 index 000000000..49af92059 --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/tiled_glass_pane.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:tiled_glass_pane" + }, + "result": "minecraft:glass_pane", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/vertical_framed_glass.json b/src/main/resources/data/create/recipes/smelting/vertical_framed_glass.json new file mode 100644 index 000000000..506467d55 --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/vertical_framed_glass.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:vertical_framed_glass" + }, + "result": "minecraft:glass", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/vertical_framed_glass_pane.json b/src/main/resources/data/create/recipes/smelting/vertical_framed_glass_pane.json new file mode 100644 index 000000000..87ebc95ca --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/vertical_framed_glass_pane.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "create:vertical_framed_glass_pane" + }, + "result": "minecraft:glass_pane", + "cookingtime": 100, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/framed_glass.json b/src/main/resources/data/create/recipes/stonecutting/framed_glass.json new file mode 100644 index 000000000..e9e589b69 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/framed_glass.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:glass" + }, + "result": "create:framed_glass", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/framed_glass_pane.json b/src/main/resources/data/create/recipes/stonecutting/framed_glass_pane.json new file mode 100644 index 000000000..940f6d18c --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/framed_glass_pane.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:glass_pane" + }, + "result": "create:framed_glass_pane", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass.json b/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass.json new file mode 100644 index 000000000..ca088b488 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:glass" + }, + "result": "create:horizontal_framed_glass", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass_pane.json b/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass_pane.json new file mode 100644 index 000000000..bace23148 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/horizontal_framed_glass_pane.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:glass_pane" + }, + "result": "create:horizontal_framed_glass_pane", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass.json b/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass.json new file mode 100644 index 000000000..d1c6ed910 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:glass" + }, + "result": "create:vertical_framed_glass", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass_pane.json b/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass_pane.json new file mode 100644 index 000000000..c8ba1ca6e --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/vertical_framed_glass_pane.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:glass_pane" + }, + "result": "create:vertical_framed_glass_pane", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file