From a0707922483aaa265f7ffcacc42fb202ff027f03 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Thu, 14 May 2020 19:06:40 +0200 Subject: [PATCH] Generating Glass and Window Panes - Re-implemented framed, tiled glass panes and window panes in the palettes registrate --- .../blockstates/acacia_window_pane.json | 77 ++++++++ .../create/blockstates/birch_window_pane.json | 77 ++++++++ .../blockstates/dark_oak_window_pane.json | 77 ++++++++ .../create/blockstates/framed_glass_pane.json | 77 ++++++++ .../horizontal_framed_glass_pane.json | 77 ++++++++ .../blockstates/jungle_window_pane.json | 77 ++++++++ .../create/blockstates/oak_window_pane.json | 77 ++++++++ .../blockstates/ornate_iron_window_pane.json | 77 ++++++++ .../blockstates/spruce_window_pane.json | 77 ++++++++ .../create/blockstates/tiled_glass.json | 7 + .../create/blockstates/tiled_glass_pane.json | 77 ++++++++ .../vertical_framed_glass_pane.json | 77 ++++++++ .../resources/assets/create/lang/en_ud.json | 12 ++ .../resources/assets/create/lang/en_us.json | 12 ++ .../block/acacia_window_pane_noside.json | 7 + .../block/acacia_window_pane_noside_alt.json | 7 + .../models/block/acacia_window_pane_post.json | 7 + .../models/block/acacia_window_pane_side.json | 7 + .../block/acacia_window_pane_side_alt.json | 7 + .../block/birch_window_pane_noside.json | 7 + .../block/birch_window_pane_noside_alt.json | 7 + .../models/block/birch_window_pane_post.json | 7 + .../models/block/birch_window_pane_side.json | 7 + .../block/birch_window_pane_side_alt.json | 7 + .../block/dark_oak_window_pane_noside.json | 7 + .../dark_oak_window_pane_noside_alt.json | 7 + .../block/dark_oak_window_pane_post.json | 7 + .../block/dark_oak_window_pane_side.json | 7 + .../block/dark_oak_window_pane_side_alt.json | 7 + .../block/framed_glass_pane_noside.json | 7 + .../block/framed_glass_pane_noside_alt.json | 7 + .../models/block/framed_glass_pane_post.json | 7 + .../models/block/framed_glass_pane_side.json | 7 + .../block/framed_glass_pane_side_alt.json | 7 + .../horizontal_framed_glass_pane_noside.json | 7 + ...rizontal_framed_glass_pane_noside_alt.json | 7 + .../horizontal_framed_glass_pane_post.json | 7 + .../horizontal_framed_glass_pane_side.json | 7 + ...horizontal_framed_glass_pane_side_alt.json | 7 + .../block/jungle_window_pane_noside.json | 7 + .../block/jungle_window_pane_noside_alt.json | 7 + .../models/block/jungle_window_pane_post.json | 7 + .../models/block/jungle_window_pane_side.json | 7 + .../block/jungle_window_pane_side_alt.json | 7 + .../models/block/oak_window_pane_noside.json | 7 + .../block/oak_window_pane_noside_alt.json | 7 + .../models/block/oak_window_pane_post.json | 7 + .../models/block/oak_window_pane_side.json | 7 + .../block/oak_window_pane_side_alt.json | 7 + .../block/ornate_iron_window_pane_noside.json | 7 + .../ornate_iron_window_pane_noside_alt.json | 7 + .../block/ornate_iron_window_pane_post.json | 7 + .../block/ornate_iron_window_pane_side.json | 7 + .../ornate_iron_window_pane_side_alt.json | 7 + .../block/spruce_window_pane_noside.json | 7 + .../block/spruce_window_pane_noside_alt.json | 7 + .../models/block/spruce_window_pane_post.json | 7 + .../models/block/spruce_window_pane_side.json | 7 + .../block/spruce_window_pane_side_alt.json | 7 + .../create/models/block/tiled_glass.json | 6 + .../models/block/tiled_glass_pane_noside.json | 6 + .../block/tiled_glass_pane_noside_alt.json | 6 + .../models/block/tiled_glass_pane_post.json | 7 + .../models/block/tiled_glass_pane_side.json | 7 + .../block/tiled_glass_pane_side_alt.json | 7 + .../vertical_framed_glass_pane_noside.json | 7 + ...vertical_framed_glass_pane_noside_alt.json | 7 + .../vertical_framed_glass_pane_post.json | 7 + .../vertical_framed_glass_pane_side.json | 7 + .../vertical_framed_glass_pane_side_alt.json | 7 + .../models/item/acacia_window_pane.json | 7 + .../create/models/item/birch_window_pane.json | 7 + .../models/item/dark_oak_window_pane.json | 7 + .../create/models/item/framed_glass_pane.json | 7 + .../item/horizontal_framed_glass_pane.json | 7 + .../models/item/jungle_window_pane.json | 7 + .../create/models/item/oak_window_pane.json | 7 + .../models/item/ornate_iron_window_pane.json | 7 + .../models/item/spruce_window_pane.json | 7 + .../create/models/item/tiled_glass.json | 3 + .../create/models/item/tiled_glass_pane.json | 7 + .../item/vertical_framed_glass_pane.json | 7 + .../foundation/utility/data/WindowGen.java | 170 ++++++++++++++++++ .../modules/palettes/AllPaletteBlocks.java | 77 +++++--- .../modules/palettes/PalettesRegistrate.java | 66 +------ .../create/blockstates/framed_glass_pane.json | 31 ---- .../create/blockstates/tiled_glass.json | 5 - .../create/blockstates/tiled_glass_pane.json | 31 ---- .../vertical_framed_glass_pane.json | 31 ---- .../create/blockstates/window_in_a_block.json | 5 - .../noside.json} | 0 .../noside_alt.json} | 0 .../post.json} | 0 .../side.json} | 0 .../side_alt.json} | 0 .../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 - .../block/palettes/pane/tiled/noside.json | 6 - .../block/palettes/pane/tiled/noside_alt.json | 6 - .../block/palettes/pane/tiled/post.json | 7 - .../block/palettes/pane/tiled/side.json | 7 - .../block/palettes/pane/tiled/side_alt.json | 7 - .../models/block/palettes/tiled_glass.json | 6 - .../create/models/item/acacia_glass_pane.json | 7 - .../create/models/item/birch_glass_pane.json | 7 - .../models/item/dark_oak_glass_pane.json | 7 - .../create/models/item/framed_glass_pane.json | 7 - .../item/horizontal_framed_glass_pane.json | 7 - .../create/models/item/iron_glass_pane.json | 7 - .../create/models/item/jungle_glass_pane.json | 7 - .../create/models/item/oak_glass_pane.json | 7 - .../create/models/item/spruce_glass_pane.json | 7 - .../create/models/item/tiled_glass_pane.json | 7 - .../item/vertical_framed_glass_pane.json | 7 - .../block/{ => palettes}/tiled_glass.png | Bin .../data/create/tags/blocks/windowable.json | 15 -- .../data/forge/tags/blocks/glass.json | 6 - .../data/forge/tags/blocks/glass_panes.json | 6 - .../data/forge/tags/items/glass.json | 6 - .../data/forge/tags/items/glass_panes.json | 16 -- 163 files changed, 1574 insertions(+), 651 deletions(-) create mode 100644 src/generated/resources/assets/create/blockstates/acacia_window_pane.json create mode 100644 src/generated/resources/assets/create/blockstates/birch_window_pane.json create mode 100644 src/generated/resources/assets/create/blockstates/dark_oak_window_pane.json create mode 100644 src/generated/resources/assets/create/blockstates/framed_glass_pane.json create mode 100644 src/generated/resources/assets/create/blockstates/horizontal_framed_glass_pane.json create mode 100644 src/generated/resources/assets/create/blockstates/jungle_window_pane.json create mode 100644 src/generated/resources/assets/create/blockstates/oak_window_pane.json create mode 100644 src/generated/resources/assets/create/blockstates/ornate_iron_window_pane.json create mode 100644 src/generated/resources/assets/create/blockstates/spruce_window_pane.json create mode 100644 src/generated/resources/assets/create/blockstates/tiled_glass.json create mode 100644 src/generated/resources/assets/create/blockstates/tiled_glass_pane.json create mode 100644 src/generated/resources/assets/create/blockstates/vertical_framed_glass_pane.json create mode 100644 src/generated/resources/assets/create/models/block/acacia_window_pane_noside.json create mode 100644 src/generated/resources/assets/create/models/block/acacia_window_pane_noside_alt.json create mode 100644 src/generated/resources/assets/create/models/block/acacia_window_pane_post.json create mode 100644 src/generated/resources/assets/create/models/block/acacia_window_pane_side.json create mode 100644 src/generated/resources/assets/create/models/block/acacia_window_pane_side_alt.json create mode 100644 src/generated/resources/assets/create/models/block/birch_window_pane_noside.json create mode 100644 src/generated/resources/assets/create/models/block/birch_window_pane_noside_alt.json create mode 100644 src/generated/resources/assets/create/models/block/birch_window_pane_post.json create mode 100644 src/generated/resources/assets/create/models/block/birch_window_pane_side.json create mode 100644 src/generated/resources/assets/create/models/block/birch_window_pane_side_alt.json create mode 100644 src/generated/resources/assets/create/models/block/dark_oak_window_pane_noside.json create mode 100644 src/generated/resources/assets/create/models/block/dark_oak_window_pane_noside_alt.json create mode 100644 src/generated/resources/assets/create/models/block/dark_oak_window_pane_post.json create mode 100644 src/generated/resources/assets/create/models/block/dark_oak_window_pane_side.json create mode 100644 src/generated/resources/assets/create/models/block/dark_oak_window_pane_side_alt.json create mode 100644 src/generated/resources/assets/create/models/block/framed_glass_pane_noside.json create mode 100644 src/generated/resources/assets/create/models/block/framed_glass_pane_noside_alt.json create mode 100644 src/generated/resources/assets/create/models/block/framed_glass_pane_post.json create mode 100644 src/generated/resources/assets/create/models/block/framed_glass_pane_side.json create mode 100644 src/generated/resources/assets/create/models/block/framed_glass_pane_side_alt.json create mode 100644 src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_noside.json create mode 100644 src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_noside_alt.json create mode 100644 src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_post.json create mode 100644 src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_side.json create mode 100644 src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_side_alt.json create mode 100644 src/generated/resources/assets/create/models/block/jungle_window_pane_noside.json create mode 100644 src/generated/resources/assets/create/models/block/jungle_window_pane_noside_alt.json create mode 100644 src/generated/resources/assets/create/models/block/jungle_window_pane_post.json create mode 100644 src/generated/resources/assets/create/models/block/jungle_window_pane_side.json create mode 100644 src/generated/resources/assets/create/models/block/jungle_window_pane_side_alt.json create mode 100644 src/generated/resources/assets/create/models/block/oak_window_pane_noside.json create mode 100644 src/generated/resources/assets/create/models/block/oak_window_pane_noside_alt.json create mode 100644 src/generated/resources/assets/create/models/block/oak_window_pane_post.json create mode 100644 src/generated/resources/assets/create/models/block/oak_window_pane_side.json create mode 100644 src/generated/resources/assets/create/models/block/oak_window_pane_side_alt.json create mode 100644 src/generated/resources/assets/create/models/block/ornate_iron_window_pane_noside.json create mode 100644 src/generated/resources/assets/create/models/block/ornate_iron_window_pane_noside_alt.json create mode 100644 src/generated/resources/assets/create/models/block/ornate_iron_window_pane_post.json create mode 100644 src/generated/resources/assets/create/models/block/ornate_iron_window_pane_side.json create mode 100644 src/generated/resources/assets/create/models/block/ornate_iron_window_pane_side_alt.json create mode 100644 src/generated/resources/assets/create/models/block/spruce_window_pane_noside.json create mode 100644 src/generated/resources/assets/create/models/block/spruce_window_pane_noside_alt.json create mode 100644 src/generated/resources/assets/create/models/block/spruce_window_pane_post.json create mode 100644 src/generated/resources/assets/create/models/block/spruce_window_pane_side.json create mode 100644 src/generated/resources/assets/create/models/block/spruce_window_pane_side_alt.json create mode 100644 src/generated/resources/assets/create/models/block/tiled_glass.json create mode 100644 src/generated/resources/assets/create/models/block/tiled_glass_pane_noside.json create mode 100644 src/generated/resources/assets/create/models/block/tiled_glass_pane_noside_alt.json create mode 100644 src/generated/resources/assets/create/models/block/tiled_glass_pane_post.json create mode 100644 src/generated/resources/assets/create/models/block/tiled_glass_pane_side.json create mode 100644 src/generated/resources/assets/create/models/block/tiled_glass_pane_side_alt.json create mode 100644 src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_noside.json create mode 100644 src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_noside_alt.json create mode 100644 src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_post.json create mode 100644 src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_side.json create mode 100644 src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_side_alt.json create mode 100644 src/generated/resources/assets/create/models/item/acacia_window_pane.json create mode 100644 src/generated/resources/assets/create/models/item/birch_window_pane.json create mode 100644 src/generated/resources/assets/create/models/item/dark_oak_window_pane.json create mode 100644 src/generated/resources/assets/create/models/item/framed_glass_pane.json create mode 100644 src/generated/resources/assets/create/models/item/horizontal_framed_glass_pane.json create mode 100644 src/generated/resources/assets/create/models/item/jungle_window_pane.json create mode 100644 src/generated/resources/assets/create/models/item/oak_window_pane.json create mode 100644 src/generated/resources/assets/create/models/item/ornate_iron_window_pane.json create mode 100644 src/generated/resources/assets/create/models/item/spruce_window_pane.json create mode 100644 src/generated/resources/assets/create/models/item/tiled_glass.json create mode 100644 src/generated/resources/assets/create/models/item/tiled_glass_pane.json create mode 100644 src/generated/resources/assets/create/models/item/vertical_framed_glass_pane.json create mode 100644 src/main/java/com/simibubi/create/foundation/utility/data/WindowGen.java delete mode 100644 src/main/resources/assets/create/blockstates/framed_glass_pane.json delete mode 100644 src/main/resources/assets/create/blockstates/tiled_glass.json delete mode 100644 src/main/resources/assets/create/blockstates/tiled_glass_pane.json delete mode 100644 src/main/resources/assets/create/blockstates/vertical_framed_glass_pane.json delete mode 100644 src/main/resources/assets/create/blockstates/window_in_a_block.json rename src/main/resources/assets/create/models/block/{template_glass_pane_noside.json => connected_glass_pane/noside.json} (100%) rename src/main/resources/assets/create/models/block/{template_glass_pane_noside_alt.json => connected_glass_pane/noside_alt.json} (100%) rename src/main/resources/assets/create/models/block/{template_glass_pane_post.json => connected_glass_pane/post.json} (100%) rename src/main/resources/assets/create/models/block/{template_glass_pane_side.json => connected_glass_pane/side.json} (100%) rename src/main/resources/assets/create/models/block/{template_glass_pane_side_alt.json => connected_glass_pane/side_alt.json} (100%) delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/acacia/noside.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/acacia/noside_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/acacia/post.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/acacia/side.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/acacia/side_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/birch/noside.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/birch/noside_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/birch/post.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/birch/side.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/birch/side_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/dark_oak/post.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/glass/noside.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/glass/noside_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/glass/post.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/glass/side.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/glass/side_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/iron/noside.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/iron/noside_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/iron/post.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/iron/side.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/iron/side_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/jungle/noside.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/jungle/noside_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/jungle/post.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/jungle/side.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/jungle/side_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/oak/noside.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/oak/noside_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/oak/post.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/oak/side.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/oak/side_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/spruce/noside.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/spruce/noside_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/spruce/post.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/spruce/side.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/spruce/side_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/template/noside.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/template/noside_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/template/post.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/template/side.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/template/side_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/tiled/noside.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/tiled/noside_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/tiled/post.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/tiled/side.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/pane/tiled/side_alt.json delete mode 100644 src/main/resources/assets/create/models/block/palettes/tiled_glass.json delete mode 100644 src/main/resources/assets/create/models/item/acacia_glass_pane.json delete mode 100644 src/main/resources/assets/create/models/item/birch_glass_pane.json delete mode 100644 src/main/resources/assets/create/models/item/dark_oak_glass_pane.json delete mode 100644 src/main/resources/assets/create/models/item/framed_glass_pane.json delete mode 100644 src/main/resources/assets/create/models/item/horizontal_framed_glass_pane.json delete mode 100644 src/main/resources/assets/create/models/item/iron_glass_pane.json delete mode 100644 src/main/resources/assets/create/models/item/jungle_glass_pane.json delete mode 100644 src/main/resources/assets/create/models/item/oak_glass_pane.json delete mode 100644 src/main/resources/assets/create/models/item/spruce_glass_pane.json delete mode 100644 src/main/resources/assets/create/models/item/tiled_glass_pane.json delete mode 100644 src/main/resources/assets/create/models/item/vertical_framed_glass_pane.json rename src/main/resources/assets/create/textures/block/{ => palettes}/tiled_glass.png (100%) delete mode 100644 src/main/resources/data/create/tags/blocks/windowable.json delete mode 100644 src/main/resources/data/forge/tags/blocks/glass.json delete mode 100644 src/main/resources/data/forge/tags/blocks/glass_panes.json delete mode 100644 src/main/resources/data/forge/tags/items/glass.json delete mode 100644 src/main/resources/data/forge/tags/items/glass_panes.json diff --git a/src/generated/resources/assets/create/blockstates/acacia_window_pane.json b/src/generated/resources/assets/create/blockstates/acacia_window_pane.json new file mode 100644 index 000000000..6f968dffc --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/acacia_window_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "create:block/acacia_window_pane_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "create:block/acacia_window_pane_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "create:block/acacia_window_pane_noside" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "create:block/acacia_window_pane_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "create:block/acacia_window_pane_noside_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "create:block/acacia_window_pane_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "create:block/acacia_window_pane_noside", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "create:block/acacia_window_pane_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "create:block/acacia_window_pane_noside_alt" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/birch_window_pane.json b/src/generated/resources/assets/create/blockstates/birch_window_pane.json new file mode 100644 index 000000000..63d3598a6 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/birch_window_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "create:block/birch_window_pane_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "create:block/birch_window_pane_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "create:block/birch_window_pane_noside" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "create:block/birch_window_pane_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "create:block/birch_window_pane_noside_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "create:block/birch_window_pane_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "create:block/birch_window_pane_noside", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "create:block/birch_window_pane_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "create:block/birch_window_pane_noside_alt" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/dark_oak_window_pane.json b/src/generated/resources/assets/create/blockstates/dark_oak_window_pane.json new file mode 100644 index 000000000..23745e9da --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/dark_oak_window_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "create:block/dark_oak_window_pane_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "create:block/dark_oak_window_pane_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "create:block/dark_oak_window_pane_noside" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "create:block/dark_oak_window_pane_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "create:block/dark_oak_window_pane_noside_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "create:block/dark_oak_window_pane_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "create:block/dark_oak_window_pane_noside", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "create:block/dark_oak_window_pane_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "create:block/dark_oak_window_pane_noside_alt" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/framed_glass_pane.json b/src/generated/resources/assets/create/blockstates/framed_glass_pane.json new file mode 100644 index 000000000..99f80b10b --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/framed_glass_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "create:block/framed_glass_pane_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "create:block/framed_glass_pane_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "create:block/framed_glass_pane_noside" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "create:block/framed_glass_pane_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "create:block/framed_glass_pane_noside_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "create:block/framed_glass_pane_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "create:block/framed_glass_pane_noside", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "create:block/framed_glass_pane_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "create:block/framed_glass_pane_noside_alt" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/horizontal_framed_glass_pane.json b/src/generated/resources/assets/create/blockstates/horizontal_framed_glass_pane.json new file mode 100644 index 000000000..85d2dc809 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/horizontal_framed_glass_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "create:block/horizontal_framed_glass_pane_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "create:block/horizontal_framed_glass_pane_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "create:block/horizontal_framed_glass_pane_noside" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "create:block/horizontal_framed_glass_pane_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "create:block/horizontal_framed_glass_pane_noside_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "create:block/horizontal_framed_glass_pane_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "create:block/horizontal_framed_glass_pane_noside", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "create:block/horizontal_framed_glass_pane_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "create:block/horizontal_framed_glass_pane_noside_alt" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/jungle_window_pane.json b/src/generated/resources/assets/create/blockstates/jungle_window_pane.json new file mode 100644 index 000000000..00b0c5a9d --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/jungle_window_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "create:block/jungle_window_pane_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "create:block/jungle_window_pane_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "create:block/jungle_window_pane_noside" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "create:block/jungle_window_pane_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "create:block/jungle_window_pane_noside_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "create:block/jungle_window_pane_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "create:block/jungle_window_pane_noside", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "create:block/jungle_window_pane_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "create:block/jungle_window_pane_noside_alt" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/oak_window_pane.json b/src/generated/resources/assets/create/blockstates/oak_window_pane.json new file mode 100644 index 000000000..42b8f1226 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/oak_window_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "create:block/oak_window_pane_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "create:block/oak_window_pane_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "create:block/oak_window_pane_noside" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "create:block/oak_window_pane_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "create:block/oak_window_pane_noside_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "create:block/oak_window_pane_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "create:block/oak_window_pane_noside", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "create:block/oak_window_pane_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "create:block/oak_window_pane_noside_alt" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/ornate_iron_window_pane.json b/src/generated/resources/assets/create/blockstates/ornate_iron_window_pane.json new file mode 100644 index 000000000..0f3f4b6d9 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/ornate_iron_window_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "create:block/ornate_iron_window_pane_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "create:block/ornate_iron_window_pane_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "create:block/ornate_iron_window_pane_noside" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "create:block/ornate_iron_window_pane_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "create:block/ornate_iron_window_pane_noside_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "create:block/ornate_iron_window_pane_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "create:block/ornate_iron_window_pane_noside", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "create:block/ornate_iron_window_pane_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "create:block/ornate_iron_window_pane_noside_alt" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/spruce_window_pane.json b/src/generated/resources/assets/create/blockstates/spruce_window_pane.json new file mode 100644 index 000000000..bbb78953e --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/spruce_window_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "create:block/spruce_window_pane_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "create:block/spruce_window_pane_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "create:block/spruce_window_pane_noside" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "create:block/spruce_window_pane_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "create:block/spruce_window_pane_noside_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "create:block/spruce_window_pane_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "create:block/spruce_window_pane_noside", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "create:block/spruce_window_pane_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "create:block/spruce_window_pane_noside_alt" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/tiled_glass.json b/src/generated/resources/assets/create/blockstates/tiled_glass.json new file mode 100644 index 000000000..516c9b989 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/tiled_glass.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/tiled_glass" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/tiled_glass_pane.json b/src/generated/resources/assets/create/blockstates/tiled_glass_pane.json new file mode 100644 index 000000000..858a7d4d9 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/tiled_glass_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "create:block/tiled_glass_pane_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "create:block/tiled_glass_pane_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "create:block/tiled_glass_pane_noside" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "create:block/tiled_glass_pane_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "create:block/tiled_glass_pane_noside_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "create:block/tiled_glass_pane_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "create:block/tiled_glass_pane_noside", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "create:block/tiled_glass_pane_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "create:block/tiled_glass_pane_noside_alt" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/vertical_framed_glass_pane.json b/src/generated/resources/assets/create/blockstates/vertical_framed_glass_pane.json new file mode 100644 index 000000000..8bd050d7e --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/vertical_framed_glass_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "create:block/vertical_framed_glass_pane_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "create:block/vertical_framed_glass_pane_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "create:block/vertical_framed_glass_pane_noside" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "create:block/vertical_framed_glass_pane_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "create:block/vertical_framed_glass_pane_noside_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "create:block/vertical_framed_glass_pane_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "create:block/vertical_framed_glass_pane_noside", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "create:block/vertical_framed_glass_pane_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "create:block/vertical_framed_glass_pane_noside_alt" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index 13c29ce46..07740439e 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -1,9 +1,11 @@ { "block.create.acacia_window": "\u028Dopu\u0131M \u0250\u0131\u0254\u0250\u0254\u2C6F", + "block.create.acacia_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u0250\u0131\u0254\u0250\u0254\u2C6F", "block.create.andesite_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_cobblestone": "\u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.birch_window": "\u028Dopu\u0131M \u0265\u0254\u0279\u0131\u15FA", + "block.create.birch_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u0265\u0254\u0279\u0131\u15FA", "block.create.chiseled_dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_dolomite": "\u01DD\u0287\u0131\u026Fo\u05DFo\u15E1 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_gabbro": "o\u0279qq\u0250\u2141 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", @@ -11,6 +13,7 @@ "block.create.chiseled_scoria": "\u0250\u0131\u0279o\u0254S p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_weathered_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.dark_oak_window": "\u028Dopu\u0131M \u029E\u0250O \u029E\u0279\u0250\u15E1", + "block.create.dark_oak_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u029E\u0250O \u029E\u0279\u0250\u15E1", "block.create.dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1", "block.create.dark_scoria_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1", "block.create.dark_scoria_cobblestone": "\u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1", @@ -32,6 +35,7 @@ "block.create.fancy_scoria_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u0250\u0131\u0279o\u0254S \u028E\u0254u\u0250\u2132", "block.create.fancy_weathered_limestone_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM \u028E\u0254u\u0250\u2132", "block.create.framed_glass": "ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132", + "block.create.framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132", "block.create.gabbro": "o\u0279qq\u0250\u2141", "block.create.gabbro_bricks": "s\u029E\u0254\u0131\u0279\u15FA o\u0279qq\u0250\u2141", "block.create.gabbro_cobblestone": "\u01DDuo\u0287s\u01DD\u05DFqqo\u0186 o\u0279qq\u0250\u2141", @@ -40,7 +44,9 @@ "block.create.granite_cobblestone": "\u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131u\u0250\u0279\u2141", "block.create.granite_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DD\u0287\u0131u\u0250\u0279\u2141", "block.create.horizontal_framed_glass": "ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0287uoz\u0131\u0279oH", + "block.create.horizontal_framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0287uoz\u0131\u0279oH", "block.create.jungle_window": "\u028Dopu\u0131M \u01DD\u05DFbun\u017F", + "block.create.jungle_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u01DD\u05DFbun\u017F", "block.create.layered_andesite": "\u01DD\u0287\u0131s\u01DDpu\u2C6F p\u01DD\u0279\u01DD\u028E\u0250\uA780", "block.create.layered_dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1 p\u01DD\u0279\u01DD\u028E\u0250\uA780", "block.create.layered_diorite": "\u01DD\u0287\u0131\u0279o\u0131\u15E1 p\u01DD\u0279\u01DD\u028E\u0250\uA780", @@ -66,7 +72,9 @@ "block.create.mossy_weathered_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM \u028EssoW", "block.create.natural_scoria": "\u0250\u0131\u0279o\u0254S \u05DF\u0250\u0279n\u0287\u0250N", "block.create.oak_window": "\u028Dopu\u0131M \u029E\u0250O", + "block.create.oak_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u029E\u0250O", "block.create.ornate_iron_window": "\u028Dopu\u0131M uo\u0279I \u01DD\u0287\u0250u\u0279O", + "block.create.ornate_iron_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M uo\u0279I \u01DD\u0287\u0250u\u0279O", "block.create.overgrown_andesite": "\u01DD\u0287\u0131s\u01DDpu\u2C6F u\u028Do\u0279b\u0279\u01DD\u028CO", "block.create.overgrown_dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1 u\u028Do\u0279b\u0279\u01DD\u028CO", "block.create.overgrown_diorite": "\u01DD\u0287\u0131\u0279o\u0131\u15E1 u\u028Do\u0279b\u0279\u01DD\u028CO", @@ -96,7 +104,11 @@ "block.create.scoria_cobblestone": "\u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u0250\u0131\u0279o\u0254S", "block.create.scoria_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u0250\u0131\u0279o\u0254S", "block.create.spruce_window": "\u028Dopu\u0131M \u01DD\u0254n\u0279dS", + "block.create.spruce_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u01DD\u0254n\u0279dS", + "block.create.tiled_glass": "ss\u0250\u05DF\u2141 p\u01DD\u05DF\u0131\u27D8", + "block.create.tiled_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u05DF\u0131\u27D8", "block.create.vertical_framed_glass": "ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", + "block.create.vertical_framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", "block.create.weathered_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM", "block.create.weathered_limestone_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM", "block.create.weathered_limestone_cobblestone": "\u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index c145f1114..18d53472f 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1,9 +1,11 @@ { "block.create.acacia_window": "Acacia Window", + "block.create.acacia_window_pane": "Acacia Window Pane", "block.create.andesite_bricks": "Andesite Bricks", "block.create.andesite_cobblestone": "Andesite Cobblestone", "block.create.andesite_pillar": "Andesite Pillar", "block.create.birch_window": "Birch Window", + "block.create.birch_window_pane": "Birch Window Pane", "block.create.chiseled_dark_scoria": "Chiseled Dark Scoria", "block.create.chiseled_dolomite": "Chiseled Dolomite", "block.create.chiseled_gabbro": "Chiseled Gabbro", @@ -11,6 +13,7 @@ "block.create.chiseled_scoria": "Chiseled Scoria", "block.create.chiseled_weathered_limestone": "Chiseled Weathered Limestone", "block.create.dark_oak_window": "Dark Oak Window", + "block.create.dark_oak_window_pane": "Dark Oak Window Pane", "block.create.dark_scoria": "Dark Scoria", "block.create.dark_scoria_bricks": "Dark Scoria Bricks", "block.create.dark_scoria_cobblestone": "Dark Scoria Cobblestone", @@ -32,6 +35,7 @@ "block.create.fancy_scoria_bricks": "Fancy Scoria Bricks", "block.create.fancy_weathered_limestone_bricks": "Fancy Weathered Limestone Bricks", "block.create.framed_glass": "Framed Glass", + "block.create.framed_glass_pane": "Framed Glass Pane", "block.create.gabbro": "Gabbro", "block.create.gabbro_bricks": "Gabbro Bricks", "block.create.gabbro_cobblestone": "Gabbro Cobblestone", @@ -40,7 +44,9 @@ "block.create.granite_cobblestone": "Granite Cobblestone", "block.create.granite_pillar": "Granite Pillar", "block.create.horizontal_framed_glass": "Horizontal Framed Glass", + "block.create.horizontal_framed_glass_pane": "Horizontal Framed Glass Pane", "block.create.jungle_window": "Jungle Window", + "block.create.jungle_window_pane": "Jungle Window Pane", "block.create.layered_andesite": "Layered Andesite", "block.create.layered_dark_scoria": "Layered Dark Scoria", "block.create.layered_diorite": "Layered Diorite", @@ -66,7 +72,9 @@ "block.create.mossy_weathered_limestone": "Mossy Weathered Limestone", "block.create.natural_scoria": "Natural Scoria", "block.create.oak_window": "Oak Window", + "block.create.oak_window_pane": "Oak Window Pane", "block.create.ornate_iron_window": "Ornate Iron Window", + "block.create.ornate_iron_window_pane": "Ornate Iron Window Pane", "block.create.overgrown_andesite": "Overgrown Andesite", "block.create.overgrown_dark_scoria": "Overgrown Dark Scoria", "block.create.overgrown_diorite": "Overgrown Diorite", @@ -96,7 +104,11 @@ "block.create.scoria_cobblestone": "Scoria Cobblestone", "block.create.scoria_pillar": "Scoria Pillar", "block.create.spruce_window": "Spruce Window", + "block.create.spruce_window_pane": "Spruce Window Pane", + "block.create.tiled_glass": "Tiled Glass", + "block.create.tiled_glass_pane": "Tiled Glass Pane", "block.create.vertical_framed_glass": "Vertical Framed Glass", + "block.create.vertical_framed_glass_pane": "Vertical Framed Glass Pane", "block.create.weathered_limestone": "Weathered Limestone", "block.create.weathered_limestone_bricks": "Weathered Limestone Bricks", "block.create.weathered_limestone_cobblestone": "Weathered Limestone Cobblestone", diff --git a/src/generated/resources/assets/create/models/block/acacia_window_pane_noside.json b/src/generated/resources/assets/create/models/block/acacia_window_pane_noside.json new file mode 100644 index 000000000..ac9fa8656 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/acacia_window_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside", + "textures": { + "pane": "create:block/palettes/acacia_window", + "edge": "block/acacia_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/acacia_window_pane_noside_alt.json b/src/generated/resources/assets/create/models/block/acacia_window_pane_noside_alt.json new file mode 100644 index 000000000..19321b723 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/acacia_window_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside_alt", + "textures": { + "pane": "create:block/palettes/acacia_window", + "edge": "block/acacia_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/acacia_window_pane_post.json b/src/generated/resources/assets/create/models/block/acacia_window_pane_post.json new file mode 100644 index 000000000..829c00b67 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/acacia_window_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/post", + "textures": { + "pane": "create:block/palettes/acacia_window", + "edge": "block/acacia_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/acacia_window_pane_side.json b/src/generated/resources/assets/create/models/block/acacia_window_pane_side.json new file mode 100644 index 000000000..8f06a57ae --- /dev/null +++ b/src/generated/resources/assets/create/models/block/acacia_window_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side", + "textures": { + "pane": "create:block/palettes/acacia_window", + "edge": "block/acacia_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/acacia_window_pane_side_alt.json b/src/generated/resources/assets/create/models/block/acacia_window_pane_side_alt.json new file mode 100644 index 000000000..f66ad13fd --- /dev/null +++ b/src/generated/resources/assets/create/models/block/acacia_window_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side_alt", + "textures": { + "pane": "create:block/palettes/acacia_window", + "edge": "block/acacia_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/birch_window_pane_noside.json b/src/generated/resources/assets/create/models/block/birch_window_pane_noside.json new file mode 100644 index 000000000..ffb416709 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/birch_window_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside", + "textures": { + "pane": "create:block/palettes/birch_window", + "edge": "block/birch_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/birch_window_pane_noside_alt.json b/src/generated/resources/assets/create/models/block/birch_window_pane_noside_alt.json new file mode 100644 index 000000000..f841a80c7 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/birch_window_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside_alt", + "textures": { + "pane": "create:block/palettes/birch_window", + "edge": "block/birch_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/birch_window_pane_post.json b/src/generated/resources/assets/create/models/block/birch_window_pane_post.json new file mode 100644 index 000000000..32103c8ed --- /dev/null +++ b/src/generated/resources/assets/create/models/block/birch_window_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/post", + "textures": { + "pane": "create:block/palettes/birch_window", + "edge": "block/birch_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/birch_window_pane_side.json b/src/generated/resources/assets/create/models/block/birch_window_pane_side.json new file mode 100644 index 000000000..3cba631a5 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/birch_window_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side", + "textures": { + "pane": "create:block/palettes/birch_window", + "edge": "block/birch_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/birch_window_pane_side_alt.json b/src/generated/resources/assets/create/models/block/birch_window_pane_side_alt.json new file mode 100644 index 000000000..b94e8d1fa --- /dev/null +++ b/src/generated/resources/assets/create/models/block/birch_window_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side_alt", + "textures": { + "pane": "create:block/palettes/birch_window", + "edge": "block/birch_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/dark_oak_window_pane_noside.json b/src/generated/resources/assets/create/models/block/dark_oak_window_pane_noside.json new file mode 100644 index 000000000..3f3d64693 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/dark_oak_window_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside", + "textures": { + "pane": "create:block/palettes/dark_oak_window", + "edge": "block/dark_oak_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/dark_oak_window_pane_noside_alt.json b/src/generated/resources/assets/create/models/block/dark_oak_window_pane_noside_alt.json new file mode 100644 index 000000000..87ad666d0 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/dark_oak_window_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside_alt", + "textures": { + "pane": "create:block/palettes/dark_oak_window", + "edge": "block/dark_oak_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/dark_oak_window_pane_post.json b/src/generated/resources/assets/create/models/block/dark_oak_window_pane_post.json new file mode 100644 index 000000000..6b5c6eff4 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/dark_oak_window_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/post", + "textures": { + "pane": "create:block/palettes/dark_oak_window", + "edge": "block/dark_oak_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/dark_oak_window_pane_side.json b/src/generated/resources/assets/create/models/block/dark_oak_window_pane_side.json new file mode 100644 index 000000000..675a8f55e --- /dev/null +++ b/src/generated/resources/assets/create/models/block/dark_oak_window_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side", + "textures": { + "pane": "create:block/palettes/dark_oak_window", + "edge": "block/dark_oak_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/dark_oak_window_pane_side_alt.json b/src/generated/resources/assets/create/models/block/dark_oak_window_pane_side_alt.json new file mode 100644 index 000000000..8d3e9780f --- /dev/null +++ b/src/generated/resources/assets/create/models/block/dark_oak_window_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side_alt", + "textures": { + "pane": "create:block/palettes/dark_oak_window", + "edge": "block/dark_oak_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/framed_glass_pane_noside.json b/src/generated/resources/assets/create/models/block/framed_glass_pane_noside.json new file mode 100644 index 000000000..739c476a4 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/framed_glass_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/framed_glass_pane_noside_alt.json b/src/generated/resources/assets/create/models/block/framed_glass_pane_noside_alt.json new file mode 100644 index 000000000..61529cb63 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/framed_glass_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside_alt", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/framed_glass_pane_post.json b/src/generated/resources/assets/create/models/block/framed_glass_pane_post.json new file mode 100644 index 000000000..dc06fff99 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/framed_glass_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/post", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/framed_glass_pane_side.json b/src/generated/resources/assets/create/models/block/framed_glass_pane_side.json new file mode 100644 index 000000000..f9b4aec75 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/framed_glass_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/framed_glass_pane_side_alt.json b/src/generated/resources/assets/create/models/block/framed_glass_pane_side_alt.json new file mode 100644 index 000000000..3dbed7bee --- /dev/null +++ b/src/generated/resources/assets/create/models/block/framed_glass_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side_alt", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_noside.json b/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_noside.json new file mode 100644 index 000000000..739c476a4 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_noside_alt.json b/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_noside_alt.json new file mode 100644 index 000000000..61529cb63 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside_alt", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_post.json b/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_post.json new file mode 100644 index 000000000..dc06fff99 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/post", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_side.json b/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_side.json new file mode 100644 index 000000000..f9b4aec75 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_side_alt.json b/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_side_alt.json new file mode 100644 index 000000000..3dbed7bee --- /dev/null +++ b/src/generated/resources/assets/create/models/block/horizontal_framed_glass_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side_alt", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/jungle_window_pane_noside.json b/src/generated/resources/assets/create/models/block/jungle_window_pane_noside.json new file mode 100644 index 000000000..3f677c93b --- /dev/null +++ b/src/generated/resources/assets/create/models/block/jungle_window_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside", + "textures": { + "pane": "create:block/palettes/jungle_window", + "edge": "block/jungle_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/jungle_window_pane_noside_alt.json b/src/generated/resources/assets/create/models/block/jungle_window_pane_noside_alt.json new file mode 100644 index 000000000..780053de1 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/jungle_window_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside_alt", + "textures": { + "pane": "create:block/palettes/jungle_window", + "edge": "block/jungle_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/jungle_window_pane_post.json b/src/generated/resources/assets/create/models/block/jungle_window_pane_post.json new file mode 100644 index 000000000..3d7375888 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/jungle_window_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/post", + "textures": { + "pane": "create:block/palettes/jungle_window", + "edge": "block/jungle_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/jungle_window_pane_side.json b/src/generated/resources/assets/create/models/block/jungle_window_pane_side.json new file mode 100644 index 000000000..92c559b03 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/jungle_window_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side", + "textures": { + "pane": "create:block/palettes/jungle_window", + "edge": "block/jungle_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/jungle_window_pane_side_alt.json b/src/generated/resources/assets/create/models/block/jungle_window_pane_side_alt.json new file mode 100644 index 000000000..c958831a1 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/jungle_window_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side_alt", + "textures": { + "pane": "create:block/palettes/jungle_window", + "edge": "block/jungle_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oak_window_pane_noside.json b/src/generated/resources/assets/create/models/block/oak_window_pane_noside.json new file mode 100644 index 000000000..fdb8be519 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oak_window_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside", + "textures": { + "pane": "create:block/palettes/oak_window", + "edge": "block/oak_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oak_window_pane_noside_alt.json b/src/generated/resources/assets/create/models/block/oak_window_pane_noside_alt.json new file mode 100644 index 000000000..c91e78cb0 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oak_window_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside_alt", + "textures": { + "pane": "create:block/palettes/oak_window", + "edge": "block/oak_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oak_window_pane_post.json b/src/generated/resources/assets/create/models/block/oak_window_pane_post.json new file mode 100644 index 000000000..ad103e989 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oak_window_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/post", + "textures": { + "pane": "create:block/palettes/oak_window", + "edge": "block/oak_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oak_window_pane_side.json b/src/generated/resources/assets/create/models/block/oak_window_pane_side.json new file mode 100644 index 000000000..e789e472c --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oak_window_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side", + "textures": { + "pane": "create:block/palettes/oak_window", + "edge": "block/oak_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oak_window_pane_side_alt.json b/src/generated/resources/assets/create/models/block/oak_window_pane_side_alt.json new file mode 100644 index 000000000..fb558875e --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oak_window_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side_alt", + "textures": { + "pane": "create:block/palettes/oak_window", + "edge": "block/oak_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_noside.json b/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_noside.json new file mode 100644 index 000000000..60f2f448c --- /dev/null +++ b/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside", + "textures": { + "pane": "create:block/palettes/ornate_iron_window", + "edge": "create:block/palettes/ornate_iron_window_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_noside_alt.json b/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_noside_alt.json new file mode 100644 index 000000000..eb67ce24a --- /dev/null +++ b/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside_alt", + "textures": { + "pane": "create:block/palettes/ornate_iron_window", + "edge": "create:block/palettes/ornate_iron_window_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_post.json b/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_post.json new file mode 100644 index 000000000..2e2eccbb8 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/post", + "textures": { + "pane": "create:block/palettes/ornate_iron_window", + "edge": "create:block/palettes/ornate_iron_window_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_side.json b/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_side.json new file mode 100644 index 000000000..51736969c --- /dev/null +++ b/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side", + "textures": { + "pane": "create:block/palettes/ornate_iron_window", + "edge": "create:block/palettes/ornate_iron_window_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_side_alt.json b/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_side_alt.json new file mode 100644 index 000000000..39480d0d1 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/ornate_iron_window_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side_alt", + "textures": { + "pane": "create:block/palettes/ornate_iron_window", + "edge": "create:block/palettes/ornate_iron_window_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/spruce_window_pane_noside.json b/src/generated/resources/assets/create/models/block/spruce_window_pane_noside.json new file mode 100644 index 000000000..0003c4ff9 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/spruce_window_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside", + "textures": { + "pane": "create:block/palettes/spruce_window", + "edge": "block/spruce_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/spruce_window_pane_noside_alt.json b/src/generated/resources/assets/create/models/block/spruce_window_pane_noside_alt.json new file mode 100644 index 000000000..66d8da59d --- /dev/null +++ b/src/generated/resources/assets/create/models/block/spruce_window_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside_alt", + "textures": { + "pane": "create:block/palettes/spruce_window", + "edge": "block/spruce_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/spruce_window_pane_post.json b/src/generated/resources/assets/create/models/block/spruce_window_pane_post.json new file mode 100644 index 000000000..76d3b31d1 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/spruce_window_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/post", + "textures": { + "pane": "create:block/palettes/spruce_window", + "edge": "block/spruce_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/spruce_window_pane_side.json b/src/generated/resources/assets/create/models/block/spruce_window_pane_side.json new file mode 100644 index 000000000..6f6ff91bf --- /dev/null +++ b/src/generated/resources/assets/create/models/block/spruce_window_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side", + "textures": { + "pane": "create:block/palettes/spruce_window", + "edge": "block/spruce_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/spruce_window_pane_side_alt.json b/src/generated/resources/assets/create/models/block/spruce_window_pane_side_alt.json new file mode 100644 index 000000000..a5b844185 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/spruce_window_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side_alt", + "textures": { + "pane": "create:block/palettes/spruce_window", + "edge": "block/spruce_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/tiled_glass.json b/src/generated/resources/assets/create/models/block/tiled_glass.json new file mode 100644 index 000000000..72e6b81d9 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/tiled_glass.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/palettes/tiled_glass" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/tiled_glass_pane_noside.json b/src/generated/resources/assets/create/models/block/tiled_glass_pane_noside.json new file mode 100644 index 000000000..3408e54ae --- /dev/null +++ b/src/generated/resources/assets/create/models/block/tiled_glass_pane_noside.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_glass_pane_noside", + "textures": { + "pane": "create:block/palettes/tiled_glass" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/tiled_glass_pane_noside_alt.json b/src/generated/resources/assets/create/models/block/tiled_glass_pane_noside_alt.json new file mode 100644 index 000000000..f23281090 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/tiled_glass_pane_noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_glass_pane_noside_alt", + "textures": { + "pane": "create:block/palettes/tiled_glass" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/tiled_glass_pane_post.json b/src/generated/resources/assets/create/models/block/tiled_glass_pane_post.json new file mode 100644 index 000000000..4dda4cdbd --- /dev/null +++ b/src/generated/resources/assets/create/models/block/tiled_glass_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "block/template_glass_pane_post", + "textures": { + "pane": "create:block/palettes/tiled_glass", + "edge": "block/glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/tiled_glass_pane_side.json b/src/generated/resources/assets/create/models/block/tiled_glass_pane_side.json new file mode 100644 index 000000000..7e048c9da --- /dev/null +++ b/src/generated/resources/assets/create/models/block/tiled_glass_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/template_glass_pane_side", + "textures": { + "pane": "create:block/palettes/tiled_glass", + "edge": "block/glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/tiled_glass_pane_side_alt.json b/src/generated/resources/assets/create/models/block/tiled_glass_pane_side_alt.json new file mode 100644 index 000000000..ec4ca7672 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/tiled_glass_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "block/template_glass_pane_side_alt", + "textures": { + "pane": "create:block/palettes/tiled_glass", + "edge": "block/glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_noside.json b/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_noside.json new file mode 100644 index 000000000..739c476a4 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_noside_alt.json b/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_noside_alt.json new file mode 100644 index 000000000..61529cb63 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside_alt", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_post.json b/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_post.json new file mode 100644 index 000000000..dc06fff99 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/post", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_side.json b/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_side.json new file mode 100644 index 000000000..f9b4aec75 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_side_alt.json b/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_side_alt.json new file mode 100644 index 000000000..3dbed7bee --- /dev/null +++ b/src/generated/resources/assets/create/models/block/vertical_framed_glass_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side_alt", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/acacia_window_pane.json b/src/generated/resources/assets/create/models/item/acacia_window_pane.json new file mode 100644 index 000000000..c81a9ad8b --- /dev/null +++ b/src/generated/resources/assets/create/models/item/acacia_window_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/palettes/acacia_window", + "edge": "block/acacia_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/birch_window_pane.json b/src/generated/resources/assets/create/models/item/birch_window_pane.json new file mode 100644 index 000000000..2787de2c2 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/birch_window_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/palettes/birch_window", + "edge": "block/birch_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/dark_oak_window_pane.json b/src/generated/resources/assets/create/models/item/dark_oak_window_pane.json new file mode 100644 index 000000000..af9a7a235 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/dark_oak_window_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/palettes/dark_oak_window", + "edge": "block/dark_oak_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/framed_glass_pane.json b/src/generated/resources/assets/create/models/item/framed_glass_pane.json new file mode 100644 index 000000000..49799f8ae --- /dev/null +++ b/src/generated/resources/assets/create/models/item/framed_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/palettes/framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/horizontal_framed_glass_pane.json b/src/generated/resources/assets/create/models/item/horizontal_framed_glass_pane.json new file mode 100644 index 000000000..277da1008 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/horizontal_framed_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/palettes/horizontal_framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/jungle_window_pane.json b/src/generated/resources/assets/create/models/item/jungle_window_pane.json new file mode 100644 index 000000000..710f46387 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/jungle_window_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/palettes/jungle_window", + "edge": "block/jungle_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/oak_window_pane.json b/src/generated/resources/assets/create/models/item/oak_window_pane.json new file mode 100644 index 000000000..c2b9cf1b2 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/oak_window_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/palettes/oak_window", + "edge": "block/oak_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/ornate_iron_window_pane.json b/src/generated/resources/assets/create/models/item/ornate_iron_window_pane.json new file mode 100644 index 000000000..68f264fee --- /dev/null +++ b/src/generated/resources/assets/create/models/item/ornate_iron_window_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/palettes/ornate_iron_window", + "edge": "create:block/palettes/ornate_iron_window_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/spruce_window_pane.json b/src/generated/resources/assets/create/models/item/spruce_window_pane.json new file mode 100644 index 000000000..0067acd23 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/spruce_window_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/palettes/spruce_window", + "edge": "block/spruce_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/tiled_glass.json b/src/generated/resources/assets/create/models/item/tiled_glass.json new file mode 100644 index 000000000..dc525e67c --- /dev/null +++ b/src/generated/resources/assets/create/models/item/tiled_glass.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/tiled_glass" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/tiled_glass_pane.json b/src/generated/resources/assets/create/models/item/tiled_glass_pane.json new file mode 100644 index 000000000..a51fec198 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/tiled_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/palettes/tiled_glass", + "edge": "block/glass_pane_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/vertical_framed_glass_pane.json b/src/generated/resources/assets/create/models/item/vertical_framed_glass_pane.json new file mode 100644 index 000000000..71c535408 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/vertical_framed_glass_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/palettes/vertical_framed_glass", + "edge": "create:block/palettes/framed_glass_pane_top" + } +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/WindowGen.java b/src/main/java/com/simibubi/create/foundation/utility/data/WindowGen.java new file mode 100644 index 000000000..260b98c9b --- /dev/null +++ b/src/main/java/com/simibubi/create/foundation/utility/data/WindowGen.java @@ -0,0 +1,170 @@ +package com.simibubi.create.foundation.utility.data; + +import java.util.function.Function; +import java.util.function.Supplier; + +import com.simibubi.create.AllCTs; +import com.simibubi.create.Create; +import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; +import com.simibubi.create.foundation.block.connected.GlassPaneCTBehaviour; +import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour; +import com.simibubi.create.modules.palettes.ConnectedGlassBlock; +import com.simibubi.create.modules.palettes.ConnectedGlassPaneBlock; +import com.simibubi.create.modules.palettes.GlassPaneBlock; +import com.simibubi.create.modules.palettes.PalettesRegistrate; +import com.simibubi.create.modules.palettes.WindowBlock; +import com.tterrag.registrate.builders.BlockBuilder; +import com.tterrag.registrate.providers.DataGenContext; +import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import com.tterrag.registrate.util.entry.BlockEntry; +import com.tterrag.registrate.util.nullness.NonNullBiConsumer; +import com.tterrag.registrate.util.nullness.NonNullFunction; +import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; + +import net.minecraft.block.Block; +import net.minecraft.block.Block.Properties; +import net.minecraft.block.Blocks; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.generators.ModelFile; + +public class WindowGen { + + private static final PalettesRegistrate REGISTRATE = Create.palettesRegistrate(); + + public static BlockEntry woodenWindowBlock(String woodType, AllCTs ct) { + return woodenWindowBlock(woodType, ct, () -> RenderType::getCutoutMipped); + } + + public static BlockEntry customWindowBlock(String name, AllCTs ct, + Supplier> renderType) { + NonNullFunction end_texture = n -> Create.asResource(palettesDir() + name + "_end"); + NonNullFunction side_texture = n -> Create.asResource(palettesDir() + n); + return windowBlock(name, ct, renderType, end_texture, side_texture); + } + + public static BlockEntry woodenWindowBlock(String woodType, AllCTs ct, + Supplier> renderType) { + String name = woodType + "_window"; + NonNullFunction end_texture = + $ -> new ResourceLocation("block/" + woodType + "_planks"); + NonNullFunction side_texture = n -> Create.asResource(palettesDir() + n); + return windowBlock(name, ct, renderType, end_texture, side_texture); + } + + public static BlockEntry windowBlock(String name, AllCTs ct, Supplier> renderType, + NonNullFunction endTexture, NonNullFunction sideTexture) { + return REGISTRATE.block(name, WindowBlock::new) + .transform(REGISTRATE.connectedTextures(new HorizontalCTBehaviour(ct.get()))) + .addLayer(renderType) + .initialProperties(() -> Blocks.GLASS) + .blockstate((c, p) -> p.simpleBlock(c.get(), p.models() + .cubeColumn(c.getName(), sideTexture.apply(c.getName()), endTexture.apply(c.getName())))) + .simpleItem() + .register(); + } + + public static BlockEntry framedGlass(String name, ConnectedTextureBehaviour behaviour) { + return REGISTRATE.block(name, ConnectedGlassBlock::new) + .transform(REGISTRATE.connectedTextures(behaviour)) + .addLayer(() -> RenderType::getTranslucent) + .initialProperties(() -> Blocks.GLASS) + .blockstate((c, p) -> BlockStateGen.cubeAll(c, p, "palettes/", "framed_glass")) + .item() + .model((c, p) -> p.cubeColumn(c.getName(), p.modLoc(palettesDir() + c.getName()), + p.modLoc("block/palettes/framed_glass"))) + .build() + .register(); + } + + public static BlockEntry framedGlassPane(String name, AllCTs ctshift) { + ResourceLocation sideTexture = Create.asResource(palettesDir() + "framed_glass"); + ResourceLocation itemSideTexture = Create.asResource(palettesDir() + name); + ResourceLocation topTexture = Create.asResource(palettesDir() + "framed_glass_pane_top"); + Supplier> renderType = () -> RenderType::getTranslucent; + return connectedGlassPane(name, ctshift, sideTexture, itemSideTexture, topTexture, renderType); + } + + public static BlockEntry customWindowPane(String name, AllCTs ctshift, + Supplier> renderType) { + ResourceLocation topTexture = Create.asResource(palettesDir() + name + "_pane_top"); + ResourceLocation sideTexture = Create.asResource(palettesDir() + name); + return connectedGlassPane(name, ctshift, sideTexture, sideTexture, topTexture, renderType); + } + + public static BlockEntry woodenWindowPane(String woodType, AllCTs ctshift) { + return woodenWindowPane(woodType, ctshift, () -> RenderType::getCutoutMipped); + } + + public static BlockEntry woodenWindowPane(String woodType, AllCTs ctshift, + Supplier> renderType) { + String name = woodType + "_window"; + ResourceLocation topTexture = new ResourceLocation("block/" + woodType + "_planks"); + ResourceLocation sideTexture = Create.asResource(palettesDir() + name); + return connectedGlassPane(name, ctshift, sideTexture, sideTexture, topTexture, renderType); + } + + public static BlockEntry standardGlassPane(String name, ResourceLocation sideTexture, + ResourceLocation topTexture, Supplier> renderType) { + NonNullBiConsumer, RegistrateBlockstateProvider> stateProvider = + (c, p) -> p.paneBlock(c.get(), sideTexture, topTexture); + NonNullUnaryOperator> connectedTextures = b -> b; + return glassPane(name, sideTexture, topTexture, GlassPaneBlock::new, renderType, connectedTextures, + stateProvider); + } + + private static BlockEntry connectedGlassPane(String name, AllCTs ctshift, + ResourceLocation sideTexture, ResourceLocation itemSideTexture, ResourceLocation topTexture, + Supplier> renderType) { + NonNullUnaryOperator> connectedTextures = + REGISTRATE.connectedTextures(new GlassPaneCTBehaviour(ctshift.get())); + String CGPparents = "block/connected_glass_pane/"; + String prefix = name + "_pane_"; + + Function post = + getPaneModelProvider(CGPparents, prefix, "post", sideTexture, topTexture), + side = getPaneModelProvider(CGPparents, prefix, "side", sideTexture, topTexture), + sideAlt = getPaneModelProvider(CGPparents, prefix, "side_alt", sideTexture, topTexture), + noSide = getPaneModelProvider(CGPparents, prefix, "noside", sideTexture, topTexture), + noSideAlt = getPaneModelProvider(CGPparents, prefix, "noside_alt", sideTexture, topTexture); + + NonNullBiConsumer, RegistrateBlockstateProvider> stateProvider = + (c, p) -> p.paneBlock(c.get(), post.apply(p), side.apply(p), sideAlt.apply(p), noSide.apply(p), + noSideAlt.apply(p)); + + return glassPane(name, itemSideTexture, topTexture, ConnectedGlassPaneBlock::new, renderType, connectedTextures, + stateProvider); + } + + private static Function getPaneModelProvider(String CGPparents, + String prefix, String partial, ResourceLocation sideTexture, ResourceLocation topTexture) { + return p -> p.models() + .withExistingParent(prefix + partial, Create.asResource(CGPparents + partial)) + .texture("pane", sideTexture) + .texture("edge", topTexture); + } + + private static BlockEntry glassPane(String name, ResourceLocation sideTexture, + ResourceLocation topTexture, NonNullFunction factory, Supplier> renderType, + NonNullUnaryOperator> connectedTextures, + NonNullBiConsumer, RegistrateBlockstateProvider> stateProvider) { + name += "_pane"; + + return REGISTRATE.block(name, factory) + .transform(connectedTextures) + .addLayer(renderType) + .initialProperties(() -> Blocks.GLASS_PANE) + .blockstate(stateProvider) + .item() + .model((c, p) -> p.withExistingParent(c.getName(), new ResourceLocation(Create.ID, "item/pane")) + .texture("pane", sideTexture) + .texture("edge", topTexture)) + .build() + .register(); + } + + private static String palettesDir() { + return "block/palettes/"; + } + +} diff --git a/src/main/java/com/simibubi/create/modules/palettes/AllPaletteBlocks.java b/src/main/java/com/simibubi/create/modules/palettes/AllPaletteBlocks.java index b151ef898..8ba5cf236 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/AllPaletteBlocks.java +++ b/src/main/java/com/simibubi/create/modules/palettes/AllPaletteBlocks.java @@ -1,10 +1,18 @@ package com.simibubi.create.modules.palettes; +import static com.simibubi.create.foundation.utility.data.WindowGen.customWindowBlock; +import static com.simibubi.create.foundation.utility.data.WindowGen.customWindowPane; +import static com.simibubi.create.foundation.utility.data.WindowGen.framedGlass; +import static com.simibubi.create.foundation.utility.data.WindowGen.framedGlassPane; +import static com.simibubi.create.foundation.utility.data.WindowGen.woodenWindowBlock; +import static com.simibubi.create.foundation.utility.data.WindowGen.woodenWindowPane; + import com.simibubi.create.AllCTs; import com.simibubi.create.Create; import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour; import com.simibubi.create.foundation.block.connected.StandardCTBehaviour; import com.simibubi.create.foundation.utility.data.BlockStateGen; +import com.simibubi.create.foundation.utility.data.WindowGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import com.tterrag.registrate.util.entry.BlockEntry; @@ -12,8 +20,10 @@ import com.tterrag.registrate.util.nullness.NonNullBiConsumer; import net.minecraft.block.Block; import net.minecraft.block.Blocks; +import net.minecraft.block.GlassBlock; import net.minecraft.block.SandBlock; import net.minecraft.client.renderer.RenderType; +import net.minecraft.util.ResourceLocation; public class AllPaletteBlocks { @@ -21,25 +31,44 @@ public class AllPaletteBlocks { // Windows and Glass + public static final BlockEntry TILED_GLASS = REGISTRATE.block("tiled_glass", GlassBlock::new) + .initialProperties(() -> Blocks.GLASS) + .blockstate(palettesCubeAll()) + .simpleItem() + .register(); + public static final BlockEntry FRAMED_GLASS = - REGISTRATE.framedGlass("framed_glass", new StandardCTBehaviour(AllCTs.FRAMED_GLASS.get())); + framedGlass("framed_glass", new StandardCTBehaviour(AllCTs.FRAMED_GLASS.get())), + HORIZONTAL_FRAMED_GLASS = framedGlass("horizontal_framed_glass", + new HorizontalCTBehaviour(AllCTs.HORIZONTAL_FRAMED_GLASS.get(), AllCTs.FRAMED_GLASS.get())), + VERTICAL_FRAMED_GLASS = + framedGlass("vertical_framed_glass", new HorizontalCTBehaviour(AllCTs.VERTICAL_FRAMED_GLASS.get())); - public static final BlockEntry HORIZONTAL_FRAMED_GLASS = - REGISTRATE.framedGlass("horizontal_framed_glass", - new HorizontalCTBehaviour(AllCTs.HORIZONTAL_FRAMED_GLASS.get(), AllCTs.FRAMED_GLASS.get())); + public static final BlockEntry TILED_GLASS_PANE = + WindowGen.standardGlassPane("tiled_glass", Create.asResource("block/palettes/tiled_glass"), + new ResourceLocation("block/glass_pane_top"), () -> RenderType::getCutoutMipped); - public static final BlockEntry VERTICAL_FRAMED_GLASS = - REGISTRATE.framedGlass("vertical_framed_glass", new HorizontalCTBehaviour(AllCTs.VERTICAL_FRAMED_GLASS.get())); + public static final BlockEntry FRAMED_GLASS_PANE = + framedGlassPane("framed_glass", AllCTs.FRAMED_GLASS), + HORIZONTAL_FRAMED_GLASS_PANE = framedGlassPane("horizontal_framed_glass", AllCTs.HORIZONTAL_FRAMED_GLASS), + VERTICAL_FRAMED_GLASS_PANE = framedGlassPane("vertical_framed_glass", AllCTs.VERTICAL_FRAMED_GLASS); - public static final BlockEntry OAK_WINDOW = REGISTRATE.woodenWindowBlock("oak", AllCTs.OAK_WINDOW), - SPRUCE_WINDOW = REGISTRATE.woodenWindowBlock("spruce", AllCTs.SPRUCE_WINDOW), - BIRCH_WINDOW = REGISTRATE.woodenWindowBlock("birch", AllCTs.BIRCH_WINDOW, () -> RenderType::getTranslucent), - JUNGLE_WINDOW = REGISTRATE.woodenWindowBlock("jungle", AllCTs.JUNGLE_WINDOW), - ACACIA_WINDOW = REGISTRATE.woodenWindowBlock("acacia", AllCTs.ACACIA_WINDOW), - DARK_OAK_WINDOW = REGISTRATE.woodenWindowBlock("dark_oak", AllCTs.DARK_OAK_WINDOW); + public static final BlockEntry OAK_WINDOW = woodenWindowBlock("oak", AllCTs.OAK_WINDOW), + SPRUCE_WINDOW = woodenWindowBlock("spruce", AllCTs.SPRUCE_WINDOW), + BIRCH_WINDOW = woodenWindowBlock("birch", AllCTs.BIRCH_WINDOW, () -> RenderType::getTranslucent), + JUNGLE_WINDOW = woodenWindowBlock("jungle", AllCTs.JUNGLE_WINDOW), + ACACIA_WINDOW = woodenWindowBlock("acacia", AllCTs.ACACIA_WINDOW), + DARK_OAK_WINDOW = woodenWindowBlock("dark_oak", AllCTs.DARK_OAK_WINDOW), ORNATE_IRON_WINDOW = + customWindowBlock("ornate_iron_window", AllCTs.ORNATE_IRON_WINDOW, () -> RenderType::getCutoutMipped); - public static final BlockEntry ORNATE_IRON_WINDOW = - REGISTRATE.customWindowBlock("ornate_iron_window", AllCTs.ORNATE_IRON_WINDOW, () -> RenderType::getCutoutMipped); + public static final BlockEntry OAK_WINDOW_PANE = + woodenWindowPane("oak", AllCTs.OAK_WINDOW), + SPRUCE_WINDOW_PANE = woodenWindowPane("spruce", AllCTs.SPRUCE_WINDOW), + BIRCH_WINDOW_PANE = woodenWindowPane("birch", AllCTs.BIRCH_WINDOW, () -> RenderType::getTranslucent), + JUNGLE_WINDOW_PANE = woodenWindowPane("jungle", AllCTs.JUNGLE_WINDOW), + ACACIA_WINDOW_PANE = woodenWindowPane("acacia", AllCTs.ACACIA_WINDOW), + DARK_OAK_WINDOW_PANE = woodenWindowPane("dark_oak", AllCTs.DARK_OAK_WINDOW), ORNATE_IRON_WINDOW_PANE = + customWindowPane("ornate_iron_window", AllCTs.ORNATE_IRON_WINDOW, () -> RenderType::getCutoutMipped); // Vanilla stone variant patterns @@ -60,11 +89,10 @@ public class AllPaletteBlocks { // Create stone variants - public static final BlockEntry LIMESAND = - REGISTRATE.block("limesand", p -> new SandBlock(0xD7D7C7, p)) - .initialProperties(() -> Blocks.SAND) - .blockstate(palettesCubeAll()) - .register(); + public static final BlockEntry LIMESAND = REGISTRATE.block("limesand", p -> new SandBlock(0xD7D7C7, p)) + .initialProperties(() -> Blocks.SAND) + .blockstate(palettesCubeAll()) + .register(); public static final BlockEntry LIMESTONE = REGISTRATE.baseBlock("limestone", Block::new, () -> Blocks.SANDSTONE) @@ -102,12 +130,11 @@ public class AllPaletteBlocks { .simpleItem() .register()); - public static final BlockEntry NATURAL_SCORIA = - REGISTRATE.block("natural_scoria", ScoriaBlock::new) - .initialProperties(() -> Blocks.ANDESITE) - .blockstate(palettesCubeAll()) - .simpleItem() - .register(); + public static final BlockEntry NATURAL_SCORIA = REGISTRATE.block("natural_scoria", ScoriaBlock::new) + .initialProperties(() -> Blocks.ANDESITE) + .blockstate(palettesCubeAll()) + .simpleItem() + .register(); public static final BlockEntry SCORIA = REGISTRATE.baseBlock("scoria", Block::new, () -> Blocks.ANDESITE) .register(); diff --git a/src/main/java/com/simibubi/create/modules/palettes/PalettesRegistrate.java b/src/main/java/com/simibubi/create/modules/palettes/PalettesRegistrate.java index d0ae1daee..da49109c2 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/PalettesRegistrate.java +++ b/src/main/java/com/simibubi/create/modules/palettes/PalettesRegistrate.java @@ -1,28 +1,19 @@ package com.simibubi.create.modules.palettes; -import java.util.function.Supplier; - -import com.simibubi.create.AllCTs; import com.simibubi.create.Create; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.block.connected.CTModel; import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; -import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour; import com.simibubi.create.foundation.registrate.CreateRegistrateBase; -import com.simibubi.create.foundation.utility.data.BlockStateGen; import com.simibubi.create.modules.Sections; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.util.NonNullLazyValue; -import com.tterrag.registrate.util.entry.BlockEntry; import com.tterrag.registrate.util.nullness.NonNullFunction; import com.tterrag.registrate.util.nullness.NonNullSupplier; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; import net.minecraft.block.Block; import net.minecraft.block.Block.Properties; -import net.minecraft.block.Blocks; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; @@ -53,61 +44,14 @@ public class PalettesRegistrate extends CreateRegistrateBase return Sections.PALETTES; } - // Specific patterns - - public BlockEntry woodenWindowBlock(String woodType, AllCTs ct) { - return woodenWindowBlock(woodType, ct, () -> RenderType::getCutoutMipped); - } - - public BlockEntry customWindowBlock(String name, AllCTs ct, - Supplier> renderType) { - NonNullFunction end_texture = - n -> Create.asResource("block/palettes/" + name + "_end"); - NonNullFunction side_texture = n -> Create.asResource("block/palettes/" + n); - return windowBlock(name, ct, renderType, end_texture, side_texture); - } - - public BlockEntry woodenWindowBlock(String woodType, AllCTs ct, - Supplier> renderType) { - String name = woodType + "_window"; - NonNullFunction end_texture = - $ -> new ResourceLocation("block/" + woodType + "_planks"); - NonNullFunction side_texture = n -> Create.asResource("block/palettes/" + n); - return windowBlock(name, ct, renderType, end_texture, side_texture); - } - - public BlockEntry windowBlock(String name, AllCTs ct, Supplier> renderType, - NonNullFunction endTexture, NonNullFunction sideTexture) { - return block(name, WindowBlock::new) - .transform(connectedTextures(new HorizontalCTBehaviour(ct.get()))) - .addLayer(renderType) - .initialProperties(() -> Blocks.GLASS) - .blockstate((c, p) -> p.simpleBlock(c.get(), p.models() - .cubeColumn(c.getName(), sideTexture.apply(c.getName()), endTexture.apply(c.getName())))) - .simpleItem() - .register(); - } - - public BlockEntry framedGlass(String name, ConnectedTextureBehaviour behaviour) { - return block(name, ConnectedGlassBlock::new) - .transform(connectedTextures(behaviour)) - .addLayer(() -> RenderType::getTranslucent) - .initialProperties(() -> Blocks.GLASS) - .blockstate((c, p) -> BlockStateGen.cubeAll(c, p, "palettes/", "framed_glass")) - .item() - .model((c, p) -> p.cubeColumn(c.getName(), p.modLoc("block/palettes/" + c.getName()), - p.modLoc("block/palettes/framed_glass"))) - .build() - .register(); - } - - private NonNullUnaryOperator> connectedTextures( - ConnectedTextureBehaviour behavior) { + public NonNullUnaryOperator> connectedTextures( + ConnectedTextureBehaviour behavior) { return b -> b.onRegister(entry -> DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> registerModel(entry, behavior))); } - + @OnlyIn(Dist.CLIENT) private void registerModel(Block entry, ConnectedTextureBehaviour behavior) { - CreateClient.getCustomBlockModels().register(entry.delegate, model -> new CTModel(model, behavior)); + CreateClient.getCustomBlockModels() + .register(entry.delegate, model -> new CTModel(model, behavior)); } } diff --git a/src/main/resources/assets/create/blockstates/framed_glass_pane.json b/src/main/resources/assets/create/blockstates/framed_glass_pane.json deleted file mode 100644 index 5b06a185f..000000000 --- a/src/main/resources/assets/create/blockstates/framed_glass_pane.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "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/tiled_glass.json b/src/main/resources/assets/create/blockstates/tiled_glass.json deleted file mode 100644 index cc94eebd7..000000000 --- a/src/main/resources/assets/create/blockstates/tiled_glass.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/palettes/tiled_glass" } - } -} diff --git a/src/main/resources/assets/create/blockstates/tiled_glass_pane.json b/src/main/resources/assets/create/blockstates/tiled_glass_pane.json deleted file mode 100644 index 2371e27b6..000000000 --- a/src/main/resources/assets/create/blockstates/tiled_glass_pane.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "multipart": [ - { - "apply": { "model": "create:block/palettes/pane/tiled/post" } - }, - { "when": { "north": true }, - "apply": { "model": "create:block/palettes/pane/tiled/side" } - }, - { "when": { "east": true }, - "apply": { "model": "create:block/palettes/pane/tiled/side", "y": 90 } - }, - { "when": { "south": true }, - "apply": { "model": "create:block/palettes/pane/tiled/side_alt" } - }, - { "when": { "west": true }, - "apply": { "model": "create:block/palettes/pane/tiled/side_alt", "y": 90 } - }, - { "when": { "north": false }, - "apply": { "model": "create:block/palettes/pane/tiled/noside" } - }, - { "when": { "east": false }, - "apply": { "model": "create:block/palettes/pane/tiled/noside_alt" } - }, - { "when": { "south": false }, - "apply": { "model": "create:block/palettes/pane/tiled/noside_alt", "y": 90 } - }, - { "when": { "west": false }, - "apply": { "model": "create:block/palettes/pane/tiled/noside", "y": 270 } - } - ] -} 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 deleted file mode 100644 index 5b06a185f..000000000 --- a/src/main/resources/assets/create/blockstates/vertical_framed_glass_pane.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "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/window_in_a_block.json b/src/main/resources/assets/create/blockstates/window_in_a_block.json deleted file mode 100644 index 3d80c1594..000000000 --- a/src/main/resources/assets/create/blockstates/window_in_a_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "block/air" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_noside.json b/src/main/resources/assets/create/models/block/connected_glass_pane/noside.json similarity index 100% rename from src/main/resources/assets/create/models/block/template_glass_pane_noside.json rename to src/main/resources/assets/create/models/block/connected_glass_pane/noside.json diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_noside_alt.json b/src/main/resources/assets/create/models/block/connected_glass_pane/noside_alt.json similarity index 100% rename from src/main/resources/assets/create/models/block/template_glass_pane_noside_alt.json rename to src/main/resources/assets/create/models/block/connected_glass_pane/noside_alt.json diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_post.json b/src/main/resources/assets/create/models/block/connected_glass_pane/post.json similarity index 100% rename from src/main/resources/assets/create/models/block/template_glass_pane_post.json rename to src/main/resources/assets/create/models/block/connected_glass_pane/post.json diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_side.json b/src/main/resources/assets/create/models/block/connected_glass_pane/side.json similarity index 100% rename from src/main/resources/assets/create/models/block/template_glass_pane_side.json rename to src/main/resources/assets/create/models/block/connected_glass_pane/side.json diff --git a/src/main/resources/assets/create/models/block/template_glass_pane_side_alt.json b/src/main/resources/assets/create/models/block/connected_glass_pane/side_alt.json similarity index 100% rename from src/main/resources/assets/create/models/block/template_glass_pane_side_alt.json rename to src/main/resources/assets/create/models/block/connected_glass_pane/side_alt.json 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 deleted file mode 100644 index 968018a78..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/acacia/noside.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index bb15f7d35..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/acacia/noside_alt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 7fb566f36..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/acacia/post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 68b589af4..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/acacia/side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 3ce093762..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/acacia/side_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index a4461d6bc..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/birch/noside.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 6cef11fc8..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/birch/noside_alt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index ad721efa7..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/birch/post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index a06a3819a..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/birch/side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 480e1db41..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/birch/side_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 73ff4a970..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 6c11888ac..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/noside_alt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 8e2483b40..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 57b35838f..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 4a1587b11..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/dark_oak/side_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 4be41d479..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/glass/noside.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 94a226f8b..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/glass/noside_alt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 85a852cd0..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/glass/post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 44b09f7e0..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/glass/side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 772d74110..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/glass/side_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index b3bee435d..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/iron/noside.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 17eeac60f..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/iron/noside_alt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 621833c48..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/iron/post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index ca3e18292..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/iron/side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 6ac3639eb..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/iron/side_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 90b479d26..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/jungle/noside.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 310d6c49f..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/jungle/noside_alt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 0e0a5db3d..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/jungle/post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 58e36e0e6..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/jungle/side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 013a1ef5e..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/jungle/side_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index b63921435..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/oak/noside.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 6e42a3c1a..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/oak/noside_alt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index e582cccc0..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/oak/post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index ce403c8b4..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/oak/side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index da42e2d92..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/oak/side_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index f46fbbfeb..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/spruce/noside.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index a13d6bcc6..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/spruce/noside_alt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index abb6d0ea8..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/spruce/post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 98067f28b..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/spruce/side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 1623b750c..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/spruce/side_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index bfb3b3003..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/template/noside.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 194fca211..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/template/noside_alt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index acf7ff4a4..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/template/post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 88a47ff9f..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/template/side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 4b4582f4e..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/template/side_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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/pane/tiled/noside.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/noside.json deleted file mode 100644 index a11b91cf6..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/tiled/noside.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_glass_pane_noside", - "textures": { - "pane": "create:block/tiled_glass" - } -} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/tiled/noside_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/noside_alt.json deleted file mode 100644 index fd400d0e7..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/tiled/noside_alt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/template_glass_pane_noside_alt", - "textures": { - "pane": "create:block/tiled_glass" - } -} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/tiled/post.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/post.json deleted file mode 100644 index 8d40e64dc..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/tiled/post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_glass_pane_post", - "textures": { - "edge": "block/glass_pane_top", - "pane": "create:block/tiled_glass" - } -} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/tiled/side.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/side.json deleted file mode 100644 index d14ee3c2d..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/tiled/side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_glass_pane_side", - "textures": { - "edge": "block/glass_pane_top", - "pane": "create:block/tiled_glass" - } -} diff --git a/src/main/resources/assets/create/models/block/palettes/pane/tiled/side_alt.json b/src/main/resources/assets/create/models/block/palettes/pane/tiled/side_alt.json deleted file mode 100644 index 1cc938289..000000000 --- a/src/main/resources/assets/create/models/block/palettes/pane/tiled/side_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/template_glass_pane_side_alt", - "textures": { - "edge": "block/glass_pane_top", - "pane": "create:block/tiled_glass" - } -} diff --git a/src/main/resources/assets/create/models/block/palettes/tiled_glass.json b/src/main/resources/assets/create/models/block/palettes/tiled_glass.json deleted file mode 100644 index 62e9fda10..000000000 --- a/src/main/resources/assets/create/models/block/palettes/tiled_glass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/tiled_glass" - } -} 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 deleted file mode 100644 index 4ee856b67..000000000 --- a/src/main/resources/assets/create/models/item/acacia_glass_pane.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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_pane.json b/src/main/resources/assets/create/models/item/birch_glass_pane.json deleted file mode 100644 index 694da2f9d..000000000 --- a/src/main/resources/assets/create/models/item/birch_glass_pane.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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_pane.json b/src/main/resources/assets/create/models/item/dark_oak_glass_pane.json deleted file mode 100644 index b15f84f31..000000000 --- a/src/main/resources/assets/create/models/item/dark_oak_glass_pane.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 5c7debab3..000000000 --- a/src/main/resources/assets/create/models/item/framed_glass_pane.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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_pane.json b/src/main/resources/assets/create/models/item/horizontal_framed_glass_pane.json deleted file mode 100644 index c632d820c..000000000 --- a/src/main/resources/assets/create/models/item/horizontal_framed_glass_pane.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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_pane.json b/src/main/resources/assets/create/models/item/iron_glass_pane.json deleted file mode 100644 index 2758d1965..000000000 --- a/src/main/resources/assets/create/models/item/iron_glass_pane.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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_pane.json b/src/main/resources/assets/create/models/item/jungle_glass_pane.json deleted file mode 100644 index f14f5667e..000000000 --- a/src/main/resources/assets/create/models/item/jungle_glass_pane.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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_pane.json b/src/main/resources/assets/create/models/item/oak_glass_pane.json deleted file mode 100644 index 8e7be69b9..000000000 --- a/src/main/resources/assets/create/models/item/oak_glass_pane.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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/spruce_glass_pane.json b/src/main/resources/assets/create/models/item/spruce_glass_pane.json deleted file mode 100644 index 221576c36..000000000 --- a/src/main/resources/assets/create/models/item/spruce_glass_pane.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 4b8269ba7..000000000 --- a/src/main/resources/assets/create/models/item/tiled_glass_pane.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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_pane.json b/src/main/resources/assets/create/models/item/vertical_framed_glass_pane.json deleted file mode 100644 index 0ac498a9b..000000000 --- a/src/main/resources/assets/create/models/item/vertical_framed_glass_pane.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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/tiled_glass.png b/src/main/resources/assets/create/textures/block/palettes/tiled_glass.png similarity index 100% rename from src/main/resources/assets/create/textures/block/tiled_glass.png rename to src/main/resources/assets/create/textures/block/palettes/tiled_glass.png diff --git a/src/main/resources/data/create/tags/blocks/windowable.json b/src/main/resources/data/create/tags/blocks/windowable.json deleted file mode 100644 index 1cbbf1a06..000000000 --- a/src/main/resources/data/create/tags/blocks/windowable.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:stairs", - "#minecraft:wooden_stairs", - "#minecraft:wooden_slabs", - "#minecraft:slabs", - "#minecraft:walls", - "#minecraft:fences", - "#minecraft:wooden_fences", - "#forge:fences", - "#forge:fences/wooden", - "#forge:fences/nether_brick" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/glass.json b/src/main/resources/data/forge/tags/blocks/glass.json deleted file mode 100644 index 723c1db15..000000000 --- a/src/main/resources/data/forge/tags/blocks/glass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:tiled_glass" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/glass_panes.json b/src/main/resources/data/forge/tags/blocks/glass_panes.json deleted file mode 100644 index 17dc53a1a..000000000 --- a/src/main/resources/data/forge/tags/blocks/glass_panes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:tiled_glass_pane" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/glass.json b/src/main/resources/data/forge/tags/items/glass.json deleted file mode 100644 index 723c1db15..000000000 --- a/src/main/resources/data/forge/tags/items/glass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:tiled_glass" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/glass_panes.json b/src/main/resources/data/forge/tags/items/glass_panes.json deleted file mode 100644 index 03cefac89..000000000 --- a/src/main/resources/data/forge/tags/items/glass_panes.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "replace": false, - "values": [ - "create:tiled_glass_pane", - "create:framed_glass_pane", - "create:horizontal_framed_glass_pane", - "create:vertical_framed_glass_pane", - "create:oak_glass_pane", - "create:spruce_glass_pane", - "create:birch_glass_pane", - "create:jungle_glass_pane", - "create:dark_oak_glass_pane", - "create:acacia_glass_pane", - "create:iron_glass_pane" - ] -} \ No newline at end of file