From a9c90cd2b64b97216012a7fce2552aa74b71e694 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Fri, 30 Oct 2020 12:18:21 +0100 Subject: [PATCH] Clean-up Crew - Fixed datagen - Fixed tank multi-place - Organized imports --- src/generated/resources/.cache/cache | 475 +++++++++--------- .../create/blockstates/radial_chassis.json | 48 +- .../java/com/simibubi/create/AllTags.java | 6 +- .../jei/FilterGhostIngredientHandler.java | 13 +- .../category/BlockzapperUpgradeCategory.java | 13 +- .../category/MechanicalCraftingCategory.java | 1 - .../MysteriousItemConversionCategory.java | 1 - .../jei/category/PolishingCategory.java | 2 - .../category/ProcessingViaFanCategory.java | 1 - .../contraptions/components/saw/SawBlock.java | 3 - .../structureMovement/Contraption.java | 1 - .../fluids/actors/SpoutTileEntity.java | 16 +- .../fluids/potion/PotionFluidHandler.java | 2 +- .../fluids/tank/FluidTankGenerator.java | 2 +- .../fluids/tank/FluidTankItem.java | 2 +- .../goggles/GoggleConfigScreen.java | 7 +- .../goggles/GoggleOverlayRenderer.java | 7 +- .../sequencer/SequencedGearshiftScreen.java | 5 +- .../curiosities/ChromaticCompoundItem.java | 12 +- .../symmetry/SymmetryWandScreen.java | 7 +- .../curiosities/zapper/ZapperScreen.java | 5 +- .../inventories/AdjustableCrateScreen.java | 13 +- .../mechanicalArm/ArmInteractionPoint.java | 2 +- .../block/redstone/StockpileSwitchScreen.java | 5 +- .../item/filter/AbstractFilterScreen.java | 13 +- .../item/filter/FilterScreenPacket.java | 5 +- .../filter/attribute/BookAuthorAttribute.java | 12 +- .../filter/attribute/BookCopyAttribute.java | 12 +- .../filter/attribute/EnchantAttribute.java | 10 +- .../attribute/FluidContentsAttribute.java | 12 +- .../filter/attribute/ItemNameAttribute.java | 16 +- .../AstralSorceryAmuletAttribute.java | 7 +- .../AstralSorceryAttunementAttribute.java | 7 +- .../AstralSorceryCrystalAttribute.java | 7 +- .../AstralSorceryPerkGemAttribute.java | 7 +- .../block/SchematicannonScreen.java | 17 +- .../create/foundation/gui/GuiGameElement.java | 12 +- .../create/foundation/gui/widgets/Label.java | 4 - .../foundation/utility/EmptyNamedTag.java | 9 +- .../create/foundation/utility/TreeCutter.java | 2 +- .../foundation/worldgen/OxidizingBlock.java | 1 - 41 files changed, 423 insertions(+), 379 deletions(-) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index c26c830d2..f5a2eab9a 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -291,7 +291,7 @@ e1eca91fdcf60b8ac0c2b8cdf6674046b0bc55f4 assets/create/blockstates/paved_limesto c17d334e938dcb742550ba8307ca8266a1fc9b49 assets/create/blockstates/paved_weathered_limestone.json cb23aef25f3106b06c8fa8f152c638bb0d2185d8 assets/create/blockstates/paved_weathered_limestone_slab.json d62b0992cec1de45dad1f2c273132225f4ef33a0 assets/create/blockstates/paved_weathered_limestone_stairs.json -dba4cf86e82ed4502fffed363fbce226a445e774 assets/create/blockstates/paved_weathered_limestone_wall.json +e29e245d06c46dac94fcd0e01a9bf7fa8e02fb87 assets/create/blockstates/paved_weathered_limestone_wall.json 30971f2f76fe56f144178c33ad6bde5fc9fb61c3 assets/create/blockstates/pink_sail.json 919a79e4a4a5fab0aac3ef48e1c786017d6aa001 assets/create/blockstates/pink_seat.json 471a3bb474a0ae0453143888d561256cce894e3f assets/create/blockstates/pink_valve_handle.json @@ -328,7 +328,7 @@ e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets/create/blockstates/powered_toggl d06cd9a1101b18d306a786320aab12018b1325d6 assets/create/blockstates/purple_sail.json 92957119abd5fbcca36a113b2a80255fd70fc303 assets/create/blockstates/purple_seat.json 61035f8afe75ff7bbd291da5d8690bcbebe679eb assets/create/blockstates/purple_valve_handle.json -bdd56f32ce0a148b6e466a55ab2777f69fc08cfc assets/create/blockstates/radial_chassis.json +d2e6f19325be65457e94bea44fd52863c0f66be7 assets/create/blockstates/radial_chassis.json 45877c4d90a7185c2f304edbd67379d800920439 assets/create/blockstates/red_sail.json da1b08387af7afa0855ee8d040f620c01f20660a assets/create/blockstates/red_seat.json 722fc77bbf387af8a4016e42cbf9501d2b968881 assets/create/blockstates/red_valve_handle.json @@ -400,12 +400,12 @@ cf432c7dcf9b91769a570242a59c12ecca79a091 assets/create/lang/unfinished/de_de.jso 3434f2d429bdf64dcbc915c0365e20250b64d819 assets/create/lang/unfinished/pt_br.json 0bfd9476411fc565a3011ffc43eecaca3f0e53ff assets/create/lang/unfinished/ru_ru.json d7150e9c65d74f41e2dc65daadf003dc200e512c assets/create/lang/unfinished/zh_cn.json -846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json -1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json -1763ea2c9b981d187f5031ba608f3d5d3be3986a assets/create/models/block/acacia_window_pane_noside_alt.json -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 +487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json +b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json +3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json +1358ff546e99004444fccca5355853d1738ef191 assets/create/models/block/acacia_window_pane_post.json +bd33b944ec6ad89850a1d275b3d2843fe6f831cc assets/create/models/block/acacia_window_pane_side.json +b272035cd746364a0bd3bf13061f51190e9b46d6 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 @@ -451,18 +451,18 @@ aa5b45c6c657436bd38621344f6728d44ea974ad assets/create/models/block/andesite_cob 7c0e71f479aeef7bf02f0fb76c4333fa2227b83e assets/create/models/block/andesite_cobblestone_wall_side_tall.json 51e851b15870c0922cfbe911ef1a2f22062969f3 assets/create/models/block/andesite_funnel.json f28da6703691f1b08cfb49208f0f7bb0c5ca816d assets/create/models/block/andesite_funnel_powered.json -b1d0bb538fc8285b7d3fd77a977d78a104b83b62 assets/create/models/block/andesite_pillar.json -aaf2e4259bcfcedd3400e9acb2d64c0cf06f7fb1 assets/create/models/block/andesite_tunnel/cross.json -75f628178fa21a2bd301eea8d1cebf7e94f7d5cc assets/create/models/block/andesite_tunnel/straight.json -c9aec5c30e6821c8f125202cad236afa48f6c358 assets/create/models/block/andesite_tunnel/t_left.json -1dcb8fe81a275ef8a49c04db021ad29abe8b38ae assets/create/models/block/andesite_tunnel/t_right.json -e2801a0c3fe8e1c2485291485b977f581fdc8b7c assets/create/models/block/andesite_tunnel/window.json -87f90e8256060683b834d57d3c11248d5ea84e34 assets/create/models/block/birch_window.json -94317904054cbf651846716d8af3bca618d3130f assets/create/models/block/birch_window_pane_noside.json -7a4cae5b075c4ac96a3113afafa391d024fc117f assets/create/models/block/birch_window_pane_noside_alt.json -3905ced5892afa60009bf26279f9fa4756c273d4 assets/create/models/block/birch_window_pane_post.json -62b3f2edc5ef5d7dabbcff19220921b0e3582376 assets/create/models/block/birch_window_pane_side.json -95d4230eb366f5e7684820c9337e3956ed34042a assets/create/models/block/birch_window_pane_side_alt.json +f77390658e8aeed4352e47b94fd24df116ea1857 assets/create/models/block/andesite_pillar.json +2294f74b5c30430de89a345af60f6669c975f33a assets/create/models/block/andesite_tunnel/cross.json +17f860947f51e84a3f9b32b10cdf61f863db3afc assets/create/models/block/andesite_tunnel/straight.json +e74aa39f8142293c202e57dbd92e8660818b18b5 assets/create/models/block/andesite_tunnel/t_left.json +c93978d636fe70d456a6e1914b65527cbc18544c assets/create/models/block/andesite_tunnel/t_right.json +2a86780c6825edce8fbdaa118a267fc09ce410b0 assets/create/models/block/andesite_tunnel/window.json +0ce09f6fdfb07dead5936c118efb4064f2f6f50f assets/create/models/block/birch_window.json +a5f0ed76e27d2ca706445f7f7c5f9270f98e34f9 assets/create/models/block/birch_window_pane_noside.json +9ad5224419ab7165c5208852bc4a4a5e65dcbf83 assets/create/models/block/birch_window_pane_noside_alt.json +f40c4d4ea6c037158f4b9862a7c11e6024a261e6 assets/create/models/block/birch_window_pane_post.json +dbfd2a996820d885d9741a3f168aa36c3538cfbd assets/create/models/block/birch_window_pane_side.json +557b35671ec417597259ba8d0239fe18c14c3d20 assets/create/models/block/birch_window_pane_side_alt.json 2b59d6f937cd542eba670689c30fe16887dfd9a0 assets/create/models/block/black_sail.json 97d79ab99c0fb278a9b5dc54e1c6563868f87b76 assets/create/models/block/black_seat.json 02747ea1a0e5d4a1cd466bf26878885a89d347fa assets/create/models/block/black_valve_handle.json @@ -489,14 +489,14 @@ a0612a633756433e1b37ddc6d290aa1fc07839ef assets/create/models/block/brass_tunnel 8ab097caaa0db0915ae9254f7d65092d9171bc60 assets/create/models/block/brown_sail.json 4eed0ad902f5e84f2b6c160f3283e8028640e77d assets/create/models/block/brown_seat.json 6c39677f8c3a84280835c717ea1ef569b7c76a1b assets/create/models/block/brown_valve_handle.json -028a07b49c05fe8a93f1d8c229d81e73d887c2df assets/create/models/block/chiseled_dark_scoria.json -b1f9ee4867373dd8f976625bab744a1c72c7fd16 assets/create/models/block/chiseled_dolomite.json -cd7751090cf3d55296b8e415d0af9b6f18d69770 assets/create/models/block/chiseled_gabbro.json -d2e195aa2e90c712e51d855a9a4a334b52f62a69 assets/create/models/block/chiseled_limestone.json -ac07568fa7b2d3fa84d0fe89a498514d30514291 assets/create/models/block/chiseled_scoria.json -ecb2b85ee210dce329d2be66b98d0f0d4e6fc223 assets/create/models/block/chiseled_weathered_limestone.json +db7279f05c1d89e21da8887a15d3a1cfff4a9cf2 assets/create/models/block/chiseled_dark_scoria.json +22d4ad2de48739ab754f8dfcd6f84ad2267abf8b assets/create/models/block/chiseled_dolomite.json +550dc0622377b4736610b1c924dc890c857a0fd0 assets/create/models/block/chiseled_gabbro.json +1deb93125b9a8cac79bec1f4ea5345d6ea857656 assets/create/models/block/chiseled_limestone.json +1cf4b68c8cf1885ede334fbfa54e52c76ba211b6 assets/create/models/block/chiseled_scoria.json +041a20dd674277ff4f1613a0a89600f05458edf4 assets/create/models/block/chiseled_weathered_limestone.json 30fe120af3cb32faf0729df4d2cdf868f804be17 assets/create/models/block/clockwork_bearing.json -70406933cc4fa5471af6e562fd84a397347dba17 assets/create/models/block/copper_casing.json +1f01a4b6608f75145734b60ddf4a33ce318425ff assets/create/models/block/copper_casing.json b2c528cfd24a5cb0cb96c45d0a914f1090f8c32b assets/create/models/block/copper_valve_handle.json 1ef7060b0ca7e9c0bfc8151f98ca08da31862cda assets/create/models/block/crate/brass/bottom.json 4ef2c7c3018f2d219f159a3ce58ceb00610b9c5d assets/create/models/block/crate/brass/left.json @@ -709,41 +709,45 @@ d13df8a5920c5778d98081fb0e97f045e2fd46a2 assets/create/models/block/framed_glass a5938ddd48109f067a19a90a0f9abab655c18821 assets/create/models/block/framed_glass_pane_post.json 41645919ece236df5804a5a73ef682720194de34 assets/create/models/block/framed_glass_pane_side.json 8bc0abaabdc62d0c27730dba7eb6da54607b7e96 assets/create/models/block/framed_glass_pane_side_alt.json -af8bceaa94d714ab377ab9cef1a46ec8cd2b6382 assets/create/models/block/gabbro.json -d21fdbd5ae4013fed068e6ae015d68880d4d3d5c assets/create/models/block/gabbro_bricks.json -acdb20098521f67a530dd809190b1c024464749d assets/create/models/block/gabbro_bricks_slab.json -10621d5aecf9d97bbf0ffec5540d6590ba88eb75 assets/create/models/block/gabbro_bricks_slab_top.json -dfb61cb5f05c385fe9a459685804eef7a5961e15 assets/create/models/block/gabbro_bricks_stairs.json -c61f0ee76ba24ecb4f597f83b45ecea3ccb9531a assets/create/models/block/gabbro_bricks_stairs_inner.json -6dc59aaa66608e8d11b67ce2c5432f7b38003113 assets/create/models/block/gabbro_bricks_stairs_outer.json -9b851103cec9334e98008a8955df62f52edeab1f assets/create/models/block/gabbro_bricks_wall_post.json -ca28cec552b4d3401854c2d00d43b3a3e01995f2 assets/create/models/block/gabbro_bricks_wall_side.json -fbdc91941c4694507a759d105dc4284914a2eaa7 assets/create/models/block/gabbro_cobblestone.json -c660c81a9faaf7cd12b50d2a329e52c377cb96a5 assets/create/models/block/gabbro_cobblestone_slab.json -b5c4037b01c2e02eee1275a36d62b2f364a49775 assets/create/models/block/gabbro_cobblestone_slab_top.json -75589542f32d2cdad96afb2348cd6fbff2475b07 assets/create/models/block/gabbro_cobblestone_stairs.json -f278ec09c13f98ccbce1a8488d4d51c72f398ed4 assets/create/models/block/gabbro_cobblestone_stairs_inner.json -094d753164a282b2a5608202ab38bd354abb1a14 assets/create/models/block/gabbro_cobblestone_stairs_outer.json -5e50c62a9db350f3a2c0e4b1c37a8dc0d149f287 assets/create/models/block/gabbro_cobblestone_wall_post.json -820235f51e7c3b4c05a327c3aa66618ea1e89c9c assets/create/models/block/gabbro_cobblestone_wall_side.json -ede9c9209f9cee3d8e1ffc5008b1b8b026aee998 assets/create/models/block/gabbro_pillar.json -392dd57e5b96214335867799347e21ac0d05457a assets/create/models/block/granite_bricks.json -0ee90049ce09f1f1c96063bc7239cd1fadbdb947 assets/create/models/block/granite_bricks_slab.json -37737d6767ba08b6bd96de1ff3b920522dc3cd51 assets/create/models/block/granite_bricks_slab_top.json -e1fe76be531aec81e97a4b28f5e7cd426e48975f assets/create/models/block/granite_bricks_stairs.json -a976ff37a2acc9f84a37c397f06c08edc0a7674f assets/create/models/block/granite_bricks_stairs_inner.json -44189d38e42d2e2ab2c1115e569d60379f9d90a3 assets/create/models/block/granite_bricks_stairs_outer.json -f949f1e763f745f140e763043cc16d68c7ee0f1f assets/create/models/block/granite_bricks_wall_post.json -1d0e735ed822d17825f20270640510a68c835a3f assets/create/models/block/granite_bricks_wall_side.json -6b9e3507606968748e48517f3aa29c2c1ee4b16e assets/create/models/block/granite_cobblestone.json -99b6c148a801868be5b265a3f7a9b86e3bc46718 assets/create/models/block/granite_cobblestone_slab.json -a54dbe2ab2ddca316efb05d8d3094dc146ced339 assets/create/models/block/granite_cobblestone_slab_top.json -d52844bdcf33a2f0111c7664a848b510a0f13b8d assets/create/models/block/granite_cobblestone_stairs.json -e2fc1797ddb503b887cf0871526e7d889df32a05 assets/create/models/block/granite_cobblestone_stairs_inner.json -d25cb5553bfd89cd3fca61ebd2204bf2a44cc3da assets/create/models/block/granite_cobblestone_stairs_outer.json -cf267628d47aa424bc20977e69e255ceda3ddfe4 assets/create/models/block/granite_cobblestone_wall_post.json -a4f50b75a3186829fc5d62ee4e33997cd202dbd5 assets/create/models/block/granite_cobblestone_wall_side.json -349a58ac4e4535d0fe9ea467632ed904da2c6098 assets/create/models/block/granite_pillar.json +894518bf911d73cece24d4557ab29829829d70c0 assets/create/models/block/gabbro.json +d84f558506d4a399f72d86b15f318b234ce67e58 assets/create/models/block/gabbro_bricks.json +6ca3de3137526e3e103b9759c9f79edcaec3bab3 assets/create/models/block/gabbro_bricks_slab.json +fd6102766ba2567a70c86e7613992a23a5a3e7c6 assets/create/models/block/gabbro_bricks_slab_top.json +ae26c480f3d9d51c8b9d2e20427ec9234a0db8d5 assets/create/models/block/gabbro_bricks_stairs.json +8a19d9f9f8f1d0f0ea9311cb8b2488c5027fba25 assets/create/models/block/gabbro_bricks_stairs_inner.json +78d2189693c37ff41751cc5f0464f88c36482d77 assets/create/models/block/gabbro_bricks_stairs_outer.json +79e4fcf540e86a4d5910d57d9d9045ce181b0070 assets/create/models/block/gabbro_bricks_wall_post.json +49398d10642388e8301159505dde8b0c25ab2edc assets/create/models/block/gabbro_bricks_wall_side.json +23854558036ea469c6d78880d0f5244b64fdb418 assets/create/models/block/gabbro_bricks_wall_side_tall.json +c50dddabd9be06f251f6bedcf7e122eb79bb9400 assets/create/models/block/gabbro_cobblestone.json +19f29ac6c463b21311629ef277ddb6dc0673caa1 assets/create/models/block/gabbro_cobblestone_slab.json +3eaa34ce53980d6340547445536444f5fcfd4e2c assets/create/models/block/gabbro_cobblestone_slab_top.json +ca94584799cbc0861e783dee631ea70e154a0898 assets/create/models/block/gabbro_cobblestone_stairs.json +47ea92c04b31fc43a2123d418ac2142f7104d780 assets/create/models/block/gabbro_cobblestone_stairs_inner.json +dc099cc48208c776cb561fb0cf20142fe1f905a4 assets/create/models/block/gabbro_cobblestone_stairs_outer.json +acb516b2ecb4bbb8dc9c7c4a8b4ef8f7347af0f7 assets/create/models/block/gabbro_cobblestone_wall_post.json +a66072ee1cd164a10935417c036f4f55772769b1 assets/create/models/block/gabbro_cobblestone_wall_side.json +b8f5a5d25a3e3731670b4a7f7c83fd22f72ebd1d assets/create/models/block/gabbro_cobblestone_wall_side_tall.json +4f8ee4ea7f0a79f7da29414397d8829c1969b7b5 assets/create/models/block/gabbro_pillar.json +adf7ef2d029fb6b26a445de79c62b710e6832c06 assets/create/models/block/granite_bricks.json +47765dd5359ab0a1d76cbc503d621250224063fd assets/create/models/block/granite_bricks_slab.json +80d7b25ff3782fc7e5cd419e275300fe3722892d assets/create/models/block/granite_bricks_slab_top.json +a56aa126a5a4a88914e62926630f5548b24c62e0 assets/create/models/block/granite_bricks_stairs.json +cdafe87bed3980b6109a2d85dd85a207967382da assets/create/models/block/granite_bricks_stairs_inner.json +b15b4ef4354b189b678fa944cf3ad456480fd30a assets/create/models/block/granite_bricks_stairs_outer.json +45999378195baa93e1eec5e58c0065a3d255490b assets/create/models/block/granite_bricks_wall_post.json +c1c86afd629d16387627d1f136e5ab6f846e072e assets/create/models/block/granite_bricks_wall_side.json +44df8fb0bcf2bb17aa0c70ae3829d01c3452e4be assets/create/models/block/granite_bricks_wall_side_tall.json +8804fa93deed01d2c488894ae0f4e35ceed0218c assets/create/models/block/granite_cobblestone.json +ea28ac79636a92779066ab43d727cc0dd99f12a5 assets/create/models/block/granite_cobblestone_slab.json +0425978f192f8dbaa6e077739f4ef77443b03b7f assets/create/models/block/granite_cobblestone_slab_top.json +9f1243adc9affaaaa43355a73570d8b8cc0b76ab assets/create/models/block/granite_cobblestone_stairs.json +ddc8bf8dc62464d424ab812f801dd7a1f68072d0 assets/create/models/block/granite_cobblestone_stairs_inner.json +2ed22800ed503bd0b903b2b7ed86209861833fcd assets/create/models/block/granite_cobblestone_stairs_outer.json +01236266fd0d5057e97dea0fbb114de702fe2c48 assets/create/models/block/granite_cobblestone_wall_post.json +87f6b4e30f2cdd0ddb3b48e43f15317b386597e6 assets/create/models/block/granite_cobblestone_wall_side.json +5c7340740d822deae7aa32c15c36531476862fbb assets/create/models/block/granite_cobblestone_wall_side_tall.json +f55c5825c63f345a95e822a2113e76b5a62d8f7c assets/create/models/block/granite_pillar.json a68cd40ffb769b195437107f4a2c2188b222b74a assets/create/models/block/gray_sail.json 6eb5e59e803e1055968b90f3099cd0a17a1d3fd5 assets/create/models/block/gray_seat.json 7e213be39cc928363bf2b096f055439211050b8d assets/create/models/block/gray_valve_handle.json @@ -756,21 +760,21 @@ d13df8a5920c5778d98081fb0e97f045e2fd46a2 assets/create/models/block/horizontal_f a5938ddd48109f067a19a90a0f9abab655c18821 assets/create/models/block/horizontal_framed_glass_pane_post.json 41645919ece236df5804a5a73ef682720194de34 assets/create/models/block/horizontal_framed_glass_pane_side.json 8bc0abaabdc62d0c27730dba7eb6da54607b7e96 assets/create/models/block/horizontal_framed_glass_pane_side_alt.json -2536b29d5d87ba7da1d0f29c791572f67d1bd951 assets/create/models/block/jungle_window.json -50ad1922e3fcc045c9ea9fc085fdeeb53ab95c7a assets/create/models/block/jungle_window_pane_noside.json -38e4df0859d04d1a2dd4973b530748eb39c9f6c9 assets/create/models/block/jungle_window_pane_noside_alt.json -bf353e0eb2f8906a14bc35edd4ba0c0100ac211c assets/create/models/block/jungle_window_pane_post.json -41db69ebd3815264bba50a842888d436105a5ebf assets/create/models/block/jungle_window_pane_side.json -45ae3d910768519c5490f0c55c986eb0fef0bccd assets/create/models/block/jungle_window_pane_side_alt.json -08db5db16af40320d5d28f68d0c59bea8ca4d181 assets/create/models/block/layered_andesite.json -072766a01b510ab062c22c811577d15a5822b7dc assets/create/models/block/layered_dark_scoria.json -3592d257cf99bb6aa507a0e4a88fd26bca992e8f assets/create/models/block/layered_diorite.json -e9b639cb29051249a9999dd05e09eb820159cd40 assets/create/models/block/layered_dolomite.json -ff78465839cbd36a356cd4153c721c88b1f0b297 assets/create/models/block/layered_gabbro.json -0fe90b060613a824effaeeff6b3d13399681cbf0 assets/create/models/block/layered_granite.json -8f1014b1fdef246c2ce525f33ade4f03c85d0217 assets/create/models/block/layered_limestone.json -9408ce7ba29a96053c9333b15a05d716752392c6 assets/create/models/block/layered_scoria.json -da71aca99ac5cf3731896be47e15d774397a3330 assets/create/models/block/layered_weathered_limestone.json +35253c91ed72c7c2ce981c384d334c1113851469 assets/create/models/block/jungle_window.json +65da656d412d973865f50ab7f02e278fe5398bea assets/create/models/block/jungle_window_pane_noside.json +9f4144df2e6b35c1fad04e594be5adb3b107bdb8 assets/create/models/block/jungle_window_pane_noside_alt.json +2e8cec84ae0fe8933a3e2e39721937673c4941d1 assets/create/models/block/jungle_window_pane_post.json +4e3cc8764a8e5cefd2dfb415e66e75c4059cb804 assets/create/models/block/jungle_window_pane_side.json +b233d493ec57204f7527c6ccf803580c1131b2ae assets/create/models/block/jungle_window_pane_side_alt.json +6abd1f7dd176b861e2335f65c8f8cdc50c90aaac assets/create/models/block/layered_andesite.json +be3a70d4f88abeb9321bdef6629790cb4220b688 assets/create/models/block/layered_dark_scoria.json +936e118bb2275fa468bc0d0e934a14e3a6c768ee assets/create/models/block/layered_diorite.json +e1add9f62cf886a7989f7ebb545906da16ad7a41 assets/create/models/block/layered_dolomite.json +3ed6faede6762dd9b44139d137ff081797189300 assets/create/models/block/layered_gabbro.json +650f878e71110f84abaa44c076b0c0023425be45 assets/create/models/block/layered_granite.json +cecf946818c65370b685dfeaade50819183acb41 assets/create/models/block/layered_limestone.json +258fb9644d396872719c56ae1ca89f50667a1077 assets/create/models/block/layered_scoria.json +60b05926e706d5dd27f3cb4997120c948797f2f4 assets/create/models/block/layered_weathered_limestone.json 19bd08ad6ac351e6eee2131f7b4c11a768bf8f08 assets/create/models/block/light_blue_sail.json 1a28b07da68d1461cd04c971ae548d94165e0cf3 assets/create/models/block/light_blue_seat.json 68e01f8d8a31f07f236383e19b49ae1be4cbe3f4 assets/create/models/block/light_blue_valve_handle.json @@ -780,29 +784,31 @@ da71aca99ac5cf3731896be47e15d774397a3330 assets/create/models/block/layered_weat 8292d043ebfe280340526a6a0f96d4160099e213 assets/create/models/block/lime_sail.json 31c9474210d8535c5417021fe042d4cc31e17328 assets/create/models/block/lime_seat.json 74008bd0d775b0e2e96b43be2e51d0f3c3abdf21 assets/create/models/block/lime_valve_handle.json -ce6fb36a386c895486e021823eb008b0fa4862c3 assets/create/models/block/limesand.json -a2cbc86d24fdd70c5f33c8b30ba52a8928dde63f assets/create/models/block/limestone.json -447686a6861773e03c5c18f2de4bc11d06c65f78 assets/create/models/block/limestone_bricks.json -4aa8f22c5c48b20170f7050ad7ecf65d08c1a6fe assets/create/models/block/limestone_bricks_slab.json -7a890ab6513ead1b4d20b023e7a04a4d4d8b8c3d assets/create/models/block/limestone_bricks_slab_top.json -180c37c3ecec8e036a12840b1440c6b9d7b21cef assets/create/models/block/limestone_bricks_stairs.json -a30fc3563f85b189a16cb4b2af6cbb587b33b354 assets/create/models/block/limestone_bricks_stairs_inner.json -cb8d4ba5a0e1372520f55ddd659ed8f944700730 assets/create/models/block/limestone_bricks_stairs_outer.json -bd46a9a9650fc893b0403a4427dace9fc2c0002a assets/create/models/block/limestone_bricks_wall_post.json -774de72109796d55c5548e4194461ce27083a20d assets/create/models/block/limestone_bricks_wall_side.json -59202c99e39fc26497cd7c27b2e5edc9b1310457 assets/create/models/block/limestone_cobblestone.json -fe6a5228bf9ca394b234afd82467efe65544afc2 assets/create/models/block/limestone_cobblestone_slab.json -d1718b257af8f892a6ed28638399a57cc6c3d8dd assets/create/models/block/limestone_cobblestone_slab_top.json -3a15866b7c6df7e035afcc4b32321d8dad07d5f8 assets/create/models/block/limestone_cobblestone_stairs.json -fd0a970c68c7025040bede0a07fef46c9047f611 assets/create/models/block/limestone_cobblestone_stairs_inner.json -abef3f97c28321ded3bafc90918377981038d7b2 assets/create/models/block/limestone_cobblestone_stairs_outer.json -eee8ae85daa99fcd594da3d4af393726af69493b assets/create/models/block/limestone_cobblestone_wall_post.json -0effd13c1ff224f4c2d7017c6505f48d31815934 assets/create/models/block/limestone_cobblestone_wall_side.json -7336e008b3af80e054c9f15be381b7fe307e97d4 assets/create/models/block/limestone_pillar.json -20432687c62402a4bc0f2415113e7470231cdf03 assets/create/models/block/linear_chassis.json -595bfec2293c44deae49147016cb7971bdd721df assets/create/models/block/linear_chassis_bottom.json -999ce855842170f47db9d1e8e8636c24f7d3ad3d assets/create/models/block/linear_chassis_top.json -b9abbd1dcf71e0a1416fd998a82a560c06cef5a3 assets/create/models/block/linear_chassis_top_bottom.json +fccac0de94fff5f4e180fc9dbddeb0f8ddf3baab assets/create/models/block/limesand.json +3c49d63386b3f5326051edbf6e2f0f8f0e2ff4f3 assets/create/models/block/limestone.json +84920646b4df506f94e64611ee231f3af51b5379 assets/create/models/block/limestone_bricks.json +34a6379261b13f0b5b856bdcbecac1aa8de98ec8 assets/create/models/block/limestone_bricks_slab.json +a4eb94d59365c854b205c22b98c03742a3e45007 assets/create/models/block/limestone_bricks_slab_top.json +6030ff8209edb3ef04e6dcf83cf181ee4cad13fa assets/create/models/block/limestone_bricks_stairs.json +0e830acdd0e39b099d0d0b3f2b9326af0c182633 assets/create/models/block/limestone_bricks_stairs_inner.json +38c3bc0412baa9ed842c6436874c528e4a27fe00 assets/create/models/block/limestone_bricks_stairs_outer.json +d36db8a76c0abf8f42798fb2d8914d4aad0cb7b9 assets/create/models/block/limestone_bricks_wall_post.json +628493255ec16d79455bc54497c6a4b8207e0649 assets/create/models/block/limestone_bricks_wall_side.json +9c4cbf01802a59919c284bc616ae4d390b34d917 assets/create/models/block/limestone_bricks_wall_side_tall.json +93d3ca6df1c824a6f8b54d917bc61e48675f5ff5 assets/create/models/block/limestone_cobblestone.json +7786068e25079538528bf717e473d5c4e2266f7c assets/create/models/block/limestone_cobblestone_slab.json +454f09c5eb4c92bfa0e0b81c0b28c88caa78a907 assets/create/models/block/limestone_cobblestone_slab_top.json +213e897e2e2df5647e6c2df23691e52e92eaccab assets/create/models/block/limestone_cobblestone_stairs.json +c54e5a17495f88fa21b3488e8da32a365452c36c assets/create/models/block/limestone_cobblestone_stairs_inner.json +17cd5d20df9a8a16ad8993bcf5fc273ca80933dc assets/create/models/block/limestone_cobblestone_stairs_outer.json +464053d2fad1f398662a0878e6891a0dc613061d assets/create/models/block/limestone_cobblestone_wall_post.json +9d2826391999f3d65b948f560c91bc178dbe8846 assets/create/models/block/limestone_cobblestone_wall_side.json +6d4fb04b155e1460c6f8019491310707ed5cca28 assets/create/models/block/limestone_cobblestone_wall_side_tall.json +7527b3f1274744a64f7eb4bc94f7bc125dcbcf28 assets/create/models/block/limestone_pillar.json +0766a12c95977dfb8f3a8ea453d45c9832e7e824 assets/create/models/block/linear_chassis.json +7991d6620d2225b1a026e2b62dc076cf0a33613d assets/create/models/block/linear_chassis_bottom.json +56e585805c6235552ce5e15ff2f125ff8ec0fa2d assets/create/models/block/linear_chassis_top.json +12b35c916e3ee83ee4fd1e309c73403dec9a7297 assets/create/models/block/linear_chassis_top_bottom.json ec6b5f636e163ff5e361d486cf628ca1af4849a1 assets/create/models/block/magenta_sail.json cbee001cd1bb1125a97d1bb2d1e6e5a68f129303 assets/create/models/block/magenta_seat.json bc5a03a5552eb4a518abefe5e8615f14ee13ca29 assets/create/models/block/magenta_valve_handle.json @@ -816,13 +822,13 @@ f2f7cda5de21279ff8e359142c523e07a3377477 assets/create/models/block/mossy_granit de9b0f933881cc735ae0acf2bd71e6eafa732ff8 assets/create/models/block/mossy_limestone.json f88a9558a20033d4955e7b6de4f8aa23b1a11b9f assets/create/models/block/mossy_scoria.json 8c3296378aa7e5dc1bc7dfdde2f0a436b8bb8b78 assets/create/models/block/mossy_weathered_limestone.json -24cbd7e60a7769a8fc9f530978ef7094ae65a9eb assets/create/models/block/natural_scoria.json -269ec2c32ba22a216b1c6831e6284ef98e78ee75 assets/create/models/block/oak_window.json -f324403f578d724c118055ca04e6bec23607ea90 assets/create/models/block/oak_window_pane_noside.json -e55363147cc27fba84590c7e24460603988118e3 assets/create/models/block/oak_window_pane_noside_alt.json -88883e266828422f86ec71db455a41f0279926fd assets/create/models/block/oak_window_pane_post.json -aa12818d00d1995e5b8a218cb613215ec0161d23 assets/create/models/block/oak_window_pane_side.json -488dfd3f4bd82ab1b5b751b4a46881befb8d6819 assets/create/models/block/oak_window_pane_side_alt.json +50f28bf7a7de95caf12b4f040994f0f3da72a55a assets/create/models/block/natural_scoria.json +e3cd8b33b8c5f0543e4f6728a5b3e05642f9efe1 assets/create/models/block/oak_window.json +54a3b3158f8c914788812aa44515b798b2a9e2f3 assets/create/models/block/oak_window_pane_noside.json +b9c27f90d4d258e3fdcd713aaa42142f5d46a79e assets/create/models/block/oak_window_pane_noside_alt.json +8c3fdc51742897d110641ba9127f857297300edb assets/create/models/block/oak_window_pane_post.json +8f77db5a66b165d2ca85f9119666907dcf65105f assets/create/models/block/oak_window_pane_side.json +b3e056a176e86660fc2d3a51f9ba8b01eebb56c5 assets/create/models/block/oak_window_pane_side_alt.json ff9b51fcaffe54e321b9479f035f4ea7b278bfec assets/create/models/block/orange_sail.json fda0628a09ef726e3e8323b2f38b6a3e612dc2ca assets/create/models/block/orange_seat.json 3b07f3f1985495051d173725b01ddd52b5f70ac4 assets/create/models/block/orange_valve_handle.json @@ -841,119 +847,128 @@ ca08c15006d65701d72bb88852df884236822522 assets/create/models/block/overgrown_di 3368bbdf335c81b9e84adc30afeab9261256279c assets/create/models/block/overgrown_limestone.json c21c58e982ec0eb1c88948ac53b570b26bf1c9bc assets/create/models/block/overgrown_scoria.json 6d7842c5c0f58a3cb3150e54bee2b51e7138df45 assets/create/models/block/overgrown_weathered_limestone.json -e151c82942df13d7f4296b6b717b12036c4c47fe assets/create/models/block/oxidized/copper_block_0.json -35cb12fe13b6f39d2baad9b5a1638b6c5b364513 assets/create/models/block/oxidized/copper_block_1.json -a7ea046b36c810816dd749727fcc3f1008807c4c assets/create/models/block/oxidized/copper_block_2.json -e06ed91723927def43bd21d9b26230c07e80151b assets/create/models/block/oxidized/copper_block_3.json -45dc4f29c527b614ce3b12706342233a6de82fa4 assets/create/models/block/oxidized/copper_block_4.json -3890ed69f41efe49233c063c572c6bfb8319e37b assets/create/models/block/oxidized/copper_block_5.json -6b681b9829a2493ee5312d4021e9302cb23d7e28 assets/create/models/block/oxidized/copper_block_6.json -b1ed190a331ba21ffeba378e9526364874a22a9d assets/create/models/block/oxidized/copper_block_7.json -375323c5dfaf643cdce4792e2c86ed6033d43412 assets/create/models/block/oxidized/copper_ore_0.json -e5be33b30e6e83ea1cfdf09201fde1255b0f7a11 assets/create/models/block/oxidized/copper_ore_1.json -cf9ab024daedfaab9e4f3f35cb788e259c3616a4 assets/create/models/block/oxidized/copper_ore_2.json -8f24fce14e52cc4082bf292c9ca8043c98023e0a assets/create/models/block/oxidized/copper_ore_3.json -db2990e91a12fd5c5a039b724da9377bb2a861a2 assets/create/models/block/oxidized/copper_ore_4.json -ffc37d15dde98e7e03d189f55fca33ac203bd1e0 assets/create/models/block/oxidized/copper_ore_5.json -4bfbc1352c961f6beeb35ca44bdc8f4084e7edc0 assets/create/models/block/oxidized/copper_ore_6.json -90daa6f691b18a078eab36a21c0a2d6fadfe20c3 assets/create/models/block/oxidized/copper_ore_7.json -2a88da386c48ff915c9a7fb6b1d96bde796020bb assets/create/models/block/oxidized/copper_shingles_0.json -79c45f98817de41f23e2a6a2a2197fdaf3e8ee8b assets/create/models/block/oxidized/copper_shingles_1.json -0085be85c60675694cfc97d39eb595327c953d02 assets/create/models/block/oxidized/copper_shingles_2.json -b4987ed1fbd44719e59cf911d606b964d51a734c assets/create/models/block/oxidized/copper_shingles_3.json -33d060556bd43b1b51f9a990fc802b204f07ceeb assets/create/models/block/oxidized/copper_shingles_4.json -c9f722cd27fb18239f796eb1fa11a73e5339005a assets/create/models/block/oxidized/copper_shingles_5.json -4df00795cde9497a0910584c6a53b62bfb18fef1 assets/create/models/block/oxidized/copper_shingles_6.json -712f8b01330a1aeff2efce5ac1ec2fdd84b622c7 assets/create/models/block/oxidized/copper_shingles_7.json -d23868f342aa1d821c2971f16b62915d24f257cd assets/create/models/block/oxidized/copper_tiles_0.json -14d893f509073bc0ee6b8a487d1ec4457f717e7a assets/create/models/block/oxidized/copper_tiles_1.json -9d531696a9e989ab090f653d50152fcdf0b8519f assets/create/models/block/oxidized/copper_tiles_2.json -84129b54eb4484c59ad5f3b95b5dea4130a934bc assets/create/models/block/oxidized/copper_tiles_3.json -0e4b39cd5d14470ee9055c3332d3c930d985e075 assets/create/models/block/oxidized/copper_tiles_4.json -c3f2f3574f33ea87c8c32a88c60b386b2ce5c59e assets/create/models/block/oxidized/copper_tiles_5.json -1bdc82a5d6deecaa6e62986bfa4d83ed80cad269 assets/create/models/block/oxidized/copper_tiles_6.json -4ba81cdb32477181225521b13de34b5cb81d3ab1 assets/create/models/block/oxidized/copper_tiles_7.json -081d87f990e01211789e9d0dc43acfceb6982aaa assets/create/models/block/paved_andesite.json -30b9aafb43ecfffcbffdf0aa19b5243e38065ff4 assets/create/models/block/paved_andesite_covered.json -ab78afb3c487976c2dc5dcefa12153fd4a064ca8 assets/create/models/block/paved_andesite_slab.json -7883fa378c843ad87593798e8129eb82f6f2e034 assets/create/models/block/paved_andesite_slab_top.json -d2d8c145ee2ae181370d53224d23df7ec2f3a1c1 assets/create/models/block/paved_andesite_stairs.json -7481fc2f5a2b3ee2259b410da2c1f35e9bc0dff8 assets/create/models/block/paved_andesite_stairs_inner.json -1226bf0720fa814125f7718ec5f2216b36e75b81 assets/create/models/block/paved_andesite_stairs_outer.json -8856b9a15c3239be81cd49a25495367eb755bb9c assets/create/models/block/paved_andesite_wall_post.json -c5814ebc7106b7d729f444f782cc03b91ebdf66d assets/create/models/block/paved_andesite_wall_side.json -bee20297f99cb4377b9c478c86db0c10fd59fddc assets/create/models/block/paved_dark_scoria.json -40a4bc726fa798d6c969dcb0fd8a04941c0e18ff assets/create/models/block/paved_dark_scoria_covered.json -c7bcf573bc82403bb84ac8df63bec1c445cd8e30 assets/create/models/block/paved_dark_scoria_slab.json -9f66f54331e40df74c6b63987d6183aca11695d3 assets/create/models/block/paved_dark_scoria_slab_top.json -5fa06fd6002ec820528623d47ffb67d3c7ac71d9 assets/create/models/block/paved_dark_scoria_stairs.json -313a75f8469ed545da798ad922b55188af1f152b assets/create/models/block/paved_dark_scoria_stairs_inner.json -f86a35c6f20a4582311677bd4ed515cfc52f6719 assets/create/models/block/paved_dark_scoria_stairs_outer.json -f4e0b3486f97dfca7dc0508d807afe037d79a40a assets/create/models/block/paved_dark_scoria_wall_post.json -a5201829b4ec5ff4f940c1b8d903f6766cb62f46 assets/create/models/block/paved_dark_scoria_wall_side.json -ed010fd12474e33023399848eaa2560e67fb1786 assets/create/models/block/paved_diorite.json -9f0f979d9e15a87a909cc7ee523c9efa2fee188f assets/create/models/block/paved_diorite_covered.json -4dc52f0705c0d3add4abf4273d1021cf907c5f10 assets/create/models/block/paved_diorite_slab.json -98556b2a6bab79bd34464c5b54b832ae716dccb0 assets/create/models/block/paved_diorite_slab_top.json -b745c52b431c44683ef6f6eb35d29a795323ac71 assets/create/models/block/paved_diorite_stairs.json -4a45dccbf43ffd8a3e6d2afb41156e24bf69c262 assets/create/models/block/paved_diorite_stairs_inner.json -b06dabc15eca7c4d8e41eb784de259a2fb0b32b1 assets/create/models/block/paved_diorite_stairs_outer.json -e3349e5f33144dca393a08fe573b499917a6491b assets/create/models/block/paved_diorite_wall_post.json -727dfa282f0f9c9f462243c6b85edd3b964982d5 assets/create/models/block/paved_diorite_wall_side.json -af2c89fcdaa2e414ca309e3cee25fe316f976269 assets/create/models/block/paved_dolomite.json -2c907a7d85c6f078fd8c7cab25d7fa0fce95cbb8 assets/create/models/block/paved_dolomite_covered.json -cd87ae72be668bf69f61b83ca0e8579963556d69 assets/create/models/block/paved_dolomite_slab.json -a2e38092ec694840be0cd5d0dd632586668166da assets/create/models/block/paved_dolomite_slab_top.json -1257a4336e687c8a8ae083d7277be594d392df49 assets/create/models/block/paved_dolomite_stairs.json -876d6a25ac6bd8a69b3a302ccd9f5db6de20855f assets/create/models/block/paved_dolomite_stairs_inner.json -f352f5468190893ccf05f77fc93c312c1bee75b2 assets/create/models/block/paved_dolomite_stairs_outer.json -0b280906a41d046dd4340f6cfcf9439abbefa388 assets/create/models/block/paved_dolomite_wall_post.json -7dd9db1faa5075f4c024a7150bbaa36aa206a004 assets/create/models/block/paved_dolomite_wall_side.json -bf650bbe4a716461ee6629d55a80e4fdbf186e7d assets/create/models/block/paved_gabbro.json -3b61df4ad67c9dcc732b1af9efa11ae6fe82c8f0 assets/create/models/block/paved_gabbro_covered.json -386cfdccfc679e32a4ef3c298a5b17f079b7f40d assets/create/models/block/paved_gabbro_slab.json -01d58ff2bb85cc74163aa4c6e528ebd5529342a6 assets/create/models/block/paved_gabbro_slab_top.json -52a5f96e46d53261097a4e190510b64f9f2a4f97 assets/create/models/block/paved_gabbro_stairs.json -97101aeefced27810dd89adc753b1a3e9526f3b6 assets/create/models/block/paved_gabbro_stairs_inner.json -648982e8e37f75b4146096dc04e2ce46c69f25dc assets/create/models/block/paved_gabbro_stairs_outer.json -405bf0ad098f7e525b0b46b2e0810a45ec3f22f2 assets/create/models/block/paved_gabbro_wall_post.json -2b03c0f5fa9ff9b5a18fb64eb1963ee49a585236 assets/create/models/block/paved_gabbro_wall_side.json -737ddffd50beb12e64fc651abf6b39eef15678b8 assets/create/models/block/paved_granite.json -6520e67aedc7f09ae1e0ccf249421dbbbc01c410 assets/create/models/block/paved_granite_covered.json -cf9afa3923d1dd6f9082ea2579c671663cb12aa2 assets/create/models/block/paved_granite_slab.json -981101ec1847e17bd7115580995059fcdbb0a39a assets/create/models/block/paved_granite_slab_top.json -a56941299579280b1ac970802b15b91d0f2af60f assets/create/models/block/paved_granite_stairs.json -9f98d88d6194a740afe26fab7b510ad0ba7b612a assets/create/models/block/paved_granite_stairs_inner.json -b1d2b9eaef07034c619ff897d22440a8e3f30624 assets/create/models/block/paved_granite_stairs_outer.json -d5190b5ebfd581f66a63f7c8af191e484851fb25 assets/create/models/block/paved_granite_wall_post.json -1313a39aac0091a92ebdcd67efa5682b0fa8b6c2 assets/create/models/block/paved_granite_wall_side.json -5caa126fbc2aa3e970c04a93b369e43dbe75ba4e assets/create/models/block/paved_limestone.json -598dab6d11f56cce1d98c46855ccde3f8c3a40db assets/create/models/block/paved_limestone_covered.json -40b0930304bfbed399e0fe4a46d6d4ee23015060 assets/create/models/block/paved_limestone_slab.json -7234c2cc3f40224fa881e7347ab72b154e102bb8 assets/create/models/block/paved_limestone_slab_top.json -7b30942c7e504f0d4656a81bcc11eaa83eddbebb assets/create/models/block/paved_limestone_stairs.json -ff51dfa74e7c3f7c7f6c05ccafc39333b6c1e1ad assets/create/models/block/paved_limestone_stairs_inner.json -9e70c6f40945e723ebe1525bfe317c221a1493e6 assets/create/models/block/paved_limestone_stairs_outer.json -0711327be8ecf3dff399a22f10ed4962c311fc9d assets/create/models/block/paved_limestone_wall_post.json -7bf11f179347567575bd839b6df5982c54309a47 assets/create/models/block/paved_limestone_wall_side.json -df6fdefa2a2bdd6ab737244234c907f88cf38070 assets/create/models/block/paved_scoria.json -3041e4b37080bb6ed2ccaa4e7727791bdac14394 assets/create/models/block/paved_scoria_covered.json -c2034068ee2c9a9dfa7d7070df8742891a599576 assets/create/models/block/paved_scoria_slab.json -5d6f360d60157b54c9f676a71390ea5bec4ba1a7 assets/create/models/block/paved_scoria_slab_top.json -ac2017f2746b34b173eef62cf60586d4a3dacbc3 assets/create/models/block/paved_scoria_stairs.json -a07f07b9e03f07fa4681b291191a9c15527f956c assets/create/models/block/paved_scoria_stairs_inner.json -cd54fcdacb9a762bba771ddcfe6d4bd824495e7b assets/create/models/block/paved_scoria_stairs_outer.json -c495e4fee97b022fd1f3c97ff51543c79bab1cab assets/create/models/block/paved_scoria_wall_post.json -7524fedd7bf1283eb2ee2747af8031a2cade5f97 assets/create/models/block/paved_scoria_wall_side.json -651289c401a89ee5a1a21497153067e7e46918cb assets/create/models/block/paved_weathered_limestone.json -afe2c1f8a14119f3746e741214fd0438bf0ed26a assets/create/models/block/paved_weathered_limestone_covered.json -f09a45d1d83aad870018f779472510a9d6201a4b assets/create/models/block/paved_weathered_limestone_slab.json -a36fff1ba5d2b5e40468c106902e083b41a0d20d assets/create/models/block/paved_weathered_limestone_slab_top.json -cc36e21013b80b1dfa041b55047096db127ffa51 assets/create/models/block/paved_weathered_limestone_stairs.json -8589358359ef3a2fbe054ca61da13c4042e2f431 assets/create/models/block/paved_weathered_limestone_stairs_inner.json -743fc37d4c96834f9bd0697ad7990c721436b901 assets/create/models/block/paved_weathered_limestone_stairs_outer.json -34ba32e570e0a54501db071b9f8c38513edea93d assets/create/models/block/paved_weathered_limestone_wall_post.json -daf65510d95730bcf0373d746f2a2dbfe6b44fc0 assets/create/models/block/paved_weathered_limestone_wall_side.json +8dfe5334887c09375f2571aa3835f2dd9de76875 assets/create/models/block/oxidized/copper_block_0.json +3f5af8864db20346df2463066265d7f6709a5e65 assets/create/models/block/oxidized/copper_block_1.json +ee0f11c96fafc164fd9ac64fde0f89cfd527a65a assets/create/models/block/oxidized/copper_block_2.json +060743439c0f0e991a7ccfcc9053ee9741e73805 assets/create/models/block/oxidized/copper_block_3.json +131b2a2b3c883deeb6af544f15fcc0d88a3ff5fe assets/create/models/block/oxidized/copper_block_4.json +4e0fbfc3b61f04f68c6022d6a9a9eabdffdd8673 assets/create/models/block/oxidized/copper_block_5.json +e3d374a2e5ceac212bed21b6ec964b4593aa847a assets/create/models/block/oxidized/copper_block_6.json +125966d6e25b601779e3bff4a9da84d85e3984ff assets/create/models/block/oxidized/copper_block_7.json +8f2b2d983c1a0d128dbb1d6465a4eb3a7f98e34c assets/create/models/block/oxidized/copper_ore_0.json +4fd860b564a98869c6450e21446e0e41a8303206 assets/create/models/block/oxidized/copper_ore_1.json +430a115e26a2e95b7a6c04746b10f617212a3091 assets/create/models/block/oxidized/copper_ore_2.json +596fb93cc5f59ccff8e84c07a99398f5ec20d169 assets/create/models/block/oxidized/copper_ore_3.json +d7e94d32a8c739fe8ccfc51b3bf5c1dff038b47f assets/create/models/block/oxidized/copper_ore_4.json +895d3ce98dc576b7396fa309dce69eaeba419c95 assets/create/models/block/oxidized/copper_ore_5.json +578ee4b7b0aaf4f5fbdecc7800f1d8b0d9ea6576 assets/create/models/block/oxidized/copper_ore_6.json +7c4e54d05a8e76e390044099ad02c5dd082f2460 assets/create/models/block/oxidized/copper_ore_7.json +2091e38299cd736320de736b9450e9b5209106cd assets/create/models/block/oxidized/copper_shingles_0.json +3614bcea228962535a048b68b3069a9058156a16 assets/create/models/block/oxidized/copper_shingles_1.json +3d2219e127df9e14109c876ef2e3499a21268209 assets/create/models/block/oxidized/copper_shingles_2.json +6f9461d372dbd9561460649a9325c62cd3f3ef36 assets/create/models/block/oxidized/copper_shingles_3.json +d9867c3574ecd484ea179a8ffc2d3b562a389bc2 assets/create/models/block/oxidized/copper_shingles_4.json +649cf546f5f4535f0936dedf0074aeb878829129 assets/create/models/block/oxidized/copper_shingles_5.json +c3bb01e750f02312c62990d71bd113df41f0746c assets/create/models/block/oxidized/copper_shingles_6.json +cde13928d8643fe28f891b4ed6358971b6eb49f7 assets/create/models/block/oxidized/copper_shingles_7.json +a223e5ddcd9c0f282a0193434189ae91b67e1571 assets/create/models/block/oxidized/copper_tiles_0.json +590c75f1c1a9013c8adb5b90f05e8578a75a140f assets/create/models/block/oxidized/copper_tiles_1.json +66af247eac88396e9c26b61443e2d324f250a160 assets/create/models/block/oxidized/copper_tiles_2.json +3fc4e85ed7115e4b3289739268b4366f8d8777c5 assets/create/models/block/oxidized/copper_tiles_3.json +abdcf49a3ad1a25b37653c1c6eccd24b9a97c87f assets/create/models/block/oxidized/copper_tiles_4.json +99580c32742505b9a2eb64185f9529a5388d2751 assets/create/models/block/oxidized/copper_tiles_5.json +be9ac7815d4bbf0c42dc40d20d34212250ac86a7 assets/create/models/block/oxidized/copper_tiles_6.json +a4e5715d04bd13860e2d5981c2122fbc6b435e80 assets/create/models/block/oxidized/copper_tiles_7.json +44abcee4d7f0d63d2f91b42a6e223cb8211597df assets/create/models/block/paved_andesite.json +afcf525fd574ebd6918d0357442d2f8099276079 assets/create/models/block/paved_andesite_covered.json +ee19b3143803e4d41639dbd564f84bf86b01d77d assets/create/models/block/paved_andesite_slab.json +39da471b29a69b94dd481b8a7d6aad2b8efcc993 assets/create/models/block/paved_andesite_slab_top.json +7f61f36812ec6f1a684bfc06e7058114dbe4c7d4 assets/create/models/block/paved_andesite_stairs.json +91a169ff2d8463520d419738d2341afdc4cf1f0f assets/create/models/block/paved_andesite_stairs_inner.json +7c7d1081ce8c4cf8c247afeafed434172c8ccd00 assets/create/models/block/paved_andesite_stairs_outer.json +b14d753208e48c3a2780d258bec6e0d20ccbafc1 assets/create/models/block/paved_andesite_wall_post.json +1edd248747a0db1381115b3ecc40f7fa24ae845d assets/create/models/block/paved_andesite_wall_side.json +5bfc3655067f7ac2e80dee3ccc1c4a9b387316a0 assets/create/models/block/paved_andesite_wall_side_tall.json +516936f48542723e9ea19fe06412348d36d4461b assets/create/models/block/paved_dark_scoria.json +5a9c0029ac5c10a65709bdf59a4f3dd778369370 assets/create/models/block/paved_dark_scoria_covered.json +4dfbc6beec27bf266b03a7fc9c9ddd8dc2d24745 assets/create/models/block/paved_dark_scoria_slab.json +9657df68fa3903ddef2aa49b88ec66a7e91ebb7e assets/create/models/block/paved_dark_scoria_slab_top.json +8c6fcbe10e4287e39b7f5161d677b628b933cb17 assets/create/models/block/paved_dark_scoria_stairs.json +fb5bd6499bf17d861d5f504b45d2caf9a734ff77 assets/create/models/block/paved_dark_scoria_stairs_inner.json +bc58687ad19f3a12b8c730dd2c7284b3baff370c assets/create/models/block/paved_dark_scoria_stairs_outer.json +346b7db2932c5f32a26e35bf0383b33c6109ee3c assets/create/models/block/paved_dark_scoria_wall_post.json +695b167aa884c3c827bf3f743233d7c5f0d220d3 assets/create/models/block/paved_dark_scoria_wall_side.json +75870726f58f388244ffbbde1676a9f66c52120c assets/create/models/block/paved_dark_scoria_wall_side_tall.json +ad5ecc000e088252a9aa144250f1be3324dac366 assets/create/models/block/paved_diorite.json +171351fbd56ea8a19ba6c9b0fd82bf88ee176528 assets/create/models/block/paved_diorite_covered.json +bc66da45a57ac338c066aa26427c3c55d78d798c assets/create/models/block/paved_diorite_slab.json +c3e7a4cc76ea1cf2511f6921ed715540dcb200df assets/create/models/block/paved_diorite_slab_top.json +dfd06d83473b0cf8855fbd0ed89831567bcc6212 assets/create/models/block/paved_diorite_stairs.json +6f852f3f90c24cfebbfc603f11803e039ea9a0c0 assets/create/models/block/paved_diorite_stairs_inner.json +cd32a4355eed1eadfdd133a2acc135c0836011a7 assets/create/models/block/paved_diorite_stairs_outer.json +6c52f7f025f56dcd45fcdef87c76263318ffbee5 assets/create/models/block/paved_diorite_wall_post.json +5ee12e7349d48986ff245512764defbf18d03a45 assets/create/models/block/paved_diorite_wall_side.json +1584f34af51c9ee584d7e6c528d68a7ff2a9b5a0 assets/create/models/block/paved_diorite_wall_side_tall.json +e763ba96670e52800dfadb96cc402ef50bc23c21 assets/create/models/block/paved_dolomite.json +1ea5247d696ab136f8e323f68e2918a9e871ce1c assets/create/models/block/paved_dolomite_covered.json +dba94cd61f0672829bbab3ace3409dce589bef62 assets/create/models/block/paved_dolomite_slab.json +74e8a30e8e14e4f4bb05f53159928544e99006ec assets/create/models/block/paved_dolomite_slab_top.json +c282fd047907899c439f022203aee6a1491070b4 assets/create/models/block/paved_dolomite_stairs.json +88f4e3af8e0a7fd38adc300e49f8f0efb19ee8a9 assets/create/models/block/paved_dolomite_stairs_inner.json +91b6be901eb9a18518585c679757c1baec16c7c5 assets/create/models/block/paved_dolomite_stairs_outer.json +8b9309e098b6066dff8cd206e80938e33b692c8e assets/create/models/block/paved_dolomite_wall_post.json +378609052c8daa9a38259b54a0a0d995c4636396 assets/create/models/block/paved_dolomite_wall_side.json +47b5f4d682d041008c8256fc3df1be25130fa10a assets/create/models/block/paved_dolomite_wall_side_tall.json +f90897992da49371e405088756b9077113a5c7dd assets/create/models/block/paved_gabbro.json +7ab1400fe9c2968fbe276bf70325ae6d159d37c3 assets/create/models/block/paved_gabbro_covered.json +fa1ed152122fee3a8bce34157159964b5fd8d79a assets/create/models/block/paved_gabbro_slab.json +8cd07e28885661fedca14b976dcd48b7042cee2a assets/create/models/block/paved_gabbro_slab_top.json +460a95cf5fc13f037902b6794a7e8c54a091b3cc assets/create/models/block/paved_gabbro_stairs.json +ce9c4a0cc7168b2fbe094b40a9a13c5fc5368426 assets/create/models/block/paved_gabbro_stairs_inner.json +f51b8fe5408d80ecf79b45fd2e758b947bd89d12 assets/create/models/block/paved_gabbro_stairs_outer.json +3113c182a4ff13adbc156b70a31c80b0e7de064a assets/create/models/block/paved_gabbro_wall_post.json +39a7a337bdca36263fb998c22a02b698b3e9ef06 assets/create/models/block/paved_gabbro_wall_side.json +8bce3c1a2d05e3d1897670c4768883b7a02e5159 assets/create/models/block/paved_gabbro_wall_side_tall.json +12ddeae599606fa0aaee5539f9cea99003220dd3 assets/create/models/block/paved_granite.json +528f2d902f402260d7d7670ef0f0b01b5367cb7b assets/create/models/block/paved_granite_covered.json +053fcddd1f3705dc47f2be515470d6cd006cea04 assets/create/models/block/paved_granite_slab.json +23329b2e8aaf3adddc50aba4ad8e2204db6677af assets/create/models/block/paved_granite_slab_top.json +1f39a935603bd49a76721cccafe49ca56ad616b9 assets/create/models/block/paved_granite_stairs.json +e9a6d727123642bc7db48f1f7e6024f08fa389c5 assets/create/models/block/paved_granite_stairs_inner.json +f7fddf3184dc69b095c432f3f2dfe9204b36ce21 assets/create/models/block/paved_granite_stairs_outer.json +2897b4cc6610e9cbb57582e84913f613903eda2d assets/create/models/block/paved_granite_wall_post.json +7292a674884325407786551a47f42ddc751b8e38 assets/create/models/block/paved_granite_wall_side.json +eec5d2ea68490b4b377bc8d8ae8dcc168e450174 assets/create/models/block/paved_granite_wall_side_tall.json +fd47f060b2d9686414d771fa79f73b0d7d18d1cf assets/create/models/block/paved_limestone.json +a02a16fcd7157e6e7485526673ba6fb30d228501 assets/create/models/block/paved_limestone_covered.json +3af3115c9d46fbf5ff9fb0c2c315292b2932601f assets/create/models/block/paved_limestone_slab.json +73873290e35c04be5e373593c5ab8555d045f239 assets/create/models/block/paved_limestone_slab_top.json +77d83f143597871e51450a370a4c3bf9a21d2d9f assets/create/models/block/paved_limestone_stairs.json +a95e3d5f34c0c8b03bd2a995a2811f3f63f91378 assets/create/models/block/paved_limestone_stairs_inner.json +825770b522f098d39c20850b7e8c887f429cdce1 assets/create/models/block/paved_limestone_stairs_outer.json +7462e8f922b26eacfe28ef5bc56fd1ed2ffdfb0a assets/create/models/block/paved_limestone_wall_post.json +1b3f725c75a524fe9e8039e03f8db84a1b252a96 assets/create/models/block/paved_limestone_wall_side.json +3a5f1bbca22ba53520138c192de22fa05c36fbfd assets/create/models/block/paved_limestone_wall_side_tall.json +2ad932c3a89dd2faa2f6d82c97f32242b092f7d2 assets/create/models/block/paved_scoria.json +a24a73544adbd4dc8afdcb42f42fe95e401a40c0 assets/create/models/block/paved_scoria_covered.json +f737e38308efcf68537505069cf60dba6d1c3658 assets/create/models/block/paved_scoria_slab.json +c6dab2f8010a5d75b1b145ea9c7e30329d099243 assets/create/models/block/paved_scoria_slab_top.json +ffdb9bb5e7072576a9db048fdb6375a27ad6df51 assets/create/models/block/paved_scoria_stairs.json +de95cca903aea66a0fd33e5629b1014fe33e6211 assets/create/models/block/paved_scoria_stairs_inner.json +f70d47a341a352ce53c39c272ef0556e8d6f62b5 assets/create/models/block/paved_scoria_stairs_outer.json +060b7c9b493c172916e99310663636376192eedf assets/create/models/block/paved_scoria_wall_post.json +308450fd3a19195364d268e29bef8afc7f9ca733 assets/create/models/block/paved_scoria_wall_side.json +100b1a1142953a107d283eab42000664c356c214 assets/create/models/block/paved_scoria_wall_side_tall.json +af309a5dd825509e64e3f2dc4db749e7d416cd71 assets/create/models/block/paved_weathered_limestone.json +04f8ab203f904371d9075d601dbb467931a75a50 assets/create/models/block/paved_weathered_limestone_covered.json +2d3700ea734cc2805fff93e1e7c63d8b716b3f43 assets/create/models/block/paved_weathered_limestone_slab.json +38177158a119e703e4e99b47eb12733e232ae768 assets/create/models/block/paved_weathered_limestone_slab_top.json +7aac84ea55c52494e5d9d61f53dc6f9a794afec4 assets/create/models/block/paved_weathered_limestone_stairs.json +db56f592a9ce027f33264d381b29830592b7d42e assets/create/models/block/paved_weathered_limestone_stairs_inner.json +f924c6104378768a3a645f5e77f9ed80d2c31e5a assets/create/models/block/paved_weathered_limestone_stairs_outer.json +46e3eeeefd47f7e6007e53bb1b22de2c6c2a5923 assets/create/models/block/paved_weathered_limestone_wall_post.json +c7941c0bcbdf7ec7e2d34679afac744cf81b7489 assets/create/models/block/paved_weathered_limestone_wall_side.json +39aaea370e31fa032e471d3b8f0ebf0586ee1a03 assets/create/models/block/paved_weathered_limestone_wall_side_tall.json 1b5f9e819cd4b5f5fe6e8c24920b916e8d93c95e assets/create/models/block/pink_sail.json ecc60ce7ee6b753073a99c597db95d6d9df3d438 assets/create/models/block/pink_seat.json 7ada61878d3a3c1d3cc33bcf9a80c21b8f9aaff2 assets/create/models/block/pink_valve_handle.json @@ -1022,7 +1037,7 @@ c934df1cfe097bcc0f0c21d1b1a3f3b53e50e831 assets/create/models/block/polished_wea f22d7d8263dcabd726aa04784031ae9062633579 assets/create/models/block/powered_toggle_latch_off_powered.json e6097d9ab9dc9954cbc750020bc33c7a423b73c6 assets/create/models/block/powered_toggle_latch_on_powered.json 622239a3a09fcac7235b9670eb395a530839a59b assets/create/models/block/pulse_repeater_powered.json -0102e253c941904f12de7acdd46b0079ee3ccf69 assets/create/models/block/pulse_repeater_pulsing.json +d469dce70d15759baed35025b8c7fa403c8b3b26 assets/create/models/block/pulse_repeater_pulsing.json b56fad63b82434564bc41ae9c01e3b427203fb5b assets/create/models/block/purple_sail.json 96adc7865ebe64b43865bc2fe914830c11258856 assets/create/models/block/purple_seat.json 062406aacf25e099f9b28a3bf7cacfcaa1da4ef6 assets/create/models/block/purple_valve_handle.json @@ -1162,7 +1177,7 @@ afd697168c9786eb80e54eccdc6a23afa6c7fb0e assets/create/models/item/chiseled_gabb a47fbe5f2da79080d99ef0975bfa8da4d08f8be4 assets/create/models/item/chiseled_scoria.json 70232ce9b88119fb383717e2c1ad113f7aad6a99 assets/create/models/item/chiseled_weathered_limestone.json fe67c3f380d17735a9436a4579a8be1a02b8e4a0 assets/create/models/item/chute.json -d418205c83d3e57c830755ee8c09e2962353e493 assets/create/models/item/cinder_flour.json +6680a68526576ded5dac2aa3bc9fb9de3e744146 assets/create/models/item/cinder_flour.json c1da21be9f1af4f7a2ef4ec9cd92195d65ada316 assets/create/models/item/clockwork_bearing.json 0a2a0f0aafeab0088172f77afd40c1fa2cc1f2b8 assets/create/models/item/clutch.json dcb09deae110077bcddf090996b51cc66e9a7de3 assets/create/models/item/cogwheel.json @@ -1306,8 +1321,8 @@ dee43bf1a9c211a752fac2c07aeba123f7f0c914 assets/create/models/item/handheld_worl 955e8accadb47f9b360e5fd48cd959c507b00f2d assets/create/models/item/horizontal_framed_glass.json f0e3b2b8a553b6e61746c922c27302dabfff71b6 assets/create/models/item/horizontal_framed_glass_pane.json ff92f6a9dfb73a6ee1eaaed3279c89390ff04a80 assets/create/models/item/hose_pulley.json -771d439eac70b52f593fa7381f2c48729fbdaec7 assets/create/models/item/integrated_circuit.json -d254f47bc185f2a2f01608a875aa63ed2c4ceb0f assets/create/models/item/iron_sheet.json +d9f222e963f8f8910ca9dbc3c31842ef149f7a1f assets/create/models/item/integrated_circuit.json +9d605ce0da83a73b535bce45c107e604364e2b20 assets/create/models/item/iron_sheet.json 52e435014cb03e93411666c4799ebff206e55fc9 assets/create/models/item/item_drain.json 83fa8699318e51f838b483b40b3e897c34ed53d1 assets/create/models/item/jungle_window.json 766323f6026c3505a75db2dee2996d342370d9c2 assets/create/models/item/jungle_window_pane.json @@ -1469,9 +1484,9 @@ ef52b3734a47e96c5f83d60da73110e925737933 assets/create/models/item/refined_radia 0817505d2d3ee516424100b985ca3fe2d2e7f01e assets/create/models/item/rose_quartz.json acfbf487ee65c2c58d89cb2644e33fda75751fde assets/create/models/item/rotation_speed_controller.json 171c343f7f536008f79ea1d63e0a443d064e9ef1 assets/create/models/item/sail_frame.json -be86c8156d55d2f128feb66abd70923b3be765cc assets/create/models/item/sand_paper.json -69196df5122a27573112dad49b334dea96aafed0 assets/create/models/item/schematic.json -533483999f61e3b091af567a473875247edaedb3 assets/create/models/item/schematic_and_quill.json +5fa0bfe8642e2614a7e97d27af1a95dd2e012097 assets/create/models/item/sand_paper.json +3202829de06e9c532dc8a61c955458648b70d645 assets/create/models/item/schematic.json +3f07bc7d4587d78de463ae2ce236e4f363b923cd assets/create/models/item/schematic_and_quill.json 8dd5caa4d7a0ee45bd9b39e09c4503159933d089 assets/create/models/item/schematic_table.json 0a1c4080ca572106c19a0ba6e2df4baba5f45d35 assets/create/models/item/schematicannon.json 22a6dfdc3cbb1b6ac20ec123b490e15c72dfbfcf assets/create/models/item/scoria.json @@ -1517,8 +1532,8 @@ f2cd30c585a25e336868ee4f8dd80799ecb986c6 assets/create/models/item/weathered_lim 3d26cb5616182ba6926d0bf703119ebfbeacbe31 assets/create/models/item/weathered_limestone_cobblestone_stairs.json ea1d735b557a71bbb2b35e5f03ba571d54c38dbe assets/create/models/item/weathered_limestone_cobblestone_wall.json 40bed7f5e9e97da45c5d9cebc3fcf87b2b13a808 assets/create/models/item/weathered_limestone_pillar.json -8914910270736f8f15364c623cd08d4638383cc5 assets/create/models/item/wheat_flour.json -0cc80844db689404d4722c93f1002b0bed05edcd assets/create/models/item/whisk.json +30c449f637e8d56b7670b81ec2a90942e2972739 assets/create/models/item/wheat_flour.json +9502a51ed2f6a110b6d41731a5948be4d70c8af8 assets/create/models/item/whisk.json c6253e0f8db3c3992d3f78fe5045e276d39d5b22 assets/create/models/item/white_sail.json 69328eb4f91c4407fbcad5e3c4b88363f1a9572c assets/create/models/item/white_seat.json be7a2d59d43083d7f2427193dcb9d68004224dd3 assets/create/models/item/white_valve_handle.json @@ -3266,10 +3281,12 @@ d3fdb8ece6cb072a93ddb64a0baad5ac952117a4 data/create/recipes/weathered_limestone f9ecec40e11a87de73c9dc7c2963c1cb10b1a180 data/create/tags/blocks/brittle.json 246ee2ec4e778e38a362f319506564886d4e0e76 data/create/tags/blocks/fan_heaters.json 551299f2f784435859bef13057c2b033eaefc784 data/create/tags/blocks/fan_transparent.json +74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/create/tags/blocks/non_movable.json c9ac7e3e5ec18554e7184168d65e9b8e44ef5610 data/create/tags/blocks/sails.json 6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/blocks/seats.json 50936b211d94167a35ec78c89954082a336b6269 data/create/tags/blocks/valve_handles.json eac71740fb12bdb38b5dfaa2268613d7ba82b809 data/create/tags/blocks/windmill_sails.json +74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/create/tags/blocks/windowable.json 081f5aa35602fc27af2ca01ea9f2fd5e7eb284dc data/create/tags/items/create_ingots.json d2dc4ff179ef7b2aa9276455c196e15d44aa95a8 data/create/tags/items/crushed_ores.json 6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/items/seats.json diff --git a/src/generated/resources/assets/create/blockstates/radial_chassis.json b/src/generated/resources/assets/create/blockstates/radial_chassis.json index 8bd829ffc..49576633e 100644 --- a/src/generated/resources/assets/create/blockstates/radial_chassis.json +++ b/src/generated/resources/assets/create/blockstates/radial_chassis.json @@ -89,8 +89,8 @@ }, { "when": { - "axis": "x", - "sticky_west": "true" + "sticky_west": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -99,8 +99,8 @@ }, { "when": { - "axis": "y", - "sticky_west": "true" + "sticky_west": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -109,8 +109,8 @@ }, { "when": { - "axis": "z", - "sticky_west": "true" + "sticky_west": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z_sticky", @@ -119,8 +119,8 @@ }, { "when": { - "axis": "x", - "sticky_west": "false" + "sticky_west": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -129,8 +129,8 @@ }, { "when": { - "axis": "y", - "sticky_west": "false" + "sticky_west": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -139,8 +139,8 @@ }, { "when": { - "axis": "z", - "sticky_west": "false" + "sticky_west": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z", @@ -207,8 +207,8 @@ }, { "when": { - "axis": "x", - "sticky_east": "true" + "sticky_east": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -217,8 +217,8 @@ }, { "when": { - "axis": "y", - "sticky_east": "true" + "sticky_east": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -227,8 +227,8 @@ }, { "when": { - "axis": "z", - "sticky_east": "true" + "sticky_east": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z_sticky" @@ -236,8 +236,8 @@ }, { "when": { - "axis": "x", - "sticky_east": "false" + "sticky_east": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -246,8 +246,8 @@ }, { "when": { - "axis": "y", - "sticky_east": "false" + "sticky_east": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -256,8 +256,8 @@ }, { "when": { - "axis": "z", - "sticky_east": "false" + "sticky_east": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z" diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java index 367dd02ad..6b81c7f7b 100644 --- a/src/main/java/com/simibubi/create/AllTags.java +++ b/src/main/java/com/simibubi/create/AllTags.java @@ -1,5 +1,9 @@ package com.simibubi.create; +import static com.simibubi.create.AllTags.NameSpace.FORGE; +import static com.simibubi.create.AllTags.NameSpace.MOD; +import static com.simibubi.create.AllTags.NameSpace.TIC; + import java.util.function.Function; import com.simibubi.create.foundation.data.CreateRegistrate; @@ -23,8 +27,6 @@ import net.minecraft.tags.ItemTags; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.ModList; -import static com.simibubi.create.AllTags.NameSpace.*; - public class AllTags { private static final CreateRegistrate REGISTRATE = Create.registrate() .itemGroup(() -> Create.baseCreativeTab); diff --git a/src/main/java/com/simibubi/create/compat/jei/FilterGhostIngredientHandler.java b/src/main/java/com/simibubi/create/compat/jei/FilterGhostIngredientHandler.java index 7ec3d405e..7b6d085b0 100644 --- a/src/main/java/com/simibubi/create/compat/jei/FilterGhostIngredientHandler.java +++ b/src/main/java/com/simibubi/create/compat/jei/FilterGhostIngredientHandler.java @@ -1,21 +1,24 @@ package com.simibubi.create.compat.jei; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.ParametersAreNonnullByDefault; + +import org.apache.logging.log4j.LogManager; + import com.simibubi.create.content.logistics.item.filter.AbstractFilterContainer; import com.simibubi.create.content.logistics.item.filter.AbstractFilterScreen; import com.simibubi.create.content.logistics.item.filter.AttributeFilterScreen; import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket; import com.simibubi.create.foundation.networking.AllPackets; + import mcp.MethodsReturnNonnullByDefault; import mezz.jei.api.gui.handlers.IGhostIngredientHandler; import net.minecraft.client.renderer.Rectangle2d; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import org.apache.logging.log4j.LogManager; - -import javax.annotation.ParametersAreNonnullByDefault; -import java.util.ArrayList; -import java.util.List; @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault diff --git a/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java index 41722a29f..b7e28375a 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java @@ -1,11 +1,18 @@ package com.simibubi.create.compat.jei.category; +import static com.simibubi.create.foundation.gui.AllGuiTextures.BLOCKZAPPER_UPGRADE_RECIPE; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllItems; import com.simibubi.create.compat.jei.ScreenResourceWrapper; import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperUpgradeRecipe; import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.foundation.utility.Lang; + import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; @@ -20,12 +27,6 @@ import net.minecraft.util.text.IFormattableTextComponent; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import static com.simibubi.create.foundation.gui.AllGuiTextures.BLOCKZAPPER_UPGRADE_RECIPE; - public class BlockzapperUpgradeCategory extends CreateRecipeCategory { public BlockzapperUpgradeCategory() { diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java index ff746cc87..5a045613f 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java @@ -3,7 +3,6 @@ package com.simibubi.create.compat.jei.category; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java index bed1da512..621bc3594 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/MysteriousItemConversionCategory.java @@ -5,7 +5,6 @@ import java.util.Arrays; import java.util.List; import com.mojang.blaze3d.matrix.MatrixStack; - import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.compat.jei.ConversionRecipe; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java index 124b95da2..b6e593699 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java @@ -14,8 +14,6 @@ import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; import mezz.jei.api.ingredients.IIngredients; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java index 244567033..4aec22cdb 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java @@ -21,7 +21,6 @@ import mezz.jei.api.ingredients.IIngredients; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.math.vector.Vector3f; -import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; public abstract class ProcessingViaFanCategory> extends CreateRecipeCategory { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java index 66a99d270..d35b6e79b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java @@ -12,14 +12,11 @@ import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import mcp.MethodsReturnNonnullByDefault; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.BlockItemUseContext; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.StateContainer.Builder; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java index f9a1befb4..1005c303e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java @@ -25,7 +25,6 @@ import com.simibubi.create.AllMovementBehaviours; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.components.actors.SeatBlock; import com.simibubi.create.content.contraptions.components.actors.SeatEntity; -import com.simibubi.create.content.contraptions.components.saw.SawBlock; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.AbstractChassisBlock; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.ChassisTileEntity; import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java index 01b7bded3..b7e487b26 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java @@ -1,5 +1,13 @@ package com.simibubi.create.content.contraptions.fluids.actors; +import static com.simibubi.create.foundation.tileEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult.HOLD; +import static com.simibubi.create.foundation.tileEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult.PASS; + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nullable; + import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; @@ -9,6 +17,7 @@ import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemS import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult; import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour; import com.simibubi.create.foundation.utility.VecHelper; + import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -28,13 +37,6 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.ModList; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; - -import static com.simibubi.create.foundation.tileEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult.HOLD; -import static com.simibubi.create.foundation.tileEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult.PASS; - public class SpoutTileEntity extends SmartTileEntity { private static final boolean IS_TIC_LOADED = ModList.get().isLoaded("tconstruct"); private static final Class CASTING_FLUID_HANDLER_CLASS; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluidHandler.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluidHandler.java index 0381a66eb..a294079b3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluidHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluidHandler.java @@ -9,8 +9,8 @@ import com.simibubi.create.content.contraptions.fluids.potion.PotionFluid.Bottle import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.Pair; -import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.ai.attributes.Attribute; +import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.fluid.Fluids; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankGenerator.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankGenerator.java index 3262e88af..1a64dbeae 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankGenerator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankGenerator.java @@ -47,7 +47,7 @@ public class FluidTankGenerator extends SpecialBlockStateGen { else if (bottom) shapeName = "bottom"; - String modelName = shapeName + (shape == Shape.PLAIN ? "" : "_" + shape.name()); + String modelName = shapeName + (shape == Shape.PLAIN ? "" : "_" + shape.getString()); if (!prefix.isEmpty()) return prov.models() diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankItem.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankItem.java index 9dfc502dc..9b4be3505 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankItem.java @@ -20,7 +20,7 @@ public class FluidTankItem extends BlockItem { @Override public ActionResultType tryPlace(BlockItemUseContext ctx) { ActionResultType initialResult = super.tryPlace(ctx); - if (initialResult != ActionResultType.SUCCESS) + if (!initialResult.isAccepted()) return initialResult; tryMultiPlace(ctx); return initialResult; diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java index 35480c8a3..5a6a924b9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java @@ -1,20 +1,21 @@ package com.simibubi.create.content.contraptions.goggles; +import java.util.ArrayList; +import java.util.List; + import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.gui.AbstractSimiScreen; import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.foundation.utility.Lang; + import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; -import java.util.ArrayList; -import java.util.List; - public class GoggleConfigScreen extends AbstractSimiScreen { private int offsetX; diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java index eed2af341..78eac7b00 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java @@ -1,9 +1,13 @@ package com.simibubi.create.content.contraptions.goggles; +import java.util.ArrayList; +import java.util.List; + import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.gui.GuiGameElement; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.world.ClientWorld; @@ -21,9 +25,6 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import java.util.ArrayList; -import java.util.List; - @EventBusSubscriber(value = Dist.CLIENT) public class GoggleOverlayRenderer { diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java index 88d1d2136..918cd93d5 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.contraptions.relays.advanced.sequencer; +import java.util.Vector; + import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.gui.AbstractSimiScreen; @@ -11,6 +13,7 @@ import com.simibubi.create.foundation.gui.widgets.ScrollInput; import com.simibubi.create.foundation.gui.widgets.SelectionScrollInput; import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.utility.Lang; + import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.nbt.ListNBT; @@ -18,8 +21,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; -import java.util.Vector; - public class SequencedGearshiftScreen extends AbstractSimiScreen { private final ItemStack renderedItem = AllBlocks.SEQUENCED_GEARSHIFT.asStack(); diff --git a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java b/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java index 32c75b01e..b46b722e1 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java @@ -1,11 +1,15 @@ package com.simibubi.create.content.curiosities; +import java.util.List; +import java.util.Random; + import com.simibubi.create.AllItems; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.config.CRecipes; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.VecHelper; + import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.item.ItemEntity; @@ -17,16 +21,16 @@ import net.minecraft.particles.ParticleTypes; import net.minecraft.tileentity.BeaconTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; -import net.minecraft.util.math.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceContext; import net.minecraft.util.math.RayTraceContext.BlockMode; import net.minecraft.util.math.RayTraceContext.FluidMode; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraft.world.gen.Heightmap; -import java.util.List; -import java.util.Random; - public class ChromaticCompoundItem extends Item { public ChromaticCompoundItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java b/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java index 33a7270a8..3c95f62ec 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java +++ b/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java @@ -1,7 +1,11 @@ package com.simibubi.create.content.curiosities.symmetry; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.content.curiosities.symmetry.mirror.*; +import com.simibubi.create.content.curiosities.symmetry.mirror.CrossPlaneMirror; +import com.simibubi.create.content.curiosities.symmetry.mirror.EmptyMirror; +import com.simibubi.create.content.curiosities.symmetry.mirror.PlaneMirror; +import com.simibubi.create.content.curiosities.symmetry.mirror.SymmetryMirror; +import com.simibubi.create.content.curiosities.symmetry.mirror.TriplePlaneMirror; import com.simibubi.create.foundation.gui.AbstractSimiScreen; import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.AllIcons; @@ -13,6 +17,7 @@ import com.simibubi.create.foundation.gui.widgets.SelectionScrollInput; import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.networking.NbtPacket; import com.simibubi.create.foundation.utility.Lang; + import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java index e60d92264..fdda09b6a 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.curiosities.zapper; +import java.util.Vector; + import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.foundation.gui.AbstractSimiScreen; import com.simibubi.create.foundation.gui.AllGuiTextures; @@ -9,6 +11,7 @@ import com.simibubi.create.foundation.gui.widgets.IconButton; import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.networking.NbtPacket; import com.simibubi.create.foundation.utility.Lang; + import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; @@ -20,8 +23,6 @@ import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; -import java.util.Vector; - public class ZapperScreen extends AbstractSimiScreen { protected ItemStack zapper; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateScreen.java b/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateScreen.java index 41c80bdda..79a289841 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateScreen.java @@ -1,5 +1,12 @@ package com.simibubi.create.content.logistics.block.inventories; +import static com.simibubi.create.foundation.gui.AllGuiTextures.ADJUSTABLE_CRATE; +import static com.simibubi.create.foundation.gui.AllGuiTextures.ADJUSTABLE_DOUBLE_CRATE; +import static com.simibubi.create.foundation.gui.AllGuiTextures.PLAYER_INVENTORY; + +import java.util.ArrayList; +import java.util.List; + import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.logistics.packet.ConfigureFlexcratePacket; @@ -10,17 +17,13 @@ import com.simibubi.create.foundation.gui.widgets.Label; import com.simibubi.create.foundation.gui.widgets.ScrollInput; import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.utility.Lang; + import net.minecraft.client.renderer.Rectangle2d; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; -import java.util.ArrayList; -import java.util.List; - -import static com.simibubi.create.foundation.gui.AllGuiTextures.*; - public class AdjustableCrateScreen extends AbstractSimiContainerScreen { private AdjustableCrateTileEntity te; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java index 4a5f0349e..1902854f9 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java @@ -8,12 +8,12 @@ import com.google.common.collect.ImmutableMap; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlock; import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterTileEntity; import com.simibubi.create.content.contraptions.components.deployer.DeployerBlock; import com.simibubi.create.content.contraptions.components.saw.SawBlock; import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock; -import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock; import com.simibubi.create.content.logistics.block.funnel.FunnelBlock; import com.simibubi.create.content.logistics.block.funnel.FunnelTileEntity; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchScreen.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchScreen.java index db6e0805c..d95ae4508 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchScreen.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.logistics.block.redstone; +import static com.simibubi.create.foundation.gui.AllGuiTextures.STOCKSWITCH; + import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.logistics.packet.ConfigureStockswitchPacket; @@ -13,13 +15,12 @@ import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.LerpedFloat; import com.simibubi.create.foundation.utility.LerpedFloat.Chaser; + import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; -import static com.simibubi.create.foundation.gui.AllGuiTextures.STOCKSWITCH; - public class StockpileSwitchScreen extends AbstractSimiScreen { private ScrollInput offBelow; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterScreen.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterScreen.java index 1a15e4139..e3028d82e 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/AbstractFilterScreen.java @@ -1,5 +1,11 @@ package com.simibubi.create.content.logistics.item.filter; +import static com.simibubi.create.foundation.gui.AllGuiTextures.PLAYER_INVENTORY; +import static net.minecraft.util.text.TextFormatting.GRAY; + +import java.util.Collections; +import java.util.List; + import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket.Option; import com.simibubi.create.foundation.gui.AbstractSimiContainerScreen; @@ -12,18 +18,13 @@ import com.simibubi.create.foundation.gui.widgets.Indicator.State; import com.simibubi.create.foundation.item.ItemDescription.Palette; import com.simibubi.create.foundation.item.TooltipHelper; import com.simibubi.create.foundation.networking.AllPackets; + import net.minecraft.client.gui.widget.Widget; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.IFormattableTextComponent; import net.minecraft.util.text.ITextComponent; -import java.util.Collections; -import java.util.List; - -import static com.simibubi.create.foundation.gui.AllGuiTextures.PLAYER_INVENTORY; -import static net.minecraft.util.text.TextFormatting.GRAY; - public abstract class AbstractFilterScreen extends AbstractSimiContainerScreen { protected AllGuiTextures background; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreenPacket.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreenPacket.java index a8b369975..071baffa2 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreenPacket.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreenPacket.java @@ -1,14 +1,15 @@ package com.simibubi.create.content.logistics.item.filter; +import java.util.function.Supplier; + import com.simibubi.create.content.logistics.item.filter.AttributeFilterContainer.WhitelistMode; import com.simibubi.create.foundation.networking.SimplePacketBase; + import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent.Context; -import java.util.function.Supplier; - public class FilterScreenPacket extends SimplePacketBase { public enum Option { diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/BookAuthorAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/BookAuthorAttribute.java index 44c97ed28..384afc68a 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/BookAuthorAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/BookAuthorAttribute.java @@ -1,15 +1,13 @@ package com.simibubi.create.content.logistics.item.filter.attribute; -import com.google.gson.JsonParseException; -import com.simibubi.create.content.logistics.item.filter.ItemAttribute; -import net.minecraft.item.ItemStack; -import net.minecraft.item.WrittenBookItem; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.text.ITextComponent; - import java.util.ArrayList; import java.util.List; +import com.simibubi.create.content.logistics.item.filter.ItemAttribute; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; + public class BookAuthorAttribute implements ItemAttribute { String author; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/BookCopyAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/BookCopyAttribute.java index e379a3bdc..1688f3c29 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/BookCopyAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/BookCopyAttribute.java @@ -1,14 +1,14 @@ package com.simibubi.create.content.logistics.item.filter.attribute; -import com.simibubi.create.content.logistics.item.filter.ItemAttribute; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.item.WrittenBookItem; -import net.minecraft.nbt.CompoundNBT; - import java.util.ArrayList; import java.util.List; +import com.simibubi.create.content.logistics.item.filter.ItemAttribute; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.WrittenBookItem; +import net.minecraft.nbt.CompoundNBT; + public class BookCopyAttribute implements ItemAttribute { int generation; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/EnchantAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/EnchantAttribute.java index 26d4586f8..611eb28a6 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/EnchantAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/EnchantAttribute.java @@ -1,6 +1,12 @@ package com.simibubi.create.content.logistics.item.filter.attribute; +import java.util.List; +import java.util.stream.Collectors; + +import javax.annotation.Nullable; + import com.simibubi.create.content.logistics.item.filter.ItemAttribute; + import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.ItemStack; @@ -9,10 +15,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.registries.ForgeRegistries; -import javax.annotation.Nullable; -import java.util.List; -import java.util.stream.Collectors; - public class EnchantAttribute implements ItemAttribute { public static final EnchantAttribute EMPTY = new EnchantAttribute(null); diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/FluidContentsAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/FluidContentsAttribute.java index 94aa9ed1f..76638df30 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/FluidContentsAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/FluidContentsAttribute.java @@ -1,6 +1,13 @@ package com.simibubi.create.content.logistics.item.filter.attribute; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +import javax.annotation.Nullable; + import com.simibubi.create.content.logistics.item.filter.ItemAttribute; + import net.minecraft.fluid.Fluid; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -11,11 +18,6 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.registries.ForgeRegistries; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - public class FluidContentsAttribute implements ItemAttribute { public static final FluidContentsAttribute EMPTY = new FluidContentsAttribute(null); diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ItemNameAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ItemNameAttribute.java index 2f83e648a..0c9581cae 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ItemNameAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ItemNameAttribute.java @@ -1,17 +1,15 @@ package com.simibubi.create.content.logistics.item.filter.attribute; -import com.google.gson.JsonParseException; -import com.simibubi.create.content.logistics.item.filter.ItemAttribute; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; - import java.util.ArrayList; import java.util.List; +import com.google.gson.JsonParseException; +import com.simibubi.create.content.logistics.item.filter.ItemAttribute; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.util.text.ITextComponent; + public class ItemNameAttribute implements ItemAttribute { String itemName; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAmuletAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAmuletAttribute.java index f2e8ab062..f3f244d59 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAmuletAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAmuletAttribute.java @@ -1,6 +1,10 @@ package com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery; +import java.util.ArrayList; +import java.util.List; + import com.simibubi.create.content.logistics.item.filter.ItemAttribute; + import net.minecraft.enchantment.Enchantment; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -10,9 +14,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.registries.ForgeRegistries; -import java.util.ArrayList; -import java.util.List; - public class AstralSorceryAmuletAttribute implements ItemAttribute { String enchName; int enchType; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAttunementAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAttunementAttribute.java index 3a621969a..4d503f17b 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAttunementAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryAttunementAttribute.java @@ -1,14 +1,15 @@ package com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery; +import java.util.ArrayList; +import java.util.List; + import com.simibubi.create.content.logistics.item.filter.ItemAttribute; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TranslationTextComponent; -import java.util.ArrayList; -import java.util.List; - public class AstralSorceryAttunementAttribute implements ItemAttribute { String constellationName; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryCrystalAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryCrystalAttribute.java index 0500eea82..3830d7b00 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryCrystalAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryCrystalAttribute.java @@ -1,6 +1,10 @@ package com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery; +import java.util.ArrayList; +import java.util.List; + import com.simibubi.create.content.logistics.item.filter.ItemAttribute; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.INBT; @@ -8,9 +12,6 @@ import net.minecraft.nbt.ListNBT; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TranslationTextComponent; -import java.util.ArrayList; -import java.util.List; - public class AstralSorceryCrystalAttribute implements ItemAttribute { String traitName; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryPerkGemAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryPerkGemAttribute.java index ab4671c1f..65b7f1994 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryPerkGemAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/astralsorcery/AstralSorceryPerkGemAttribute.java @@ -1,6 +1,10 @@ package com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery; +import java.util.ArrayList; +import java.util.List; + import com.simibubi.create.content.logistics.item.filter.ItemAttribute; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.INBT; @@ -8,9 +12,6 @@ import net.minecraft.nbt.ListNBT; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TranslationTextComponent; -import java.util.ArrayList; -import java.util.List; - public class AstralSorceryPerkGemAttribute implements ItemAttribute { String traitName; diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonScreen.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonScreen.java index 81efc5b15..30535ba1a 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonScreen.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonScreen.java @@ -1,5 +1,14 @@ package com.simibubi.create.content.schematics.block; +import static net.minecraft.util.text.TextFormatting.BLUE; +import static net.minecraft.util.text.TextFormatting.DARK_PURPLE; +import static net.minecraft.util.text.TextFormatting.GRAY; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Vector; + import com.google.common.collect.ImmutableList; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlocks; @@ -16,6 +25,7 @@ import com.simibubi.create.foundation.item.ItemDescription.Palette; import com.simibubi.create.foundation.item.TooltipHelper; import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.utility.Lang; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.Widget; import net.minecraft.client.renderer.Rectangle2d; @@ -25,13 +35,6 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Vector; - -import static net.minecraft.util.text.TextFormatting.*; public class SchematicannonScreen extends AbstractSimiContainerScreen { private static final AllGuiTextures BG_BOTTOM = AllGuiTextures.SCHEMATICANNON_BOTTOM; diff --git a/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java b/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java index 0f98c050b..50fe745b4 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java +++ b/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java @@ -1,5 +1,7 @@ package com.simibubi.create.foundation.gui; +import javax.annotation.Nullable; + import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.GlStateManager.DestFactor; @@ -16,7 +18,13 @@ import net.minecraft.block.Blocks; import net.minecraft.block.FireBlock; import net.minecraft.block.FlowingFluidBlock; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.Atlases; +import net.minecraft.client.renderer.BlockRendererDispatcher; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.AtlasTexture; @@ -31,8 +39,6 @@ import net.minecraft.util.math.vector.Vector3f; import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.fluids.FluidStack; -import javax.annotation.Nullable; - public class GuiGameElement { public static GuiRenderBuilder of(ItemStack stack) { diff --git a/src/main/java/com/simibubi/create/foundation/gui/widgets/Label.java b/src/main/java/com/simibubi/create/foundation/gui/widgets/Label.java index d1f0d6855..55e3ea767 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widgets/Label.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widgets/Label.java @@ -1,10 +1,7 @@ package com.simibubi.create.foundation.gui.widgets; -import java.util.Objects; - import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.Create; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -41,7 +38,6 @@ public class Label extends AbstractSimiWidget { public Label withSuffix(String s) { suffix = s; - Create.logger.info("Suffix is now " + Objects.toString(s)); return this; } diff --git a/src/main/java/com/simibubi/create/foundation/utility/EmptyNamedTag.java b/src/main/java/com/simibubi/create/foundation/utility/EmptyNamedTag.java index 7d45d10ce..f58694653 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/EmptyNamedTag.java +++ b/src/main/java/com/simibubi/create/foundation/utility/EmptyNamedTag.java @@ -1,13 +1,14 @@ package com.simibubi.create.foundation.utility; +import java.util.Collections; +import java.util.List; + +import javax.annotation.ParametersAreNonnullByDefault; + import mcp.MethodsReturnNonnullByDefault; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.Tags; -import javax.annotation.ParametersAreNonnullByDefault; -import java.util.Collections; -import java.util.List; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class EmptyNamedTag implements Tags.IOptionalNamedTag { diff --git a/src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java b/src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java index a0f293dc6..b81e7e0ef 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java +++ b/src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java @@ -8,8 +8,8 @@ import java.util.List; import java.util.Set; import com.google.common.base.Predicates; - import com.simibubi.create.AllTags; + import net.minecraft.block.BambooBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java b/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java index df0a4dc2a..bf61d269b 100644 --- a/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java @@ -17,7 +17,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld;