From c698aec5d47a09418abb00403616a222a7a13ad9 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Mon, 18 May 2020 22:01:09 +0200 Subject: [PATCH] Generating complex blockstates - Added utility for outsourcing blockstate generators into dedicated classes - Ported Encased belt and Adjustable Pulley - Updated Forge --- build.gradle | 2 +- src/generated/resources/.cache/cache | 80 +++++--- .../create/blockstates/adjustable_pulley.json | 190 ++++++++++++++++++ .../create/blockstates/encased_belt.json | 97 +++++++++ .../resources/assets/create/lang/en_ud.json | 2 + .../resources/assets/create/lang/en_us.json | 2 + .../adjustable_pulley_end_horizontal.json | 6 + ...ustable_pulley_end_horizontal_powered.json | 6 + .../block/adjustable_pulley_end_vertical.json | 6 + ...djustable_pulley_end_vertical_powered.json | 6 + .../adjustable_pulley_middle_horizontal.json | 6 + ...able_pulley_middle_horizontal_powered.json | 6 + .../adjustable_pulley_middle_vertical.json | 6 + ...stable_pulley_middle_vertical_powered.json | 6 + .../block/adjustable_pulley_single.json | 6 + .../adjustable_pulley_single_powered.json | 6 + .../create/models/item/adjustable_pulley.json | 6 + .../create/models/item/encased_belt.json | 3 + .../data/forge/tags/blocks/ores/copper.json | 3 +- .../data/forge/tags/blocks/ores/zinc.json | 3 +- .../tags/blocks/storage_blocks/brass.json | 3 +- .../tags/blocks/storage_blocks/copper.json | 3 +- .../tags/blocks/storage_blocks/zinc.json | 3 +- .../data/forge/tags/items/ingots.json | 3 +- .../data/forge/tags/items/ingots/brass.json | 3 +- .../data/forge/tags/items/ingots/copper.json | 3 +- .../data/forge/tags/items/ingots/zinc.json | 3 +- .../data/forge/tags/items/nuggets.json | 3 +- .../data/forge/tags/items/nuggets/brass.json | 3 +- .../data/forge/tags/items/nuggets/copper.json | 3 +- .../data/forge/tags/items/nuggets/zinc.json | 3 +- .../data/forge/tags/items/ores/copper.json | 3 +- .../data/forge/tags/items/ores/zinc.json | 3 +- .../data/forge/tags/items/plates.json | 3 +- .../data/forge/tags/items/plates/brass.json | 3 +- .../data/forge/tags/items/plates/copper.json | 3 +- .../data/forge/tags/items/plates/gold.json | 3 +- .../data/forge/tags/items/plates/iron.json | 3 +- .../data/forge/tags/items/plates/lapis.json | 3 +- .../tags/items/storage_blocks/brass.json | 3 +- .../tags/items/storage_blocks/copper.json | 3 +- .../forge/tags/items/storage_blocks/zinc.json | 3 +- .../data/minecraft/tags/blocks/rails.json | 3 +- .../data/minecraft/tags/blocks/slabs.json | 3 +- .../data/minecraft/tags/blocks/stairs.json | 3 +- .../data/minecraft/tags/blocks/walls.json | 3 +- .../data/minecraft/tags/items/slabs.json | 3 +- .../data/minecraft/tags/items/stairs.json | 3 +- .../data/minecraft/tags/items/walls.json | 3 +- .../java/com/simibubi/create/AllBlocks.java | 6 +- .../com/simibubi/create/AllBlocksNew.java | 36 +++- .../com/simibubi/create/AllTileEntities.java | 4 +- .../utility/data/SpecialBlockStateGen.java | 31 +++ .../relays/encased/AdjustablePulleyBlock.java | 3 +- .../relays/encased/EncasedBeltBlock.java | 4 +- .../relays/encased/EncasedBeltGenerator.java | 72 +++++++ src/main/resources/META-INF/mods.toml | 2 +- .../create/blockstates/adjustable_pulley.json | 59 ------ .../create/blockstates/encased_belt.json | 31 --- .../adjustable_pulley/end_horizontal.json | 7 - .../block/adjustable_pulley/end_vertical.json | 7 - .../models/block/adjustable_pulley/item.json | 6 - .../adjustable_pulley/middle_horizontal.json | 7 - .../adjustable_pulley/middle_vertical.json | 7 - .../powered/end_horizontal.json | 7 - .../powered/end_vertical.json | 7 - .../powered/middle_horizontal.json | 7 - .../powered/middle_vertical.json | 7 - .../adjustable_pulley/powered/single.json | 7 - .../block/adjustable_pulley/single.json | 7 - .../block/encased_belt/end_horizontal.json | 28 +-- .../block/encased_belt/end_vertical.json | 32 +-- .../models/block/encased_belt/item.json | 28 +-- .../block/encased_belt/middle_horizontal.json | 20 +- .../block/encased_belt/middle_vertical.json | 20 +- .../models/block/encased_belt/single.json | 28 +-- .../create/models/item/adjustable_pulley.json | 3 - .../create/models/item/encased_belt.json | 3 - ...e_pulley_off.png => adjustable_pulley.png} | Bin ...y_on.png => adjustable_pulley_powered.png} | Bin 80 files changed, 664 insertions(+), 357 deletions(-) create mode 100644 src/generated/resources/assets/create/blockstates/adjustable_pulley.json create mode 100644 src/generated/resources/assets/create/blockstates/encased_belt.json create mode 100644 src/generated/resources/assets/create/models/block/adjustable_pulley_end_horizontal.json create mode 100644 src/generated/resources/assets/create/models/block/adjustable_pulley_end_horizontal_powered.json create mode 100644 src/generated/resources/assets/create/models/block/adjustable_pulley_end_vertical.json create mode 100644 src/generated/resources/assets/create/models/block/adjustable_pulley_end_vertical_powered.json create mode 100644 src/generated/resources/assets/create/models/block/adjustable_pulley_middle_horizontal.json create mode 100644 src/generated/resources/assets/create/models/block/adjustable_pulley_middle_horizontal_powered.json create mode 100644 src/generated/resources/assets/create/models/block/adjustable_pulley_middle_vertical.json create mode 100644 src/generated/resources/assets/create/models/block/adjustable_pulley_middle_vertical_powered.json create mode 100644 src/generated/resources/assets/create/models/block/adjustable_pulley_single.json create mode 100644 src/generated/resources/assets/create/models/block/adjustable_pulley_single_powered.json create mode 100644 src/generated/resources/assets/create/models/item/adjustable_pulley.json create mode 100644 src/generated/resources/assets/create/models/item/encased_belt.json create mode 100644 src/main/java/com/simibubi/create/foundation/utility/data/SpecialBlockStateGen.java create mode 100644 src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedBeltGenerator.java delete mode 100644 src/main/resources/assets/create/blockstates/adjustable_pulley.json delete mode 100644 src/main/resources/assets/create/blockstates/encased_belt.json delete mode 100644 src/main/resources/assets/create/models/block/adjustable_pulley/end_horizontal.json delete mode 100644 src/main/resources/assets/create/models/block/adjustable_pulley/end_vertical.json delete mode 100644 src/main/resources/assets/create/models/block/adjustable_pulley/item.json delete mode 100644 src/main/resources/assets/create/models/block/adjustable_pulley/middle_horizontal.json delete mode 100644 src/main/resources/assets/create/models/block/adjustable_pulley/middle_vertical.json delete mode 100644 src/main/resources/assets/create/models/block/adjustable_pulley/powered/end_horizontal.json delete mode 100644 src/main/resources/assets/create/models/block/adjustable_pulley/powered/end_vertical.json delete mode 100644 src/main/resources/assets/create/models/block/adjustable_pulley/powered/middle_horizontal.json delete mode 100644 src/main/resources/assets/create/models/block/adjustable_pulley/powered/middle_vertical.json delete mode 100644 src/main/resources/assets/create/models/block/adjustable_pulley/powered/single.json delete mode 100644 src/main/resources/assets/create/models/block/adjustable_pulley/single.json delete mode 100644 src/main/resources/assets/create/models/item/adjustable_pulley.json delete mode 100644 src/main/resources/assets/create/models/item/encased_belt.json rename src/main/resources/assets/create/textures/block/{adjustable_pulley_off.png => adjustable_pulley.png} (100%) rename src/main/resources/assets/create/textures/block/{adjustable_pulley_on.png => adjustable_pulley_powered.png} (100%) diff --git a/build.gradle b/build.gradle index 884066c06..e0e893ea6 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ configurations { } dependencies { - minecraft 'net.minecraftforge:forge:1.15.2-31.1.36' + minecraft 'net.minecraftforge:forge:1.15.2-31.2.0' def registrate = "com.tterrag.registrate:Registrate:MC1.15.2-0.0.3.11" implementation fg.deobf(registrate) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 622438326..a12122db8 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,5 +1,6 @@ 16539ad12ee9e1ee004dec3fd62122b3e17c8e77 assets\create\blockstates\acacia_window.json f0d6baaabda94151134f569246d61a6e710c35a9 assets\create\blockstates\acacia_window_pane.json +029e6fbb2760f5a93575981372f394ed3f12ce7f assets\create\blockstates\adjustable_pulley.json 585481e97c5066af63ea12fa5dd658798844d64c assets\create\blockstates\andesite_bricks.json 4e8d61aa2c8490301317ef747f67f0169ebfc2ed assets\create\blockstates\andesite_bricks_slab.json da63a8be3191d6d72afef6c79e3aea3f607631f9 assets\create\blockstates\andesite_bricks_stairs.json @@ -54,6 +55,7 @@ a2b7259dacf7b582e3b819e12015b5e18a1768e5 assets\create\blockstates\dolomite_cobb e7c1db7226df5858f1884f0cf328a733fec22c3d assets\create\blockstates\dolomite_cobblestone_stairs.json f63a5816d4bfe643aa098d03c3b54462dd06fe19 assets\create\blockstates\dolomite_cobblestone_wall.json 6d7f0c92ee978366d2b019e35cf2fc6a2e4de37d assets\create\blockstates\dolomite_pillar.json +7b1c40891b07c8f3238537625d9e25c8627e7333 assets\create\blockstates\encased_belt.json 373ac3c29b553322291599e93eac12000c4a87f8 assets\create\blockstates\encased_shaft.json a774e815376a67e2a2de44e39af0a1a0b4406932 assets\create\blockstates\fancy_andesite_bricks.json 180be26a75834cf9cdb881f969f77906e91cc36a assets\create\blockstates\fancy_andesite_bricks_slab.json @@ -253,14 +255,24 @@ c60c3115fd6eeaa3a696428a87a74d184ab7d62d assets\create\blockstates\weathered_lim 7e2476ffff93d0eedee5314e5692fcbf5692bffc assets\create\blockstates\weathered_limestone_pillar.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets\create\blockstates\zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets\create\blockstates\zinc_ore.json -5dbfc71c642672428b88a2fd7f31516f7d8f5c31 assets\create\lang\en_ud.json -24601285e20a92802b386b94004acc6abf484af3 assets\create\lang\en_us.json +5987ff1a91023708bca1878a8a576f2f1b6a53f0 assets\create\lang\en_ud.json +b511c344b44c62444a9c096b30bcac77fe5b8382 assets\create\lang\en_us.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 7d23c8e4543108f5f53b78ccb4908f7a5bb76c54 assets\create\models\block\acacia_window_pane_post.json 3bdcc6bd616a179ffc22e66307aab538e9bcb75f assets\create\models\block\acacia_window_pane_side.json 7b5b6809e3ef685a497ba15b549d3918aeb6c135 assets\create\models\block\acacia_window_pane_side_alt.json +7c81658c8839fdb23429e54f847c2a0aee0e866e assets\create\models\block\adjustable_pulley_end_horizontal.json +20cfb751fc395a0e07c66ce87ab035207f9d1e0e assets\create\models\block\adjustable_pulley_end_horizontal_powered.json +bb02f94b260be8fe1944b801cc4050b4d213f1df assets\create\models\block\adjustable_pulley_end_vertical.json +634b76bd58fe3d485fc2a3212a10a7b3ff6a92a7 assets\create\models\block\adjustable_pulley_end_vertical_powered.json +b3937db45bc7af8eefc0459f5429f9d79490e12e assets\create\models\block\adjustable_pulley_middle_horizontal.json +b0dc21bc9c0e48f4a557f760e351db6c99f34585 assets\create\models\block\adjustable_pulley_middle_horizontal_powered.json +e4cf5269494e614eaa699b0ed104ca5829e86f26 assets\create\models\block\adjustable_pulley_middle_vertical.json +d190170ebddb64c7874ef18e380dc6ece8f46007 assets\create\models\block\adjustable_pulley_middle_vertical_powered.json +9eff0ff2df8f7baf5ad3c0f47730f6d260822e99 assets\create\models\block\adjustable_pulley_single.json +7f731fe96ca538256fb98ba77e8857edb5cd2306 assets\create\models\block\adjustable_pulley_single_powered.json 4d412de3eb98dfee548a0dcdbae5d0168ac67123 assets\create\models\block\andesite_bricks.json 054ef3fff7f146dbf8adc92dc2b6d169c2bdb7a5 assets\create\models\block\andesite_bricks_slab.json 8784414839f6a5786bf43d6a7dff6c27bdf7fe46 assets\create\models\block\andesite_bricks_slab_top.json @@ -751,6 +763,7 @@ c94c60d1d77404af7d74a29a094c7bdf7501b385 assets\create\models\block\zinc_block.j a3ff06384fff574ac4cd6c253259f0734b025cab assets\create\models\block\zinc_ore.json 67ef6fd6ec26fc216fa5319b8538beb223da1530 assets\create\models\item\acacia_window.json cbc0ebadda4497663437f99622914de678d0ffaf assets\create\models\item\acacia_window_pane.json +10aba4b84af792048d27d3befb42d44b523b5f7d assets\create\models\item\adjustable_pulley.json a513af38f164a48fd44693b70a93012f3546caff assets\create\models\item\andesite_bricks.json 851090d21c6e6c67444324d975c6b3270eaf4ff2 assets\create\models\item\andesite_bricks_slab.json d283f86cd05ed378efd82ce46cf49bc83783069b assets\create\models\item\andesite_bricks_stairs.json @@ -805,6 +818,7 @@ f92bc71df40567367d08798a6ea45e7e8d0b07b0 assets\create\models\item\dolomite_cobb be7de1e1529fb2a2e842204136520a760676d4e9 assets\create\models\item\dolomite_cobblestone_stairs.json 6b03f2be8fa1e62a89d59859e7d40f9e45ab8b65 assets\create\models\item\dolomite_cobblestone_wall.json e974cd23a5456baef8b634f2d21fd8c3822931ab assets\create\models\item\dolomite_pillar.json +f2d6b88c3174de01e16da555236727efc33b490c assets\create\models\item\encased_belt.json e0f9ad7e7d790e9e21a38fa57395fd3ff892359b assets\create\models\item\encased_shaft.json efcbd30ad7a7658c02a3dc3de5fa0f21d7f49b54 assets\create\models\item\fancy_andesite_bricks.json 7ccd312084128c356307c7ca6e52c65d0a18907b assets\create\models\item\fancy_andesite_bricks_slab.json @@ -1364,34 +1378,34 @@ d5c30af1052332ff3ef6d837ca2bf51c51e14c8d data\create\recipes\brass_block.json 386c52f0aad6e2239f31dc85f7e745b47230846b data\create\recipes\copper_block.json f863c101808434316da5261b0274f09d80065ea5 data\create\recipes\copper_shingles.json 266f08e604d229a9d2b46f7272c0b06ec270bf3d data\create\recipes\zinc_block.json -95d2533863d22fc66babc04ae9cc5cd145e20e1a data\forge\tags\blocks\ores\copper.json -49be45d747ce9fa674515b1c1c68df9ebc9afd28 data\forge\tags\blocks\ores\zinc.json -12fd1e1dc1ca0cbe904bf798b10f62b5cf37fb34 data\forge\tags\blocks\storage_blocks\brass.json -dbc150e49d73f14def029fe54fb70e9001830af2 data\forge\tags\blocks\storage_blocks\copper.json -a722d55ec21979b443a7d2cb1e68b19d9b91e224 data\forge\tags\blocks\storage_blocks\zinc.json -76982ba58ac3aed8b1a072a07ce390a8fb82f8d3 data\forge\tags\items\ingots.json -cb4dce916166df989377388f09bc75288288ec33 data\forge\tags\items\ingots\brass.json -6ebd530ef815b54f4fe0582f19028d9aa2a404f9 data\forge\tags\items\ingots\copper.json -49944029d75cc84802753c8ebb7119d20e2a9034 data\forge\tags\items\ingots\zinc.json -f9b4bfa9a10addd1e7ad03e05439cb9035913fb1 data\forge\tags\items\nuggets.json -753baf7f28874ae42fbb8509f3b29ae3245f5fb5 data\forge\tags\items\nuggets\brass.json -3ba27781962c597c5f7df50a240dabce20452d88 data\forge\tags\items\nuggets\copper.json -9e1208ce7a9a4805664d97955ee755273a2d4a25 data\forge\tags\items\nuggets\zinc.json -95d2533863d22fc66babc04ae9cc5cd145e20e1a data\forge\tags\items\ores\copper.json -49be45d747ce9fa674515b1c1c68df9ebc9afd28 data\forge\tags\items\ores\zinc.json -bb1d34063c9d2e196fb9efcb8dd691e3bd123b9e data\forge\tags\items\plates.json -99b23d251591b3c8c17ffd947af6b2b6e78d5652 data\forge\tags\items\plates\brass.json -708af49da48f0bf0bef7ec942c3adc40f0ca3cd7 data\forge\tags\items\plates\copper.json -f8ab90a5522f4e80e030cfc832edf9af8d3009d1 data\forge\tags\items\plates\gold.json -9a48608de59bd52e8b14385bd3d13dba06ab306d data\forge\tags\items\plates\iron.json -9bb964b32bdf567f4ad388599e4faf08affd64e7 data\forge\tags\items\plates\lapis.json -12fd1e1dc1ca0cbe904bf798b10f62b5cf37fb34 data\forge\tags\items\storage_blocks\brass.json -dbc150e49d73f14def029fe54fb70e9001830af2 data\forge\tags\items\storage_blocks\copper.json -a722d55ec21979b443a7d2cb1e68b19d9b91e224 data\forge\tags\items\storage_blocks\zinc.json -021c009005611030d3dc8602ab2a2a5a10d7ed96 data\minecraft\tags\blocks\rails.json -0162e7b4adfb28e25b3ca0d4dd3ec51ff57784ba data\minecraft\tags\blocks\slabs.json -b121cb0e98dfe6fd076fec8116ca0f85dcaffdce data\minecraft\tags\blocks\stairs.json -d1723fde3fda57d7d3a7b9d565c3b8490ecb6bdd data\minecraft\tags\blocks\walls.json -0162e7b4adfb28e25b3ca0d4dd3ec51ff57784ba data\minecraft\tags\items\slabs.json -b121cb0e98dfe6fd076fec8116ca0f85dcaffdce data\minecraft\tags\items\stairs.json -d1723fde3fda57d7d3a7b9d565c3b8490ecb6bdd data\minecraft\tags\items\walls.json +4a0b13a9835106de9a1dd0a71a02372abb48e7b6 data\forge\tags\blocks\ores\copper.json +d5ea262a0f5fb210612d22521818e26cf08e591a data\forge\tags\blocks\ores\zinc.json +ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data\forge\tags\blocks\storage_blocks\brass.json +f6c8f34ceb475546dba5cc6ff288863ea795d20b data\forge\tags\blocks\storage_blocks\copper.json +7f71a774800111e50b42de0e6159ed2d2a807d32 data\forge\tags\blocks\storage_blocks\zinc.json +689000fe8dde7ac020ac84875f01a27331ce8f3b data\forge\tags\items\ingots.json +2dfd21017cb51d4bdc18d977a7d16f103cc3a985 data\forge\tags\items\ingots\brass.json +8e0ca32df10a50544f54fbe3dbfe485971b23315 data\forge\tags\items\ingots\copper.json +2f9ac80569a5cc168061742f9e3c36277d4d056e data\forge\tags\items\ingots\zinc.json +28e41220b4d933cb95fe7e4f8d1b062f5922e29c data\forge\tags\items\nuggets.json +cc82188fe8d986f4457301ed4f75ae833d263601 data\forge\tags\items\nuggets\brass.json +7affb30e30a252566a77467994b0c99331f1076c data\forge\tags\items\nuggets\copper.json +0d8cb5092ee6ec01ea09324c80d649ba05549799 data\forge\tags\items\nuggets\zinc.json +4a0b13a9835106de9a1dd0a71a02372abb48e7b6 data\forge\tags\items\ores\copper.json +d5ea262a0f5fb210612d22521818e26cf08e591a data\forge\tags\items\ores\zinc.json +9db8fecba63944baec58a6059a3c4ce29ef79313 data\forge\tags\items\plates.json +39f0d70ec10597e85df7c4783bbc5e0e4a5ffb80 data\forge\tags\items\plates\brass.json +c3dab5fe379bc1b7b10d4a0ba7009eee1b75a27c data\forge\tags\items\plates\copper.json +e5d4131644a084c9dd724e5f0dfa2a418ffee45d data\forge\tags\items\plates\gold.json +04d947ed7a5066f3cfe75a8dc564fe2dca8a9c93 data\forge\tags\items\plates\iron.json +56c0ccf7a6995f41f21e6ab5c0088e61b12e23fc data\forge\tags\items\plates\lapis.json +ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data\forge\tags\items\storage_blocks\brass.json +f6c8f34ceb475546dba5cc6ff288863ea795d20b data\forge\tags\items\storage_blocks\copper.json +7f71a774800111e50b42de0e6159ed2d2a807d32 data\forge\tags\items\storage_blocks\zinc.json +b217a66f3364c21c313d0ab427ccb82d9f21abb8 data\minecraft\tags\blocks\rails.json +29e6f7e3d4be9a9b0af1fca5d32fa55e29905ce2 data\minecraft\tags\blocks\slabs.json +0d188ad2c33d10ee8f0d455c4e63a4460a8302fb data\minecraft\tags\blocks\stairs.json +92584f914c53e00c111f9ff5e3894e2e3594946b data\minecraft\tags\blocks\walls.json +29e6f7e3d4be9a9b0af1fca5d32fa55e29905ce2 data\minecraft\tags\items\slabs.json +0d188ad2c33d10ee8f0d455c4e63a4460a8302fb data\minecraft\tags\items\stairs.json +92584f914c53e00c111f9ff5e3894e2e3594946b data\minecraft\tags\items\walls.json diff --git a/src/generated/resources/assets/create/blockstates/adjustable_pulley.json b/src/generated/resources/assets/create/blockstates/adjustable_pulley.json new file mode 100644 index 000000000..84b556520 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/adjustable_pulley.json @@ -0,0 +1,190 @@ +{ + "variants": { + "axis=x,axis_along_first=false,part=start,powered=false": { + "model": "create:block/adjustable_pulley_end_horizontal", + "x": 180 + }, + "axis=y,axis_along_first=false,part=start,powered=false": { + "model": "create:block/adjustable_pulley_end_vertical" + }, + "axis=z,axis_along_first=false,part=start,powered=false": { + "model": "create:block/adjustable_pulley_end_horizontal", + "x": 270, + "y": 90 + }, + "axis=x,axis_along_first=true,part=start,powered=false": { + "model": "create:block/adjustable_pulley_end_horizontal", + "x": 270 + }, + "axis=y,axis_along_first=true,part=start,powered=false": { + "model": "create:block/adjustable_pulley_end_vertical", + "y": 270 + }, + "axis=z,axis_along_first=true,part=start,powered=false": { + "model": "create:block/adjustable_pulley_end_horizontal", + "y": 90 + }, + "axis=x,axis_along_first=false,part=middle,powered=false": { + "model": "create:block/adjustable_pulley_middle_horizontal" + }, + "axis=y,axis_along_first=false,part=middle,powered=false": { + "model": "create:block/adjustable_pulley_middle_vertical" + }, + "axis=z,axis_along_first=false,part=middle,powered=false": { + "model": "create:block/adjustable_pulley_middle_horizontal", + "x": 90, + "y": 90 + }, + "axis=x,axis_along_first=true,part=middle,powered=false": { + "model": "create:block/adjustable_pulley_middle_horizontal", + "x": 90 + }, + "axis=y,axis_along_first=true,part=middle,powered=false": { + "model": "create:block/adjustable_pulley_middle_vertical", + "y": 90 + }, + "axis=z,axis_along_first=true,part=middle,powered=false": { + "model": "create:block/adjustable_pulley_middle_horizontal", + "y": 90 + }, + "axis=x,axis_along_first=false,part=end,powered=false": { + "model": "create:block/adjustable_pulley_end_horizontal" + }, + "axis=y,axis_along_first=false,part=end,powered=false": { + "model": "create:block/adjustable_pulley_end_vertical", + "y": 180 + }, + "axis=z,axis_along_first=false,part=end,powered=false": { + "model": "create:block/adjustable_pulley_end_horizontal", + "x": 90, + "y": 90 + }, + "axis=x,axis_along_first=true,part=end,powered=false": { + "model": "create:block/adjustable_pulley_end_horizontal", + "x": 90 + }, + "axis=y,axis_along_first=true,part=end,powered=false": { + "model": "create:block/adjustable_pulley_end_vertical", + "y": 90 + }, + "axis=z,axis_along_first=true,part=end,powered=false": { + "model": "create:block/adjustable_pulley_end_horizontal", + "y": 270 + }, + "axis=x,axis_along_first=false,part=none,powered=false": { + "model": "create:block/adjustable_pulley_single", + "y": 90 + }, + "axis=y,axis_along_first=false,part=none,powered=false": { + "model": "create:block/adjustable_pulley_single", + "x": 90 + }, + "axis=z,axis_along_first=false,part=none,powered=false": { + "model": "create:block/adjustable_pulley_single" + }, + "axis=x,axis_along_first=true,part=none,powered=false": { + "model": "create:block/adjustable_pulley_single", + "y": 90 + }, + "axis=y,axis_along_first=true,part=none,powered=false": { + "model": "create:block/adjustable_pulley_single", + "x": 90 + }, + "axis=z,axis_along_first=true,part=none,powered=false": { + "model": "create:block/adjustable_pulley_single" + }, + "axis=x,axis_along_first=false,part=start,powered=true": { + "model": "create:block/adjustable_pulley_end_horizontal_powered", + "x": 180 + }, + "axis=y,axis_along_first=false,part=start,powered=true": { + "model": "create:block/adjustable_pulley_end_vertical_powered" + }, + "axis=z,axis_along_first=false,part=start,powered=true": { + "model": "create:block/adjustable_pulley_end_horizontal_powered", + "x": 270, + "y": 90 + }, + "axis=x,axis_along_first=true,part=start,powered=true": { + "model": "create:block/adjustable_pulley_end_horizontal_powered", + "x": 270 + }, + "axis=y,axis_along_first=true,part=start,powered=true": { + "model": "create:block/adjustable_pulley_end_vertical_powered", + "y": 270 + }, + "axis=z,axis_along_first=true,part=start,powered=true": { + "model": "create:block/adjustable_pulley_end_horizontal_powered", + "y": 90 + }, + "axis=x,axis_along_first=false,part=middle,powered=true": { + "model": "create:block/adjustable_pulley_middle_horizontal_powered" + }, + "axis=y,axis_along_first=false,part=middle,powered=true": { + "model": "create:block/adjustable_pulley_middle_vertical_powered" + }, + "axis=z,axis_along_first=false,part=middle,powered=true": { + "model": "create:block/adjustable_pulley_middle_horizontal_powered", + "x": 90, + "y": 90 + }, + "axis=x,axis_along_first=true,part=middle,powered=true": { + "model": "create:block/adjustable_pulley_middle_horizontal_powered", + "x": 90 + }, + "axis=y,axis_along_first=true,part=middle,powered=true": { + "model": "create:block/adjustable_pulley_middle_vertical_powered", + "y": 90 + }, + "axis=z,axis_along_first=true,part=middle,powered=true": { + "model": "create:block/adjustable_pulley_middle_horizontal_powered", + "y": 90 + }, + "axis=x,axis_along_first=false,part=end,powered=true": { + "model": "create:block/adjustable_pulley_end_horizontal_powered" + }, + "axis=y,axis_along_first=false,part=end,powered=true": { + "model": "create:block/adjustable_pulley_end_vertical_powered", + "y": 180 + }, + "axis=z,axis_along_first=false,part=end,powered=true": { + "model": "create:block/adjustable_pulley_end_horizontal_powered", + "x": 90, + "y": 90 + }, + "axis=x,axis_along_first=true,part=end,powered=true": { + "model": "create:block/adjustable_pulley_end_horizontal_powered", + "x": 90 + }, + "axis=y,axis_along_first=true,part=end,powered=true": { + "model": "create:block/adjustable_pulley_end_vertical_powered", + "y": 90 + }, + "axis=z,axis_along_first=true,part=end,powered=true": { + "model": "create:block/adjustable_pulley_end_horizontal_powered", + "y": 270 + }, + "axis=x,axis_along_first=false,part=none,powered=true": { + "model": "create:block/adjustable_pulley_single_powered", + "y": 90 + }, + "axis=y,axis_along_first=false,part=none,powered=true": { + "model": "create:block/adjustable_pulley_single_powered", + "x": 90 + }, + "axis=z,axis_along_first=false,part=none,powered=true": { + "model": "create:block/adjustable_pulley_single_powered" + }, + "axis=x,axis_along_first=true,part=none,powered=true": { + "model": "create:block/adjustable_pulley_single_powered", + "y": 90 + }, + "axis=y,axis_along_first=true,part=none,powered=true": { + "model": "create:block/adjustable_pulley_single_powered", + "x": 90 + }, + "axis=z,axis_along_first=true,part=none,powered=true": { + "model": "create:block/adjustable_pulley_single_powered" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/encased_belt.json b/src/generated/resources/assets/create/blockstates/encased_belt.json new file mode 100644 index 000000000..0b885ee88 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/encased_belt.json @@ -0,0 +1,97 @@ +{ + "variants": { + "axis=x,axis_along_first=false,part=start": { + "model": "create:block/encased_belt/end_horizontal", + "x": 180 + }, + "axis=y,axis_along_first=false,part=start": { + "model": "create:block/encased_belt/end_vertical" + }, + "axis=z,axis_along_first=false,part=start": { + "model": "create:block/encased_belt/end_horizontal", + "x": 270, + "y": 90 + }, + "axis=x,axis_along_first=true,part=start": { + "model": "create:block/encased_belt/end_horizontal", + "x": 270 + }, + "axis=y,axis_along_first=true,part=start": { + "model": "create:block/encased_belt/end_vertical", + "y": 270 + }, + "axis=z,axis_along_first=true,part=start": { + "model": "create:block/encased_belt/end_horizontal", + "y": 90 + }, + "axis=x,axis_along_first=false,part=middle": { + "model": "create:block/encased_belt/middle_horizontal" + }, + "axis=y,axis_along_first=false,part=middle": { + "model": "create:block/encased_belt/middle_vertical" + }, + "axis=z,axis_along_first=false,part=middle": { + "model": "create:block/encased_belt/middle_horizontal", + "x": 90, + "y": 90 + }, + "axis=x,axis_along_first=true,part=middle": { + "model": "create:block/encased_belt/middle_horizontal", + "x": 90 + }, + "axis=y,axis_along_first=true,part=middle": { + "model": "create:block/encased_belt/middle_vertical", + "y": 90 + }, + "axis=z,axis_along_first=true,part=middle": { + "model": "create:block/encased_belt/middle_horizontal", + "y": 90 + }, + "axis=x,axis_along_first=false,part=end": { + "model": "create:block/encased_belt/end_horizontal" + }, + "axis=y,axis_along_first=false,part=end": { + "model": "create:block/encased_belt/end_vertical", + "y": 180 + }, + "axis=z,axis_along_first=false,part=end": { + "model": "create:block/encased_belt/end_horizontal", + "x": 90, + "y": 90 + }, + "axis=x,axis_along_first=true,part=end": { + "model": "create:block/encased_belt/end_horizontal", + "x": 90 + }, + "axis=y,axis_along_first=true,part=end": { + "model": "create:block/encased_belt/end_vertical", + "y": 90 + }, + "axis=z,axis_along_first=true,part=end": { + "model": "create:block/encased_belt/end_horizontal", + "y": 270 + }, + "axis=x,axis_along_first=false,part=none": { + "model": "create:block/encased_belt/single", + "y": 90 + }, + "axis=y,axis_along_first=false,part=none": { + "model": "create:block/encased_belt/single", + "x": 90 + }, + "axis=z,axis_along_first=false,part=none": { + "model": "create:block/encased_belt/single" + }, + "axis=x,axis_along_first=true,part=none": { + "model": "create:block/encased_belt/single", + "y": 90 + }, + "axis=y,axis_along_first=true,part=none": { + "model": "create:block/encased_belt/single", + "x": 90 + }, + "axis=z,axis_along_first=true,part=none": { + "model": "create:block/encased_belt/single" + } + } +} \ 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 c79b3fee9..468d8564b 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -1,6 +1,7 @@ { "block.create.acacia_window": "\u028Dopu\u0131M \u0250\u0131\u0254\u0250\u0254\u2C6F", "block.create.acacia_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u0250\u0131\u0254\u0250\u0254\u2C6F", + "block.create.adjustable_pulley": "\u028E\u01DD\u05DF\u05DFn\u0500 \u01DD\u05DFq\u0250\u0287sn\u0638p\u2C6F", "block.create.andesite_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_bricks_stairs": "s\u0279\u0131\u0250\u0287S s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", @@ -55,6 +56,7 @@ "block.create.dolomite_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131\u026Fo\u05DFo\u15E1", "block.create.dolomite_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131\u026Fo\u05DFo\u15E1", "block.create.dolomite_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DD\u0287\u0131\u026Fo\u05DFo\u15E1", + "block.create.encased_belt": "\u0287\u05DF\u01DD\u15FA p\u01DDs\u0250\u0254u\u018E", "block.create.encased_shaft": "\u0287\u025F\u0250\u0265S p\u01DDs\u0250\u0254u\u018E", "block.create.fancy_andesite_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F \u028E\u0254u\u0250\u2132", "block.create.fancy_andesite_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F \u028E\u0254u\u0250\u2132", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 83898741f..c1b23be69 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1,6 +1,7 @@ { "block.create.acacia_window": "Acacia Window", "block.create.acacia_window_pane": "Acacia Window Pane", + "block.create.adjustable_pulley": "Adjustable Pulley", "block.create.andesite_bricks": "Andesite Bricks", "block.create.andesite_bricks_slab": "Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "Andesite Bricks Stairs", @@ -55,6 +56,7 @@ "block.create.dolomite_cobblestone_stairs": "Dolomite Cobblestone Stairs", "block.create.dolomite_cobblestone_wall": "Dolomite Cobblestone Wall", "block.create.dolomite_pillar": "Dolomite Pillar", + "block.create.encased_belt": "Encased Belt", "block.create.encased_shaft": "Encased Shaft", "block.create.fancy_andesite_bricks": "Fancy Andesite Bricks", "block.create.fancy_andesite_bricks_slab": "Fancy Andesite Bricks Slab", diff --git a/src/generated/resources/assets/create/models/block/adjustable_pulley_end_horizontal.json b/src/generated/resources/assets/create/models/block/adjustable_pulley_end_horizontal.json new file mode 100644 index 000000000..5bdb2195e --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_pulley_end_horizontal.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/encased_belt/end_horizontal", + "textures": { + "side": "create:block/adjustable_pulley" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/adjustable_pulley_end_horizontal_powered.json b/src/generated/resources/assets/create/models/block/adjustable_pulley_end_horizontal_powered.json new file mode 100644 index 000000000..37b7334c7 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_pulley_end_horizontal_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/encased_belt/end_horizontal", + "textures": { + "side": "create:block/adjustable_pulley_powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/adjustable_pulley_end_vertical.json b/src/generated/resources/assets/create/models/block/adjustable_pulley_end_vertical.json new file mode 100644 index 000000000..6bab6054b --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_pulley_end_vertical.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/encased_belt/end_vertical", + "textures": { + "side": "create:block/adjustable_pulley" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/adjustable_pulley_end_vertical_powered.json b/src/generated/resources/assets/create/models/block/adjustable_pulley_end_vertical_powered.json new file mode 100644 index 000000000..47af2d5ca --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_pulley_end_vertical_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/encased_belt/end_vertical", + "textures": { + "side": "create:block/adjustable_pulley_powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/adjustable_pulley_middle_horizontal.json b/src/generated/resources/assets/create/models/block/adjustable_pulley_middle_horizontal.json new file mode 100644 index 000000000..0718add3c --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_pulley_middle_horizontal.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/encased_belt/middle_horizontal", + "textures": { + "side": "create:block/adjustable_pulley" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/adjustable_pulley_middle_horizontal_powered.json b/src/generated/resources/assets/create/models/block/adjustable_pulley_middle_horizontal_powered.json new file mode 100644 index 000000000..e8652368e --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_pulley_middle_horizontal_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/encased_belt/middle_horizontal", + "textures": { + "side": "create:block/adjustable_pulley_powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/adjustable_pulley_middle_vertical.json b/src/generated/resources/assets/create/models/block/adjustable_pulley_middle_vertical.json new file mode 100644 index 000000000..3884eaec4 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_pulley_middle_vertical.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/encased_belt/middle_vertical", + "textures": { + "side": "create:block/adjustable_pulley" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/adjustable_pulley_middle_vertical_powered.json b/src/generated/resources/assets/create/models/block/adjustable_pulley_middle_vertical_powered.json new file mode 100644 index 000000000..a96d7ca8a --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_pulley_middle_vertical_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/encased_belt/middle_vertical", + "textures": { + "side": "create:block/adjustable_pulley_powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/adjustable_pulley_single.json b/src/generated/resources/assets/create/models/block/adjustable_pulley_single.json new file mode 100644 index 000000000..56b3822f7 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_pulley_single.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/encased_belt/single", + "textures": { + "side": "create:block/adjustable_pulley" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/adjustable_pulley_single_powered.json b/src/generated/resources/assets/create/models/block/adjustable_pulley_single_powered.json new file mode 100644 index 000000000..412ed36ee --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_pulley_single_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/encased_belt/single", + "textures": { + "side": "create:block/adjustable_pulley_powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/adjustable_pulley.json b/src/generated/resources/assets/create/models/item/adjustable_pulley.json new file mode 100644 index 000000000..ff01db8da --- /dev/null +++ b/src/generated/resources/assets/create/models/item/adjustable_pulley.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/encased_belt/item", + "textures": { + "side": "create:block/adjustable_pulley" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/encased_belt.json b/src/generated/resources/assets/create/models/item/encased_belt.json new file mode 100644 index 000000000..967e04efe --- /dev/null +++ b/src/generated/resources/assets/create/models/item/encased_belt.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/encased_belt/item" +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ores/copper.json b/src/generated/resources/data/forge/tags/blocks/ores/copper.json index 3469f57fd..4b386dbe0 100644 --- a/src/generated/resources/data/forge/tags/blocks/ores/copper.json +++ b/src/generated/resources/data/forge/tags/blocks/ores/copper.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:copper_ore" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ores/zinc.json b/src/generated/resources/data/forge/tags/blocks/ores/zinc.json index 5a05026cc..9389dcb95 100644 --- a/src/generated/resources/data/forge/tags/blocks/ores/zinc.json +++ b/src/generated/resources/data/forge/tags/blocks/ores/zinc.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:zinc_ore" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/brass.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/brass.json index b20a52e99..1628821d5 100644 --- a/src/generated/resources/data/forge/tags/blocks/storage_blocks/brass.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/brass.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:brass_block" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json index be78443ca..0b5561d1f 100644 --- a/src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:copper_block" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/zinc.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/zinc.json index ee7c25d49..c4e4a73b8 100644 --- a/src/generated/resources/data/forge/tags/blocks/storage_blocks/zinc.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/zinc.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:zinc_block" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots.json b/src/generated/resources/data/forge/tags/items/ingots.json index efda80e5f..67624f22f 100644 --- a/src/generated/resources/data/forge/tags/items/ingots.json +++ b/src/generated/resources/data/forge/tags/items/ingots.json @@ -4,6 +4,5 @@ "#forge:ingots/copper", "#forge:ingots/zinc", "#forge:ingots/brass" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/brass.json b/src/generated/resources/data/forge/tags/items/ingots/brass.json index 4d5ab01cb..feebc4293 100644 --- a/src/generated/resources/data/forge/tags/items/ingots/brass.json +++ b/src/generated/resources/data/forge/tags/items/ingots/brass.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:brass_ingot" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/copper.json b/src/generated/resources/data/forge/tags/items/ingots/copper.json index bc30b7115..2617d2aeb 100644 --- a/src/generated/resources/data/forge/tags/items/ingots/copper.json +++ b/src/generated/resources/data/forge/tags/items/ingots/copper.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:copper_ingot" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/zinc.json b/src/generated/resources/data/forge/tags/items/ingots/zinc.json index 7a42265a5..401a1ea1d 100644 --- a/src/generated/resources/data/forge/tags/items/ingots/zinc.json +++ b/src/generated/resources/data/forge/tags/items/ingots/zinc.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:zinc_ingot" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/nuggets.json b/src/generated/resources/data/forge/tags/items/nuggets.json index 094297265..00ed383ec 100644 --- a/src/generated/resources/data/forge/tags/items/nuggets.json +++ b/src/generated/resources/data/forge/tags/items/nuggets.json @@ -4,6 +4,5 @@ "#forge:nuggets/copper", "#forge:nuggets/zinc", "#forge:nuggets/brass" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/nuggets/brass.json b/src/generated/resources/data/forge/tags/items/nuggets/brass.json index 30e194d7d..3b9add6b0 100644 --- a/src/generated/resources/data/forge/tags/items/nuggets/brass.json +++ b/src/generated/resources/data/forge/tags/items/nuggets/brass.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:brass_nugget" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/nuggets/copper.json b/src/generated/resources/data/forge/tags/items/nuggets/copper.json index 3deec82e6..555bdee2c 100644 --- a/src/generated/resources/data/forge/tags/items/nuggets/copper.json +++ b/src/generated/resources/data/forge/tags/items/nuggets/copper.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:copper_nugget" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/nuggets/zinc.json b/src/generated/resources/data/forge/tags/items/nuggets/zinc.json index fc489bb84..55913868b 100644 --- a/src/generated/resources/data/forge/tags/items/nuggets/zinc.json +++ b/src/generated/resources/data/forge/tags/items/nuggets/zinc.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:zinc_nugget" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/copper.json b/src/generated/resources/data/forge/tags/items/ores/copper.json index 3469f57fd..4b386dbe0 100644 --- a/src/generated/resources/data/forge/tags/items/ores/copper.json +++ b/src/generated/resources/data/forge/tags/items/ores/copper.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:copper_ore" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/zinc.json b/src/generated/resources/data/forge/tags/items/ores/zinc.json index 5a05026cc..9389dcb95 100644 --- a/src/generated/resources/data/forge/tags/items/ores/zinc.json +++ b/src/generated/resources/data/forge/tags/items/ores/zinc.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:zinc_ore" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/plates.json b/src/generated/resources/data/forge/tags/items/plates.json index 8a7b79217..6a8dc83bf 100644 --- a/src/generated/resources/data/forge/tags/items/plates.json +++ b/src/generated/resources/data/forge/tags/items/plates.json @@ -6,6 +6,5 @@ "#forge:plates/copper", "#forge:plates/brass", "#forge:plates/lapis" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/plates/brass.json b/src/generated/resources/data/forge/tags/items/plates/brass.json index 2761c5fc2..c4b2191c7 100644 --- a/src/generated/resources/data/forge/tags/items/plates/brass.json +++ b/src/generated/resources/data/forge/tags/items/plates/brass.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:brass_sheet" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/plates/copper.json b/src/generated/resources/data/forge/tags/items/plates/copper.json index 6bc090997..71079712b 100644 --- a/src/generated/resources/data/forge/tags/items/plates/copper.json +++ b/src/generated/resources/data/forge/tags/items/plates/copper.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:copper_sheet" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/plates/gold.json b/src/generated/resources/data/forge/tags/items/plates/gold.json index 7565583d7..ba9349551 100644 --- a/src/generated/resources/data/forge/tags/items/plates/gold.json +++ b/src/generated/resources/data/forge/tags/items/plates/gold.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:gold_sheet" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/plates/iron.json b/src/generated/resources/data/forge/tags/items/plates/iron.json index 8d1bfb6bf..cfbf11632 100644 --- a/src/generated/resources/data/forge/tags/items/plates/iron.json +++ b/src/generated/resources/data/forge/tags/items/plates/iron.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:iron_sheet" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/plates/lapis.json b/src/generated/resources/data/forge/tags/items/plates/lapis.json index 7c41b4945..2700c9935 100644 --- a/src/generated/resources/data/forge/tags/items/plates/lapis.json +++ b/src/generated/resources/data/forge/tags/items/plates/lapis.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:lapis_plate" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/brass.json b/src/generated/resources/data/forge/tags/items/storage_blocks/brass.json index b20a52e99..1628821d5 100644 --- a/src/generated/resources/data/forge/tags/items/storage_blocks/brass.json +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/brass.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:brass_block" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/copper.json b/src/generated/resources/data/forge/tags/items/storage_blocks/copper.json index be78443ca..0b5561d1f 100644 --- a/src/generated/resources/data/forge/tags/items/storage_blocks/copper.json +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/copper.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:copper_block" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/zinc.json b/src/generated/resources/data/forge/tags/items/storage_blocks/zinc.json index ee7c25d49..c4e4a73b8 100644 --- a/src/generated/resources/data/forge/tags/items/storage_blocks/zinc.json +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/zinc.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:zinc_block" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/rails.json b/src/generated/resources/data/minecraft/tags/blocks/rails.json index 9b499b0a2..c2532577d 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/rails.json +++ b/src/generated/resources/data/minecraft/tags/blocks/rails.json @@ -2,6 +2,5 @@ "replace": false, "values": [ "create:cart_assembler" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/slabs.json b/src/generated/resources/data/minecraft/tags/blocks/slabs.json index 692193caf..6853a79e2 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/slabs.json @@ -43,6 +43,5 @@ "create:dark_scoria_bricks_slab", "create:fancy_dark_scoria_bricks_slab", "create:paved_dark_scoria_slab" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/stairs.json b/src/generated/resources/data/minecraft/tags/blocks/stairs.json index cdc2b72ed..063a72ea5 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/stairs.json @@ -43,6 +43,5 @@ "create:dark_scoria_bricks_stairs", "create:fancy_dark_scoria_bricks_stairs", "create:paved_dark_scoria_stairs" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/walls.json b/src/generated/resources/data/minecraft/tags/blocks/walls.json index 2234fde07..934d41e8b 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/walls.json +++ b/src/generated/resources/data/minecraft/tags/blocks/walls.json @@ -43,6 +43,5 @@ "create:dark_scoria_bricks_wall", "create:fancy_dark_scoria_bricks_wall", "create:paved_dark_scoria_wall" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/slabs.json b/src/generated/resources/data/minecraft/tags/items/slabs.json index 692193caf..6853a79e2 100644 --- a/src/generated/resources/data/minecraft/tags/items/slabs.json +++ b/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -43,6 +43,5 @@ "create:dark_scoria_bricks_slab", "create:fancy_dark_scoria_bricks_slab", "create:paved_dark_scoria_slab" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/stairs.json b/src/generated/resources/data/minecraft/tags/items/stairs.json index cdc2b72ed..063a72ea5 100644 --- a/src/generated/resources/data/minecraft/tags/items/stairs.json +++ b/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -43,6 +43,5 @@ "create:dark_scoria_bricks_stairs", "create:fancy_dark_scoria_bricks_stairs", "create:paved_dark_scoria_stairs" - ], - "optional": [] + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/walls.json b/src/generated/resources/data/minecraft/tags/items/walls.json index 2234fde07..934d41e8b 100644 --- a/src/generated/resources/data/minecraft/tags/items/walls.json +++ b/src/generated/resources/data/minecraft/tags/items/walls.json @@ -43,6 +43,5 @@ "create:dark_scoria_bricks_wall", "create:fancy_dark_scoria_bricks_wall", "create:paved_dark_scoria_wall" - ], - "optional": [] + ] } \ 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 5a2019729..725de7c6c 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -49,8 +49,6 @@ import com.simibubi.create.modules.contraptions.redstone.ContactBlock; import com.simibubi.create.modules.contraptions.relays.advanced.SpeedControllerBlock; import com.simibubi.create.modules.contraptions.relays.advanced.sequencer.SequencedGearshiftBlock; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; -import com.simibubi.create.modules.contraptions.relays.encased.AdjustablePulleyBlock; -import com.simibubi.create.modules.contraptions.relays.encased.EncasedBeltBlock; import com.simibubi.create.modules.contraptions.relays.gauge.GaugeBlock; import com.simibubi.create.modules.logistics.block.RedstoneLinkBlock; import com.simibubi.create.modules.logistics.block.StockswitchBlock; @@ -107,8 +105,8 @@ public enum AllBlocks implements NonNullSupplier { // CLUTCH(ClutchBlock::new), // GEARSHIFT(GearshiftBlock::new), - ENCASED_BELT(EncasedBeltBlock::new), - ADJUSTABLE_PULLEY(AdjustablePulleyBlock::new), +// ENCASED_BELT(EncasedBeltBlock::new), +// ADJUSTABLE_PULLEY(AdjustablePulleyBlock::new), BELT(BeltBlock::new, ComesWith.NO_BLOCKITEM), CREATIVE_MOTOR(MotorBlock::new), WATER_WHEEL(WaterWheelBlock::new), diff --git a/src/main/java/com/simibubi/create/AllBlocksNew.java b/src/main/java/com/simibubi/create/AllBlocksNew.java index 85457c10a..2275d0fe3 100644 --- a/src/main/java/com/simibubi/create/AllBlocksNew.java +++ b/src/main/java/com/simibubi/create/AllBlocksNew.java @@ -12,7 +12,10 @@ import com.simibubi.create.modules.Sections; import com.simibubi.create.modules.contraptions.relays.elementary.CogWheelBlock; import com.simibubi.create.modules.contraptions.relays.elementary.CogwheelBlockItem; import com.simibubi.create.modules.contraptions.relays.elementary.ShaftBlock; +import com.simibubi.create.modules.contraptions.relays.encased.AdjustablePulleyBlock; import com.simibubi.create.modules.contraptions.relays.encased.ClutchBlock; +import com.simibubi.create.modules.contraptions.relays.encased.EncasedBeltBlock; +import com.simibubi.create.modules.contraptions.relays.encased.EncasedBeltGenerator; import com.simibubi.create.modules.contraptions.relays.encased.EncasedShaftBlock; import com.simibubi.create.modules.contraptions.relays.encased.GearshiftBlock; import com.simibubi.create.modules.contraptions.relays.gearbox.GearboxBlock; @@ -41,6 +44,8 @@ public class AllBlocksNew { private static final CreateRegistrate REGISTRATE = Create.registrate() .itemGroup(() -> Create.baseCreativeTab); + // Schematics + static { REGISTRATE.startSection(SCHEMATICS); } @@ -62,6 +67,8 @@ public class AllBlocksNew { .simpleItem() .register(); + // Kinetics + static { REGISTRATE.startSection(Sections.KINETICS); } @@ -122,6 +129,33 @@ public class AllBlocksNew { .build() .register(); + public static final BlockEntry ENCASED_BELT = + REGISTRATE.block("encased_belt", EncasedBeltBlock::new) + .initialProperties(SharedProperties::kinetic) + .blockstate((c, p) -> new EncasedBeltGenerator((state, suffix) -> p.models() + .getExistingFile(p.modLoc("block/" + c.getName() + "/" + suffix))).generate(c, p)) + .item() + .model(AssetLookup::customItemModel) + .build() + .register(); + + public static final BlockEntry ADJUSTABLE_PULLEY = + REGISTRATE.block("adjustable_pulley", AdjustablePulleyBlock::new) + .initialProperties(SharedProperties::kinetic) + .blockstate((c, p) -> new EncasedBeltGenerator((state, suffix) -> { + String powered = state.get(AdjustablePulleyBlock.POWERED) ? "_powered" : ""; + return p.models() + .withExistingParent(c.getName() + "_" + suffix + powered, p.modLoc("block/encased_belt/" + suffix)) + .texture("side", p.modLoc("block/" + c.getName() + powered)); + }).generate(c, p)) + .item() + .model((c, p) -> p.withExistingParent(c.getName(), p.modLoc("block/encased_belt/item")) + .texture("side", p.modLoc("block/" + c.getName()))) + .build() + .register(); + + // Materials + static { REGISTRATE.startSection(Sections.MATERIALS); } @@ -175,7 +209,7 @@ public class AllBlocksNew { .register(); // Utility - + private static NonNullFunction, ItemBuilder>> tagBlockAndItem( String tagName) { return b -> b.tag(forgeBlockTag(tagName)) diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index f854535ce..769d77e7a 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -112,8 +112,8 @@ public enum AllTileEntities { MOTOR(MotorTileEntity::new, AllBlocks.CREATIVE_MOTOR), GEARBOX(GearboxTileEntity::new, AllBlocksNew.GEARBOX), TURNTABLE(TurntableTileEntity::new, AllBlocks.TURNTABLE), - ENCASED_SHAFT(EncasedShaftTileEntity::new, AllBlocksNew.ENCASED_SHAFT, AllBlocks.ENCASED_BELT), - ADJUSTABLE_PULLEY(AdjustablePulleyTileEntity::new, AllBlocks.ADJUSTABLE_PULLEY), + ENCASED_SHAFT(EncasedShaftTileEntity::new, AllBlocksNew.ENCASED_SHAFT, AllBlocksNew.ENCASED_BELT), + ADJUSTABLE_PULLEY(AdjustablePulleyTileEntity::new, AllBlocksNew.ADJUSTABLE_PULLEY), ENCASED_FAN(EncasedFanTileEntity::new, AllBlocks.ENCASED_FAN), NOZZLE(NozzleTileEntity::new, AllBlocks.NOZZLE), CLUTCH(ClutchTileEntity::new, AllBlocksNew.CLUTCH), diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/SpecialBlockStateGen.java b/src/main/java/com/simibubi/create/foundation/utility/data/SpecialBlockStateGen.java new file mode 100644 index 000000000..7cecd7c71 --- /dev/null +++ b/src/main/java/com/simibubi/create/foundation/utility/data/SpecialBlockStateGen.java @@ -0,0 +1,31 @@ +package com.simibubi.create.foundation.utility.data; + +import com.tterrag.registrate.providers.DataGenContext; +import com.tterrag.registrate.providers.RegistrateBlockstateProvider; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraftforge.client.model.generators.ConfiguredModel; +import net.minecraftforge.client.model.generators.ModelFile; + +public abstract class SpecialBlockStateGen { + + public final void generate(DataGenContext ctx, RegistrateBlockstateProvider prov) { + prov.getVariantBuilder(ctx.getEntry()) + .forAllStates(state -> { + return ConfiguredModel.builder() + .modelFile(getModel(ctx, prov, state)) + .rotationX(getXRotation(state)) + .rotationY(getYRotation(state)) + .build(); + }); + } + + protected abstract int getXRotation(BlockState state); + + protected abstract int getYRotation(BlockState state); + + public abstract ModelFile getModel(DataGenContext ctx, + RegistrateBlockstateProvider prov, BlockState state); + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/AdjustablePulleyBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/AdjustablePulleyBlock.java index 3e450b1bf..d6cd1a333 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/AdjustablePulleyBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/AdjustablePulleyBlock.java @@ -18,7 +18,8 @@ public class AdjustablePulleyBlock extends EncasedBeltBlock implements ITE PART = EnumProperty.create("part", Part.class); public static final BooleanProperty CONNECTED_ALONG_FIRST_COORDINATE = DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE; - public EncasedBeltBlock() { - super(Properties.from(Blocks.ANDESITE)); + public EncasedBeltBlock(Properties properties) { + super(properties); setDefaultState(getDefaultState().with(PART, Part.NONE)); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedBeltGenerator.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedBeltGenerator.java new file mode 100644 index 000000000..18c391533 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/encased/EncasedBeltGenerator.java @@ -0,0 +1,72 @@ +package com.simibubi.create.modules.contraptions.relays.encased; + +import java.util.function.BiFunction; + +import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen; +import com.simibubi.create.modules.contraptions.relays.encased.EncasedBeltBlock.Part; +import com.tterrag.registrate.providers.DataGenContext; +import com.tterrag.registrate.providers.RegistrateBlockstateProvider; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.util.Direction.Axis; +import net.minecraftforge.client.model.generators.ModelFile; + +public class EncasedBeltGenerator extends SpecialBlockStateGen { + + private BiFunction modelFunc; + + public EncasedBeltGenerator(BiFunction modelFunc) { + this.modelFunc = modelFunc; + } + + @Override + protected int getXRotation(BlockState state) { + EncasedBeltBlock.Part part = state.get(EncasedBeltBlock.PART); + boolean connectedAlongFirst = state.get(EncasedBeltBlock.CONNECTED_ALONG_FIRST_COORDINATE); + Axis axis = state.get(EncasedBeltBlock.AXIS); + + if (part == Part.NONE) + return axis == Axis.Y ? 90 : 0; + if (axis == Axis.X) + return (connectedAlongFirst ? 90 : 0) + (part == Part.START ? 180 : 0); + if (axis == Axis.Z) + return (connectedAlongFirst ? 0 : (part == Part.START ? 270 : 90)); + return 0; + } + + @Override + protected int getYRotation(BlockState state) { + EncasedBeltBlock.Part part = state.get(EncasedBeltBlock.PART); + boolean connectedAlongFirst = state.get(EncasedBeltBlock.CONNECTED_ALONG_FIRST_COORDINATE); + Axis axis = state.get(EncasedBeltBlock.AXIS); + + if (part == Part.NONE) + return axis == Axis.X ? 90 : 0; + if (axis == Axis.Z) + return (connectedAlongFirst && part == Part.END ? 270 : 90); + boolean flip = part == Part.END && !connectedAlongFirst || part == Part.START && connectedAlongFirst; + if (axis == Axis.Y) + return (connectedAlongFirst ? 90 : 0) + (flip ? 180 : 0); + return 0; + } + + @Override + public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, + BlockState state) { + return modelFunc.apply(state, getModelSuffix(state)); + } + + protected String getModelSuffix(BlockState state) { + EncasedBeltBlock.Part part = state.get(EncasedBeltBlock.PART); + Axis axis = state.get(EncasedBeltBlock.AXIS); + + if (part == Part.NONE) + return "single"; + + String orientation = axis == Axis.Y ? "vertical" : "horizontal"; + String section = part == Part.MIDDLE ? "middle" : "end"; + return section + "_" + orientation; + } + +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index b1732da14..3b69e270c 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -14,7 +14,7 @@ Technology that empowers the player.''' [[dependencies.create]] modId="forge" mandatory=true - versionRange="[31.1.0,)" + versionRange="[31.2.0,)" ordering="NONE" side="BOTH" diff --git a/src/main/resources/assets/create/blockstates/adjustable_pulley.json b/src/main/resources/assets/create/blockstates/adjustable_pulley.json deleted file mode 100644 index 10ca08d20..000000000 --- a/src/main/resources/assets/create/blockstates/adjustable_pulley.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "variants": { - "powered=false,part=none,axis_along_first=false,axis=x": { "model": "create:block/adjustable_pulley/single", "y": 90 }, - "powered=false,part=none,axis_along_first=false,axis=y": { "model": "create:block/adjustable_pulley/single", "x": 90 }, - "powered=false,part=none,axis_along_first=false,axis=z": { "model": "create:block/adjustable_pulley/single" }, - "powered=false,part=none,axis_along_first=true,axis=x": { "model": "create:block/adjustable_pulley/single", "y": 90 }, - "powered=false,part=none,axis_along_first=true,axis=y": { "model": "create:block/adjustable_pulley/single", "x": 90 }, - "powered=false,part=none,axis_along_first=true,axis=z": { "model": "create:block/adjustable_pulley/single" }, - - "powered=false,part=start,axis_along_first=false,axis=x": { "model": "create:block/adjustable_pulley/end_horizontal", "x": 180 }, - "powered=false,part=start,axis_along_first=true,axis=x": { "model": "create:block/adjustable_pulley/end_horizontal", "x": 270 }, - "powered=false,part=middle,axis_along_first=false,axis=x": { "model": "create:block/adjustable_pulley/middle_horizontal" }, - "powered=false,part=middle,axis_along_first=true,axis=x": { "model": "create:block/adjustable_pulley/middle_horizontal", "x": 90 }, - "powered=false,part=end,axis_along_first=false,axis=x": { "model": "create:block/adjustable_pulley/end_horizontal" }, - "powered=false,part=end,axis_along_first=true,axis=x": { "model": "create:block/adjustable_pulley/end_horizontal", "x": 90 }, - - "powered=false,part=start,axis_along_first=false,axis=y": { "model": "create:block/adjustable_pulley/end_vertical" }, - "powered=false,part=start,axis_along_first=true,axis=y": { "model": "create:block/adjustable_pulley/end_vertical", "y": 270 }, - "powered=false,part=middle,axis_along_first=false,axis=y": { "model": "create:block/adjustable_pulley/middle_vertical" }, - "powered=false,part=middle,axis_along_first=true,axis=y": { "model": "create:block/adjustable_pulley/middle_vertical", "y": 90 }, - "powered=false,part=end,axis_along_first=false,axis=y": { "model": "create:block/adjustable_pulley/end_vertical", "y": 180 }, - "powered=false,part=end,axis_along_first=true,axis=y": { "model": "create:block/adjustable_pulley/end_vertical", "y": 90 }, - - "powered=false,part=start,axis_along_first=false,axis=z": { "model": "create:block/adjustable_pulley/end_horizontal", "x": 270, "y": 90 }, - "powered=false,part=start,axis_along_first=true,axis=z": { "model": "create:block/adjustable_pulley/end_horizontal", "y": 90 }, - "powered=false,part=middle,axis_along_first=false,axis=z": { "model": "create:block/adjustable_pulley/middle_horizontal", "x": 90, "y": 90 }, - "powered=false,part=middle,axis_along_first=true,axis=z": { "model": "create:block/adjustable_pulley/middle_horizontal", "y": 90 }, - "powered=false,part=end,axis_along_first=false,axis=z": { "model": "create:block/adjustable_pulley/end_horizontal", "x": 90, "y": 90 }, - "powered=false,part=end,axis_along_first=true,axis=z": { "model": "create:block/adjustable_pulley/end_horizontal", "y": 270 }, - - "powered=true,part=none,axis_along_first=false,axis=x": { "model": "create:block/adjustable_pulley/powered/single", "y": 90 }, - "powered=true,part=none,axis_along_first=false,axis=y": { "model": "create:block/adjustable_pulley/powered/single", "x": 90 }, - "powered=true,part=none,axis_along_first=false,axis=z": { "model": "create:block/adjustable_pulley/powered/single" }, - "powered=true,part=none,axis_along_first=true,axis=x": { "model": "create:block/adjustable_pulley/powered/single", "y": 90 }, - "powered=true,part=none,axis_along_first=true,axis=y": { "model": "create:block/adjustable_pulley/powered/single", "x": 90 }, - "powered=true,part=none,axis_along_first=true,axis=z": { "model": "create:block/adjustable_pulley/powered/single" }, - - "powered=true,part=start,axis_along_first=false,axis=x": { "model": "create:block/adjustable_pulley/powered/end_horizontal", "x": 180 }, - "powered=true,part=start,axis_along_first=true,axis=x": { "model": "create:block/adjustable_pulley/powered/end_horizontal", "x": 270 }, - "powered=true,part=middle,axis_along_first=false,axis=x": { "model": "create:block/adjustable_pulley/powered/middle_horizontal" }, - "powered=true,part=middle,axis_along_first=true,axis=x": { "model": "create:block/adjustable_pulley/powered/middle_horizontal", "x": 90 }, - "powered=true,part=end,axis_along_first=false,axis=x": { "model": "create:block/adjustable_pulley/powered/end_horizontal" }, - "powered=true,part=end,axis_along_first=true,axis=x": { "model": "create:block/adjustable_pulley/powered/end_horizontal", "x": 90 }, - - "powered=true,part=start,axis_along_first=false,axis=y": { "model": "create:block/adjustable_pulley/powered/end_vertical" }, - "powered=true,part=start,axis_along_first=true,axis=y": { "model": "create:block/adjustable_pulley/powered/end_vertical", "y": 270 }, - "powered=true,part=middle,axis_along_first=false,axis=y": { "model": "create:block/adjustable_pulley/powered/middle_vertical" }, - "powered=true,part=middle,axis_along_first=true,axis=y": { "model": "create:block/adjustable_pulley/powered/middle_vertical", "y": 90 }, - "powered=true,part=end,axis_along_first=false,axis=y": { "model": "create:block/adjustable_pulley/powered/end_vertical", "y": 180 }, - "powered=true,part=end,axis_along_first=true,axis=y": { "model": "create:block/adjustable_pulley/powered/end_vertical", "y": 90 }, - - "powered=true,part=start,axis_along_first=false,axis=z": { "model": "create:block/adjustable_pulley/powered/end_horizontal", "x": 270, "y": 90 }, - "powered=true,part=start,axis_along_first=true,axis=z": { "model": "create:block/adjustable_pulley/powered/end_horizontal", "y": 90 }, - "powered=true,part=middle,axis_along_first=false,axis=z": { "model": "create:block/adjustable_pulley/powered/middle_horizontal", "x": 90, "y": 90 }, - "powered=true,part=middle,axis_along_first=true,axis=z": { "model": "create:block/adjustable_pulley/powered/middle_horizontal", "y": 90 }, - "powered=true,part=end,axis_along_first=false,axis=z": { "model": "create:block/adjustable_pulley/powered/end_horizontal", "x": 90, "y": 90 }, - "powered=true,part=end,axis_along_first=true,axis=z": { "model": "create:block/adjustable_pulley/powered/end_horizontal", "y": 270 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/encased_belt.json b/src/main/resources/assets/create/blockstates/encased_belt.json deleted file mode 100644 index b46146fdc..000000000 --- a/src/main/resources/assets/create/blockstates/encased_belt.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "variants": { - "part=none,axis_along_first=false,axis=x": { "model": "create:block/encased_belt/single", "y": 90 }, - "part=none,axis_along_first=false,axis=y": { "model": "create:block/encased_belt/single", "x": 90 }, - "part=none,axis_along_first=false,axis=z": { "model": "create:block/encased_belt/single" }, - "part=none,axis_along_first=true,axis=x": { "model": "create:block/encased_belt/single", "y": 90 }, - "part=none,axis_along_first=true,axis=y": { "model": "create:block/encased_belt/single", "x": 90 }, - "part=none,axis_along_first=true,axis=z": { "model": "create:block/encased_belt/single" }, - - "part=start,axis_along_first=false,axis=x": { "model": "create:block/encased_belt/end_horizontal", "x": 180 }, - "part=start,axis_along_first=true,axis=x": { "model": "create:block/encased_belt/end_horizontal", "x": 270 }, - "part=middle,axis_along_first=false,axis=x": { "model": "create:block/encased_belt/middle_horizontal" }, - "part=middle,axis_along_first=true,axis=x": { "model": "create:block/encased_belt/middle_horizontal", "x": 90 }, - "part=end,axis_along_first=false,axis=x": { "model": "create:block/encased_belt/end_horizontal" }, - "part=end,axis_along_first=true,axis=x": { "model": "create:block/encased_belt/end_horizontal", "x": 90 }, - - "part=start,axis_along_first=false,axis=y": { "model": "create:block/encased_belt/end_vertical" }, - "part=start,axis_along_first=true,axis=y": { "model": "create:block/encased_belt/end_vertical", "y": 270 }, - "part=middle,axis_along_first=false,axis=y": { "model": "create:block/encased_belt/middle_vertical" }, - "part=middle,axis_along_first=true,axis=y": { "model": "create:block/encased_belt/middle_vertical", "y": 90 }, - "part=end,axis_along_first=false,axis=y": { "model": "create:block/encased_belt/end_vertical", "y": 180 }, - "part=end,axis_along_first=true,axis=y": { "model": "create:block/encased_belt/end_vertical", "y": 90 }, - - "part=start,axis_along_first=false,axis=z": { "model": "create:block/encased_belt/end_horizontal", "x": 270, "y": 90 }, - "part=start,axis_along_first=true,axis=z": { "model": "create:block/encased_belt/end_horizontal", "y": 90 }, - "part=middle,axis_along_first=false,axis=z": { "model": "create:block/encased_belt/middle_horizontal", "x": 90, "y": 90 }, - "part=middle,axis_along_first=true,axis=z": { "model": "create:block/encased_belt/middle_horizontal", "y": 90 }, - "part=end,axis_along_first=false,axis=z": { "model": "create:block/encased_belt/end_horizontal", "x": 90, "y": 90 }, - "part=end,axis_along_first=true,axis=z": { "model": "create:block/encased_belt/end_horizontal", "y": 270 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/adjustable_pulley/end_horizontal.json b/src/main/resources/assets/create/models/block/adjustable_pulley/end_horizontal.json deleted file mode 100644 index 4c314e645..000000000 --- a/src/main/resources/assets/create/models/block/adjustable_pulley/end_horizontal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/encased_belt/end_horizontal", - "textures": { - "0": "create:block/adjustable_pulley_off", - "particle": "create:block/adjustable_pulley_off" - } -} diff --git a/src/main/resources/assets/create/models/block/adjustable_pulley/end_vertical.json b/src/main/resources/assets/create/models/block/adjustable_pulley/end_vertical.json deleted file mode 100644 index a61e4395c..000000000 --- a/src/main/resources/assets/create/models/block/adjustable_pulley/end_vertical.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/encased_belt/end_vertical", - "textures": { - "1": "create:block/adjustable_pulley_off", - "particle": "create:block/adjustable_pulley_off" - } -} diff --git a/src/main/resources/assets/create/models/block/adjustable_pulley/item.json b/src/main/resources/assets/create/models/block/adjustable_pulley/item.json deleted file mode 100644 index 7a1d89752..000000000 --- a/src/main/resources/assets/create/models/block/adjustable_pulley/item.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/encased_belt/item", - "textures": { - "0": "create:block/adjustable_pulley_off" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/adjustable_pulley/middle_horizontal.json b/src/main/resources/assets/create/models/block/adjustable_pulley/middle_horizontal.json deleted file mode 100644 index a1ccef9be..000000000 --- a/src/main/resources/assets/create/models/block/adjustable_pulley/middle_horizontal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/encased_belt/middle_horizontal", - "textures": { - "0": "create:block/adjustable_pulley_off", - "particle": "create:block/adjustable_pulley_off" - } -} diff --git a/src/main/resources/assets/create/models/block/adjustable_pulley/middle_vertical.json b/src/main/resources/assets/create/models/block/adjustable_pulley/middle_vertical.json deleted file mode 100644 index 44da384ec..000000000 --- a/src/main/resources/assets/create/models/block/adjustable_pulley/middle_vertical.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/encased_belt/middle_vertical", - "textures": { - "0": "create:block/adjustable_pulley_off", - "particle": "create:block/adjustable_pulley_off" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/adjustable_pulley/powered/end_horizontal.json b/src/main/resources/assets/create/models/block/adjustable_pulley/powered/end_horizontal.json deleted file mode 100644 index 203b7a248..000000000 --- a/src/main/resources/assets/create/models/block/adjustable_pulley/powered/end_horizontal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/encased_belt/end_horizontal", - "textures": { - "0": "create:block/adjustable_pulley_on", - "particle": "create:block/adjustable_pulley_on" - } -} diff --git a/src/main/resources/assets/create/models/block/adjustable_pulley/powered/end_vertical.json b/src/main/resources/assets/create/models/block/adjustable_pulley/powered/end_vertical.json deleted file mode 100644 index 24b120f68..000000000 --- a/src/main/resources/assets/create/models/block/adjustable_pulley/powered/end_vertical.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/encased_belt/end_vertical", - "textures": { - "1": "create:block/adjustable_pulley_on", - "particle": "create:block/adjustable_pulley_on" - } -} diff --git a/src/main/resources/assets/create/models/block/adjustable_pulley/powered/middle_horizontal.json b/src/main/resources/assets/create/models/block/adjustable_pulley/powered/middle_horizontal.json deleted file mode 100644 index df44b3b9a..000000000 --- a/src/main/resources/assets/create/models/block/adjustable_pulley/powered/middle_horizontal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/encased_belt/middle_horizontal", - "textures": { - "0": "create:block/adjustable_pulley_on", - "particle": "create:block/adjustable_pulley_on" - } -} diff --git a/src/main/resources/assets/create/models/block/adjustable_pulley/powered/middle_vertical.json b/src/main/resources/assets/create/models/block/adjustable_pulley/powered/middle_vertical.json deleted file mode 100644 index e85bc9af2..000000000 --- a/src/main/resources/assets/create/models/block/adjustable_pulley/powered/middle_vertical.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/encased_belt/middle_vertical", - "textures": { - "0": "create:block/adjustable_pulley_on", - "particle": "create:block/adjustable_pulley_on" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/adjustable_pulley/powered/single.json b/src/main/resources/assets/create/models/block/adjustable_pulley/powered/single.json deleted file mode 100644 index 66445a3ec..000000000 --- a/src/main/resources/assets/create/models/block/adjustable_pulley/powered/single.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/encased_belt/single", - "textures": { - "0": "create:block/adjustable_pulley_on", - "particle": "create:block/adjustable_pulley_on" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/adjustable_pulley/single.json b/src/main/resources/assets/create/models/block/adjustable_pulley/single.json deleted file mode 100644 index c2ba3e4be..000000000 --- a/src/main/resources/assets/create/models/block/adjustable_pulley/single.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/encased_belt/single", - "textures": { - "0": "create:block/adjustable_pulley_off", - "particle": "create:block/adjustable_pulley_off" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/encased_belt/end_horizontal.json b/src/main/resources/assets/create/models/block/encased_belt/end_horizontal.json index c56339095..9bfdf2a0a 100644 --- a/src/main/resources/assets/create/models/block/encased_belt/end_horizontal.json +++ b/src/main/resources/assets/create/models/block/encased_belt/end_horizontal.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/encased_belt", + "side": "create:block/encased_belt", "2": "create:block/encased_belt_end", - "particle": "create:block/encased_belt" + "particle": "#side" }, "elements": [ { @@ -12,12 +12,12 @@ "from": [0, 0, 0], "to": [16, 2, 16], "faces": { - "north": {"uv": [14, 16, 16, 0], "rotation": 90, "texture": "#0"}, + "north": {"uv": [14, 16, 16, 0], "rotation": 90, "texture": "#side"}, "east": {"uv": [0, 14, 16, 16], "texture": "#2"}, - "south": {"uv": [0, 16, 2, 0], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 16, 2, 0], "rotation": 270, "texture": "#side"}, "west": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#2"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"} + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#side"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#side"} } }, { @@ -34,10 +34,10 @@ "from": [0, 2, 14], "to": [16, 14, 16], "faces": { - "north": {"uv": [2, 16, 14, 0], "rotation": 270, "texture": "#0"}, - "east": {"uv": [2, 0, 14, 2], "rotation": 270, "texture": "#0"}, - "south": {"uv": [2, 0, 14, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [2, 14, 14, 16], "rotation": 270, "texture": "#0"} + "north": {"uv": [2, 16, 14, 0], "rotation": 270, "texture": "#side"}, + "east": {"uv": [2, 0, 14, 2], "rotation": 270, "texture": "#side"}, + "south": {"uv": [2, 0, 14, 16], "rotation": 90, "texture": "#side"}, + "west": {"uv": [2, 14, 14, 16], "rotation": 270, "texture": "#side"} } }, { @@ -45,12 +45,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [14, 16, 16, 0], "rotation": 90, "texture": "#0"}, + "north": {"uv": [14, 16, 16, 0], "rotation": 90, "texture": "#side"}, "east": {"uv": [0, 0, 16, 2], "texture": "#2"}, - "south": {"uv": [14, 16, 16, 0], "rotation": 270, "texture": "#0"}, + "south": {"uv": [14, 16, 16, 0], "rotation": 270, "texture": "#side"}, "west": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#2"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#0"} + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#side"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#side"} } } ] diff --git a/src/main/resources/assets/create/models/block/encased_belt/end_vertical.json b/src/main/resources/assets/create/models/block/encased_belt/end_vertical.json index ead988ad3..d4bc090b6 100644 --- a/src/main/resources/assets/create/models/block/encased_belt/end_vertical.json +++ b/src/main/resources/assets/create/models/block/encased_belt/end_vertical.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "1": "create:block/encased_belt", + "side": "create:block/encased_belt", "2": "create:block/encased_belt_end", - "particle": "create:block/encased_belt" + "particle": "#side" }, "elements": [ { @@ -21,10 +21,10 @@ "from": [0, 0, 0], "to": [2, 16, 16], "faces": { - "north": {"uv": [14, 0, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 0, 2, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "north": {"uv": [14, 0, 16, 16], "texture": "#side"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 2, 16], "texture": "#side"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#side"}, "up": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#2"}, "down": {"uv": [0, 16, 16, 14], "rotation": 270, "texture": "#2"} } @@ -34,10 +34,10 @@ "from": [14, 0, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 2, 16], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [14, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "north": {"uv": [0, 0, 2, 16], "texture": "#side"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "south": {"uv": [14, 0, 16, 16], "texture": "#side"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#side"}, "up": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#2"}, "down": {"uv": [0, 2, 16, 0], "rotation": 270, "texture": "#2"} } @@ -47,12 +47,12 @@ "from": [2, 0, 0], "to": [14, 16, 2], "faces": { - "north": {"uv": [2, 0, 14, 16], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [2, 0, 14, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, - "up": {"uv": [2, 14, 14, 16], "rotation": 180, "texture": "#1"}, - "down": {"uv": [2, 14, 14, 16], "texture": "#1"} + "north": {"uv": [2, 0, 14, 16], "texture": "#side"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "south": {"uv": [2, 0, 14, 16], "texture": "#side"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "up": {"uv": [2, 14, 14, 16], "rotation": 180, "texture": "#side"}, + "down": {"uv": [2, 14, 14, 16], "texture": "#side"} } } ] diff --git a/src/main/resources/assets/create/models/block/encased_belt/item.json b/src/main/resources/assets/create/models/block/encased_belt/item.json index e94e7384b..675dc097b 100644 --- a/src/main/resources/assets/create/models/block/encased_belt/item.json +++ b/src/main/resources/assets/create/models/block/encased_belt/item.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/encased_belt", + "side": "create:block/encased_belt", "1": "create:block/gearbox", - "particle": "create:block/axis", + "particle": "#side", "1_0": "create:block/axis", "1_1": "create:block/axis_top" }, @@ -15,11 +15,11 @@ "to": [16, 2, 16], "faces": { "north": {"uv": [0, 14, 16, 16], "texture": "#1"}, - "east": {"uv": [14, 0, 16, 16], "rotation": 90, "texture": "#0"}, + "east": {"uv": [14, 0, 16, 16], "rotation": 90, "texture": "#side"}, "south": {"uv": [0, 14, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#0"} + "west": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#side"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#side"} } }, { @@ -37,11 +37,11 @@ "to": [16, 16, 16], "faces": { "north": {"uv": [0, 0, 16, 2], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#side"}, "south": {"uv": [0, 0, 16, 2], "texture": "#1"}, - "west": {"uv": [14, 0, 16, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + "west": {"uv": [14, 0, 16, 16], "rotation": 270, "texture": "#side"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#side"} } }, { @@ -50,9 +50,9 @@ "to": [2, 14, 16], "faces": { "north": {"uv": [14, 2, 16, 14], "texture": "#1"}, - "east": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#0"}, + "east": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#side"}, "south": {"uv": [0, 2, 2, 14], "texture": "#1"}, - "west": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#0"} + "west": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#side"} } }, { @@ -61,9 +61,9 @@ "to": [16, 14, 16], "faces": { "north": {"uv": [0, 2, 2, 14], "texture": "#1"}, - "east": {"uv": [2, 0, 14, 16], "rotation": 90, "texture": "#0"}, + "east": {"uv": [2, 0, 14, 16], "rotation": 90, "texture": "#side"}, "south": {"uv": [14, 2, 16, 14], "texture": "#1"}, - "west": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#0"} + "west": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#side"} } }, { diff --git a/src/main/resources/assets/create/models/block/encased_belt/middle_horizontal.json b/src/main/resources/assets/create/models/block/encased_belt/middle_horizontal.json index 44282d677..a6a659287 100644 --- a/src/main/resources/assets/create/models/block/encased_belt/middle_horizontal.json +++ b/src/main/resources/assets/create/models/block/encased_belt/middle_horizontal.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/encased_belt", + "side": "create:block/encased_belt", "1": "create:block/encased_belt_middle", - "particle": "create:block/encased_belt" + "particle": "#side" }, "elements": [ { @@ -12,12 +12,12 @@ "from": [0, 0, 0], "to": [16, 2, 16], "faces": { - "north": {"uv": [14, 16, 16, 0], "rotation": 90, "texture": "#0"}, + "north": {"uv": [14, 16, 16, 0], "rotation": 90, "texture": "#side"}, "east": {"uv": [0, 14, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 16, 2, 0], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 16, 2, 0], "rotation": 270, "texture": "#side"}, "west": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"} + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#side"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#side"} } }, { @@ -34,12 +34,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [14, 16, 16, 0], "rotation": 90, "texture": "#0"}, + "north": {"uv": [14, 16, 16, 0], "rotation": 90, "texture": "#side"}, "east": {"uv": [0, 0, 16, 2], "texture": "#1"}, - "south": {"uv": [14, 16, 16, 0], "rotation": 270, "texture": "#0"}, + "south": {"uv": [14, 16, 16, 0], "rotation": 270, "texture": "#side"}, "west": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#0"} + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#side"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#side"} } } ] diff --git a/src/main/resources/assets/create/models/block/encased_belt/middle_vertical.json b/src/main/resources/assets/create/models/block/encased_belt/middle_vertical.json index c83bea661..395801cba 100644 --- a/src/main/resources/assets/create/models/block/encased_belt/middle_vertical.json +++ b/src/main/resources/assets/create/models/block/encased_belt/middle_vertical.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/encased_belt", + "side": "create:block/encased_belt", "1": "create:block/encased_belt_middle", - "particle": "create:block/encased_belt" + "particle": "#side" }, "elements": [ { @@ -12,10 +12,10 @@ "from": [14, 0, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [14, 16, 16, 0], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 16, 2, 0], "rotation": 180, "texture": "#0"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "north": {"uv": [14, 16, 16, 0], "rotation": 180, "texture": "#side"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "south": {"uv": [0, 16, 2, 0], "rotation": 180, "texture": "#side"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#side"}, "up": {"uv": [0, 14, 16, 16], "rotation": 270, "texture": "#1"}, "down": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#1"} } @@ -34,10 +34,10 @@ "from": [0, 0, 0], "to": [2, 16, 16], "faces": { - "north": {"uv": [14, 16, 16, 0], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#0"}, - "south": {"uv": [14, 16, 16, 0], "rotation": 180, "texture": "#0"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "north": {"uv": [14, 16, 16, 0], "rotation": 180, "texture": "#side"}, + "east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#side"}, + "south": {"uv": [14, 16, 16, 0], "rotation": 180, "texture": "#side"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#side"}, "up": {"uv": [0, 0, 16, 2], "rotation": 270, "texture": "#1"}, "down": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#1"} } diff --git a/src/main/resources/assets/create/models/block/encased_belt/single.json b/src/main/resources/assets/create/models/block/encased_belt/single.json index 4fe835d94..432ffab24 100644 --- a/src/main/resources/assets/create/models/block/encased_belt/single.json +++ b/src/main/resources/assets/create/models/block/encased_belt/single.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/encased_belt", + "side": "create:block/encased_belt", "1": "create:block/gearbox", - "particle": "create:block/encased_belt" + "particle": "#side" }, "elements": [ { @@ -13,11 +13,11 @@ "to": [16, 2, 16], "faces": { "north": {"uv": [0, 14, 16, 16], "texture": "#1"}, - "east": {"uv": [14, 0, 16, 16], "rotation": 90, "texture": "#0"}, + "east": {"uv": [14, 0, 16, 16], "rotation": 90, "texture": "#side"}, "south": {"uv": [0, 14, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#0"} + "west": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#side"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#side"} } }, { @@ -35,11 +35,11 @@ "to": [16, 16, 16], "faces": { "north": {"uv": [0, 0, 16, 2], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#side"}, "south": {"uv": [0, 0, 16, 2], "texture": "#1"}, - "west": {"uv": [14, 0, 16, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + "west": {"uv": [14, 0, 16, 16], "rotation": 270, "texture": "#side"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#side"} } }, { @@ -48,9 +48,9 @@ "to": [2, 14, 16], "faces": { "north": {"uv": [14, 2, 16, 14], "texture": "#1"}, - "east": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#0"}, + "east": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#side"}, "south": {"uv": [0, 2, 2, 14], "texture": "#1"}, - "west": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#0"} + "west": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#side"} } }, { @@ -59,9 +59,9 @@ "to": [16, 14, 16], "faces": { "north": {"uv": [0, 2, 2, 14], "texture": "#1"}, - "east": {"uv": [2, 0, 14, 16], "rotation": 90, "texture": "#0"}, + "east": {"uv": [2, 0, 14, 16], "rotation": 90, "texture": "#side"}, "south": {"uv": [14, 2, 16, 14], "texture": "#1"}, - "west": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#0"} + "west": {"uv": [2, 0, 14, 16], "rotation": 270, "texture": "#side"} } } ] diff --git a/src/main/resources/assets/create/models/item/adjustable_pulley.json b/src/main/resources/assets/create/models/item/adjustable_pulley.json deleted file mode 100644 index 4ec70826b..000000000 --- a/src/main/resources/assets/create/models/item/adjustable_pulley.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/adjustable_pulley/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/encased_belt.json b/src/main/resources/assets/create/models/item/encased_belt.json deleted file mode 100644 index ac1722910..000000000 --- a/src/main/resources/assets/create/models/item/encased_belt.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/encased_belt/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/adjustable_pulley_off.png b/src/main/resources/assets/create/textures/block/adjustable_pulley.png similarity index 100% rename from src/main/resources/assets/create/textures/block/adjustable_pulley_off.png rename to src/main/resources/assets/create/textures/block/adjustable_pulley.png diff --git a/src/main/resources/assets/create/textures/block/adjustable_pulley_on.png b/src/main/resources/assets/create/textures/block/adjustable_pulley_powered.png similarity index 100% rename from src/main/resources/assets/create/textures/block/adjustable_pulley_on.png rename to src/main/resources/assets/create/textures/block/adjustable_pulley_powered.png