From 757b65f136172613431d21bfa7db03379a6aabfc Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Thu, 26 Nov 2020 00:57:50 +0100 Subject: [PATCH] All caught up - Port recent changes to 1.16 --- .../create/blockstates/crimson_window.json | 7 ++ .../blockstates/crimson_window_pane.json | 77 ++++++++++++++++ .../assets/create/blockstates/fluid_pipe.json | 90 +++++++++---------- .../create/blockstates/radial_chassis.json | 72 +++++++-------- .../create/blockstates/warped_window.json | 7 ++ .../blockstates/warped_window_pane.json | 77 ++++++++++++++++ .../resources/assets/create/lang/en_ud.json | 4 + .../resources/assets/create/lang/en_us.json | 4 + .../assets/create/lang/unfinished/de_de.json | 6 +- .../assets/create/lang/unfinished/fr_fr.json | 6 +- .../assets/create/lang/unfinished/it_it.json | 6 +- .../assets/create/lang/unfinished/ja_jp.json | 6 +- .../assets/create/lang/unfinished/ko_kr.json | 6 +- .../assets/create/lang/unfinished/nl_nl.json | 6 +- .../assets/create/lang/unfinished/pt_br.json | 6 +- .../assets/create/lang/unfinished/ru_ru.json | 6 +- .../assets/create/lang/unfinished/zh_cn.json | 6 +- .../create/models/block/crimson_window.json | 7 ++ .../block/crimson_window_pane_noside.json | 7 ++ .../block/crimson_window_pane_noside_alt.json | 7 ++ .../block/crimson_window_pane_post.json | 7 ++ .../block/crimson_window_pane_side.json | 7 ++ .../block/crimson_window_pane_side_alt.json | 7 ++ .../create/models/block/warped_window.json | 7 ++ .../block/warped_window_pane_noside.json | 7 ++ .../block/warped_window_pane_noside_alt.json | 7 ++ .../models/block/warped_window_pane_post.json | 7 ++ .../models/block/warped_window_pane_side.json | 7 ++ .../block/warped_window_pane_side_alt.json | 7 ++ .../create/models/item/crimson_window.json | 3 + .../models/item/crimson_window_pane.json | 7 ++ .../create/models/item/warped_window.json | 3 + .../models/item/warped_window_pane.json | 7 ++ .../create.palettes/crimson_window.json | 32 +++++++ .../create.palettes/crimson_window_pane.json | 32 +++++++ .../create.palettes/warped_window.json | 32 +++++++ .../create.palettes/warped_window_pane.json | 32 +++++++ .../loot_tables/blocks/crimson_window.json | 29 ++++++ .../blocks/crimson_window_pane.json | 29 ++++++ .../loot_tables/blocks/warped_window.json | 29 ++++++ .../blocks/warped_window_pane.json | 29 ++++++ .../data/create/recipes/crimson_window.json | 19 ++++ .../create/recipes/crimson_window_pane.json | 16 ++++ .../data/create/recipes/warped_window.json | 19 ++++ .../create/recipes/warped_window_pane.json | 16 ++++ .../data/forge/tags/blocks/glass_panes.json | 2 + .../data/forge/tags/items/glass_panes.json | 2 + .../minecraft/tags/blocks/impermeable.json | 2 + .../ControlledContraptionEntity.java | 2 +- .../piston/PistonPolePlacementHelper.java | 23 ++--- .../goggles/IHaveGoggleInformation.java | 2 +- .../content/palettes/AllPaletteBlocks.java | 4 + 52 files changed, 744 insertions(+), 103 deletions(-) create mode 100644 src/generated/resources/assets/create/blockstates/crimson_window.json create mode 100644 src/generated/resources/assets/create/blockstates/crimson_window_pane.json create mode 100644 src/generated/resources/assets/create/blockstates/warped_window.json create mode 100644 src/generated/resources/assets/create/blockstates/warped_window_pane.json create mode 100644 src/generated/resources/assets/create/models/block/crimson_window.json create mode 100644 src/generated/resources/assets/create/models/block/crimson_window_pane_noside.json create mode 100644 src/generated/resources/assets/create/models/block/crimson_window_pane_noside_alt.json create mode 100644 src/generated/resources/assets/create/models/block/crimson_window_pane_post.json create mode 100644 src/generated/resources/assets/create/models/block/crimson_window_pane_side.json create mode 100644 src/generated/resources/assets/create/models/block/crimson_window_pane_side_alt.json create mode 100644 src/generated/resources/assets/create/models/block/warped_window.json create mode 100644 src/generated/resources/assets/create/models/block/warped_window_pane_noside.json create mode 100644 src/generated/resources/assets/create/models/block/warped_window_pane_noside_alt.json create mode 100644 src/generated/resources/assets/create/models/block/warped_window_pane_post.json create mode 100644 src/generated/resources/assets/create/models/block/warped_window_pane_side.json create mode 100644 src/generated/resources/assets/create/models/block/warped_window_pane_side_alt.json create mode 100644 src/generated/resources/assets/create/models/item/crimson_window.json create mode 100644 src/generated/resources/assets/create/models/item/crimson_window_pane.json create mode 100644 src/generated/resources/assets/create/models/item/warped_window.json create mode 100644 src/generated/resources/assets/create/models/item/warped_window_pane.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.palettes/crimson_window.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.palettes/crimson_window_pane.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.palettes/warped_window.json create mode 100644 src/generated/resources/data/create/advancements/recipes/create.palettes/warped_window_pane.json create mode 100644 src/generated/resources/data/create/loot_tables/blocks/crimson_window.json create mode 100644 src/generated/resources/data/create/loot_tables/blocks/crimson_window_pane.json create mode 100644 src/generated/resources/data/create/loot_tables/blocks/warped_window.json create mode 100644 src/generated/resources/data/create/loot_tables/blocks/warped_window_pane.json create mode 100644 src/generated/resources/data/create/recipes/crimson_window.json create mode 100644 src/generated/resources/data/create/recipes/crimson_window_pane.json create mode 100644 src/generated/resources/data/create/recipes/warped_window.json create mode 100644 src/generated/resources/data/create/recipes/warped_window_pane.json diff --git a/src/generated/resources/assets/create/blockstates/crimson_window.json b/src/generated/resources/assets/create/blockstates/crimson_window.json new file mode 100644 index 000000000..c6e0efa37 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/crimson_window.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/crimson_window" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/crimson_window_pane.json b/src/generated/resources/assets/create/blockstates/crimson_window_pane.json new file mode 100644 index 000000000..017e51dbf --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/crimson_window_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "create:block/crimson_window_pane_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "create:block/crimson_window_pane_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "create:block/crimson_window_pane_noside" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "create:block/crimson_window_pane_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "create:block/crimson_window_pane_noside_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "create:block/crimson_window_pane_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "create:block/crimson_window_pane_noside", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "create:block/crimson_window_pane_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "create:block/crimson_window_pane_noside_alt" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/fluid_pipe.json b/src/generated/resources/assets/create/blockstates/fluid_pipe.json index 3b646b920..9ba21b91c 100644 --- a/src/generated/resources/assets/create/blockstates/fluid_pipe.json +++ b/src/generated/resources/assets/create/blockstates/fluid_pipe.json @@ -60,9 +60,9 @@ }, { "when": { - "down": "false", "north": "true", "up": "true", + "down": "false", "south": "false" }, "apply": { @@ -71,9 +71,9 @@ }, { "when": { - "down": "false", "north": "false", "up": "true", + "down": "false", "south": "true" }, "apply": { @@ -82,9 +82,9 @@ }, { "when": { - "down": "true", "north": "true", "up": "false", + "down": "true", "south": "false" }, "apply": { @@ -93,9 +93,9 @@ }, { "when": { - "down": "true", "north": "false", "up": "false", + "down": "true", "south": "true" }, "apply": { @@ -104,9 +104,9 @@ }, { "when": { - "down": "true", "north": "false", "up": "true", + "down": "true", "south": "false" }, "apply": { @@ -115,9 +115,9 @@ }, { "when": { + "north": "false", + "up": "true", "down": "false", - "north": "false", - "up": "true", "south": "false" }, "apply": { @@ -126,9 +126,9 @@ }, { "when": { - "down": "true", "north": "false", "up": "false", + "down": "true", "south": "false" }, "apply": { @@ -137,9 +137,9 @@ }, { "when": { - "down": "false", "north": "true", "up": "false", + "down": "false", "south": "true" }, "apply": { @@ -148,9 +148,9 @@ }, { "when": { - "down": "false", "north": "true", "up": "false", + "down": "false", "south": "false" }, "apply": { @@ -159,9 +159,9 @@ }, { "when": { - "down": "false", "north": "false", "up": "false", + "down": "false", "south": "true" }, "apply": { @@ -170,9 +170,9 @@ }, { "when": { - "down": "false", "north": "false", "up": "false", + "down": "false", "south": "false" }, "apply": { @@ -182,8 +182,8 @@ { "when": { "west": "true", - "east": "false", "north": "false", + "east": "false", "south": "true" }, "apply": { @@ -193,8 +193,8 @@ { "when": { "west": "false", - "east": "true", "north": "false", + "east": "true", "south": "true" }, "apply": { @@ -204,8 +204,8 @@ { "when": { "west": "true", - "east": "false", "north": "true", + "east": "false", "south": "false" }, "apply": { @@ -215,8 +215,8 @@ { "when": { "west": "false", - "east": "true", "north": "true", + "east": "true", "south": "false" }, "apply": { @@ -226,8 +226,8 @@ { "when": { "west": "false", - "east": "false", "north": "true", + "east": "false", "south": "true" }, "apply": { @@ -237,8 +237,8 @@ { "when": { "west": "false", - "east": "false", "north": "false", + "east": "false", "south": "true" }, "apply": { @@ -248,8 +248,8 @@ { "when": { "west": "false", - "east": "false", "north": "true", + "east": "false", "south": "false" }, "apply": { @@ -259,8 +259,8 @@ { "when": { "west": "true", - "east": "true", "north": "false", + "east": "true", "south": "false" }, "apply": { @@ -270,8 +270,8 @@ { "when": { "west": "true", - "east": "false", "north": "false", + "east": "false", "south": "false" }, "apply": { @@ -281,8 +281,8 @@ { "when": { "west": "false", + "north": "false", "east": "true", - "north": "false", "south": "false" }, "apply": { @@ -292,8 +292,8 @@ { "when": { "west": "false", - "east": "false", "north": "false", + "east": "false", "south": "false" }, "apply": { @@ -303,9 +303,9 @@ { "when": { "west": "false", + "up": "true", "east": "true", - "down": "false", - "up": "true" + "down": "false" }, "apply": { "model": "create:block/fluid_pipe/lu_z" @@ -314,9 +314,9 @@ { "when": { "west": "true", + "up": "true", "east": "false", - "down": "false", - "up": "true" + "down": "false" }, "apply": { "model": "create:block/fluid_pipe/ru_z" @@ -325,9 +325,9 @@ { "when": { "west": "false", + "up": "false", "east": "true", - "down": "true", - "up": "false" + "down": "true" }, "apply": { "model": "create:block/fluid_pipe/ld_z" @@ -336,9 +336,9 @@ { "when": { "west": "true", + "up": "false", "east": "false", - "down": "true", - "up": "false" + "down": "true" }, "apply": { "model": "create:block/fluid_pipe/rd_z" @@ -347,9 +347,9 @@ { "when": { "west": "false", + "up": "true", "east": "false", - "down": "true", - "up": "true" + "down": "true" }, "apply": { "model": "create:block/fluid_pipe/ud_z" @@ -358,9 +358,9 @@ { "when": { "west": "false", + "up": "true", "east": "false", - "down": "false", - "up": "true" + "down": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_z" @@ -369,9 +369,9 @@ { "when": { "west": "false", + "up": "false", "east": "false", - "down": "true", - "up": "false" + "down": "true" }, "apply": { "model": "create:block/fluid_pipe/ud_z" @@ -380,9 +380,9 @@ { "when": { "west": "true", + "up": "false", "east": "true", - "down": "false", - "up": "false" + "down": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_z" @@ -391,9 +391,9 @@ { "when": { "west": "false", + "up": "false", "east": "true", - "down": "false", - "up": "false" + "down": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_z" @@ -402,9 +402,9 @@ { "when": { "west": "true", + "up": "false", "east": "false", - "down": "false", - "up": "false" + "down": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_z" @@ -413,9 +413,9 @@ { "when": { "west": "false", + "up": "false", "east": "false", - "down": "false", - "up": "false" + "down": "false" }, "apply": { "model": "create:block/fluid_pipe/none_z" diff --git a/src/generated/resources/assets/create/blockstates/radial_chassis.json b/src/generated/resources/assets/create/blockstates/radial_chassis.json index 04e5c08ae..c930cf0b5 100644 --- a/src/generated/resources/assets/create/blockstates/radial_chassis.json +++ b/src/generated/resources/assets/create/blockstates/radial_chassis.json @@ -29,8 +29,8 @@ }, { "when": { - "axis": "x", - "sticky_south": "true" + "sticky_south": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -39,8 +39,8 @@ }, { "when": { - "axis": "y", - "sticky_south": "true" + "sticky_south": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky" @@ -48,8 +48,8 @@ }, { "when": { - "axis": "z", - "sticky_south": "true" + "sticky_south": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -59,8 +59,8 @@ }, { "when": { - "axis": "x", - "sticky_south": "false" + "sticky_south": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -69,8 +69,8 @@ }, { "when": { - "axis": "y", - "sticky_south": "false" + "sticky_south": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y" @@ -78,8 +78,8 @@ }, { "when": { - "axis": "z", - "sticky_south": "false" + "sticky_south": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -149,8 +149,8 @@ }, { "when": { - "axis": "x", - "sticky_north": "true" + "sticky_north": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky" @@ -158,8 +158,8 @@ }, { "when": { - "axis": "y", - "sticky_north": "true" + "sticky_north": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -168,8 +168,8 @@ }, { "when": { - "axis": "z", - "sticky_north": "true" + "sticky_north": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -178,8 +178,8 @@ }, { "when": { - "axis": "x", - "sticky_north": "false" + "sticky_north": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x" @@ -187,8 +187,8 @@ }, { "when": { - "axis": "y", - "sticky_north": "false" + "sticky_north": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -197,8 +197,8 @@ }, { "when": { - "axis": "z", - "sticky_north": "false" + "sticky_north": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -207,8 +207,8 @@ }, { "when": { - "sticky_east": "true", - "axis": "x" + "axis": "x", + "sticky_east": "true" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -217,8 +217,8 @@ }, { "when": { - "sticky_east": "true", - "axis": "y" + "axis": "y", + "sticky_east": "true" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -227,8 +227,8 @@ }, { "when": { - "sticky_east": "true", - "axis": "z" + "axis": "z", + "sticky_east": "true" }, "apply": { "model": "create:block/radial_chassis_side_z_sticky" @@ -236,8 +236,8 @@ }, { "when": { - "sticky_east": "false", - "axis": "x" + "axis": "x", + "sticky_east": "false" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -246,8 +246,8 @@ }, { "when": { - "sticky_east": "false", - "axis": "y" + "axis": "y", + "sticky_east": "false" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -256,8 +256,8 @@ }, { "when": { - "sticky_east": "false", - "axis": "z" + "axis": "z", + "sticky_east": "false" }, "apply": { "model": "create:block/radial_chassis_side_z" diff --git a/src/generated/resources/assets/create/blockstates/warped_window.json b/src/generated/resources/assets/create/blockstates/warped_window.json new file mode 100644 index 000000000..682ab912f --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/warped_window.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/warped_window" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/warped_window_pane.json b/src/generated/resources/assets/create/blockstates/warped_window_pane.json new file mode 100644 index 000000000..7cf4fb592 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/warped_window_pane.json @@ -0,0 +1,77 @@ +{ + "multipart": [ + { + "apply": { + "model": "create:block/warped_window_pane_post" + } + }, + { + "when": { + "north": "true" + }, + "apply": { + "model": "create:block/warped_window_pane_side" + } + }, + { + "when": { + "north": "false" + }, + "apply": { + "model": "create:block/warped_window_pane_noside" + } + }, + { + "when": { + "south": "true" + }, + "apply": { + "model": "create:block/warped_window_pane_side_alt" + } + }, + { + "when": { + "south": "false" + }, + "apply": { + "model": "create:block/warped_window_pane_noside_alt", + "y": 90 + } + }, + { + "when": { + "west": "true" + }, + "apply": { + "model": "create:block/warped_window_pane_side_alt", + "y": 90 + } + }, + { + "when": { + "west": "false" + }, + "apply": { + "model": "create:block/warped_window_pane_noside", + "y": 270 + } + }, + { + "when": { + "east": "true" + }, + "apply": { + "model": "create:block/warped_window_pane_side", + "y": 90 + } + }, + { + "when": { + "east": "false" + }, + "apply": { + "model": "create:block/warped_window_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 a98ffe1fb..fa8fb5569 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -59,6 +59,8 @@ "block.create.creative_crate": "\u01DD\u0287\u0250\u0279\u0186 \u01DD\u028C\u0131\u0287\u0250\u01DD\u0279\u0186", "block.create.creative_fluid_tank": "\u029Eu\u0250\u27D8 p\u0131n\u05DF\u2132 \u01DD\u028C\u0131\u0287\u0250\u01DD\u0279\u0186", "block.create.creative_motor": "\u0279o\u0287oW \u01DD\u028C\u0131\u0287\u0250\u01DD\u0279\u0186", + "block.create.crimson_window": "\u028Dopu\u0131M uos\u026F\u0131\u0279\u0186", + "block.create.crimson_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M uos\u026F\u0131\u0279\u0186", "block.create.crushing_wheel": "\u05DF\u01DD\u01DD\u0265M bu\u0131\u0265sn\u0279\u0186", "block.create.crushing_wheel_controller": "\u0279\u01DD\u05DF\u05DFo\u0279\u0287uo\u0186 \u05DF\u01DD\u01DD\u0265M bu\u0131\u0265sn\u0279\u0186", "block.create.cuckoo_clock": "\u029E\u0254o\u05DF\u0186 oo\u029E\u0254n\u0186", @@ -373,6 +375,8 @@ "block.create.turntable": "\u01DD\u05DFq\u0250\u0287u\u0279n\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.warped_window": "\u028Dopu\u0131M p\u01DDd\u0279\u0250M", + "block.create.warped_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M p\u01DDd\u0279\u0250M", "block.create.water_wheel": "\u05DF\u01DD\u01DD\u0265M \u0279\u01DD\u0287\u0250M", "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", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index c4d69c991..9a59b7380 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -62,6 +62,8 @@ "block.create.creative_crate": "Creative Crate", "block.create.creative_fluid_tank": "Creative Fluid Tank", "block.create.creative_motor": "Creative Motor", + "block.create.crimson_window": "Crimson Window", + "block.create.crimson_window_pane": "Crimson Window Pane", "block.create.crushing_wheel": "Crushing Wheel", "block.create.crushing_wheel_controller": "Crushing Wheel Controller", "block.create.cuckoo_clock": "Cuckoo Clock", @@ -376,6 +378,8 @@ "block.create.turntable": "Turntable", "block.create.vertical_framed_glass": "Vertical Framed Glass", "block.create.vertical_framed_glass_pane": "Vertical Framed Glass Pane", + "block.create.warped_window": "Warped Window", + "block.create.warped_window_pane": "Warped Window Pane", "block.create.water_wheel": "Water Wheel", "block.create.weathered_limestone": "Weathered Limestone", "block.create.weathered_limestone_bricks": "Weathered Limestone Bricks", diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index a0469d075..9f7d7edc2 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1043", + "_": "Missing Localizations: 1047", "_": "->------------------------] Game Elements [------------------------<-", @@ -63,6 +63,8 @@ "block.create.creative_crate": "Bauplankanonenmacher", "block.create.creative_fluid_tank": "UNLOCALIZED: Creative Fluid Tank", "block.create.creative_motor": "UNLOCALIZED: Creative Motor", + "block.create.crimson_window": "UNLOCALIZED: Crimson Window", + "block.create.crimson_window_pane": "UNLOCALIZED: Crimson Window Pane", "block.create.crushing_wheel": "Mahlwerkrad", "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", "block.create.cuckoo_clock": "UNLOCALIZED: Cuckoo Clock", @@ -377,6 +379,8 @@ "block.create.turntable": "Drehtisch", "block.create.vertical_framed_glass": "UNLOCALIZED: Vertical Framed Glass", "block.create.vertical_framed_glass_pane": "UNLOCALIZED: Vertical Framed Glass Pane", + "block.create.warped_window": "UNLOCALIZED: Warped Window", + "block.create.warped_window_pane": "UNLOCALIZED: Warped Window Pane", "block.create.water_wheel": "Wasserrad", "block.create.weathered_limestone": "Verwitterter Kalkstein", "block.create.weathered_limestone_bricks": "Verwitterte Kalksteinziegel", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index 3827b205c..99fa2c820 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 672", + "_": "Missing Localizations: 676", "_": "->------------------------] Game Elements [------------------------<-", @@ -63,6 +63,8 @@ "block.create.creative_crate": "Créateur de schémacanon", "block.create.creative_fluid_tank": "UNLOCALIZED: Creative Fluid Tank", "block.create.creative_motor": "Moteur", + "block.create.crimson_window": "UNLOCALIZED: Crimson Window", + "block.create.crimson_window_pane": "UNLOCALIZED: Crimson Window Pane", "block.create.crushing_wheel": "Roue de concassage", "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", "block.create.cuckoo_clock": "Horloge à coucou", @@ -377,6 +379,8 @@ "block.create.turntable": "Plaque tournante", "block.create.vertical_framed_glass": "Fenêtre en verre verticale", "block.create.vertical_framed_glass_pane": "Vitre encadrée verticale", + "block.create.warped_window": "UNLOCALIZED: Warped Window", + "block.create.warped_window_pane": "UNLOCALIZED: Warped Window Pane", "block.create.water_wheel": "Roue à eau", "block.create.weathered_limestone": "Calcaire patinées", "block.create.weathered_limestone_bricks": "Briques de calcaire patinées", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index ec2e3e609..44dc59f70 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 656", + "_": "Missing Localizations: 660", "_": "->------------------------] Game Elements [------------------------<-", @@ -63,6 +63,8 @@ "block.create.creative_crate": "Creatore Cannoneschematico", "block.create.creative_fluid_tank": "UNLOCALIZED: Creative Fluid Tank", "block.create.creative_motor": "Motore", + "block.create.crimson_window": "UNLOCALIZED: Crimson Window", + "block.create.crimson_window_pane": "UNLOCALIZED: Crimson Window Pane", "block.create.crushing_wheel": "Ruota di Frantumazione", "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", "block.create.cuckoo_clock": "Orologio a Cucù", @@ -377,6 +379,8 @@ "block.create.turntable": "Piatto", "block.create.vertical_framed_glass": "Finestra Verticale Vetro", "block.create.vertical_framed_glass_pane": "Pannello di Finestra Verticale Vetro", + "block.create.warped_window": "UNLOCALIZED: Warped Window", + "block.create.warped_window_pane": "UNLOCALIZED: Warped Window Pane", "block.create.water_wheel": "Ruota d'Acqua", "block.create.weathered_limestone": "Calcare Consumato", "block.create.weathered_limestone_bricks": "Mattoni di Calcare Consumato", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index 8283f2543..044140d0c 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 655", + "_": "Missing Localizations: 659", "_": "->------------------------] Game Elements [------------------------<-", @@ -63,6 +63,8 @@ "block.create.creative_crate": "概略図砲クリエティフィアー", "block.create.creative_fluid_tank": "UNLOCALIZED: Creative Fluid Tank", "block.create.creative_motor": "モーター", + "block.create.crimson_window": "UNLOCALIZED: Crimson Window", + "block.create.crimson_window_pane": "UNLOCALIZED: Crimson Window Pane", "block.create.crushing_wheel": "破砕ホイール", "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", "block.create.cuckoo_clock": "鳩時計", @@ -377,6 +379,8 @@ "block.create.turntable": "ターンテーブル", "block.create.vertical_framed_glass": "垂直ガラス窓", "block.create.vertical_framed_glass_pane": "垂直ガラス窓板", + "block.create.warped_window": "UNLOCALIZED: Warped Window", + "block.create.warped_window_pane": "UNLOCALIZED: Warped Window Pane", "block.create.water_wheel": "水車", "block.create.weathered_limestone": "風化した石灰岩", "block.create.weathered_limestone_bricks": "風化した石灰岩レンガ", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index 67dd3c869..c62dd16b1 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 656", + "_": "Missing Localizations: 660", "_": "->------------------------] Game Elements [------------------------<-", @@ -63,6 +63,8 @@ "block.create.creative_crate": "청사진 대포 지원기", "block.create.creative_fluid_tank": "UNLOCALIZED: Creative Fluid Tank", "block.create.creative_motor": "모터", + "block.create.crimson_window": "UNLOCALIZED: Crimson Window", + "block.create.crimson_window_pane": "UNLOCALIZED: Crimson Window Pane", "block.create.crushing_wheel": "분쇄 휠", "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", "block.create.cuckoo_clock": "뻐꾸기 시계", @@ -377,6 +379,8 @@ "block.create.turntable": "돌림판", "block.create.vertical_framed_glass": "수직 유리", "block.create.vertical_framed_glass_pane": "수직 유리판", + "block.create.warped_window": "UNLOCALIZED: Warped Window", + "block.create.warped_window_pane": "UNLOCALIZED: Warped Window Pane", "block.create.water_wheel": "물레방아", "block.create.weathered_limestone": "풍화된 석회암", "block.create.weathered_limestone_bricks": "풍화된 석회암 벽돌", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index b87dccf6b..6ab71b209 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 984", + "_": "Missing Localizations: 988", "_": "->------------------------] Game Elements [------------------------<-", @@ -63,6 +63,8 @@ "block.create.creative_crate": "Bouwtekeningkannon Creatiefeerder", "block.create.creative_fluid_tank": "UNLOCALIZED: Creative Fluid Tank", "block.create.creative_motor": "UNLOCALIZED: Creative Motor", + "block.create.crimson_window": "UNLOCALIZED: Crimson Window", + "block.create.crimson_window_pane": "UNLOCALIZED: Crimson Window Pane", "block.create.crushing_wheel": "Verpulveraar", "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", "block.create.cuckoo_clock": "UNLOCALIZED: Cuckoo Clock", @@ -377,6 +379,8 @@ "block.create.turntable": "Draaischijf", "block.create.vertical_framed_glass": "UNLOCALIZED: Vertical Framed Glass", "block.create.vertical_framed_glass_pane": "UNLOCALIZED: Vertical Framed Glass Pane", + "block.create.warped_window": "UNLOCALIZED: Warped Window", + "block.create.warped_window_pane": "UNLOCALIZED: Warped Window Pane", "block.create.water_wheel": "Waterrad", "block.create.weathered_limestone": "Verweerde Kalksteen", "block.create.weathered_limestone_bricks": "Verweerde Kalksteenstenen", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index 14e55ca88..b1a20558f 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1050", + "_": "Missing Localizations: 1054", "_": "->------------------------] Game Elements [------------------------<-", @@ -63,6 +63,8 @@ "block.create.creative_crate": "Criativador Esquemaannon", "block.create.creative_fluid_tank": "UNLOCALIZED: Creative Fluid Tank", "block.create.creative_motor": "UNLOCALIZED: Creative Motor", + "block.create.crimson_window": "UNLOCALIZED: Crimson Window", + "block.create.crimson_window_pane": "UNLOCALIZED: Crimson Window Pane", "block.create.crushing_wheel": "Roda de Moer", "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", "block.create.cuckoo_clock": "UNLOCALIZED: Cuckoo Clock", @@ -377,6 +379,8 @@ "block.create.turntable": "Mesa giratória", "block.create.vertical_framed_glass": "UNLOCALIZED: Vertical Framed Glass", "block.create.vertical_framed_glass_pane": "UNLOCALIZED: Vertical Framed Glass Pane", + "block.create.warped_window": "UNLOCALIZED: Warped Window", + "block.create.warped_window_pane": "UNLOCALIZED: Warped Window Pane", "block.create.water_wheel": "Roda de Água", "block.create.weathered_limestone": "Calcário Resistido", "block.create.weathered_limestone_bricks": "Tijolos de Calcário Resistido", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index ad536d123..aec5e770e 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 325", + "_": "Missing Localizations: 329", "_": "->------------------------] Game Elements [------------------------<-", @@ -63,6 +63,8 @@ "block.create.creative_crate": "Творческий ящик", "block.create.creative_fluid_tank": "UNLOCALIZED: Creative Fluid Tank", "block.create.creative_motor": "Творческий мотор", + "block.create.crimson_window": "UNLOCALIZED: Crimson Window", + "block.create.crimson_window_pane": "UNLOCALIZED: Crimson Window Pane", "block.create.crushing_wheel": "Колесо дробления", "block.create.crushing_wheel_controller": "Контроллер колеса дробления", "block.create.cuckoo_clock": "Часы с кукушкой", @@ -377,6 +379,8 @@ "block.create.turntable": "Поворотный стол", "block.create.vertical_framed_glass": "Вертикальное обрамлённое стекло", "block.create.vertical_framed_glass_pane": "Вертикальная обрамлённая стеклянная панель", + "block.create.warped_window": "UNLOCALIZED: Warped Window", + "block.create.warped_window_pane": "UNLOCALIZED: Warped Window Pane", "block.create.water_wheel": "Водяное колесо", "block.create.weathered_limestone": "Выветренный известняк", "block.create.weathered_limestone_bricks": "Выветренный известняковый кирпич", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index 4e17d99ea..0719719ae 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 338", + "_": "Missing Localizations: 342", "_": "->------------------------] Game Elements [------------------------<-", @@ -63,6 +63,8 @@ "block.create.creative_crate": "创造板条箱", "block.create.creative_fluid_tank": "UNLOCALIZED: Creative Fluid Tank", "block.create.creative_motor": "创造马达", + "block.create.crimson_window": "UNLOCALIZED: Crimson Window", + "block.create.crimson_window_pane": "UNLOCALIZED: Crimson Window Pane", "block.create.crushing_wheel": "粉碎轮", "block.create.crushing_wheel_controller": "粉碎轮控制器", "block.create.cuckoo_clock": "布谷鸟闹钟", @@ -377,6 +379,8 @@ "block.create.turntable": "转盘", "block.create.vertical_framed_glass": "竖直边框玻璃", "block.create.vertical_framed_glass_pane": "竖直边框玻璃板", + "block.create.warped_window": "UNLOCALIZED: Warped Window", + "block.create.warped_window_pane": "UNLOCALIZED: Warped Window Pane", "block.create.water_wheel": "水车", "block.create.weathered_limestone": "风化石灰岩", "block.create.weathered_limestone_bricks": "风化石灰岩砖", diff --git a/src/generated/resources/assets/create/models/block/crimson_window.json b/src/generated/resources/assets/create/models/block/crimson_window.json new file mode 100644 index 000000000..f240fb6f9 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crimson_window.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "create:block/palettes/crimson_window", + "end": "minecraft:block/crimson_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crimson_window_pane_noside.json b/src/generated/resources/assets/create/models/block/crimson_window_pane_noside.json new file mode 100644 index 000000000..9d674fc5a --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crimson_window_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside", + "textures": { + "pane": "create:block/palettes/crimson_window", + "edge": "minecraft:block/crimson_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crimson_window_pane_noside_alt.json b/src/generated/resources/assets/create/models/block/crimson_window_pane_noside_alt.json new file mode 100644 index 000000000..cf7ff996b --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crimson_window_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside_alt", + "textures": { + "pane": "create:block/palettes/crimson_window", + "edge": "minecraft:block/crimson_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crimson_window_pane_post.json b/src/generated/resources/assets/create/models/block/crimson_window_pane_post.json new file mode 100644 index 000000000..07d86e211 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crimson_window_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/post", + "textures": { + "pane": "create:block/palettes/crimson_window", + "edge": "minecraft:block/crimson_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crimson_window_pane_side.json b/src/generated/resources/assets/create/models/block/crimson_window_pane_side.json new file mode 100644 index 000000000..9cb062af8 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crimson_window_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side", + "textures": { + "pane": "create:block/palettes/crimson_window", + "edge": "minecraft:block/crimson_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crimson_window_pane_side_alt.json b/src/generated/resources/assets/create/models/block/crimson_window_pane_side_alt.json new file mode 100644 index 000000000..023d94c84 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crimson_window_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side_alt", + "textures": { + "pane": "create:block/palettes/crimson_window", + "edge": "minecraft:block/crimson_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/warped_window.json b/src/generated/resources/assets/create/models/block/warped_window.json new file mode 100644 index 000000000..3cc929cf7 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/warped_window.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "create:block/palettes/warped_window", + "end": "minecraft:block/warped_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/warped_window_pane_noside.json b/src/generated/resources/assets/create/models/block/warped_window_pane_noside.json new file mode 100644 index 000000000..a15b3aece --- /dev/null +++ b/src/generated/resources/assets/create/models/block/warped_window_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside", + "textures": { + "pane": "create:block/palettes/warped_window", + "edge": "minecraft:block/warped_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/warped_window_pane_noside_alt.json b/src/generated/resources/assets/create/models/block/warped_window_pane_noside_alt.json new file mode 100644 index 000000000..1327e4e66 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/warped_window_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/noside_alt", + "textures": { + "pane": "create:block/palettes/warped_window", + "edge": "minecraft:block/warped_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/warped_window_pane_post.json b/src/generated/resources/assets/create/models/block/warped_window_pane_post.json new file mode 100644 index 000000000..173c9e0e6 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/warped_window_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/post", + "textures": { + "pane": "create:block/palettes/warped_window", + "edge": "minecraft:block/warped_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/warped_window_pane_side.json b/src/generated/resources/assets/create/models/block/warped_window_pane_side.json new file mode 100644 index 000000000..eaf22b0b6 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/warped_window_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side", + "textures": { + "pane": "create:block/palettes/warped_window", + "edge": "minecraft:block/warped_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/warped_window_pane_side_alt.json b/src/generated/resources/assets/create/models/block/warped_window_pane_side_alt.json new file mode 100644 index 000000000..155a66033 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/warped_window_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/connected_glass_pane/side_alt", + "textures": { + "pane": "create:block/palettes/warped_window", + "edge": "minecraft:block/warped_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/crimson_window.json b/src/generated/resources/assets/create/models/item/crimson_window.json new file mode 100644 index 000000000..cf612f7c0 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/crimson_window.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/crimson_window" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/crimson_window_pane.json b/src/generated/resources/assets/create/models/item/crimson_window_pane.json new file mode 100644 index 000000000..0fbbcc9ef --- /dev/null +++ b/src/generated/resources/assets/create/models/item/crimson_window_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/palettes/crimson_window", + "edge": "minecraft:block/crimson_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/warped_window.json b/src/generated/resources/assets/create/models/item/warped_window.json new file mode 100644 index 000000000..df090d31f --- /dev/null +++ b/src/generated/resources/assets/create/models/item/warped_window.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/warped_window" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/warped_window_pane.json b/src/generated/resources/assets/create/models/item/warped_window_pane.json new file mode 100644 index 000000000..d99c749be --- /dev/null +++ b/src/generated/resources/assets/create/models/item/warped_window_pane.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/pane", + "textures": { + "pane": "create:block/palettes/warped_window", + "edge": "minecraft:block/warped_planks" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.palettes/crimson_window.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crimson_window.json new file mode 100644 index 000000000..a366cda82 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.palettes/crimson_window.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crimson_window" + ] + }, + "criteria": { + "has_ingredient": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:crimson_planks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crimson_window" + } + } + }, + "requirements": [ + [ + "has_ingredient", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.palettes/crimson_window_pane.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/crimson_window_pane.json new file mode 100644 index 000000000..1a74a5e54 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.palettes/crimson_window_pane.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crimson_window_pane" + ] + }, + "criteria": { + "has_ingredient": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "create:crimson_window" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crimson_window_pane" + } + } + }, + "requirements": [ + [ + "has_ingredient", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.palettes/warped_window.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/warped_window.json new file mode 100644 index 000000000..0f4e7e9d4 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.palettes/warped_window.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:warped_window" + ] + }, + "criteria": { + "has_ingredient": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:warped_planks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:warped_window" + } + } + }, + "requirements": [ + [ + "has_ingredient", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.palettes/warped_window_pane.json b/src/generated/resources/data/create/advancements/recipes/create.palettes/warped_window_pane.json new file mode 100644 index 000000000..89b031cf4 --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.palettes/warped_window_pane.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:warped_window_pane" + ] + }, + "criteria": { + "has_ingredient": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "create:warped_window" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:warped_window_pane" + } + } + }, + "requirements": [ + [ + "has_ingredient", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/crimson_window.json b/src/generated/resources/data/create/loot_tables/blocks/crimson_window.json new file mode 100644 index 000000000..1b8fd7ca9 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/crimson_window.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:crimson_window" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/crimson_window_pane.json b/src/generated/resources/data/create/loot_tables/blocks/crimson_window_pane.json new file mode 100644 index 000000000..b71dc9d03 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/crimson_window_pane.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:crimson_window_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/warped_window.json b/src/generated/resources/data/create/loot_tables/blocks/warped_window.json new file mode 100644 index 000000000..b1ec0e64e --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/warped_window.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:warped_window" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/warped_window_pane.json b/src/generated/resources/data/create/loot_tables/blocks/warped_window_pane.json new file mode 100644 index 000000000..aec7abd02 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/warped_window_pane.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:warped_window_pane" + } + ], + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crimson_window.json b/src/generated/resources/data/create/recipes/crimson_window.json new file mode 100644 index 000000000..080ba00af --- /dev/null +++ b/src/generated/resources/data/create/recipes/crimson_window.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " # ", + "#X#" + ], + "key": { + "#": { + "item": "minecraft:crimson_planks" + }, + "X": { + "tag": "forge:glass/colorless" + } + }, + "result": { + "item": "create:crimson_window", + "count": 2 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crimson_window_pane.json b/src/generated/resources/data/create/recipes/crimson_window_pane.json new file mode 100644 index 000000000..9bfbb23ac --- /dev/null +++ b/src/generated/resources/data/create/recipes/crimson_window_pane.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "###" + ], + "key": { + "#": { + "item": "create:crimson_window" + } + }, + "result": { + "item": "create:crimson_window_pane", + "count": 16 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/warped_window.json b/src/generated/resources/data/create/recipes/warped_window.json new file mode 100644 index 000000000..9661b10e5 --- /dev/null +++ b/src/generated/resources/data/create/recipes/warped_window.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " # ", + "#X#" + ], + "key": { + "#": { + "item": "minecraft:warped_planks" + }, + "X": { + "tag": "forge:glass/colorless" + } + }, + "result": { + "item": "create:warped_window", + "count": 2 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/warped_window_pane.json b/src/generated/resources/data/create/recipes/warped_window_pane.json new file mode 100644 index 000000000..31b951092 --- /dev/null +++ b/src/generated/resources/data/create/recipes/warped_window_pane.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "###" + ], + "key": { + "#": { + "item": "create:warped_window" + } + }, + "result": { + "item": "create:warped_window_pane", + "count": 16 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes.json b/src/generated/resources/data/forge/tags/blocks/glass_panes.json index 5a6ace209..9ec2f3e21 100644 --- a/src/generated/resources/data/forge/tags/blocks/glass_panes.json +++ b/src/generated/resources/data/forge/tags/blocks/glass_panes.json @@ -11,6 +11,8 @@ "create:jungle_window_pane", "create:acacia_window_pane", "create:dark_oak_window_pane", + "create:crimson_window_pane", + "create:warped_window_pane", "create:ornate_iron_window_pane" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass_panes.json b/src/generated/resources/data/forge/tags/items/glass_panes.json index 5a6ace209..9ec2f3e21 100644 --- a/src/generated/resources/data/forge/tags/items/glass_panes.json +++ b/src/generated/resources/data/forge/tags/items/glass_panes.json @@ -11,6 +11,8 @@ "create:jungle_window_pane", "create:acacia_window_pane", "create:dark_oak_window_pane", + "create:crimson_window_pane", + "create:warped_window_pane", "create:ornate_iron_window_pane" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/impermeable.json b/src/generated/resources/data/minecraft/tags/blocks/impermeable.json index 4c49ba81a..598a68c11 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/impermeable.json +++ b/src/generated/resources/data/minecraft/tags/blocks/impermeable.json @@ -11,6 +11,8 @@ "create:jungle_window", "create:acacia_window", "create:dark_oak_window", + "create:crimson_window", + "create:warped_window", "create:ornate_iron_window" ] } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ControlledContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ControlledContraptionEntity.java index e05d714f5..1f7fcab9d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ControlledContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ControlledContraptionEntity.java @@ -51,7 +51,7 @@ public class ControlledContraptionEntity extends AbstractContraptionEntity { } @Override - public Vec3d getContactPointMotion(Vec3d globalContactPoint) { + public Vector3d getContactPointMotion(Vector3d globalContactPoint) { if (contraption instanceof TranslatingContraption) return getMotion(); return super.getContactPointMotion(globalContactPoint); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonPolePlacementHelper.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonPolePlacementHelper.java index 5559631e6..0669c661d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonPolePlacementHelper.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonPolePlacementHelper.java @@ -1,10 +1,13 @@ package com.simibubi.create.content.contraptions.components.structureMovement.piston; +import java.util.Arrays; + import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.Pair; import com.simibubi.create.foundation.utility.VecHelper; + import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.world.ClientWorld; @@ -13,13 +16,11 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import java.util.Arrays; - public class PistonPolePlacementHelper { @OnlyIn(Dist.CLIENT) @@ -49,29 +50,29 @@ public class PistonPolePlacementHelper { if (hitFace.getAxis() == offset.getFirst().getAxis()) return; - Vec3d hitCenter = VecHelper.getCenterOf(pos).add(new Vec3d(hitFace.getDirectionVec()).scale(0.3)); + Vector3d hitCenter = VecHelper.getCenterOf(pos).add(Vector3d.of(hitFace.getDirectionVec()).scale(0.3)); //get the two perpendicular directions to form the arrow Direction[] directions = Arrays.stream(Direction.Axis.values()).filter(axis -> axis != hitFace.getAxis() && axis != offset.getFirst().getAxis()).map(Iterate::directionsInAxis).findFirst().orElse(new Direction[]{}); - Vec3d startOffset = new Vec3d(offset.getFirst().getDirectionVec()); - Vec3d start = hitCenter.add(startOffset); + Vector3d startOffset = Vector3d.of(offset.getFirst().getDirectionVec()); + Vector3d start = hitCenter.add(startOffset); for (Direction dir : directions) { - Vec3d arrowOffset = new Vec3d(dir.getDirectionVec()).scale(.25); - Vec3d target = hitCenter.add(startOffset.scale(0.75)).add(arrowOffset); + Vector3d arrowOffset = Vector3d.of(dir.getDirectionVec()).scale(.25); + Vector3d target = hitCenter.add(startOffset.scale(0.75)).add(arrowOffset); CreateClient.outliner.showLine("poleHelp" + offset.getFirst() + dir, start, target).lineWidth(1/16f); } } // first indicates the direction that the position needs to be offset into // second indicates by how many blocks the position needs to be offset by; is 0 if there was no valid position on either end of the pole - public static Pair getPlacementOffset(World world, Direction.Axis poleAxis, BlockPos pos, Vec3d hit) { + public static Pair getPlacementOffset(World world, Direction.Axis poleAxis, BlockPos pos, Vector3d hit) { Pair offset = null; double min = Double.MAX_VALUE; - Vec3d localPos = hit.subtract(VecHelper.getCenterOf(pos)); + Vector3d localPos = hit.subtract(VecHelper.getCenterOf(pos)); //find target direction for (Direction dir : Iterate.directionsInAxis(poleAxis)) { - double distance = new Vec3d(dir.getDirectionVec()).distanceTo(localPos); + double distance = Vector3d.of(dir.getDirectionVec()).distanceTo(localPos); if (distance > min) continue; min = distance; diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java index 969a5fc95..6a12fe7f8 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java @@ -13,7 +13,7 @@ public interface IHaveGoggleInformation { DecimalFormat decimalFormat = new DecimalFormat("#.##"); public static String spacing = " "; - ITextComponent componentSpacing = new StringTextComponent(spacing); + public static ITextComponent componentSpacing = new StringTextComponent(spacing); /** * this method will be called when looking at a TileEntity that implemented this interface diff --git a/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java b/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java index 2ad7578b0..f6f75708d 100644 --- a/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java +++ b/src/main/java/com/simibubi/create/content/palettes/AllPaletteBlocks.java @@ -76,6 +76,8 @@ public class AllPaletteBlocks { JUNGLE_WINDOW = woodenWindowBlock(WoodType.JUNGLE, Blocks.JUNGLE_PLANKS), ACACIA_WINDOW = woodenWindowBlock(WoodType.ACACIA, Blocks.ACACIA_PLANKS), DARK_OAK_WINDOW = woodenWindowBlock(WoodType.DARK_OAK, Blocks.DARK_OAK_PLANKS), + CRIMSON_WINDOW = woodenWindowBlock(WoodType.CRIMSON, Blocks.CRIMSON_PLANKS), + WARPED_WINDOW = woodenWindowBlock(WoodType.WARPED, Blocks.WARPED_PLANKS), ORNATE_IRON_WINDOW = customWindowBlock("ornate_iron_window", AllItems.ANDESITE_ALLOY, AllSpriteShifts.ORNATE_IRON_WINDOW, () -> RenderType::getCutoutMipped); @@ -86,6 +88,8 @@ public class AllPaletteBlocks { JUNGLE_WINDOW_PANE = woodenWindowPane(WoodType.JUNGLE, JUNGLE_WINDOW), ACACIA_WINDOW_PANE = woodenWindowPane(WoodType.ACACIA, ACACIA_WINDOW), DARK_OAK_WINDOW_PANE = woodenWindowPane(WoodType.DARK_OAK, DARK_OAK_WINDOW), + CRIMSON_WINDOW_PANE = woodenWindowPane(WoodType.CRIMSON, CRIMSON_WINDOW), + WARPED_WINDOW_PANE = woodenWindowPane(WoodType.WARPED, WARPED_WINDOW), ORNATE_IRON_WINDOW_PANE = customWindowPane("ornate_iron_window", ORNATE_IRON_WINDOW, AllSpriteShifts.ORNATE_IRON_WINDOW, () -> RenderType::getCutoutMipped);