From a5e666d85ed3630287de2f5a9a2ee17b913d9599 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Wed, 5 Aug 2020 00:41:07 +0200 Subject: [PATCH] casings, indeed. - Implemented the new casing variants - Fixed missing particle textures on cogwheels - Implemented Copper Tiles --- src/generated/resources/.cache/cache | 43 +++++-- .../create/blockstates/copper_tiles.json | 28 +++++ .../assets/create/blockstates/fluid_pipe.json | 110 +++++++++--------- .../blockstates/refined_radiance_casing.json | 7 ++ .../blockstates/shadow_steel_casing.json | 7 ++ .../resources/assets/create/lang/en_ud.json | 3 + .../resources/assets/create/lang/en_us.json | 3 + .../assets/create/lang/unfinished/de_de.json | 5 +- .../assets/create/lang/unfinished/fr_fr.json | 5 +- .../assets/create/lang/unfinished/it_it.json | 5 +- .../assets/create/lang/unfinished/ja_jp.json | 5 +- .../assets/create/lang/unfinished/ko_kr.json | 5 +- .../assets/create/lang/unfinished/nl_nl.json | 5 +- .../assets/create/lang/unfinished/pt_br.json | 5 +- .../assets/create/lang/unfinished/ru_ru.json | 5 +- .../assets/create/lang/unfinished/zh_cn.json | 5 +- .../models/block/oxidized/copper_tiles_0.json | 6 + .../models/block/oxidized/copper_tiles_1.json | 6 + .../models/block/oxidized/copper_tiles_2.json | 6 + .../models/block/oxidized/copper_tiles_3.json | 6 + .../models/block/oxidized/copper_tiles_4.json | 6 + .../models/block/oxidized/copper_tiles_5.json | 6 + .../models/block/oxidized/copper_tiles_6.json | 6 + .../models/block/oxidized/copper_tiles_7.json | 6 + .../models/block/refined_radiance_casing.json | 6 + .../models/block/shadow_steel_casing.json | 6 + .../create/models/item/copper_tiles.json | 3 + .../models/item/refined_radiance_casing.json | 3 + .../models/item/shadow_steel_casing.json | 3 + .../loot_tables/blocks/copper_tiles.json | 19 +++ .../blocks/refined_radiance_casing.json | 19 +++ .../blocks/shadow_steel_casing.json | 19 +++ .../java/com/simibubi/create/AllBlocks.java | 44 +++++-- .../com/simibubi/create/AllSpriteShifts.java | 4 +- .../assets/create/models/block/cogwheel.json | 2 +- .../create/models/block/large_cogwheel.json | 1 + ...eel_casing.png => shadow_steel_casing.png} | Bin ....png => shadow_steel_casing_connected.png} | Bin 38 files changed, 333 insertions(+), 90 deletions(-) create mode 100644 src/generated/resources/assets/create/blockstates/copper_tiles.json create mode 100644 src/generated/resources/assets/create/blockstates/refined_radiance_casing.json create mode 100644 src/generated/resources/assets/create/blockstates/shadow_steel_casing.json create mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_tiles_0.json create mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_tiles_1.json create mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_tiles_2.json create mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_tiles_3.json create mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_tiles_4.json create mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_tiles_5.json create mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_tiles_6.json create mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_tiles_7.json create mode 100644 src/generated/resources/assets/create/models/block/refined_radiance_casing.json create mode 100644 src/generated/resources/assets/create/models/block/shadow_steel_casing.json create mode 100644 src/generated/resources/assets/create/models/item/copper_tiles.json create mode 100644 src/generated/resources/assets/create/models/item/refined_radiance_casing.json create mode 100644 src/generated/resources/assets/create/models/item/shadow_steel_casing.json create mode 100644 src/generated/resources/data/create/loot_tables/blocks/copper_tiles.json create mode 100644 src/generated/resources/data/create/loot_tables/blocks/refined_radiance_casing.json create mode 100644 src/generated/resources/data/create/loot_tables/blocks/shadow_steel_casing.json rename src/main/resources/assets/create/textures/block/{shadowsteel_casing.png => shadow_steel_casing.png} (100%) rename src/main/resources/assets/create/textures/block/{shadowsteel_casing_connected.png => shadow_steel_casing_connected.png} (100%) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 6b94b1566..71f3b472a 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -49,6 +49,7 @@ f8eff64c75fc599e9a44a003f54ae9931cd8ce7c assets/create/blockstates/copper_block. cabf6b8c59eb0e3d56a0a5a856ca058bb3200882 assets/create/blockstates/copper_casing.json 3355a852cdc717e257ca19b3db836068964733e3 assets/create/blockstates/copper_ore.json dc76bca1fdd41c8e6ada27fd59a2b73d7adc9596 assets/create/blockstates/copper_shingles.json +ecf4a72411870bfdbf8a59469b114cd77621c343 assets/create/blockstates/copper_tiles.json 3df0d5d5170a2f6cbab0f8a9bc8f2d64229589af assets/create/blockstates/creative_crate.json f0031f5e970b3d5695472ed384950b8631b015ed assets/create/blockstates/creative_motor.json fe2f78b94c20944399101e7369e2d43324297fb6 assets/create/blockstates/crushing_wheel.json @@ -128,7 +129,7 @@ de8a40b7daf1497d5aecee47a43b3e0b1d030b00 assets/create/blockstates/fancy_scoria_ fc9ac0a7e7191b93516719455a17177fa6524ecc assets/create/blockstates/fancy_weathered_limestone_bricks_slab.json b2a7c321b1795f20e7433f81a55ce4683de081b8 assets/create/blockstates/fancy_weathered_limestone_bricks_stairs.json 6372fe02ba0065acb0758121c45a15a1a8fdc5de assets/create/blockstates/fancy_weathered_limestone_bricks_wall.json -3df164be441c87d6f869b34b5ab48b6822892ad6 assets/create/blockstates/fluid_pipe.json +fe9169716dd21a81a3710a89f0a9b7ea4dcd4d51 assets/create/blockstates/fluid_pipe.json f0eaab18e16c4f3f65ebf3b55b08f0dc445720fe assets/create/blockstates/fluid_tank.json e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets/create/blockstates/flywheel.json ac00d40e1ef50a37041c0481afa1a23a14dea78e assets/create/blockstates/framed_glass.json @@ -304,6 +305,7 @@ e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets/create/blockstates/powered_toggl da1b08387af7afa0855ee8d040f620c01f20660a assets/create/blockstates/red_seat.json 8929677f2cc5354aa19ef182af69f9f0b41eb242 assets/create/blockstates/redstone_contact.json c29213b77ac0c78d8979c5f6188d2b265696f9b9 assets/create/blockstates/redstone_link.json +b76ed5f6d271349b2509708c11e713bb299a57b6 assets/create/blockstates/refined_radiance_casing.json 1eac804cba08aebb5f4646758ae1ef9b32e01365 assets/create/blockstates/reinforced_rail.json e2990fe70ad5d10437a376e70e167d1856277cc1 assets/create/blockstates/rope.json e14d5f7252105934295b4e156ec0e6d62d3d6b1c assets/create/blockstates/rope_pulley.json @@ -322,6 +324,7 @@ b6e50f46a02f833f2f2bafa8585a909b6da5e229 assets/create/blockstates/scoria_cobble 46641fdbc6bdc05829153bc28efb90cae26a51f8 assets/create/blockstates/scoria_pillar.json 89e10f35b93b5c72dd235eb79e5fc6f3655027a1 assets/create/blockstates/secondary_linear_chassis.json 81931eb1027dfb42ba4b2186185a4c0a36e0dbe4 assets/create/blockstates/sequenced_gearshift.json +c4c3613ad353e721e7109628aa06ab0664d0862b assets/create/blockstates/shadow_steel_casing.json 79ae6d86a829b9ce82fce68a6377d3810fcfcb10 assets/create/blockstates/shaft.json e815bfd854c2653f10828bb11950f7fb991d7efc assets/create/blockstates/speedometer.json d62b7908119fa4f51715a186d0882b388bb25cab assets/create/blockstates/spruce_window.json @@ -354,17 +357,17 @@ c77b46d8b459e5c7cc495393546f3fcca8a1fa1d assets/create/blockstates/weathered_lim a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json -0f82b1cb0f026895a75feb06fba8c33b44d14711 assets/create/lang/en_ud.json -0c28bf9b20b27caa23ec5eb0cf77b3557cc07f19 assets/create/lang/en_us.json -2adfeab7ad690f28e21c885f5952d285430df646 assets/create/lang/unfinished/de_de.json -4faaa837fc1c9aa2734c4462970626cb7f8de9a8 assets/create/lang/unfinished/fr_fr.json -b2d7fac85167362bfed655394fe7a7ed31d76929 assets/create/lang/unfinished/it_it.json -57813585da4b9b3605c557ddc044cfd9839049eb assets/create/lang/unfinished/ja_jp.json -5349034d41e56df04d7c54bef0e17ee5941c8de4 assets/create/lang/unfinished/ko_kr.json -20b02ad64a22d931e62ad32bc880ba9a8b6b44f3 assets/create/lang/unfinished/nl_nl.json -321cf5d17bd7f881675125ac2b3ec79d85b2d364 assets/create/lang/unfinished/pt_br.json -8a23811e1d9fd60a96611071d140038e64977826 assets/create/lang/unfinished/ru_ru.json -06f2a0836d475ba095e8fcc11d5be4626c2eb11b assets/create/lang/unfinished/zh_cn.json +da8ae8561b7827b4aca53ef32f2dd3860a39fba1 assets/create/lang/en_ud.json +bf48621dfa7345a765c6a1e1c6a39689ddefd965 assets/create/lang/en_us.json +bc1018ede1b186c9e7656e85a57682bfd8f13814 assets/create/lang/unfinished/de_de.json +2b0ad2444e9c14c1ffcee91954940fef74061fb6 assets/create/lang/unfinished/fr_fr.json +2b3595491cfc672f3d6da7bd9e3600f139445f2b assets/create/lang/unfinished/it_it.json +3f559bd4e42159edea64e9f958901ee9c7049111 assets/create/lang/unfinished/ja_jp.json +a9e22722c8b424bc3316b3d2c6d7f21da937a2d4 assets/create/lang/unfinished/ko_kr.json +28c53f4ee00201fdf65e167c96affbcc72f3f585 assets/create/lang/unfinished/nl_nl.json +12053da965398e50eccf5d549a2caa06d1555e5f assets/create/lang/unfinished/pt_br.json +9d5f4355a84883b5e499d7af432431e0592f687b assets/create/lang/unfinished/ru_ru.json +bf2894922ec5e14db2d516002d9be46e08461a58 assets/create/lang/unfinished/zh_cn.json 846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json 1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json 1763ea2c9b981d187f5031ba608f3d5d3be3986a assets/create/models/block/acacia_window_pane_noside_alt.json @@ -782,6 +785,14 @@ b4987ed1fbd44719e59cf911d606b964d51a734c assets/create/models/block/oxidized/cop c9f722cd27fb18239f796eb1fa11a73e5339005a assets/create/models/block/oxidized/copper_shingles_5.json 4df00795cde9497a0910584c6a53b62bfb18fef1 assets/create/models/block/oxidized/copper_shingles_6.json 712f8b01330a1aeff2efce5ac1ec2fdd84b622c7 assets/create/models/block/oxidized/copper_shingles_7.json +d23868f342aa1d821c2971f16b62915d24f257cd assets/create/models/block/oxidized/copper_tiles_0.json +14d893f509073bc0ee6b8a487d1ec4457f717e7a assets/create/models/block/oxidized/copper_tiles_1.json +9d531696a9e989ab090f653d50152fcdf0b8519f assets/create/models/block/oxidized/copper_tiles_2.json +84129b54eb4484c59ad5f3b95b5dea4130a934bc assets/create/models/block/oxidized/copper_tiles_3.json +0e4b39cd5d14470ee9055c3332d3c930d985e075 assets/create/models/block/oxidized/copper_tiles_4.json +c3f2f3574f33ea87c8c32a88c60b386b2ce5c59e assets/create/models/block/oxidized/copper_tiles_5.json +1bdc82a5d6deecaa6e62986bfa4d83ed80cad269 assets/create/models/block/oxidized/copper_tiles_6.json +4ba81cdb32477181225521b13de34b5cb81d3ab1 assets/create/models/block/oxidized/copper_tiles_7.json 081d87f990e01211789e9d0dc43acfceb6982aaa assets/create/models/block/paved_andesite.json 30b9aafb43ecfffcbffdf0aa19b5243e38065ff4 assets/create/models/block/paved_andesite_covered.json ab78afb3c487976c2dc5dcefa12153fd4a064ca8 assets/create/models/block/paved_andesite_slab.json @@ -932,6 +943,7 @@ a9885a3f69e3e2a2812c33bafd9140fcc5cc7c25 assets/create/models/block/radial_chass 522f4733118d6fba172696e9478c8f9fe88b236e assets/create/models/block/radial_chassis_side_z.json bffca231a146a6ac49e028f3790cdcbf375e98b0 assets/create/models/block/radial_chassis_side_z_sticky.json 12d4f4119b994c5d71c96ab3aa09beb89dad1e10 assets/create/models/block/red_seat.json +c4bb40ed2bddabff154a34f4eff7a485bf6488a0 assets/create/models/block/refined_radiance_casing.json c145d8e0d7f8f41afa80b9727a107b2ad2f0c3c9 assets/create/models/block/scoria.json 59c6f6a4ffe43485244a8561d7e8341f796e268b assets/create/models/block/scoria_bricks.json d86ca38a0c1bac89e545916c59f23f6f0c9f7d7a assets/create/models/block/scoria_bricks_slab.json @@ -954,6 +966,7 @@ de66b504054f37eca6e5eeee6245fb8f9db2e1bf assets/create/models/block/scoria_cobbl fbe57e52b0234c2c379d82d6cc425d6ce9492454 assets/create/models/block/secondary_linear_chassis_bottom.json e439d642f3c2049dce444b7b4bea8532eb22699c assets/create/models/block/secondary_linear_chassis_top.json 5fc7d8839c6de9363d22fd22be7f440aab853121 assets/create/models/block/secondary_linear_chassis_top_bottom.json +3020d66d33996dd4b203905a54538d3dd5f01330 assets/create/models/block/shadow_steel_casing.json 3fc9a7ae552095d0f45f8e632e2bf04d1378946f assets/create/models/block/spruce_window.json f39904a8a73a25e440d6a35fad931f8ce7ef165e assets/create/models/block/spruce_window_pane_noside.json 7446e12a5ba91c008b17fd70484468caa36500b9 assets/create/models/block/spruce_window_pane_noside_alt.json @@ -1056,6 +1069,7 @@ c5bcfba46f5824654dedaa2c5d5f42deb29e3baf assets/create/models/item/copper_ingot. 51be7da59368681522de870f1e09036dac55aa77 assets/create/models/item/copper_ore.json 200ef8378a9c014571c414433d4aef73a204dc01 assets/create/models/item/copper_sheet.json d7cb2f7bac8fae893fc5179af8140786a908f3f5 assets/create/models/item/copper_shingles.json +f56bf22324faf8958eaef4d94b958f1108d52e5a assets/create/models/item/copper_tiles.json 4e9126b349d55c65aa5407f05700579e52101c1f assets/create/models/item/crafter_slot_cover.json 7b333dea353afaa27b182aedc647c9e9e34e92ef assets/create/models/item/creative_crate.json 5b39403f6c81f05e566b621b62e267267de47c41 assets/create/models/item/creative_motor.json @@ -1333,6 +1347,7 @@ ba99e2fdb64892f4f479a8ac51c226cb5f71f659 assets/create/models/item/red_sand_pape b9a4ac219a27e60a82f55129f2df5ae6183981e2 assets/create/models/item/redstone_contact.json 52e561abeb954d0349e640566de92ef80ccbf919 assets/create/models/item/redstone_link.json d9dd4546f4f4c6ed5fef66de9d272d469db4e81f assets/create/models/item/refined_radiance.json +ef52b3734a47e96c5f83d60da73110e925737933 assets/create/models/item/refined_radiance_casing.json 901f7ad587dd07c9494d95bf7f08f93bb20db774 assets/create/models/item/reinforced_rail.json 6daff6b82b33374d7add65e352e05ecb2fd9ebdd assets/create/models/item/rope_pulley.json fc54acc37695f21ef650c8310110407647e9a023 assets/create/models/item/rose_quartz.json @@ -1355,6 +1370,7 @@ b0061419cf7b7bd2dd548ff00ee28f1227ee2663 assets/create/models/item/scoria_cobble 083b9fc316cef1d24ea20f06a6aaa4cb52f1ef94 assets/create/models/item/secondary_linear_chassis.json 0df94333da5700f01dcf4ffa46e3f3bf26bb8cf7 assets/create/models/item/sequenced_gearshift.json da72ccdc893fbdd3efa9c22143b88eb756c20e44 assets/create/models/item/shadow_steel.json +081326d6666cfcfe34c45c1b74bfceba0b01ae6e assets/create/models/item/shadow_steel_casing.json 106ae694f7e03a218c37003dca8291b1d39b3c55 assets/create/models/item/shaft.json d6fb0d38b1b5bcc199b52ac8889eaecd167f6725 assets/create/models/item/speedometer.json b305e81f1dc5272634745b6e822af40955a2ef28 assets/create/models/item/spruce_window.json @@ -1862,6 +1878,7 @@ f38802b919c49f162f102d6e5d94113f05bf4ab1 data/create/loot_tables/blocks/copper_b 5a65a18ea787130ac7b8f5652bfa5ed187446649 data/create/loot_tables/blocks/copper_casing.json 31a51237763c374b7cdf39b9b62c14e965871047 data/create/loot_tables/blocks/copper_ore.json a5a7ba88a1d38da83b37bbe842dc7cc0544f37be data/create/loot_tables/blocks/copper_shingles.json +c013613df278f6e8b4c9dad5f16e0ec6c3e992e3 data/create/loot_tables/blocks/copper_tiles.json b160899aa785dc54d8c6cc095337f70b81f3e44f data/create/loot_tables/blocks/creative_crate.json d8f2f8921b9200b1d9476a77ee1be32c25308ac3 data/create/loot_tables/blocks/creative_motor.json c28fa42746a4d5ca2f824001b67e58673810169e data/create/loot_tables/blocks/crushing_wheel.json @@ -2117,6 +2134,7 @@ d7f6caa568e6508177a644fb78dc18ce26c9b2c0 data/create/loot_tables/blocks/purple_s 71b0fa3b174efe94a2a735ab2426c376c0ef674a data/create/loot_tables/blocks/red_seat.json f5907a694206facc01f61f3428f72488486761c7 data/create/loot_tables/blocks/redstone_contact.json 886a0c1386fb12104b736a15689030aaff771270 data/create/loot_tables/blocks/redstone_link.json +5569a01114939be4b09cc1414e33d7211d7aada3 data/create/loot_tables/blocks/refined_radiance_casing.json 97c945de837a6360c0ab7e1371f16ebc1645f6ea data/create/loot_tables/blocks/reinforced_rail.json 205f5899101262f31f5c1a88bb7d954918d08d04 data/create/loot_tables/blocks/rope.json cecaac07bd275bb1ae9e302f0bf44b581e74105d data/create/loot_tables/blocks/rope_pulley.json @@ -2135,6 +2153,7 @@ d2139e9daa55c09cd262b15c980d65c554347e45 data/create/loot_tables/blocks/scoria_c 82fb40738f53892571ad83789ff45315e887c811 data/create/loot_tables/blocks/scoria_pillar.json f70c5b7e7da7abffc82e3d1828499799883bbe85 data/create/loot_tables/blocks/secondary_linear_chassis.json e4f6dccb8bce21b5214c1d8cfb440fc0ba4159d7 data/create/loot_tables/blocks/sequenced_gearshift.json +49f6b51c0618aa0c0133dc1f034ff6c031318cac data/create/loot_tables/blocks/shadow_steel_casing.json b127cb6920e6d7d9c8b2402cb186402a9a8dd3fc data/create/loot_tables/blocks/shaft.json 70b6e82e9198d3910877e62c2eab86d46ca27089 data/create/loot_tables/blocks/speedometer.json a23a1e332c9ba84474e3c0588e8a0857afe346e0 data/create/loot_tables/blocks/spruce_window.json diff --git a/src/generated/resources/assets/create/blockstates/copper_tiles.json b/src/generated/resources/assets/create/blockstates/copper_tiles.json new file mode 100644 index 000000000..74895de71 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/copper_tiles.json @@ -0,0 +1,28 @@ +{ + "variants": { + "oxidization=0": { + "model": "create:block/oxidized/copper_tiles_0" + }, + "oxidization=1": { + "model": "create:block/oxidized/copper_tiles_1" + }, + "oxidization=2": { + "model": "create:block/oxidized/copper_tiles_2" + }, + "oxidization=3": { + "model": "create:block/oxidized/copper_tiles_3" + }, + "oxidization=4": { + "model": "create:block/oxidized/copper_tiles_4" + }, + "oxidization=5": { + "model": "create:block/oxidized/copper_tiles_5" + }, + "oxidization=6": { + "model": "create:block/oxidized/copper_tiles_6" + }, + "oxidization=7": { + "model": "create:block/oxidized/copper_tiles_7" + } + } +} \ 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 44255c27a..3b646b920 100644 --- a/src/generated/resources/assets/create/blockstates/fluid_pipe.json +++ b/src/generated/resources/assets/create/blockstates/fluid_pipe.json @@ -60,10 +60,10 @@ }, { "when": { - "up": "true", + "down": "false", "north": "true", - "south": "false", - "down": "false" + "up": "true", + "south": "false" }, "apply": { "model": "create:block/fluid_pipe/lu_x" @@ -71,10 +71,10 @@ }, { "when": { - "up": "true", + "down": "false", "north": "false", - "south": "true", - "down": "false" + "up": "true", + "south": "true" }, "apply": { "model": "create:block/fluid_pipe/ru_x" @@ -82,10 +82,10 @@ }, { "when": { - "up": "false", + "down": "true", "north": "true", - "south": "false", - "down": "true" + "up": "false", + "south": "false" }, "apply": { "model": "create:block/fluid_pipe/ld_x" @@ -93,10 +93,10 @@ }, { "when": { - "up": "false", + "down": "true", "north": "false", - "south": "true", - "down": "true" + "up": "false", + "south": "true" }, "apply": { "model": "create:block/fluid_pipe/rd_x" @@ -104,10 +104,10 @@ }, { "when": { + "down": "true", + "north": "false", "up": "true", - "north": "false", - "south": "false", - "down": "true" + "south": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_x" @@ -115,10 +115,10 @@ }, { "when": { + "down": "false", + "north": "false", "up": "true", - "north": "false", - "south": "false", - "down": "false" + "south": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_x" @@ -126,10 +126,10 @@ }, { "when": { - "up": "false", + "down": "true", "north": "false", - "south": "false", - "down": "true" + "up": "false", + "south": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_x" @@ -137,10 +137,10 @@ }, { "when": { - "up": "false", + "down": "false", "north": "true", - "south": "true", - "down": "false" + "up": "false", + "south": "true" }, "apply": { "model": "create:block/fluid_pipe/lr_x" @@ -148,10 +148,10 @@ }, { "when": { - "up": "false", + "down": "false", "north": "true", - "south": "false", - "down": "false" + "up": "false", + "south": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_x" @@ -159,10 +159,10 @@ }, { "when": { - "up": "false", + "down": "false", "north": "false", - "south": "true", - "down": "false" + "up": "false", + "south": "true" }, "apply": { "model": "create:block/fluid_pipe/lr_x" @@ -170,10 +170,10 @@ }, { "when": { - "up": "false", + "down": "false", "north": "false", - "south": "false", - "down": "false" + "up": "false", + "south": "false" }, "apply": { "model": "create:block/fluid_pipe/none_x" @@ -304,8 +304,8 @@ "when": { "west": "false", "east": "true", - "up": "true", - "down": "false" + "down": "false", + "up": "true" }, "apply": { "model": "create:block/fluid_pipe/lu_z" @@ -315,8 +315,8 @@ "when": { "west": "true", "east": "false", - "up": "true", - "down": "false" + "down": "false", + "up": "true" }, "apply": { "model": "create:block/fluid_pipe/ru_z" @@ -326,8 +326,8 @@ "when": { "west": "false", "east": "true", - "up": "false", - "down": "true" + "down": "true", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/ld_z" @@ -337,8 +337,8 @@ "when": { "west": "true", "east": "false", - "up": "false", - "down": "true" + "down": "true", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/rd_z" @@ -348,8 +348,8 @@ "when": { "west": "false", "east": "false", - "up": "true", - "down": "true" + "down": "true", + "up": "true" }, "apply": { "model": "create:block/fluid_pipe/ud_z" @@ -359,8 +359,8 @@ "when": { "west": "false", "east": "false", - "up": "true", - "down": "false" + "down": "false", + "up": "true" }, "apply": { "model": "create:block/fluid_pipe/ud_z" @@ -370,8 +370,8 @@ "when": { "west": "false", "east": "false", - "up": "false", - "down": "true" + "down": "true", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_z" @@ -381,8 +381,8 @@ "when": { "west": "true", "east": "true", - "up": "false", - "down": "false" + "down": "false", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_z" @@ -392,8 +392,8 @@ "when": { "west": "false", "east": "true", - "up": "false", - "down": "false" + "down": "false", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_z" @@ -403,8 +403,8 @@ "when": { "west": "true", "east": "false", - "up": "false", - "down": "false" + "down": "false", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_z" @@ -414,8 +414,8 @@ "when": { "west": "false", "east": "false", - "up": "false", - "down": "false" + "down": "false", + "up": "false" }, "apply": { "model": "create:block/fluid_pipe/none_z" diff --git a/src/generated/resources/assets/create/blockstates/refined_radiance_casing.json b/src/generated/resources/assets/create/blockstates/refined_radiance_casing.json new file mode 100644 index 000000000..b43052bac --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/refined_radiance_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/refined_radiance_casing" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/shadow_steel_casing.json b/src/generated/resources/assets/create/blockstates/shadow_steel_casing.json new file mode 100644 index 000000000..9caf34364 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/shadow_steel_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/shadow_steel_casing" + } + } +} \ 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 df347443d..845ea00c8 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -50,6 +50,7 @@ "block.create.copper_casing": "bu\u0131s\u0250\u0186 \u0279\u01DDddo\u0186", "block.create.copper_ore": "\u01DD\u0279O \u0279\u01DDddo\u0186", "block.create.copper_shingles": "s\u01DD\u05DFbu\u0131\u0265S \u0279\u01DDddo\u0186", + "block.create.copper_tiles": "s\u01DD\u05DF\u0131\u27D8 \u0279\u01DDddo\u0186", "block.create.creative_crate": "\u01DD\u0287\u0250\u0279\u0186 \u01DD\u028C\u0131\u0287\u0250\u01DD\u0279\u0186", "block.create.creative_motor": "\u0279o\u0287oW \u01DD\u028C\u0131\u0287\u0250\u01DD\u0279\u0186", "block.create.crushing_wheel": "\u05DF\u01DD\u01DD\u0265M bu\u0131\u0265sn\u0279\u0186", @@ -305,6 +306,7 @@ "block.create.red_seat": "\u0287\u0250\u01DDS p\u01DD\u1D1A", "block.create.redstone_contact": "\u0287\u0254\u0250\u0287uo\u0186 \u01DDuo\u0287sp\u01DD\u1D1A", "block.create.redstone_link": "\u029Eu\u0131\uA780 \u01DDuo\u0287sp\u01DD\u1D1A", + "block.create.refined_radiance_casing": "bu\u0131s\u0250\u0186 \u01DD\u0254u\u0250\u0131p\u0250\u1D1A p\u01DDu\u0131\u025F\u01DD\u1D1A", "block.create.reinforced_rail": "\u05DF\u0131\u0250\u1D1A p\u01DD\u0254\u0279o\u025Fu\u0131\u01DD\u1D1A", "block.create.rope": "\u01DDdo\u1D1A", "block.create.rope_pulley": "\u028E\u01DD\u05DF\u05DFn\u0500 \u01DDdo\u1D1A", @@ -323,6 +325,7 @@ "block.create.scoria_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u0250\u0131\u0279o\u0254S", "block.create.secondary_linear_chassis": "s\u0131ss\u0250\u0265\u0186 \u0279\u0250\u01DDu\u0131\uA780 \u028E\u0279\u0250puo\u0254\u01DDS", "block.create.sequenced_gearshift": "\u0287\u025F\u0131\u0265s\u0279\u0250\u01DD\u2141 p\u01DD\u0254u\u01DDnb\u01DDS", + "block.create.shadow_steel_casing": "bu\u0131s\u0250\u0186 \u05DF\u01DD\u01DD\u0287S \u028Dop\u0250\u0265S", "block.create.shaft": "\u0287\u025F\u0250\u0265S", "block.create.speedometer": "\u0279\u01DD\u0287\u01DD\u026Fop\u01DD\u01DDdS", "block.create.spruce_window": "\u028Dopu\u0131M \u01DD\u0254n\u0279dS", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 883a7ee2d..86e5a6ea3 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -53,6 +53,7 @@ "block.create.copper_casing": "Copper Casing", "block.create.copper_ore": "Copper Ore", "block.create.copper_shingles": "Copper Shingles", + "block.create.copper_tiles": "Copper Tiles", "block.create.creative_crate": "Creative Crate", "block.create.creative_motor": "Creative Motor", "block.create.crushing_wheel": "Crushing Wheel", @@ -308,6 +309,7 @@ "block.create.red_seat": "Red Seat", "block.create.redstone_contact": "Redstone Contact", "block.create.redstone_link": "Redstone Link", + "block.create.refined_radiance_casing": "Refined Radiance Casing", "block.create.reinforced_rail": "Reinforced Rail", "block.create.rope": "Rope", "block.create.rope_pulley": "Rope Pulley", @@ -326,6 +328,7 @@ "block.create.scoria_pillar": "Scoria Pillar", "block.create.secondary_linear_chassis": "Secondary Linear Chassis", "block.create.sequenced_gearshift": "Sequenced Gearshift", + "block.create.shadow_steel_casing": "Shadow Steel Casing", "block.create.shaft": "Shaft", "block.create.speedometer": "Speedometer", "block.create.spruce_window": "Spruce Window", 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 175e62e23..a8d3157f0 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: 810", + "_": "Missing Localizations: 813", "_": "->------------------------] Game Elements [------------------------<-", @@ -54,6 +54,7 @@ "block.create.copper_casing": "UNLOCALIZED: Copper Casing", "block.create.copper_ore": "UNLOCALIZED: Copper Ore", "block.create.copper_shingles": "UNLOCALIZED: Copper Shingles", + "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", "block.create.creative_crate": "Bauplankanonenmacher", "block.create.creative_motor": "UNLOCALIZED: Creative Motor", "block.create.crushing_wheel": "Mahlwerkrad", @@ -309,6 +310,7 @@ "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.redstone_contact": "Redstone-Kontakt", "block.create.redstone_link": "Redstone-Verbindung", + "block.create.refined_radiance_casing": "UNLOCALIZED: Refined Radiance Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", "block.create.rope": "UNLOCALIZED: Rope", "block.create.rope_pulley": "UNLOCALIZED: Rope Pulley", @@ -327,6 +329,7 @@ "block.create.scoria_pillar": "UNLOCALIZED: Scoria Pillar", "block.create.secondary_linear_chassis": "UNLOCALIZED: Secondary Linear Chassis", "block.create.sequenced_gearshift": "UNLOCALIZED: Sequenced Gearshift", + "block.create.shadow_steel_casing": "UNLOCALIZED: Shadow Steel Casing", "block.create.shaft": "Welle", "block.create.speedometer": "UNLOCALIZED: Speedometer", "block.create.spruce_window": "UNLOCALIZED: Spruce Window", 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 7c2fb3dc2..962dbc00f 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: 413", + "_": "Missing Localizations: 416", "_": "->------------------------] Game Elements [------------------------<-", @@ -54,6 +54,7 @@ "block.create.copper_casing": "Boîtier en cuivre", "block.create.copper_ore": "Minerai de cuivre", "block.create.copper_shingles": "Bardeaux de cuivre", + "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", "block.create.creative_crate": "Créateur de schémacanon", "block.create.creative_motor": "Moteur", "block.create.crushing_wheel": "Roue de concassage", @@ -309,6 +310,7 @@ "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.redstone_contact": "redstone_contact Redstone", "block.create.redstone_link": "Liaison Redstone", + "block.create.refined_radiance_casing": "UNLOCALIZED: Refined Radiance Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", "block.create.rope": "Corde", "block.create.rope_pulley": "Poulie à corde", @@ -327,6 +329,7 @@ "block.create.scoria_pillar": "Pillier de scorie", "block.create.secondary_linear_chassis": "UNLOCALIZED: Secondary Linear Chassis", "block.create.sequenced_gearshift": "Décaleur de rotation séquencé", + "block.create.shadow_steel_casing": "UNLOCALIZED: Shadow Steel Casing", "block.create.shaft": "Arbre mécanique", "block.create.speedometer": "Compteur de vitesse", "block.create.spruce_window": "UNLOCALIZED: Spruce Window", 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 a421aa963..2bbe58597 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: 397", + "_": "Missing Localizations: 400", "_": "->------------------------] Game Elements [------------------------<-", @@ -54,6 +54,7 @@ "block.create.copper_casing": "Involucro di Rame", "block.create.copper_ore": "Rame Grezzo", "block.create.copper_shingles": "Tegole di Rame", + "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", "block.create.creative_crate": "Creatore Cannoneschematico", "block.create.creative_motor": "Motore", "block.create.crushing_wheel": "Ruota di Frantumazione", @@ -309,6 +310,7 @@ "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.redstone_contact": "Contatto Redstone", "block.create.redstone_link": "Collegamento Redstone", + "block.create.refined_radiance_casing": "UNLOCALIZED: Refined Radiance Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", "block.create.rope": "Corda", "block.create.rope_pulley": "Puleggia della Corda", @@ -327,6 +329,7 @@ "block.create.scoria_pillar": "Pilastro di Scoria", "block.create.secondary_linear_chassis": "UNLOCALIZED: Secondary Linear Chassis", "block.create.sequenced_gearshift": "Cambio Sequenziale", + "block.create.shadow_steel_casing": "UNLOCALIZED: Shadow Steel Casing", "block.create.shaft": "Albero", "block.create.speedometer": "Tachimetro", "block.create.spruce_window": "UNLOCALIZED: Spruce Window", 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 753b230e9..c4f699b59 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: 392", + "_": "Missing Localizations: 395", "_": "->------------------------] Game Elements [------------------------<-", @@ -54,6 +54,7 @@ "block.create.copper_casing": "銅ケーシング", "block.create.copper_ore": "銅鉱石", "block.create.copper_shingles": "銅のこけら板", + "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", "block.create.creative_crate": "概略図砲クリエティフィアー", "block.create.creative_motor": "モーター", "block.create.crushing_wheel": "破砕ホイール", @@ -309,6 +310,7 @@ "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.redstone_contact": "レッドストーンコンタクト", "block.create.redstone_link": "レッドストーンリンク", + "block.create.refined_radiance_casing": "UNLOCALIZED: Refined Radiance Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", "block.create.rope": "ロープ", "block.create.rope_pulley": "ローププーリー", @@ -327,6 +329,7 @@ "block.create.scoria_pillar": "スコリアの柱", "block.create.secondary_linear_chassis": "UNLOCALIZED: Secondary Linear Chassis", "block.create.sequenced_gearshift": "シーケンスギアシフト", + "block.create.shadow_steel_casing": "UNLOCALIZED: Shadow Steel Casing", "block.create.shaft": "軸", "block.create.speedometer": "スピードメーター", "block.create.spruce_window": "UNLOCALIZED: Spruce Window", 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 1a896e625..dacd740e5 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: 397", + "_": "Missing Localizations: 400", "_": "->------------------------] Game Elements [------------------------<-", @@ -54,6 +54,7 @@ "block.create.copper_casing": "구리 케이스", "block.create.copper_ore": "구리 광석", "block.create.copper_shingles": "구리 판자", + "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", "block.create.creative_crate": "청사진 대포 지원기", "block.create.creative_motor": "모터", "block.create.crushing_wheel": "분쇄 휠", @@ -309,6 +310,7 @@ "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.redstone_contact": "동형 감지기", "block.create.redstone_link": "레드스톤 링크", + "block.create.refined_radiance_casing": "UNLOCALIZED: Refined Radiance Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", "block.create.rope": "밧줄", "block.create.rope_pulley": "밧줄 도르래", @@ -327,6 +329,7 @@ "block.create.scoria_pillar": "스코리아 기둥", "block.create.secondary_linear_chassis": "UNLOCALIZED: Secondary Linear Chassis", "block.create.sequenced_gearshift": "순서 기어쉬프트", + "block.create.shadow_steel_casing": "UNLOCALIZED: Shadow Steel Casing", "block.create.shaft": "축", "block.create.speedometer": "속도 계측기", "block.create.spruce_window": "UNLOCALIZED: Spruce Window", 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 8a086de65..0f8d47ef3 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: 747", + "_": "Missing Localizations: 750", "_": "->------------------------] Game Elements [------------------------<-", @@ -54,6 +54,7 @@ "block.create.copper_casing": "UNLOCALIZED: Copper Casing", "block.create.copper_ore": "UNLOCALIZED: Copper Ore", "block.create.copper_shingles": "UNLOCALIZED: Copper Shingles", + "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", "block.create.creative_crate": "Bouwtekeningkannon Creatiefeerder", "block.create.creative_motor": "UNLOCALIZED: Creative Motor", "block.create.crushing_wheel": "Verpulveraar", @@ -309,6 +310,7 @@ "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.redstone_contact": "Redstone redstone_contact", "block.create.redstone_link": "Redstone Brug", + "block.create.refined_radiance_casing": "UNLOCALIZED: Refined Radiance Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", "block.create.rope": "UNLOCALIZED: Rope", "block.create.rope_pulley": "UNLOCALIZED: Rope Pulley", @@ -327,6 +329,7 @@ "block.create.scoria_pillar": "UNLOCALIZED: Scoria Pillar", "block.create.secondary_linear_chassis": "UNLOCALIZED: Secondary Linear Chassis", "block.create.sequenced_gearshift": "UNLOCALIZED: Sequenced Gearshift", + "block.create.shadow_steel_casing": "UNLOCALIZED: Shadow Steel Casing", "block.create.shaft": "Drijfas", "block.create.speedometer": "Snelheidsmeter", "block.create.spruce_window": "UNLOCALIZED: Spruce Window", 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 843ab7e33..c64bd695f 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: 817", + "_": "Missing Localizations: 820", "_": "->------------------------] Game Elements [------------------------<-", @@ -54,6 +54,7 @@ "block.create.copper_casing": "UNLOCALIZED: Copper Casing", "block.create.copper_ore": "UNLOCALIZED: Copper Ore", "block.create.copper_shingles": "UNLOCALIZED: Copper Shingles", + "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", "block.create.creative_crate": "Criativador Esquemaannon", "block.create.creative_motor": "UNLOCALIZED: Creative Motor", "block.create.crushing_wheel": "Roda de Moer", @@ -309,6 +310,7 @@ "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.redstone_contact": "Contato de Redstone", "block.create.redstone_link": "Conexão de Redstone", + "block.create.refined_radiance_casing": "UNLOCALIZED: Refined Radiance Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", "block.create.rope": "UNLOCALIZED: Rope", "block.create.rope_pulley": "UNLOCALIZED: Rope Pulley", @@ -327,6 +329,7 @@ "block.create.scoria_pillar": "UNLOCALIZED: Scoria Pillar", "block.create.secondary_linear_chassis": "UNLOCALIZED: Secondary Linear Chassis", "block.create.sequenced_gearshift": "UNLOCALIZED: Sequenced Gearshift", + "block.create.shadow_steel_casing": "UNLOCALIZED: Shadow Steel Casing", "block.create.shaft": "Eixo", "block.create.speedometer": "UNLOCALIZED: Speedometer", "block.create.spruce_window": "UNLOCALIZED: Spruce Window", 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 d996c9f99..d0ab81d18 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: 811", + "_": "Missing Localizations: 814", "_": "->------------------------] Game Elements [------------------------<-", @@ -54,6 +54,7 @@ "block.create.copper_casing": "UNLOCALIZED: Copper Casing", "block.create.copper_ore": "UNLOCALIZED: Copper Ore", "block.create.copper_shingles": "UNLOCALIZED: Copper Shingles", + "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", "block.create.creative_crate": "Креативный ящик", "block.create.creative_motor": "UNLOCALIZED: Creative Motor", "block.create.crushing_wheel": "Дробильное колесо", @@ -309,6 +310,7 @@ "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.redstone_contact": "Контактное соединение", "block.create.redstone_link": "Сигнальное соединение", + "block.create.refined_radiance_casing": "UNLOCALIZED: Refined Radiance Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", "block.create.rope": "UNLOCALIZED: Rope", "block.create.rope_pulley": "UNLOCALIZED: Rope Pulley", @@ -327,6 +329,7 @@ "block.create.scoria_pillar": "UNLOCALIZED: Scoria Pillar", "block.create.secondary_linear_chassis": "UNLOCALIZED: Secondary Linear Chassis", "block.create.sequenced_gearshift": "UNLOCALIZED: Sequenced Gearshift", + "block.create.shadow_steel_casing": "UNLOCALIZED: Shadow Steel Casing", "block.create.shaft": "Вал", "block.create.speedometer": "UNLOCALIZED: Speedometer", "block.create.spruce_window": "UNLOCALIZED: Spruce Window", 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 eab7d3c6a..decafb66f 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: 73", + "_": "Missing Localizations: 76", "_": "->------------------------] Game Elements [------------------------<-", @@ -54,6 +54,7 @@ "block.create.copper_casing": "铜机壳", "block.create.copper_ore": "铜矿石", "block.create.copper_shingles": "铜瓦", + "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", "block.create.creative_crate": "创造板条箱", "block.create.creative_motor": "创造马达", "block.create.crushing_wheel": "粉碎轮", @@ -309,6 +310,7 @@ "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.redstone_contact": "信号检测器", "block.create.redstone_link": "无限红石信号终端", + "block.create.refined_radiance_casing": "UNLOCALIZED: Refined Radiance Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", "block.create.rope": "绳索", "block.create.rope_pulley": "绳索滑轮", @@ -327,6 +329,7 @@ "block.create.scoria_pillar": "竖纹熔渣", "block.create.secondary_linear_chassis": "机壳底盘2号", "block.create.sequenced_gearshift": "可编程齿轮箱", + "block.create.shadow_steel_casing": "UNLOCALIZED: Shadow Steel Casing", "block.create.shaft": "传动杆", "block.create.speedometer": "速度表", "block.create.spruce_window": "云杉窗户", diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_0.json b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_0.json new file mode 100644 index 000000000..985bdda17 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_tiles_0" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_1.json b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_1.json new file mode 100644 index 000000000..d1e42e0aa --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_tiles_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_2.json b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_2.json new file mode 100644 index 000000000..2797d2042 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_tiles_2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_3.json b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_3.json new file mode 100644 index 000000000..52ed6ae16 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_tiles_3" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_4.json b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_4.json new file mode 100644 index 000000000..1c687ae01 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_tiles_4" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_5.json b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_5.json new file mode 100644 index 000000000..31635b811 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_tiles_5" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_6.json b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_6.json new file mode 100644 index 000000000..ba3ee95fd --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_6.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_tiles_6" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_7.json b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_7.json new file mode 100644 index 000000000..8b860acd2 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_tiles_7.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_tiles_7" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/refined_radiance_casing.json b/src/generated/resources/assets/create/models/block/refined_radiance_casing.json new file mode 100644 index 000000000..de2fbfba0 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/refined_radiance_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/refined_radiance_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/shadow_steel_casing.json b/src/generated/resources/assets/create/models/block/shadow_steel_casing.json new file mode 100644 index 000000000..17d607c17 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/shadow_steel_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/shadow_steel_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/copper_tiles.json b/src/generated/resources/assets/create/models/item/copper_tiles.json new file mode 100644 index 000000000..943873f28 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/copper_tiles.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/oxidized/copper_tiles_0" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/refined_radiance_casing.json b/src/generated/resources/assets/create/models/item/refined_radiance_casing.json new file mode 100644 index 000000000..46393f46b --- /dev/null +++ b/src/generated/resources/assets/create/models/item/refined_radiance_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/refined_radiance_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/shadow_steel_casing.json b/src/generated/resources/assets/create/models/item/shadow_steel_casing.json new file mode 100644 index 000000000..3d0f22343 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/shadow_steel_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/shadow_steel_casing" +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/copper_tiles.json b/src/generated/resources/data/create/loot_tables/blocks/copper_tiles.json new file mode 100644 index 000000000..4fabc0d92 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/copper_tiles.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:copper_tiles" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/refined_radiance_casing.json b/src/generated/resources/data/create/loot_tables/blocks/refined_radiance_casing.json new file mode 100644 index 000000000..76ec447a2 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/refined_radiance_casing.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:refined_radiance_casing" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/shadow_steel_casing.json b/src/generated/resources/data/create/loot_tables/blocks/shadow_steel_casing.json new file mode 100644 index 000000000..d15ba3eac --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/shadow_steel_casing.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:shadow_steel_casing" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index bd1fe7cfd..be8a903dd 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -59,8 +59,8 @@ import com.simibubi.create.content.contraptions.fluids.FluidTankItem; import com.simibubi.create.content.contraptions.fluids.FluidTankModel; import com.simibubi.create.content.contraptions.fluids.PumpBlock; import com.simibubi.create.content.contraptions.processing.BasinBlock; -import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlockItem; import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock; +import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlockItem; import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerBlock; import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftBlock; import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftGenerator; @@ -403,17 +403,18 @@ public class AllBlocks { .simpleItem() .register(); - public static final BlockEntry BLAZE_BURNER = REGISTRATE.block("blaze_burner", BlazeBurnerBlock::new) - .initialProperties(SharedProperties::softMetal) - .properties(p -> p.lightValue(12)) - .addLayer(() -> RenderType::getCutoutMipped) - .tag(AllBlockTags.FAN_TRANSPARENT.tag, AllBlockTags.FAN_HEATERS.tag) - .loot((lt, block) -> lt.registerLootTable(block, BlazeBurnerBlock.buildLootTable())) - .blockstate((c, p) -> p.simpleBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p))) - .item(BlazeBurnerBlockItem::withBlaze) - .model(AssetLookup.customItemModel("blaze_burner", "block_with_blaze")) - .build() - .register(); + public static final BlockEntry BLAZE_BURNER = + REGISTRATE.block("blaze_burner", BlazeBurnerBlock::new) + .initialProperties(SharedProperties::softMetal) + .properties(p -> p.lightValue(12)) + .addLayer(() -> RenderType::getCutoutMipped) + .tag(AllBlockTags.FAN_TRANSPARENT.tag, AllBlockTags.FAN_HEATERS.tag) + .loot((lt, block) -> lt.registerLootTable(block, BlazeBurnerBlock.buildLootTable())) + .blockstate((c, p) -> p.simpleBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p))) + .item(BlazeBurnerBlockItem::withBlaze) + .model(AssetLookup.customItemModel("blaze_burner", "block_with_blaze")) + .build() + .register(); public static final BlockEntry DEPOT = REGISTRATE.block("depot", DepotBlock::new) .initialProperties(SharedProperties::stone) @@ -678,6 +679,17 @@ public class AllBlocks { .transform(BuilderTransformers.casing(AllSpriteShifts.COPPER_CASING)) .register(); + public static final BlockEntry SHADOW_STEEL_CASING = + REGISTRATE.block("shadow_steel_casing", CasingBlock::new) + .transform(BuilderTransformers.casing(AllSpriteShifts.SHADOW_STEEL_CASING)) + .register(); + + public static final BlockEntry REFINED_RADIANCE_CASING = + REGISTRATE.block("refined_radiance_casing", CasingBlock::new) + .transform(BuilderTransformers.casing(AllSpriteShifts.REFINED_RADIANCE_CASING)) + .properties(p -> p.lightValue(12)) + .register(); + public static final BlockEntry MECHANICAL_CRAFTER = REGISTRATE.block("mechanical_crafter", MechanicalCrafterBlock::new) .initialProperties(SharedProperties::softMetal) @@ -1022,6 +1034,14 @@ public class AllBlocks { .transform(oxidizedBlockstate()) .register(); + public static final BlockEntry COPPER_TILES = + REGISTRATE.block("copper_tiles", p -> new OxidizingBlock(p, 1 / 32f)) + .initialProperties(() -> Blocks.IRON_BLOCK) + .item() + .transform(oxidizedItemModel()) + .transform(oxidizedBlockstate()) + .register(); + public static final BlockEntry ZINC_BLOCK = REGISTRATE.block("zinc_block", p -> new MetalBlock(p, true)) .initialProperties(() -> Blocks.IRON_BLOCK) .transform(tagBlockAndItem("storage_blocks/zinc")) diff --git a/src/main/java/com/simibubi/create/AllSpriteShifts.java b/src/main/java/com/simibubi/create/AllSpriteShifts.java index 6927f4de2..5fa92ea72 100644 --- a/src/main/java/com/simibubi/create/AllSpriteShifts.java +++ b/src/main/java/com/simibubi/create/AllSpriteShifts.java @@ -40,7 +40,9 @@ public class AllSpriteShifts { public static final CTSpriteShiftEntry ANDESITE_CASING = omni("andesite_casing"), BRASS_CASING = omni("brass_casing"), - COPPER_CASING = omni("copper_casing"); + COPPER_CASING = omni("copper_casing"), + SHADOW_STEEL_CASING = omni("shadow_steel_casing"), + REFINED_RADIANCE_CASING = omni("refined_radiance_casing"); public static final CTSpriteShiftEntry CHASSIS = getCT(CTType.OMNIDIRECTIONAL, "linear_chassis_end"), diff --git a/src/main/resources/assets/create/models/block/cogwheel.json b/src/main/resources/assets/create/models/block/cogwheel.json index 28db82c9f..a18d1655d 100644 --- a/src/main/resources/assets/create/models/block/cogwheel.json +++ b/src/main/resources/assets/create/models/block/cogwheel.json @@ -5,7 +5,7 @@ "textures": { "0": "create:block/axis", "3": "create:block/axis_top", - "particle": "create:block/cogwheel", + "particle": "block/stripped_spruce_log", "1_2": "create:block/cogwheel" }, "elements": [ diff --git a/src/main/resources/assets/create/models/block/large_cogwheel.json b/src/main/resources/assets/create/models/block/large_cogwheel.json index 2bdea006f..c21f61a1b 100644 --- a/src/main/resources/assets/create/models/block/large_cogwheel.json +++ b/src/main/resources/assets/create/models/block/large_cogwheel.json @@ -5,6 +5,7 @@ "textures": { "0": "create:block/axis", "3": "create:block/axis_top", + "particle": "block/stripped_spruce_log", "4": "create:block/large_cogwheel" }, "elements": [ diff --git a/src/main/resources/assets/create/textures/block/shadowsteel_casing.png b/src/main/resources/assets/create/textures/block/shadow_steel_casing.png similarity index 100% rename from src/main/resources/assets/create/textures/block/shadowsteel_casing.png rename to src/main/resources/assets/create/textures/block/shadow_steel_casing.png diff --git a/src/main/resources/assets/create/textures/block/shadowsteel_casing_connected.png b/src/main/resources/assets/create/textures/block/shadow_steel_casing_connected.png similarity index 100% rename from src/main/resources/assets/create/textures/block/shadowsteel_casing_connected.png rename to src/main/resources/assets/create/textures/block/shadow_steel_casing_connected.png