Late Arrivals

- Added Mangrove Windows
This commit is contained in:
simibubi 2023-05-08 18:44:24 +02:00
parent 08286e911a
commit f201e26f6b
27 changed files with 333 additions and 9 deletions

View file

@ -1,4 +1,4 @@
// 1.19.2 2023-05-08T18:06:22.2311246 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
// 1.19.2 2023-05-08T18:33:12.7571465 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json
6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json
c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json
@ -305,6 +305,8 @@ f150922cbed1c05fb3892d4ac91eb471234252e2 assets/create/blockstates/magenta_sail.
bb1ab5c70647933400b3a99ef9d166ba5e3d4709 assets/create/blockstates/magenta_seat.json
fcd226c7863262d98765c701538bf9e44d2b177e assets/create/blockstates/magenta_toolbox.json
ecf670d95969a33a738f59e08393299891f78847 assets/create/blockstates/magenta_valve_handle.json
8a30c1ed277ec60963abbcb24cce6efd162d02d3 assets/create/blockstates/mangrove_window.json
ed1afa8eec6824928332aed7f75c07ba6754c760 assets/create/blockstates/mangrove_window_pane.json
9386361f50a60bb14f397821285e64d33ed21fd2 assets/create/blockstates/mechanical_arm.json
aafb4c62ae10fd65003f05160f3e1fbddbb01c5e assets/create/blockstates/mechanical_bearing.json
be119eeeb8e0d9a9a5515dd2c49eaf91268d49b3 assets/create/blockstates/mechanical_crafter.json
@ -582,8 +584,8 @@ b0d8f08968763a5f74e5cd5644377a76a9f39753 assets/create/blockstates/yellow_toolbo
fe8c497aacc641c2f01cec90bba9f19e59cc2ed2 assets/create/blockstates/yellow_valve_handle.json
e819e93fdcbe9fd9c050a052d2718ff3b3539365 assets/create/blockstates/zinc_block.json
64121dcb216381c83b4fe28aa361ea07c24c9ad0 assets/create/blockstates/zinc_ore.json
6c3df97e22df92ea8bd338b564f7e311345d0277 assets/create/lang/en_ud.json
f55c05ea74b1450d97d95384b899aea28d7e270f assets/create/lang/en_us.json
4fbf6fad8444b526c35552e8cae76fac037dcb6a assets/create/lang/en_ud.json
9c63efe509cff853228fd2626f0ec48085a206d5 assets/create/lang/en_us.json
a97e1060e00ae701a02e39cd4ef8054cf345fac4 assets/create/models/block/acacia_window.json
103e032c0b1a0a6a27c67da8c91179a564bd281c assets/create/models/block/acacia_window_pane_noside.json
fb00b627abda76ad4fea867ca57dbfadd24fffa3 assets/create/models/block/acacia_window_pane_noside_alt.json
@ -1181,6 +1183,12 @@ f885acc0ba705cfa9c65b62626ab4007f3b6e329 assets/create/models/block/linear_chass
b5cd13b021400b3c37499ec4ef22e560c721ac54 assets/create/models/block/magenta_seat.json
d7b2b16ba2d6a0b2441aeaf7faa76f61fbdc35e7 assets/create/models/block/magenta_toolbox.json
c0d29851d48cebd376b3b6e8f0454e0369d0e265 assets/create/models/block/magenta_valve_handle.json
026384a699d592160624bb7a1606e31fb77751be assets/create/models/block/mangrove_window.json
fefcd6368357f1ad324b07a082fcd059900e0a39 assets/create/models/block/mangrove_window_pane_noside.json
166268a91f073f60e86af3e39a85dc0f4eb23368 assets/create/models/block/mangrove_window_pane_noside_alt.json
cf77590316c06bfea1c11fb39626f49888bf61b6 assets/create/models/block/mangrove_window_pane_post.json
dfd365f73424f4ffd1915822ae0c4d5538922ed1 assets/create/models/block/mangrove_window_pane_side.json
a8fb21f2d2f10b0c46bea41c9dd41eb9c5a9c5fe assets/create/models/block/mangrove_window_pane_side_alt.json
5a6d44dbf914c22065d8f32519defc93ce124c49 assets/create/models/block/mechanical_bearing.json
2f040681214af58a97e70d3a6e77a0fc2e02c624 assets/create/models/block/nixie_tube.json
e298cb8398f551c5af5f563f95123b18f39d4753 assets/create/models/block/oak_window.json
@ -1986,6 +1994,8 @@ d0f4148bdb0a905e68f54b5dfd829fd47e528fea assets/create/models/item/lime_valve_ha
ad6fd371ee989c9c3c21e762273e8a4e903f0af8 assets/create/models/item/magenta_seat.json
7c0e3f91e5ab029473736deffb2b2aab9d4763c7 assets/create/models/item/magenta_toolbox.json
6d82582e5afea919927606b20a74cbda5223956f assets/create/models/item/magenta_valve_handle.json
a4ecba2ee36699401de661b89065bf0738487a87 assets/create/models/item/mangrove_window.json
474c896c4ca4e6547fac225cc204bbc0b287c5ea assets/create/models/item/mangrove_window_pane.json
d5b1665cdcf03baef41a8d3fbbdcc747cd6867f8 assets/create/models/item/mechanical_arm.json
95d437fffd455e5a22d288bb7683fbdce211fa8a assets/create/models/item/mechanical_bearing.json
08dcab9d0cdb7fb6426b8dee508eecc3f5d71fb1 assets/create/models/item/mechanical_crafter.json
@ -2666,6 +2676,8 @@ e5feef288669aa930ae12cf9a783d620af7d91b4 data/create/advancements/recipes/create
dfb4f2e119b8017d5db975fb541713048703e2c6 data/create/advancements/recipes/create.palettes/layered_veridium_from_stone_types_veridium_stonecutting.json
395ac94e392ba5e84588593808411b58439fa00b data/create/advancements/recipes/create.palettes/limestone_from_stone_types_limestone_stonecutting.json
de18b7fbe72ebab8664dc8bad74b11c8f963d201 data/create/advancements/recipes/create.palettes/limestone_pillar_from_stone_types_limestone_stonecutting.json
297cef748e21b0615fba6d89e917ca95744eb72c data/create/advancements/recipes/create.palettes/mangrove_window.json
caae52c615f4f73e6197a0f64530d65e032ee86c data/create/advancements/recipes/create.palettes/mangrove_window_pane.json
72a0bf990de9157649f4a35d107691336ac251cd data/create/advancements/recipes/create.palettes/oak_window.json
0df92ddbd45927fffcd6e7dd64e23a9c1a480987 data/create/advancements/recipes/create.palettes/oak_window_pane.json
3af97ef889363105d623983041bc542e42262a81 data/create/advancements/recipes/create.palettes/ochrum_from_stone_types_ochrum_stonecutting.json
@ -3233,6 +3245,8 @@ f4a50c2bcfc2483168a661d5af233bd043d1ea51 data/create/loot_tables/blocks/magenta_
ccae04c0e944f9f3909c3210ae3eb910207cd57c data/create/loot_tables/blocks/magenta_seat.json
dbdcad9959ec94b2f214f121a0361f2eeac5cab9 data/create/loot_tables/blocks/magenta_toolbox.json
6020e533ed7121ee33409a4422a8098295af49d0 data/create/loot_tables/blocks/magenta_valve_handle.json
acb87cf1aa3236529a9322e3d04155da16747e1f data/create/loot_tables/blocks/mangrove_window.json
544741628cabdf548d6185bd1e1b3d2675a7c7bb data/create/loot_tables/blocks/mangrove_window_pane.json
e86b6745d61732cfd95356df84e71cae8b9be10d data/create/loot_tables/blocks/mechanical_arm.json
6ffb8f41c3c42d57c9ff9ce8520b2327f51e2731 data/create/loot_tables/blocks/mechanical_bearing.json
1f166934a75ea3d1bdcf65394632636e6f9cf5ff data/create/loot_tables/blocks/mechanical_crafter.json
@ -3882,6 +3896,8 @@ efcbb602a5274a037af323bf5ef40756cbb8683c data/create/recipes/layered_tuff_from_s
6861c7c7d75d669a948a3dc617137759fb387d49 data/create/recipes/layered_veridium_from_stone_types_veridium_stonecutting.json
9882a276da633a82f42cbd809c0a104d2137f7ca data/create/recipes/limestone_from_stone_types_limestone_stonecutting.json
923e6a5bec0018849c1bf9e5714195ab7f839f44 data/create/recipes/limestone_pillar_from_stone_types_limestone_stonecutting.json
7bc8b7787f0e60e521c68953607b8851a53294f4 data/create/recipes/mangrove_window.json
2ea63a3c31aa3b4e2ea2620e24a23ee9c3044421 data/create/recipes/mangrove_window_pane.json
106f5e57b11aeb799eef2d485c047701e23adad6 data/create/recipes/oak_window.json
050fab7045837fef1a2c7c2471058b641f0c99fc data/create/recipes/oak_window_pane.json
9e1eaa83597afe00485940018be874885f02b1f7 data/create/recipes/ochrum_from_stone_types_ochrum_stonecutting.json
@ -4199,7 +4215,7 @@ da739ad2160e7df4e0e5cc89587670ce5e9450c3 data/create/tags/items/valve_handles.js
03989b943d729293db75c8f681c490c55f594d53 data/create/tags/items/vanilla_stripped_logs.json
a82f75a9af4c0b28f08de8dfcaea2dce2accda28 data/create/tags/items/vanilla_stripped_wood.json
10d5f0c1763f80860a39398ecc33dbbe43099471 data/forge/tags/blocks/glass/colorless.json
3101d4cdeb57fae0e777ed7a773eccbd7d757b76 data/forge/tags/blocks/glass_panes.json
de1fc89be6a52473d526d3efe0204b9b8489058c data/forge/tags/blocks/glass_panes.json
81b107ada9c6ac5679a21f8c6a006bf230f69c39 data/forge/tags/blocks/ores.json
81b107ada9c6ac5679a21f8c6a006bf230f69c39 data/forge/tags/blocks/ores/zinc.json
e475ad1c52bffedfc544e5331a87c1f5c45149fd data/forge/tags/blocks/ores_in_ground/deepslate.json
@ -4219,7 +4235,7 @@ cca816b34ac2e9b7933df680aa9778ff2cfe9605 data/forge/tags/fluids/tea.json
745512f10c4ba52f2c224607377e41011fb2ecfe data/forge/tags/items/flour.json
745512f10c4ba52f2c224607377e41011fb2ecfe data/forge/tags/items/flour/wheat.json
10d5f0c1763f80860a39398ecc33dbbe43099471 data/forge/tags/items/glass/colorless.json
3101d4cdeb57fae0e777ed7a773eccbd7d757b76 data/forge/tags/items/glass_panes.json
de1fc89be6a52473d526d3efe0204b9b8489058c data/forge/tags/items/glass_panes.json
01d32d3b7b033aff44c047bf289d696de0b0c715 data/forge/tags/items/ingots.json
5a7bffd1d604bc6ea8b35714ef02b95773240f90 data/forge/tags/items/ingots/brass.json
ccf5b08295f6362a3f6b3b595f1de1bba4b224ec data/forge/tags/items/ingots/zinc.json
@ -4252,7 +4268,7 @@ c741ba83b562ae3459d7c4f2db69537f549ea411 data/forge/tags/items/tools/wrench.json
82274e06b6a9f3bfd83c8b59be38dee4a15b8bf3 data/minecraft/tags/blocks/climbable.json
71aef080a900d9e86818cf579438c3d826d6567e data/minecraft/tags/blocks/doors.json
515a1c773e617dd7e38aa1b893acc7db2dd30e08 data/minecraft/tags/blocks/dripstone_replaceable_blocks.json
84c712d8f5ec8ba4e0d9de9a0485af5115a5cfe2 data/minecraft/tags/blocks/impermeable.json
e3321ff14704c031a2c16953b7e391f4f24dd70b data/minecraft/tags/blocks/impermeable.json
515a1c773e617dd7e38aa1b893acc7db2dd30e08 data/minecraft/tags/blocks/lush_ground_replaceable.json
5a030817b2322e363edc8f5376f7c9de73df8b48 data/minecraft/tags/blocks/mineable/axe.json
e7d7eb2ad92056c587caf7e0dd691315241845e8 data/minecraft/tags/blocks/mineable/pickaxe.json

View file

@ -1,2 +1,2 @@
// 1.19.2 2023-05-08T18:06:22.2301281 Create's lang merger
e911c27c508c1d67d4c915daeccfa9d9f0afba81 assets/create/lang/en_us.json
// 1.19.2 2023-05-08T18:33:12.7561491 Create's lang merger
ea950145f523432317da10a40a1f761bcb10a8dd assets/create/lang/en_us.json

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "create:block/mangrove_window"
}
}
}

View file

@ -0,0 +1,77 @@
{
"multipart": [
{
"apply": {
"model": "create:block/mangrove_window_pane_post"
}
},
{
"apply": {
"model": "create:block/mangrove_window_pane_side"
},
"when": {
"north": "true"
}
},
{
"apply": {
"model": "create:block/mangrove_window_pane_noside"
},
"when": {
"north": "false"
}
},
{
"apply": {
"model": "create:block/mangrove_window_pane_side_alt"
},
"when": {
"south": "true"
}
},
{
"apply": {
"model": "create:block/mangrove_window_pane_noside_alt",
"y": 90
},
"when": {
"south": "false"
}
},
{
"apply": {
"model": "create:block/mangrove_window_pane_side_alt",
"y": 90
},
"when": {
"west": "true"
}
},
{
"apply": {
"model": "create:block/mangrove_window_pane_noside",
"y": 270
},
"when": {
"west": "false"
}
},
{
"apply": {
"model": "create:block/mangrove_window_pane_side",
"y": 90
},
"when": {
"east": "true"
}
},
{
"apply": {
"model": "create:block/mangrove_window_pane_noside_alt"
},
"when": {
"east": "false"
}
}
]
}

View file

@ -305,6 +305,8 @@
"block.create.magenta_seat": "ʇɐǝS ɐʇuǝbɐW",
"block.create.magenta_toolbox": "xoqןoo⟘ ɐʇuǝbɐW",
"block.create.magenta_valve_handle": ןpuɐH ǝʌןɐΛ ɐʇuǝbɐW",
"block.create.mangrove_window": "ʍopuıM ǝʌoɹbuɐW",
"block.create.mangrove_window_pane": "ǝuɐԀ ʍopuıM ǝʌoɹbuɐW",
"block.create.mechanical_arm": "ɯɹⱯ ןɐɔıuɐɥɔǝW",
"block.create.mechanical_bearing": "buıɹɐǝᗺ ןɐɔıuɐɥɔǝW",
"block.create.mechanical_crafter": "ɹǝʇɟɐɹƆ ןɐɔıuɐɥɔǝW",

View file

@ -308,6 +308,8 @@
"block.create.magenta_seat": "Magenta Seat",
"block.create.magenta_toolbox": "Magenta Toolbox",
"block.create.magenta_valve_handle": "Magenta Valve Handle",
"block.create.mangrove_window": "Mangrove Window",
"block.create.mangrove_window_pane": "Mangrove Window Pane",
"block.create.mechanical_arm": "Mechanical Arm",
"block.create.mechanical_bearing": "Mechanical Bearing",
"block.create.mechanical_crafter": "Mechanical Crafter",

View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "minecraft:block/mangrove_planks",
"side": "create:block/palettes/mangrove_window"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "create:block/connected_glass_pane/noside",
"textures": {
"edge": "minecraft:block/mangrove_planks",
"pane": "create:block/palettes/mangrove_window"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "create:block/connected_glass_pane/noside_alt",
"textures": {
"edge": "minecraft:block/mangrove_planks",
"pane": "create:block/palettes/mangrove_window"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "create:block/connected_glass_pane/post",
"textures": {
"edge": "minecraft:block/mangrove_planks",
"pane": "create:block/palettes/mangrove_window"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "create:block/connected_glass_pane/side",
"textures": {
"edge": "minecraft:block/mangrove_planks",
"pane": "create:block/palettes/mangrove_window"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "create:block/connected_glass_pane/side_alt",
"textures": {
"edge": "minecraft:block/mangrove_planks",
"pane": "create:block/palettes/mangrove_window"
}
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/mangrove_window"
}

View file

@ -0,0 +1,7 @@
{
"parent": "create:item/pane",
"textures": {
"edge": "minecraft:block/mangrove_planks",
"pane": "create:block/palettes/mangrove_window"
}
}

View file

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingredient": {
"conditions": {
"items": [
{
"items": [
"minecraft:mangrove_planks"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "create:mangrove_window"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_ingredient",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"create:mangrove_window"
]
}
}

View file

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingredient": {
"conditions": {
"items": [
{
"items": [
"create:mangrove_window"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "create:mangrove_window_pane"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_ingredient",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"create:mangrove_window_pane"
]
}
}

View file

@ -0,0 +1,30 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"entries": [
{
"type": "minecraft:item",
"name": "create:mangrove_window"
}
],
"rolls": 1.0
}
]
}

View file

@ -0,0 +1,30 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"entries": [
{
"type": "minecraft:item",
"name": "create:mangrove_window_pane"
}
],
"rolls": 1.0
}
]
}

View file

@ -0,0 +1,19 @@
{
"type": "minecraft:crafting_shaped",
"key": {
"#": {
"item": "minecraft:mangrove_planks"
},
"X": {
"tag": "forge:glass/colorless"
}
},
"pattern": [
" # ",
"#X#"
],
"result": {
"count": 2,
"item": "create:mangrove_window"
}
}

View file

@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shaped",
"key": {
"#": {
"item": "create:mangrove_window"
}
},
"pattern": [
"###",
"###"
],
"result": {
"count": 16,
"item": "create:mangrove_window_pane"
}
}

View file

@ -10,6 +10,7 @@
"create:jungle_window_pane",
"create:acacia_window_pane",
"create:dark_oak_window_pane",
"create:mangrove_window_pane",
"create:crimson_window_pane",
"create:warped_window_pane",
"create:ornate_iron_window_pane"

View file

@ -10,6 +10,7 @@
"create:jungle_window_pane",
"create:acacia_window_pane",
"create:dark_oak_window_pane",
"create:mangrove_window_pane",
"create:crimson_window_pane",
"create:warped_window_pane",
"create:ornate_iron_window_pane"

View file

@ -10,6 +10,7 @@
"create:jungle_window",
"create:acacia_window",
"create:dark_oak_window",
"create:mangrove_window",
"create:crimson_window",
"create:warped_window",
"create:ornate_iron_window"

View file

@ -85,7 +85,7 @@ public class AllSpriteShifts {
private static void populateMaps() {
WoodType[] supportedWoodTypes = new WoodType[] { WoodType.OAK, WoodType.SPRUCE, WoodType.BIRCH, WoodType.ACACIA,
WoodType.JUNGLE, WoodType.DARK_OAK, WoodType.CRIMSON, WoodType.WARPED };
WoodType.JUNGLE, WoodType.DARK_OAK, WoodType.MANGROVE, WoodType.CRIMSON, WoodType.WARPED };
Arrays.stream(supportedWoodTypes)
.forEach(woodType -> WOODEN_WINDOWS.put(woodType, vertical("palettes/" + woodType.name() + "_window")));

View file

@ -71,6 +71,7 @@ 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),
MANGROVE_WINDOW = woodenWindowBlock(WoodType.MANGROVE, Blocks.MANGROVE_PLANKS),
CRIMSON_WINDOW = woodenWindowBlock(WoodType.CRIMSON, Blocks.CRIMSON_PLANKS),
WARPED_WINDOW = woodenWindowBlock(WoodType.WARPED, Blocks.WARPED_PLANKS),
ORNATE_IRON_WINDOW =
@ -84,6 +85,7 @@ 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),
MANGROVE_WINDOW_PANE = woodenWindowPane(WoodType.MANGROVE, MANGROVE_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,

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 372 B