From e2b8e1cb7d4bc55de06a6fd8c180098aa13444df Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Fri, 3 Dec 2021 03:57:00 +0100 Subject: [PATCH] The Processing Experience - Added the Experience Nugget - Item Vaults are now Immune to regular explosion damage - Encased Shafts and Cogwheels no longer appear on creative tabs - Fixed gantry carriage model uvs - Fixed Palette blocks & Item Vault not easily mineable using a pickaxe - Fixed ponder crash when a non-ticking tile is shown - Fixed cube particle interpolation and quads - Fixed sawblades rendering with wrong rotations - Items shown on JEI's Washing tab are now centred - Introduced a new set of Ore Processing recipes - Moved Portable Storage Interface to andesite tier - Removed the Adjustable Crate - Creative Crates can no longer span multiple blocks - "Chromatic" items no longer appear on creative tabs - Ejectors now emit comparator signals relative to their max accepted stack size - Fixed combined slots in the toolbox menu not acting correctly - Fixed background of the advancement tab --- src/generated/resources/.cache/cache | 195 ++++++++--------- .../create/blockstates/adjustable_crate.json | 42 ---- .../create/blockstates/creative_crate.json | 32 +-- .../resources/assets/create/lang/en_ud.json | 3 +- .../resources/assets/create/lang/en_us.json | 3 +- .../assets/create/lang/unfinished/de_de.json | 5 +- .../assets/create/lang/unfinished/es_cl.json | 5 +- .../assets/create/lang/unfinished/es_es.json | 5 +- .../assets/create/lang/unfinished/fr_fr.json | 5 +- .../assets/create/lang/unfinished/it_it.json | 5 +- .../assets/create/lang/unfinished/ja_jp.json | 5 +- .../assets/create/lang/unfinished/ko_kr.json | 5 +- .../assets/create/lang/unfinished/nl_nl.json | 5 +- .../assets/create/lang/unfinished/pl_pl.json | 5 +- .../assets/create/lang/unfinished/pt_br.json | 5 +- .../assets/create/lang/unfinished/ru_ru.json | 5 +- .../assets/create/lang/unfinished/zh_cn.json | 5 +- .../assets/create/lang/unfinished/zh_tw.json | 5 +- .../models/block/crate/brass/bottom.json | 8 - .../create/models/block/crate/brass/left.json | 8 - .../models/block/crate/brass/right.json | 8 - .../models/block/crate/brass/single.json | 8 - .../create/models/block/crate/brass/top.json | 8 - .../create/models/item/adjustable_crate.json | 3 - ...shed_brass.json => experience_nugget.json} | 2 +- .../blasting/brass_ingot_from_crushed.json | 34 --- .../kinetics/portable_storage_interface.json | 2 +- .../crafting/logistics/adjustable_crate.json | 34 --- .../smelting/brass_ingot_from_crushed.json | 34 --- .../data/create/advancements/root.json | 2 +- .../loot_tables/blocks/adjustable_crate.json | 20 -- .../blasting/brass_ingot_from_crushed.json | 9 - .../kinetics/portable_fluid_interface.json | 16 +- .../kinetics/portable_storage_interface.json | 18 +- .../crafting/logistics/adjustable_crate.json | 17 -- .../create/recipes/crushing/aluminum_ore.json | 32 --- .../recipes/crushing/amethyst_cluster.json | 19 ++ .../data/create/recipes/crushing/asurine.json | 19 ++ .../create/recipes/crushing/brass_block.json | 15 -- .../create/recipes/crushing/coal_ore.json | 12 +- .../create/recipes/crushing/copper_block.json | 15 -- .../create/recipes/crushing/copper_ore.json | 23 +- .../create/recipes/crushing/crimsite.json | 19 ++ .../recipes/crushing/deepslate_coal_ore.json | 26 +++ .../crushing/deepslate_copper_ore.json | 27 +++ .../crushing/deepslate_diamond_ore.json | 27 +++ .../crushing/deepslate_emerald_ore.json | 27 +++ .../recipes/crushing/deepslate_gold_ore.json | 27 +++ .../recipes/crushing/deepslate_iron_ore.json | 27 +++ .../recipes/crushing/deepslate_lapis_ore.json | 27 +++ .../crushing/deepslate_redstone_ore.json | 27 +++ .../recipes/crushing/deepslate_zinc_ore.json | 27 +++ .../create/recipes/crushing/diamond_ore.json | 11 +- .../data/create/recipes/crushing/diorite.json | 15 ++ .../create/recipes/crushing/emerald_ore.json | 11 +- .../create/recipes/crushing/gold_ore.json | 20 +- .../create/recipes/crushing/iron_ore.json | 20 +- .../create/recipes/crushing/lapis_ore.json | 11 +- .../create/recipes/crushing/lead_ore.json | 32 --- .../recipes/crushing/nether_gold_ore.json | 27 +++ .../recipes/crushing/nether_quartz_ore.json | 7 +- .../create/recipes/crushing/nickel_ore.json | 32 --- .../data/create/recipes/crushing/ochrum.json | 19 ++ .../create/recipes/crushing/osmium_ore.json | 32 --- .../create/recipes/crushing/platinum_ore.json | 32 --- .../recipes/crushing/quicksilver_ore.json | 32 --- .../create/recipes/crushing/raw_copper.json | 18 ++ .../create/recipes/crushing/raw_gold.json | 18 ++ .../create/recipes/crushing/raw_iron.json | 18 ++ .../create/recipes/crushing/raw_zinc.json | 18 ++ .../create/recipes/crushing/redstone_ore.json | 11 +- .../create/recipes/crushing/silver_ore.json | 32 --- .../data/create/recipes/crushing/tin_ore.json | 32 --- .../data/create/recipes/crushing/tuff.json | 31 +++ .../create/recipes/crushing/uranium_ore.json | 32 --- .../create/recipes/crushing/veridium.json | 19 ++ .../create/recipes/crushing/zinc_block.json | 15 -- .../create/recipes/crushing/zinc_ore.json | 20 +- .../create/recipes/milling/aluminum_ore.json | 23 -- .../data/create/recipes/milling/calcite.json | 15 ++ .../create/recipes/milling/copper_ore.json | 23 -- .../recipes/milling/dripstone_block.json | 14 ++ .../data/create/recipes/milling/gold_ore.json | 23 -- .../data/create/recipes/milling/iron_ore.json | 23 -- .../data/create/recipes/milling/lead_ore.json | 23 -- .../create/recipes/milling/nickel_ore.json | 23 -- .../create/recipes/milling/osmium_ore.json | 23 -- .../create/recipes/milling/platinum_ore.json | 23 -- .../recipes/milling/quicksilver_ore.json | 23 -- .../create/recipes/milling/silver_ore.json | 23 -- .../data/create/recipes/milling/tin_ore.json | 23 -- .../create/recipes/milling/uranium_ore.json | 23 -- .../data/create/recipes/milling/zinc_ore.json | 23 -- .../recipes/mixing/chromatic_compound.json | 32 --- .../create/recipes/mixing/crushed_brass.json | 18 -- .../smelting/brass_ingot_from_crushed.json | 9 - .../recipes/splashing/crushed_brass.json | 19 -- .../recipes/splashing/crushed_copper_ore.json | 5 +- .../recipes/splashing/crushed_gold_ore.json | 5 +- .../recipes/splashing/crushed_iron_ore.json | 7 +- .../recipes/splashing/crushed_zinc_ore.json | 7 +- .../splashing/eidolon/crushed_lead_ore.json | 7 +- .../iceandfire/crushed_silver_ore.json | 7 +- .../crushed_aluminum_ore.json | 7 +- .../crushed_lead_ore.json | 7 +- .../crushed_nickel_ore.json | 7 +- .../crushed_silver_ore.json | 7 +- .../crushed_uranium_ore.json | 7 +- .../splashing/mekanism/crushed_lead_ore.json | 7 +- .../mekanism/crushed_osmium_ore.json | 7 +- .../splashing/mekanism/crushed_tin_ore.json | 7 +- .../mekanism/crushed_uranium_ore.json | 7 +- .../mysticalworld/crushed_lead_ore.json | 7 +- .../crushed_quicksilver_ore.json | 7 +- .../mysticalworld/crushed_silver_ore.json | 7 +- .../mysticalworld/crushed_tin_ore.json | 7 +- .../crushed_aluminum_ore.json | 7 +- .../silents_mechanisms/crushed_lead_ore.json | 7 +- .../crushed_nickel_ore.json | 7 +- .../crushed_platinum_ore.json | 7 +- .../crushed_silver_ore.json | 7 +- .../silents_mechanisms/crushed_tin_ore.json | 7 +- .../crushed_uranium_ore.json | 7 +- .../splashing/thermal/crushed_lead_ore.json | 7 +- .../splashing/thermal/crushed_nickel_ore.json | 7 +- .../splashing/thermal/crushed_silver_ore.json | 7 +- .../splashing/thermal/crushed_tin_ore.json | 7 +- .../data/create/tags/items/crushed_ores.json | 1 - .../data/forge/tags/items/nuggets.json | 3 +- .../minecraft/tags/blocks/mineable/axe.json | 1 - .../tags/blocks/mineable/pickaxe.json | 95 +++++++- .../java/com/simibubi/create/AllBlocks.java | 14 +- .../simibubi/create/AllContainerTypes.java | 5 - .../java/com/simibubi/create/AllItems.java | 37 ++-- .../com/simibubi/create/AllTileEntities.java | 7 - .../jei/category/FanSmokingCategory.java | 2 +- .../jei/category/FanWashingCategory.java | 38 ++-- .../contraptions/base/CasingBlock.java | 20 ++ .../components/saw/SawRenderer.java | 2 +- .../structureMovement/Contraption.java | 6 - .../structureMovement/MountedStorage.java | 12 -- .../contraptions/particle/CubeParticle.java | 4 +- .../relays/encased/EncasedCogwheelBlock.java | 6 + .../relays/encased/EncasedShaftBlock.java | 6 + .../curiosities/ChromaticCompoundItem.java | 8 +- .../curiosities/ExperienceNuggetItem.java | 68 ++++++ .../curiosities/NoGravMagicalDohickyItem.java | 5 + .../curiosities/toolbox/ToolboxContainer.java | 11 +- .../block/depot/SharedDepotBlockMethods.java | 18 +- .../inventories/AdjustableCrateBlock.java | 121 ----------- .../inventories/AdjustableCrateContainer.java | 89 -------- .../inventories/AdjustableCrateScreen.java | 141 ------------ .../AdjustableCrateTileEntity.java | 181 ---------------- .../block/inventories/CrateBlock.java | 70 ------ .../block/inventories/CrateTileEntity.java | 18 -- .../block/inventories/CreativeCrateBlock.java | 8 - .../inventories/CreativeCrateTileEntity.java | 45 +--- .../packet/ConfigureFlexcratePacket.java | 37 ---- .../palettes/AllPaletteStoneTypes.java | 5 + .../palettes/PalettesVariantEntry.java | 2 + .../advancement/AllAdvancements.java | 2 +- .../foundation/data/BuilderTransformers.java | 29 --- .../foundation/data/CreateRegistrate.java | 3 + .../data/recipe/CreateRecipeProvider.java | 2 +- .../data/recipe/CrushingRecipeGen.java | 147 ++++++++----- .../data/recipe/MillingRecipeGen.java | 20 +- .../data/recipe/MixingRecipeGen.java | 18 +- .../data/recipe/StandardRecipeGen.java | 22 +- .../data/recipe/WashingRecipeGen.java | 19 +- .../foundation/networking/AllPackets.java | 2 - .../foundation/ponder/content/FanScenes.java | 3 +- .../ponder/content/PonderIndex.java | 1 - .../ponder/content/ProcessingScenes.java | 2 +- .../ponder/element/WorldSectionElement.java | 14 +- .../foundation/utility/RemapHelper.java | 10 - .../models/block/gantry_carriage/item.json | 204 ++++++++++-------- .../models/block/gantry_carriage/wheels.json | 165 +++++++------- .../models/block/mechanical_saw/item.json | 2 +- .../portable_storage_interface/block.json | 4 +- .../portable_storage_interface/item.json | 77 +++---- .../block/portable_storage_interface.png | Bin 666 -> 825 bytes .../create/textures/gui/advancements.png | Bin 0 -> 1374 bytes .../textures/item/crushed_copper_ore.png | Bin 215 -> 298 bytes .../create/textures/item/crushed_gold_ore.png | Bin 217 -> 268 bytes .../create/textures/item/crushed_iron_ore.png | Bin 214 -> 267 bytes .../create/textures/item/crushed_zinc_ore.png | Bin 210 -> 287 bytes .../textures/item/experience_nugget.png | Bin 0 -> 236 bytes 187 files changed, 1404 insertions(+), 2572 deletions(-) delete mode 100644 src/generated/resources/assets/create/blockstates/adjustable_crate.json delete mode 100644 src/generated/resources/assets/create/models/block/crate/brass/bottom.json delete mode 100644 src/generated/resources/assets/create/models/block/crate/brass/left.json delete mode 100644 src/generated/resources/assets/create/models/block/crate/brass/right.json delete mode 100644 src/generated/resources/assets/create/models/block/crate/brass/single.json delete mode 100644 src/generated/resources/assets/create/models/block/crate/brass/top.json delete mode 100644 src/generated/resources/assets/create/models/item/adjustable_crate.json rename src/generated/resources/assets/create/models/item/{crushed_brass.json => experience_nugget.json} (57%) delete mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/blasting/brass_ingot_from_crushed.json delete mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/adjustable_crate.json delete mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/smelting/brass_ingot_from_crushed.json delete mode 100644 src/generated/resources/data/create/loot_tables/blocks/adjustable_crate.json delete mode 100644 src/generated/resources/data/create/recipes/blasting/brass_ingot_from_crushed.json delete mode 100644 src/generated/resources/data/create/recipes/crafting/logistics/adjustable_crate.json delete mode 100644 src/generated/resources/data/create/recipes/crushing/aluminum_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/amethyst_cluster.json create mode 100644 src/generated/resources/data/create/recipes/crushing/asurine.json delete mode 100644 src/generated/resources/data/create/recipes/crushing/brass_block.json delete mode 100644 src/generated/resources/data/create/recipes/crushing/copper_block.json create mode 100644 src/generated/resources/data/create/recipes/crushing/crimsite.json create mode 100644 src/generated/resources/data/create/recipes/crushing/deepslate_coal_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/deepslate_copper_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/deepslate_diamond_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/deepslate_emerald_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/deepslate_gold_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/deepslate_iron_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/deepslate_lapis_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/deepslate_redstone_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/deepslate_zinc_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/diorite.json delete mode 100644 src/generated/resources/data/create/recipes/crushing/lead_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/nether_gold_ore.json delete mode 100644 src/generated/resources/data/create/recipes/crushing/nickel_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/ochrum.json delete mode 100644 src/generated/resources/data/create/recipes/crushing/osmium_ore.json delete mode 100644 src/generated/resources/data/create/recipes/crushing/platinum_ore.json delete mode 100644 src/generated/resources/data/create/recipes/crushing/quicksilver_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/raw_copper.json create mode 100644 src/generated/resources/data/create/recipes/crushing/raw_gold.json create mode 100644 src/generated/resources/data/create/recipes/crushing/raw_iron.json create mode 100644 src/generated/resources/data/create/recipes/crushing/raw_zinc.json delete mode 100644 src/generated/resources/data/create/recipes/crushing/silver_ore.json delete mode 100644 src/generated/resources/data/create/recipes/crushing/tin_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/tuff.json delete mode 100644 src/generated/resources/data/create/recipes/crushing/uranium_ore.json create mode 100644 src/generated/resources/data/create/recipes/crushing/veridium.json delete mode 100644 src/generated/resources/data/create/recipes/crushing/zinc_block.json delete mode 100644 src/generated/resources/data/create/recipes/milling/aluminum_ore.json create mode 100644 src/generated/resources/data/create/recipes/milling/calcite.json delete mode 100644 src/generated/resources/data/create/recipes/milling/copper_ore.json create mode 100644 src/generated/resources/data/create/recipes/milling/dripstone_block.json delete mode 100644 src/generated/resources/data/create/recipes/milling/gold_ore.json delete mode 100644 src/generated/resources/data/create/recipes/milling/iron_ore.json delete mode 100644 src/generated/resources/data/create/recipes/milling/lead_ore.json delete mode 100644 src/generated/resources/data/create/recipes/milling/nickel_ore.json delete mode 100644 src/generated/resources/data/create/recipes/milling/osmium_ore.json delete mode 100644 src/generated/resources/data/create/recipes/milling/platinum_ore.json delete mode 100644 src/generated/resources/data/create/recipes/milling/quicksilver_ore.json delete mode 100644 src/generated/resources/data/create/recipes/milling/silver_ore.json delete mode 100644 src/generated/resources/data/create/recipes/milling/tin_ore.json delete mode 100644 src/generated/resources/data/create/recipes/milling/uranium_ore.json delete mode 100644 src/generated/resources/data/create/recipes/milling/zinc_ore.json delete mode 100644 src/generated/resources/data/create/recipes/mixing/chromatic_compound.json delete mode 100644 src/generated/resources/data/create/recipes/mixing/crushed_brass.json delete mode 100644 src/generated/resources/data/create/recipes/smelting/brass_ingot_from_crushed.json delete mode 100644 src/generated/resources/data/create/recipes/splashing/crushed_brass.json create mode 100644 src/main/java/com/simibubi/create/content/curiosities/ExperienceNuggetItem.java delete mode 100644 src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateBlock.java delete mode 100644 src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateContainer.java delete mode 100644 src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateScreen.java delete mode 100644 src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateTileEntity.java delete mode 100644 src/main/java/com/simibubi/create/content/logistics/packet/ConfigureFlexcratePacket.java create mode 100644 src/main/resources/assets/create/textures/gui/advancements.png create mode 100644 src/main/resources/assets/create/textures/item/experience_nugget.png diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 197279562..744f22963 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,7 +1,6 @@ 16539ad12ee9e1ee004dec3fd62122b3e17c8e77 assets/create/blockstates/acacia_window.json f0d6baaabda94151134f569246d61a6e710c35a9 assets/create/blockstates/acacia_window_pane.json 6b70306397316d6ebfa1cb07f2308d5c7fce83e0 assets/create/blockstates/adjustable_chain_gearshift.json -55d57354040f4b5cefa2a9bfaf1cb777350fd699 assets/create/blockstates/adjustable_crate.json 9dd79bf5430f674e7d3e3fc7d59edee3d66e241e assets/create/blockstates/analog_lever.json dd468657a73fc2ad6e1ac08ace2996b6997d33e0 assets/create/blockstates/andesite_belt_funnel.json 585481e97c5066af63ea12fa5dd658798844d64c assets/create/blockstates/andesite_bricks.json @@ -65,7 +64,7 @@ cabf6b8c59eb0e3d56a0a5a856ca058bb3200882 assets/create/blockstates/copper_casing dc76bca1fdd41c8e6ada27fd59a2b73d7adc9596 assets/create/blockstates/copper_shingles.json ecf4a72411870bfdbf8a59469b114cd77621c343 assets/create/blockstates/copper_tiles.json 890be245b914c1a9f29f48a8c5d325640b5be160 assets/create/blockstates/copper_valve_handle.json -3df0d5d5170a2f6cbab0f8a9bc8f2d64229589af assets/create/blockstates/creative_crate.json +b759be6f47fb960a7757b70d194921a38261c90a assets/create/blockstates/creative_crate.json da3f1203dd0b0096ce19e09705060a0ed0478bee assets/create/blockstates/creative_fluid_tank.json f0031f5e970b3d5695472ed384950b8631b015ed assets/create/blockstates/creative_motor.json 23ef8777fb1eb48d1d719bd5a2f5ff7ed40a62c1 assets/create/blockstates/crimsite.json @@ -486,21 +485,21 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json -8ce823821a78bd30936a91b1da4993a01c6bf852 assets/create/lang/en_ud.json -7c8a8b89f6e03334901fda9f15755f0a7dc17ed8 assets/create/lang/en_us.json -d324389e64c18df353e6ace173ff0866c4d5c98f assets/create/lang/unfinished/de_de.json -4238965cbe5e8ef39e5d5eba1569adacc81fe098 assets/create/lang/unfinished/es_cl.json -0cb4f6d23ce762707dd0c7554ef194a8b8afdd5c assets/create/lang/unfinished/es_es.json -c0543f36d936bba719382514cea05a74d4aca35d assets/create/lang/unfinished/fr_fr.json -ab054b1a2b8e431ec0f0f0dcb1d8073d22c00acf assets/create/lang/unfinished/it_it.json -883530b59a33ff9e72431475f25940879b77a081 assets/create/lang/unfinished/ja_jp.json -95fb036973024e8acde406a79b67d466e6223069 assets/create/lang/unfinished/ko_kr.json -3940ae47dac5af80ead184a804cb73a5fcaf02ae assets/create/lang/unfinished/nl_nl.json -47912e1981b57e70057d984942464664765cd4f3 assets/create/lang/unfinished/pl_pl.json -31299f1f01c5bceda77008f6c45a27d1594ee772 assets/create/lang/unfinished/pt_br.json -e278e1a27565799208af9c0ceea721ae60f58122 assets/create/lang/unfinished/ru_ru.json -e2223230ae43758330c96fccdae41c9a6f1f7460 assets/create/lang/unfinished/zh_cn.json -bb7d854ce65ffca6e72e631f694cbe3fcfdc9254 assets/create/lang/unfinished/zh_tw.json +14bb1f0bfd46b7f9bdbf0a7c110e8be76d4c3ee1 assets/create/lang/en_ud.json +c8c40b21c44f493e2044aebab34e051220f2b1f4 assets/create/lang/en_us.json +8348e844da1dd08afef34d1725d847208c4e24a2 assets/create/lang/unfinished/de_de.json +a0a7fe0e8f144041c3319dbd8d4b40b351717675 assets/create/lang/unfinished/es_cl.json +2c9cd8d2889b93775d9ea33f9de3e60f5c8e8f7d assets/create/lang/unfinished/es_es.json +ab1e069a2f2e5aa347fa92b24fe76052b244efb6 assets/create/lang/unfinished/fr_fr.json +09f7d32516a7383e279aeeb67730582c6d2866ad assets/create/lang/unfinished/it_it.json +c523c4659b1939ae14549081a780d34ef599d0d2 assets/create/lang/unfinished/ja_jp.json +40bc0e69a4446bc80ef199678f2b6259b3363a84 assets/create/lang/unfinished/ko_kr.json +66ba2c54c62152cfa0d28aac187f1ccbabc375f1 assets/create/lang/unfinished/nl_nl.json +32ed5f41b4eb2d296d907b8cb95ec0df19098155 assets/create/lang/unfinished/pl_pl.json +06f9c161b946c2c2a4e51cce2343ea33e1e01296 assets/create/lang/unfinished/pt_br.json +95f962b103b9a2190160449b8732e5a6714def77 assets/create/lang/unfinished/ru_ru.json +8cba217fb9b04a7b72713cd60cfa0b8c17af7118 assets/create/lang/unfinished/zh_cn.json +ed5bc9cd6b4c9c5a00ff64201494da9dddd2d38f assets/create/lang/unfinished/zh_tw.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 @@ -631,11 +630,6 @@ fd69c70a98aaae5894f16f61333e93909282fc16 assets/create/models/block/calcite_bric 30fe120af3cb32faf0729df4d2cdf868f804be17 assets/create/models/block/clockwork_bearing.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 -c76cfec1279d307c52f9502fdba3425f38219168 assets/create/models/block/crate/brass/right.json -9e55a49ecb99841627f5c2560e5b3c67310919ee assets/create/models/block/crate/brass/single.json -a09f639bde4c61d68592eb06c807e7a6791ff950 assets/create/models/block/crate/brass/top.json 917914f6b8aa9234bbffb434ba07f706c5d1232a assets/create/models/block/crate/creative/bottom.json 03a56c112a947735ff1682d5d9c3202e7796bce9 assets/create/models/block/crate/creative/left.json 7635211e4d833748acaea37ea48b1f749c32ea5f assets/create/models/block/crate/creative/right.json @@ -1442,7 +1436,6 @@ f3059145a84ddbd54d08167e984112c7baf5ef4a assets/create/models/block/zinc_ore.jso 67ef6fd6ec26fc216fa5319b8538beb223da1530 assets/create/models/item/acacia_window.json c695dab3964186a857767b2b4975aebffa86dcf9 assets/create/models/item/acacia_window_pane.json 564f6245f92ec48a733e34d91b96b1beebbaf44a assets/create/models/item/adjustable_chain_gearshift.json -06d8b6e8f050b8ec0bef88b7633f3741baad4571 assets/create/models/item/adjustable_crate.json e7759d9b3cd64d2719a58dc35fc75ca65b9e14fa assets/create/models/item/analog_lever.json 2e90c7abfcad12ca656ae253d834fbb799e15277 assets/create/models/item/andesite_alloy.json a513af38f164a48fd44693b70a93012f3546caff assets/create/models/item/andesite_bricks.json @@ -1526,7 +1519,6 @@ c65a06648214338e48d65e3c40417132e3a6f852 assets/create/models/item/crimsite_bric 5680d7cee347c46bb29db8c77dc33f234a7eba41 assets/create/models/item/crimson_window.json cdcc4c773bdda431e2aef26e83c061db36e66bae assets/create/models/item/crimson_window_pane.json e5f43ee61a7f434a487a5c91890d7eb295928d73 assets/create/models/item/crushed_aluminum_ore.json -6281a7439c92459761893835f91fde25467fae76 assets/create/models/item/crushed_brass.json cd148cb7e881091ecce2390dac0d9f545573c91c assets/create/models/item/crushed_copper_ore.json 5b701661c7b847dfe5b4cbc854b48f128f90090c assets/create/models/item/crushed_gold_ore.json 38181d7bf4284534666cfd62c1c9defed69d0788 assets/create/models/item/crushed_iron_ore.json @@ -1625,6 +1617,7 @@ a8363538beaf879b85bbb2dc38b9c46e75ece98f assets/create/models/item/dripstone_bri 5312db341e777c79feeaec99e5cb85bb99bb76ff assets/create/models/item/empty_schematic.json cf34fd7e891a131d763126aa070d5b919e304a51 assets/create/models/item/encased_chain_drive.json 250bd0716cc1f04b03892ab74eb0b3a0f32a6158 assets/create/models/item/encased_fan.json +3dbe101503c83630778605c50499d049adbf86ff assets/create/models/item/experience_nugget.json 68833e2a7836c73776551565783a1d175b715c66 assets/create/models/item/extendo_grip.json e5e6fb6eb182b85b977e1025a7fe84d46de59320 assets/create/models/item/fluid_pipe.json e7d2097256fed545064a37d233e7b810b04c26a4 assets/create/models/item/fluid_tank.json @@ -2076,7 +2069,6 @@ edb22e0bb018cf00e51f37d912939207c4bf5ac5 data/create/advancements/recipes/buildi d63adc5e4cd233a53feb767b9cb09e7bb1a9d4f1 data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_silents_mechanisms.json f10041d864bfb1e6f017e442ae85ee9503b3f5a4 data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json 8887aa51ab368864eb95fdbca0aee24563b1eb0e data/create/advancements/recipes/building_blocks/smelting/uranium_ingot_compat_silents_mechanisms.json -ba28efed4ba15c02eac8b0cf3e3420733ad0cc05 data/create/advancements/recipes/create.base/blasting/brass_ingot_from_crushed.json ba80332510acab3f60f30d8b802ee2d450fd51b9 data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_crushed.json 4bb60ef5e186f12a9d52e61319db8c78300c64ab data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_ore.json 00ff89f208cb9023d7a2657c43d267e21755fb2e data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_raw_ore.json @@ -2182,7 +2174,7 @@ ca21e2192a2fea0f112764f96c928d337762158b data/create/advancements/recipes/create 6c11444884679c4dd03d43f5893fca5cdc271915 data/create/advancements/recipes/create.base/crafting/kinetics/pink_valve_handle_from_other_valve_handle.json bb2250aa06cc87e8eb39dfde45c53f6f263be7e7 data/create/advancements/recipes/create.base/crafting/kinetics/piston_extension_pole.json d1f5c8d73a700ad1022563e73844ea80f76d32b4 data/create/advancements/recipes/create.base/crafting/kinetics/portable_fluid_interface.json -7d6199dbae8cde97af8272dcaae66ef96cc26b8b data/create/advancements/recipes/create.base/crafting/kinetics/portable_storage_interface.json +e43aa4b89f57ba643cd5b4885e8fd6abd8c514b3 data/create/advancements/recipes/create.base/crafting/kinetics/portable_storage_interface.json 02258b70f1db3d91f0ccb5a5ffd362349f8f359d data/create/advancements/recipes/create.base/crafting/kinetics/propeller.json d2a430820a87c24104729eede57628c6a92b277e data/create/advancements/recipes/create.base/crafting/kinetics/purple_seat.json 8eb1319984a8bf9502d8fddb717b11a1ee082f39 data/create/advancements/recipes/create.base/crafting/kinetics/purple_seat_from_other_seat.json @@ -2221,7 +2213,6 @@ b73e6f8b89e6ef94167b6fa3d0837a27222edb01 data/create/advancements/recipes/create 14c1cac4545f544a78bfd80cf7dd6355794c6679 data/create/advancements/recipes/create.base/crafting/kinetics/yellow_seat.json e8c2001863d9819d2a2c1fddeda41a4f126a5c09 data/create/advancements/recipes/create.base/crafting/kinetics/yellow_seat_from_other_seat.json f05bbae1e39eabb51dffa0babecf07f5de2cee3d data/create/advancements/recipes/create.base/crafting/kinetics/yellow_valve_handle_from_other_valve_handle.json -4e397619a76acc6083e3d3a3a4a3bd46a5f61efd data/create/advancements/recipes/create.base/crafting/logistics/adjustable_crate.json 0af26235bc51f73b0656d26a4232ae26419cee38 data/create/advancements/recipes/create.base/crafting/logistics/andesite_funnel.json 3443156df3d50b283be20d466797075064ddd59d data/create/advancements/recipes/create.base/crafting/logistics/andesite_tunnel.json 66dbb3486c5d38d309dd480e3f2ab0eb5ff9e559 data/create/advancements/recipes/create.base/crafting/logistics/brass_funnel.json @@ -2264,7 +2255,6 @@ ae3abb1234ff2bb373ddb660e2df99e4fb2fffbd data/create/advancements/recipes/create 453c39a149831f27b4c0069fae40cb1a8c87ed5e data/create/advancements/recipes/create.base/crafting/schematics/schematic_and_quill.json d5efcd206b74c5165cbd4c2f5bb7bf3cf3eeae34 data/create/advancements/recipes/create.base/crafting/schematics/schematic_table.json cd1f66066664ed58995f8a7988fb1aa22605650b data/create/advancements/recipes/create.base/crafting/schematics/schematicannon.json -4f330e44fc9eed84ddf84d1a510ac42e2c36b058 data/create/advancements/recipes/create.base/smelting/brass_ingot_from_crushed.json b2b9c6d93ff4d912081cee2ab5e68209828cdc86 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_crushed.json 16e52ba04279bcf803c5f6be46550ba5d81be1a3 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_ore.json 88a8661167993de0f2897c95e398b6f77429d724 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_raw_ore.json @@ -2805,7 +2795,7 @@ a1afb005cc23607cb4d84d42664b4bc28eef9ead data/create/advancements/recipes/transp c1434c26c854d6b723c4f4d0fbb051268043da07 data/create/advancements/recipes/transportation/crafting/kinetics/minecart_from_contraption_cart.json aca270ea8db5e00ba17c1c8fa46ee2445c2bc961 data/create/advancements/refined_radiance.json 67edd7bd314a85a1fddc2aa9f6b2207879aa5c3e data/create/advancements/reinforced.json -fc12b590ab8f5ac901db21c67ba3850f157e1421 data/create/advancements/root.json +9654f4952c39175825a3deb2d9bb56d525f0539a data/create/advancements/root.json 1ab3abcd219b9efb225588f4c797c775e96e07ff data/create/advancements/shadow_steel.json 6c1a67e193a4c5af356b31a1d5b5e9d3faeca87e data/create/advancements/shifting_gears.json 65132cb27041c848230781cca8020a2e5ae4365e data/create/advancements/speed_controller.json @@ -2823,7 +2813,6 @@ ef4fa382442aacbda1ca8b762bd51ff80b708a93 data/create/advancements/wrench.json 875873c46f48bee4a1cdd2a0b866727e0882966e data/create/loot_tables/blocks/acacia_window.json 98f71c17409a37a584eed6cb6ee3878efebf3ef6 data/create/loot_tables/blocks/acacia_window_pane.json c5c0b82ab3bcd7ffd1bcb65d00876aaba69363f9 data/create/loot_tables/blocks/adjustable_chain_gearshift.json -3b8a3cb092eab5bf269beb7c3764bcf6b5252851 data/create/loot_tables/blocks/adjustable_crate.json a4716789704bb30cf1c518b04c61661ba6289efa data/create/loot_tables/blocks/analog_lever.json 468759c042e8410da9230357f4b602766190df79 data/create/loot_tables/blocks/andesite_belt_funnel.json 6b38dc481ae2c536502dade305af1b5fee06ec2f data/create/loot_tables/blocks/andesite_bricks.json @@ -3327,7 +3316,6 @@ bde5f8a7b1c821f85c8687fbb2efa2a404262c4c data/create/recipes/asurine_bricks_wall 2b291b77860254b7ba8500cf2199a04ca1fca7b5 data/create/recipes/birch_window.json 288d80210f7efb4664e2e9c9d9111049863e5f60 data/create/recipes/birch_window_pane.json a4a9159c349dba7269c6b32c481f1df90b9e805a data/create/recipes/blasting/aluminum_ingot_compat_silents_mechanisms.json -adb384440f91411692689707d5c767c1065ac06c data/create/recipes/blasting/brass_ingot_from_crushed.json 7fc9cec199788a1151f9760b2e2c6eec870f830f data/create/recipes/blasting/copper_ingot_from_crushed.json d9021504be855cd2d4d91503a82b84233052adb0 data/create/recipes/blasting/gold_ingot_from_crushed.json f2307aa01ddf7accb3fe19c4d3f9b46dec1acf97 data/create/recipes/blasting/ingot_aluminum_compat_immersiveengineering.json @@ -3479,8 +3467,8 @@ d41f850475814e099f21b7232596c1ba12d30798 data/create/recipes/crafting/kinetics/p e6997dae188b5b07b5ca33c0843628dc73df1cc1 data/create/recipes/crafting/kinetics/pink_seat_from_other_seat.json 7b57fdc904ad0cf8cda25fca8f7008d0268a3d64 data/create/recipes/crafting/kinetics/pink_valve_handle_from_other_valve_handle.json 5399c3496a90bed9428c48fdd334ad4f763cbf9a data/create/recipes/crafting/kinetics/piston_extension_pole.json -a8e996bed77d3d20725f9d592c250392b3adb106 data/create/recipes/crafting/kinetics/portable_fluid_interface.json -7ed5699349faf2981228769c873057105a5ea3ea data/create/recipes/crafting/kinetics/portable_storage_interface.json +e8f953212e80eda389e223cd192629a6054324bc data/create/recipes/crafting/kinetics/portable_fluid_interface.json +e9f84dcb9820a8500769a507d776c6fc88b0ae8e data/create/recipes/crafting/kinetics/portable_storage_interface.json 16199a6729005a279854cb1838401f6e73bdebae data/create/recipes/crafting/kinetics/propeller.json b90fdb1047afc234b126a071fb7ddad003203db2 data/create/recipes/crafting/kinetics/purple_seat.json 8be4a393acce649d57178a62f81705abcd919a56 data/create/recipes/crafting/kinetics/purple_seat_from_other_seat.json @@ -3519,7 +3507,6 @@ d11eee4005372b1d0fad283b28c8016d823b5e37 data/create/recipes/crafting/kinetics/w 8b7ca850a23126fd7d65084cbc6506145efee7af data/create/recipes/crafting/kinetics/yellow_seat.json c574b993d49874bbed5d064205c436271dfa27b8 data/create/recipes/crafting/kinetics/yellow_seat_from_other_seat.json 19333b83d10e307d715b5667b8623915880e1861 data/create/recipes/crafting/kinetics/yellow_valve_handle_from_other_valve_handle.json -3f6f3a547dc06c9462da880360f29b49ac3f5e2a data/create/recipes/crafting/logistics/adjustable_crate.json fc75c87159569cb6ee978e6d51b0c3b0f504b5de data/create/recipes/crafting/logistics/andesite_funnel.json 660e824ab6042c145f02ffcfe95a34c38f113e19 data/create/recipes/crafting/logistics/andesite_tunnel.json 9b4e74f9a950191134d978bf45c3339212677b0d data/create/recipes/crafting/logistics/brass_funnel.json @@ -3574,40 +3561,49 @@ e68349f876c955c95cc810c2e383a6127f4ee3d5 data/create/recipes/crimsite_bricks_sla d622ca69a637b048937e5f36fbb467607d509472 data/create/recipes/crimsite_bricks_wall_from_stone_types_crimsite_stonecutting.json 4629d9a1a8a98a6b5b8b82c4507ca9e321c3a210 data/create/recipes/crimson_window.json 72cffde4281a1e34d77aa91c847e811833b68f21 data/create/recipes/crimson_window_pane.json -18ece8e366b73d19950f9a5a5c93a92c857da2e9 data/create/recipes/crushing/aluminum_ore.json +63a5543dbd89b250664fee43c036f2a29fef3fe1 data/create/recipes/crushing/amethyst_cluster.json +eeaf32eefa5be50f21dab021ae613c29b6f451f2 data/create/recipes/crushing/asurine.json 3da7a3cdb84f44e259b5399a94ddfbf94ebebd37 data/create/recipes/crushing/blaze_rod.json -5878767e89be5a522b8f28d6a2d7b2f8566cf0dd data/create/recipes/crushing/brass_block.json -b83ef0af844ca068e0353330b8273bace5b6a8c3 data/create/recipes/crushing/coal_ore.json -5015cd10482b5f2db7e646e1a73fb80288a17f88 data/create/recipes/crushing/copper_block.json -b576c6e51e5b6a0623e024ac90cdf4d3a9265e4b data/create/recipes/crushing/copper_ore.json +46ff1282677d08157bed54f1c1fa758e2504496a data/create/recipes/crushing/coal_ore.json +2089312b012db32c158858d5624135b11873857a data/create/recipes/crushing/copper_ore.json +2c63cb60722c74c10e0448e1875725a1a42b8d96 data/create/recipes/crushing/crimsite.json +c0f2d4de4d00504607a8f3e2d1327d754835eebe data/create/recipes/crushing/deepslate_coal_ore.json +dedb4d7e958efa2218561686974ad9223848ec30 data/create/recipes/crushing/deepslate_copper_ore.json +2f9f26daadda2d291989bccd2b0ea5f85e3ef5ae data/create/recipes/crushing/deepslate_diamond_ore.json +ab79ae0d086ac1c90d2e802a2bbb7eb868e9ff8b data/create/recipes/crushing/deepslate_emerald_ore.json +ae0418f47a68c15247350e8b31fd24905f1bced8 data/create/recipes/crushing/deepslate_gold_ore.json +21e591d215993dcecd92db86e14334958198d7c7 data/create/recipes/crushing/deepslate_iron_ore.json +b85ba487f2867564c10a0870b55ce213558156bf data/create/recipes/crushing/deepslate_lapis_ore.json +3384241f2441a047f9a226629238ece0b986e613 data/create/recipes/crushing/deepslate_redstone_ore.json +06ea6aed66fec9fd71a7b2f716fd83f77ab4b242 data/create/recipes/crushing/deepslate_zinc_ore.json 4c482db5575b74b4111800602d7fce22b2e6d32a data/create/recipes/crushing/diamond_horse_armor.json -28ba8cf655bd11bb6c600cd862b98349c812915f data/create/recipes/crushing/diamond_ore.json -e1bb927c62c59f5bf5063bd110da9231de378a1f data/create/recipes/crushing/emerald_ore.json +c42d105c8567c0844fcd811349093c2d754ea7d0 data/create/recipes/crushing/diamond_ore.json +f2b1c52cde3ecd83f021eff5114375e2f6526d90 data/create/recipes/crushing/diorite.json +1327589e844cb587a02167e4428fd604350d60e1 data/create/recipes/crushing/emerald_ore.json b26b1f0dccf2ffb194ce12173890a83e93369b39 data/create/recipes/crushing/glowstone.json -274ee397285ded906792a0a19e54faefc496a931 data/create/recipes/crushing/gold_ore.json +ec88e04ee72d54a3ba22c8348369809a30d5a095 data/create/recipes/crushing/gold_ore.json 55c0656723bd5a87089965651fe268b2d2956771 data/create/recipes/crushing/golden_horse_armor.json 7ce0637578ab3198de54ac74111b6d458eaf08bd data/create/recipes/crushing/gravel.json a7c97582bae243ab04ff5ff9914b24af25d40d59 data/create/recipes/crushing/iron_horse_armor.json -9ad2394a8835c0d59edd699d646ae64b266612f3 data/create/recipes/crushing/iron_ore.json -5be5d90f862da95d9fd15663b71bff126fd04441 data/create/recipes/crushing/lapis_ore.json -62e2768ae8f0de8d2e50a0916d4961f7836b5f04 data/create/recipes/crushing/lead_ore.json +554b6555888fe01de349efaaab36b68a338ac397 data/create/recipes/crushing/iron_ore.json +c9a9d6d28a7eac1210108d52840b60b26d58bcfe data/create/recipes/crushing/lapis_ore.json e870d049abc5cd5f389f70414c67e76ddc14060d data/create/recipes/crushing/leather_horse_armor.json -2bc66f89a751a440c93de5f1d28d54f9b5a0da77 data/create/recipes/crushing/nether_quartz_ore.json +cc5a817901d6f0d68e4ceb3e65d7f2187ab37ceb data/create/recipes/crushing/nether_gold_ore.json +6cd97c6f12687790943db810f85036b02586c753 data/create/recipes/crushing/nether_quartz_ore.json 6e424d7e9f7d8b585384053a713db28f9d36448b data/create/recipes/crushing/nether_wart_block.json 8003e7db3ee11066b365c251f04f84028820de94 data/create/recipes/crushing/netherrack.json -7b4c7587374fb77088f226187771de520ada548b data/create/recipes/crushing/nickel_ore.json dd4b9e88a723f6c3f2456f36ef2354cd86d85433 data/create/recipes/crushing/obsidian.json -4a71aea480a6e6dd844c452155af1c30d70c5c09 data/create/recipes/crushing/osmium_ore.json -5e057c5e46f744fb63d9c1d51c113fd2bb95bfb7 data/create/recipes/crushing/platinum_ore.json +93767cfd10019f11de935021a729771430bc114b data/create/recipes/crushing/ochrum.json 67197bbbb9667ab481410d21cb014bf9ca71ea60 data/create/recipes/crushing/prismarine_crystals.json -d068d6b1c0ffddf989188b826cf948e997af184d data/create/recipes/crushing/quicksilver_ore.json -03874de476273de5aab8758f23d1ae638847843b data/create/recipes/crushing/redstone_ore.json -2583968bd8227c0aa464741e2b5716367acd1536 data/create/recipes/crushing/silver_ore.json -e288b431c6a313a637cdc6208137faa17f6d8c4c data/create/recipes/crushing/tin_ore.json -307f30eb1180bca140572d08951c06b01a85beb0 data/create/recipes/crushing/uranium_ore.json +3602170b10ed1e0bb5e7aa806dcc73170b999517 data/create/recipes/crushing/raw_copper.json +f2c64ade6ef62e73d7f5aa0a0706de55cf12e464 data/create/recipes/crushing/raw_gold.json +2ee02db1746e2297aa0860b5bb8554625724c964 data/create/recipes/crushing/raw_iron.json +68cc75b755626aecea2e3cf6db98b986dbd905f4 data/create/recipes/crushing/raw_zinc.json +a2d3e1feb660a89c09038853859302726fa863c1 data/create/recipes/crushing/redstone_ore.json +7f6c7b88464ecb023165d379bfe8d0117b2f37d6 data/create/recipes/crushing/tuff.json +2517df626a19d7fc489ca7573a573c59513c6b83 data/create/recipes/crushing/veridium.json b6b97f139ee0a06a4ec1ed9f43e1f845b3c502d3 data/create/recipes/crushing/wool.json -967bea8eabac8fab8de547ddd6670230f400c111 data/create/recipes/crushing/zinc_block.json -0c9692950385949ba605065b6fbce32a75f9ee8a data/create/recipes/crushing/zinc_ore.json +24ee57fbe5a1656df6b9c63a3f414112b31caf15 data/create/recipes/crushing/zinc_ore.json 7444ed52b6f280e650984608821f7304c2522d6c data/create/recipes/cut_andesite_from_andesite_stonecutting.json 066f87115afcef674e9b86b5e8eb9732723f50bb data/create/recipes/cut_andesite_from_stone_types_andesite_stonecutting.json 8e5b95f70339d611d46734a7ff143e853160a01f data/create/recipes/cut_andesite_slab.json @@ -3847,7 +3843,6 @@ f26ed47c10cc63613759b0f8ae4ef349000de60d data/create/recipes/mechanical_crafting 2dc00d6e4c159e06ab2a705e666e83e4238a7814 data/create/recipes/mechanical_crafting/furnace_engine.json fa356eb82c08339bb0064017d88b1e5b053fd4ff data/create/recipes/mechanical_crafting/potato_cannon.json 98f877bf8f3f8a686fc6cf7479a0fba5744248ce data/create/recipes/milling/allium.json -8c7e1cbc87c7ca7df2bf949957e89422fef8ad94 data/create/recipes/milling/aluminum_ore.json bcff4d30ae09a0729bce8b2dbde4ddd6719a998b data/create/recipes/milling/andesite.json ac3f1c92115a113a1ea7e5543c1e061e3d2a0b36 data/create/recipes/milling/azure_bluet.json 83fc4663a012e78cebbb0f08e01a10df06b04873 data/create/recipes/milling/beetroot.json @@ -3855,59 +3850,47 @@ ac3f1c92115a113a1ea7e5543c1e061e3d2a0b36 data/create/recipes/milling/azure_bluet 25d008621c461a1f6fef0e45913dc8654c645ea3 data/create/recipes/milling/bone.json 8c09dc48b3e3c3c6bfdc4ed7683bdee860802172 data/create/recipes/milling/bone_meal.json c152f6ae0c5bdcd4eaf3e714864a318f462b64a0 data/create/recipes/milling/cactus.json +b0af6ba2f2082d67b36a1a71d13de0d4100ffe80 data/create/recipes/milling/calcite.json b8eff5bcc773a7ce75146423e5997ee24f69a92c data/create/recipes/milling/charcoal.json e34c20506e9054da0e3b22fb27a093222eeb9a9c data/create/recipes/milling/clay.json ccce7e6d1ab703d6567046b9c99c254e8baa88f7 data/create/recipes/milling/coal.json 851e4f3b84f431003264bc902a3351b6d769c897 data/create/recipes/milling/cobblestone.json 929d5c69bfd4eefc33766954e1ed7cbc284180b6 data/create/recipes/milling/cocoa_beans.json -a1d947988d0c31be6a7f86db255328d704c90bda data/create/recipes/milling/copper_ore.json 31da5a1a6cc6f6cf90bf091d968d8b6f8555b292 data/create/recipes/milling/cornflower.json 623c1a134f8ce6b7d52476b6da8e8d210dba7bb1 data/create/recipes/milling/dandelion.json +54d544e24263acc564dc14f6544198f9d705dc9c data/create/recipes/milling/dripstone_block.json 28bad3c34cf0f5e20c48486c15130f6c552a93ec data/create/recipes/milling/fern.json -9acaae7f887c815a5d2195e4847f276161e94fec data/create/recipes/milling/gold_ore.json 51d692a94c69e10e3b77542f9cd98500104d5a42 data/create/recipes/milling/granite.json 6f9d6891b2bc2e6f1dc24a7802f9a0f7982e9d20 data/create/recipes/milling/grass.json 407a82fb6ca49d8e6159b0e900f856021b1dd771 data/create/recipes/milling/gravel.json 7932570ab897c0afe71ca368372f7628cb2c9b31 data/create/recipes/milling/ink_sac.json -b73e22d4234fa32a649c57d3a83a1b9c8f89f358 data/create/recipes/milling/iron_ore.json b2e80b5752eec591f4110f6a5fc5e052aeecab78 data/create/recipes/milling/lapis_lazuli.json 1720439fd1c8eb808d1a1d29510b71860afbdec2 data/create/recipes/milling/large_fern.json -63e4d80308ac542d36e82a4689267fce4d8c86bf data/create/recipes/milling/lead_ore.json 3c8a3b3d8c91e107c2ff64b2115f5cf94197fc91 data/create/recipes/milling/lilac.json f2a7518eeef43052785dff6c3bf305c8c74c4789 data/create/recipes/milling/lily_of_the_valley.json -051ccd86b1dc037c7c12a4abde6bd4f7e5bc7bb0 data/create/recipes/milling/nickel_ore.json 5ba9cd55d4a551350b64ecbbff6bfd32e130c00c data/create/recipes/milling/orange_tulip.json -856cb5f8aa2b4c3a292fb71348bd060b4cd5fe1d data/create/recipes/milling/osmium_ore.json e5f121e244cd0afa2fe3d76a1e15ca9974bee96b data/create/recipes/milling/oxeye_daisy.json 077edce210beb2cbe5e37062b0518be473784dc7 data/create/recipes/milling/peony.json 00c67bfbfc780b0d0343c9d31fda9f477341bc88 data/create/recipes/milling/pink_tulip.json -6b176880d75ab9f7fd80fa175d4c18c129c1dad7 data/create/recipes/milling/platinum_ore.json 47fabce9ae3fbc2cc888697b11e6d48748631ef5 data/create/recipes/milling/poppy.json -c338d5ad841673364d514800074268b83852e944 data/create/recipes/milling/quicksilver_ore.json ea6fb7e30fa22cd87ff4760288e11f909b78ac86 data/create/recipes/milling/red_tulip.json bda581c2039f41f7d55527814a46903f10da7e05 data/create/recipes/milling/rose_bush.json 54be62a1bf098a370d315f79068ec326e4f4d6c2 data/create/recipes/milling/saddle.json 42c5837c16132632da52325cddea3cdbb318e822 data/create/recipes/milling/sandstone.json d11b247b41fc1c36c75a68a56eca8404367707f8 data/create/recipes/milling/sea_pickle.json -87e30347cc28aa5fb2daefae4c25fa81ce92b0f1 data/create/recipes/milling/silver_ore.json 1e14bd30032aab6dfaff5bca50c791332ffc1aaa data/create/recipes/milling/sugar_cane.json af2beca9f934601ad029f34bad08be3cee07f6b4 data/create/recipes/milling/sunflower.json 949c7aa8f5172c07b0b5ea178d8046ffaac9f527 data/create/recipes/milling/tall_grass.json 542ffcedc9b1467ec41c6f4e162453e76fa1ead1 data/create/recipes/milling/terracotta.json -2af15c24fecb0c25017f23ec74f2f4a343b92c65 data/create/recipes/milling/tin_ore.json -aa0db51304fc877f9670e6c331a94bd38ca853ce data/create/recipes/milling/uranium_ore.json 4f61f0efbd980407d4e0fa1067dd320f01496c6c data/create/recipes/milling/wheat.json 0a598bfc39ad473856887703d7971ba3a70339f8 data/create/recipes/milling/white_tulip.json 19a16516ce26afddef5604b118899a50671a9a9a data/create/recipes/milling/wither_rose.json eec880075efd6008b604a4b8064d782752b4bad6 data/create/recipes/milling/wool.json -2363962d6c8ad337b1fd9dfb2bd2c82388b911a5 data/create/recipes/milling/zinc_ore.json b3cc5e61bab40ca6135dc1f706f3ab447e9f78bf data/create/recipes/mixing/andesite_alloy.json ce9dc7dacb85cb23a7187c19a115b40e597ad36b data/create/recipes/mixing/andesite_alloy_from_zinc.json 5a0ff7f1284d3c5e476552170cfee2e8164fb087 data/create/recipes/mixing/brass_ingot.json ab602a53a5d8d057aad910dd1c5529cde2d587ab data/create/recipes/mixing/chocolate.json d3bf74bb3826cf2dccaf7377b8b3e0fdaa38f1aa data/create/recipes/mixing/chocolate_melting.json -0e29b4ce13750aab5a60ae54cbec8776569b35e0 data/create/recipes/mixing/chromatic_compound.json -d9a3dff1288d675ab812eef1eb73cb27dcc71bd2 data/create/recipes/mixing/crushed_brass.json ec331b1de31bbe2795aec729e931726ec4f4534f data/create/recipes/mixing/dough_by_mixing.json ffba306dbb52e4d7afeaec183b92821dbc402a7c data/create/recipes/mixing/honey.json cd9a78454bce20cf3557f5c44febae77ebd43e54 data/create/recipes/mixing/lava_from_cobble.json @@ -4189,7 +4172,6 @@ e58a5192fdda8a6abf676cd5ea860b74bd8cff8e data/create/recipes/small_veridium_bric b1243157b020416ca120135f1a5c4b3fe348904a data/create/recipes/small_veridium_bricks_wall_from_small_veridium_bricks_stonecutting.json 759c793375c750e337bb9d5d33c69422e2073f92 data/create/recipes/small_veridium_bricks_wall_from_stone_types_veridium_stonecutting.json 4e817b521623966fa24186731a70f0e14c03168e data/create/recipes/smelting/aluminum_ingot_compat_silents_mechanisms.json -ae90f50589bc06b44765ac8cbb9fbdc2b58fdb32 data/create/recipes/smelting/brass_ingot_from_crushed.json 64cbf425effba00ff2e31d95cffc2be2e0191932 data/create/recipes/smelting/bread.json 1c537423aeeb2a0a787f4499c7b339f3a5f152d1 data/create/recipes/smelting/copper_ingot_from_crushed.json 11857aff0104cce17a318e440b6b38cf414f7174 data/create/recipes/smelting/glass_from_framed_glass.json @@ -4235,56 +4217,55 @@ ce7c3c6e1da9d6684c9537d1a558423925d89f33 data/create/recipes/smoking/bread.json 6b1d2483fe717657f7188f6490eab2da715609e8 data/create/recipes/splashing/black_concrete_powder.json 1aedfde11712827604bbef34e992c411c0b02876 data/create/recipes/splashing/blue_concrete_powder.json 6e11d592dc9b19c4cd9bf2df2aa46b7ec4d9a331 data/create/recipes/splashing/brown_concrete_powder.json -c22dc50b7c8dea74dae9018506989fa14a340796 data/create/recipes/splashing/crushed_brass.json -d43ec1edc4743dc5a3483c327dc010a12d81dbf5 data/create/recipes/splashing/crushed_copper_ore.json -a1112c785f4571c0a9900288081eb216c729a17b data/create/recipes/splashing/crushed_gold_ore.json -f3b03dd4532086a785d6bbc9de081ab8adf58146 data/create/recipes/splashing/crushed_iron_ore.json -d2d6137fd7a3155263cfffef45f760b99f26f26b data/create/recipes/splashing/crushed_zinc_ore.json +2063d4133977bacf14a08be563bd40510e9bdcbe data/create/recipes/splashing/crushed_copper_ore.json +c01d2b2d12418a79124c941a803476c1047db4f9 data/create/recipes/splashing/crushed_gold_ore.json +f1b2f52d75006a92f1a64a68f7b39ce0ff4a7b00 data/create/recipes/splashing/crushed_iron_ore.json +6c49c0bf4a8c5c586ef005644684d5d7b1a87221 data/create/recipes/splashing/crushed_zinc_ore.json 42cee25fabf4f0f9fb4815a98134eaf38ae197d0 data/create/recipes/splashing/cyan_concrete_powder.json -2705d04043f39e4604dd89d8a0ff34ed01548849 data/create/recipes/splashing/eidolon/crushed_lead_ore.json +678943fe2ae04dffa31c41bb40ec45cd9a0c1643 data/create/recipes/splashing/eidolon/crushed_lead_ore.json c4d680eed98791fe45fa93aeeae9e8dbd508d6f5 data/create/recipes/splashing/gravel.json 7af4d9ae50af13da0d4fc814687f9586ff872798 data/create/recipes/splashing/gray_concrete_powder.json 23fb61c0e4bcca58fa7241db9cbef07bf4bd9a9b data/create/recipes/splashing/green_concrete_powder.json 0a15fffe26190b78d2177c8302c92fc2232ce398 data/create/recipes/splashing/ice.json -42e05e89ad9c83bd74ea67878930056ee0491fa8 data/create/recipes/splashing/iceandfire/crushed_silver_ore.json -1c978c74c949e9325a4078f25d8b39ed2d70f4a0 data/create/recipes/splashing/immersiveengineering/crushed_aluminum_ore.json -10ce4f124a8caf28027f4976f49a54561bfb7d18 data/create/recipes/splashing/immersiveengineering/crushed_lead_ore.json -ab433eb5d0739ca5932588f48308151d7e0bacc2 data/create/recipes/splashing/immersiveengineering/crushed_nickel_ore.json -690fe5c0fbdad61827862f21ee3a59dc385a0f93 data/create/recipes/splashing/immersiveengineering/crushed_silver_ore.json -0c8391170e5918872b06d371f694fcd72e173c5b data/create/recipes/splashing/immersiveengineering/crushed_uranium_ore.json +1be95ef8e9cfd9eaced7397eb1eaac33dc78428b data/create/recipes/splashing/iceandfire/crushed_silver_ore.json +f0b4be08f5803a403ef2f6e14a953ba9f6f5bf26 data/create/recipes/splashing/immersiveengineering/crushed_aluminum_ore.json +9291dca28f54bdeed71e45593c02535da28bcf37 data/create/recipes/splashing/immersiveengineering/crushed_lead_ore.json +5b4dd867a5e4bb0f67b269695a9b7c099fd7777a data/create/recipes/splashing/immersiveengineering/crushed_nickel_ore.json +daa63db4f101c9923cdbb03ff1ecc21539583f8a data/create/recipes/splashing/immersiveengineering/crushed_silver_ore.json +236763fb438f58622d379516e56ec244d610b5bf data/create/recipes/splashing/immersiveengineering/crushed_uranium_ore.json 601e460575d3d1f45dca3e259f5a7c2701f45888 data/create/recipes/splashing/light_blue_concrete_powder.json 11792305bc949f08e7c1199ead8430f20848fa54 data/create/recipes/splashing/light_gray_concrete_powder.json a43d7c9a6369a48ef7d1396f2c11dc1f3704a61e data/create/recipes/splashing/lime_concrete_powder.json 862f7b68bb107d7c4ecc82ddd10c788eb0a07b03 data/create/recipes/splashing/magenta_concrete_powder.json 004e05fed3684de8603905d9c9381cbbd789a882 data/create/recipes/splashing/magma_block.json -1ac44e66e1999b7127156492008e08e9607b158e data/create/recipes/splashing/mekanism/crushed_lead_ore.json -f627573eefe0353b32d7c48abd7dcbcf13613004 data/create/recipes/splashing/mekanism/crushed_osmium_ore.json -a1828cb3c934c4146008d1d10d04adb80a80ac94 data/create/recipes/splashing/mekanism/crushed_tin_ore.json -751c1d11d19054d514eb99d24a73945236dc9116 data/create/recipes/splashing/mekanism/crushed_uranium_ore.json -ea4a295149091e3b4b8388cb9d4dd2ab509d666e data/create/recipes/splashing/mysticalworld/crushed_lead_ore.json -1ecac82da1ccc381e303dc64e8033c13cf66fb59 data/create/recipes/splashing/mysticalworld/crushed_quicksilver_ore.json -fd1751c804bfc156c7bd97955fabb19f9a4b94ec data/create/recipes/splashing/mysticalworld/crushed_silver_ore.json -123db4bca699bf1d2571727f4b7fcf9d3ef82e37 data/create/recipes/splashing/mysticalworld/crushed_tin_ore.json +d0d4ff1b927cea965ae0d371ffbf9b90fd8f4a89 data/create/recipes/splashing/mekanism/crushed_lead_ore.json +bd39c8ae599da8201eb3087a1a7e655d7dacaae7 data/create/recipes/splashing/mekanism/crushed_osmium_ore.json +8d830d8768baaf5a937333370149b7a3e1e48f0e data/create/recipes/splashing/mekanism/crushed_tin_ore.json +3ed995c7ee1ddd12470904168b0c4c9eac3b6f2d data/create/recipes/splashing/mekanism/crushed_uranium_ore.json +b8764ac353fe4883156e9dd5d705aef03f638840 data/create/recipes/splashing/mysticalworld/crushed_lead_ore.json +4621168fd0011a2cd687de432ffbc8cc25bc3fbd data/create/recipes/splashing/mysticalworld/crushed_quicksilver_ore.json +f71f97cd6951d8c4ad4ed2c2e0aa8f3574e32bd9 data/create/recipes/splashing/mysticalworld/crushed_silver_ore.json +0f727ab5a73fe6a59738ace4b5e1238d9788b3e4 data/create/recipes/splashing/mysticalworld/crushed_tin_ore.json 625c2d68ad722209523925375bc4f7494667feb2 data/create/recipes/splashing/orange_concrete_powder.json fb0c5fb2da0ac1fd236b19823747b9c15b536b02 data/create/recipes/splashing/pink_concrete_powder.json 2599fcd240eacdf4ace0dffe64f026d0bb4919d9 data/create/recipes/splashing/purple_concrete_powder.json 9c10bfdd047fb9ac17d51ebdd38bc8be0883d970 data/create/recipes/splashing/red_concrete_powder.json 87ddb764bcff88c12686d171540cea4cc6edaf16 data/create/recipes/splashing/red_sand.json 3a5dea804e0aec6fa8711eb07b006d8b1de098ff data/create/recipes/splashing/sand.json -94eb5e36f8f0f47d1846d6cd21a04f5ad39e4a67 data/create/recipes/splashing/silents_mechanisms/crushed_aluminum_ore.json -8ba14fdc6c3ebe54a8b70cedaf0f9951cbd756ed data/create/recipes/splashing/silents_mechanisms/crushed_lead_ore.json -8a4c5d280c423d1f1272a56abb7cc8cf36bf2486 data/create/recipes/splashing/silents_mechanisms/crushed_nickel_ore.json -fc9889cf6c0594b3635670b85f5cfec628a78537 data/create/recipes/splashing/silents_mechanisms/crushed_platinum_ore.json -14f525e426a5a14a5d5279afe07582896de90a96 data/create/recipes/splashing/silents_mechanisms/crushed_silver_ore.json -62c8dbed54fac6a95f89f18b6e68ddceb534dbd3 data/create/recipes/splashing/silents_mechanisms/crushed_tin_ore.json -4140a1f16467dd690e458561871c456f9f826f27 data/create/recipes/splashing/silents_mechanisms/crushed_uranium_ore.json +ee7380abb5e61d3a44c061af3ed11a9665c90328 data/create/recipes/splashing/silents_mechanisms/crushed_aluminum_ore.json +4815dfb170051c44558d4ef3846a3b15acf3c7bd data/create/recipes/splashing/silents_mechanisms/crushed_lead_ore.json +1e33de048364d32b67743ef58e671e24e9dbf62b data/create/recipes/splashing/silents_mechanisms/crushed_nickel_ore.json +f6cd777675b4721c23ecceb73fb9455b9e63353c data/create/recipes/splashing/silents_mechanisms/crushed_platinum_ore.json +9387324b68ecb3f77a64d00c9370a241d9f1844b data/create/recipes/splashing/silents_mechanisms/crushed_silver_ore.json +dead53cd0ce6b5a1ee0f089dc72c44093ca83737 data/create/recipes/splashing/silents_mechanisms/crushed_tin_ore.json +df6a91126a221cfff1a50335ecbce3f618193704 data/create/recipes/splashing/silents_mechanisms/crushed_uranium_ore.json cf0dcdb8ec3f3e75b315faa377eccef662dea71f data/create/recipes/splashing/soul_sand.json ba660fe5786c95a359a6ddfdeb73d7109cbebe5d data/create/recipes/splashing/stained_glass.json c7a51fd1b730d48991cf6b4f1b56da4144537f1d data/create/recipes/splashing/stained_glass_pane.json -0dab1568708dfa19a2f4c3d06074bb12d477b89c data/create/recipes/splashing/thermal/crushed_lead_ore.json -1bb810e459ab32eaa33e29d4868f4d057b5b3273 data/create/recipes/splashing/thermal/crushed_nickel_ore.json -13a59189b523238f8e39b928d129993608c6ffbc data/create/recipes/splashing/thermal/crushed_silver_ore.json -b7287dc1142ec6f5d6945424f3a183784bd5e270 data/create/recipes/splashing/thermal/crushed_tin_ore.json +97bb2aa9e3f1ff67dbcb679ad9445e2311d318db data/create/recipes/splashing/thermal/crushed_lead_ore.json +c4030e816d783bd195c56ae52a970c38593d178b data/create/recipes/splashing/thermal/crushed_nickel_ore.json +aa831e7fe830732b773d8ad144cb0d31ecffd489 data/create/recipes/splashing/thermal/crushed_silver_ore.json +df4276c923839620f284ac7c2d6a44bfd9ba356e data/create/recipes/splashing/thermal/crushed_tin_ore.json 39bd2780c1d3066e6b5b8d3b029f058f5ea63165 data/create/recipes/splashing/wheat_flour.json 24cedf74a5a118fa03c7e91a3fdaae3e41f6ec40 data/create/recipes/splashing/white_concrete_powder.json 4ad9a4699a6e28c4406ab2aa453bbe50fcb34abc data/create/recipes/splashing/wool.json @@ -4326,7 +4307,7 @@ eac71740fb12bdb38b5dfaa2268613d7ba82b809 data/create/tags/blocks/windmill_sails. 74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/create/tags/blocks/windowable.json 893a01e6004d6d8272bd1658e98da88bb572ee57 data/create/tags/blocks/wrench_pickup.json 5212172aee2239136c94f9868ad39ec2e17cf1c6 data/create/tags/items/create_ingots.json -94c62bf22678ef55b2b8a5398a7960e5b00682dc data/create/tags/items/crushed_ores.json +4480f211f4a37bfee193eba945bc9f5a8d2c6e34 data/create/tags/items/crushed_ores.json bce28787b0271382842823d04a977912a88b01c2 data/create/tags/items/sandpaper.json 6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/items/seats.json c95e0233e7251c84b03ecd09d4cb7e1c53af139e data/create/tags/items/stone_types/andesite.json @@ -4363,7 +4344,7 @@ d9ffc62a496946fc4848934e7c0a6e917337f8be data/forge/tags/items/beacon_payment.js d9ffc62a496946fc4848934e7c0a6e917337f8be data/forge/tags/items/ingots.json 2dfd21017cb51d4bdc18d977a7d16f103cc3a985 data/forge/tags/items/ingots/brass.json 2f9ac80569a5cc168061742f9e3c36277d4d056e data/forge/tags/items/ingots/zinc.json -bcf15289cbadd429a48bd9accb4d2d5f75353a61 data/forge/tags/items/nuggets.json +ece57d101227f1656ec82c1d899a081123cc5582 data/forge/tags/items/nuggets.json cc82188fe8d986f4457301ed4f75ae833d263601 data/forge/tags/items/nuggets/brass.json 7affb30e30a252566a77467994b0c99331f1076c data/forge/tags/items/nuggets/copper.json 0d8cb5092ee6ec01ea09324c80d649ba05549799 data/forge/tags/items/nuggets/zinc.json @@ -4379,8 +4360,8 @@ ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/br 7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/items/storage_blocks/zinc.json 9f7a428085b1aac66da32a43e9d51c7efc1f0d81 data/minecraft/tags/blocks/beacon_base_blocks.json 69f596fcb065e26b02ce246760432b5174191b76 data/minecraft/tags/blocks/impermeable.json -492323734dfc7824d751b0b4afeaaa65ed205d65 data/minecraft/tags/blocks/mineable/axe.json -dcce3f89e4b816b8229125a8a3be767998137efb data/minecraft/tags/blocks/mineable/pickaxe.json +59681910c06f8b7385c6641a409d352056235506 data/minecraft/tags/blocks/mineable/axe.json +cb4500607ad91b6575cac77ed9c248c669e20cbe data/minecraft/tags/blocks/mineable/pickaxe.json e157c1d3af30e409e34bbefbe15a037e6e1c8daa data/minecraft/tags/blocks/needs_iron_tool.json 6bcabbc1c0479caa80a0ebc676bb34ce0052efb0 data/minecraft/tags/blocks/rails.json b8a94be947d0c2fb0e4a9ee329ba815a90892d5f data/minecraft/tags/blocks/slabs.json diff --git a/src/generated/resources/assets/create/blockstates/adjustable_crate.json b/src/generated/resources/assets/create/blockstates/adjustable_crate.json deleted file mode 100644 index f34e3aaf6..000000000 --- a/src/generated/resources/assets/create/blockstates/adjustable_crate.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "variants": { - "double=false,facing=down": { - "model": "create:block/crate/brass/single" - }, - "double=true,facing=down": { - "model": "create:block/crate/brass/top" - }, - "double=false,facing=up": { - "model": "create:block/crate/brass/single" - }, - "double=true,facing=up": { - "model": "create:block/crate/brass/bottom" - }, - "double=false,facing=north": { - "model": "create:block/crate/brass/single" - }, - "double=true,facing=north": { - "model": "create:block/crate/brass/right" - }, - "double=false,facing=south": { - "model": "create:block/crate/brass/single" - }, - "double=true,facing=south": { - "model": "create:block/crate/brass/left" - }, - "double=false,facing=west": { - "model": "create:block/crate/brass/single" - }, - "double=true,facing=west": { - "model": "create:block/crate/brass/left", - "y": 90 - }, - "double=false,facing=east": { - "model": "create:block/crate/brass/single" - }, - "double=true,facing=east": { - "model": "create:block/crate/brass/right", - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/creative_crate.json b/src/generated/resources/assets/create/blockstates/creative_crate.json index 89413592c..384ef7f59 100644 --- a/src/generated/resources/assets/create/blockstates/creative_crate.json +++ b/src/generated/resources/assets/create/blockstates/creative_crate.json @@ -1,42 +1,22 @@ { "variants": { - "double=false,facing=down": { + "facing=down": { "model": "create:block/crate/creative/single" }, - "double=true,facing=down": { - "model": "create:block/crate/creative/top" - }, - "double=false,facing=up": { + "facing=up": { "model": "create:block/crate/creative/single" }, - "double=true,facing=up": { - "model": "create:block/crate/creative/bottom" - }, - "double=false,facing=north": { + "facing=north": { "model": "create:block/crate/creative/single" }, - "double=true,facing=north": { - "model": "create:block/crate/creative/right" - }, - "double=false,facing=south": { + "facing=south": { "model": "create:block/crate/creative/single" }, - "double=true,facing=south": { - "model": "create:block/crate/creative/left" - }, - "double=false,facing=west": { + "facing=west": { "model": "create:block/crate/creative/single" }, - "double=true,facing=west": { - "model": "create:block/crate/creative/left", - "y": 90 - }, - "double=false,facing=east": { + "facing=east": { "model": "create:block/crate/creative/single" - }, - "double=true,facing=east": { - "model": "create:block/crate/creative/right", - "y": 90 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index 6539b86dd..6cbeb8075 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -2,7 +2,6 @@ "block.create.acacia_window": "\u028Dopu\u0131M \u0250\u0131\u0254\u0250\u0254\u2C6F", "block.create.acacia_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u0250\u0131\u0254\u0250\u0254\u2C6F", "block.create.adjustable_chain_gearshift": "\u0287\u025F\u0131\u0265s\u0279\u0250\u01DD\u2141 u\u0131\u0250\u0265\u0186 \u01DD\u05DFq\u0250\u0287sn\u0638p\u2C6F", - "block.create.adjustable_crate": "\u01DD\u0287\u0250\u0279\u0186 \u01DD\u05DFq\u0250\u0287sn\u0638p\u2C6F", "block.create.analog_lever": "\u0279\u01DD\u028C\u01DD\uA780 bo\u05DF\u0250u\u2C6F", "block.create.andesite_belt_funnel": "\u05DF\u01DDuun\u2132 \u0287\u05DF\u01DD\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", @@ -521,7 +520,6 @@ "item.create.crafting_blueprint": "\u0287u\u0131\u0279d\u01DDn\u05DF\u15FA bu\u0131\u0287\u025F\u0250\u0279\u0186", "item.create.creative_blaze_cake": "\u01DD\u029E\u0250\u0186 \u01DDz\u0250\u05DF\u15FA \u01DD\u028C\u0131\u0287\u0250\u01DD\u0279\u0186", "item.create.crushed_aluminum_ore": "\u01DD\u0279O \u026Fnu\u0131\u026Fn\u05DF\u2C6F p\u01DD\u0265sn\u0279\u0186", - "item.create.crushed_brass": "ss\u0250\u0279\u15FA p\u01DD\u0265sn\u0279\u0186", "item.create.crushed_copper_ore": "\u01DD\u0279O \u0279\u01DDddo\u0186 p\u01DD\u0265sn\u0279\u0186", "item.create.crushed_gold_ore": "\u01DD\u0279O p\u05DFo\u2141 p\u01DD\u0265sn\u0279\u0186", "item.create.crushed_iron_ore": "\u01DD\u0279O uo\u0279I p\u01DD\u0265sn\u0279\u0186", @@ -540,6 +538,7 @@ "item.create.electron_tube": "\u01DDqn\u27D8 uo\u0279\u0287\u0254\u01DD\u05DF\u018E", "item.create.empty_blaze_burner": "\u0279\u01DDu\u0279n\u15FA \u01DDz\u0250\u05DF\u15FA \u028E\u0287d\u026F\u018E", "item.create.empty_schematic": "\u0254\u0131\u0287\u0250\u026F\u01DD\u0265\u0254S \u028E\u0287d\u026F\u018E", + "item.create.experience_nugget": "\u01DD\u0254u\u01DD\u0131\u0279\u01DDdx\u018E \u025Fo \u0287\u01DDbbnN", "item.create.extendo_grip": "d\u0131\u0279\u2141 opu\u01DD\u0287x\u018E", "item.create.filter": "\u0279\u01DD\u0287\u05DF\u0131\u2132", "item.create.furnace_minecart_contraption": "uo\u0131\u0287d\u0250\u0279\u0287uo\u0186 \u0287\u0279\u0250\u0254\u01DDu\u0131W \u01DD\u0254\u0250u\u0279n\u2132", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 7d3f66ff5..1c4e08a87 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -5,7 +5,6 @@ "block.create.acacia_window": "Acacia Window", "block.create.acacia_window_pane": "Acacia Window Pane", "block.create.adjustable_chain_gearshift": "Adjustable Chain Gearshift", - "block.create.adjustable_crate": "Adjustable Crate", "block.create.analog_lever": "Analog Lever", "block.create.andesite_belt_funnel": "Andesite Belt Funnel", "block.create.andesite_bricks": "Andesite Bricks", @@ -528,7 +527,6 @@ "item.create.crafting_blueprint": "Crafting Blueprint", "item.create.creative_blaze_cake": "Creative Blaze Cake", "item.create.crushed_aluminum_ore": "Crushed Aluminum Ore", - "item.create.crushed_brass": "Crushed Brass", "item.create.crushed_copper_ore": "Crushed Copper Ore", "item.create.crushed_gold_ore": "Crushed Gold Ore", "item.create.crushed_iron_ore": "Crushed Iron Ore", @@ -547,6 +545,7 @@ "item.create.electron_tube": "Electron Tube", "item.create.empty_blaze_burner": "Empty Blaze Burner", "item.create.empty_schematic": "Empty Schematic", + "item.create.experience_nugget": "Nugget of Experience", "item.create.extendo_grip": "Extendo Grip", "item.create.filter": "Filter", "item.create.furnace_minecart_contraption": "Furnace Minecart Contraption", diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index f78a503f8..dc7f5a392 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1,12 +1,11 @@ { - "_": "Missing Localizations: 1232", + "_": "Missing Localizations: 1233", "_": "->------------------------] Game Elements [------------------------<-", "block.create.acacia_window": "Akazienholzfenster", "block.create.acacia_window_pane": "Akazienholzfensterscheibe", "block.create.adjustable_chain_gearshift": "Verstellbares Kettengetriebe", - "block.create.adjustable_crate": "Verstellbare Kiste", "block.create.analog_lever": "Analoger Schalter", "block.create.andesite_belt_funnel": "Riementrichter aus Andesit", "block.create.andesite_bricks": "Andesitziegel", @@ -529,7 +528,6 @@ "item.create.crafting_blueprint": "UNLOCALIZED: Crafting Blueprint", "item.create.creative_blaze_cake": "UNLOCALIZED: Creative Blaze Cake", "item.create.crushed_aluminum_ore": "Zerkleinertes Aluminiumerz", - "item.create.crushed_brass": "Zerkleinertes Messing", "item.create.crushed_copper_ore": "Zerkleinertes Kupfererz", "item.create.crushed_gold_ore": "Zerkleinertes Golderz", "item.create.crushed_iron_ore": "Zerkleinertes Eisenerz", @@ -548,6 +546,7 @@ "item.create.electron_tube": "Elektronenröhre", "item.create.empty_blaze_burner": "Leerer Lohenbrenner", "item.create.empty_schematic": "Leerer Bauplan", + "item.create.experience_nugget": "UNLOCALIZED: Nugget of Experience", "item.create.extendo_grip": "Extendo Griff", "item.create.filter": "Filter", "item.create.furnace_minecart_contraption": "Antriebsloren Vorrichtung", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_cl.json b/src/generated/resources/assets/create/lang/unfinished/es_cl.json index 22e1f99f0..f4c138f18 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_cl.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_cl.json @@ -1,12 +1,11 @@ { - "_": "Missing Localizations: 235", + "_": "Missing Localizations: 236", "_": "->------------------------] Game Elements [------------------------<-", "block.create.acacia_window": "Ventana de Acacia", "block.create.acacia_window_pane": "Panel de Ventana de Acacia", "block.create.adjustable_chain_gearshift": "Caja de Cambios en Cadena Ajustable", - "block.create.adjustable_crate": "Cajón Ajustable", "block.create.analog_lever": "Palanca Análoga", "block.create.andesite_belt_funnel": "Ingreso para Cintas de Andesita", "block.create.andesite_bricks": "Ladrillos de Andesita", @@ -529,7 +528,6 @@ "item.create.crafting_blueprint": "Plano de Fabricación", "item.create.creative_blaze_cake": "Pastel Blaze del Creativo", "item.create.crushed_aluminum_ore": "Mineral de Aluminio Triturado", - "item.create.crushed_brass": "Latón Triturado", "item.create.crushed_copper_ore": "Mineral de Cobre Triturado", "item.create.crushed_gold_ore": "Mineral de Oro Triturado", "item.create.crushed_iron_ore": "Mineral de Hierro Triturado", @@ -548,6 +546,7 @@ "item.create.electron_tube": "Tubo de Electrones", "item.create.empty_blaze_burner": "Quemador Blaze Vacío", "item.create.empty_schematic": "Esquema Vacío", + "item.create.experience_nugget": "UNLOCALIZED: Nugget of Experience", "item.create.extendo_grip": "Agarrextensor", "item.create.filter": "Filtro", "item.create.furnace_minecart_contraption": "Contrapción de Vagoneta con Horno", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_es.json b/src/generated/resources/assets/create/lang/unfinished/es_es.json index b06fb271f..6de89e102 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -1,12 +1,11 @@ { - "_": "Missing Localizations: 235", + "_": "Missing Localizations: 236", "_": "->------------------------] Game Elements [------------------------<-", "block.create.acacia_window": "Ventana de acacia", "block.create.acacia_window_pane": "Panel de ventana de acacia", "block.create.adjustable_chain_gearshift": "Cadena de transmisión ajustable", - "block.create.adjustable_crate": "Caja ajustable", "block.create.analog_lever": "Palanca analógica", "block.create.andesite_belt_funnel": "Embudo de cinta de andesita", "block.create.andesite_bricks": "Ladrillos de andesita", @@ -529,7 +528,6 @@ "item.create.crafting_blueprint": "Plano de elaboración", "item.create.creative_blaze_cake": "´Pastel de blaze creativo", "item.create.crushed_aluminum_ore": "Mineral de aluminio molido", - "item.create.crushed_brass": "Latón molido", "item.create.crushed_copper_ore": "Mineral de cobre molido", "item.create.crushed_gold_ore": "Mineral de oro molido", "item.create.crushed_iron_ore": "Mineral de hierro molido", @@ -548,6 +546,7 @@ "item.create.electron_tube": "Tubo de electrones", "item.create.empty_blaze_burner": "Quemador de blaze vacío", "item.create.empty_schematic": "Esquema vacío", + "item.create.experience_nugget": "UNLOCALIZED: Nugget of Experience", "item.create.extendo_grip": "Agarre extendido", "item.create.filter": "Filtro", "item.create.furnace_minecart_contraption": "Artilugio de vagoneta de horno", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index 481777f48..6d27d7e7d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,12 +1,11 @@ { - "_": "Missing Localizations: 1505", + "_": "Missing Localizations: 1506", "_": "->------------------------] Game Elements [------------------------<-", "block.create.acacia_window": "Fenêtre en acacia", "block.create.acacia_window_pane": "Vitre en acacia", "block.create.adjustable_chain_gearshift": "UNLOCALIZED: Adjustable Chain Gearshift", - "block.create.adjustable_crate": "Caisse ajustable", "block.create.analog_lever": "Levier analogique", "block.create.andesite_belt_funnel": "Entonnoir en andésite pour tapis roulant", "block.create.andesite_bricks": "Briques d'andésite", @@ -529,7 +528,6 @@ "item.create.crafting_blueprint": "UNLOCALIZED: Crafting Blueprint", "item.create.creative_blaze_cake": "UNLOCALIZED: Creative Blaze Cake", "item.create.crushed_aluminum_ore": "Aluminium concassé", - "item.create.crushed_brass": "Laiton concassé", "item.create.crushed_copper_ore": "Cuivre concassé", "item.create.crushed_gold_ore": "Or concassé", "item.create.crushed_iron_ore": "Fer concassé", @@ -548,6 +546,7 @@ "item.create.electron_tube": "Tube électronique", "item.create.empty_blaze_burner": "Brûleur à blaze vide", "item.create.empty_schematic": "Schéma vide", + "item.create.experience_nugget": "UNLOCALIZED: Nugget of Experience", "item.create.extendo_grip": "Extendo Grip", "item.create.filter": "Filtre", "item.create.furnace_minecart_contraption": "Engin de wagon avec fourneau", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index 16587b875..8bc346f54 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,12 +1,11 @@ { - "_": "Missing Localizations: 1175", + "_": "Missing Localizations: 1176", "_": "->------------------------] Game Elements [------------------------<-", "block.create.acacia_window": "Finestra di acacia", "block.create.acacia_window_pane": "Pannello di finestra di acacia", "block.create.adjustable_chain_gearshift": "Cambio a catena regolabile", - "block.create.adjustable_crate": "Baule regolabile", "block.create.analog_lever": "Leva analogica", "block.create.andesite_belt_funnel": "Imbuto per nastro di andesite", "block.create.andesite_bricks": "Mattoni di andesite", @@ -529,7 +528,6 @@ "item.create.crafting_blueprint": "UNLOCALIZED: Crafting Blueprint", "item.create.creative_blaze_cake": "UNLOCALIZED: Creative Blaze Cake", "item.create.crushed_aluminum_ore": "Alluminio grezzo frantumato", - "item.create.crushed_brass": "Ottone frantumato", "item.create.crushed_copper_ore": "Rame grezzo frantumato", "item.create.crushed_gold_ore": "Oro grezzo frantumato", "item.create.crushed_iron_ore": "Ferro grezzo frantumato", @@ -548,6 +546,7 @@ "item.create.electron_tube": "Valvola", "item.create.empty_blaze_burner": "Inceneritore di blaze vuoto", "item.create.empty_schematic": "Schematica vuota", + "item.create.experience_nugget": "UNLOCALIZED: Nugget of Experience", "item.create.extendo_grip": "Presa extendo", "item.create.filter": "Filtro", "item.create.furnace_minecart_contraption": "Contrazione per carrello da miniera con fornace", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index 6b5693a9f..9556ca785 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1,12 +1,11 @@ { - "_": "Missing Localizations: 235", + "_": "Missing Localizations: 236", "_": "->------------------------] Game Elements [------------------------<-", "block.create.acacia_window": "アカシアの窓", "block.create.acacia_window_pane": "アカシアの窓板", "block.create.adjustable_chain_gearshift": "可変チェーンギアシフト", - "block.create.adjustable_crate": "可変クレート", "block.create.analog_lever": "アナログレバー", "block.create.andesite_belt_funnel": "安山岩のベルトファンネル", "block.create.andesite_bricks": "安山岩レンガ", @@ -529,7 +528,6 @@ "item.create.crafting_blueprint": "クラフトブループリント", "item.create.creative_blaze_cake": "クリエイティブブレイズケーキ", "item.create.crushed_aluminum_ore": "砕いたアルミニウム鉱石", - "item.create.crushed_brass": "砕いた真鍮", "item.create.crushed_copper_ore": "砕いた銅鉱石", "item.create.crushed_gold_ore": "砕いた金鉱石", "item.create.crushed_iron_ore": "砕いた鉄鉱石", @@ -548,6 +546,7 @@ "item.create.electron_tube": "電子管", "item.create.empty_blaze_burner": "空のブレイズバーナー", "item.create.empty_schematic": "空の概略図", + "item.create.experience_nugget": "UNLOCALIZED: Nugget of Experience", "item.create.extendo_grip": "マジックハンド", "item.create.filter": "フィルター", "item.create.furnace_minecart_contraption": "からくりかまど付きトロッコ", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index 74455bcc8..c834e784f 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1,12 +1,11 @@ { - "_": "Missing Localizations: 235", + "_": "Missing Localizations: 236", "_": "->------------------------] Game Elements [------------------------<-", "block.create.acacia_window": "아카시아나무 유리창", "block.create.acacia_window_pane": "아카시아나무 유리판 ", "block.create.adjustable_chain_gearshift": "벨트 변속기", - "block.create.adjustable_crate": "가변 창고", "block.create.analog_lever": "아날로그 레버", "block.create.andesite_belt_funnel": "안산암 퍼널", "block.create.andesite_bricks": "안산암 벽돌", @@ -529,7 +528,6 @@ "item.create.crafting_blueprint": "조합 청사진", "item.create.creative_blaze_cake": "크리에이티브 블레이즈 케이크", "item.create.crushed_aluminum_ore": "분쇄된 알루미늄 광석", - "item.create.crushed_brass": "분쇄된 황동", "item.create.crushed_copper_ore": "분쇄된 구리 광석", "item.create.crushed_gold_ore": "분쇄된 금 광석", "item.create.crushed_iron_ore": "분쇄된 철 광석", @@ -548,6 +546,7 @@ "item.create.electron_tube": "전지 튜브", "item.create.empty_blaze_burner": "빈 블레이즈 버너", "item.create.empty_schematic": "빈 청사진", + "item.create.experience_nugget": "UNLOCALIZED: Nugget of Experience", "item.create.extendo_grip": "외장형 연장 팔", "item.create.filter": "필터 틀", "item.create.furnace_minecart_contraption": "화로가 실린 광산 수레 구조물", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index f6d0f9cb8..b9a89ab0e 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,12 +1,11 @@ { - "_": "Missing Localizations: 1863", + "_": "Missing Localizations: 1864", "_": "->------------------------] Game Elements [------------------------<-", "block.create.acacia_window": "UNLOCALIZED: Acacia Window", "block.create.acacia_window_pane": "UNLOCALIZED: Acacia Window Pane", "block.create.adjustable_chain_gearshift": "UNLOCALIZED: Adjustable Chain Gearshift", - "block.create.adjustable_crate": "FlexKrat", "block.create.analog_lever": "UNLOCALIZED: Analog Lever", "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", "block.create.andesite_bricks": "Andesietstenen", @@ -529,7 +528,6 @@ "item.create.crafting_blueprint": "UNLOCALIZED: Crafting Blueprint", "item.create.creative_blaze_cake": "UNLOCALIZED: Creative Blaze Cake", "item.create.crushed_aluminum_ore": "UNLOCALIZED: Crushed Aluminum Ore", - "item.create.crushed_brass": "Gemalen Brons", "item.create.crushed_copper_ore": "UNLOCALIZED: Crushed Copper Ore", "item.create.crushed_gold_ore": "UNLOCALIZED: Crushed Gold Ore", "item.create.crushed_iron_ore": "UNLOCALIZED: Crushed Iron Ore", @@ -548,6 +546,7 @@ "item.create.electron_tube": "UNLOCALIZED: Electron Tube", "item.create.empty_blaze_burner": "UNLOCALIZED: Empty Blaze Burner", "item.create.empty_schematic": "Lege bouwtekening", + "item.create.experience_nugget": "UNLOCALIZED: Nugget of Experience", "item.create.extendo_grip": "UNLOCALIZED: Extendo Grip", "item.create.filter": "Filter", "item.create.furnace_minecart_contraption": "UNLOCALIZED: Furnace Minecart Contraption", diff --git a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json index 613f6d75e..67e350e17 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -1,12 +1,11 @@ { - "_": "Missing Localizations: 274", + "_": "Missing Localizations: 275", "_": "->------------------------] Game Elements [------------------------<-", "block.create.acacia_window": "Akacjowe okno", "block.create.acacia_window_pane": "Akacjowa szyba okienna", "block.create.adjustable_chain_gearshift": "Regulowany przekładnik łańcuchowy", - "block.create.adjustable_crate": "Regulowana skrzynka", "block.create.analog_lever": "Dźwignia analogowa", "block.create.andesite_belt_funnel": "Andezytowy lejek taśmowy", "block.create.andesite_bricks": "Andezytowe cegły", @@ -529,7 +528,6 @@ "item.create.crafting_blueprint": "Szablon konstruowania", "item.create.creative_blaze_cake": "Kreatywne płomienne ciasto", "item.create.crushed_aluminum_ore": "Rozkruszona ruda żelaza", - "item.create.crushed_brass": "Rozkruszony mosiądz", "item.create.crushed_copper_ore": "Rozkruszona ruda miedzi", "item.create.crushed_gold_ore": "Rozkruszona ruda złota", "item.create.crushed_iron_ore": "Rozkruszona ruda żelaza", @@ -548,6 +546,7 @@ "item.create.electron_tube": "Lampa elektronowa", "item.create.empty_blaze_burner": "Pusty płomienny palnik", "item.create.empty_schematic": "Pusty schemat", + "item.create.experience_nugget": "UNLOCALIZED: Nugget of Experience", "item.create.extendo_grip": "Wydłużony Chwytak", "item.create.filter": "Filtr", "item.create.furnace_minecart_contraption": "Maszyna w wagoniku z piecem", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index abbc1e208..2e6fa9397 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1,12 +1,11 @@ { - "_": "Missing Localizations: 1598", + "_": "Missing Localizations: 1599", "_": "->------------------------] Game Elements [------------------------<-", "block.create.acacia_window": "UNLOCALIZED: Acacia Window", "block.create.acacia_window_pane": "UNLOCALIZED: Acacia Window Pane", "block.create.adjustable_chain_gearshift": "Correia Ajustável", - "block.create.adjustable_crate": "Caixa Ajustável", "block.create.analog_lever": "Alavanca Analógica", "block.create.andesite_belt_funnel": "Funil de Esteira de Andesito", "block.create.andesite_bricks": "Tijolos de Andesito", @@ -529,7 +528,6 @@ "item.create.crafting_blueprint": "Esquema de Fabricação", "item.create.creative_blaze_cake": "Bolo de Blaze Criativo", "item.create.crushed_aluminum_ore": "Minério de Alumínio Esmagado", - "item.create.crushed_brass": "Latão Esmagado", "item.create.crushed_copper_ore": "Minério de Cobre Esmagado", "item.create.crushed_gold_ore": "Minério de Ouro Esmagado", "item.create.crushed_iron_ore": "Minério de Ferro Esmagado", @@ -548,6 +546,7 @@ "item.create.electron_tube": "Tubo de Elétron", "item.create.empty_blaze_burner": "Queimador de Blaze Vazio", "item.create.empty_schematic": "Esquema vazio", + "item.create.experience_nugget": "UNLOCALIZED: Nugget of Experience", "item.create.extendo_grip": "Extensão de Pegador", "item.create.filter": "Filtro", "item.create.furnace_minecart_contraption": "Engenhoca de Carrinho de Mina com Fornalha", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index 5445cd36c..072472357 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1,12 +1,11 @@ { - "_": "Missing Localizations: 279", + "_": "Missing Localizations: 280", "_": "->------------------------] Game Elements [------------------------<-", "block.create.acacia_window": "Акациевое окно", "block.create.acacia_window_pane": "Панель из акациевого окна", "block.create.adjustable_chain_gearshift": "Регулируемый цепной механизм", - "block.create.adjustable_crate": "Регулируемый ящик", "block.create.analog_lever": "Аналоговый рычаг", "block.create.andesite_belt_funnel": "Андезитовая конвейерная воронка", "block.create.andesite_bricks": "Андезитовый кирпич", @@ -529,7 +528,6 @@ "item.create.crafting_blueprint": "Создание чертежа", "item.create.creative_blaze_cake": "UNLOCALIZED: Creative Blaze Cake", "item.create.crushed_aluminum_ore": "Дроблёная алюминиевая руда", - "item.create.crushed_brass": "Дроблёная латунь", "item.create.crushed_copper_ore": "Дроблёная медная руда", "item.create.crushed_gold_ore": "Дроблёная золотая руда", "item.create.crushed_iron_ore": "Дроблёная железная руда", @@ -548,6 +546,7 @@ "item.create.electron_tube": "Электронная лампа", "item.create.empty_blaze_burner": "Пустая горелка Всполоха", "item.create.empty_schematic": "Пустая схематика", + "item.create.experience_nugget": "UNLOCALIZED: Nugget of Experience", "item.create.extendo_grip": "Удлинённая рука", "item.create.filter": "Фильтр", "item.create.furnace_minecart_contraption": "Штуковина самоходной вагонетки", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index fce6cc8cc..c365b3638 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1,12 +1,11 @@ { - "_": "Missing Localizations: 235", + "_": "Missing Localizations: 236", "_": "->------------------------] Game Elements [------------------------<-", "block.create.acacia_window": "金合欢木窗户", "block.create.acacia_window_pane": "金合欢木窗户板", "block.create.adjustable_chain_gearshift": "可调节链式传动箱", - "block.create.adjustable_crate": "可调节板条箱", "block.create.analog_lever": "模拟拉杆", "block.create.andesite_belt_funnel": "安山岩传送带漏斗", "block.create.andesite_bricks": "安山岩砖", @@ -529,7 +528,6 @@ "item.create.crafting_blueprint": "合成蓝图", "item.create.creative_blaze_cake": "创造模式烈焰蛋糕", "item.create.crushed_aluminum_ore": "粉碎铝矿石", - "item.create.crushed_brass": "粉碎黄铜", "item.create.crushed_copper_ore": "粉碎铜矿石", "item.create.crushed_gold_ore": "粉碎金矿石", "item.create.crushed_iron_ore": "粉碎铁矿石", @@ -548,6 +546,7 @@ "item.create.electron_tube": "电子管", "item.create.empty_blaze_burner": "空的烈焰人燃烧室", "item.create.empty_schematic": "空白蓝图", + "item.create.experience_nugget": "UNLOCALIZED: Nugget of Experience", "item.create.extendo_grip": "伸缩机械手", "item.create.filter": "过滤器", "item.create.furnace_minecart_contraption": "装配过的动力矿车", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json index 39fd82e64..4ebf46c12 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -1,12 +1,11 @@ { - "_": "Missing Localizations: 293", + "_": "Missing Localizations: 294", "_": "->------------------------] Game Elements [------------------------<-", "block.create.acacia_window": "相思木窗戶", "block.create.acacia_window_pane": "相思木窗戶片", "block.create.adjustable_chain_gearshift": "可調式鏈式變速箱", - "block.create.adjustable_crate": "可調式板條箱", "block.create.analog_lever": "可調式拉桿", "block.create.andesite_belt_funnel": "安山岩輸送帶漏斗", "block.create.andesite_bricks": "安山岩磚", @@ -529,7 +528,6 @@ "item.create.crafting_blueprint": "合成藍圖", "item.create.creative_blaze_cake": "UNLOCALIZED: Creative Blaze Cake", "item.create.crushed_aluminum_ore": "碎狀鋁礦石", - "item.create.crushed_brass": "碎狀黃銅", "item.create.crushed_copper_ore": "碎狀銅礦石", "item.create.crushed_gold_ore": "碎狀金礦石", "item.create.crushed_iron_ore": "碎狀鐵礦石", @@ -548,6 +546,7 @@ "item.create.electron_tube": "真空管", "item.create.empty_blaze_burner": "空的烈焰使者動力爐", "item.create.empty_schematic": "空白藍圖", + "item.create.experience_nugget": "UNLOCALIZED: Nugget of Experience", "item.create.extendo_grip": "伸縮機械手", "item.create.filter": "過濾器", "item.create.furnace_minecart_contraption": "裝配過的機械礦車", diff --git a/src/generated/resources/assets/create/models/block/crate/brass/bottom.json b/src/generated/resources/assets/create/models/block/crate/brass/bottom.json deleted file mode 100644 index 8c93e8863..000000000 --- a/src/generated/resources/assets/create/models/block/crate/brass/bottom.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/bottom", - "textures": { - "crate": "create:block/crate_brass", - "side": "create:block/crate_brass_side", - "casing": "create:block/brass_casing" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crate/brass/left.json b/src/generated/resources/assets/create/models/block/crate/brass/left.json deleted file mode 100644 index bd7d013c7..000000000 --- a/src/generated/resources/assets/create/models/block/crate/brass/left.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/left", - "textures": { - "crate": "create:block/crate_brass", - "side": "create:block/crate_brass_side", - "casing": "create:block/brass_casing" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crate/brass/right.json b/src/generated/resources/assets/create/models/block/crate/brass/right.json deleted file mode 100644 index ab12b0aa2..000000000 --- a/src/generated/resources/assets/create/models/block/crate/brass/right.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/right", - "textures": { - "crate": "create:block/crate_brass", - "side": "create:block/crate_brass_side", - "casing": "create:block/brass_casing" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crate/brass/single.json b/src/generated/resources/assets/create/models/block/crate/brass/single.json deleted file mode 100644 index 6e294b01c..000000000 --- a/src/generated/resources/assets/create/models/block/crate/brass/single.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/single", - "textures": { - "crate": "create:block/crate_brass", - "side": "create:block/crate_brass_side", - "casing": "create:block/brass_casing" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crate/brass/top.json b/src/generated/resources/assets/create/models/block/crate/brass/top.json deleted file mode 100644 index 752b38aee..000000000 --- a/src/generated/resources/assets/create/models/block/crate/brass/top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/top", - "textures": { - "crate": "create:block/crate_brass", - "side": "create:block/crate_brass_side", - "casing": "create:block/brass_casing" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/adjustable_crate.json b/src/generated/resources/assets/create/models/item/adjustable_crate.json deleted file mode 100644 index 619cce82a..000000000 --- a/src/generated/resources/assets/create/models/item/adjustable_crate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/crate/brass/single" -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/crushed_brass.json b/src/generated/resources/assets/create/models/item/experience_nugget.json similarity index 57% rename from src/generated/resources/assets/create/models/item/crushed_brass.json rename to src/generated/resources/assets/create/models/item/experience_nugget.json index 3a3c18370..6e8307297 100644 --- a/src/generated/resources/assets/create/models/item/crushed_brass.json +++ b/src/generated/resources/assets/create/models/item/experience_nugget.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "create:item/crushed_brass" + "layer0": "create:item/experience_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/blasting/brass_ingot_from_crushed.json b/src/generated/resources/data/create/advancements/recipes/create.base/blasting/brass_ingot_from_crushed.json deleted file mode 100644 index 3fa839882..000000000 --- a/src/generated/resources/data/create/advancements/recipes/create.base/blasting/brass_ingot_from_crushed.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:blasting/brass_ingot_from_crushed" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "create:crushed_brass" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "create:blasting/brass_ingot_from_crushed" - } - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/portable_storage_interface.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/portable_storage_interface.json index 49b350511..7f26671aa 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/portable_storage_interface.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/portable_storage_interface.json @@ -12,7 +12,7 @@ "items": [ { "items": [ - "create:brass_casing" + "create:andesite_casing" ] } ] diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/adjustable_crate.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/adjustable_crate.json deleted file mode 100644 index 0439151fd..000000000 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/adjustable_crate.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:crafting/logistics/adjustable_crate" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "create:brass_casing" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "create:crafting/logistics/adjustable_crate" - } - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/smelting/brass_ingot_from_crushed.json b/src/generated/resources/data/create/advancements/recipes/create.base/smelting/brass_ingot_from_crushed.json deleted file mode 100644 index 1455e30e1..000000000 --- a/src/generated/resources/data/create/advancements/recipes/create.base/smelting/brass_ingot_from_crushed.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:smelting/brass_ingot_from_crushed" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "create:crushed_brass" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "create:smelting/brass_ingot_from_crushed" - } - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/root.json b/src/generated/resources/data/create/advancements/root.json index 87ea85f7c..7a4bdc3d1 100644 --- a/src/generated/resources/data/create/advancements/root.json +++ b/src/generated/resources/data/create/advancements/root.json @@ -13,7 +13,7 @@ "show_toast": false, "announce_to_chat": false, "hidden": false, - "background": "create:textures/block/palettes/gabbro/bricks.png" + "background": "create:textures/gui/advancements.png" }, "criteria": { "0": { diff --git a/src/generated/resources/data/create/loot_tables/blocks/adjustable_crate.json b/src/generated/resources/data/create/loot_tables/blocks/adjustable_crate.json deleted file mode 100644 index 48723dc10..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/adjustable_crate.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "create:adjustable_crate" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/blasting/brass_ingot_from_crushed.json b/src/generated/resources/data/create/recipes/blasting/brass_ingot_from_crushed.json deleted file mode 100644 index ce5f6049b..000000000 --- a/src/generated/resources/data/create/recipes/blasting/brass_ingot_from_crushed.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "item": "create:crushed_brass" - }, - "result": "create:brass_ingot", - "experience": 0.1, - "cookingtime": 100 -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/portable_fluid_interface.json b/src/generated/resources/data/create/recipes/crafting/kinetics/portable_fluid_interface.json index 61bf4785c..713545e37 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/portable_fluid_interface.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/portable_fluid_interface.json @@ -1,17 +1,13 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " B ", - " I " - ], - "key": { - "I": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "create:copper_casing" }, - "B": { - "item": "create:andesite_funnel" + { + "item": "create:chute" } - }, + ], "result": { "item": "create:portable_fluid_interface" } diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/portable_storage_interface.json b/src/generated/resources/data/create/recipes/crafting/kinetics/portable_storage_interface.json index ee961eefa..406d5716c 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/portable_storage_interface.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/portable_storage_interface.json @@ -1,17 +1,13 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " B ", - " I " - ], - "key": { - "I": { - "item": "create:brass_casing" + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "create:andesite_casing" }, - "B": { - "item": "create:andesite_funnel" + { + "item": "create:chute" } - }, + ], "result": { "item": "create:portable_storage_interface" } diff --git a/src/generated/resources/data/create/recipes/crafting/logistics/adjustable_crate.json b/src/generated/resources/data/create/recipes/crafting/logistics/adjustable_crate.json deleted file mode 100644 index 1556c9d1b..000000000 --- a/src/generated/resources/data/create/recipes/crafting/logistics/adjustable_crate.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "BBB", - "B B", - "BBB" - ], - "key": { - "B": { - "item": "create:brass_casing" - } - }, - "result": { - "item": "create:adjustable_crate", - "count": 4 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/aluminum_ore.json b/src/generated/resources/data/create/recipes/crushing/aluminum_ore.json deleted file mode 100644 index 7c6472470..000000000 --- a/src/generated/resources/data/create/recipes/crushing/aluminum_ore.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "create:crushing", - "ingredients": [ - { - "tag": "forge:ores/aluminum" - } - ], - "results": [ - { - "item": "create:crushed_aluminum_ore" - }, - { - "item": "create:crushed_aluminum_ore", - "count": 2, - "chance": 0.3 - }, - { - "item": "minecraft:cobblestone", - "chance": 0.125 - } - ], - "processingTime": 300, - "conditions": [ - { - "value": { - "tag": "forge:ores/aluminum", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/amethyst_cluster.json b/src/generated/resources/data/create/recipes/crushing/amethyst_cluster.json new file mode 100644 index 000000000..40bdb02be --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/amethyst_cluster.json @@ -0,0 +1,19 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:amethyst_cluster" + } + ], + "results": [ + { + "item": "minecraft:amethyst_shard", + "count": 7 + }, + { + "item": "minecraft:amethyst_shard", + "chance": 0.5 + } + ], + "processingTime": 150 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/asurine.json b/src/generated/resources/data/create/recipes/crushing/asurine.json new file mode 100644 index 000000000..1983f8853 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/asurine.json @@ -0,0 +1,19 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "create:asurine" + } + ], + "results": [ + { + "item": "create:crushed_zinc_ore", + "chance": 0.2 + }, + { + "item": "create:zinc_nugget", + "chance": 0.2 + } + ], + "processingTime": 250 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/brass_block.json b/src/generated/resources/data/create/recipes/crushing/brass_block.json deleted file mode 100644 index 4e32f34ea..000000000 --- a/src/generated/resources/data/create/recipes/crushing/brass_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "create:crushing", - "ingredients": [ - { - "tag": "forge:storage_blocks/brass" - } - ], - "results": [ - { - "item": "create:crushed_brass", - "count": 5 - } - ], - "processingTime": 400 -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/coal_ore.json b/src/generated/resources/data/create/recipes/crushing/coal_ore.json index f1e417ec4..87b773608 100644 --- a/src/generated/resources/data/create/recipes/crushing/coal_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/coal_ore.json @@ -7,18 +7,20 @@ ], "results": [ { - "item": "minecraft:coal", - "count": 2 + "item": "minecraft:coal" }, { "item": "minecraft:coal", - "count": 2, - "chance": 0.5 + "chance": 0.75 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 }, { "item": "minecraft:cobblestone", "chance": 0.125 } ], - "processingTime": 300 + "processingTime": 150 } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/copper_block.json b/src/generated/resources/data/create/recipes/crushing/copper_block.json deleted file mode 100644 index 5b7abcc76..000000000 --- a/src/generated/resources/data/create/recipes/crushing/copper_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "create:crushing", - "ingredients": [ - { - "item": "minecraft:copper_block" - } - ], - "results": [ - { - "item": "create:crushed_copper_ore", - "count": 5 - } - ], - "processingTime": 400 -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/copper_ore.json b/src/generated/resources/data/create/recipes/crushing/copper_ore.json index cc80390c1..a7b4f903f 100644 --- a/src/generated/resources/data/create/recipes/crushing/copper_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/copper_ore.json @@ -2,31 +2,26 @@ "type": "create:crushing", "ingredients": [ { - "tag": "forge:ores/copper" + "item": "minecraft:copper_ore" } ], "results": [ { - "item": "create:crushed_copper_ore" + "item": "create:crushed_copper_ore", + "count": 5 }, { "item": "create:crushed_copper_ore", - "count": 2, - "chance": 0.3 + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 }, { "item": "minecraft:cobblestone", "chance": 0.125 } ], - "processingTime": 350, - "conditions": [ - { - "value": { - "tag": "forge:ores/copper", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] + "processingTime": 250 } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/crimsite.json b/src/generated/resources/data/create/recipes/crushing/crimsite.json new file mode 100644 index 000000000..b169924dd --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/crimsite.json @@ -0,0 +1,19 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "create:crimsite" + } + ], + "results": [ + { + "item": "create:crushed_iron_ore", + "chance": 0.2 + }, + { + "item": "minecraft:iron_nugget", + "chance": 0.2 + } + ], + "processingTime": 250 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/deepslate_coal_ore.json b/src/generated/resources/data/create/recipes/crushing/deepslate_coal_ore.json new file mode 100644 index 000000000..1a7b72c05 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/deepslate_coal_ore.json @@ -0,0 +1,26 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:deepslate_coal_ore" + } + ], + "results": [ + { + "item": "minecraft:coal" + }, + { + "item": "minecraft:coal", + "chance": 0.75 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:cobbled_deepslate", + "chance": 0.125 + } + ], + "processingTime": 250 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/deepslate_copper_ore.json b/src/generated/resources/data/create/recipes/crushing/deepslate_copper_ore.json new file mode 100644 index 000000000..683025dbf --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/deepslate_copper_ore.json @@ -0,0 +1,27 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:deepslate_copper_ore" + } + ], + "results": [ + { + "item": "create:crushed_copper_ore", + "count": 7 + }, + { + "item": "create:crushed_copper_ore", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:cobbled_deepslate", + "chance": 0.125 + } + ], + "processingTime": 350 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/deepslate_diamond_ore.json b/src/generated/resources/data/create/recipes/crushing/deepslate_diamond_ore.json new file mode 100644 index 000000000..56841ebee --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/deepslate_diamond_ore.json @@ -0,0 +1,27 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:deepslate_diamond_ore" + } + ], + "results": [ + { + "item": "minecraft:diamond", + "count": 2 + }, + { + "item": "minecraft:diamond", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:cobbled_deepslate", + "chance": 0.125 + } + ], + "processingTime": 450 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/deepslate_emerald_ore.json b/src/generated/resources/data/create/recipes/crushing/deepslate_emerald_ore.json new file mode 100644 index 000000000..d3d49fbc9 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/deepslate_emerald_ore.json @@ -0,0 +1,27 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:deepslate_emerald_ore" + } + ], + "results": [ + { + "item": "minecraft:emerald", + "count": 2 + }, + { + "item": "minecraft:emerald", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:cobblestone", + "chance": 0.125 + } + ], + "processingTime": 450 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/deepslate_gold_ore.json b/src/generated/resources/data/create/recipes/crushing/deepslate_gold_ore.json new file mode 100644 index 000000000..40b2f1b52 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/deepslate_gold_ore.json @@ -0,0 +1,27 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:deepslate_gold_ore" + } + ], + "results": [ + { + "item": "create:crushed_gold_ore", + "count": 2 + }, + { + "item": "create:crushed_gold_ore", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:cobbled_deepslate", + "chance": 0.125 + } + ], + "processingTime": 350 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/deepslate_iron_ore.json b/src/generated/resources/data/create/recipes/crushing/deepslate_iron_ore.json new file mode 100644 index 000000000..ed9bbc058 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/deepslate_iron_ore.json @@ -0,0 +1,27 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:deepslate_iron_ore" + } + ], + "results": [ + { + "item": "create:crushed_iron_ore", + "count": 2 + }, + { + "item": "create:crushed_iron_ore", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:cobbled_deepslate", + "chance": 0.125 + } + ], + "processingTime": 350 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/deepslate_lapis_ore.json b/src/generated/resources/data/create/recipes/crushing/deepslate_lapis_ore.json new file mode 100644 index 000000000..74b28710f --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/deepslate_lapis_ore.json @@ -0,0 +1,27 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:deepslate_lapis_ore" + } + ], + "results": [ + { + "item": "minecraft:lapis_lazuli", + "count": 12 + }, + { + "item": "minecraft:lapis_lazuli", + "chance": 0.5 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:cobbled_deepslate", + "chance": 0.125 + } + ], + "processingTime": 350 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/deepslate_redstone_ore.json b/src/generated/resources/data/create/recipes/crushing/deepslate_redstone_ore.json new file mode 100644 index 000000000..6bfabb3c5 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/deepslate_redstone_ore.json @@ -0,0 +1,27 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:deepslate_redstone_ore" + } + ], + "results": [ + { + "item": "minecraft:redstone", + "count": 7 + }, + { + "item": "minecraft:redstone", + "chance": 0.5 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:cobbled_deepslate", + "chance": 0.125 + } + ], + "processingTime": 350 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/deepslate_zinc_ore.json b/src/generated/resources/data/create/recipes/crushing/deepslate_zinc_ore.json new file mode 100644 index 000000000..cddbf59d7 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/deepslate_zinc_ore.json @@ -0,0 +1,27 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "create:deepslate_zinc_ore" + } + ], + "results": [ + { + "item": "create:crushed_zinc_ore", + "count": 2 + }, + { + "item": "create:crushed_zinc_ore", + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:cobbled_deepslate", + "chance": 0.125 + } + ], + "processingTime": 350 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/diamond_ore.json b/src/generated/resources/data/create/recipes/crushing/diamond_ore.json index f16220528..88ab1eab4 100644 --- a/src/generated/resources/data/create/recipes/crushing/diamond_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/diamond_ore.json @@ -7,17 +7,20 @@ ], "results": [ { - "item": "minecraft:diamond", - "count": 2 + "item": "minecraft:diamond" }, { "item": "minecraft:diamond", - "chance": 0.25 + "chance": 0.75 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 }, { "item": "minecraft:cobblestone", "chance": 0.125 } ], - "processingTime": 500 + "processingTime": 350 } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/diorite.json b/src/generated/resources/data/create/recipes/crushing/diorite.json new file mode 100644 index 000000000..d24a98f38 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/diorite.json @@ -0,0 +1,15 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:diorite" + } + ], + "results": [ + { + "item": "minecraft:quartz", + "chance": 0.25 + } + ], + "processingTime": 350 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/emerald_ore.json b/src/generated/resources/data/create/recipes/crushing/emerald_ore.json index b48aedf88..6bc11e23c 100644 --- a/src/generated/resources/data/create/recipes/crushing/emerald_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/emerald_ore.json @@ -7,17 +7,20 @@ ], "results": [ { - "item": "minecraft:emerald", - "count": 2 + "item": "minecraft:emerald" }, { "item": "minecraft:emerald", - "chance": 0.25 + "chance": 0.75 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 }, { "item": "minecraft:cobblestone", "chance": 0.125 } ], - "processingTime": 500 + "processingTime": 350 } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/gold_ore.json b/src/generated/resources/data/create/recipes/crushing/gold_ore.json index 8545c7d32..1208634d8 100644 --- a/src/generated/resources/data/create/recipes/crushing/gold_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/gold_ore.json @@ -2,7 +2,7 @@ "type": "create:crushing", "ingredients": [ { - "tag": "forge:ores/gold" + "item": "minecraft:gold_ore" } ], "results": [ @@ -11,22 +11,16 @@ }, { "item": "create:crushed_gold_ore", - "count": 2, - "chance": 0.3 + "chance": 0.75 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 }, { "item": "minecraft:cobblestone", "chance": 0.125 } ], - "processingTime": 300, - "conditions": [ - { - "value": { - "tag": "forge:ores/gold", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] + "processingTime": 250 } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/iron_ore.json b/src/generated/resources/data/create/recipes/crushing/iron_ore.json index d67f352ee..658ffe0bf 100644 --- a/src/generated/resources/data/create/recipes/crushing/iron_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/iron_ore.json @@ -2,7 +2,7 @@ "type": "create:crushing", "ingredients": [ { - "tag": "forge:ores/iron" + "item": "minecraft:iron_ore" } ], "results": [ @@ -11,22 +11,16 @@ }, { "item": "create:crushed_iron_ore", - "count": 2, - "chance": 0.3 + "chance": 0.75 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 }, { "item": "minecraft:cobblestone", "chance": 0.125 } ], - "processingTime": 400, - "conditions": [ - { - "value": { - "tag": "forge:ores/iron", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] + "processingTime": 250 } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/lapis_ore.json b/src/generated/resources/data/create/recipes/crushing/lapis_ore.json index a5aba4741..f9f8f8e48 100644 --- a/src/generated/resources/data/create/recipes/crushing/lapis_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/lapis_ore.json @@ -8,17 +8,20 @@ "results": [ { "item": "minecraft:lapis_lazuli", - "count": 12 + "count": 10 }, { "item": "minecraft:lapis_lazuli", - "count": 8, - "chance": 0.25 + "chance": 0.5 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 }, { "item": "minecraft:cobblestone", "chance": 0.125 } ], - "processingTime": 300 + "processingTime": 250 } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/lead_ore.json b/src/generated/resources/data/create/recipes/crushing/lead_ore.json deleted file mode 100644 index adbefb9f7..000000000 --- a/src/generated/resources/data/create/recipes/crushing/lead_ore.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "create:crushing", - "ingredients": [ - { - "tag": "forge:ores/lead" - } - ], - "results": [ - { - "item": "create:crushed_lead_ore" - }, - { - "item": "create:crushed_lead_ore", - "count": 2, - "chance": 0.3 - }, - { - "item": "minecraft:cobblestone", - "chance": 0.125 - } - ], - "processingTime": 400, - "conditions": [ - { - "value": { - "tag": "forge:ores/lead", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/nether_gold_ore.json b/src/generated/resources/data/create/recipes/crushing/nether_gold_ore.json new file mode 100644 index 000000000..da323cc75 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/nether_gold_ore.json @@ -0,0 +1,27 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:nether_gold_ore" + } + ], + "results": [ + { + "item": "minecraft:gold_nugget", + "count": 7 + }, + { + "item": "minecraft:gold_nugget", + "chance": 0.5 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:netherrack", + "chance": 0.125 + } + ], + "processingTime": 350 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/nether_quartz_ore.json b/src/generated/resources/data/create/recipes/crushing/nether_quartz_ore.json index eb6ea8b3f..7ffe88ba7 100644 --- a/src/generated/resources/data/create/recipes/crushing/nether_quartz_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/nether_quartz_ore.json @@ -12,8 +12,11 @@ }, { "item": "minecraft:quartz", - "count": 4, - "chance": 0.5 + "chance": 0.25 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 }, { "item": "minecraft:netherrack", diff --git a/src/generated/resources/data/create/recipes/crushing/nickel_ore.json b/src/generated/resources/data/create/recipes/crushing/nickel_ore.json deleted file mode 100644 index 22a5579ee..000000000 --- a/src/generated/resources/data/create/recipes/crushing/nickel_ore.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "create:crushing", - "ingredients": [ - { - "tag": "forge:ores/nickel" - } - ], - "results": [ - { - "item": "create:crushed_nickel_ore" - }, - { - "item": "create:crushed_nickel_ore", - "count": 2, - "chance": 0.3 - }, - { - "item": "minecraft:cobblestone", - "chance": 0.125 - } - ], - "processingTime": 350, - "conditions": [ - { - "value": { - "tag": "forge:ores/nickel", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/ochrum.json b/src/generated/resources/data/create/recipes/crushing/ochrum.json new file mode 100644 index 000000000..7e75eea39 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/ochrum.json @@ -0,0 +1,19 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "create:ochrum" + } + ], + "results": [ + { + "item": "create:crushed_gold_ore", + "chance": 0.1 + }, + { + "item": "minecraft:gold_nugget", + "chance": 0.1 + } + ], + "processingTime": 250 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/osmium_ore.json b/src/generated/resources/data/create/recipes/crushing/osmium_ore.json deleted file mode 100644 index 2620b7fd3..000000000 --- a/src/generated/resources/data/create/recipes/crushing/osmium_ore.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "create:crushing", - "ingredients": [ - { - "tag": "forge:ores/osmium" - } - ], - "results": [ - { - "item": "create:crushed_osmium_ore" - }, - { - "item": "create:crushed_osmium_ore", - "count": 2, - "chance": 0.3 - }, - { - "item": "minecraft:cobblestone", - "chance": 0.125 - } - ], - "processingTime": 400, - "conditions": [ - { - "value": { - "tag": "forge:ores/osmium", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/platinum_ore.json b/src/generated/resources/data/create/recipes/crushing/platinum_ore.json deleted file mode 100644 index edaa78261..000000000 --- a/src/generated/resources/data/create/recipes/crushing/platinum_ore.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "create:crushing", - "ingredients": [ - { - "tag": "forge:ores/platinum" - } - ], - "results": [ - { - "item": "create:crushed_platinum_ore" - }, - { - "item": "create:crushed_platinum_ore", - "count": 2, - "chance": 0.3 - }, - { - "item": "minecraft:cobblestone", - "chance": 0.125 - } - ], - "processingTime": 300, - "conditions": [ - { - "value": { - "tag": "forge:ores/platinum", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/quicksilver_ore.json b/src/generated/resources/data/create/recipes/crushing/quicksilver_ore.json deleted file mode 100644 index 05484d91e..000000000 --- a/src/generated/resources/data/create/recipes/crushing/quicksilver_ore.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "create:crushing", - "ingredients": [ - { - "tag": "forge:ores/quicksilver" - } - ], - "results": [ - { - "item": "create:crushed_quicksilver_ore" - }, - { - "item": "create:crushed_quicksilver_ore", - "count": 2, - "chance": 0.3 - }, - { - "item": "minecraft:cobblestone", - "chance": 0.125 - } - ], - "processingTime": 300, - "conditions": [ - { - "value": { - "tag": "forge:ores/quicksilver", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/raw_copper.json b/src/generated/resources/data/create/recipes/crushing/raw_copper.json new file mode 100644 index 000000000..81e99ec47 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/raw_copper.json @@ -0,0 +1,18 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:raw_copper" + } + ], + "results": [ + { + "item": "create:crushed_copper_ore" + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + } + ], + "processingTime": 400 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/raw_gold.json b/src/generated/resources/data/create/recipes/crushing/raw_gold.json new file mode 100644 index 000000000..caf7b3f35 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/raw_gold.json @@ -0,0 +1,18 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:raw_gold" + } + ], + "results": [ + { + "item": "create:crushed_gold_ore" + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + } + ], + "processingTime": 400 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/raw_iron.json b/src/generated/resources/data/create/recipes/crushing/raw_iron.json new file mode 100644 index 000000000..cd044b642 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/raw_iron.json @@ -0,0 +1,18 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:raw_iron" + } + ], + "results": [ + { + "item": "create:crushed_iron_ore" + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + } + ], + "processingTime": 400 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/raw_zinc.json b/src/generated/resources/data/create/recipes/crushing/raw_zinc.json new file mode 100644 index 000000000..59f163c23 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/raw_zinc.json @@ -0,0 +1,18 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "create:raw_zinc" + } + ], + "results": [ + { + "item": "create:crushed_zinc_ore" + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + } + ], + "processingTime": 400 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/redstone_ore.json b/src/generated/resources/data/create/recipes/crushing/redstone_ore.json index 55c3bccab..90074aeba 100644 --- a/src/generated/resources/data/create/recipes/crushing/redstone_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/redstone_ore.json @@ -8,17 +8,20 @@ "results": [ { "item": "minecraft:redstone", - "count": 8 + "count": 6 }, { "item": "minecraft:redstone", - "count": 6, - "chance": 0.25 + "chance": 0.5 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 }, { "item": "minecraft:cobblestone", "chance": 0.125 } ], - "processingTime": 300 + "processingTime": 250 } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/silver_ore.json b/src/generated/resources/data/create/recipes/crushing/silver_ore.json deleted file mode 100644 index 5358eba8d..000000000 --- a/src/generated/resources/data/create/recipes/crushing/silver_ore.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "create:crushing", - "ingredients": [ - { - "tag": "forge:ores/silver" - } - ], - "results": [ - { - "item": "create:crushed_silver_ore" - }, - { - "item": "create:crushed_silver_ore", - "count": 2, - "chance": 0.3 - }, - { - "item": "minecraft:cobblestone", - "chance": 0.125 - } - ], - "processingTime": 300, - "conditions": [ - { - "value": { - "tag": "forge:ores/silver", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/tin_ore.json b/src/generated/resources/data/create/recipes/crushing/tin_ore.json deleted file mode 100644 index 59bae1b52..000000000 --- a/src/generated/resources/data/create/recipes/crushing/tin_ore.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "create:crushing", - "ingredients": [ - { - "tag": "forge:ores/tin" - } - ], - "results": [ - { - "item": "create:crushed_tin_ore" - }, - { - "item": "create:crushed_tin_ore", - "count": 2, - "chance": 0.3 - }, - { - "item": "minecraft:cobblestone", - "chance": 0.125 - } - ], - "processingTime": 350, - "conditions": [ - { - "value": { - "tag": "forge:ores/tin", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/tuff.json b/src/generated/resources/data/create/recipes/crushing/tuff.json new file mode 100644 index 000000000..f10aed06b --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/tuff.json @@ -0,0 +1,31 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:tuff" + } + ], + "results": [ + { + "item": "minecraft:flint", + "chance": 0.25 + }, + { + "item": "minecraft:gold_nugget", + "chance": 0.1 + }, + { + "item": "create:copper_nugget", + "chance": 0.1 + }, + { + "item": "create:zinc_nugget", + "chance": 0.1 + }, + { + "item": "minecraft:iron_nugget", + "chance": 0.1 + } + ], + "processingTime": 350 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/uranium_ore.json b/src/generated/resources/data/create/recipes/crushing/uranium_ore.json deleted file mode 100644 index a00f7f03e..000000000 --- a/src/generated/resources/data/create/recipes/crushing/uranium_ore.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "create:crushing", - "ingredients": [ - { - "tag": "forge:ores/uranium" - } - ], - "results": [ - { - "item": "create:crushed_uranium_ore" - }, - { - "item": "create:crushed_uranium_ore", - "count": 2, - "chance": 0.3 - }, - { - "item": "minecraft:cobblestone", - "chance": 0.125 - } - ], - "processingTime": 400, - "conditions": [ - { - "value": { - "tag": "forge:ores/uranium", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/veridium.json b/src/generated/resources/data/create/recipes/crushing/veridium.json new file mode 100644 index 000000000..2be35e2d6 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/veridium.json @@ -0,0 +1,19 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "create:veridium" + } + ], + "results": [ + { + "item": "create:crushed_copper_ore", + "chance": 0.4 + }, + { + "item": "create:copper_nugget", + "chance": 0.4 + } + ], + "processingTime": 250 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/zinc_block.json b/src/generated/resources/data/create/recipes/crushing/zinc_block.json deleted file mode 100644 index b8122dc32..000000000 --- a/src/generated/resources/data/create/recipes/crushing/zinc_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "create:crushing", - "ingredients": [ - { - "tag": "forge:storage_blocks/zinc" - } - ], - "results": [ - { - "item": "create:crushed_zinc_ore", - "count": 5 - } - ], - "processingTime": 400 -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/zinc_ore.json b/src/generated/resources/data/create/recipes/crushing/zinc_ore.json index 751c69559..6034fe124 100644 --- a/src/generated/resources/data/create/recipes/crushing/zinc_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/zinc_ore.json @@ -2,7 +2,7 @@ "type": "create:crushing", "ingredients": [ { - "tag": "forge:ores/zinc" + "item": "create:zinc_ore" } ], "results": [ @@ -11,22 +11,16 @@ }, { "item": "create:crushed_zinc_ore", - "count": 2, - "chance": 0.3 + "chance": 0.75 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 }, { "item": "minecraft:cobblestone", "chance": 0.125 } ], - "processingTime": 350, - "conditions": [ - { - "value": { - "tag": "forge:ores/zinc", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] + "processingTime": 250 } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/aluminum_ore.json b/src/generated/resources/data/create/recipes/milling/aluminum_ore.json deleted file mode 100644 index a0e94e54b..000000000 --- a/src/generated/resources/data/create/recipes/milling/aluminum_ore.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "create:milling", - "ingredients": [ - { - "tag": "forge:ores/aluminum" - } - ], - "results": [ - { - "item": "create:crushed_aluminum_ore" - } - ], - "processingTime": 300, - "conditions": [ - { - "value": { - "tag": "forge:ores/aluminum", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/calcite.json b/src/generated/resources/data/create/recipes/milling/calcite.json new file mode 100644 index 000000000..2ae9f393b --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/calcite.json @@ -0,0 +1,15 @@ +{ + "type": "create:milling", + "ingredients": [ + { + "item": "minecraft:calcite" + } + ], + "results": [ + { + "item": "minecraft:bone_meal", + "chance": 0.125 + } + ], + "processingTime": 250 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/copper_ore.json b/src/generated/resources/data/create/recipes/milling/copper_ore.json deleted file mode 100644 index e8a1ffc78..000000000 --- a/src/generated/resources/data/create/recipes/milling/copper_ore.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "create:milling", - "ingredients": [ - { - "tag": "forge:ores/copper" - } - ], - "results": [ - { - "item": "create:crushed_copper_ore" - } - ], - "processingTime": 350, - "conditions": [ - { - "value": { - "tag": "forge:ores/copper", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/dripstone_block.json b/src/generated/resources/data/create/recipes/milling/dripstone_block.json new file mode 100644 index 000000000..5d2930bfd --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/dripstone_block.json @@ -0,0 +1,14 @@ +{ + "type": "create:milling", + "ingredients": [ + { + "item": "minecraft:dripstone_block" + } + ], + "results": [ + { + "item": "minecraft:clay_ball" + } + ], + "processingTime": 250 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/gold_ore.json b/src/generated/resources/data/create/recipes/milling/gold_ore.json deleted file mode 100644 index c80b0d4fd..000000000 --- a/src/generated/resources/data/create/recipes/milling/gold_ore.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "create:milling", - "ingredients": [ - { - "tag": "forge:ores/gold" - } - ], - "results": [ - { - "item": "create:crushed_gold_ore" - } - ], - "processingTime": 300, - "conditions": [ - { - "value": { - "tag": "forge:ores/gold", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/iron_ore.json b/src/generated/resources/data/create/recipes/milling/iron_ore.json deleted file mode 100644 index ddbe1a20d..000000000 --- a/src/generated/resources/data/create/recipes/milling/iron_ore.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "create:milling", - "ingredients": [ - { - "tag": "forge:ores/iron" - } - ], - "results": [ - { - "item": "create:crushed_iron_ore" - } - ], - "processingTime": 400, - "conditions": [ - { - "value": { - "tag": "forge:ores/iron", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/lead_ore.json b/src/generated/resources/data/create/recipes/milling/lead_ore.json deleted file mode 100644 index 7daad6dfa..000000000 --- a/src/generated/resources/data/create/recipes/milling/lead_ore.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "create:milling", - "ingredients": [ - { - "tag": "forge:ores/lead" - } - ], - "results": [ - { - "item": "create:crushed_lead_ore" - } - ], - "processingTime": 400, - "conditions": [ - { - "value": { - "tag": "forge:ores/lead", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/nickel_ore.json b/src/generated/resources/data/create/recipes/milling/nickel_ore.json deleted file mode 100644 index 3e113bbe3..000000000 --- a/src/generated/resources/data/create/recipes/milling/nickel_ore.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "create:milling", - "ingredients": [ - { - "tag": "forge:ores/nickel" - } - ], - "results": [ - { - "item": "create:crushed_nickel_ore" - } - ], - "processingTime": 350, - "conditions": [ - { - "value": { - "tag": "forge:ores/nickel", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/osmium_ore.json b/src/generated/resources/data/create/recipes/milling/osmium_ore.json deleted file mode 100644 index b6969f922..000000000 --- a/src/generated/resources/data/create/recipes/milling/osmium_ore.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "create:milling", - "ingredients": [ - { - "tag": "forge:ores/osmium" - } - ], - "results": [ - { - "item": "create:crushed_osmium_ore" - } - ], - "processingTime": 400, - "conditions": [ - { - "value": { - "tag": "forge:ores/osmium", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/platinum_ore.json b/src/generated/resources/data/create/recipes/milling/platinum_ore.json deleted file mode 100644 index 9f71f1a4c..000000000 --- a/src/generated/resources/data/create/recipes/milling/platinum_ore.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "create:milling", - "ingredients": [ - { - "tag": "forge:ores/platinum" - } - ], - "results": [ - { - "item": "create:crushed_platinum_ore" - } - ], - "processingTime": 300, - "conditions": [ - { - "value": { - "tag": "forge:ores/platinum", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/quicksilver_ore.json b/src/generated/resources/data/create/recipes/milling/quicksilver_ore.json deleted file mode 100644 index 14e920f10..000000000 --- a/src/generated/resources/data/create/recipes/milling/quicksilver_ore.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "create:milling", - "ingredients": [ - { - "tag": "forge:ores/quicksilver" - } - ], - "results": [ - { - "item": "create:crushed_quicksilver_ore" - } - ], - "processingTime": 300, - "conditions": [ - { - "value": { - "tag": "forge:ores/quicksilver", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/silver_ore.json b/src/generated/resources/data/create/recipes/milling/silver_ore.json deleted file mode 100644 index 57c73480f..000000000 --- a/src/generated/resources/data/create/recipes/milling/silver_ore.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "create:milling", - "ingredients": [ - { - "tag": "forge:ores/silver" - } - ], - "results": [ - { - "item": "create:crushed_silver_ore" - } - ], - "processingTime": 300, - "conditions": [ - { - "value": { - "tag": "forge:ores/silver", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/tin_ore.json b/src/generated/resources/data/create/recipes/milling/tin_ore.json deleted file mode 100644 index 1c2178db4..000000000 --- a/src/generated/resources/data/create/recipes/milling/tin_ore.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "create:milling", - "ingredients": [ - { - "tag": "forge:ores/tin" - } - ], - "results": [ - { - "item": "create:crushed_tin_ore" - } - ], - "processingTime": 350, - "conditions": [ - { - "value": { - "tag": "forge:ores/tin", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/uranium_ore.json b/src/generated/resources/data/create/recipes/milling/uranium_ore.json deleted file mode 100644 index 38da4894d..000000000 --- a/src/generated/resources/data/create/recipes/milling/uranium_ore.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "create:milling", - "ingredients": [ - { - "tag": "forge:ores/uranium" - } - ], - "results": [ - { - "item": "create:crushed_uranium_ore" - } - ], - "processingTime": 400, - "conditions": [ - { - "value": { - "tag": "forge:ores/uranium", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/zinc_ore.json b/src/generated/resources/data/create/recipes/milling/zinc_ore.json deleted file mode 100644 index f2ff77f97..000000000 --- a/src/generated/resources/data/create/recipes/milling/zinc_ore.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "create:milling", - "ingredients": [ - { - "tag": "forge:ores/zinc" - } - ], - "results": [ - { - "item": "create:crushed_zinc_ore" - } - ], - "processingTime": 350, - "conditions": [ - { - "value": { - "tag": "forge:ores/zinc", - "type": "forge:tag_empty" - }, - "type": "forge:not" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/mixing/chromatic_compound.json b/src/generated/resources/data/create/recipes/mixing/chromatic_compound.json deleted file mode 100644 index ad36ad7cf..000000000 --- a/src/generated/resources/data/create/recipes/mixing/chromatic_compound.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "create:mixing", - "ingredients": [ - { - "tag": "forge:dusts/glowstone" - }, - { - "tag": "forge:dusts/glowstone" - }, - { - "tag": "forge:dusts/glowstone" - }, - { - "item": "create:powdered_obsidian" - }, - { - "item": "create:powdered_obsidian" - }, - { - "item": "create:powdered_obsidian" - }, - { - "item": "create:polished_rose_quartz" - } - ], - "results": [ - { - "item": "create:chromatic_compound" - } - ], - "heatRequirement": "superheated" -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/mixing/crushed_brass.json b/src/generated/resources/data/create/recipes/mixing/crushed_brass.json deleted file mode 100644 index 7c1e34832..000000000 --- a/src/generated/resources/data/create/recipes/mixing/crushed_brass.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "create:mixing", - "ingredients": [ - { - "item": "create:crushed_copper_ore" - }, - { - "item": "create:crushed_zinc_ore" - } - ], - "results": [ - { - "item": "create:crushed_brass", - "count": 2 - } - ], - "heatRequirement": "heated" -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/smelting/brass_ingot_from_crushed.json b/src/generated/resources/data/create/recipes/smelting/brass_ingot_from_crushed.json deleted file mode 100644 index 900b9346a..000000000 --- a/src/generated/resources/data/create/recipes/smelting/brass_ingot_from_crushed.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "create:crushed_brass" - }, - "result": "create:brass_ingot", - "experience": 0.1, - "cookingtime": 200 -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/crushed_brass.json b/src/generated/resources/data/create/recipes/splashing/crushed_brass.json deleted file mode 100644 index 3f24c6c85..000000000 --- a/src/generated/resources/data/create/recipes/splashing/crushed_brass.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "create:splashing", - "ingredients": [ - { - "item": "create:crushed_brass" - } - ], - "results": [ - { - "item": "create:brass_nugget", - "count": 10 - }, - { - "item": "create:brass_nugget", - "count": 5, - "chance": 0.5 - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/crushed_copper_ore.json b/src/generated/resources/data/create/recipes/splashing/crushed_copper_ore.json index 070f8ea77..18ab1116c 100644 --- a/src/generated/resources/data/create/recipes/splashing/crushed_copper_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/crushed_copper_ore.json @@ -8,11 +8,10 @@ "results": [ { "item": "create:copper_nugget", - "count": 10 + "count": 9 }, { - "item": "create:copper_nugget", - "count": 5, + "item": "minecraft:clay_ball", "chance": 0.5 } ] diff --git a/src/generated/resources/data/create/recipes/splashing/crushed_gold_ore.json b/src/generated/resources/data/create/recipes/splashing/crushed_gold_ore.json index d2791a774..19bef6491 100644 --- a/src/generated/resources/data/create/recipes/splashing/crushed_gold_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/crushed_gold_ore.json @@ -8,11 +8,10 @@ "results": [ { "item": "minecraft:gold_nugget", - "count": 10 + "count": 9 }, { - "item": "minecraft:gold_nugget", - "count": 5, + "item": "minecraft:quartz", "chance": 0.5 } ] diff --git a/src/generated/resources/data/create/recipes/splashing/crushed_iron_ore.json b/src/generated/resources/data/create/recipes/splashing/crushed_iron_ore.json index 7a9e70631..1a053a93c 100644 --- a/src/generated/resources/data/create/recipes/splashing/crushed_iron_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/crushed_iron_ore.json @@ -8,12 +8,11 @@ "results": [ { "item": "minecraft:iron_nugget", - "count": 10 + "count": 9 }, { - "item": "minecraft:iron_nugget", - "count": 5, - "chance": 0.5 + "item": "minecraft:redstone", + "chance": 0.125 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/crushed_zinc_ore.json b/src/generated/resources/data/create/recipes/splashing/crushed_zinc_ore.json index 5796f6834..b147f25fd 100644 --- a/src/generated/resources/data/create/recipes/splashing/crushed_zinc_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/crushed_zinc_ore.json @@ -8,12 +8,11 @@ "results": [ { "item": "create:zinc_nugget", - "count": 10 + "count": 9 }, { - "item": "create:zinc_nugget", - "count": 5, - "chance": 0.5 + "item": "minecraft:gunpowder", + "chance": 0.25 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/eidolon/crushed_lead_ore.json b/src/generated/resources/data/create/recipes/splashing/eidolon/crushed_lead_ore.json index 9d5fdee5d..b92da1d90 100644 --- a/src/generated/resources/data/create/recipes/splashing/eidolon/crushed_lead_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/eidolon/crushed_lead_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "eidolon:lead_nugget", - "count": 10 - }, - { - "item": "eidolon:lead_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/iceandfire/crushed_silver_ore.json b/src/generated/resources/data/create/recipes/splashing/iceandfire/crushed_silver_ore.json index 8e14e236a..bf4f44294 100644 --- a/src/generated/resources/data/create/recipes/splashing/iceandfire/crushed_silver_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/iceandfire/crushed_silver_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "iceandfire:silver_nugget", - "count": 10 - }, - { - "item": "iceandfire:silver_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_aluminum_ore.json b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_aluminum_ore.json index e88525be6..167f6c5aa 100644 --- a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_aluminum_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_aluminum_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "immersiveengineering:nugget_aluminum", - "count": 10 - }, - { - "item": "immersiveengineering:nugget_aluminum", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_lead_ore.json b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_lead_ore.json index 71bcde052..8946e64fb 100644 --- a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_lead_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_lead_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "immersiveengineering:nugget_lead", - "count": 10 - }, - { - "item": "immersiveengineering:nugget_lead", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_nickel_ore.json b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_nickel_ore.json index 03d9eaa3e..3669b385e 100644 --- a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_nickel_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_nickel_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "immersiveengineering:nugget_nickel", - "count": 10 - }, - { - "item": "immersiveengineering:nugget_nickel", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_silver_ore.json b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_silver_ore.json index 5b24d6a99..552752f4a 100644 --- a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_silver_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_silver_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "immersiveengineering:nugget_silver", - "count": 10 - }, - { - "item": "immersiveengineering:nugget_silver", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_uranium_ore.json b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_uranium_ore.json index 8407663b3..718f8c87c 100644 --- a/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_uranium_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/immersiveengineering/crushed_uranium_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "immersiveengineering:nugget_uranium", - "count": 10 - }, - { - "item": "immersiveengineering:nugget_uranium", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_lead_ore.json b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_lead_ore.json index 458333ed6..19d0207ca 100644 --- a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_lead_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_lead_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "mekanism:nugget_lead", - "count": 10 - }, - { - "item": "mekanism:nugget_lead", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_osmium_ore.json b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_osmium_ore.json index b05c11800..b7dbc3a1a 100644 --- a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_osmium_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_osmium_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "mekanism:nugget_osmium", - "count": 10 - }, - { - "item": "mekanism:nugget_osmium", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_tin_ore.json b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_tin_ore.json index 21f9b3556..03bf5f3dd 100644 --- a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_tin_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_tin_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "mekanism:nugget_tin", - "count": 10 - }, - { - "item": "mekanism:nugget_tin", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_uranium_ore.json b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_uranium_ore.json index 50c5123cc..2cd3f0263 100644 --- a/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_uranium_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/mekanism/crushed_uranium_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "mekanism:nugget_uranium", - "count": 10 - }, - { - "item": "mekanism:nugget_uranium", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_lead_ore.json b/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_lead_ore.json index 3361263fd..672183fb2 100644 --- a/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_lead_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_lead_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "mysticalworld:lead_nugget", - "count": 10 - }, - { - "item": "mysticalworld:lead_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_quicksilver_ore.json b/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_quicksilver_ore.json index 817c1636d..b17316e2a 100644 --- a/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_quicksilver_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_quicksilver_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "mysticalworld:quicksilver_nugget", - "count": 10 - }, - { - "item": "mysticalworld:quicksilver_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_silver_ore.json b/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_silver_ore.json index 6f08f1cf9..971771a70 100644 --- a/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_silver_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_silver_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "mysticalworld:silver_nugget", - "count": 10 - }, - { - "item": "mysticalworld:silver_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_tin_ore.json b/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_tin_ore.json index d2b63a94f..2254bb087 100644 --- a/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_tin_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/mysticalworld/crushed_tin_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "mysticalworld:tin_nugget", - "count": 10 - }, - { - "item": "mysticalworld:tin_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_aluminum_ore.json b/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_aluminum_ore.json index ebc8ed9a3..7c337ca39 100644 --- a/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_aluminum_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_aluminum_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "silents_mechanisms:aluminum_nugget", - "count": 10 - }, - { - "item": "silents_mechanisms:aluminum_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_lead_ore.json b/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_lead_ore.json index 5da948065..0855c5229 100644 --- a/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_lead_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_lead_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "silents_mechanisms:lead_nugget", - "count": 10 - }, - { - "item": "silents_mechanisms:lead_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_nickel_ore.json b/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_nickel_ore.json index 9015c0579..9df88ef84 100644 --- a/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_nickel_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_nickel_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "silents_mechanisms:nickel_nugget", - "count": 10 - }, - { - "item": "silents_mechanisms:nickel_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_platinum_ore.json b/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_platinum_ore.json index 4a463a10a..4e14edba7 100644 --- a/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_platinum_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_platinum_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "silents_mechanisms:platinum_nugget", - "count": 10 - }, - { - "item": "silents_mechanisms:platinum_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_silver_ore.json b/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_silver_ore.json index 77d1b5b24..18aa0d48e 100644 --- a/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_silver_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_silver_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "silents_mechanisms:silver_nugget", - "count": 10 - }, - { - "item": "silents_mechanisms:silver_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_tin_ore.json b/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_tin_ore.json index 5ebf55141..d3e5d8595 100644 --- a/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_tin_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_tin_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "silents_mechanisms:tin_nugget", - "count": 10 - }, - { - "item": "silents_mechanisms:tin_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_uranium_ore.json b/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_uranium_ore.json index 5da13a4ac..4a0afde20 100644 --- a/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_uranium_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/silents_mechanisms/crushed_uranium_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "silents_mechanisms:uranium_nugget", - "count": 10 - }, - { - "item": "silents_mechanisms:uranium_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_lead_ore.json b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_lead_ore.json index 9c32c0d7f..82449468f 100644 --- a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_lead_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_lead_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "thermal:lead_nugget", - "count": 10 - }, - { - "item": "thermal:lead_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_nickel_ore.json b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_nickel_ore.json index 294901799..5e3a5556a 100644 --- a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_nickel_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_nickel_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "thermal:nickel_nugget", - "count": 10 - }, - { - "item": "thermal:nickel_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_silver_ore.json b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_silver_ore.json index d62f2b9d3..65d82dc50 100644 --- a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_silver_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_silver_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "thermal:silver_nugget", - "count": 10 - }, - { - "item": "thermal:silver_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_tin_ore.json b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_tin_ore.json index 1040fd5dc..39e63efe7 100644 --- a/src/generated/resources/data/create/recipes/splashing/thermal/crushed_tin_ore.json +++ b/src/generated/resources/data/create/recipes/splashing/thermal/crushed_tin_ore.json @@ -8,12 +8,7 @@ "results": [ { "item": "thermal:tin_nugget", - "count": 10 - }, - { - "item": "thermal:tin_nugget", - "count": 5, - "chance": 0.5 + "count": 9 } ], "conditions": [ diff --git a/src/generated/resources/data/create/tags/items/crushed_ores.json b/src/generated/resources/data/create/tags/items/crushed_ores.json index 69cc6ed10..725e33173 100644 --- a/src/generated/resources/data/create/tags/items/crushed_ores.json +++ b/src/generated/resources/data/create/tags/items/crushed_ores.json @@ -5,7 +5,6 @@ "create:crushed_gold_ore", "create:crushed_copper_ore", "create:crushed_zinc_ore", - "create:crushed_brass", "create:crushed_osmium_ore", "create:crushed_platinum_ore", "create:crushed_silver_ore", diff --git a/src/generated/resources/data/forge/tags/items/nuggets.json b/src/generated/resources/data/forge/tags/items/nuggets.json index 6eb0a5036..129f7fcd8 100644 --- a/src/generated/resources/data/forge/tags/items/nuggets.json +++ b/src/generated/resources/data/forge/tags/items/nuggets.json @@ -3,6 +3,7 @@ "values": [ "create:copper_nugget", "create:zinc_nugget", - "create:brass_nugget" + "create:brass_nugget", + "create:experience_nugget" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index d39200c53..4faa45ffa 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -98,7 +98,6 @@ "create:mechanical_arm", "create:content_observer", "create:stockpile_switch", - "create:adjustable_crate", "create:creative_crate", "create:nixie_tube", "create:white_nixie_tube", diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 158b62fbe..ecece4e38 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -104,6 +104,7 @@ "create:furnace_engine", "create:rotation_speed_controller", "create:mechanical_arm", + "create:item_vault", "create:andesite_funnel", "create:andesite_belt_funnel", "create:brass_funnel", @@ -112,7 +113,6 @@ "create:brass_tunnel", "create:content_observer", "create:stockpile_switch", - "create:adjustable_crate", "create:creative_crate", "create:nixie_tube", "create:white_nixie_tube", @@ -142,6 +142,97 @@ "create:copper_shingles", "create:copper_tiles", "create:zinc_block", - "create:brass_block" + "create:brass_block", + "create:cut_granite", + "create:polished_granite", + "create:granite_bricks", + "create:small_granite_bricks", + "create:layered_granite", + "create:pillar_granite", + "create:cut_diorite", + "create:polished_diorite", + "create:diorite_bricks", + "create:small_diorite_bricks", + "create:layered_diorite", + "create:pillar_diorite", + "create:cut_andesite", + "create:polished_andesite", + "create:andesite_bricks", + "create:small_andesite_bricks", + "create:layered_andesite", + "create:pillar_andesite", + "create:cut_calcite", + "create:polished_calcite", + "create:calcite_bricks", + "create:small_calcite_bricks", + "create:layered_calcite", + "create:pillar_calcite", + "create:cut_dripstone", + "create:polished_dripstone", + "create:dripstone_bricks", + "create:small_dripstone_bricks", + "create:layered_dripstone", + "create:pillar_dripstone", + "create:cut_deepslate", + "create:polished_deepslate", + "create:deepslate_bricks", + "create:small_deepslate_bricks", + "create:layered_deepslate", + "create:pillar_deepslate", + "create:cut_tuff", + "create:polished_tuff", + "create:tuff_bricks", + "create:small_tuff_bricks", + "create:layered_tuff", + "create:pillar_tuff", + "create:asurine", + "create:cut_asurine", + "create:polished_asurine", + "create:asurine_bricks", + "create:small_asurine_bricks", + "create:layered_asurine", + "create:pillar_asurine", + "create:crimsite", + "create:cut_crimsite", + "create:polished_crimsite", + "create:crimsite_bricks", + "create:small_crimsite_bricks", + "create:layered_crimsite", + "create:pillar_crimsite", + "create:limestone", + "create:cut_limestone", + "create:polished_limestone", + "create:limestone_bricks", + "create:small_limestone_bricks", + "create:layered_limestone", + "create:pillar_limestone", + "create:ochrum", + "create:cut_ochrum", + "create:polished_ochrum", + "create:ochrum_bricks", + "create:small_ochrum_bricks", + "create:layered_ochrum", + "create:pillar_ochrum", + "create:scoria", + "create:cut_scoria", + "create:polished_scoria", + "create:scoria_bricks", + "create:small_scoria_bricks", + "create:layered_scoria", + "create:pillar_scoria", + "create:scorchia", + "create:cut_scorchia", + "create:polished_scorchia", + "create:scorchia_bricks", + "create:small_scorchia_bricks", + "create:layered_scorchia", + "create:pillar_scorchia", + "create:veridium", + "create:cut_veridium", + "create:polished_veridium", + "create:veridium_bricks", + "create:small_veridium_bricks", + "create:layered_veridium", + "create:pillar_veridium" ] } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index d7a267ffc..4bdff359a 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -147,7 +147,6 @@ import com.simibubi.create.content.logistics.block.funnel.BrassFunnelBlock; import com.simibubi.create.content.logistics.block.funnel.FunnelGenerator; import com.simibubi.create.content.logistics.block.funnel.FunnelItem; import com.simibubi.create.content.logistics.block.funnel.FunnelMovementBehaviour; -import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateBlock; import com.simibubi.create.content.logistics.block.inventories.CreativeCrateBlock; import com.simibubi.create.content.logistics.block.mechanicalArm.ArmBlock; import com.simibubi.create.content.logistics.block.mechanicalArm.ArmItem; @@ -1155,13 +1154,13 @@ public class AllBlocks { .register(); public static final BlockEntry SHADOW_STEEL_CASING = - REGISTRATE.block("shadow_steel_casing", CasingBlock::new) + REGISTRATE.block("shadow_steel_casing", CasingBlock::deprecated) .transform(BuilderTransformers.casing(AllSpriteShifts.SHADOW_STEEL_CASING)) .lang("Shadow Casing") .register(); public static final BlockEntry REFINED_RADIANCE_CASING = - REGISTRATE.block("refined_radiance_casing", CasingBlock::new) + REGISTRATE.block("refined_radiance_casing", CasingBlock::deprecated) .transform(BuilderTransformers.casing(AllSpriteShifts.REFINED_RADIANCE_CASING)) .properties(p -> p.lightLevel($ -> 12)) .lang("Radiant Casing") @@ -1245,7 +1244,9 @@ public class AllBlocks { public static final BlockEntry ITEM_VAULT = REGISTRATE.block("item_vault", VaultBlock::new) .initialProperties(SharedProperties::softMetal) - .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) + .properties(p -> p.sound(SoundType.NETHERITE_BLOCK) + .explosionResistance(1200)) + .transform(pickaxeOnly()) .blockstate((c, p) -> p.getVariantBuilder(c.get()) .forAllStates(s -> ConfiguredModel.builder() .modelFile(AssetLookup.standardModel(c, p)) @@ -1327,11 +1328,6 @@ public class AllBlocks { .simpleItem() .register(); - public static final BlockEntry ADJUSTABLE_CRATE = - REGISTRATE.block("adjustable_crate", AdjustableCrateBlock::new) - .transform(BuilderTransformers.crate("brass")) - .register(); - public static final BlockEntry CREATIVE_CRATE = REGISTRATE.block("creative_crate", CreativeCrateBlock::new) .transform(BuilderTransformers.crate("creative")) diff --git a/src/main/java/com/simibubi/create/AllContainerTypes.java b/src/main/java/com/simibubi/create/AllContainerTypes.java index dc2b49ffa..4c71f33bc 100644 --- a/src/main/java/com/simibubi/create/AllContainerTypes.java +++ b/src/main/java/com/simibubi/create/AllContainerTypes.java @@ -4,8 +4,6 @@ import com.simibubi.create.content.curiosities.toolbox.ToolboxContainer; import com.simibubi.create.content.curiosities.toolbox.ToolboxScreen; import com.simibubi.create.content.curiosities.tools.BlueprintContainer; import com.simibubi.create.content.curiosities.tools.BlueprintScreen; -import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateContainer; -import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateScreen; import com.simibubi.create.content.logistics.item.LinkedControllerContainer; import com.simibubi.create.content.logistics.item.LinkedControllerScreen; import com.simibubi.create.content.logistics.item.filter.AttributeFilterContainer; @@ -33,9 +31,6 @@ public class AllContainerTypes { public static final ContainerEntry SCHEMATICANNON = register("schematicannon", SchematicannonContainer::new, () -> SchematicannonScreen::new); - public static final ContainerEntry FLEXCRATE = - register("flexcrate", AdjustableCrateContainer::new, () -> AdjustableCrateScreen::new); - public static final ContainerEntry FILTER = register("filter", FilterContainer::new, () -> FilterScreen::new); diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index 26ae909a0..cf1335d1b 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -25,6 +25,7 @@ import com.simibubi.create.content.curiosities.BuildersTeaItem; import com.simibubi.create.content.curiosities.ChromaticCompoundColor; import com.simibubi.create.content.curiosities.ChromaticCompoundItem; import com.simibubi.create.content.curiosities.CombustibleItem; +import com.simibubi.create.content.curiosities.ExperienceNuggetItem; import com.simibubi.create.content.curiosities.RefinedRadianceItem; import com.simibubi.create.content.curiosities.ShadowSteelItem; import com.simibubi.create.content.curiosities.TreeFertilizerItem; @@ -70,11 +71,13 @@ public class AllItems { } public static final ItemEntry WHEAT_FLOUR = ingredient("wheat_flour"), DOUGH = ingredient("dough"), - CINDER_FLOUR = ingredient("cinder_flour"), POWDERED_OBSIDIAN = ingredient("powdered_obsidian"), - ROSE_QUARTZ = ingredient("rose_quartz"), POLISHED_ROSE_QUARTZ = ingredient("polished_rose_quartz"), - PROPELLER = ingredient("propeller"), WHISK = ingredient("whisk"), BRASS_HAND = ingredient("brass_hand"), + CINDER_FLOUR = ingredient("cinder_flour"), ROSE_QUARTZ = ingredient("rose_quartz"), + POLISHED_ROSE_QUARTZ = ingredient("polished_rose_quartz"), PROPELLER = ingredient("propeller"), + WHISK = ingredient("whisk"), BRASS_HAND = ingredient("brass_hand"), CRAFTER_SLOT_COVER = ingredient("crafter_slot_cover"), ELECTRON_TUBE = ingredient("electron_tube"); + public static final ItemEntry POWDERED_OBSIDIAN = hiddenIngredient("powdered_obsidian"); + public static final ItemEntry INCOMPLETE_PRECISION_MECHANISM = REGISTRATE.item("incomplete_precision_mechanism", SequencedAssemblyItem::new) .register(); @@ -139,9 +142,8 @@ public class AllItems { .lang("Builder's Tea") .register(); - public static final ItemEntry RAW_ZINC = ingredient("raw_zinc"); - + public static final ItemEntry ANDESITE_ALLOY = ingredient("andesite_alloy"), ZINC_INGOT = taggedIngredient("zinc_ingot", forgeItemTag("ingots/zinc"), CREATE_INGOTS.tag), BRASS_INGOT = taggedIngredient("brass_ingot", forgeItemTag("ingots/brass"), CREATE_INGOTS.tag); @@ -165,9 +167,17 @@ public class AllItems { public static final ItemEntry COPPER_NUGGET = taggedIngredient("copper_nugget", forgeItemTag("nuggets/copper"), Tags.Items.NUGGETS), ZINC_NUGGET = taggedIngredient("zinc_nugget", forgeItemTag("nuggets/zinc"), Tags.Items.NUGGETS), - BRASS_NUGGET = taggedIngredient("brass_nugget", forgeItemTag("nuggets/brass"), Tags.Items.NUGGETS), + BRASS_NUGGET = taggedIngredient("brass_nugget", forgeItemTag("nuggets/brass"), Tags.Items.NUGGETS); - COPPER_SHEET = taggedIngredient("copper_sheet", forgeItemTag("plates/copper"), PLATES.tag), + public static final ItemEntry EXP_NUGGET = + REGISTRATE.item("experience_nugget", ExperienceNuggetItem::new) + .tag(Tags.Items.NUGGETS) + .properties(p -> p.rarity(Rarity.UNCOMMON)) + .lang("Nugget of Experience") + .register(); + + public static final ItemEntry COPPER_SHEET = + taggedIngredient("copper_sheet", forgeItemTag("plates/copper"), PLATES.tag), BRASS_SHEET = taggedIngredient("brass_sheet", forgeItemTag("plates/brass"), PLATES.tag), IRON_SHEET = taggedIngredient("iron_sheet", forgeItemTag("plates/iron"), PLATES.tag), GOLDEN_SHEET = taggedIngredient("golden_sheet", forgeItemTag("plates/gold"), PLATES.tag, ItemTags.PIGLIN_LOVED), @@ -175,8 +185,7 @@ public class AllItems { CRUSHED_IRON = taggedIngredient("crushed_iron_ore", CRUSHED_ORES.tag), CRUSHED_GOLD = taggedIngredient("crushed_gold_ore", CRUSHED_ORES.tag, ItemTags.PIGLIN_LOVED), CRUSHED_COPPER = taggedIngredient("crushed_copper_ore", CRUSHED_ORES.tag), - CRUSHED_ZINC = taggedIngredient("crushed_zinc_ore", CRUSHED_ORES.tag), - CRUSHED_BRASS = taggedIngredient("crushed_brass", CRUSHED_ORES.tag); + CRUSHED_ZINC = taggedIngredient("crushed_zinc_ore", CRUSHED_ORES.tag); public static final ItemEntry CRUSHED_OSMIUM = compatCrushedOre("osmium"), CRUSHED_PLATINUM = compatCrushedOre("platinum"), CRUSHED_SILVER = compatCrushedOre("silver"), @@ -341,10 +350,10 @@ public class AllItems { .register(); } -// private static ItemEntry hiddenIngredient(String name) { -// return REGISTRATE.item(name, HiddenIngredientItem::new) -// .register(); -// } + private static ItemEntry hiddenIngredient(String name) { + return REGISTRATE.item(name, HiddenIngredientItem::new) + .register(); + } @SafeVarargs private static ItemEntry taggedIngredient(String name, Tag.Named... tags) { @@ -357,7 +366,7 @@ public class AllItems { return REGISTRATE .item("crushed_" + metalName + "_ore", props -> new TagDependentIngredientItem(props, new ResourceLocation("forge", "ores/" + metalName))) - .tag(AllItemTags.CRUSHED_ORES.tag) + .tag(CRUSHED_ORES.tag) .register(); } diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index 073e4adf7..5b819533e 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -151,7 +151,6 @@ import com.simibubi.create.content.logistics.block.diodes.PulseRepeaterTileEntit import com.simibubi.create.content.logistics.block.funnel.FunnelInstance; import com.simibubi.create.content.logistics.block.funnel.FunnelRenderer; import com.simibubi.create.content.logistics.block.funnel.FunnelTileEntity; -import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateTileEntity; import com.simibubi.create.content.logistics.block.inventories.CreativeCrateTileEntity; import com.simibubi.create.content.logistics.block.mechanicalArm.ArmInstance; import com.simibubi.create.content.logistics.block.mechanicalArm.ArmRenderer; @@ -638,12 +637,6 @@ public class AllTileEntities { .renderer(() -> SmartTileEntityRenderer::new) .register(); - public static final TileEntityEntry ADJUSTABLE_CRATE = Create.registrate() - .tileEntity("adjustable_crate", AdjustableCrateTileEntity::new) - .validBlocks(AllBlocks.ADJUSTABLE_CRATE) - // .renderer(() -> renderer) - .register(); - public static final TileEntityEntry CREATIVE_CRATE = Create.registrate() .tileEntity("creative_crate", CreativeCrateTileEntity::new) .validBlocks(AllBlocks.CREATIVE_CRATE) diff --git a/src/main/java/com/simibubi/create/compat/jei/category/FanSmokingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/FanSmokingCategory.java index e80182364..7160a8b1c 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/FanSmokingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/FanSmokingCategory.java @@ -11,7 +11,7 @@ import net.minecraft.world.level.block.Blocks; public class FanSmokingCategory extends ProcessingViaFanCategory { public FanSmokingCategory() { - super(doubleItemIcon(AllItems.PROPELLER.get(), Items.BLAZE_POWDER)); + super(doubleItemIcon(AllItems.PROPELLER.get(), Items.CAMPFIRE)); } @Override diff --git a/src/main/java/com/simibubi/create/compat/jei/category/FanWashingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/FanWashingCategory.java index de9806280..9aeae2c83 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/FanWashingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/FanWashingCategory.java @@ -38,21 +38,24 @@ public class FanWashingCategory extends ProcessingViaFanCategory results = recipe.getRollableResults(); + int xOffsetGlobal = 8 * (3 - Math.min(3, results.size())); + + itemStacks.init(0, true, xOffsetGlobal + 12, 47); + itemStacks.set(0, Arrays.asList(recipe.getIngredients() + .get(0) + .getItems())); + boolean single = results.size() == 1; boolean excessive = results.size() > 9; for (int outputIndex = 0; outputIndex < results.size(); outputIndex++) { int xOffset = (outputIndex % 3) * 19; int yOffset = (outputIndex / 3) * -19; - itemStacks.init(outputIndex + 1, false, single ? 126 : 126 + xOffset, 47 + yOffset + (excessive ? 8 : 0)); + itemStacks.init(outputIndex + 1, false, xOffsetGlobal + (single ? 126 : 126 + xOffset), + 47 + yOffset + (excessive ? 8 : 0)); itemStacks.set(outputIndex + 1, results.get(outputIndex) - .getStack()); + .getStack()); } addStochasticTooltip(itemStacks, results); @@ -61,25 +64,26 @@ public class FanWashingCategory extends ProcessingViaFanCategory 9 ? 8 : 0); - getRenderedSlot(recipe, i).render(matrixStack, 126 + xOffset, 47 + yOffset); + getRenderedSlot(recipe, i).render(matrixStack, xOffsetGlobal + 126 + xOffset, 47 + yOffset); } } - + @Override protected void translateFan(PoseStack ms) { ms.translate(56 + 4, 33, 0); @@ -90,10 +94,10 @@ public class FanWashingCategory extends ProcessingViaFanCategory pItems) { + if (visible) + super.fillItemCategory(pCategory, pItems); } @Override diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java index b911936c7..149be2e09 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java @@ -76,7 +76,7 @@ public class SawRenderer extends SafeTileEntityRenderer { partial = AllBlockPartials.SAW_BLADE_VERTICAL_INACTIVE; } - if (!blockState.getValue(SawBlock.AXIS_ALONG_FIRST_COORDINATE)) + if (blockState.getValue(SawBlock.AXIS_ALONG_FIRST_COORDINATE)) rotate = true; } 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 7a683be19..3891ccca8 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 @@ -55,7 +55,6 @@ import com.simibubi.create.content.contraptions.components.structureMovement.ren import com.simibubi.create.content.contraptions.fluids.tank.FluidTankTileEntity; import com.simibubi.create.content.contraptions.relays.advanced.GantryShaftBlock; import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; -import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateBlock; import com.simibubi.create.content.logistics.block.inventories.CreativeCrateTileEntity; import com.simibubi.create.content.logistics.block.redstone.RedstoneContactBlock; import com.simibubi.create.content.logistics.block.vault.VaultTileEntity; @@ -321,9 +320,6 @@ public abstract class Contraption { && !moveChassis(world, pos, forcedDirection, frontier, visited)) return false; - if (AllBlocks.ADJUSTABLE_CRATE.has(state)) - AdjustableCrateBlock.splitCrate(world, pos); - if (AllBlocks.BELT.has(state)) moveBelt(pos, frontier, visited, state); @@ -599,8 +595,6 @@ public abstract class Contraption { BlockState blockstate = world.getBlockState(pos); if (blockstate.getBlock() instanceof ChestBlock) blockstate = blockstate.setValue(ChestBlock.TYPE, ChestType.SINGLE); - if (AllBlocks.ADJUSTABLE_CRATE.has(blockstate)) - blockstate = blockstate.setValue(AdjustableCrateBlock.DOUBLE, false); if (AllBlocks.REDSTONE_CONTACT.has(blockstate)) blockstate = blockstate.setValue(RedstoneContactBlock.POWERED, true); if (blockstate.getBlock() instanceof ButtonBlock) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorage.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorage.java index b896afe6d..b18b6dfa4 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorage.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MountedStorage.java @@ -3,7 +3,6 @@ package com.simibubi.create.content.contraptions.components.structureMovement; import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterTileEntity; import com.simibubi.create.content.contraptions.processing.ProcessingInventory; -import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateBlock; import com.simibubi.create.content.logistics.block.inventories.BottomlessItemHandler; import com.simibubi.create.foundation.utility.NBTHelper; @@ -37,8 +36,6 @@ public class MountedStorage { if (te instanceof MechanicalCrafterTileEntity) return false; - if (AllTileEntities.ADJUSTABLE_CRATE.is(te)) - return true; if (AllTileEntities.CREATIVE_CRATE.is(te)) return true; if (te instanceof ShulkerBoxBlockEntity) @@ -72,15 +69,6 @@ public class MountedStorage { .setValue(ChestBlock.TYPE, ChestType.SINGLE)); } - // Split double flexcrates - if (AllTileEntities.ADJUSTABLE_CRATE.is(te)) { - if (te.getBlockState() - .getValue(AdjustableCrateBlock.DOUBLE)) - te.getLevel() - .setBlockAndUpdate(te.getBlockPos(), te.getBlockState() - .setValue(AdjustableCrateBlock.DOUBLE, false)); - } - IItemHandler teHandler = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) .orElse(dummyHandler); if (teHandler == dummyHandler) diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java b/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java index 41f2fae03..59f36cb06 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java @@ -124,12 +124,12 @@ public class CubeParticle extends Particle { // int light = getBrightnessForRender(p_225606_3_); int light = LightTexture.FULL_BRIGHT; - double ageMultiplier = 1 - Math.pow(age, 3) / Math.pow(lifetime, 3); + double ageMultiplier = 1 - Math.pow(Mth.clamp(age + p_225606_3_, 0, lifetime), 3) / Math.pow(lifetime, 3); for (int i = 0; i < 6; i++) { // 6 faces to a cube for (int j = 0; j < 4; j++) { - Vec3 vec = CUBE[i * 4 + j]; + Vec3 vec = CUBE[i * 4 + j].scale(-1); vec = vec /* .rotate(?) */ .scale(scale * ageMultiplier) diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogwheelBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogwheelBlock.java index 17729968d..1fa98fa25 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogwheelBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogwheelBlock.java @@ -17,7 +17,10 @@ import com.tterrag.registrate.util.entry.BlockEntry; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; +import net.minecraft.core.NonNullList; import net.minecraft.world.InteractionResult; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.LevelReader; @@ -46,6 +49,9 @@ public class EncasedCogwheelBlock extends RotatedPillarKineticBlock this.casing = casing; } + @Override + public void fillItemCategory(CreativeModeTab pTab, NonNullList pItems) {} + @Override public BlockState getStateForPlacement(BlockPlaceContext context) { BlockState placedOn = context.getLevel() diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java index 3dc35add9..0cc0b52dc 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java @@ -9,7 +9,10 @@ import com.simibubi.create.content.schematics.ItemRequirement; import com.simibubi.create.foundation.block.ITE; import com.tterrag.registrate.util.entry.BlockEntry; +import net.minecraft.core.NonNullList; import net.minecraft.world.InteractionResult; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; @@ -38,6 +41,9 @@ public class EncasedShaftBlock extends AbstractEncasedShaftBlock return casing; } + @Override + public void fillItemCategory(CreativeModeTab pTab, NonNullList pItems) {} + @Override public InteractionResult onSneakWrenched(BlockState state, UseOnContext context) { if (context.getLevel().isClientSide) 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 3ae5e7b9f..b8bf6bd67 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java @@ -16,11 +16,13 @@ import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.NonNullList; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ClipContext; @@ -45,6 +47,9 @@ public class ChromaticCompoundItem extends Item { .getInt("CollectingLight"); } + @Override + public void fillItemCategory(CreativeModeTab pCategory, NonNullList pItems) {} + @Override public boolean isBarVisible(ItemStack stack) { return getLight(stack) > 0; @@ -57,7 +62,8 @@ public class ChromaticCompoundItem extends Item { @Override public int getBarColor(ItemStack stack) { - return Color.mixColors(0x413c69, 0xFFFFFF, getLight(stack) / (float) AllConfigs.SERVER.recipes.lightSourceCountForRefinedRadiance.get()); + return Color.mixColors(0x413c69, 0xFFFFFF, + getLight(stack) / (float) AllConfigs.SERVER.recipes.lightSourceCountForRefinedRadiance.get()); } @Override diff --git a/src/main/java/com/simibubi/create/content/curiosities/ExperienceNuggetItem.java b/src/main/java/com/simibubi/create/content/curiosities/ExperienceNuggetItem.java new file mode 100644 index 000000000..53b91160e --- /dev/null +++ b/src/main/java/com/simibubi/create/content/curiosities/ExperienceNuggetItem.java @@ -0,0 +1,68 @@ +package com.simibubi.create.content.curiosities; + +import com.simibubi.create.foundation.utility.VecHelper; + +import net.minecraft.core.Direction.Axis; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.util.Mth; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.ExperienceOrb; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; + +public class ExperienceNuggetItem extends Item { + + public ExperienceNuggetItem(Properties pProperties) { + super(pProperties); + } + + @Override + public boolean isFoil(ItemStack pStack) { + return true; + } + + @Override + public InteractionResultHolder use(Level pLevel, Player pPlayer, InteractionHand pUsedHand) { + ItemStack itemInHand = pPlayer.getItemInHand(pUsedHand); + if (pLevel.isClientSide) { + pLevel.playSound(pPlayer, pPlayer.blockPosition(), SoundEvents.AMETHYST_BLOCK_BREAK, SoundSource.PLAYERS, + .5f, 1); + return InteractionResultHolder.consume(itemInHand); + } + + int total = Mth.ceil(3f * itemInHand.getCount()); + int maxOrbs = 5; + int valuePer = Math.max(1, 1 + total / maxOrbs); + + for (int i = 0; i < maxOrbs; i++) { + int value = Math.min(valuePer, total - i * valuePer); + if (value == 0) + continue; + + Vec3 offset = VecHelper.offsetRandomly(Vec3.ZERO, pLevel.random, 1) + .normalize(); + Vec3 look = pPlayer.getLookAngle(); + Vec3 motion = look.scale(0.2) + .add(0, 0.2, 0) + .add(offset.scale(.1)); + Vec3 cross = look.cross(VecHelper.rotate(new Vec3(-.75f, 0, 0), -pPlayer.getYRot(), Axis.Y)); + + Vec3 global = offset.add(pPlayer.getPosition(1)); + global = pPlayer.getEyePosition() + .add(look.scale(.5f)) + .add(cross); + ExperienceOrb xp = new ExperienceOrb(pLevel, global.x, global.y, global.z, value); + xp.setDeltaMovement(motion); + pLevel.addFreshEntity(xp); + } + + pPlayer.setItemInHand(pUsedHand, ItemStack.EMPTY); + return InteractionResultHolder.consume(itemInHand); + } + +} diff --git a/src/main/java/com/simibubi/create/content/curiosities/NoGravMagicalDohickyItem.java b/src/main/java/com/simibubi/create/content/curiosities/NoGravMagicalDohickyItem.java index 66939bb34..4d314d720 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/NoGravMagicalDohickyItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/NoGravMagicalDohickyItem.java @@ -2,10 +2,12 @@ package com.simibubi.create.content.curiosities; import com.simibubi.create.foundation.utility.VecHelper; +import net.minecraft.core.NonNullList; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; @@ -17,6 +19,9 @@ public class NoGravMagicalDohickyItem extends Item { super(p_i48487_1_); } + @Override + public void fillItemCategory(CreativeModeTab pCategory, NonNullList pItems) {} + @Override public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) { Level world = entity.level; diff --git a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxContainer.java b/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxContainer.java index 866e9eb68..e6c1ec786 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxContainer.java +++ b/src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxContainer.java @@ -58,13 +58,14 @@ public class ToolboxContainer extends ContainerBase { ItemStack stack = clickedSlot.getItem(); int size = contentHolder.inventory.getSlots(); + boolean success = false; if (index < size) { - moveItemStackTo(stack, size, slots.size(), false); + success = !moveItemStackTo(stack, size, slots.size(), false); contentHolder.inventory.onContentsChanged(index); } else - moveItemStackTo(stack, 0, size - 1, false); + success = !moveItemStackTo(stack, 0, size - 1, false); - return ItemStack.EMPTY; + return success ? ItemStack.EMPTY : stack; } @Override @@ -83,8 +84,10 @@ public class ToolboxContainer extends ContainerBase { if (type == ClickType.PICKUP && !carried.isEmpty() && !itemInClickedSlot.isEmpty() && ToolboxInventory.canItemsShareCompartment(itemInClickedSlot, carried)) { int subIndex = index % STACKS_PER_COMPARTMENT; - if (subIndex != STACKS_PER_COMPARTMENT - 1) + if (subIndex != STACKS_PER_COMPARTMENT - 1) { clicked(index - subIndex + STACKS_PER_COMPARTMENT - 1, flags, type, player); + return; + } } if (type == ClickType.PICKUP && carried.isEmpty() && itemInClickedSlot.isEmpty()) diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/SharedDepotBlockMethods.java b/src/main/java/com/simibubi/create/content/logistics/block/depot/SharedDepotBlockMethods.java index 34016585b..1cce72cbf 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/depot/SharedDepotBlockMethods.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/depot/SharedDepotBlockMethods.java @@ -12,6 +12,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; +import net.minecraft.util.Mth; import net.minecraft.world.Containers; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; @@ -31,8 +32,8 @@ public class SharedDepotBlockMethods { return TileEntityBehaviour.get(worldIn, pos, DepotBehaviour.TYPE); } - public static InteractionResult onUse(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, - BlockHitResult ray) { + public static InteractionResult onUse(BlockState state, Level world, BlockPos pos, Player player, + InteractionHand hand, BlockHitResult ray) { if (ray.getDirection() != Direction.UP) return InteractionResult.PASS; if (world.isClientSide) @@ -50,14 +51,16 @@ public class SharedDepotBlockMethods { ItemStack mainItemStack = behaviour.getHeldItemStack(); if (!mainItemStack.isEmpty()) { - player.getInventory().placeItemBackInInventory(mainItemStack); + player.getInventory() + .placeItemBackInInventory(mainItemStack); behaviour.removeHeldItem(); world.playSound(null, pos, SoundEvents.ITEM_PICKUP, SoundSource.PLAYERS, .2f, - 1f + Create.RANDOM.nextFloat()); + 1f + Create.RANDOM.nextFloat()); } ItemStackHandler outputs = behaviour.processingOutputBuffer; for (int i = 0; i < outputs.getSlots(); i++) - player.getInventory().placeItemBackInInventory(outputs.extractItem(i, 64, false)); + player.getInventory() + .placeItemBackInInventory(outputs.extractItem(i, 64, false)); if (!wasEmptyHanded && !shouldntPlaceItem) { TransportedItemStack transported = new TransportedItemStack(heldItem); @@ -112,7 +115,10 @@ public class SharedDepotBlockMethods { DepotBehaviour depotBehaviour = get(worldIn, pos); if (depotBehaviour == null) return 0; - return ItemHelper.calcRedstoneFromInventory(depotBehaviour.itemHandler); + float f = depotBehaviour.getPresentStackSize(); + Integer max = depotBehaviour.maxStackSize.get(); + f = f / (max == 0 ? 64 : max); + return Mth.clamp(Mth.floor(f * 14.0F) + (f > 0 ? 1 : 0), 0, 15); } } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateBlock.java deleted file mode 100644 index 899c49c48..000000000 --- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateBlock.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.simibubi.create.content.logistics.block.inventories; - -import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.item.ItemHelper; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction.AxisDirection; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraftforge.fmllegacy.network.NetworkHooks; - -public class AdjustableCrateBlock extends CrateBlock implements ITE { - - public AdjustableCrateBlock(Properties p_i48415_1_) { - super(p_i48415_1_); - } - - @Override - public void onPlace(BlockState state, Level worldIn, BlockPos pos, BlockState oldState, boolean isMoving) { - if (oldState.getBlock() != state.getBlock() && state.hasBlockEntity() && state.getValue(DOUBLE) - && state.getValue(FACING).getAxisDirection() == AxisDirection.POSITIVE) { - BlockEntity tileEntity = worldIn.getBlockEntity(pos); - if (!(tileEntity instanceof AdjustableCrateTileEntity)) - return; - - AdjustableCrateTileEntity te = (AdjustableCrateTileEntity) tileEntity; - AdjustableCrateTileEntity other = te.getOtherCrate(); - if (other == null) - return; - - for (int slot = 0; slot < other.inventory.getSlots(); slot++) { - te.inventory.setStackInSlot(slot, other.inventory.getStackInSlot(slot)); - other.inventory.setStackInSlot(slot, ItemStack.EMPTY); - } - te.allowedAmount = other.allowedAmount; - other.invHandler.invalidate(); - } - } - - @Override - public InteractionResult use(BlockState state, Level worldIn, BlockPos pos, Player player, InteractionHand handIn, - BlockHitResult hit) { - - if (worldIn.isClientSide) { - return InteractionResult.SUCCESS; - } else { - BlockEntity te = worldIn.getBlockEntity(pos); - if (te instanceof AdjustableCrateTileEntity) { - AdjustableCrateTileEntity fte = (AdjustableCrateTileEntity) te; - fte = fte.getMainCrate(); - NetworkHooks.openGui((ServerPlayer) player, fte, fte::sendToContainer); - } - return InteractionResult.SUCCESS; - } - } - - public static void splitCrate(Level world, BlockPos pos) { - BlockState state = world.getBlockState(pos); - if (!AllBlocks.ADJUSTABLE_CRATE.has(state)) - return; - if (!state.getValue(DOUBLE)) - return; - BlockEntity te = world.getBlockEntity(pos); - if (!(te instanceof AdjustableCrateTileEntity)) - return; - AdjustableCrateTileEntity crateTe = (AdjustableCrateTileEntity) te; - crateTe.onSplit(); - world.setBlockAndUpdate(pos, state.setValue(DOUBLE, false)); - world.setBlockAndUpdate(crateTe.getOtherCrate().getBlockPos(), state.setValue(DOUBLE, false)); - } - - @Override - public void onRemove(BlockState state, Level worldIn, BlockPos pos, BlockState newState, boolean isMoving) { - if (!(worldIn.getBlockEntity(pos) instanceof AdjustableCrateTileEntity)) - return; - - if (state.hasBlockEntity() && state.getBlock() != newState.getBlock()) { - AdjustableCrateTileEntity te = (AdjustableCrateTileEntity) worldIn.getBlockEntity(pos); - if (!isMoving) - te.onDestroyed(); - worldIn.removeBlockEntity(pos); - } - - } - - @Override - public boolean hasAnalogOutputSignal(BlockState state) { - return true; - } - - @Override - public int getAnalogOutputSignal(BlockState blockState, Level worldIn, BlockPos pos) { - BlockEntity te = worldIn.getBlockEntity(pos); - if (te instanceof AdjustableCrateTileEntity) { - AdjustableCrateTileEntity flexcrateTileEntity = ((AdjustableCrateTileEntity) te).getMainCrate(); - return ItemHelper.calcRedstoneFromInventory(flexcrateTileEntity.inventory); - } - return 0; - } - - @Override - public Class getTileEntityClass() { - return AdjustableCrateTileEntity.class; - } - - @Override - public BlockEntityType getTileEntityType() { - return AllTileEntities.ADJUSTABLE_CRATE.get(); - } - -} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateContainer.java b/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateContainer.java deleted file mode 100644 index 7e0b2d33f..000000000 --- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateContainer.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.simibubi.create.content.logistics.block.inventories; - -import com.simibubi.create.AllContainerTypes; -import com.simibubi.create.foundation.gui.container.ContainerBase; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.inventory.Slot; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraftforge.items.SlotItemHandler; - -public class AdjustableCrateContainer extends ContainerBase { - - protected boolean doubleCrate; - - public AdjustableCrateContainer(MenuType type, int id, Inventory inv, FriendlyByteBuf extraData) { - super(type, id, inv, extraData); - } - - public AdjustableCrateContainer(MenuType type, int id, Inventory inv, AdjustableCrateTileEntity te) { - super(type, id, inv, te); - } - - public static AdjustableCrateContainer create(int id, Inventory inv, AdjustableCrateTileEntity te) { - return new AdjustableCrateContainer(AllContainerTypes.FLEXCRATE.get(), id, inv, te); - } - - @Override - protected AdjustableCrateTileEntity createOnClient(FriendlyByteBuf extraData) { - BlockPos readBlockPos = extraData.readBlockPos(); - CompoundTag readNbt = extraData.readNbt(); - - ClientLevel world = Minecraft.getInstance().level; - BlockEntity tileEntity = world.getBlockEntity(readBlockPos); - if (tileEntity instanceof AdjustableCrateTileEntity crate) { - crate.handleUpdateTag(readNbt); - return crate; - } - - return null; - } - - @Override - protected void initAndReadInventory(AdjustableCrateTileEntity contentHolder) { - doubleCrate = contentHolder.isDoubleCrate(); - } - - @Override - protected void addSlots() { - int x = doubleCrate ? 23 : 53; - int maxCol = doubleCrate ? 8 : 4; - for (int row = 0; row < 4; ++row) { - for (int col = 0; col < maxCol; ++col) { - this.addSlot(new SlotItemHandler(contentHolder.inventory, col + row * maxCol, x + col * 18, 20 + row * 18)); - } - } - - addPlayerSlots(doubleCrate ? 20 : 8, 149); - } - - @Override - protected void saveData(AdjustableCrateTileEntity contentHolder) { - } - - @Override - public ItemStack quickMoveStack(Player playerIn, int index) { - Slot clickedSlot = getSlot(index); - if (!clickedSlot.hasItem()) - return ItemStack.EMPTY; - - ItemStack stack = clickedSlot.getItem(); - int crateSize = doubleCrate ? 32 : 16; - if (index < crateSize) { - moveItemStackTo(stack, crateSize, slots.size(), false); - contentHolder.inventory.onContentsChanged(index); - } else - moveItemStackTo(stack, 0, crateSize - 1, false); - - return ItemStack.EMPTY; - } - -} 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 deleted file mode 100644 index 394b101a9..000000000 --- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateScreen.java +++ /dev/null @@ -1,141 +0,0 @@ -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.Collections; -import java.util.List; - -import com.google.common.collect.ImmutableList; -import com.mojang.blaze3d.vertex.PoseStack; -import com.simibubi.create.AllBlocks; -import com.simibubi.create.content.logistics.packet.ConfigureFlexcratePacket; -import com.simibubi.create.foundation.gui.AllGuiTextures; -import com.simibubi.create.foundation.gui.container.AbstractSimiContainerScreen; -import com.simibubi.create.foundation.gui.element.GuiGameElement; -import com.simibubi.create.foundation.gui.widget.Label; -import com.simibubi.create.foundation.gui.widget.ScrollInput; -import com.simibubi.create.foundation.networking.AllPackets; -import com.simibubi.create.foundation.utility.Lang; - -import net.minecraft.client.renderer.Rect2i; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.item.ItemStack; - -public class AdjustableCrateScreen extends AbstractSimiContainerScreen { - - protected AllGuiTextures background; - private List extraAreas = Collections.emptyList(); - - private AdjustableCrateTileEntity te; - private Label allowedItemsLabel; - private ScrollInput allowedItems; - private int lastModification; - - private int itemLabelOffset; - private int textureXShift; - private int itemYShift; - - private final ItemStack renderedItem = AllBlocks.ADJUSTABLE_CRATE.asStack(); - private final Component storageSpace = Lang.translate("gui.adjustable_crate.storageSpace"); - - public AdjustableCrateScreen(AdjustableCrateContainer container, Inventory inv, Component title) { - super(container, inv, title); - te = container.contentHolder; - lastModification = -1; - background = container.doubleCrate ? ADJUSTABLE_DOUBLE_CRATE : ADJUSTABLE_CRATE; - } - - @Override - protected void init() { - setWindowSize(Math.max(background.width, PLAYER_INVENTORY.width), background.height + 4 + PLAYER_INVENTORY.height); - setWindowOffset(menu.doubleCrate ? -2 : 0, 0); - super.init(); - - itemLabelOffset = menu.doubleCrate ? 137 : 65; - textureXShift = menu.doubleCrate ? 0 : (imageWidth - (background.width - 8)) / 2; - itemYShift = menu.doubleCrate ? 0 : -16; - - int x = leftPos + textureXShift; - int y = topPos; - - allowedItemsLabel = new Label(x + itemLabelOffset + 4, y + 108, TextComponent.EMPTY).colored(0xFFFFFF) - .withShadow(); - allowedItems = new ScrollInput(x + itemLabelOffset, y + 104, 41, 16).titled(storageSpace.plainCopy()) - .withRange(1, (menu.doubleCrate ? 2049 : 1025)) - .writingTo(allowedItemsLabel) - .withShiftStep(64) - .setState(te.allowedAmount) - .calling(s -> lastModification = 0); - allowedItems.onChanged(); - addRenderableWidget(allowedItemsLabel); - addRenderableWidget(allowedItems); - - extraAreas = ImmutableList.of( - new Rect2i(x + background.width, y + background.height - 56 + itemYShift, 80, 80) - ); - } - - @Override - protected void renderBg(PoseStack ms, float partialTicks, int mouseX, int mouseY) { - int invX = getLeftOfCentered(PLAYER_INVENTORY.width); - int invY = topPos + background.height + 4; - renderPlayerInventory(ms, invX, invY); - - int x = leftPos + textureXShift; - int y = topPos; - - background.render(ms, x, y, this); - drawCenteredString(ms, font, title, x + (background.width - 8) / 2, y + 3, 0xFFFFFF); - - String itemCount = String.valueOf(te.itemCount); - font.draw(ms, itemCount, x + itemLabelOffset - 13 - font.width(itemCount), y + 108, 0x4B3A22); - - for (int slot = 0; slot < (menu.doubleCrate ? 32 : 16); slot++) { - if (allowedItems.getState() > slot * 64) - continue; - int slotsPerRow = (menu.doubleCrate ? 8 : 4); - int slotX = x + 22 + (slot % slotsPerRow) * 18; - int slotY = y + 19 + (slot / slotsPerRow) * 18; - AllGuiTextures.ADJUSTABLE_CRATE_LOCKED_SLOT.render(ms, slotX, slotY, this); - } - - GuiGameElement.of(renderedItem) - .at(x + background.width, y + background.height - 56 + itemYShift, -200) - .scale(5) - .render(ms); - } - - @Override - public void removed() { - AllPackets.channel.sendToServer(new ConfigureFlexcratePacket(te.getBlockPos(), allowedItems.getState())); - } - - @Override - protected void containerTick() { - if (!AllBlocks.ADJUSTABLE_CRATE.has(minecraft.level.getBlockState(te.getBlockPos()))) - minecraft.setScreen(null); - - super.containerTick(); - - if (lastModification >= 0) - lastModification++; - - if (lastModification >= 15) { - lastModification = -1; - AllPackets.channel.sendToServer(new ConfigureFlexcratePacket(te.getBlockPos(), allowedItems.getState())); - } - - if (menu.doubleCrate != te.isDoubleCrate()) - menu.playerInventory.player.closeContainer(); - } - - @Override - public List getExtraAreas() { - return extraAreas; - } - -} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateTileEntity.java deleted file mode 100644 index 63fafec02..000000000 --- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/AdjustableCrateTileEntity.java +++ /dev/null @@ -1,181 +0,0 @@ -package com.simibubi.create.content.logistics.block.inventories; - -import com.simibubi.create.AllBlocks; -import com.simibubi.create.foundation.utility.Lang; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.chat.Component; -import net.minecraft.world.Containers; -import net.minecraft.world.MenuProvider; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.ItemStackHandler; - -public class AdjustableCrateTileEntity extends CrateTileEntity implements MenuProvider { - - public class Inv extends ItemStackHandler { - public Inv() { - super(32); - } - - @Override - public int getSlotLimit(int slot) { - if (slot < allowedAmount / 64) - return super.getSlotLimit(slot); - else if (slot == allowedAmount / 64) - return allowedAmount % 64; - return 0; - } - - @Override - public boolean isItemValid(int slot, ItemStack stack) { - if (slot > allowedAmount / 64) - return false; - return super.isItemValid(slot, stack); - } - - @Override - protected void onContentsChanged(int slot) { - super.onContentsChanged(slot); - setChanged(); - - itemCount = 0; - for (int i = 0; i < getSlots(); i++) { - itemCount += getStackInSlot(i).getCount(); - } - } - } - - public Inv inventory; - public int allowedAmount; - public int itemCount; - protected LazyOptional invHandler; - - public AdjustableCrateTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { - super(type, pos, state); - allowedAmount = 512; - itemCount = 10; - inventory = new Inv(); - invHandler = LazyOptional.of(() -> inventory); - } - - @Override - public AbstractContainerMenu createMenu(int id, Inventory inventory, Player player) { - return AdjustableCrateContainer.create(id, inventory, this); - } - - public AdjustableCrateTileEntity getOtherCrate() { - if (!AllBlocks.ADJUSTABLE_CRATE.has(getBlockState())) - return null; - BlockEntity tileEntity = level.getBlockEntity(worldPosition.relative(getFacing())); - if (tileEntity instanceof AdjustableCrateTileEntity) - return (AdjustableCrateTileEntity) tileEntity; - return null; - } - - public AdjustableCrateTileEntity getMainCrate() { - if (isSecondaryCrate()) - return getOtherCrate(); - return this; - } - - public void onSplit() { - AdjustableCrateTileEntity other = getOtherCrate(); - if (other == null) - return; - if (other == getMainCrate()) { - other.onSplit(); - return; - } - - other.allowedAmount = Math.max(1, allowedAmount - 1024); - for (int slot = 0; slot < other.inventory.getSlots(); slot++) - other.inventory.setStackInSlot(slot, ItemStack.EMPTY); - for (int slot = 16; slot < inventory.getSlots(); slot++) { - other.inventory.setStackInSlot(slot - 16, inventory.getStackInSlot(slot)); - inventory.setStackInSlot(slot, ItemStack.EMPTY); - } - allowedAmount = Math.min(1024, allowedAmount); - - invHandler.invalidate(); - invHandler = LazyOptional.of(() -> inventory); - other.invHandler.invalidate(); - other.invHandler = LazyOptional.of(() -> other.inventory); - } - - public void onDestroyed() { - AdjustableCrateTileEntity other = getOtherCrate(); - if (other == null) { - for (int slot = 0; slot < inventory.getSlots(); slot++) - drop(slot); - return; - } - - AdjustableCrateTileEntity main = getMainCrate(); - if (this == main) { - for (int slot = 0; slot < inventory.getSlots(); slot++) { - other.inventory.setStackInSlot(slot, inventory.getStackInSlot(slot)); - inventory.setStackInSlot(slot, ItemStack.EMPTY); - } - other.allowedAmount = Math.min(1024, allowedAmount); - } - - for (int slot = 16; slot < other.inventory.getSlots(); slot++) - other.drop(slot); - - other.invHandler.invalidate(); - other.invHandler = LazyOptional.of(() -> other.inventory); - } - - private void drop(int slot) { - Containers.dropItemStack(level, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ(), inventory.getStackInSlot(slot)); - } - - @Override - public void write(CompoundTag compound, boolean clientPacket) { - compound.putBoolean("Main", true); - compound.putInt("AllowedAmount", allowedAmount); - compound.put("Inventory", inventory.serializeNBT()); - super.write(compound, clientPacket); - } - - @Override - protected void fromTag(CompoundTag compound, boolean clientPacket) { - allowedAmount = compound.getInt("AllowedAmount"); - inventory.deserializeNBT(compound.getCompound("Inventory")); - super.fromTag(compound, clientPacket); - } - - @Override - public Component getDisplayName() { - return Lang.translate("gui.adjustable_crate.title"); - } - - @Override - public void setRemoved() { - super.setRemoved(); - invHandler.invalidate(); - } - - @Override - public LazyOptional getCapability(Capability capability, Direction facing) { - if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { - AdjustableCrateTileEntity mainCrate = getMainCrate(); - if (mainCrate != null && mainCrate.invHandler != null && mainCrate.invHandler.isPresent()) - return mainCrate.invHandler.cast(); - } - return super.getCapability(capability, facing); - } - -} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateBlock.java index e446f8541..6550f3bc6 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateBlock.java @@ -3,30 +3,18 @@ package com.simibubi.create.content.logistics.block.inventories; import com.simibubi.create.AllShapes; import com.simibubi.create.content.contraptions.wrench.IWrenchable; import com.simibubi.create.foundation.block.WrenchableDirectionalBlock; -import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition.Builder; -import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.pathfinder.PathComputationType; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; public class CrateBlock extends WrenchableDirectionalBlock implements IWrenchable { - public static final BooleanProperty DOUBLE = BooleanProperty.create("double"); - public CrateBlock(Properties p_i48415_1_) { super(p_i48415_1_); - registerDefaultState(defaultBlockState().setValue(FACING, Direction.UP) - .setValue(DOUBLE, false)); } @Override @@ -39,62 +27,4 @@ public class CrateBlock extends WrenchableDirectionalBlock implements IWrenchabl return false; } - @Override - public BlockState updateShape(BlockState stateIn, Direction facing, BlockState facingState, LevelAccessor worldIn, - BlockPos currentPos, BlockPos facingPos) { - - boolean isDouble = stateIn.getValue(DOUBLE); - Direction blockFacing = stateIn.getValue(FACING); - boolean isFacingOther = facingState.getBlock() == this && facingState.getValue(DOUBLE) - && facingState.getValue(FACING) == facing.getOpposite(); - - if (!isDouble) { - if (!isFacingOther) - return stateIn; - return stateIn.setValue(DOUBLE, true) - .setValue(FACING, facing); - } - - if (facing != blockFacing) - return stateIn; - if (!isFacingOther) - return stateIn.setValue(DOUBLE, false); - - return stateIn; - } - - @Override - public BlockState getStateForPlacement(BlockPlaceContext context) { - BlockPos pos = context.getClickedPos(); - Level world = context.getLevel(); - - if (context.getPlayer() == null || !context.getPlayer() - .isShiftKeyDown()) { - for (Direction d : Iterate.directions) { - BlockState state = world.getBlockState(pos.relative(d)); - if (state.getBlock() == this && !state.getValue(DOUBLE)) - return defaultBlockState().setValue(FACING, d) - .setValue(DOUBLE, true); - } - } - - Direction placedOnFace = context.getClickedFace() - .getOpposite(); - BlockState state = world.getBlockState(pos.relative(placedOnFace)); - if (state.getBlock() == this && !state.getValue(DOUBLE)) - return defaultBlockState().setValue(FACING, placedOnFace) - .setValue(DOUBLE, true); - return defaultBlockState(); - } - - @Override - public BlockState getRotatedBlockState(BlockState originalState, Direction targetedFace) { - return originalState; - } - - @Override - protected void createBlockStateDefinition(Builder builder) { - super.createBlockStateDefinition(builder.add(DOUBLE)); - } - } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateTileEntity.java index 4f8164d3f..44ce5ca60 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/inventories/CrateTileEntity.java @@ -6,8 +6,6 @@ import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.core.Direction.AxisDirection; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; @@ -20,20 +18,4 @@ public abstract class CrateTileEntity extends SmartTileEntity { @Override public void addBehaviours(List behaviours) {} - public boolean isDoubleCrate() { - return getBlockState().getValue(AdjustableCrateBlock.DOUBLE); - } - - public boolean isSecondaryCrate() { - if (!hasLevel()) - return false; - if (!(getBlockState().getBlock() instanceof CrateBlock)) - return false; - return isDoubleCrate() && getFacing().getAxisDirection() == AxisDirection.NEGATIVE; - } - - public Direction getFacing() { - return getBlockState().getValue(AdjustableCrateBlock.FACING); - } - } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateBlock.java index d1980cdbd..df3ca8171 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateBlock.java @@ -3,10 +3,7 @@ package com.simibubi.create.content.logistics.block.inventories; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.block.ITE; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; public class CreativeCrateBlock extends CrateBlock implements ITE { @@ -14,11 +11,6 @@ public class CreativeCrateBlock extends CrateBlock implements ITE getTileEntityClass() { return CreativeCrateTileEntity.class; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateTileEntity.java index bd9d04cc9..57445bdf4 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/inventories/CreativeCrateTileEntity.java @@ -4,15 +4,12 @@ import java.util.List; import com.jozufozu.flywheel.util.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; -import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; @@ -35,25 +32,7 @@ public class CreativeCrateTileEntity extends CrateTileEntity { @Override public void addBehaviours(List behaviours) { - behaviours.add(filtering = createFilter().onlyActiveWhen(this::filterVisible) - .withCallback(this::filterChanged)); - } - - private boolean filterVisible() { - if (!hasLevel() || isDoubleCrate() && !isSecondaryCrate()) - return false; - return true; - } - - private void filterChanged(ItemStack filter) { - if (!filterVisible()) - return; - CreativeCrateTileEntity otherCrate = getOtherCrate(); - if (otherCrate == null) - return; - if (ItemStack.isSame(filter, otherCrate.filtering.getFilter())) - return; - otherCrate.filtering.setFilter(filter); + behaviours.add(filtering = createFilter()); } @Override @@ -63,28 +42,6 @@ public class CreativeCrateTileEntity extends CrateTileEntity { itemHandler.invalidate(); } - private CreativeCrateTileEntity getOtherCrate() { - if (!AllBlocks.CREATIVE_CRATE.has(getBlockState())) - return null; - BlockEntity tileEntity = level.getBlockEntity(worldPosition.relative(getFacing())); - if (tileEntity instanceof CreativeCrateTileEntity) - return (CreativeCrateTileEntity) tileEntity; - return null; - } - - public void onPlaced() { - if (!isDoubleCrate()) - return; - CreativeCrateTileEntity otherCrate = getOtherCrate(); - if (otherCrate == null) - return; - - filtering.withCallback($ -> { - }); - filtering.setFilter(otherCrate.filtering.getFilter()); - filtering.withCallback(this::filterChanged); - } - @Override public LazyOptional getCapability(Capability cap, Direction side) { if (cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) diff --git a/src/main/java/com/simibubi/create/content/logistics/packet/ConfigureFlexcratePacket.java b/src/main/java/com/simibubi/create/content/logistics/packet/ConfigureFlexcratePacket.java deleted file mode 100644 index df5f64b2b..000000000 --- a/src/main/java/com/simibubi/create/content/logistics/packet/ConfigureFlexcratePacket.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.simibubi.create.content.logistics.packet; - -import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateTileEntity; -import com.simibubi.create.foundation.networking.TileEntityConfigurationPacket; - -import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; - -public class ConfigureFlexcratePacket extends TileEntityConfigurationPacket { - - private int maxItems; - - public ConfigureFlexcratePacket(FriendlyByteBuf buffer) { - super(buffer); - } - - public ConfigureFlexcratePacket(BlockPos pos, int newMaxItems) { - super(pos); - this.maxItems = newMaxItems; - } - - @Override - protected void writeSettings(FriendlyByteBuf buffer) { - buffer.writeInt(maxItems); - } - - @Override - protected void readSettings(FriendlyByteBuf buffer) { - maxItems = buffer.readInt(); - } - - @Override - protected void applySettings(AdjustableCrateTileEntity te) { - te.allowedAmount = maxItems; - } - -} diff --git a/src/main/java/com/simibubi/create/content/palettes/AllPaletteStoneTypes.java b/src/main/java/com/simibubi/create/content/palettes/AllPaletteStoneTypes.java index 69a5a32df..92299feb7 100644 --- a/src/main/java/com/simibubi/create/content/palettes/AllPaletteStoneTypes.java +++ b/src/main/java/com/simibubi/create/content/palettes/AllPaletteStoneTypes.java @@ -28,15 +28,19 @@ public enum AllPaletteStoneTypes { TUFF(VANILLA_RANGE, r -> () -> Blocks.TUFF), ASURINE(STANDARD_RANGE, r -> r.paletteStoneBlock("asurine", () -> Blocks.DEEPSLATE, true) + .properties(p -> p.destroyTime(1.25f)) .register()), CRIMSITE(STANDARD_RANGE, r -> r.paletteStoneBlock("crimsite", () -> Blocks.DEEPSLATE, true) + .properties(p -> p.destroyTime(1.25f)) .register()), LIMESTONE(STANDARD_RANGE, r -> r.paletteStoneBlock("limestone", () -> Blocks.SANDSTONE, true) + .properties(p -> p.destroyTime(1.25f)) .register()), OCHRUM(STANDARD_RANGE, r -> r.paletteStoneBlock("ochrum", () -> Blocks.CALCITE, true) + .properties(p -> p.destroyTime(1.25f)) .register()), SCORIA(STANDARD_RANGE, r -> r.paletteStoneBlock("scoria", () -> Blocks.BLACKSTONE, true) @@ -46,6 +50,7 @@ public enum AllPaletteStoneTypes { .register()), VERIDIUM(STANDARD_RANGE, r -> r.paletteStoneBlock("veridium", () -> Blocks.TUFF, true) + .properties(p -> p.destroyTime(1.25f)) .register()) ; diff --git a/src/main/java/com/simibubi/create/content/palettes/PalettesVariantEntry.java b/src/main/java/com/simibubi/create/content/palettes/PalettesVariantEntry.java index 4302d52f0..656abe88b 100644 --- a/src/main/java/com/simibubi/create/content/palettes/PalettesVariantEntry.java +++ b/src/main/java/com/simibubi/create/content/palettes/PalettesVariantEntry.java @@ -1,5 +1,6 @@ package com.simibubi.create.content.palettes; +import static com.simibubi.create.AllTags.pickaxeOnly; import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures; import com.google.common.collect.ImmutableList; @@ -32,6 +33,7 @@ public class PalettesVariantEntry { BlockBuilder builder = registrate.block(pattern.createName(name), pattern.getBlockFactory()) .initialProperties(baseBlock::get) + .transform(pickaxeOnly()) .blockstate(pattern.getBlockStateGenerator() .apply(pattern) .apply(name)::accept); diff --git a/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java b/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java index 1ba593b34..fa698c95c 100644 --- a/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java +++ b/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java @@ -48,7 +48,7 @@ public class AllAdvancements implements DataProvider { Advancement root = Advancement.Builder.advancement() .display(AllItems.BRASS_HAND.asStack(), new TranslatableComponent(LANG + "root"), new TranslatableComponent(LANG + "root.desc"), - new ResourceLocation(Create.ID, "textures/block/palettes/gabbro/bricks.png"), FrameType.TASK, false, + new ResourceLocation(Create.ID, "textures/gui/advancements.png"), FrameType.TASK, false, false, false) .addCriterion("0", InventoryChangeTrigger.TriggerInstance.hasItems(new ItemLike[] {})) .save(t, id + ":root"); diff --git a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java index 5551e4ed7..b50c4eecc 100644 --- a/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java +++ b/src/main/java/com/simibubi/create/foundation/data/BuilderTransformers.java @@ -26,7 +26,6 @@ import com.simibubi.create.content.contraptions.relays.encased.EncasedShaftBlock import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock.Shape; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelItem; -import com.simibubi.create.content.logistics.block.inventories.CrateBlock; import com.simibubi.create.foundation.block.BlockStressDefaults; import com.simibubi.create.foundation.block.ItemUseOverrides; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; @@ -34,7 +33,6 @@ import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; import net.minecraft.client.renderer.RenderType; -import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.DyeColor; @@ -236,35 +234,8 @@ public class BuilderTransformers { p.getVariantBuilder(c.get()) .forAllStates(state -> { String variant = "single"; - int yRot = 0; - - if (state.getValue(CrateBlock.DOUBLE)) { - Direction direction = state.getValue(CrateBlock.FACING); - if (direction.getAxis() == Axis.X) - yRot = 90; - - switch (direction) { - case DOWN: - variant = "top"; - break; - case NORTH: - case EAST: - variant = "right"; - break; - case UP: - variant = "bottom"; - break; - case SOUTH: - case WEST: - default: - variant = "left"; - - } - } - return ConfiguredModel.builder() .modelFile(models.get(variant)) - .rotationY(yRot) .build(); }); }) diff --git a/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java index e030d9e46..0b1f1fc09 100644 --- a/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java +++ b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java @@ -1,5 +1,7 @@ package com.simibubi.create.foundation.data; +import static com.simibubi.create.AllTags.pickaxeOnly; + import java.util.Collection; import java.util.IdentityHashMap; import java.util.Map; @@ -151,6 +153,7 @@ public class CreateRegistrate extends AbstractRegistrate { public BlockBuilder paletteStoneBlock(String name, NonNullFunction factory, NonNullSupplier propertiesFrom, boolean worldGenStone) { BlockBuilder builder = super.block(name, factory).initialProperties(propertiesFrom) + .transform(pickaxeOnly()) .blockstate((c, p) -> { final String location = "block/palettes/stone_types/" + c.getName(); p.simpleBlock(c.get(), p.models() diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java index 131c7bcd9..b978da112 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java @@ -127,7 +127,7 @@ public abstract class CreateRecipeProvider extends RecipeProvider { static ItemLike precisionMechanism() { return AllItems.PRECISION_MECHANISM.get(); } - + static ItemLike copperBlock() { return Items.COPPER_BLOCK; } diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java index a217c5bd4..431f49fb9 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java @@ -1,17 +1,20 @@ package com.simibubi.create.foundation.data.recipe; +import java.util.function.Supplier; + +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.AllRecipeTypes; -import com.simibubi.create.AllTags; -import com.tterrag.registrate.util.entry.ItemEntry; +import com.simibubi.create.content.contraptions.processing.ProcessingRecipe; +import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder; +import com.simibubi.create.content.palettes.AllPaletteStoneTypes; import net.minecraft.data.DataGenerator; import net.minecraft.tags.ItemTags; -import net.minecraft.world.item.Item; +import net.minecraft.util.Mth; import net.minecraft.world.item.Items; +import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Blocks; -import net.minecraftforge.common.crafting.conditions.NotCondition; -import net.minecraftforge.common.crafting.conditions.TagEmptyCondition; public class CrushingRecipeGen extends ProcessingRecipeGen { @@ -35,67 +38,68 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { .output(Items.STRING, 2) .output(.5f, Items.STRING)), - COPPER_BLOCK = create("copper_block", b -> b.duration(400) - .require(I.copperBlock()) - .output(AllItems.CRUSHED_COPPER.get(), 5)), + DIORITE = create(() -> Items.DIORITE, b -> b.duration(350) + .output(.25f, Items.QUARTZ, 1)), - ZINC_BLOCK = create("zinc_block", b -> b.duration(400) - .require(I.zincBlock()) - .output(AllItems.CRUSHED_ZINC.get(), 5)), + CRIMSITE = create(AllPaletteStoneTypes.CRIMSITE.getBaseBlock()::get, b -> b.duration(250) + .output(.20f, AllItems.CRUSHED_IRON.get(), 1) + .output(.20f, Items.IRON_NUGGET, 1)), - BRASS_BLOCK = create("brass_block", b -> b.duration(400) - .require(I.brassBlock()) - .output(AllItems.CRUSHED_BRASS.get(), 5)), + VERIDIUM = create(AllPaletteStoneTypes.VERIDIUM.getBaseBlock()::get, b -> b.duration(250) + .output(.40f, AllItems.CRUSHED_COPPER.get(), 1) + .output(.40f, AllItems.COPPER_NUGGET.get(), 1)), - COPPER_ORE = metalOre("copper", AllItems.CRUSHED_COPPER, 350), - ZINC_ORE = metalOre("zinc", AllItems.CRUSHED_ZINC, 350), - IRON_ORE = metalOre("iron", AllItems.CRUSHED_IRON, 400), - GOLD_ORE = metalOre("gold", AllItems.CRUSHED_GOLD, 300), + ASURINE = create(AllPaletteStoneTypes.ASURINE.getBaseBlock()::get, b -> b.duration(250) + .output(.20f, AllItems.CRUSHED_ZINC.get(), 1) + .output(.20f, AllItems.ZINC_NUGGET.get(), 1)), - OSMIUM_ORE = metalOre("osmium", AllItems.CRUSHED_OSMIUM, 400), - PLATINUM_ORE = metalOre("platinum", AllItems.CRUSHED_PLATINUM, 300), - SILVER_ORE = metalOre("silver", AllItems.CRUSHED_SILVER, 300), - TIN_ORE = metalOre("tin", AllItems.CRUSHED_TIN, 350), - QUICKSILVER_ORE = metalOre("quicksilver", AllItems.CRUSHED_QUICKSILVER, 300), - LEAD_ORE = metalOre("lead", AllItems.CRUSHED_LEAD, 400), - ALUMINUM_ORE = metalOre("aluminum", AllItems.CRUSHED_BAUXITE, 300), - URANIUM_ORE = metalOre("uranium", AllItems.CRUSHED_URANIUM, 400), - NICKEL_ORE = metalOre("nickel", AllItems.CRUSHED_NICKEL, 350), + OCHRUM = create(AllPaletteStoneTypes.OCHRUM.getBaseBlock()::get, b -> b.duration(250) + .output(.10f, AllItems.CRUSHED_GOLD.get(), 1) + .output(.10f, Items.GOLD_NUGGET, 1)), - NETHER_QUARTZ_ORE = create(() -> Blocks.NETHER_QUARTZ_ORE, b -> b.duration(350) - .output(Items.QUARTZ, 2) - .output(.5f, Items.QUARTZ, 4) - .output(.125f, Blocks.NETHERRACK)), + TUFF = create(() -> Items.TUFF, b -> b.duration(350) + .output(.25f, Items.FLINT, 1) + .output(.1f, Items.GOLD_NUGGET, 1) + .output(.1f, AllItems.COPPER_NUGGET.get(), 1) + .output(.1f, AllItems.ZINC_NUGGET.get(), 1) + .output(.1f, Items.IRON_NUGGET, 1)), - REDSTONE_ORE = create(() -> Blocks.REDSTONE_ORE, b -> b.duration(300) - .output(Items.REDSTONE, 8) - .output(.25f, Items.REDSTONE, 6) - .output(.125f, Blocks.COBBLESTONE)), + COPPER_ORE = stoneOre(() -> Items.COPPER_ORE, AllItems.CRUSHED_COPPER::get, 5.25f, 250), + ZINC_ORE = stoneOre(AllBlocks.ZINC_ORE::get, AllItems.CRUSHED_ZINC::get, 1.75f, 250), + IRON_ORE = stoneOre(() -> Items.IRON_ORE, () -> AllItems.CRUSHED_IRON::get, 1.75f, 250), + GOLD_ORE = stoneOre(() -> Items.GOLD_ORE, AllItems.CRUSHED_GOLD::get, 1.75f, 250), + DIAMOND_ORE = stoneOre(() -> Items.DIAMOND_ORE, () -> Items.DIAMOND, 1.75f, 350), + EMERALD_ORE = stoneOre(() -> Items.EMERALD_ORE, () -> Items.EMERALD, 1.75f, 350), + COAL_ORE = stoneOre(() -> Items.COAL_ORE, () -> Items.COAL, 1.75f, 150), + REDSTONE_ORE = stoneOre(() -> Items.REDSTONE_ORE, () -> Items.REDSTONE, 6.5f, 250), + LAPIS_ORE = stoneOre(() -> Items.LAPIS_ORE, () -> Items.LAPIS_LAZULI, 10.5f, 250), - LAPIS_ORE = create(() -> Blocks.LAPIS_ORE, b -> b.duration(300) - .output(Items.LAPIS_LAZULI, 12) - .output(.25f, Items.LAPIS_LAZULI, 8) - .output(.125f, Blocks.COBBLESTONE)), + DEEP_COPPER_ORE = deepslateOre(() -> Items.DEEPSLATE_COPPER_ORE, AllItems.CRUSHED_COPPER::get, 7.25f, 350), + DEEP_ZINC_ORE = deepslateOre(AllBlocks.DEEPSLATE_ZINC_ORE::get, AllItems.CRUSHED_ZINC::get, 2.25f, 350), + DEEP_IRON_ORE = deepslateOre(() -> Items.DEEPSLATE_IRON_ORE, AllItems.CRUSHED_IRON::get, 2.25f, 350), + DEEP_GOLD_ORE = deepslateOre(() -> Items.DEEPSLATE_GOLD_ORE, AllItems.CRUSHED_GOLD::get, 2.25f, 350), + DEEP_DIAMOND_ORE = deepslateOre(() -> Items.DEEPSLATE_DIAMOND_ORE, () -> Items.DIAMOND, 2.25f, 450), + DEEP_EMERALD_ORE = stoneOre(() -> Items.DEEPSLATE_EMERALD_ORE, () -> Items.EMERALD, 2.25f, 450), + DEEP_COAL_ORE = deepslateOre(() -> Items.DEEPSLATE_COAL_ORE, () -> Items.COAL, 1.75f, 250), + DEEP_REDSTONE_ORE = deepslateOre(() -> Items.DEEPSLATE_REDSTONE_ORE, () -> Items.REDSTONE, 7.5f, 350), + DEEP_LAPIS_ORE = deepslateOre(() -> Items.DEEPSLATE_LAPIS_ORE, () -> Items.LAPIS_LAZULI, 12.5f, 350), - COAL_ORE = create(() -> Blocks.COAL_ORE, b -> b.duration(300) - .output(Items.COAL, 2) - .output(.5f, Items.COAL, 2) - .output(.125f, Blocks.COBBLESTONE)), + NETHER_GOLD_ORE = netherOre(() -> Items.NETHER_GOLD_ORE, () -> Items.GOLD_NUGGET, 7.5f, 350), + NETHER_QUARTZ_ORE = netherOre(() -> Items.NETHER_QUARTZ_ORE, () -> Items.QUARTZ, 2.25f, 350), - EMERALD_ORE = create(() -> Blocks.EMERALD_ORE, b -> b.duration(500) - .output(Items.EMERALD, 2) - .output(.25f, Items.EMERALD, 1) - .output(.125f, Blocks.COBBLESTONE)), - - DIAMOND_ORE = create(() -> Blocks.DIAMOND_ORE, b -> b.duration(500) - .output(Items.DIAMOND, 2) - .output(.25f, Items.DIAMOND, 1) - .output(.125f, Blocks.COBBLESTONE)), + RAW_COPPER_ORE = rawOre(() -> Items.RAW_COPPER, AllItems.CRUSHED_COPPER::get), + RAW_ZINC_ORE = rawOre(AllItems.RAW_ZINC::get, AllItems.CRUSHED_ZINC::get), + RAW_IRON_ORE = rawOre(() -> Items.RAW_IRON, AllItems.CRUSHED_IRON::get), + RAW_GOLD_ORE = rawOre(() -> Items.RAW_GOLD, AllItems.CRUSHED_GOLD::get), NETHER_WART = create("nether_wart_block", b -> b.duration(150) .require(Blocks.NETHER_WART_BLOCK) .output(.25f, Items.NETHER_WART, 1)), + AMETHYST_CLUSTER = create(() -> Blocks.AMETHYST_CLUSTER, b -> b.duration(150) + .output(Items.AMETHYST_SHARD, 7) + .output(.5f, Items.AMETHYST_SHARD)), + GLOWSTONE = create(() -> Blocks.GLOWSTONE, b -> b.duration(150) .output(Items.GLOWSTONE_DUST, 3) .output(.5f, Items.GLOWSTONE_DUST)), @@ -135,13 +139,38 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { ; - protected GeneratedRecipe metalOre(String name, ItemEntry crushed, int duration) { - return create(name + "_ore", b -> b.duration(duration) - .withCondition(new NotCondition(new TagEmptyCondition("forge", "ores/" + name))) - .require(AllTags.forgeItemTag("ores/" + name)) - .output(crushed.get()) - .output(.3f, crushed.get(), 2) - .output(.125f, Blocks.COBBLESTONE)); + protected GeneratedRecipe stoneOre(Supplier ore, Supplier raw, float expectedAmount, + int duration) { + return ore(Blocks.COBBLESTONE, ore, raw, expectedAmount, duration); + } + + protected GeneratedRecipe deepslateOre(Supplier ore, Supplier raw, float expectedAmount, + int duration) { + return ore(Blocks.COBBLED_DEEPSLATE, ore, raw, expectedAmount, duration); + } + + protected GeneratedRecipe netherOre(Supplier ore, Supplier raw, float expectedAmount, + int duration) { + return ore(Blocks.NETHERRACK, ore, raw, expectedAmount, duration); + } + + protected GeneratedRecipe ore(ItemLike stoneType, Supplier ore, Supplier raw, + float expectedAmount, int duration) { + return create(ore, b -> { + ProcessingRecipeBuilder> builder = b.duration(duration) + .output(raw.get(), Mth.floor(expectedAmount)); + float extra = expectedAmount - Mth.floor(expectedAmount); + if (extra > 0) + builder.output(extra, raw.get(), 1); + builder.output(.75f, AllItems.EXP_NUGGET.get(), 1); + return builder.output(.125f, stoneType); + }); + } + + protected GeneratedRecipe rawOre(Supplier input, Supplier result) { + return create(input, b -> b.duration(400) + .output(result.get(), 1) + .output(.75f, AllItems.EXP_NUGGET.get(), 1)); } public CrushingRecipeGen(DataGenerator p_i48262_1_) { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java index d9f942f87..169cb0e62 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java @@ -28,6 +28,11 @@ public class MillingRecipeGen extends ProcessingRecipeGen { .output(Items.CLAY_BALL, 3) .output(.5f, Items.CLAY_BALL)), + CALCITE = create(() -> Items.CALCITE, b -> b.duration(250) + .output(.125f, Items.BONE_MEAL, 1)), + DRIPSTONE = create(() -> Items.DRIPSTONE_BLOCK, b -> b.duration(250) + .output(Items.CLAY_BALL, 1)), + TERRACOTTA = create(() -> Blocks.TERRACOTTA, b -> b.duration(200) .output(Blocks.RED_SAND)), ANDESITE = create(() -> Blocks.ANDESITE, b -> b.duration(200) @@ -39,21 +44,6 @@ public class MillingRecipeGen extends ProcessingRecipeGen { SANDSTONE = create(() -> Blocks.SANDSTONE, b -> b.duration(150) .output(Blocks.SAND)), - COPPER_ORE = metalOre("copper", AllItems.CRUSHED_COPPER, 350), - ZINC_ORE = metalOre("zinc", AllItems.CRUSHED_ZINC, 350), - IRON_ORE = metalOre("iron", AllItems.CRUSHED_IRON, 400), - GOLD_ORE = metalOre("gold", AllItems.CRUSHED_GOLD, 300), - - OSMIUM_ORE = metalOre("osmium", AllItems.CRUSHED_OSMIUM, 400), - PLATINUM_ORE = metalOre("platinum", AllItems.CRUSHED_PLATINUM, 300), - SILVER_ORE = metalOre("silver", AllItems.CRUSHED_SILVER, 300), - TIN_ORE = metalOre("tin", AllItems.CRUSHED_TIN, 350), - QUICKSILVER_ORE = metalOre("quicksilver", AllItems.CRUSHED_QUICKSILVER, 300), - LEAD_ORE = metalOre("lead", AllItems.CRUSHED_LEAD, 400), - ALUMINUM_ORE = metalOre("aluminum", AllItems.CRUSHED_BAUXITE, 300), - URANIUM_ORE = metalOre("uranium", AllItems.CRUSHED_URANIUM, 400), - NICKEL_ORE = metalOre("nickel", AllItems.CRUSHED_NICKEL, 350), - WHEAT = create(() -> Items.WHEAT, b -> b.duration(150) .output(AllItems.WHEAT_FLOUR.get()) .output(.25f, AllItems.WHEAT_FLOUR.get(), 2) diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java index c82eb7727..ac33b63a2 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MixingRecipeGen.java @@ -3,7 +3,6 @@ package com.simibubi.create.foundation.data.recipe; import com.simibubi.create.AllFluids; import com.simibubi.create.AllItems; import com.simibubi.create.AllRecipeTypes; -import com.simibubi.create.AllTags; import com.simibubi.create.content.contraptions.processing.HeatCondition; import net.minecraft.data.DataGenerator; @@ -50,23 +49,8 @@ public class MixingRecipeGen extends ProcessingRecipeGen { .output(AllItems.BRASS_INGOT.get(), 2) .requiresHeat(HeatCondition.HEATED)), - CRUSHED_BRASS = create("crushed_brass", b -> b.require(AllItems.CRUSHED_COPPER.get()) - .require(AllItems.CRUSHED_ZINC.get()) - .output(AllItems.CRUSHED_BRASS.get(), 2) - .requiresHeat(HeatCondition.HEATED)), - - CHROMATIC_COMPOUND = create("chromatic_compound", b -> b.require(Tags.Items.DUSTS_GLOWSTONE) - .require(Tags.Items.DUSTS_GLOWSTONE) - .require(Tags.Items.DUSTS_GLOWSTONE) - .require(AllItems.POWDERED_OBSIDIAN.get()) - .require(AllItems.POWDERED_OBSIDIAN.get()) - .require(AllItems.POWDERED_OBSIDIAN.get()) - .require(AllItems.POLISHED_ROSE_QUARTZ.get()) - .output(AllItems.CHROMATIC_COMPOUND.get(), 1) - .requiresHeat(HeatCondition.SUPERHEATED)), - ANDESITE_ALLOY = create("andesite_alloy", b -> b.require(Blocks.ANDESITE) - .require(AllTags.forgeItemTag("nuggets/iron")) + .require(I.ironNugget()) .output(I.andesite(), 1)), ANDESITE_ALLOY_FROM_ZINC = create("andesite_alloy_from_zinc", b -> b.require(Blocks.ANDESITE) diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java index dd47008dc..a97543259 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java @@ -561,17 +561,13 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("SCS") .pattern(" I ")), - PORTABLE_STORAGE_INTERFACE = create(AllBlocks.PORTABLE_STORAGE_INTERFACE).unlockedBy(I::brassCasing) - .viaShaped(b -> b.define('I', I.brassCasing()) - .define('B', AllBlocks.ANDESITE_FUNNEL.get()) - .pattern(" B ") - .pattern(" I ")), + PORTABLE_STORAGE_INTERFACE = create(AllBlocks.PORTABLE_STORAGE_INTERFACE).unlockedBy(I::andesiteCasing) + .viaShapeless(b -> b.requires(I.andesiteCasing()) + .requires(AllBlocks.CHUTE.get())), PORTABLE_FLUID_INTERFACE = create(AllBlocks.PORTABLE_FLUID_INTERFACE).unlockedBy(I::copperCasing) - .viaShaped(b -> b.define('I', I.copperCasing()) - .define('B', AllBlocks.ANDESITE_FUNNEL.get()) - .pattern(" B ") - .pattern(" I ")), + .viaShapeless(b -> b.requires(I.copperCasing()) + .requires(AllBlocks.CHUTE.get())), ROPE_PULLEY = create(AllBlocks.ROPE_PULLEY).unlockedBy(I::andesite) .viaShaped(b -> b.define('S', I.shaft()) @@ -845,13 +841,6 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("AA") .pattern("KK")), - ADJUSTABLE_CRATE = create(AllBlocks.ADJUSTABLE_CRATE).returns(4) - .unlockedBy(I::brassCasing) - .viaShaped(b -> b.define('B', I.brassCasing()) - .pattern("BBB") - .pattern("B B") - .pattern("BBB")), - BELT_OBSERVER = create(AllBlocks.CONTENT_OBSERVER).unlockedBy(AllItems.BELT_CONNECTOR::get) .viaShaped(b -> b.define('B', I.brassCasing()) .define('R', I.redstone()) @@ -1051,7 +1040,6 @@ public class StandardRecipeGen extends CreateRecipeProvider { CRUSHED_GOLD = blastCrushedMetal(() -> Items.GOLD_INGOT, AllItems.CRUSHED_GOLD::get), CRUSHED_COPPER = blastCrushedMetal(() -> Items.COPPER_INGOT, AllItems.CRUSHED_COPPER::get), CRUSHED_ZINC = blastCrushedMetal(AllItems.ZINC_INGOT::get, AllItems.CRUSHED_ZINC::get), - CRUSHED_BRASS = blastCrushedMetal(AllItems.BRASS_INGOT::get, AllItems.CRUSHED_BRASS::get), CRUSHED_OSMIUM = blastModdedCrushedMetal(AllItems.CRUSHED_OSMIUM, "osmium", MEK), CRUSHED_PLATINUM = blastModdedCrushedMetal(AllItems.CRUSHED_PLATINUM, "platinum", SM), diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java index c51e75b43..bb917080d 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java @@ -45,11 +45,10 @@ public class WashingRecipeGen extends ProcessingRecipeGen { .output(.05f, Items.DEAD_BUSH)), SAND = create(() -> Blocks.SAND, b -> b.output(.25f, Items.CLAY_BALL)), - CRUSHED_COPPER = crushedOre(AllItems.CRUSHED_COPPER, AllItems.COPPER_NUGGET::get), - CRUSHED_ZINC = crushedOre(AllItems.CRUSHED_ZINC, AllItems.ZINC_NUGGET::get), - CRUSHED_BRASS = crushedOre(AllItems.CRUSHED_BRASS, AllItems.BRASS_NUGGET::get), - CRUSHED_GOLD = crushedOre(AllItems.CRUSHED_GOLD, () -> Items.GOLD_NUGGET), - CRUSHED_IRON = crushedOre(AllItems.CRUSHED_IRON, () -> Items.IRON_NUGGET), + CRUSHED_COPPER = crushedOre(AllItems.CRUSHED_COPPER, AllItems.COPPER_NUGGET::get, () -> Items.CLAY_BALL, .5f), + CRUSHED_ZINC = crushedOre(AllItems.CRUSHED_ZINC, AllItems.ZINC_NUGGET::get, () -> Items.GUNPOWDER, .25f), + CRUSHED_GOLD = crushedOre(AllItems.CRUSHED_GOLD, () -> Items.GOLD_NUGGET, () -> Items.QUARTZ, .5f), + CRUSHED_IRON = crushedOre(AllItems.CRUSHED_IRON, () -> Items.IRON_NUGGET, () -> Items.REDSTONE, .125f), CRUSHED_OSMIUM = moddedCrushedOre(AllItems.CRUSHED_OSMIUM, "osmium", MEK), CRUSHED_PLATINUM = moddedCrushedOre(AllItems.CRUSHED_PLATINUM, "platinum", SM), @@ -88,9 +87,10 @@ public class WashingRecipeGen extends ProcessingRecipeGen { return create(() -> block, b -> b.output(result)); } - public GeneratedRecipe crushedOre(ItemEntry crushed, Supplier nugget) { - return create(crushed::get, b -> b.output(nugget.get(), 10) - .output(.5f, nugget.get(), 5)); + public GeneratedRecipe crushedOre(ItemEntry crushed, Supplier nugget, Supplier secondary, + float secondaryChance) { + return create(crushed::get, b -> b.output(nugget.get(), 9) + .output(secondaryChance, secondary.get(), 1)); } public GeneratedRecipe moddedCrushedOre(ItemEntry crushed, String metalName, Mods... mods) { @@ -99,8 +99,7 @@ public class WashingRecipeGen extends ProcessingRecipeGen { create(mod.getId() + "/" + crushed.getId() .getPath(), b -> b.withItemIngredients(Ingredient.of(crushed::get)) - .output(1, nugget, 10) - .output(.5f, nugget, 5) + .output(1, nugget, 9) .whenModLoaded(mod.getId())); } return null; diff --git a/src/main/java/com/simibubi/create/foundation/networking/AllPackets.java b/src/main/java/com/simibubi/create/foundation/networking/AllPackets.java index 358433140..85c8ed1a5 100644 --- a/src/main/java/com/simibubi/create/foundation/networking/AllPackets.java +++ b/src/main/java/com/simibubi/create/foundation/networking/AllPackets.java @@ -40,7 +40,6 @@ import com.simibubi.create.content.logistics.item.LinkedControllerBindPacket; import com.simibubi.create.content.logistics.item.LinkedControllerInputPacket; import com.simibubi.create.content.logistics.item.LinkedControllerStopLecternPacket; import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket; -import com.simibubi.create.content.logistics.packet.ConfigureFlexcratePacket; import com.simibubi.create.content.logistics.packet.ConfigureStockswitchPacket; import com.simibubi.create.content.logistics.packet.FunnelFlapPacket; import com.simibubi.create.content.logistics.packet.TunnelFlapPacket; @@ -73,7 +72,6 @@ public enum AllPackets { // Client to Server CONFIGURE_SCHEMATICANNON(ConfigureSchematicannonPacket.class, ConfigureSchematicannonPacket::new, PLAY_TO_SERVER), - CONFIGURE_FLEXCRATE(ConfigureFlexcratePacket.class, ConfigureFlexcratePacket::new, PLAY_TO_SERVER), CONFIGURE_STOCKSWITCH(ConfigureStockswitchPacket.class, ConfigureStockswitchPacket::new, PLAY_TO_SERVER), CONFIGURE_SEQUENCER(ConfigureSequencedGearshiftPacket.class, ConfigureSequencedGearshiftPacket::new, PLAY_TO_SERVER), diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/FanScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/FanScenes.java index 6a778be0b..65d69a398 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/FanScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/FanScenes.java @@ -1,6 +1,5 @@ package com.simibubi.create.foundation.ponder.content; -import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; import com.simibubi.create.content.logistics.block.depot.DepotTileEntity; import com.simibubi.create.foundation.ponder.ElementLink; @@ -182,7 +181,7 @@ public class FanScenes { .text("Air Flows passing through water create a Washing Setup"); scene.idle(70); - stack = AllItems.CRUSHED_GOLD.asStack(); + stack = new ItemStack(Items.RED_SAND, 16); ItemStack washed = new ItemStack(Items.GOLD_NUGGET, 16); entityLink = scene.world.createItemEntity(util.vector.centerOf(blockPos.west(2) diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java index 20f6b46d8..b11aca8bf 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java @@ -391,7 +391,6 @@ public class PonderIndex { .add(AllBlocks.BRASS_TUNNEL) .add(AllBlocks.CONTENT_OBSERVER) .add(AllBlocks.STOCKPILE_SWITCH) - .add(AllBlocks.ADJUSTABLE_CRATE) .add(AllBlocks.CREATIVE_CRATE) .add(AllBlocks.PORTABLE_STORAGE_INTERFACE); diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/ProcessingScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/ProcessingScenes.java index fb79e7005..f72b00fd2 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/ProcessingScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/ProcessingScenes.java @@ -203,7 +203,7 @@ public class ProcessingScenes { scene.idle(30); ItemStack input = new ItemStack(Items.GOLD_ORE); - ItemStack output = AllItems.CRUSHED_GOLD.asStack(); + ItemStack output = new ItemStack(Items.RAW_GOLD); Vec3 entitySpawn = util.vector.topOf(center.above(2)); ElementLink entity1 = diff --git a/src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java b/src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java index 11a1ca661..4c62a1343 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java @@ -54,7 +54,8 @@ import net.minecraftforge.client.model.data.EmptyModelData; public class WorldSectionElement extends AnimatedSceneElement { - public static final SuperByteBufferCache.Compartment> DOC_WORLD_SECTION = new SuperByteBufferCache.Compartment<>(); + public static final SuperByteBufferCache.Compartment> DOC_WORLD_SECTION = + new SuperByteBufferCache.Compartment<>(); List renderedTileEntities; List>> tickableTileEntities; @@ -257,11 +258,8 @@ public class WorldSectionElement extends AnimatedSceneElement { tickableTileEntities.removeIf(te -> scene.getWorld() .getBlockEntity(te.getFirst() .getBlockPos()) != te.getFirst()); - tickableTileEntities.forEach(te -> { - BlockEntity tile = te.getFirst(); - te.getSecond() - .accept(scene.getWorld()); - }); + tickableTileEntities.forEach(te -> te.getSecond() + .accept(scene.getWorld())); } @Override @@ -286,7 +284,9 @@ public class WorldSectionElement extends AnimatedSceneElement { return; if (!(block instanceof EntityBlock)) return; - addTicker(tileEntity, ((EntityBlock) block).getTicker(world, blockState, tileEntity.getType())); + BlockEntityTicker ticker = ((EntityBlock) block).getTicker(world, blockState, tileEntity.getType()); + if (ticker != null) + addTicker(tileEntity, ticker); renderedTileEntities.add(tileEntity); }); } diff --git a/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java b/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java index a2d2cde63..eca2aa43a 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java @@ -1,6 +1,5 @@ package com.simibubi.create.foundation.utility; -import static com.simibubi.create.AllBlocks.ADJUSTABLE_CRATE; import static com.simibubi.create.AllBlocks.ANDESITE_ENCASED_SHAFT; import static com.simibubi.create.AllBlocks.BRASS_BELT_FUNNEL; import static com.simibubi.create.AllBlocks.BRASS_TUNNEL; @@ -24,10 +23,6 @@ import static com.simibubi.create.AllBlocks.STOCKPILE_SWITCH; import static com.simibubi.create.AllBlocks.STRESSOMETER; import static com.simibubi.create.AllItems.ATTRIBUTE_FILTER; import static com.simibubi.create.AllItems.CRAFTER_SLOT_COVER; -import static com.simibubi.create.AllItems.CRUSHED_COPPER; -import static com.simibubi.create.AllItems.CRUSHED_GOLD; -import static com.simibubi.create.AllItems.CRUSHED_IRON; -import static com.simibubi.create.AllItems.CRUSHED_ZINC; import static com.simibubi.create.AllItems.GOLDEN_SHEET; import static com.simibubi.create.AllItems.POWDERED_OBSIDIAN; import static com.simibubi.create.AllItems.SCHEMATIC; @@ -104,7 +99,6 @@ public class RemapHelper { reMap.put("iron_glass", ORNATE_IRON_WINDOW.getId()); reMap.put("limestone_slab", Create.asResource("polished_limestone_slab")); reMap.put("entity_detector", CONTENT_OBSERVER.getId()); - reMap.put("flexcrate", ADJUSTABLE_CRATE.getId()); reMap.put("scoria_slab", Create.asResource("polished_scoria_slab")); reMap.put("birch_glass", BIRCH_WINDOW.getId()); reMap.put("saw", MECHANICAL_SAW.getId()); @@ -146,19 +140,15 @@ public class RemapHelper { reMap.put("adjustable_pulse_repeater", PULSE_REPEATER.getId()); reMap.put("adjustable_repeater", PULSE_REPEATER.getId()); - reMap.put("crushed_copper", CRUSHED_COPPER.getId()); reMap.put("empty_blueprint", SCHEMATIC.getId()); reMap.put("gold_sheet", GOLDEN_SHEET.getId()); reMap.put("flour", WHEAT_FLOUR.getId()); reMap.put("blueprint_and_quill", SCHEMATIC_AND_QUILL.getId()); - reMap.put("crushed_iron", CRUSHED_IRON.getId()); reMap.put("slot_cover", CRAFTER_SLOT_COVER.getId()); reMap.put("blueprint", SCHEMATIC.getId()); reMap.put("symmetry_wand", WAND_OF_SYMMETRY.getId()); reMap.put("terrain_zapper", WORLDSHAPER.getId()); - reMap.put("crushed_zinc", CRUSHED_ZINC.getId()); reMap.put("property_filter", ATTRIBUTE_FILTER.getId()); - reMap.put("crushed_gold", CRUSHED_GOLD.getId()); reMap.put("obsidian_dust", POWDERED_OBSIDIAN.getId()); } diff --git a/src/main/resources/assets/create/models/block/gantry_carriage/item.json b/src/main/resources/assets/create/models/block/gantry_carriage/item.json index 1e2349978..8d33abbc3 100644 --- a/src/main/resources/assets/create/models/block/gantry_carriage/item.json +++ b/src/main/resources/assets/create/models/block/gantry_carriage/item.json @@ -1,6 +1,7 @@ { "credit": "Made with Blockbench", "parent": "block/block", + "texture_size": [32, 32], "textures": { "0": "create:block/axis", "3": "create:block/cogwheel", @@ -14,79 +15,79 @@ "elements": [ { "name": "Gear", - "from": [10.5, -10, 6.5], - "to": [13.5, 8, 9.5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [12, -1, 8]}, + "from": [2.5, -10, 6.5], + "to": [5.5, 8, 9.5], + "rotation": {"angle": 22.5, "axis": "x", "origin": [12, -1, 8]}, "faces": { - "north": {"uv": [7, 7.5, 16, 9], "rotation": 90, "texture": "#3"}, + "north": {"uv": [7, 8, 16, 9.5], "rotation": 90, "texture": "#3"}, "east": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, + "south": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, "west": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"} + "up": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "Gear2", - "from": [10.5, -2.5, -1], - "to": [13.5, 0.5, 17], - "rotation": {"angle": 22.5, "axis": "x", "origin": [12, -1, 8]}, + "from": [2.5, -10, 6.5], + "to": [5.5, 8, 9.5], + "rotation": {"angle": -22.5, "axis": "x", "origin": [12, -1, 8]}, "faces": { - "north": {"uv": [5.5, 7.5, 7, 9], "rotation": 90, "texture": "#3"}, - "east": {"uv": [7, 6, 16, 7.5], "texture": "#3"}, - "south": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, - "west": {"uv": [7, 6, 16, 7.5], "rotation": 180, "texture": "#3"}, - "up": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"} + "north": {"uv": [7, 8, 16, 9.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, + "south": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, + "west": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, + "up": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "Gear3", - "from": [10.5, -10, 6.5], - "to": [13.5, 8, 9.5], - "rotation": {"angle": 22.5, "axis": "x", "origin": [12, -1, 8]}, + "from": [2.5, -2.5, -1], + "to": [5.5, 0.5, 17], + "rotation": {"angle": -22.5, "axis": "x", "origin": [12, -1, 8]}, "faces": { - "north": {"uv": [7, 7.5, 16, 9], "rotation": 90, "texture": "#3"}, - "east": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, - "west": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"} + "north": {"uv": [5, 8, 6.5, 9.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [7, 6, 16, 7.5], "rotation": 180, "texture": "#3"}, + "south": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, + "west": {"uv": [7, 6, 16, 7.5], "texture": "#3"}, + "up": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "Gear4", - "from": [10.5, -2.5, -1], - "to": [13.5, 0.5, 17], - "rotation": {"angle": -22.5, "axis": "x", "origin": [12, -1, 8]}, + "from": [2.5, -2.5, -1], + "to": [5.5, 0.5, 17], + "rotation": {"angle": 22.5, "axis": "x", "origin": [12, -1, 8]}, "faces": { - "north": {"uv": [5.5, 7.5, 7, 9], "rotation": 90, "texture": "#3"}, + "north": {"uv": [5, 8, 6.5, 9.5], "rotation": 90, "texture": "#3"}, "east": {"uv": [7, 6, 16, 7.5], "texture": "#3"}, - "south": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, + "south": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, "west": {"uv": [7, 6, 16, 7.5], "texture": "#3"}, - "up": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"} + "up": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "GearCaseInner", - "from": [11, -7, 2], - "to": [13, 5, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [12, -1, 8]}, + "from": [2.55, -7, 2], + "to": [5.45, 5, 14], + "rotation": {"angle": 22.5, "axis": "x", "origin": [12, -1, 8]}, "faces": { - "north": {"uv": [0, 6, 6, 7], "rotation": 90, "texture": "#3"}, + "north": {"uv": [0, 6, 6, 7.5], "rotation": 90, "texture": "#3"}, "east": {"uv": [4, 0, 10, 6], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 6, 6, 7], "rotation": 270, "texture": "#3"}, + "south": {"uv": [0, 6, 6, 7.5], "rotation": 270, "texture": "#3"}, "west": {"uv": [4, 0, 10, 6], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 6, 6, 7], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 6, 6, 7], "rotation": 270, "texture": "#3"} + "up": {"uv": [0, 6, 6, 7.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [0, 6, 6, 7.5], "rotation": 270, "texture": "#3"} } }, { "name": "GearCaseOuter", - "from": [10, -5, 4], - "to": [14, 3, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [12, -1, 8]}, + "from": [2, -5, 4], + "to": [6, 3, 12], + "rotation": {"angle": 22.5, "axis": "x", "origin": [12, -1, 8]}, "faces": { "north": {"uv": [0, 4, 4, 6], "rotation": 90, "texture": "#3"}, "east": {"uv": [0, 0, 4, 4], "rotation": 270, "texture": "#3"}, @@ -98,79 +99,79 @@ }, { "name": "Gear", - "from": [2.5, -10, 6.5], - "to": [5.5, 8, 9.5], - "rotation": {"angle": -22.5, "axis": "x", "origin": [4, -1, 8]}, + "from": [10.5, -10, 6.5], + "to": [13.5, 8, 9.5], + "rotation": {"angle": 22.5, "axis": "x", "origin": [12, -1, 8]}, "faces": { - "north": {"uv": [7, 7.5, 16, 9], "rotation": 90, "texture": "#3"}, + "north": {"uv": [7, 8, 16, 9.5], "rotation": 90, "texture": "#3"}, "east": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, + "south": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, "west": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"} + "up": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "Gear3", - "from": [2.5, -2.5, -1], - "to": [5.5, 0.5, 17], - "rotation": {"angle": 22.5, "axis": "x", "origin": [4, -1, 8]}, + "from": [10.5, -10, 6.5], + "to": [13.5, 8, 9.5], + "rotation": {"angle": -22.5, "axis": "x", "origin": [12, -1, 8]}, "faces": { - "north": {"uv": [5.5, 7.5, 7, 9], "rotation": 90, "texture": "#3"}, - "east": {"uv": [7, 6, 16, 7.5], "texture": "#3"}, - "south": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, - "west": {"uv": [7, 6, 16, 7.5], "rotation": 180, "texture": "#3"}, - "up": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"} + "north": {"uv": [7, 8, 16, 9.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, + "south": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, + "west": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, + "up": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "Gear4", - "from": [2.5, -10, 6.5], - "to": [5.5, 8, 9.5], - "rotation": {"angle": 22.5, "axis": "x", "origin": [4, -1, 8]}, + "from": [10.5, -2.5, -1], + "to": [13.5, 0.5, 17], + "rotation": {"angle": -22.5, "axis": "x", "origin": [12, -1, 8]}, "faces": { - "north": {"uv": [7, 7.5, 16, 9], "rotation": 90, "texture": "#3"}, - "east": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, - "west": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"} + "north": {"uv": [5, 8, 6.5, 9.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [7, 6, 16, 7.5], "rotation": 180, "texture": "#3"}, + "south": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, + "west": {"uv": [7, 6, 16, 7.5], "texture": "#3"}, + "up": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "Gear5", - "from": [2.5, -2.5, -1], - "to": [5.5, 0.5, 17], - "rotation": {"angle": -22.5, "axis": "x", "origin": [4, -1, 8]}, + "from": [10.5, -2.5, -1], + "to": [13.5, 0.5, 17], + "rotation": {"angle": 22.5, "axis": "x", "origin": [12, -1, 8]}, "faces": { - "north": {"uv": [5.5, 7.5, 7, 9], "rotation": 90, "texture": "#3"}, + "north": {"uv": [5, 8, 6.5, 9.5], "rotation": 90, "texture": "#3"}, "east": {"uv": [7, 6, 16, 7.5], "texture": "#3"}, - "south": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, + "south": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, "west": {"uv": [7, 6, 16, 7.5], "texture": "#3"}, - "up": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"} + "up": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "GearCaseInner", - "from": [3, -7, 2], - "to": [5, 5, 14], - "rotation": {"angle": -22.5, "axis": "x", "origin": [4, -1, 8]}, + "from": [10.55, -7, 2], + "to": [13.45, 5, 14], + "rotation": {"angle": 22.5, "axis": "x", "origin": [12, -1, 8]}, "faces": { - "north": {"uv": [0, 6, 6, 7], "rotation": 90, "texture": "#3"}, + "north": {"uv": [0, 6, 6, 7.5], "rotation": 90, "texture": "#3"}, "east": {"uv": [4, 0, 10, 6], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 6, 6, 7], "rotation": 270, "texture": "#3"}, + "south": {"uv": [0, 6, 6, 7.5], "rotation": 270, "texture": "#3"}, "west": {"uv": [4, 0, 10, 6], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 6, 6, 7], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 6, 6, 7], "rotation": 270, "texture": "#3"} + "up": {"uv": [0, 6, 6, 7.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [0, 6, 6, 7.5], "rotation": 270, "texture": "#3"} } }, { "name": "GearCaseOuter", - "from": [2, -5, 4], - "to": [6, 3, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [4, -1, 8]}, + "from": [10, -5, 4], + "to": [14, 3, 12], + "rotation": {"angle": 22.5, "axis": "x", "origin": [12, -1, 8]}, "faces": { "north": {"uv": [0, 4, 4, 6], "rotation": 90, "texture": "#3"}, "east": {"uv": [0, 0, 4, 4], "rotation": 270, "texture": "#3"}, @@ -319,26 +320,45 @@ { "name": "cogwheel_shaftless", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3, 4, 5] }, { "name": "cogwheel_shaftless", "origin": [8, 8, 8], + "color": 0, "children": [6, 7, 8, 9, 10, 11] }, - { - "name": "item_andesite", - "origin": [8, 8, 8], - "children": [] - }, { "name": "item", "origin": [8, 8, 8], - "children": [12, 13, 14, 15, 16, 17, 18, + "color": 0, + "children": [ { - "name": "shaft", + "name": "item_andesite", "origin": [8, 8, 8], - "children": [19] + "color": 0, + "children": [] + }, + { + "name": "item", + "origin": [8, 8, 8], + "color": 0, + "children": [ + 12, + 13, + 14, + 15, + 16, + 17, + 18, + { + "name": "shaft", + "origin": [8, 8, 8], + "color": 0, + "children": [19] + } + ] } ] } diff --git a/src/main/resources/assets/create/models/block/gantry_carriage/wheels.json b/src/main/resources/assets/create/models/block/gantry_carriage/wheels.json index 7c54b4893..957523ec1 100644 --- a/src/main/resources/assets/create/models/block/gantry_carriage/wheels.json +++ b/src/main/resources/assets/create/models/block/gantry_carriage/wheels.json @@ -1,6 +1,7 @@ { "credit": "Made with Blockbench", - "parent": "block/block", + "parent": "create:block/large_wheels", + "texture_size": [32, 32], "textures": { "3": "create:block/cogwheel", "particle": "create:block/andesite_casing" @@ -8,79 +9,79 @@ "elements": [ { "name": "Gear", - "from": [10.5, -10, 6.5], - "to": [13.5, 8, 9.5], - "rotation": {"angle": 0, "axis": "x", "origin": [12, -1, 8]}, + "from": [2.5, -10, 6.5], + "to": [5.5, 8, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [12, -9, 0]}, "faces": { - "north": {"uv": [7, 7.5, 16, 9], "rotation": 90, "texture": "#3"}, + "north": {"uv": [7, 8, 16, 9.5], "rotation": 90, "texture": "#3"}, "east": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, + "south": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, "west": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"} + "up": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "Gear2", - "from": [10.5, -2.5, -1], - "to": [13.5, 0.5, 17], - "rotation": {"angle": 45, "axis": "x", "origin": [12, -1, 8]}, + "from": [2.5, -10, 6.5], + "to": [5.5, 8, 9.5], + "rotation": {"angle": -45, "axis": "x", "origin": [4, -1, 8]}, "faces": { - "north": {"uv": [5.5, 7.5, 7, 9], "rotation": 90, "texture": "#3"}, - "east": {"uv": [7, 6, 16, 7.5], "texture": "#3"}, - "south": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, - "west": {"uv": [7, 6, 16, 7.5], "rotation": 180, "texture": "#3"}, - "up": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"} + "north": {"uv": [7, 8, 16, 9.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, + "south": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, + "west": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, + "up": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "Gear3", - "from": [10.5, -10, 6.5], - "to": [13.5, 8, 9.5], - "rotation": {"angle": 45, "axis": "x", "origin": [12, -1, 8]}, + "from": [2.5, -10, 6.5], + "to": [5.5, 8, 9.5], + "rotation": {"angle": 45, "axis": "x", "origin": [4, -1, 8]}, "faces": { - "north": {"uv": [7, 7.5, 16, 9], "rotation": 90, "texture": "#3"}, + "north": {"uv": [7, 8, 16, 9.5], "rotation": 90, "texture": "#3"}, "east": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, + "south": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, "west": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"} + "up": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "Gear4", - "from": [10.5, -2.5, -1], - "to": [13.5, 0.5, 17], - "rotation": {"angle": 0, "axis": "x", "origin": [12, -1, 8]}, + "from": [2.5, -2.5, -1], + "to": [5.5, 0.5, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [12, -9, 0]}, "faces": { - "north": {"uv": [5.5, 7.5, 7, 9], "rotation": 90, "texture": "#3"}, + "north": {"uv": [5, 8, 6.5, 9.5], "rotation": 90, "texture": "#3"}, "east": {"uv": [7, 6, 16, 7.5], "texture": "#3"}, - "south": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, + "south": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, "west": {"uv": [7, 6, 16, 7.5], "texture": "#3"}, - "up": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"} + "up": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "GearCaseInner", - "from": [11, -7, 2], - "to": [13, 5, 14], - "rotation": {"angle": 0, "axis": "x", "origin": [12, -1, 8]}, + "from": [2.55, -7, 2], + "to": [5.45, 5, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [12, -9, 0]}, "faces": { - "north": {"uv": [0, 6, 6, 7], "rotation": 90, "texture": "#3"}, + "north": {"uv": [0, 6, 6, 7.5], "rotation": 90, "texture": "#3"}, "east": {"uv": [4, 0, 10, 6], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 6, 6, 7], "rotation": 270, "texture": "#3"}, + "south": {"uv": [0, 6, 6, 7.5], "rotation": 270, "texture": "#3"}, "west": {"uv": [4, 0, 10, 6], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 6, 6, 7], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 6, 6, 7], "rotation": 270, "texture": "#3"} + "up": {"uv": [0, 6, 6, 7.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [0, 6, 6, 7.5], "rotation": 270, "texture": "#3"} } }, { "name": "GearCaseOuter", - "from": [10, -5, 4], - "to": [14, 3, 12], - "rotation": {"angle": 0, "axis": "x", "origin": [12, -1, 8]}, + "from": [2, -5, 4], + "to": [6, 3, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, -9, 0]}, "faces": { "north": {"uv": [0, 4, 4, 6], "rotation": 90, "texture": "#3"}, "east": {"uv": [0, 0, 4, 4], "rotation": 270, "texture": "#3"}, @@ -92,79 +93,79 @@ }, { "name": "Gear", - "from": [2.5, -10, 6.5], - "to": [5.5, 8, 9.5], - "rotation": {"angle": 0, "axis": "x", "origin": [4, -1, 8]}, + "from": [10.5, -10, 6.5], + "to": [13.5, 8, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [20, -9, 0]}, "faces": { - "north": {"uv": [7, 7.5, 16, 9], "rotation": 90, "texture": "#3"}, + "north": {"uv": [7, 8, 16, 9.5], "rotation": 90, "texture": "#3"}, "east": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, + "south": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, "west": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"} + "up": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "Gear3", - "from": [2.5, -2.5, -1], - "to": [5.5, 0.5, 17], - "rotation": {"angle": 45, "axis": "x", "origin": [4, -1, 8]}, + "from": [10.5, -10, 6.5], + "to": [13.5, 8, 9.5], + "rotation": {"angle": -45, "axis": "x", "origin": [12, -1, 8]}, "faces": { - "north": {"uv": [5.5, 7.5, 7, 9], "rotation": 90, "texture": "#3"}, - "east": {"uv": [7, 6, 16, 7.5], "texture": "#3"}, - "south": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, - "west": {"uv": [7, 6, 16, 7.5], "rotation": 180, "texture": "#3"}, - "up": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"} + "north": {"uv": [7, 8, 16, 9.5], "rotation": 90, "texture": "#3"}, + "east": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, + "south": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, + "west": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, + "up": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "Gear4", - "from": [2.5, -10, 6.5], - "to": [5.5, 8, 9.5], - "rotation": {"angle": 45, "axis": "x", "origin": [4, -1, 8]}, + "from": [10.5, -10, 6.5], + "to": [13.5, 8, 9.5], + "rotation": {"angle": 45, "axis": "x", "origin": [12, -1, 8]}, "faces": { - "north": {"uv": [7, 7.5, 16, 9], "rotation": 90, "texture": "#3"}, + "north": {"uv": [7, 8, 16, 9.5], "rotation": 90, "texture": "#3"}, "east": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "south": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, + "south": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, "west": {"uv": [7, 6, 16, 7.5], "rotation": 270, "texture": "#3"}, - "up": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"} + "up": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "Gear5", - "from": [2.5, -2.5, -1], - "to": [5.5, 0.5, 17], - "rotation": {"angle": 0, "axis": "x", "origin": [4, -1, 8]}, + "from": [10.5, -2.5, -1], + "to": [13.5, 0.5, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [20, -9, 0]}, "faces": { - "north": {"uv": [5.5, 7.5, 7, 9], "rotation": 90, "texture": "#3"}, + "north": {"uv": [5, 8, 6.5, 9.5], "rotation": 90, "texture": "#3"}, "east": {"uv": [7, 6, 16, 7.5], "texture": "#3"}, - "south": {"uv": [5.5, 7.5, 7, 9], "rotation": 270, "texture": "#3"}, + "south": {"uv": [5, 8, 6.5, 9.5], "rotation": 270, "texture": "#3"}, "west": {"uv": [7, 6, 16, 7.5], "texture": "#3"}, - "up": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"}, - "down": {"uv": [7, 7.5, 16, 9], "rotation": 270, "texture": "#3"} + "up": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [7, 8, 16, 9.5], "rotation": 270, "texture": "#3"} } }, { "name": "GearCaseInner", - "from": [3, -7, 2], - "to": [5, 5, 14], - "rotation": {"angle": 0, "axis": "x", "origin": [4, -1, 8]}, + "from": [10.55, -7, 2], + "to": [13.45, 5, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [20, -9, 0]}, "faces": { - "north": {"uv": [0, 6, 6, 7], "rotation": 90, "texture": "#3"}, + "north": {"uv": [0, 6, 6, 7.5], "rotation": 90, "texture": "#3"}, "east": {"uv": [4, 0, 10, 6], "rotation": 270, "texture": "#3"}, - "south": {"uv": [0, 6, 6, 7], "rotation": 270, "texture": "#3"}, + "south": {"uv": [0, 6, 6, 7.5], "rotation": 270, "texture": "#3"}, "west": {"uv": [4, 0, 10, 6], "rotation": 270, "texture": "#3"}, - "up": {"uv": [0, 6, 6, 7], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 6, 6, 7], "rotation": 270, "texture": "#3"} + "up": {"uv": [0, 6, 6, 7.5], "rotation": 270, "texture": "#3"}, + "down": {"uv": [0, 6, 6, 7.5], "rotation": 270, "texture": "#3"} } }, { "name": "GearCaseOuter", - "from": [2, -5, 4], - "to": [6, 3, 12], - "rotation": {"angle": 0, "axis": "x", "origin": [4, -1, 8]}, + "from": [10, -5, 4], + "to": [14, 3, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [20, -9, 0]}, "faces": { "north": {"uv": [0, 4, 4, 6], "rotation": 90, "texture": "#3"}, "east": {"uv": [0, 0, 4, 4], "rotation": 270, "texture": "#3"}, @@ -213,11 +214,13 @@ { "name": "cogwheel_shaftless", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3, 4, 5] }, { "name": "cogwheel_shaftless", "origin": [8, 8, 8], + "color": 0, "children": [6, 7, 8, 9, 10, 11] } ] diff --git a/src/main/resources/assets/create/models/block/mechanical_saw/item.json b/src/main/resources/assets/create/models/block/mechanical_saw/item.json index 503179e64..a74e1a24c 100644 --- a/src/main/resources/assets/create/models/block/mechanical_saw/item.json +++ b/src/main/resources/assets/create/models/block/mechanical_saw/item.json @@ -3,7 +3,7 @@ "textures": { "particle": "create:block/gearbox_top", "slit": "create:block/mechanical_saw_top", - "stonecutter_saw": "create:block/static_saw", + "stonecutter_saw": "block/stonecutter_saw", "gearbox_top": "create:block/gearbox_top", "encased_belt": "create:block/encased_chain_drive", "gearbox": "create:block/gearbox", diff --git a/src/main/resources/assets/create/models/block/portable_storage_interface/block.json b/src/main/resources/assets/create/models/block/portable_storage_interface/block.json index 79251958e..e124076ba 100644 --- a/src/main/resources/assets/create/models/block/portable_storage_interface/block.json +++ b/src/main/resources/assets/create/models/block/portable_storage_interface/block.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "textures": { "0": "create:block/portable_storage_interface", - "1": "create:block/brass_casing", - "particle": "create:block/brass_casing" + "1": "create:block/andesite_casing", + "particle": "create:block/andesite_casing" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/portable_storage_interface/item.json b/src/main/resources/assets/create/models/block/portable_storage_interface/item.json index 2b93d6cc3..c4d1328a4 100644 --- a/src/main/resources/assets/create/models/block/portable_storage_interface/item.json +++ b/src/main/resources/assets/create/models/block/portable_storage_interface/item.json @@ -2,13 +2,13 @@ "credit": "Made with Blockbench", "textures": { "0": "create:block/portable_storage_interface", - "1": "create:block/brass_casing", + "1": "create:block/andesite_casing", "particle": "create:block/portable_storage_interface" }, "elements": [ { - "from": [2, 10, 2], - "to": [14, 19, 14], + "from": [2, 7, 2], + "to": [14, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [10, 18, 10]}, "faces": { "north": {"uv": [1, 3.5, 7, 8], "texture": "#0"}, @@ -65,9 +65,9 @@ } }, { - "from": [3, 16, 3], - "to": [13, 23.1, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 24, 11]}, + "from": [3, 10, 3], + "to": [13, 17.1, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 18, 11]}, "faces": { "north": {"uv": [1.5, 0, 6.5, 3.5], "texture": "#0"}, "east": {"uv": [1.5, 0, 6.5, 3.5], "texture": "#0"}, @@ -76,9 +76,9 @@ } }, { - "from": [1, 23, 1], - "to": [15, 25, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]}, + "from": [1, 17, 1], + "to": [15, 19, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, "faces": { "north": {"uv": [8.5, 15, 15.5, 16], "texture": "#0"}, "east": {"uv": [8.5, 15, 15.5, 16], "texture": "#0"}, @@ -89,9 +89,9 @@ } }, { - "from": [4, 22.1, 13], - "to": [6, 24.1, 14], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 23, 13]}, + "from": [4, 16.1, 13], + "to": [6, 18.1, 14], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 17, 13]}, "faces": { "east": {"uv": [7.5, 10, 8, 10.5], "texture": "#0"}, "south": {"uv": [10, 15, 11, 16], "texture": "#0"}, @@ -99,9 +99,9 @@ } }, { - "from": [10, 22.1, 2], - "to": [12, 24.1, 3], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 23, 3]}, + "from": [10, 16.1, 2], + "to": [12, 18.1, 3], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 17, 3]}, "faces": { "north": {"uv": [10, 15, 11, 16], "texture": "#0"}, "east": {"uv": [7.5, 10, 8, 10.5], "texture": "#0"}, @@ -109,9 +109,9 @@ } }, { - "from": [2, 22.1, 4], - "to": [3, 24.1, 6], - "rotation": {"angle": 45, "axis": "z", "origin": [3, 23, 8]}, + "from": [2, 16.1, 4], + "to": [3, 18.1, 6], + "rotation": {"angle": 45, "axis": "z", "origin": [3, 17, 8]}, "faces": { "north": {"uv": [7.5, 10, 8, 10.5], "texture": "#0"}, "south": {"uv": [7.5, 10, 8, 10.5], "texture": "#0"}, @@ -119,9 +119,9 @@ } }, { - "from": [13, 22.1, 10], - "to": [14, 24.1, 12], - "rotation": {"angle": -45, "axis": "z", "origin": [13, 23, 8]}, + "from": [13, 16.1, 10], + "to": [14, 18.1, 12], + "rotation": {"angle": -45, "axis": "z", "origin": [13, 17, 8]}, "faces": { "north": {"uv": [7.5, 10, 8, 10.5], "texture": "#0"}, "east": {"uv": [10, 15, 11, 16], "texture": "#0"}, @@ -129,9 +129,9 @@ } }, { - "from": [10, 22.1, 13], - "to": [12, 24.1, 14], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 23, 13]}, + "from": [10, 16.1, 13], + "to": [12, 18.1, 14], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 17, 13]}, "faces": { "east": {"uv": [7.5, 10, 8, 10.5], "texture": "#0"}, "south": {"uv": [13, 15, 14, 16], "texture": "#0"}, @@ -139,9 +139,9 @@ } }, { - "from": [4, 22.1, 2], - "to": [6, 24.1, 3], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 23, 3]}, + "from": [4, 16.1, 2], + "to": [6, 18.1, 3], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 17, 3]}, "faces": { "north": {"uv": [13, 15, 14, 16], "texture": "#0"}, "east": {"uv": [7.5, 10, 8, 10.5], "texture": "#0"}, @@ -149,9 +149,9 @@ } }, { - "from": [2, 22.1, 10], - "to": [3, 24.1, 12], - "rotation": {"angle": 45, "axis": "z", "origin": [3, 23, 8]}, + "from": [2, 16.1, 10], + "to": [3, 18.1, 12], + "rotation": {"angle": 45, "axis": "z", "origin": [3, 17, 8]}, "faces": { "north": {"uv": [7.5, 10, 8, 10.5], "texture": "#0"}, "south": {"uv": [7.5, 10, 8, 10.5], "texture": "#0"}, @@ -159,9 +159,9 @@ } }, { - "from": [13, 22.1, 4], - "to": [14, 24.1, 6], - "rotation": {"angle": -45, "axis": "z", "origin": [13, 23, 8]}, + "from": [13, 16.1, 4], + "to": [14, 18.1, 6], + "rotation": {"angle": -45, "axis": "z", "origin": [13, 17, 8]}, "faces": { "north": {"uv": [7.5, 10, 8, 10.5], "texture": "#0"}, "east": {"uv": [13, 15, 14, 16], "texture": "#0"}, @@ -193,9 +193,9 @@ "scale": [0.25, 0.25, 0.25] }, "gui": { - "rotation": [30, 225, 0], - "translation": [0, -1.75, 0], - "scale": [0.45, 0.45, 0.45] + "rotation": [30, 135, 90], + "translation": [-0.5, 0, 0], + "scale": [0.625, 0.625, 0.625] }, "head": { "rotation": [-180, 0, 0], @@ -210,15 +210,18 @@ { "name": "Middle", "origin": [10, 22, 10], + "color": 0, "children": [0] }, { "name": "block", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "Base", "origin": [10, 20, 8], + "color": 0, "children": [1, 2, 3, 4] } ] @@ -226,10 +229,12 @@ { "name": "block_top", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "Top", "origin": [10, 22, 10], + "color": 0, "children": [5, 6, 7, 8, 9, 10, 11, 12, 13, 14] } ] diff --git a/src/main/resources/assets/create/textures/block/portable_storage_interface.png b/src/main/resources/assets/create/textures/block/portable_storage_interface.png index 39dc7611317d496897f267f5de1f360b121e9620..3566b15cc1002fa5f8dafb315c8620a91a3183da 100644 GIT binary patch delta 786 zcmbQmx|3~!3KwH>kh>GZx^prwCn^fpuL$r7admNawX=2f@%Hv`cek>%)z>#xQ`3r! zj0_10@%Q(ytFCrnWb|faj9_GRXJkraV3^Lpu#SP@ECa(*1_mW1^@xaw+qZ9@I&vgA zEjcPSs;#5FroN%6wWYqPsj{ZBslBbNvb?^f&A`AwO-)TsPEJ)-RbO8})l(zZsa{1; zP%zY5zADP3Bh|7g(JDVsyE4*PR#vua!i3`TVm&=Q6%`dfGnut3S28d#9G&(d0Z3Vt z1o;L3Cl4@K#|WMRn!#D%5n0So&%k$>0f-ro=dVa%U|_uF>Eak-;h#I{ZPjc8p4Qyc z%NF`xTGGl;wyliySh)N29M13c>DESnW?be{wmn|8F-6+Yck+aw2aW9wnn4l;U6XAT zML3%tcSfIO@O&g{@bdG*Z>n1+L>3?T50SBYILR8&-$b~Gj?CZl{f$e2eS9v+f!HF8WVcz;waf>bCvBoR|M8a^o! zA|fYGG8joO7g$(W5fKq4CMr))PcJVsOiN2dLq$3{Jw81_NJmHb@Q%U&0004WQchC< zK<3zH0004*Nklw1GA49)KMUbnfnv$|GM$K(?7{?E1q*^hPvIerI^$q4`e z;6v~{7$Jru$A1rlgS6lsd17#R4irc-@M4~WM;|aS_&kST16pJVc@8+D9W4XqISAw6 zSDwG^Op4uGj>GQNJLiC>5M?`3OQp0I-?Y(&AI-^F@U{Q=*zY6oY+ytBzAWpyC@(c_ zqCgG9H-}Pcf3t;(Oj-YM)TN;gMCN_Hd&mSY-9G=NcSGwyeh8ix-9Qgo0G*j zMeu*4S~X1nv&q}-|E*@hR6_QF1?Pu#xcK}F*=xxVs&ya=>ng+ya!@CS<#GLj-s8&} b`PTjd;sAj(9PU7)00000NkvXXu0mjfU6c{z diff --git a/src/main/resources/assets/create/textures/gui/advancements.png b/src/main/resources/assets/create/textures/gui/advancements.png new file mode 100644 index 0000000000000000000000000000000000000000..f2a8d700ea5269a3284b546652ea8f1e7fbde34f GIT binary patch literal 1374 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9GGLLkg|>2BR01_tK! znIRD+5xzcF$@#f@i7EL>sd^Q;1whpd3^w)^1&PVosU-?Ysp*+{wn|D0nJKnP;ikR@ zz6H*y8JQkcMXAA6ej&+K*~ykEO7?a(6;?paxv3?I3Kh9IdBs*0wn|_#t$=Khu)dN4 zSV>8?t&$_iGKC1=00rm#qErP_Jrmtz0|O%kLp=j9&`|(U`e3AMU|I01d`q;|3 zC^fMpzbGU>KgTY(G^w~GF)uk)0cdz;dR}UgjXt^>8-0*vNR~sqgCu~>HK`Su2v4Fo z2P6Y?4~T8$3M9f(i;98%vNJF;GO*Fd5Viq}1Y}mE=0vz;=BDO>6&spCm7+@^DUZaZ z97%#aAC_dM;qW0y2IfN$+sZRHF+DXrGo>WM4&-KZF&l({PikH|hAOBaL|H^oYH@x} zDJT`#nHxb3Ll%T6i^Qf3SrDQOp(->lv&0T&9-1(g00JipV3M{2CKy;ovP0y;)I4DB zD+gw?+4f6y85kHtJzX3_G(=M;I{LLZ2)N!};woU0bVB0zj2`ayFAQy3#EVu+`+E4u zs3%O3+i>^Ctn&sep37JKirv5J*Y$&k|K9b#E_-yNA=~lo|5WU!G7G5+mi?J0=lwgj ze&Q2hekqyfshr!_mcPxPB_sFU#L40G*XPSDwT+mr9xj^Y>pU-LamkC#>*lKRPdT(e zB~g=6QQOFA72lk@IgJK?U$|MA+!1A4$Ys{6yxNfI3DcMViwGZcJA+EQl zKU>>WP1IuVwx~{fTB3R+F82A&$_X8z3i~gtTBDag{nJI+_LUNy$(2i0l0=VGnS3(b zRkKNuYbV1;-TkidUdmqb4u=Y+E}taoE!82bsJrPo+hMt|V|(^ped23bJ+-CnsPC6p z-OrH=4JNIW6<>Asu|?+7EoqIxeXao|OSW3d!X%WC5i3OM?7@|DyngD|cor z1WIuhctjR6Fz_7$VMb96uLh7dPZ!4!jo{w1j(mp=I9MDOFiI!?_@7n0dEJ_*SE@I; zZwWH3+P{Zok&@U?##+5yA#WMXzvQJwFzx6r`LfQ8=|S-B=U=WQZenEen!N46hV?u7 zG9I&v-Z@gU%-~m37sq@(iQl?LY;rZ5A3ot+mA9Lj>%UM(z*V5V44$rjF6*2UngChv BZ0G<0 delta 199 zcmZ3*be(a6L_G^L0|Ud`yN`l^6id3JuOkD)#(wTUiL5}rT!2rAE0C^rvD;T0d1q?w zG+&Qp8Nq*#P4Sdaj!@OkGB>x5VC)8}U@Qsp3ubV5b|VeQ3HNky4B@z*oN$0Wt>|0^ z!^Jr#C!bYokeqmOrLmQRk?~cdvr^m=7FTsbm#I3GF-Rt!3|6aD5i=-gSyEcEB~#46 wV9TzORa^YnwbJzGTkYM$kfT)17{@Kiko{F`=MPcuMxY%Gp00i_>zopr0D<{KhX4Qo diff --git a/src/main/resources/assets/create/textures/item/crushed_gold_ore.png b/src/main/resources/assets/create/textures/item/crushed_gold_ore.png index 71f1e2dc251fa4bae590c4c0d5348749340b235f..b547bcd820c38955b734117782720bf5b607d780 100644 GIT binary patch delta 237 zcmcb~*uykILX3l%fq_9omp>RtF%}28J29*~C-ZWmqHw)*fKQ0)rWCOaQumOj2t`N_6`;R`iS6r$ya`Pu!EKpPo6UHx3vIVCg!0B5vWSpWb4 delta 201 zcmeBSy2&^}qMn7Bfq~)e-A6${iY49A*O7r?V?XzwL{=bQF~BFp6-fX8|NrmT_&d{t z|NnjP>zdcgjiP^lOfS`7n&iT{DMe6u-kUu@MT{jue!&b5&u*jvIbohIjv*Y^lM@bb zhv_l|$E?1y`aq9sXy4M!4oRoC9BN(8cy!0AP191>I{C~xaNy~_BgJ7aw{Y^z(LCKc zP5gXTLc$Ci%bKhZ_5efoolMh44$rjF6*2UngHVn BQtAKz diff --git a/src/main/resources/assets/create/textures/item/crushed_iron_ore.png b/src/main/resources/assets/create/textures/item/crushed_iron_ore.png index 64758072163d4c67a261ea9ae3d7189ea7297595..eb784c2cf711380022b56008cc03eb45a1cd39d9 100644 GIT binary patch delta 236 zcmcb{*v&LSLX3l%fq_9omp>RtF%}28J29*~C-ZWmqHw)*fKP~PM@eY7ujTr_@|Pzz z-dI2R-@Oz6zPz)8S2 c_zSg+IxpE29OJ}QfEF@%y85}Sb4q9e089^Fga7~l delta 198 zcmeBXy2dy`qMn7Bfq~)e-A6${iY49A*O7r?V?XzwL{=bQF2E8^R}`^q1jJz#HPRFWDM7v%Ls?79w61!GB&UoeBivm0qZPMD{QV+hCf(gLgmAL+ejy}8ek+`^q>rQM8M_ff_Ck9(h0$Rb~>FVdQ&MBb@06fG;r~m)} diff --git a/src/main/resources/assets/create/textures/item/crushed_zinc_ore.png b/src/main/resources/assets/create/textures/item/crushed_zinc_ore.png index 2ffdcae38f57f4880b230f0ee623bbf553707298..b861bac0568a4c6beaf5c2878da1aeac6a46b3de 100644 GIT binary patch delta 256 zcmcb_IG<^Pgct`i0|SGGE`KnPVk{1FcVbv~PUhuAMd5n&0G|+7$DHhGJLX+{b3Hph z>;M1%@87+PZ>czTY{&FjQ_MVllCl%koE(8V*M?r(2&8yRg8YJk%HV*(_JvX#P=d3- zBeIx*f$uN~Gak=hkpdLV@N{tu(FpE68_jn_frB;R!zu4O|Et)eE~|YuE*6ewp3`yZ z->Lr&{>5DUhwffw%Vc8>gMB@ZnS{9|rg56KSY>}{nvk}CqSdRW uwGU=Vm!-9>Us1Gg@7m?38qN17yyq9$&bi5~MworGF zoUDCN=iJP;snZhnrM?jPnCZ}%@bG1D^D=dVg0>mfDOFi)sskd?~fQ0L+~o$kG)qfWC4w5@O1TaS?83{1OSO|O9B7@ diff --git a/src/main/resources/assets/create/textures/item/experience_nugget.png b/src/main/resources/assets/create/textures/item/experience_nugget.png new file mode 100644 index 0000000000000000000000000000000000000000..a5e27e225a36d4153a5b42205aa5230c0312a790 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}%0G|+7#bl!!Polp5@89_(Dsn@(q@A1P1RwQMYoL75robyeinAohFZe$c zFa-No2!R9(JR*x382Ao>Fr%o3R|8Pc)zif>L?d``^k;$#&?+o RX8;Xk@O1TaS?83{1OP?iO_=}y literal 0 HcmV?d00001