From 2229ae9226ad79820beaa35140d9dd473906f90f Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 5 Oct 2024 00:45:43 +0200 Subject: [PATCH] chore: rename crafter to autocrafter To make things more clear. --- .idea/dictionaries/refinedstorage.xml | 5 +- CHANGELOG.md | 3 +- .../refinedstorage/common/api/grid/Grid.java | 2 +- .../view/AbstractPlatformGridResource.java | 12 ++-- .../api/support/resource/ResourceType.java | 2 +- .../blockstates/autocrafter.json | 56 ++++++++++++++++++ .../blockstates/black_autocrafter.json | 56 ++++++++++++++++++ ...lue_crafter.json => blue_autocrafter.json} | 24 ++++---- .../blockstates/brown_autocrafter.json | 56 ++++++++++++++++++ ...own_crafter.json => cyan_autocrafter.json} | 24 ++++---- .../blockstates/cyan_crafter.json | 56 ------------------ .../{crafter.json => gray_autocrafter.json} | 24 ++++---- .../blockstates/gray_crafter.json | 56 ------------------ .../blockstates/green_autocrafter.json | 56 ++++++++++++++++++ .../blockstates/green_crafter.json | 56 ------------------ .../blockstates/light_gray_autocrafter.json | 56 ++++++++++++++++++ .../blockstates/light_gray_crafter.json | 56 ------------------ .../blockstates/lime_autocrafter.json | 56 ++++++++++++++++++ .../blockstates/lime_crafter.json | 56 ------------------ .../blockstates/magenta_autocrafter.json | 56 ++++++++++++++++++ .../blockstates/magenta_crafter.json | 56 ------------------ .../blockstates/orange_autocrafter.json | 56 ++++++++++++++++++ .../blockstates/orange_crafter.json | 56 ------------------ .../blockstates/pink_autocrafter.json | 56 ++++++++++++++++++ .../blockstates/pink_crafter.json | 56 ------------------ .../blockstates/purple_autocrafter.json | 56 ++++++++++++++++++ .../blockstates/purple_crafter.json | 56 ------------------ ...lack_crafter.json => red_autocrafter.json} | 24 ++++---- .../blockstates/red_crafter.json | 56 ------------------ .../blockstates/white_autocrafter.json | 56 ++++++++++++++++++ .../blockstates/white_crafter.json | 56 ------------------ .../blockstates/yellow_autocrafter.json | 56 ++++++++++++++++++ .../blockstates/yellow_crafter.json | 56 ------------------ .../models/block/autocrafter/black.json | 18 ++++++ .../models/block/autocrafter/blue.json | 18 ++++++ .../models/block/autocrafter/brown.json | 18 ++++++ .../models/block/autocrafter/cyan.json | 18 ++++++ .../models/block/autocrafter/gray.json | 18 ++++++ .../models/block/autocrafter/green.json | 18 ++++++ .../models/block/autocrafter/inactive.json | 18 ++++++ .../models/block/autocrafter/light_blue.json | 18 ++++++ .../models/block/autocrafter/light_gray.json | 18 ++++++ .../models/block/autocrafter/lime.json | 18 ++++++ .../models/block/autocrafter/magenta.json | 18 ++++++ .../models/block/autocrafter/orange.json | 18 ++++++ .../models/block/autocrafter/pink.json | 18 ++++++ .../models/block/autocrafter/purple.json | 18 ++++++ .../models/block/autocrafter/red.json | 18 ++++++ .../models/block/autocrafter/white.json | 18 ++++++ .../models/block/autocrafter/yellow.json | 18 ++++++ .../models/block/crafter/black.json | 18 ------ .../models/block/crafter/blue.json | 18 ------ .../models/block/crafter/brown.json | 18 ------ .../models/block/crafter/cyan.json | 18 ------ .../models/block/crafter/gray.json | 18 ------ .../models/block/crafter/green.json | 18 ------ .../models/block/crafter/inactive.json | 18 ------ .../models/block/crafter/light_blue.json | 18 ------ .../models/block/crafter/light_gray.json | 18 ------ .../models/block/crafter/lime.json | 18 ------ .../models/block/crafter/magenta.json | 18 ------ .../models/block/crafter/orange.json | 18 ------ .../models/block/crafter/pink.json | 18 ------ .../models/block/crafter/purple.json | 18 ------ .../models/block/crafter/red.json | 18 ------ .../models/block/crafter/white.json | 18 ------ .../models/block/crafter/yellow.json | 18 ------ .../models/item/autocrafter.json | 3 + .../models/item/black_autocrafter.json | 3 + .../models/item/black_crafter.json | 3 - .../models/item/blue_autocrafter.json | 3 + .../models/item/blue_crafter.json | 3 - .../models/item/brown_autocrafter.json | 3 + .../models/item/brown_crafter.json | 3 - .../refinedstorage/models/item/crafter.json | 3 - .../models/item/cyan_autocrafter.json | 3 + .../models/item/cyan_crafter.json | 3 - .../models/item/gray_autocrafter.json | 3 + .../models/item/gray_crafter.json | 3 - .../models/item/green_autocrafter.json | 3 + .../models/item/green_crafter.json | 3 - .../models/item/light_gray_autocrafter.json | 3 + .../models/item/light_gray_crafter.json | 3 - .../models/item/lime_autocrafter.json | 3 + .../models/item/lime_crafter.json | 3 - .../models/item/magenta_autocrafter.json | 3 + .../models/item/magenta_crafter.json | 3 - .../models/item/orange_autocrafter.json | 3 + .../models/item/orange_crafter.json | 3 - .../models/item/pink_autocrafter.json | 3 + .../models/item/pink_crafter.json | 3 - .../models/item/purple_autocrafter.json | 3 + .../models/item/purple_crafter.json | 3 - .../models/item/red_autocrafter.json | 3 + .../models/item/red_crafter.json | 3 - .../models/item/white_autocrafter.json | 3 + .../models/item/white_crafter.json | 3 - .../models/item/yellow_autocrafter.json | 3 + .../models/item/yellow_crafter.json | 3 - .../misc/coloring/black_autocrafter.json | 32 ++++++++++ ...ack_crafter.json => blue_autocrafter.json} | 10 ++-- .../misc/coloring/brown_autocrafter.json | 32 ++++++++++ ...lue_crafter.json => cyan_autocrafter.json} | 10 ++-- ...own_crafter.json => gray_autocrafter.json} | 10 ++-- .../recipes/misc/coloring/gray_crafter.json | 32 ---------- .../misc/coloring/green_autocrafter.json | 32 ++++++++++ .../recipes/misc/coloring/green_crafter.json | 32 ---------- .../misc/coloring/light_blue_autocrafter.json | 32 ++++++++++ .../misc/coloring/light_blue_crafter.json | 32 ---------- .../misc/coloring/light_gray_autocrafter.json | 32 ++++++++++ .../misc/coloring/light_gray_crafter.json | 32 ---------- .../misc/coloring/lime_autocrafter.json | 32 ++++++++++ .../recipes/misc/coloring/lime_crafter.json | 32 ---------- .../misc/coloring/magenta_autocrafter.json | 32 ++++++++++ .../misc/coloring/magenta_crafter.json | 32 ---------- .../misc/coloring/orange_autocrafter.json | 32 ++++++++++ .../recipes/misc/coloring/orange_crafter.json | 32 ---------- .../misc/coloring/pink_autocrafter.json | 32 ++++++++++ .../recipes/misc/coloring/pink_crafter.json | 32 ---------- .../misc/coloring/purple_autocrafter.json | 32 ++++++++++ .../recipes/misc/coloring/purple_crafter.json | 32 ---------- ...cyan_crafter.json => red_autocrafter.json} | 10 ++-- .../recipes/misc/coloring/red_crafter.json | 32 ---------- .../misc/coloring/white_autocrafter.json | 32 ++++++++++ .../recipes/misc/coloring/white_crafter.json | 32 ---------- .../misc/coloring/yellow_autocrafter.json | 32 ++++++++++ .../recipes/misc/coloring/yellow_crafter.json | 32 ---------- .../blocks/{crafter.json => autocrafter.json} | 4 +- .../loot_table/blocks/black_autocrafter.json | 30 ++++++++++ ...lue_crafter.json => blue_autocrafter.json} | 4 +- .../loot_table/blocks/brown_autocrafter.json | 30 ++++++++++ ...own_crafter.json => cyan_autocrafter.json} | 4 +- .../loot_table/blocks/cyan_crafter.json | 30 ---------- .../loot_table/blocks/gray_autocrafter.json | 30 ++++++++++ .../loot_table/blocks/gray_crafter.json | 30 ---------- .../loot_table/blocks/green_autocrafter.json | 30 ++++++++++ .../loot_table/blocks/green_crafter.json | 30 ---------- .../blocks/light_gray_autocrafter.json | 30 ++++++++++ .../loot_table/blocks/light_gray_crafter.json | 30 ---------- .../loot_table/blocks/lime_autocrafter.json | 30 ++++++++++ .../loot_table/blocks/lime_crafter.json | 30 ---------- .../blocks/magenta_autocrafter.json | 30 ++++++++++ .../loot_table/blocks/magenta_crafter.json | 30 ---------- .../loot_table/blocks/orange_autocrafter.json | 30 ++++++++++ .../loot_table/blocks/orange_crafter.json | 30 ---------- .../loot_table/blocks/pink_autocrafter.json | 30 ++++++++++ .../loot_table/blocks/pink_crafter.json | 30 ---------- .../loot_table/blocks/purple_autocrafter.json | 30 ++++++++++ .../loot_table/blocks/purple_crafter.json | 30 ---------- ...lack_crafter.json => red_autocrafter.json} | 4 +- .../loot_table/blocks/red_crafter.json | 30 ---------- .../loot_table/blocks/white_autocrafter.json | 30 ++++++++++ .../loot_table/blocks/white_crafter.json | 30 ---------- .../loot_table/blocks/yellow_autocrafter.json | 30 ++++++++++ .../loot_table/blocks/yellow_crafter.json | 30 ---------- ...ck_crafter.json => black_autocrafter.json} | 4 +- ...lue_crafter.json => blue_autocrafter.json} | 4 +- ...wn_crafter.json => brown_autocrafter.json} | 4 +- ...yan_crafter.json => cyan_autocrafter.json} | 4 +- ...ray_crafter.json => gray_autocrafter.json} | 4 +- ...en_crafter.json => green_autocrafter.json} | 4 +- ...after.json => light_blue_autocrafter.json} | 4 +- ...after.json => light_gray_autocrafter.json} | 4 +- ...ime_crafter.json => lime_autocrafter.json} | 4 +- ..._crafter.json => magenta_autocrafter.json} | 4 +- ...e_crafter.json => orange_autocrafter.json} | 4 +- ...ink_crafter.json => pink_autocrafter.json} | 4 +- ...e_crafter.json => purple_autocrafter.json} | 4 +- ...{red_crafter.json => red_autocrafter.json} | 4 +- ...te_crafter.json => white_autocrafter.json} | 4 +- ...w_crafter.json => yellow_autocrafter.json} | 4 +- .../tags/item/autocrafters.json | 20 +++++++ .../refinedstorage/tags/item/crafters.json | 20 ------- .../common/AbstractClientModInitializer.java | 4 +- .../common/AbstractModInitializer.java | 24 ++++---- .../refinedstorage/common/Config.java | 2 +- ...rafterBlock.java => AutocrafterBlock.java} | 16 ++--- ...ntity.java => AutocrafterBlockEntity.java} | 46 +++++++------- ...ava => AutocrafterConnectionStrategy.java} | 4 +- ...enu.java => AutocrafterContainerMenu.java} | 52 ++++++++-------- .../common/autocrafting/AutocrafterData.java | 13 ++++ ...pes.java => AutocrafterPropertyTypes.java} | 4 +- ...fterScreen.java => AutocrafterScreen.java} | 32 +++++----- .../common/autocrafting/CrafterData.java | 13 ---- .../LockModeSideButtonWidget.java | 14 ++--- .../common/autocrafting/PatternInventory.java | 4 +- .../common/autocrafting/PatternRendering.java | 2 +- .../common/autocrafting/PatternSlot.java | 2 +- .../ProcessingPatternGridRenderer.java | 2 +- .../common/content/BlockEntities.java | 12 ++-- .../refinedstorage/common/content/Blocks.java | 14 ++--- .../common/content/ContentIds.java | 2 +- .../common/content/ContentNames.java | 2 +- .../common/content/CreativeModeTabItems.java | 2 +- .../common/content/DefaultEnergyUsage.java | 2 +- .../refinedstorage/common/content/Items.java | 10 ++-- .../refinedstorage/common/content/Menus.java | 12 ++-- .../refinedstorage/common/content/Tags.java | 2 +- .../common/grid/AbstractGridBlockEntity.java | 2 +- .../grid/AbstractGridContainerMenu.java | 7 ++- .../refinedstorage/common/grid/GridData.java | 6 +- .../common/grid/GridViewType.java | 10 ++-- .../common/grid/WirelessGrid.java | 2 +- .../grid/screen/AbstractGridScreen.java | 10 ++-- .../grid/screen/ViewTypeSideButtonWidget.java | 14 ++--- .../AbstractFluidGridResourceFactory.java | 4 +- .../view/AbstractItemGridResourceFactory.java | 4 +- .../view/CompositeGridResourceFactory.java | 4 +- .../common/grid/view/FluidGridResource.java | 4 +- .../common/grid/view/ItemGridResource.java | 4 +- .../storage/portablegrid/PortableGrid.java | 2 +- .../c2s/AutocrafterNameChangePacket.java | 33 +++++++++++ .../common/support/packet/c2s/C2SPackets.java | 4 +- .../packet/c2s/CrafterNameChangePacket.java | 33 ----------- .../s2c/AutocrafterNameUpdatePacket.java | 34 +++++++++++ .../packet/s2c/CrafterNameUpdatePacket.java | 34 ----------- .../common/support/packet/s2c/S2CPackets.java | 4 +- .../support/resource/FluidResourceType.java | 4 +- .../support/resource/ItemResourceType.java | 4 +- .../common/upgrade/UpgradeDestinations.java | 2 +- .../assets/refinedstorage/lang/en_us.json | 44 +++++++------- .../cutouts/side/black.png | Bin .../cutouts/side/blue.png | Bin .../cutouts/side/brown.png | Bin .../cutouts/side/cyan.png | Bin .../cutouts/side/gray.png | Bin .../cutouts/side/green.png | Bin .../cutouts/side/inactive.png | Bin .../cutouts/side/light_blue.png | Bin .../cutouts/side/light_gray.png | Bin .../cutouts/side/lime.png | Bin .../cutouts/side/magenta.png | Bin .../cutouts/side/orange.png | Bin .../cutouts/side/pink.png | Bin .../cutouts/side/purple.png | Bin .../cutouts/side/red.png | Bin .../cutouts/side/white.png | Bin .../cutouts/side/yellow.png | Bin .../cutouts/top/black.png | Bin .../cutouts/top/blue.png | Bin .../cutouts/top/brown.png | Bin .../cutouts/top/cyan.png | Bin .../cutouts/top/gray.png | Bin .../cutouts/top/green.png | Bin .../cutouts/top/inactive.png | Bin .../cutouts/top/light_blue.png | Bin .../cutouts/top/light_gray.png | Bin .../cutouts/top/lime.png | Bin .../cutouts/top/magenta.png | Bin .../cutouts/top/orange.png | Bin .../cutouts/top/pink.png | Bin .../cutouts/top/purple.png | Bin .../cutouts/top/red.png | Bin .../cutouts/top/white.png | Bin .../cutouts/top/yellow.png | Bin .../block/{crafter => autocrafter}/side.png | Bin .../block/{crafter => autocrafter}/top.png | Bin ...{crafter_name.png => autocrafter_name.png} | Bin .../lock_until_all_outputs_are_received.png | Bin .../lock_until_connected_machine_is_empty.png | Bin .../lock_until_high_redstone_signal.png | Bin .../lock_until_low_redstone_signal.png | Bin .../lock_until_redstone_pulse_is_received.png | Bin .../never.png | Bin .../advancement/autocrafting.json | 6 +- .../recipe/{crafter.json => autocrafter.json} | 2 +- .../fabric/ClientModInitializerImpl.java | 22 +++---- .../refinedstorage/fabric/ConfigImpl.java | 8 +-- .../fabric/ModInitializerImpl.java | 18 +++--- .../api/grid/view/GridResource.java | 2 +- .../api/grid/view/GridResourceFactory.java | 6 +- .../api/grid/view/GridView.java | 4 +- .../api/grid/view/GridViewBuilder.java | 4 +- .../api/grid/view/GridViewBuilderImpl.java | 8 +-- .../api/grid/view/GridViewImpl.java | 28 ++++----- .../grid/query/GridQueryParserImplTest.java | 2 +- .../api/grid/view/GridResourceImpl.java | 14 ++--- .../api/grid/view/GridViewImplTest.java | 38 ++++++------ .../refinedstorage/neoforge/ConfigImpl.java | 8 +-- .../neoforge/ModInitializer.java | 18 +++--- .../datagen/BlockModelProviderImpl.java | 22 +++---- .../datagen/BlockStateProviderImpl.java | 14 ++--- .../datagen/ItemModelProviderImpl.java | 8 +-- .../datagen/loot/BlockDropProvider.java | 4 +- .../recipe/RecoloringRecipeProvider.java | 6 +- .../datagen/tag/ItemTagsProviderImpl.java | 6 +- 286 files changed, 2317 insertions(+), 2312 deletions(-) create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/autocrafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_autocrafter.json rename refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/{blue_crafter.json => blue_autocrafter.json} (52%) create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_autocrafter.json rename refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/{brown_crafter.json => cyan_autocrafter.json} (52%) delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafter.json rename refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/{crafter.json => gray_autocrafter.json} (52%) delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_crafter.json rename refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/{black_crafter.json => red_autocrafter.json} (53%) delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/black.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/blue.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/brown.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/cyan.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/gray.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/green.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/inactive.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/light_blue.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/light_gray.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/lime.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/magenta.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/orange.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/pink.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/purple.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/red.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/white.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/yellow.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/black.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/blue.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/brown.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/cyan.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/gray.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/green.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/inactive.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/light_blue.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/light_gray.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/lime.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/magenta.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/orange.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/pink.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/purple.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/red.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/white.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/yellow.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/autocrafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_crafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_autocrafter.json rename refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/{black_crafter.json => blue_autocrafter.json} (65%) create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_autocrafter.json rename refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/{blue_crafter.json => cyan_autocrafter.json} (65%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/{brown_crafter.json => gray_autocrafter.json} (65%) delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_crafter.json rename refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/{cyan_crafter.json => red_autocrafter.json} (65%) delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_crafter.json rename refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/{crafter.json => autocrafter.json} (81%) create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_autocrafter.json rename refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/{blue_crafter.json => blue_autocrafter.json} (80%) create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_autocrafter.json rename refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/{brown_crafter.json => cyan_autocrafter.json} (80%) delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_crafter.json rename refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/{black_crafter.json => red_autocrafter.json} (80%) delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_crafter.json create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_autocrafter.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_crafter.json rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{black_crafter.json => black_autocrafter.json} (66%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{blue_crafter.json => blue_autocrafter.json} (67%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{brown_crafter.json => brown_autocrafter.json} (66%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{cyan_crafter.json => cyan_autocrafter.json} (67%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{gray_crafter.json => gray_autocrafter.json} (67%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{green_crafter.json => green_autocrafter.json} (66%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{light_blue_crafter.json => light_blue_autocrafter.json} (69%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{light_gray_crafter.json => light_gray_autocrafter.json} (66%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{lime_crafter.json => lime_autocrafter.json} (67%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{magenta_crafter.json => magenta_autocrafter.json} (66%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{orange_crafter.json => orange_autocrafter.json} (66%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{pink_crafter.json => pink_autocrafter.json} (67%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{purple_crafter.json => purple_autocrafter.json} (66%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{red_crafter.json => red_autocrafter.json} (67%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{white_crafter.json => white_autocrafter.json} (66%) rename refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/{yellow_crafter.json => yellow_autocrafter.json} (66%) create mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/autocrafters.json delete mode 100644 refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/crafters.json rename refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/{CrafterBlock.java => AutocrafterBlock.java} (82%) rename refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/{CrafterBlockEntity.java => AutocrafterBlockEntity.java} (85%) rename refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/{CrafterConnectionStrategy.java => AutocrafterConnectionStrategy.java} (83%) rename refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/{CrafterContainerMenu.java => AutocrafterContainerMenu.java} (73%) create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterData.java rename refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/{CrafterPropertyTypes.java => AutocrafterPropertyTypes.java} (89%) rename refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/{CrafterScreen.java => AutocrafterScreen.java} (89%) delete mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterData.java create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/AutocrafterNameChangePacket.java delete mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/CrafterNameChangePacket.java create mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/AutocrafterNameUpdatePacket.java delete mode 100644 refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/CrafterNameUpdatePacket.java rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/black.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/blue.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/brown.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/cyan.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/gray.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/green.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/inactive.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/light_blue.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/light_gray.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/lime.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/magenta.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/orange.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/pink.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/purple.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/red.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/white.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/side/yellow.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/black.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/blue.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/brown.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/cyan.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/gray.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/green.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/inactive.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/light_blue.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/light_gray.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/lime.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/magenta.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/orange.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/pink.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/purple.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/red.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/white.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/cutouts/top/yellow.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/side.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/{crafter => autocrafter}/top.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/{crafter_name.png => autocrafter_name.png} (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/{crafter_lock_mode => autocrafter_lock_mode}/lock_until_all_outputs_are_received.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/{crafter_lock_mode => autocrafter_lock_mode}/lock_until_connected_machine_is_empty.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/{crafter_lock_mode => autocrafter_lock_mode}/lock_until_high_redstone_signal.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/{crafter_lock_mode => autocrafter_lock_mode}/lock_until_low_redstone_signal.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/{crafter_lock_mode => autocrafter_lock_mode}/lock_until_redstone_pulse_is_received.png (100%) rename refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/{crafter_lock_mode => autocrafter_lock_mode}/never.png (100%) rename refinedstorage-common/src/main/resources/data/refinedstorage/recipe/{crafter.json => autocrafter.json} (92%) diff --git a/.idea/dictionaries/refinedstorage.xml b/.idea/dictionaries/refinedstorage.xml index 5731caf61..5d8aa73fa 100644 --- a/.idea/dictionaries/refinedstorage.xml +++ b/.idea/dictionaries/refinedstorage.xml @@ -3,12 +3,11 @@ allowlist autocraftable + autocrafter + autocrafters autocrafting autoselected blocklist - craftable - crafter - crafters cullface emissive firstperson diff --git a/CHANGELOG.md b/CHANGELOG.md index afca303c7..0ac637d70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ### Added -- Crafter +- Autocrafter ### Changed @@ -32,6 +32,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - The numbers on the crafting preview screen are now compacted with units. - When requesting autocrafting multiple resources at once, which can happen via a recipe mod, all the crafting requests are now listed on the side of the GUI. - You can now request autocrafting from the Storage Monitor if the resource count reaches zero. +- The Crafter has been renamed to "Autocrafter". ### Fixed diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/Grid.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/Grid.java index e02e7412e..6c999dd42 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/Grid.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/Grid.java @@ -27,7 +27,7 @@ public interface Grid extends AutocraftingPreviewProvider { List getResources(Class actorType); - Set getCraftableResources(); + Set getAutocraftableResources(); GridOperations createOperations(ResourceType resourceType, ServerPlayer player); } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/view/AbstractPlatformGridResource.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/view/AbstractPlatformGridResource.java index a1d5a8008..07a05b6b0 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/view/AbstractPlatformGridResource.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/grid/view/AbstractPlatformGridResource.java @@ -18,16 +18,16 @@ public abstract class AbstractPlatformGridResource> attributes; - private final boolean craftable; + private final boolean autocraftable; protected AbstractPlatformGridResource(final T resource, final String name, final Map> attributes, - final boolean craftable) { + final boolean autocraftable) { this.resource = resource; this.name = name; this.attributes = attributes; - this.craftable = craftable; + this.autocraftable = autocraftable; } @Override @@ -51,8 +51,8 @@ public Set getAttribute(final GridResourceAttributeKey key) { } @Override - public boolean isCraftable() { - return craftable; + public boolean isAutocraftable() { + return autocraftable; } @Nullable @@ -67,7 +67,7 @@ public String toString() { + "resource=" + resource + ", name='" + name + '\'' + ", attributes=" + attributes - + ", craftable=" + craftable + + ", autocraftable=" + autocraftable + '}'; } } diff --git a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceType.java b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceType.java index d31f1e176..a622ae8f4 100644 --- a/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceType.java +++ b/refinedstorage-common-api/src/main/java/com/refinedmods/refinedstorage/common/api/support/resource/ResourceType.java @@ -29,7 +29,7 @@ public interface ResourceType { double getDisplayAmount(long amount); - Optional toGridResource(ResourceKey resource, boolean craftable); + Optional toGridResource(ResourceKey resource, boolean autocraftable); long getInterfaceExportLimit(); diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/autocrafter.json new file mode 100644 index 000000000..1d0dae569 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/autocrafter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 180 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/autocrafter/inactive" + }, + "active=false,direction=west": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/autocrafter/light_blue", + "x": 180 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/autocrafter/light_blue", + "x": 90, + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/autocrafter/light_blue", + "x": 90 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/autocrafter/light_blue", + "x": 90, + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/autocrafter/light_blue" + }, + "active=true,direction=west": { + "model": "refinedstorage:block/autocrafter/light_blue", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_autocrafter.json new file mode 100644 index 000000000..6d5161a9e --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_autocrafter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 180 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/autocrafter/inactive" + }, + "active=false,direction=west": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/autocrafter/black", + "x": 180 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/autocrafter/black", + "x": 90, + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/autocrafter/black", + "x": 90 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/autocrafter/black", + "x": 90, + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/autocrafter/black" + }, + "active=true,direction=west": { + "model": "refinedstorage:block/autocrafter/black", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_autocrafter.json similarity index 52% rename from refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_crafter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_autocrafter.json index 67a82b4c7..651846801 100644 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_crafter.json +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/blue_autocrafter.json @@ -1,54 +1,54 @@ { "variants": { "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 180 }, "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90, "y": 90 }, "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90 }, "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90, "y": 180 }, "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" + "model": "refinedstorage:block/autocrafter/inactive" }, "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90, "y": 270 }, "active=true,direction=down": { - "model": "refinedstorage:block/crafter/blue", + "model": "refinedstorage:block/autocrafter/blue", "x": 180 }, "active=true,direction=east": { - "model": "refinedstorage:block/crafter/blue", + "model": "refinedstorage:block/autocrafter/blue", "x": 90, "y": 90 }, "active=true,direction=north": { - "model": "refinedstorage:block/crafter/blue", + "model": "refinedstorage:block/autocrafter/blue", "x": 90 }, "active=true,direction=south": { - "model": "refinedstorage:block/crafter/blue", + "model": "refinedstorage:block/autocrafter/blue", "x": 90, "y": 180 }, "active=true,direction=up": { - "model": "refinedstorage:block/crafter/blue" + "model": "refinedstorage:block/autocrafter/blue" }, "active=true,direction=west": { - "model": "refinedstorage:block/crafter/blue", + "model": "refinedstorage:block/autocrafter/blue", "x": 90, "y": 270 } diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_autocrafter.json new file mode 100644 index 000000000..13c577b7d --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_autocrafter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 180 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/autocrafter/inactive" + }, + "active=false,direction=west": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/autocrafter/brown", + "x": 180 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/autocrafter/brown", + "x": 90, + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/autocrafter/brown", + "x": 90 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/autocrafter/brown", + "x": 90, + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/autocrafter/brown" + }, + "active=true,direction=west": { + "model": "refinedstorage:block/autocrafter/brown", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_autocrafter.json similarity index 52% rename from refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_crafter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_autocrafter.json index f7e980273..368f9eddf 100644 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/brown_crafter.json +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_autocrafter.json @@ -1,54 +1,54 @@ { "variants": { "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 180 }, "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90, "y": 90 }, "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90 }, "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90, "y": 180 }, "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" + "model": "refinedstorage:block/autocrafter/inactive" }, "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90, "y": 270 }, "active=true,direction=down": { - "model": "refinedstorage:block/crafter/brown", + "model": "refinedstorage:block/autocrafter/cyan", "x": 180 }, "active=true,direction=east": { - "model": "refinedstorage:block/crafter/brown", + "model": "refinedstorage:block/autocrafter/cyan", "x": 90, "y": 90 }, "active=true,direction=north": { - "model": "refinedstorage:block/crafter/brown", + "model": "refinedstorage:block/autocrafter/cyan", "x": 90 }, "active=true,direction=south": { - "model": "refinedstorage:block/crafter/brown", + "model": "refinedstorage:block/autocrafter/cyan", "x": 90, "y": 180 }, "active=true,direction=up": { - "model": "refinedstorage:block/crafter/brown" + "model": "refinedstorage:block/autocrafter/cyan" }, "active=true,direction=west": { - "model": "refinedstorage:block/crafter/brown", + "model": "refinedstorage:block/autocrafter/cyan", "x": 90, "y": 270 } diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafter.json deleted file mode 100644 index ec6336bdc..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/cyan_crafter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", - "x": 180 - }, - "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90 - }, - "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" - }, - "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage:block/crafter/cyan", - "x": 180 - }, - "active=true,direction=east": { - "model": "refinedstorage:block/crafter/cyan", - "x": 90, - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage:block/crafter/cyan", - "x": 90 - }, - "active=true,direction=south": { - "model": "refinedstorage:block/crafter/cyan", - "x": 90, - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage:block/crafter/cyan" - }, - "active=true,direction=west": { - "model": "refinedstorage:block/crafter/cyan", - "x": 90, - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_autocrafter.json similarity index 52% rename from refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/crafter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_autocrafter.json index ebb944768..771e3641a 100644 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/crafter.json +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_autocrafter.json @@ -1,54 +1,54 @@ { "variants": { "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 180 }, "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90, "y": 90 }, "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90 }, "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90, "y": 180 }, "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" + "model": "refinedstorage:block/autocrafter/inactive" }, "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90, "y": 270 }, "active=true,direction=down": { - "model": "refinedstorage:block/crafter/light_blue", + "model": "refinedstorage:block/autocrafter/gray", "x": 180 }, "active=true,direction=east": { - "model": "refinedstorage:block/crafter/light_blue", + "model": "refinedstorage:block/autocrafter/gray", "x": 90, "y": 90 }, "active=true,direction=north": { - "model": "refinedstorage:block/crafter/light_blue", + "model": "refinedstorage:block/autocrafter/gray", "x": 90 }, "active=true,direction=south": { - "model": "refinedstorage:block/crafter/light_blue", + "model": "refinedstorage:block/autocrafter/gray", "x": 90, "y": 180 }, "active=true,direction=up": { - "model": "refinedstorage:block/crafter/light_blue" + "model": "refinedstorage:block/autocrafter/gray" }, "active=true,direction=west": { - "model": "refinedstorage:block/crafter/light_blue", + "model": "refinedstorage:block/autocrafter/gray", "x": 90, "y": 270 } diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_crafter.json deleted file mode 100644 index 0d17db938..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/gray_crafter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", - "x": 180 - }, - "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90 - }, - "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" - }, - "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage:block/crafter/gray", - "x": 180 - }, - "active=true,direction=east": { - "model": "refinedstorage:block/crafter/gray", - "x": 90, - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage:block/crafter/gray", - "x": 90 - }, - "active=true,direction=south": { - "model": "refinedstorage:block/crafter/gray", - "x": 90, - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage:block/crafter/gray" - }, - "active=true,direction=west": { - "model": "refinedstorage:block/crafter/gray", - "x": 90, - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_autocrafter.json new file mode 100644 index 000000000..3ac5c3abc --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_autocrafter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 180 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/autocrafter/inactive" + }, + "active=false,direction=west": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/autocrafter/green", + "x": 180 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/autocrafter/green", + "x": 90, + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/autocrafter/green", + "x": 90 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/autocrafter/green", + "x": 90, + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/autocrafter/green" + }, + "active=true,direction=west": { + "model": "refinedstorage:block/autocrafter/green", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_crafter.json deleted file mode 100644 index 843091a40..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/green_crafter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", - "x": 180 - }, - "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90 - }, - "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" - }, - "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage:block/crafter/green", - "x": 180 - }, - "active=true,direction=east": { - "model": "refinedstorage:block/crafter/green", - "x": 90, - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage:block/crafter/green", - "x": 90 - }, - "active=true,direction=south": { - "model": "refinedstorage:block/crafter/green", - "x": 90, - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage:block/crafter/green" - }, - "active=true,direction=west": { - "model": "refinedstorage:block/crafter/green", - "x": 90, - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_autocrafter.json new file mode 100644 index 000000000..69a2f69e2 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_autocrafter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 180 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/autocrafter/inactive" + }, + "active=false,direction=west": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/autocrafter/light_gray", + "x": 180 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/autocrafter/light_gray", + "x": 90, + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/autocrafter/light_gray", + "x": 90 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/autocrafter/light_gray", + "x": 90, + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/autocrafter/light_gray" + }, + "active=true,direction=west": { + "model": "refinedstorage:block/autocrafter/light_gray", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafter.json deleted file mode 100644 index 0adc18f77..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/light_gray_crafter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", - "x": 180 - }, - "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90 - }, - "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" - }, - "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage:block/crafter/light_gray", - "x": 180 - }, - "active=true,direction=east": { - "model": "refinedstorage:block/crafter/light_gray", - "x": 90, - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage:block/crafter/light_gray", - "x": 90 - }, - "active=true,direction=south": { - "model": "refinedstorage:block/crafter/light_gray", - "x": 90, - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage:block/crafter/light_gray" - }, - "active=true,direction=west": { - "model": "refinedstorage:block/crafter/light_gray", - "x": 90, - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_autocrafter.json new file mode 100644 index 000000000..01b9c57a1 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_autocrafter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 180 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/autocrafter/inactive" + }, + "active=false,direction=west": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/autocrafter/lime", + "x": 180 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/autocrafter/lime", + "x": 90, + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/autocrafter/lime", + "x": 90 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/autocrafter/lime", + "x": 90, + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/autocrafter/lime" + }, + "active=true,direction=west": { + "model": "refinedstorage:block/autocrafter/lime", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_crafter.json deleted file mode 100644 index bb1a371ad..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/lime_crafter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", - "x": 180 - }, - "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90 - }, - "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" - }, - "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage:block/crafter/lime", - "x": 180 - }, - "active=true,direction=east": { - "model": "refinedstorage:block/crafter/lime", - "x": 90, - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage:block/crafter/lime", - "x": 90 - }, - "active=true,direction=south": { - "model": "refinedstorage:block/crafter/lime", - "x": 90, - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage:block/crafter/lime" - }, - "active=true,direction=west": { - "model": "refinedstorage:block/crafter/lime", - "x": 90, - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_autocrafter.json new file mode 100644 index 000000000..0bce32b65 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_autocrafter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 180 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/autocrafter/inactive" + }, + "active=false,direction=west": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/autocrafter/magenta", + "x": 180 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/autocrafter/magenta", + "x": 90, + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/autocrafter/magenta", + "x": 90 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/autocrafter/magenta", + "x": 90, + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/autocrafter/magenta" + }, + "active=true,direction=west": { + "model": "refinedstorage:block/autocrafter/magenta", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafter.json deleted file mode 100644 index a560d8148..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/magenta_crafter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", - "x": 180 - }, - "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90 - }, - "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" - }, - "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage:block/crafter/magenta", - "x": 180 - }, - "active=true,direction=east": { - "model": "refinedstorage:block/crafter/magenta", - "x": 90, - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage:block/crafter/magenta", - "x": 90 - }, - "active=true,direction=south": { - "model": "refinedstorage:block/crafter/magenta", - "x": 90, - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage:block/crafter/magenta" - }, - "active=true,direction=west": { - "model": "refinedstorage:block/crafter/magenta", - "x": 90, - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_autocrafter.json new file mode 100644 index 000000000..11d7247f4 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_autocrafter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 180 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/autocrafter/inactive" + }, + "active=false,direction=west": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/autocrafter/orange", + "x": 180 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/autocrafter/orange", + "x": 90, + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/autocrafter/orange", + "x": 90 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/autocrafter/orange", + "x": 90, + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/autocrafter/orange" + }, + "active=true,direction=west": { + "model": "refinedstorage:block/autocrafter/orange", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_crafter.json deleted file mode 100644 index d03485bba..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/orange_crafter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", - "x": 180 - }, - "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90 - }, - "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" - }, - "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage:block/crafter/orange", - "x": 180 - }, - "active=true,direction=east": { - "model": "refinedstorage:block/crafter/orange", - "x": 90, - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage:block/crafter/orange", - "x": 90 - }, - "active=true,direction=south": { - "model": "refinedstorage:block/crafter/orange", - "x": 90, - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage:block/crafter/orange" - }, - "active=true,direction=west": { - "model": "refinedstorage:block/crafter/orange", - "x": 90, - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_autocrafter.json new file mode 100644 index 000000000..7a8de7565 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_autocrafter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 180 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/autocrafter/inactive" + }, + "active=false,direction=west": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/autocrafter/pink", + "x": 180 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/autocrafter/pink", + "x": 90, + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/autocrafter/pink", + "x": 90 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/autocrafter/pink", + "x": 90, + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/autocrafter/pink" + }, + "active=true,direction=west": { + "model": "refinedstorage:block/autocrafter/pink", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_crafter.json deleted file mode 100644 index 735409627..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/pink_crafter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", - "x": 180 - }, - "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90 - }, - "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" - }, - "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage:block/crafter/pink", - "x": 180 - }, - "active=true,direction=east": { - "model": "refinedstorage:block/crafter/pink", - "x": 90, - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage:block/crafter/pink", - "x": 90 - }, - "active=true,direction=south": { - "model": "refinedstorage:block/crafter/pink", - "x": 90, - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage:block/crafter/pink" - }, - "active=true,direction=west": { - "model": "refinedstorage:block/crafter/pink", - "x": 90, - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_autocrafter.json new file mode 100644 index 000000000..f1e432fc1 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_autocrafter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 180 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/autocrafter/inactive" + }, + "active=false,direction=west": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/autocrafter/purple", + "x": 180 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/autocrafter/purple", + "x": 90, + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/autocrafter/purple", + "x": 90 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/autocrafter/purple", + "x": 90, + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/autocrafter/purple" + }, + "active=true,direction=west": { + "model": "refinedstorage:block/autocrafter/purple", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_crafter.json deleted file mode 100644 index d2c25823b..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/purple_crafter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", - "x": 180 - }, - "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90 - }, - "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" - }, - "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage:block/crafter/purple", - "x": 180 - }, - "active=true,direction=east": { - "model": "refinedstorage:block/crafter/purple", - "x": 90, - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage:block/crafter/purple", - "x": 90 - }, - "active=true,direction=south": { - "model": "refinedstorage:block/crafter/purple", - "x": 90, - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage:block/crafter/purple" - }, - "active=true,direction=west": { - "model": "refinedstorage:block/crafter/purple", - "x": 90, - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_autocrafter.json similarity index 53% rename from refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_crafter.json rename to refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_autocrafter.json index 3efddbdce..02897d1c5 100644 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/black_crafter.json +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_autocrafter.json @@ -1,54 +1,54 @@ { "variants": { "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 180 }, "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90, "y": 90 }, "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90 }, "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90, "y": 180 }, "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" + "model": "refinedstorage:block/autocrafter/inactive" }, "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", + "model": "refinedstorage:block/autocrafter/inactive", "x": 90, "y": 270 }, "active=true,direction=down": { - "model": "refinedstorage:block/crafter/black", + "model": "refinedstorage:block/autocrafter/red", "x": 180 }, "active=true,direction=east": { - "model": "refinedstorage:block/crafter/black", + "model": "refinedstorage:block/autocrafter/red", "x": 90, "y": 90 }, "active=true,direction=north": { - "model": "refinedstorage:block/crafter/black", + "model": "refinedstorage:block/autocrafter/red", "x": 90 }, "active=true,direction=south": { - "model": "refinedstorage:block/crafter/black", + "model": "refinedstorage:block/autocrafter/red", "x": 90, "y": 180 }, "active=true,direction=up": { - "model": "refinedstorage:block/crafter/black" + "model": "refinedstorage:block/autocrafter/red" }, "active=true,direction=west": { - "model": "refinedstorage:block/crafter/black", + "model": "refinedstorage:block/autocrafter/red", "x": 90, "y": 270 } diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_crafter.json deleted file mode 100644 index 5cddc0110..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/red_crafter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", - "x": 180 - }, - "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90 - }, - "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" - }, - "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage:block/crafter/red", - "x": 180 - }, - "active=true,direction=east": { - "model": "refinedstorage:block/crafter/red", - "x": 90, - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage:block/crafter/red", - "x": 90 - }, - "active=true,direction=south": { - "model": "refinedstorage:block/crafter/red", - "x": 90, - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage:block/crafter/red" - }, - "active=true,direction=west": { - "model": "refinedstorage:block/crafter/red", - "x": 90, - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_autocrafter.json new file mode 100644 index 000000000..6c8711fb2 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_autocrafter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 180 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/autocrafter/inactive" + }, + "active=false,direction=west": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/autocrafter/white", + "x": 180 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/autocrafter/white", + "x": 90, + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/autocrafter/white", + "x": 90 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/autocrafter/white", + "x": 90, + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/autocrafter/white" + }, + "active=true,direction=west": { + "model": "refinedstorage:block/autocrafter/white", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_crafter.json deleted file mode 100644 index 259d76b6e..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/white_crafter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", - "x": 180 - }, - "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90 - }, - "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" - }, - "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage:block/crafter/white", - "x": 180 - }, - "active=true,direction=east": { - "model": "refinedstorage:block/crafter/white", - "x": 90, - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage:block/crafter/white", - "x": 90 - }, - "active=true,direction=south": { - "model": "refinedstorage:block/crafter/white", - "x": 90, - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage:block/crafter/white" - }, - "active=true,direction=west": { - "model": "refinedstorage:block/crafter/white", - "x": 90, - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_autocrafter.json new file mode 100644 index 000000000..8153b7001 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_autocrafter.json @@ -0,0 +1,56 @@ +{ + "variants": { + "active=false,direction=down": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 180 + }, + "active=false,direction=east": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 90 + }, + "active=false,direction=north": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90 + }, + "active=false,direction=south": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 180 + }, + "active=false,direction=up": { + "model": "refinedstorage:block/autocrafter/inactive" + }, + "active=false,direction=west": { + "model": "refinedstorage:block/autocrafter/inactive", + "x": 90, + "y": 270 + }, + "active=true,direction=down": { + "model": "refinedstorage:block/autocrafter/yellow", + "x": 180 + }, + "active=true,direction=east": { + "model": "refinedstorage:block/autocrafter/yellow", + "x": 90, + "y": 90 + }, + "active=true,direction=north": { + "model": "refinedstorage:block/autocrafter/yellow", + "x": 90 + }, + "active=true,direction=south": { + "model": "refinedstorage:block/autocrafter/yellow", + "x": 90, + "y": 180 + }, + "active=true,direction=up": { + "model": "refinedstorage:block/autocrafter/yellow" + }, + "active=true,direction=west": { + "model": "refinedstorage:block/autocrafter/yellow", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafter.json deleted file mode 100644 index bdbdb3e3c..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/blockstates/yellow_crafter.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "active=false,direction=down": { - "model": "refinedstorage:block/crafter/inactive", - "x": 180 - }, - "active=false,direction=east": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 90 - }, - "active=false,direction=north": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90 - }, - "active=false,direction=south": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 180 - }, - "active=false,direction=up": { - "model": "refinedstorage:block/crafter/inactive" - }, - "active=false,direction=west": { - "model": "refinedstorage:block/crafter/inactive", - "x": 90, - "y": 270 - }, - "active=true,direction=down": { - "model": "refinedstorage:block/crafter/yellow", - "x": 180 - }, - "active=true,direction=east": { - "model": "refinedstorage:block/crafter/yellow", - "x": 90, - "y": 90 - }, - "active=true,direction=north": { - "model": "refinedstorage:block/crafter/yellow", - "x": 90 - }, - "active=true,direction=south": { - "model": "refinedstorage:block/crafter/yellow", - "x": 90, - "y": 180 - }, - "active=true,direction=up": { - "model": "refinedstorage:block/crafter/yellow" - }, - "active=true,direction=west": { - "model": "refinedstorage:block/crafter/yellow", - "x": 90, - "y": 270 - } - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/black.json new file mode 100644 index 000000000..31dc22334 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/black.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/black", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/black", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/black", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/black", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/black", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/blue.json new file mode 100644 index 000000000..8b871805f --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/blue.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/blue", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/blue", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/blue", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/blue", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/blue", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/brown.json new file mode 100644 index 000000000..6c90bac5c --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/brown.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/brown", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/brown", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/brown", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/brown", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/brown", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/cyan.json new file mode 100644 index 000000000..71ae49092 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/cyan.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/cyan", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/cyan", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/cyan", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/cyan", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/cyan", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/gray.json new file mode 100644 index 000000000..286ad7726 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/gray.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/gray", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/gray", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/gray", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/gray", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/gray", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/green.json new file mode 100644 index 000000000..931e5c24c --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/green.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/green", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/green", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/green", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/green", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/green", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/inactive.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/inactive.json new file mode 100644 index 000000000..a7e6b97d3 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/inactive.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/inactive", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/inactive", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/inactive", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/inactive", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/inactive", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/light_blue.json new file mode 100644 index 000000000..77f583f74 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/light_blue.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/light_blue", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/light_blue", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/light_blue", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/light_blue", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/light_blue", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/light_gray.json new file mode 100644 index 000000000..4a3930c0a --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/light_gray.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/light_gray", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/light_gray", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/light_gray", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/light_gray", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/light_gray", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/lime.json new file mode 100644 index 000000000..74f446585 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/lime.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/lime", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/lime", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/lime", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/lime", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/lime", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/magenta.json new file mode 100644 index 000000000..95fac1354 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/magenta.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/magenta", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/magenta", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/magenta", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/magenta", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/magenta", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/orange.json new file mode 100644 index 000000000..f86758f23 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/orange.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/orange", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/orange", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/orange", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/orange", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/orange", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/pink.json new file mode 100644 index 000000000..951d0e6c2 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/pink.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/pink", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/pink", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/pink", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/pink", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/pink", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/purple.json new file mode 100644 index 000000000..c3d7ae5f6 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/purple.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/purple", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/purple", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/purple", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/purple", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/purple", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/red.json new file mode 100644 index 000000000..378e69693 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/red.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/red", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/red", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/red", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/red", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/red", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/white.json new file mode 100644 index 000000000..757b3cac6 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/white.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/white", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/white", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/white", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/white", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/white", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/yellow.json new file mode 100644 index 000000000..0b1fadea8 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/autocrafter/yellow.json @@ -0,0 +1,18 @@ +{ + "parent": "refinedstorage:block/emissive_cutout", + "textures": { + "cutout_down": "refinedstorage:block/bottom", + "cutout_east": "refinedstorage:block/autocrafter/cutouts/side/yellow", + "cutout_north": "refinedstorage:block/autocrafter/cutouts/side/yellow", + "cutout_south": "refinedstorage:block/autocrafter/cutouts/side/yellow", + "cutout_up": "refinedstorage:block/autocrafter/cutouts/top/yellow", + "cutout_west": "refinedstorage:block/autocrafter/cutouts/side/yellow", + "down": "refinedstorage:block/bottom", + "east": "refinedstorage:block/autocrafter/side", + "north": "refinedstorage:block/autocrafter/side", + "particle": "refinedstorage:block/autocrafter/side", + "south": "refinedstorage:block/autocrafter/side", + "up": "refinedstorage:block/autocrafter/top", + "west": "refinedstorage:block/autocrafter/side" + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/black.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/black.json deleted file mode 100644 index 80593f95a..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/black.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/black", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/black", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/black", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/black", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/black", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/blue.json deleted file mode 100644 index e8f631301..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/blue.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/blue", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/blue", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/blue", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/blue", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/blue", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/brown.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/brown.json deleted file mode 100644 index 254921b3b..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/brown.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/brown", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/brown", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/brown", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/brown", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/brown", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/cyan.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/cyan.json deleted file mode 100644 index 7dcf4b2bc..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/cyan.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/cyan", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/cyan", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/cyan", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/cyan", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/cyan", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/gray.json deleted file mode 100644 index fbca35d3c..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/gray.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/gray", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/gray", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/gray", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/gray", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/gray", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/green.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/green.json deleted file mode 100644 index b061aad2c..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/green.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/green", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/green", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/green", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/green", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/green", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/inactive.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/inactive.json deleted file mode 100644 index d102b64cf..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/inactive.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/inactive", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/inactive", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/inactive", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/inactive", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/inactive", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/light_blue.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/light_blue.json deleted file mode 100644 index 0e835aee2..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/light_blue.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/light_blue", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/light_blue", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/light_blue", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/light_blue", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/light_blue", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/light_gray.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/light_gray.json deleted file mode 100644 index 4586aad1f..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/light_gray.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/light_gray", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/light_gray", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/light_gray", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/light_gray", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/light_gray", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/lime.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/lime.json deleted file mode 100644 index a97de199a..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/lime.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/lime", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/lime", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/lime", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/lime", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/lime", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/magenta.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/magenta.json deleted file mode 100644 index ed891c156..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/magenta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/magenta", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/magenta", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/magenta", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/magenta", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/magenta", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/orange.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/orange.json deleted file mode 100644 index 50547c38e..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/orange.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/orange", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/orange", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/orange", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/orange", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/orange", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/pink.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/pink.json deleted file mode 100644 index 015d13d72..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/pink.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/pink", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/pink", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/pink", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/pink", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/pink", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/purple.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/purple.json deleted file mode 100644 index c55c5aa8a..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/purple.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/purple", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/purple", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/purple", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/purple", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/purple", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/red.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/red.json deleted file mode 100644 index c8872d6ba..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/red.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/red", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/red", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/red", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/red", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/red", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/white.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/white.json deleted file mode 100644 index bb0443b64..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/white.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/white", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/white", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/white", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/white", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/white", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/yellow.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/yellow.json deleted file mode 100644 index b5ce91e01..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/block/crafter/yellow.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "refinedstorage:block/emissive_cutout", - "textures": { - "cutout_down": "refinedstorage:block/bottom", - "cutout_east": "refinedstorage:block/crafter/cutouts/side/yellow", - "cutout_north": "refinedstorage:block/crafter/cutouts/side/yellow", - "cutout_south": "refinedstorage:block/crafter/cutouts/side/yellow", - "cutout_up": "refinedstorage:block/crafter/cutouts/top/yellow", - "cutout_west": "refinedstorage:block/crafter/cutouts/side/yellow", - "down": "refinedstorage:block/bottom", - "east": "refinedstorage:block/crafter/side", - "north": "refinedstorage:block/crafter/side", - "particle": "refinedstorage:block/crafter/side", - "south": "refinedstorage:block/crafter/side", - "up": "refinedstorage:block/crafter/top", - "west": "refinedstorage:block/crafter/side" - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/autocrafter.json new file mode 100644 index 000000000..88130ab6f --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/light_blue" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_autocrafter.json new file mode 100644 index 000000000..67f0709b2 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/black" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_crafter.json deleted file mode 100644 index 98633c2cc..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/black_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/black" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_autocrafter.json new file mode 100644 index 000000000..05144a25a --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/blue" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_crafter.json deleted file mode 100644 index d434378e6..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/blue_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/blue" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_autocrafter.json new file mode 100644 index 000000000..fd3ece6fc --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/brown" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_crafter.json deleted file mode 100644 index 6f6b63b57..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/brown_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/brown" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/crafter.json deleted file mode 100644 index db4b4e848..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/light_blue" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_autocrafter.json new file mode 100644 index 000000000..0c0867ca7 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/cyan" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_crafter.json deleted file mode 100644 index bb4ce620c..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/cyan_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/cyan" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_autocrafter.json new file mode 100644 index 000000000..e9bd37fe5 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/gray" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_crafter.json deleted file mode 100644 index 518058aaf..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/gray_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/gray" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_autocrafter.json new file mode 100644 index 000000000..023b6857f --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/green" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_crafter.json deleted file mode 100644 index 412af43ce..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/green_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/green" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_autocrafter.json new file mode 100644 index 000000000..802d6920b --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/light_gray" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_crafter.json deleted file mode 100644 index 202f076dd..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/light_gray_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/light_gray" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_autocrafter.json new file mode 100644 index 000000000..21a98e751 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/lime" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_crafter.json deleted file mode 100644 index 162cdffaa..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/lime_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/lime" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_autocrafter.json new file mode 100644 index 000000000..3e56775dd --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/magenta" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_crafter.json deleted file mode 100644 index d9243b1e0..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/magenta_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/magenta" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_autocrafter.json new file mode 100644 index 000000000..4365a5c15 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/orange" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_crafter.json deleted file mode 100644 index e7aa14eca..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/orange_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/orange" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_autocrafter.json new file mode 100644 index 000000000..78d53fc65 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/pink" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_crafter.json deleted file mode 100644 index 6336b4fc4..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/pink_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/pink" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_autocrafter.json new file mode 100644 index 000000000..e28738b0f --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/purple" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_crafter.json deleted file mode 100644 index f6cd434fb..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/purple_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/purple" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_autocrafter.json new file mode 100644 index 000000000..92800d36e --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/red" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_crafter.json deleted file mode 100644 index 68cd81152..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/red_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/red" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_autocrafter.json new file mode 100644 index 000000000..a2e2050da --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/white" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_crafter.json deleted file mode 100644 index 66dcfa851..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/white_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/white" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_autocrafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_autocrafter.json new file mode 100644 index 000000000..426b875e2 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_autocrafter.json @@ -0,0 +1,3 @@ +{ + "parent": "refinedstorage:block/autocrafter/yellow" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_crafter.json b/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_crafter.json deleted file mode 100644 index 195eaf6dd..000000000 --- a/refinedstorage-common/src/generated/resources/assets/refinedstorage/models/item/yellow_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "refinedstorage:block/crafter/yellow" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_autocrafter.json new file mode 100644 index 000000000..307b34d1e --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_autocrafter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_autocrafters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:autocrafters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/black_autocrafter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_autocrafters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/black_autocrafter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_autocrafter.json similarity index 65% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_autocrafter.json index 79dbd5749..173530a41 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/black_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_autocrafter.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_crafters": { + "has_autocrafters": { "conditions": { "items": [ { - "items": "#refinedstorage:crafters" + "items": "#refinedstorage:autocrafters" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "refinedstorage:coloring/black_crafter" + "recipe": "refinedstorage:coloring/blue_autocrafter" }, "trigger": "minecraft:recipe_unlocked" } @@ -21,12 +21,12 @@ "requirements": [ [ "has_the_recipe", - "has_crafters" + "has_autocrafters" ] ], "rewards": { "recipes": [ - "refinedstorage:coloring/black_crafter" + "refinedstorage:coloring/blue_autocrafter" ] } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_autocrafter.json new file mode 100644 index 000000000..86759a619 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_autocrafter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_autocrafters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:autocrafters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/brown_autocrafter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_autocrafters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/brown_autocrafter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_autocrafter.json similarity index 65% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_autocrafter.json index 651b3a5f5..2a3350158 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/blue_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_autocrafter.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_crafters": { + "has_autocrafters": { "conditions": { "items": [ { - "items": "#refinedstorage:crafters" + "items": "#refinedstorage:autocrafters" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "refinedstorage:coloring/blue_crafter" + "recipe": "refinedstorage:coloring/cyan_autocrafter" }, "trigger": "minecraft:recipe_unlocked" } @@ -21,12 +21,12 @@ "requirements": [ [ "has_the_recipe", - "has_crafters" + "has_autocrafters" ] ], "rewards": { "recipes": [ - "refinedstorage:coloring/blue_crafter" + "refinedstorage:coloring/cyan_autocrafter" ] } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_autocrafter.json similarity index 65% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_autocrafter.json index b6533e45a..3f91eee3f 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/brown_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_autocrafter.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_crafters": { + "has_autocrafters": { "conditions": { "items": [ { - "items": "#refinedstorage:crafters" + "items": "#refinedstorage:autocrafters" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "refinedstorage:coloring/brown_crafter" + "recipe": "refinedstorage:coloring/gray_autocrafter" }, "trigger": "minecraft:recipe_unlocked" } @@ -21,12 +21,12 @@ "requirements": [ [ "has_the_recipe", - "has_crafters" + "has_autocrafters" ] ], "rewards": { "recipes": [ - "refinedstorage:coloring/brown_crafter" + "refinedstorage:coloring/gray_autocrafter" ] } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_crafter.json deleted file mode 100644 index fbf672c93..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/gray_crafter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage:crafters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage:coloring/gray_crafter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage:coloring/gray_crafter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_autocrafter.json new file mode 100644 index 000000000..576293fe5 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_autocrafter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_autocrafters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:autocrafters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/green_autocrafter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_autocrafters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/green_autocrafter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_crafter.json deleted file mode 100644 index 741854daf..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/green_crafter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage:crafters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage:coloring/green_crafter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage:coloring/green_crafter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_autocrafter.json new file mode 100644 index 000000000..2be275bf0 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_autocrafter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_autocrafters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:autocrafters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_blue_autocrafter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_autocrafters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_blue_autocrafter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_crafter.json deleted file mode 100644 index 03d3a94ad..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_blue_crafter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage:crafters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage:coloring/light_blue_crafter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage:coloring/light_blue_crafter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_autocrafter.json new file mode 100644 index 000000000..410e607da --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_autocrafter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_autocrafters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:autocrafters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/light_gray_autocrafter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_autocrafters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/light_gray_autocrafter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_crafter.json deleted file mode 100644 index 65e9fee43..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/light_gray_crafter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage:crafters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage:coloring/light_gray_crafter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage:coloring/light_gray_crafter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_autocrafter.json new file mode 100644 index 000000000..c8a1da55e --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_autocrafter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_autocrafters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:autocrafters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/lime_autocrafter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_autocrafters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/lime_autocrafter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_crafter.json deleted file mode 100644 index acf330d01..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/lime_crafter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage:crafters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage:coloring/lime_crafter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage:coloring/lime_crafter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_autocrafter.json new file mode 100644 index 000000000..edc3d7836 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_autocrafter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_autocrafters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:autocrafters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/magenta_autocrafter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_autocrafters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/magenta_autocrafter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_crafter.json deleted file mode 100644 index eb7cf31d0..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/magenta_crafter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage:crafters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage:coloring/magenta_crafter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage:coloring/magenta_crafter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_autocrafter.json new file mode 100644 index 000000000..604c26de3 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_autocrafter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_autocrafters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:autocrafters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/orange_autocrafter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_autocrafters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/orange_autocrafter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_crafter.json deleted file mode 100644 index 77bba14c1..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/orange_crafter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage:crafters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage:coloring/orange_crafter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage:coloring/orange_crafter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_autocrafter.json new file mode 100644 index 000000000..07894f6ae --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_autocrafter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_autocrafters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:autocrafters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/pink_autocrafter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_autocrafters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/pink_autocrafter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_crafter.json deleted file mode 100644 index 4c0d71038..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/pink_crafter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage:crafters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage:coloring/pink_crafter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage:coloring/pink_crafter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_autocrafter.json new file mode 100644 index 000000000..c0373ee44 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_autocrafter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_autocrafters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:autocrafters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/purple_autocrafter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_autocrafters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/purple_autocrafter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_crafter.json deleted file mode 100644 index 8b4de13bf..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/purple_crafter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage:crafters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage:coloring/purple_crafter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage:coloring/purple_crafter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_autocrafter.json similarity index 65% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_autocrafter.json index 2416c2308..dd5c73749 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/cyan_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_autocrafter.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_crafters": { + "has_autocrafters": { "conditions": { "items": [ { - "items": "#refinedstorage:crafters" + "items": "#refinedstorage:autocrafters" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "refinedstorage:coloring/cyan_crafter" + "recipe": "refinedstorage:coloring/red_autocrafter" }, "trigger": "minecraft:recipe_unlocked" } @@ -21,12 +21,12 @@ "requirements": [ [ "has_the_recipe", - "has_crafters" + "has_autocrafters" ] ], "rewards": { "recipes": [ - "refinedstorage:coloring/cyan_crafter" + "refinedstorage:coloring/red_autocrafter" ] } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_crafter.json deleted file mode 100644 index 371f8765d..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/red_crafter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage:crafters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage:coloring/red_crafter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage:coloring/red_crafter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_autocrafter.json new file mode 100644 index 000000000..2b6cf71b0 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_autocrafter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_autocrafters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:autocrafters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/white_autocrafter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_autocrafters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/white_autocrafter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_crafter.json deleted file mode 100644 index 6c0bf9067..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/white_crafter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage:crafters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage:coloring/white_crafter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage:coloring/white_crafter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_autocrafter.json new file mode 100644 index 000000000..ab26ddca6 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_autocrafter.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_autocrafters": { + "conditions": { + "items": [ + { + "items": "#refinedstorage:autocrafters" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "refinedstorage:coloring/yellow_autocrafter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_autocrafters" + ] + ], + "rewards": { + "recipes": [ + "refinedstorage:coloring/yellow_autocrafter" + ] + } +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_crafter.json deleted file mode 100644 index f36cce8de..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/advancement/recipes/misc/coloring/yellow_crafter.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_crafters": { - "conditions": { - "items": [ - { - "items": "#refinedstorage:crafters" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "refinedstorage:coloring/yellow_crafter" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_crafters" - ] - ], - "rewards": { - "recipes": [ - "refinedstorage:coloring/yellow_crafter" - ] - } -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/autocrafter.json similarity index 81% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/autocrafter.json index 2e0025c58..86ad90b49 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/autocrafter.json @@ -20,11 +20,11 @@ "entries": [ { "type": "minecraft:item", - "name": "refinedstorage:crafter" + "name": "refinedstorage:autocrafter" } ], "rolls": 1.0 } ], - "random_sequence": "refinedstorage:blocks/crafter" + "random_sequence": "refinedstorage:blocks/autocrafter" } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_autocrafter.json new file mode 100644 index 000000000..10b335994 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_autocrafter.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:custom_name" + ], + "source": "block_entity" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:black_autocrafter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/black_autocrafter" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_autocrafter.json similarity index 80% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_autocrafter.json index 5d0ca047f..c17624b59 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/blue_autocrafter.json @@ -20,11 +20,11 @@ "entries": [ { "type": "minecraft:item", - "name": "refinedstorage:blue_crafter" + "name": "refinedstorage:blue_autocrafter" } ], "rolls": 1.0 } ], - "random_sequence": "refinedstorage:blocks/blue_crafter" + "random_sequence": "refinedstorage:blocks/blue_autocrafter" } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_autocrafter.json new file mode 100644 index 000000000..82af1bbd9 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_autocrafter.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:custom_name" + ], + "source": "block_entity" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:brown_autocrafter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/brown_autocrafter" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_autocrafter.json similarity index 80% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_autocrafter.json index a5c65c9fb..e60f5479a 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/brown_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_autocrafter.json @@ -20,11 +20,11 @@ "entries": [ { "type": "minecraft:item", - "name": "refinedstorage:brown_crafter" + "name": "refinedstorage:cyan_autocrafter" } ], "rolls": 1.0 } ], - "random_sequence": "refinedstorage:blocks/brown_crafter" + "random_sequence": "refinedstorage:blocks/cyan_autocrafter" } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_crafter.json deleted file mode 100644 index 757a47795..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/cyan_crafter.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "minecraft:copy_components", - "include": [ - "minecraft:custom_name" - ], - "source": "block_entity" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage:cyan_crafter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage:blocks/cyan_crafter" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_autocrafter.json new file mode 100644 index 000000000..4724a29f1 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_autocrafter.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:custom_name" + ], + "source": "block_entity" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:gray_autocrafter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/gray_autocrafter" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_crafter.json deleted file mode 100644 index 560f3f68a..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/gray_crafter.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "minecraft:copy_components", - "include": [ - "minecraft:custom_name" - ], - "source": "block_entity" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage:gray_crafter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage:blocks/gray_crafter" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_autocrafter.json new file mode 100644 index 000000000..d41236978 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_autocrafter.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:custom_name" + ], + "source": "block_entity" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:green_autocrafter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/green_autocrafter" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_crafter.json deleted file mode 100644 index a99ea230a..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/green_crafter.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "minecraft:copy_components", - "include": [ - "minecraft:custom_name" - ], - "source": "block_entity" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage:green_crafter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage:blocks/green_crafter" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_autocrafter.json new file mode 100644 index 000000000..6327e51a6 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_autocrafter.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:custom_name" + ], + "source": "block_entity" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:light_gray_autocrafter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/light_gray_autocrafter" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_crafter.json deleted file mode 100644 index 3a55004ce..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/light_gray_crafter.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "minecraft:copy_components", - "include": [ - "minecraft:custom_name" - ], - "source": "block_entity" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage:light_gray_crafter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage:blocks/light_gray_crafter" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_autocrafter.json new file mode 100644 index 000000000..989d61f7d --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_autocrafter.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:custom_name" + ], + "source": "block_entity" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:lime_autocrafter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/lime_autocrafter" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_crafter.json deleted file mode 100644 index 02cba6ebf..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/lime_crafter.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "minecraft:copy_components", - "include": [ - "minecraft:custom_name" - ], - "source": "block_entity" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage:lime_crafter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage:blocks/lime_crafter" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_autocrafter.json new file mode 100644 index 000000000..01562d3e0 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_autocrafter.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:custom_name" + ], + "source": "block_entity" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:magenta_autocrafter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/magenta_autocrafter" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_crafter.json deleted file mode 100644 index 0a11c938e..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/magenta_crafter.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "minecraft:copy_components", - "include": [ - "minecraft:custom_name" - ], - "source": "block_entity" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage:magenta_crafter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage:blocks/magenta_crafter" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_autocrafter.json new file mode 100644 index 000000000..178a2b90e --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_autocrafter.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:custom_name" + ], + "source": "block_entity" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:orange_autocrafter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/orange_autocrafter" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_crafter.json deleted file mode 100644 index 2191b7186..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/orange_crafter.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "minecraft:copy_components", - "include": [ - "minecraft:custom_name" - ], - "source": "block_entity" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage:orange_crafter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage:blocks/orange_crafter" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_autocrafter.json new file mode 100644 index 000000000..c23afa99d --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_autocrafter.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:custom_name" + ], + "source": "block_entity" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:pink_autocrafter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/pink_autocrafter" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_crafter.json deleted file mode 100644 index c86e79cbb..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/pink_crafter.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "minecraft:copy_components", - "include": [ - "minecraft:custom_name" - ], - "source": "block_entity" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage:pink_crafter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage:blocks/pink_crafter" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_autocrafter.json new file mode 100644 index 000000000..2f5a77e62 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_autocrafter.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:custom_name" + ], + "source": "block_entity" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:purple_autocrafter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/purple_autocrafter" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_crafter.json deleted file mode 100644 index e2ac59182..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/purple_crafter.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "minecraft:copy_components", - "include": [ - "minecraft:custom_name" - ], - "source": "block_entity" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage:purple_crafter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage:blocks/purple_crafter" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_autocrafter.json similarity index 80% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_autocrafter.json index 9e3f87067..101a0f4f3 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/black_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_autocrafter.json @@ -20,11 +20,11 @@ "entries": [ { "type": "minecraft:item", - "name": "refinedstorage:black_crafter" + "name": "refinedstorage:red_autocrafter" } ], "rolls": 1.0 } ], - "random_sequence": "refinedstorage:blocks/black_crafter" + "random_sequence": "refinedstorage:blocks/red_autocrafter" } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_crafter.json deleted file mode 100644 index 892e7097e..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/red_crafter.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "minecraft:copy_components", - "include": [ - "minecraft:custom_name" - ], - "source": "block_entity" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage:red_crafter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage:blocks/red_crafter" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_autocrafter.json new file mode 100644 index 000000000..e9d1560d0 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_autocrafter.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:custom_name" + ], + "source": "block_entity" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:white_autocrafter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/white_autocrafter" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_crafter.json deleted file mode 100644 index 40453b663..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/white_crafter.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "minecraft:copy_components", - "include": [ - "minecraft:custom_name" - ], - "source": "block_entity" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage:white_crafter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage:blocks/white_crafter" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_autocrafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_autocrafter.json new file mode 100644 index 000000000..2fed1dd5d --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_autocrafter.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:block", + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:custom_name" + ], + "source": "block_entity" + } + ], + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "refinedstorage:yellow_autocrafter" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "refinedstorage:blocks/yellow_autocrafter" +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_crafter.json deleted file mode 100644 index af9313455..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/loot_table/blocks/yellow_crafter.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "minecraft:copy_components", - "include": [ - "minecraft:custom_name" - ], - "source": "block_entity" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "refinedstorage:yellow_crafter" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "refinedstorage:blocks/yellow_crafter" -} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_autocrafter.json similarity index 66% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_autocrafter.json index c4aff7eba..8926cd009 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/black_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/black" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:black_crafter" + "id": "refinedstorage:black_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_autocrafter.json similarity index 67% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_autocrafter.json index 0fc17ef1a..5a887f308 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/blue_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/blue" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:blue_crafter" + "id": "refinedstorage:blue_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_autocrafter.json similarity index 66% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_autocrafter.json index 5837706b0..1f803e530 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/brown_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/brown" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:brown_crafter" + "id": "refinedstorage:brown_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_autocrafter.json similarity index 67% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_autocrafter.json index 118726fe9..cf34f942a 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/cyan_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/cyan" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:cyan_crafter" + "id": "refinedstorage:cyan_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_autocrafter.json similarity index 67% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_autocrafter.json index 2752d0972..f1adab13e 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/gray_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/gray" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:gray_crafter" + "id": "refinedstorage:gray_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_autocrafter.json similarity index 66% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_autocrafter.json index 8b8dadde7..824982db3 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/green_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/green" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:green_crafter" + "id": "refinedstorage:green_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_autocrafter.json similarity index 69% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_autocrafter.json index ec954a018..965adf95c 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_blue_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/light_blue" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:crafter" + "id": "refinedstorage:autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_autocrafter.json similarity index 66% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_autocrafter.json index 84a06b2ed..3346c5fff 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/light_gray_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/light_gray" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:light_gray_crafter" + "id": "refinedstorage:light_gray_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_autocrafter.json similarity index 67% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_autocrafter.json index 30da99e3d..23a48b548 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/lime_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/lime" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:lime_crafter" + "id": "refinedstorage:lime_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_autocrafter.json similarity index 66% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_autocrafter.json index a71de1b35..59883425b 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/magenta_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/magenta" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:magenta_crafter" + "id": "refinedstorage:magenta_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_autocrafter.json similarity index 66% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_autocrafter.json index c9933b779..197f142d3 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/orange_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/orange" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:orange_crafter" + "id": "refinedstorage:orange_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_autocrafter.json similarity index 67% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_autocrafter.json index b2f0afa8e..67f80037c 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/pink_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/pink" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:pink_crafter" + "id": "refinedstorage:pink_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_autocrafter.json similarity index 66% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_autocrafter.json index 591e2fb1c..14ca0b91b 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/purple_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/purple" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:purple_crafter" + "id": "refinedstorage:purple_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_autocrafter.json similarity index 67% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_autocrafter.json index 37c8788fc..45a12872b 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/red_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/red" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:red_crafter" + "id": "refinedstorage:red_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_autocrafter.json similarity index 66% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_autocrafter.json index a0bf7182e..c29d1f895 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/white_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/white" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:white_crafter" + "id": "refinedstorage:white_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_crafter.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_autocrafter.json similarity index 66% rename from refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_crafter.json rename to refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_autocrafter.json index 0828bcda9..d79d3753c 100644 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_crafter.json +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/recipe/coloring/yellow_autocrafter.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "refinedstorage:crafters" + "tag": "refinedstorage:autocrafters" }, { "tag": "c:dyes/yellow" @@ -11,6 +11,6 @@ ], "result": { "count": 1, - "id": "refinedstorage:yellow_crafter" + "id": "refinedstorage:yellow_autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/autocrafters.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/autocrafters.json new file mode 100644 index 000000000..d77a283c3 --- /dev/null +++ b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/autocrafters.json @@ -0,0 +1,20 @@ +{ + "values": [ + "refinedstorage:white_autocrafter", + "refinedstorage:orange_autocrafter", + "refinedstorage:magenta_autocrafter", + "refinedstorage:autocrafter", + "refinedstorage:yellow_autocrafter", + "refinedstorage:lime_autocrafter", + "refinedstorage:pink_autocrafter", + "refinedstorage:gray_autocrafter", + "refinedstorage:light_gray_autocrafter", + "refinedstorage:cyan_autocrafter", + "refinedstorage:purple_autocrafter", + "refinedstorage:blue_autocrafter", + "refinedstorage:brown_autocrafter", + "refinedstorage:green_autocrafter", + "refinedstorage:red_autocrafter", + "refinedstorage:black_autocrafter" + ] +} \ No newline at end of file diff --git a/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/crafters.json b/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/crafters.json deleted file mode 100644 index bcc58380b..000000000 --- a/refinedstorage-common/src/generated/resources/data/refinedstorage/tags/item/crafters.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "values": [ - "refinedstorage:white_crafter", - "refinedstorage:orange_crafter", - "refinedstorage:magenta_crafter", - "refinedstorage:crafter", - "refinedstorage:yellow_crafter", - "refinedstorage:lime_crafter", - "refinedstorage:pink_crafter", - "refinedstorage:gray_crafter", - "refinedstorage:light_gray_crafter", - "refinedstorage:cyan_crafter", - "refinedstorage:purple_crafter", - "refinedstorage:blue_crafter", - "refinedstorage:brown_crafter", - "refinedstorage:green_crafter", - "refinedstorage:red_crafter", - "refinedstorage:black_crafter" - ] -} \ No newline at end of file diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java index 30fd6efb1..8526ff4ca 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractClientModInitializer.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; import com.refinedmods.refinedstorage.common.api.upgrade.UpgradeMapping; -import com.refinedmods.refinedstorage.common.autocrafting.CrafterScreen; +import com.refinedmods.refinedstorage.common.autocrafting.AutocrafterScreen; import com.refinedmods.refinedstorage.common.autocrafting.PatternGridScreen; import com.refinedmods.refinedstorage.common.autocrafting.preview.AutocraftingPreviewContainerMenu; import com.refinedmods.refinedstorage.common.autocrafting.preview.AutocraftingPreviewScreen; @@ -94,7 +94,7 @@ protected static void registerScreens(final ScreenRegistration registration) { registration.register(Menus.INSTANCE.getSecurityManager(), SecurityManagerScreen::new); registration.register(Menus.INSTANCE.getRelay(), RelayScreen::new); registration.register(Menus.INSTANCE.getDiskInterface(), DiskInterfaceScreen::new); - registration.register(Menus.INSTANCE.getCrafter(), CrafterScreen::new); + registration.register(Menus.INSTANCE.getAutocrafter(), AutocrafterScreen::new); registration.register(Menus.INSTANCE.getAutocraftingStorageMonitor(), new ScreenConstructor() { @Override diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java index b6b25841c..aeedd165b 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java @@ -14,9 +14,9 @@ import com.refinedmods.refinedstorage.common.api.RefinedStorageApiProxy; import com.refinedmods.refinedstorage.common.api.security.PlatformSecurityNetworkComponent; import com.refinedmods.refinedstorage.common.api.upgrade.AbstractUpgradeItem; -import com.refinedmods.refinedstorage.common.autocrafting.CrafterBlockEntity; -import com.refinedmods.refinedstorage.common.autocrafting.CrafterContainerMenu; -import com.refinedmods.refinedstorage.common.autocrafting.CrafterData; +import com.refinedmods.refinedstorage.common.autocrafting.AutocrafterBlockEntity; +import com.refinedmods.refinedstorage.common.autocrafting.AutocrafterContainerMenu; +import com.refinedmods.refinedstorage.common.autocrafting.AutocrafterData; import com.refinedmods.refinedstorage.common.autocrafting.CraftingPatternState; import com.refinedmods.refinedstorage.common.autocrafting.PatternGridBlockEntity; import com.refinedmods.refinedstorage.common.autocrafting.PatternGridContainerMenu; @@ -343,7 +343,7 @@ protected final void registerBlocks(final RegistryCallback callback, Blocks.INSTANCE.getSecurityManager().registerBlocks(callback); Blocks.INSTANCE.getRelay().registerBlocks(callback); Blocks.INSTANCE.setDiskInterface(blockEntityProviders.diskInterface()).registerBlocks(callback); - Blocks.INSTANCE.getCrafter().registerBlocks(callback); + Blocks.INSTANCE.getAutocrafter().registerBlocks(callback); } protected final void registerItems(final RegistryCallback callback) { @@ -366,7 +366,7 @@ protected final void registerItems(final RegistryCallback callback) { Blocks.INSTANCE.getSecurityManager().registerItems(callback, Items.INSTANCE::addSecurityManager); Blocks.INSTANCE.getRelay().registerItems(callback, Items.INSTANCE::addRelay); Blocks.INSTANCE.getDiskInterface().registerItems(callback, Items.INSTANCE::addDiskInterface); - Blocks.INSTANCE.getCrafter().registerItems(callback, Items.INSTANCE::addCrafter); + Blocks.INSTANCE.getAutocrafter().registerItems(callback, Items.INSTANCE::addAutocrafter); registerStorageItems(callback); registerUpgrades(callback); } @@ -527,7 +527,7 @@ protected final void registerUpgradeMappings() { .add(Items.INSTANCE.getSpeedUpgrade(), 4) .add(Items.INSTANCE.getStackUpgrade()); - RefinedStorageApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.CRAFTER) + RefinedStorageApi.INSTANCE.getUpgradeRegistry().forDestination(UpgradeDestinations.AUTOCRAFTER) .add(Items.INSTANCE.getSpeedUpgrade(), 4); } @@ -665,9 +665,9 @@ protected final void registerBlockEntities( ContentIds.DISK_INTERFACE, () -> typeFactory.create(providers.diskInterface(), Blocks.INSTANCE.getDiskInterface().toArray()) )); - BlockEntities.INSTANCE.setCrafter(callback.register( - ContentIds.CRAFTER, - () -> typeFactory.create(CrafterBlockEntity::new, Blocks.INSTANCE.getCrafter().toArray()) + BlockEntities.INSTANCE.setAutocrafter(callback.register( + ContentIds.AUTOCRAFTER, + () -> typeFactory.create(AutocrafterBlockEntity::new, Blocks.INSTANCE.getAutocrafter().toArray()) )); } @@ -788,9 +788,9 @@ protected final void registerMenus(final RegistryCallback> callback, ContentIds.DISK_INTERFACE, () -> extendedMenuTypeFactory.create(DiskInterfaceContainerMenu::new, ResourceContainerData.STREAM_CODEC) )); - Menus.INSTANCE.setCrafter(callback.register( - ContentIds.CRAFTER, - () -> extendedMenuTypeFactory.create(CrafterContainerMenu::new, CrafterData.STREAM_CODEC) + Menus.INSTANCE.setAutocrafter(callback.register( + ContentIds.AUTOCRAFTER, + () -> extendedMenuTypeFactory.create(AutocrafterContainerMenu::new, AutocrafterData.STREAM_CODEC) )); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/Config.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/Config.java index 018cdc3c4..4954b9077 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/Config.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/Config.java @@ -73,7 +73,7 @@ public interface Config { RelayEntry getRelay(); - SimpleEnergyUsageEntry getCrafter(); + SimpleEnergyUsageEntry getAutocrafter(); interface SimpleEnergyUsageEntry { long getEnergyUsage(); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterBlock.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterBlock.java similarity index 82% rename from refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterBlock.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterBlock.java index 40f36dddd..5b1311324 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterBlock.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterBlock.java @@ -29,15 +29,15 @@ import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; -public class CrafterBlock extends AbstractActiveColoredDirectionalBlock +public class AutocrafterBlock extends AbstractActiveColoredDirectionalBlock implements BlockItemProvider, EntityBlock { - private static final Component HELP = createTranslation("item", "crafter.help"); - private static final AbstractBlockEntityTicker TICKER = new NetworkNodeBlockEntityTicker<>( - BlockEntities.INSTANCE::getCrafter, + private static final Component HELP = createTranslation("item", "autocrafter.help"); + private static final AbstractBlockEntityTicker TICKER = new NetworkNodeBlockEntityTicker<>( + BlockEntities.INSTANCE::getAutocrafter, ACTIVE ); - public CrafterBlock(final DyeColor color, final MutableComponent name) { + public AutocrafterBlock(final DyeColor color, final MutableComponent name) { super(BlockConstants.PROPERTIES, color, name); } @@ -47,8 +47,8 @@ protected DirectionType getDirectionType() { } @Override - public BlockColorMap getBlockColorMap() { - return Blocks.INSTANCE.getCrafter(); + public BlockColorMap getBlockColorMap() { + return Blocks.INSTANCE.getAutocrafter(); } @Override @@ -59,7 +59,7 @@ public boolean canAlwaysConnect() { @Nullable @Override public BlockEntity newBlockEntity(final BlockPos pos, final BlockState state) { - return new CrafterBlockEntity(pos, state); + return new AutocrafterBlockEntity(pos, state); } @Nullable diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterBlockEntity.java similarity index 85% rename from refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterBlockEntity.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterBlockEntity.java index 71d997548..0bd4f665d 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterBlockEntity.java @@ -41,8 +41,8 @@ import static com.refinedmods.refinedstorage.common.support.AbstractDirectionalBlock.tryExtractDirection; // TODO: More energy usage for more patterns. -public class CrafterBlockEntity extends AbstractBaseNetworkNodeContainerBlockEntity - implements ExtendedMenuProvider, BlockEntityWithDrops, PatternInventory.Listener { +public class AutocrafterBlockEntity extends AbstractBaseNetworkNodeContainerBlockEntity + implements ExtendedMenuProvider, BlockEntityWithDrops, PatternInventory.Listener { static final int PATTERNS = 9; private static final int MAX_CHAINED_CRAFTERS = 8; @@ -56,15 +56,15 @@ public class CrafterBlockEntity extends AbstractBaseNetworkNodeContainerBlockEnt private LockMode lockMode = LockMode.NEVER; private int priority; - public CrafterBlockEntity(final BlockPos pos, final BlockState state) { + public AutocrafterBlockEntity(final BlockPos pos, final BlockState state) { super( - BlockEntities.INSTANCE.getCrafter(), + BlockEntities.INSTANCE.getAutocrafter(), pos, state, - new PatternProviderNetworkNode(Platform.INSTANCE.getConfig().getCrafter().getEnergyUsage(), PATTERNS) + new PatternProviderNetworkNode(Platform.INSTANCE.getConfig().getAutocrafter().getEnergyUsage(), PATTERNS) ); - this.upgradeContainer = new UpgradeContainer(UpgradeDestinations.CRAFTER, upgradeEnergyUsage -> { - final long baseEnergyUsage = Platform.INSTANCE.getConfig().getCrafter().getEnergyUsage(); + this.upgradeContainer = new UpgradeContainer(UpgradeDestinations.AUTOCRAFTER, upgradeEnergyUsage -> { + final long baseEnergyUsage = Platform.INSTANCE.getConfig().getAutocrafter().getEnergyUsage(); mainNetworkNode.setEnergyUsage(baseEnergyUsage + upgradeEnergyUsage); setChanged(); }); @@ -75,7 +75,7 @@ public CrafterBlockEntity(final BlockPos pos, final BlockState state) { @Override protected InWorldNetworkNodeContainer createMainContainer(final PatternProviderNetworkNode networkNode) { return RefinedStorageApi.INSTANCE.createNetworkNodeContainer(this, networkNode) - .connectionStrategy(new CrafterConnectionStrategy(this::getBlockState, getBlockPos())) + .connectionStrategy(new AutocrafterConnectionStrategy(this::getBlockState, getBlockPos())) .build(); } @@ -91,7 +91,7 @@ private boolean isPartOfChain() { return getChainingRoot() != this; } - // if there is another crafter next to us, that is pointing in our direction, + // if there is another autocrafter next to us, that is pointing in our direction, // and we are not part of a chain, we are the head of the chain private boolean isHeadOfChain() { if (level == null || isPartOfChain()) { @@ -103,8 +103,8 @@ private boolean isHeadOfChain() { continue; } final BlockEntity neighbor = level.getBlockEntity(pos); - if (neighbor instanceof CrafterBlockEntity neighborCrafter) { - final Direction neighborDirection = tryExtractDirection(neighborCrafter.getBlockState()); + if (neighbor instanceof AutocrafterBlockEntity neighborAutocrafter) { + final Direction neighborDirection = tryExtractDirection(neighborAutocrafter.getBlockState()); if (neighborDirection == direction.getOpposite()) { return true; } @@ -113,17 +113,17 @@ private boolean isHeadOfChain() { return false; } - private CrafterBlockEntity getChainingRoot() { + private AutocrafterBlockEntity getChainingRoot() { return getChainingRoot(0, this); } - private CrafterBlockEntity getChainingRoot(final int depth, final CrafterBlockEntity origin) { + private AutocrafterBlockEntity getChainingRoot(final int depth, final AutocrafterBlockEntity origin) { final Direction direction = tryExtractDirection(getBlockState()); if (level == null || direction == null || depth >= MAX_CHAINED_CRAFTERS) { return origin; } final BlockEntity neighbor = getConnectedMachine(); - if (!(neighbor instanceof CrafterBlockEntity neighborCrafter)) { + if (!(neighbor instanceof AutocrafterBlockEntity neighborCrafter)) { return this; } return neighborCrafter.getChainingRoot(depth + 1, origin); @@ -144,7 +144,7 @@ private BlockEntity getConnectedMachine() { @Override public Component getName() { - final CrafterBlockEntity root = getChainingRoot(); + final AutocrafterBlockEntity root = getChainingRoot(); if (root == this) { return doGetName(); } @@ -157,29 +157,29 @@ private Component doGetName() { return customName; } final BlockEntity connectedMachine = getConnectedMachine(); - // We don't handle crafters here, as crafters are also nameable, and we could have infinite recursion. - if (connectedMachine instanceof Nameable nameable && !(connectedMachine instanceof CrafterBlockEntity)) { + // We don't handle autocrafters here, as autocrafters are also nameable, and we could have infinite recursion. + if (connectedMachine instanceof Nameable nameable && !(connectedMachine instanceof AutocrafterBlockEntity)) { return nameable.getName(); } else if (connectedMachine != null) { return connectedMachine.getBlockState().getBlock().getName(); } - return ContentNames.CRAFTER; + return ContentNames.AUTOCRAFTER; } @Nullable @Override public AbstractContainerMenu createMenu(final int syncId, final Inventory inventory, final Player player) { - return new CrafterContainerMenu(syncId, inventory, this); + return new AutocrafterContainerMenu(syncId, inventory, this); } @Override - public CrafterData getMenuData() { - return new CrafterData(isPartOfChain(), isHeadOfChain()); + public AutocrafterData getMenuData() { + return new AutocrafterData(isPartOfChain(), isHeadOfChain()); } @Override - public StreamEncoder getMenuCodec() { - return CrafterData.STREAM_CODEC; + public StreamEncoder getMenuCodec() { + return AutocrafterData.STREAM_CODEC; } @Override diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterConnectionStrategy.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterConnectionStrategy.java similarity index 83% rename from refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterConnectionStrategy.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterConnectionStrategy.java index e60f5fc6f..12e7161db 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterConnectionStrategy.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterConnectionStrategy.java @@ -9,8 +9,8 @@ import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; -class CrafterConnectionStrategy extends ColoredConnectionStrategy { - CrafterConnectionStrategy(final Supplier blockStateProvider, final BlockPos origin) { +class AutocrafterConnectionStrategy extends ColoredConnectionStrategy { + AutocrafterConnectionStrategy(final Supplier blockStateProvider, final BlockPos origin) { super(blockStateProvider, origin); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterContainerMenu.java similarity index 73% rename from refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterContainerMenu.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterContainerMenu.java index 32cf774c0..3619372df 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterContainerMenu.java @@ -22,7 +22,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -public class CrafterContainerMenu extends AbstractBaseContainerMenu { +public class AutocrafterContainerMenu extends AbstractBaseContainerMenu { private static final int PATTERN_SLOT_X = 8; private static final int PATTERN_SLOT_Y = 20; @@ -32,43 +32,45 @@ public class CrafterContainerMenu extends AbstractBaseContainerMenu { private final RateLimiter nameRateLimiter = RateLimiter.create(0.5); @Nullable - private CrafterBlockEntity crafter; + private AutocrafterBlockEntity autocrafter; @Nullable private Listener listener; private Component name; - public CrafterContainerMenu(final int syncId, final Inventory playerInventory, final CrafterData data) { - super(Menus.INSTANCE.getCrafter(), syncId); + public AutocrafterContainerMenu(final int syncId, final Inventory playerInventory, final AutocrafterData data) { + super(Menus.INSTANCE.getAutocrafter(), syncId); this.player = playerInventory.player; - registerProperty(new ClientProperty<>(CrafterPropertyTypes.LOCK_MODE, LockMode.NEVER)); - registerProperty(new ClientProperty<>(CrafterPropertyTypes.PRIORITY, 0)); + registerProperty(new ClientProperty<>(AutocrafterPropertyTypes.LOCK_MODE, LockMode.NEVER)); + registerProperty(new ClientProperty<>(AutocrafterPropertyTypes.PRIORITY, 0)); addSlots( new PatternInventory(playerInventory.player::level), - new UpgradeContainer(UpgradeDestinations.CRAFTER) + new UpgradeContainer(UpgradeDestinations.AUTOCRAFTER) ); this.name = Component.empty(); this.partOfChain = data.partOfChain(); this.headOfChain = data.headOfChain(); } - public CrafterContainerMenu(final int syncId, final Inventory playerInventory, final CrafterBlockEntity crafter) { - super(Menus.INSTANCE.getCrafter(), syncId); - this.crafter = crafter; + public AutocrafterContainerMenu(final int syncId, + final Inventory playerInventory, + final AutocrafterBlockEntity autocrafter) { + super(Menus.INSTANCE.getAutocrafter(), syncId); + this.autocrafter = autocrafter; this.player = playerInventory.player; - this.name = crafter.getDisplayName(); + this.name = autocrafter.getDisplayName(); this.partOfChain = false; this.headOfChain = false; registerProperty(new ServerProperty<>( - CrafterPropertyTypes.LOCK_MODE, - crafter::getLockMode, - crafter::setLockMode + AutocrafterPropertyTypes.LOCK_MODE, + autocrafter::getLockMode, + autocrafter::setLockMode )); registerProperty(new ServerProperty<>( - CrafterPropertyTypes.PRIORITY, - crafter::getPriority, - crafter::setPriority + AutocrafterPropertyTypes.PRIORITY, + autocrafter::getPriority, + autocrafter::setPriority )); - addSlots(crafter.getPatternContainer(), crafter.getUpgradeContainer()); + addSlots(autocrafter.getPatternContainer(), autocrafter.getUpgradeContainer()); } boolean canChangeName() { @@ -90,7 +92,7 @@ void setListener(@Nullable final Listener listener) { @Override public void broadcastChanges() { super.broadcastChanges(); - if (crafter == null) { + if (autocrafter == null) { return; } if (nameRateLimiter.tryAcquire()) { @@ -99,13 +101,13 @@ public void broadcastChanges() { } private void detectNameChange() { - if (crafter == null) { + if (autocrafter == null) { return; } - final Component newName = crafter.getDisplayName(); + final Component newName = autocrafter.getDisplayName(); if (!newName.equals(name)) { this.name = newName; - S2CPackets.sendCrafterNameUpdate((ServerPlayer) player, newName); + S2CPackets.sendAutocrafterNameUpdate((ServerPlayer) player, newName); } } @@ -141,11 +143,11 @@ public void changeName(final String newName) { if (partOfChain) { return; } - if (crafter != null) { - crafter.setCustomName(newName); + if (autocrafter != null) { + autocrafter.setCustomName(newName); detectNameChange(); } else { - C2SPackets.sendCrafterNameChange(newName); + C2SPackets.sendAutocrafterNameChange(newName); } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterData.java new file mode 100644 index 000000000..6cb7995df --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterData.java @@ -0,0 +1,13 @@ +package com.refinedmods.refinedstorage.common.autocrafting; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + +public record AutocrafterData(boolean partOfChain, boolean headOfChain) { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.BOOL, AutocrafterData::partOfChain, + ByteBufCodecs.BOOL, AutocrafterData::headOfChain, + AutocrafterData::new + ); +} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterPropertyTypes.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterPropertyTypes.java similarity index 89% rename from refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterPropertyTypes.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterPropertyTypes.java index bb60a91e1..3d7aca144 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterPropertyTypes.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterPropertyTypes.java @@ -5,7 +5,7 @@ import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; -final class CrafterPropertyTypes { +final class AutocrafterPropertyTypes { static final PropertyType LOCK_MODE = new PropertyType<>( createIdentifier("lock_mode"), LockModeSettings::getLockMode, @@ -16,6 +16,6 @@ final class CrafterPropertyTypes { createIdentifier("crafter_priority") ); - private CrafterPropertyTypes() { + private AutocrafterPropertyTypes() { } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterScreen.java similarity index 89% rename from refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterScreen.java rename to refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterScreen.java index e87e7a70d..ab50b8f88 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterScreen.java @@ -27,19 +27,19 @@ import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslationAsHeading; import static java.util.Objects.requireNonNull; -public class CrafterScreen extends AbstractBaseScreen { +public class AutocrafterScreen extends AbstractBaseScreen { private static final Component EMPTY_PATTERN_SLOT = createTranslationAsHeading( - "gui", "crafter.empty_pattern_slot" + "gui", "autocrafter.empty_pattern_slot" ); - private static final Component CHAINED = createTranslation("gui", "crafter.chained"); - private static final Component CHAINED_HELP = createTranslation("gui", "crafter.chained.help"); - private static final Component CHAINED_HEAD_HELP = createTranslation("gui", "crafter.chained.head_help"); - private static final Component NOT_CHAINED = createTranslation("gui", "crafter.not_chained"); - private static final Component NOT_CHAINED_HELP = createTranslation("gui", "crafter.not_chained.help"); - private static final Component EDIT = createTranslation("gui", "crafter.edit_name"); + private static final Component CHAINED = createTranslation("gui", "autocrafter.chained"); + private static final Component CHAINED_HELP = createTranslation("gui", "autocrafter.chained.help"); + private static final Component CHAINED_HEAD_HELP = createTranslation("gui", "autocrafter.chained.head_help"); + private static final Component NOT_CHAINED = createTranslation("gui", "autocrafter.not_chained"); + private static final Component NOT_CHAINED_HELP = createTranslation("gui", "autocrafter.not_chained.help"); + private static final Component EDIT = createTranslation("gui", "autocrafter.edit_name"); - private static final ResourceLocation CRAFTER_NAME_BACKGROUND = createIdentifier("widget/crafter_name"); + private static final ResourceLocation NAME_BACKGROUND = createIdentifier("widget/autocrafter_name"); private static final List CRAFTER_NAME_HISTORY = new ArrayList<>(); private final Inventory playerInventory; @@ -50,7 +50,9 @@ public class CrafterScreen extends AbstractBaseScreen { private Button editButton; private boolean editName; - public CrafterScreen(final CrafterContainerMenu menu, final Inventory playerInventory, final Component title) { + public AutocrafterScreen(final AutocrafterContainerMenu menu, + final Inventory playerInventory, + final Component title) { super(menu, playerInventory, new TextMarquee(title, getTitleMaxWidth(menu))); this.inventoryLabelY = 42; this.imageWidth = 210; @@ -58,7 +60,7 @@ public CrafterScreen(final CrafterContainerMenu menu, final Inventory playerInve this.playerInventory = playerInventory; } - private static int getTitleMaxWidth(final CrafterContainerMenu menu) { + private static int getTitleMaxWidth(final AutocrafterContainerMenu menu) { final int chainingTitleWidth = Minecraft.getInstance().font.width(getChainingTitle(menu)); final int editButtonWidth = getEditButtonWidth(); return TITLE_MAX_WIDTH - chainingTitleWidth - editButtonWidth - 10; @@ -72,7 +74,7 @@ private static int getEditButtonWidth() { return Minecraft.getInstance().font.width(EDIT) + 8; } - private static Component getChainingTitle(final CrafterContainerMenu menu) { + private static Component getChainingTitle(final AutocrafterContainerMenu menu) { return (menu.isPartOfChain() || menu.isHeadOfChain()) ? CHAINED : NOT_CHAINED; } @@ -87,7 +89,7 @@ private Component getChainingTooltip() { protected void renderBg(final GuiGraphics graphics, final float delta, final int mouseX, final int mouseY) { super.renderBg(graphics, delta, mouseX, mouseY); if (editName) { - graphics.blitSprite(CRAFTER_NAME_BACKGROUND, leftPos + 7, topPos + 5, 162, 12); + graphics.blitSprite(NAME_BACKGROUND, leftPos + 7, topPos + 5, 162, 12); } } @@ -115,9 +117,9 @@ protected void init() { } }); - addSideButton(new LockModeSideButtonWidget(getMenu().getProperty(CrafterPropertyTypes.LOCK_MODE))); + addSideButton(new LockModeSideButtonWidget(getMenu().getProperty(AutocrafterPropertyTypes.LOCK_MODE))); addSideButton(PrioritySideButtonWidget.forCrafter( - getMenu().getProperty(CrafterPropertyTypes.PRIORITY), + getMenu().getProperty(AutocrafterPropertyTypes.PRIORITY), playerInventory, this )); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterData.java deleted file mode 100644 index b1cbf8cb6..000000000 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CrafterData.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.refinedmods.refinedstorage.common.autocrafting; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; - -public record CrafterData(boolean partOfChain, boolean headOfChain) { - public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - ByteBufCodecs.BOOL, CrafterData::partOfChain, - ByteBufCodecs.BOOL, CrafterData::headOfChain, - CrafterData::new - ); -} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/LockModeSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/LockModeSideButtonWidget.java index 7d038d4d0..8253d98ba 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/LockModeSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/LockModeSideButtonWidget.java @@ -10,24 +10,24 @@ import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createTranslation; class LockModeSideButtonWidget extends AbstractSideButtonWidget { - private static final String PREFIX = "crafter.lock_mode"; + private static final String PREFIX = "autocrafter.lock_mode"; private static final MutableComponent TITLE = createTranslation("gui", PREFIX); - private static final ResourceLocation NEVER = createIdentifier("widget/side_button/crafter_lock_mode/never"); + private static final ResourceLocation NEVER = createIdentifier("widget/side_button/autocrafter_lock_mode/never"); private static final ResourceLocation LOCK_UNTIL_REDSTONE_PULSE_RECEIVED = createIdentifier( - "widget/side_button/crafter_lock_mode/lock_until_redstone_pulse_is_received" + "widget/side_button/autocrafter_lock_mode/lock_until_redstone_pulse_is_received" ); private static final ResourceLocation LOCK_UNTIL_CONNECTED_MACHINE_IS_EMPTY = createIdentifier( - "widget/side_button/crafter_lock_mode/lock_until_connected_machine_is_empty" + "widget/side_button/autocrafter_lock_mode/lock_until_connected_machine_is_empty" ); private static final ResourceLocation LOCK_UNTIL_ALL_OUTPUTS_ARE_RECEIVED = createIdentifier( - "widget/side_button/crafter_lock_mode/lock_until_all_outputs_are_received" + "widget/side_button/autocrafter_lock_mode/lock_until_all_outputs_are_received" ); private static final ResourceLocation LOCK_UNTIL_HIGH_REDSTONE_SIGNAL = createIdentifier( - "widget/side_button/crafter_lock_mode/lock_until_high_redstone_signal" + "widget/side_button/autocrafter_lock_mode/lock_until_high_redstone_signal" ); private static final ResourceLocation LOCK_UNTIL_LOW_REDSTONE_SIGNAL = createIdentifier( - "widget/side_button/crafter_lock_mode/lock_until_low_redstone_signal" + "widget/side_button/autocrafter_lock_mode/lock_until_low_redstone_signal" ); private static final MutableComponent NEVER_TITLE = createTranslation("gui", PREFIX + ".never"); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternInventory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternInventory.java index d18aa5603..d094ad103 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternInventory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternInventory.java @@ -10,8 +10,8 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import static com.refinedmods.refinedstorage.common.autocrafting.CrafterBlockEntity.PATTERNS; -import static com.refinedmods.refinedstorage.common.autocrafting.CrafterBlockEntity.isValidPattern; +import static com.refinedmods.refinedstorage.common.autocrafting.AutocrafterBlockEntity.PATTERNS; +import static com.refinedmods.refinedstorage.common.autocrafting.AutocrafterBlockEntity.isValidPattern; class PatternInventory extends FilteredContainer { @Nullable diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternRendering.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternRendering.java index fc8962f16..5310342e1 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternRendering.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternRendering.java @@ -30,7 +30,7 @@ private static boolean canDisplayOutputInScreen(final ItemStack stack) { final Screen screen = Minecraft.getInstance().screen; return switch (screen) { case PatternGridScreen patternGridScreen -> patternGridScreen.getMenu().isPatternInOutput(stack); - case CrafterScreen crafterScreen -> crafterScreen.getMenu().containsPattern(stack); + case AutocrafterScreen autocrafterScreen -> autocrafterScreen.getMenu().containsPattern(stack); case null, default -> false; }; } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternSlot.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternSlot.java index 800104eed..ab24426be 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternSlot.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternSlot.java @@ -7,6 +7,6 @@ class PatternSlot extends ValidatedSlot { PatternSlot(final Container container, final int index, final int x, final int y, final Level level) { - super(container, index, x, y, stack -> CrafterBlockEntity.isValidPattern(stack, level)); + super(container, index, x, y, stack -> AutocrafterBlockEntity.isValidPattern(stack, level)); } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/ProcessingPatternGridRenderer.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/ProcessingPatternGridRenderer.java index 2da20d010..467b224d1 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/ProcessingPatternGridRenderer.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/ProcessingPatternGridRenderer.java @@ -251,7 +251,7 @@ private void renderMatrixSlot(final GuiGraphics graphics, final int mouseY, final ResourceSlot resourceSlot, final ProcessingMatrixResourceSlot matrixSlot) { - if (matrixSlot.getResource() != null && menu.getView().isCraftable(matrixSlot.getResource())) { + if (matrixSlot.getResource() != null && menu.getView().isAutocraftable(matrixSlot.getResource())) { AbstractGridScreen.renderCraftableBackground( graphics, resourceSlot.x + leftPos, diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockEntities.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockEntities.java index 0dc196060..1868b4c92 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockEntities.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/BlockEntities.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.content; -import com.refinedmods.refinedstorage.common.autocrafting.CrafterBlockEntity; +import com.refinedmods.refinedstorage.common.autocrafting.AutocrafterBlockEntity; import com.refinedmods.refinedstorage.common.autocrafting.PatternGridBlockEntity; import com.refinedmods.refinedstorage.common.constructordestructor.AbstractConstructorBlockEntity; import com.refinedmods.refinedstorage.common.constructordestructor.AbstractDestructorBlockEntity; @@ -90,7 +90,7 @@ public final class BlockEntities { @Nullable private Supplier> diskInterface; @Nullable - private Supplier> crafter; + private Supplier> autocrafter; private BlockEntities() { } @@ -297,11 +297,11 @@ public void setDiskInterface(final Supplier getCrafter() { - return requireNonNull(crafter).get(); + public BlockEntityType getAutocrafter() { + return requireNonNull(autocrafter).get(); } - public void setCrafter(final Supplier> supplier) { - this.crafter = supplier; + public void setAutocrafter(final Supplier> supplier) { + this.autocrafter = supplier; } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Blocks.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Blocks.java index 52979ac31..0c7b8036f 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Blocks.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Blocks.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.content; -import com.refinedmods.refinedstorage.common.autocrafting.CrafterBlock; +import com.refinedmods.refinedstorage.common.autocrafting.AutocrafterBlock; import com.refinedmods.refinedstorage.common.autocrafting.PatternGridBlock; import com.refinedmods.refinedstorage.common.constructordestructor.AbstractConstructorBlockEntity; import com.refinedmods.refinedstorage.common.constructordestructor.AbstractDestructorBlockEntity; @@ -145,10 +145,10 @@ public final class Blocks { ); @Nullable private BlockColorMap diskInterface; - private final BlockColorMap crafter = new BlockColorMap<>( - CrafterBlock::new, - ContentIds.CRAFTER, - ContentNames.CRAFTER, + private final BlockColorMap autocrafter = new BlockColorMap<>( + AutocrafterBlock::new, + ContentIds.AUTOCRAFTER, + ContentNames.AUTOCRAFTER, COLOR ); @@ -419,7 +419,7 @@ public BlockColorMap getDiskInterface() { return requireNonNull(diskInterface); } - public BlockColorMap getCrafter() { - return crafter; + public BlockColorMap getAutocrafter() { + return autocrafter; } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentIds.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentIds.java index 5b477fd38..3d932e4e2 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentIds.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentIds.java @@ -65,7 +65,7 @@ public final class ContentIds { public static final ResourceLocation RELAY = createIdentifier("relay"); public static final ResourceLocation DISK_INTERFACE = createIdentifier("disk_interface"); public static final ResourceLocation PATTERN = createIdentifier("pattern"); - public static final ResourceLocation CRAFTER = createIdentifier("crafter"); + public static final ResourceLocation AUTOCRAFTER = createIdentifier("autocrafter"); private ContentIds() { } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentNames.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentNames.java index 08b3c65f0..1cacbaacc 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentNames.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/ContentNames.java @@ -39,7 +39,7 @@ public final class ContentNames { public static final MutableComponent SECURITY_MANAGER = name("security_manager"); public static final MutableComponent RELAY = name("relay"); public static final MutableComponent DISK_INTERFACE = name("disk_interface"); - public static final MutableComponent CRAFTER = name("crafter"); + public static final MutableComponent AUTOCRAFTER = name("autocrafter"); public static final String CLEAR_CRAFTING_MATRIX_TO_NETWORK_TRANSLATION_KEY = createTranslationKey("key", "clear_crafting_grid_matrix_to_network"); diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/CreativeModeTabItems.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/CreativeModeTabItems.java index 5aa97d549..bcae7cd56 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/CreativeModeTabItems.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/CreativeModeTabItems.java @@ -58,7 +58,7 @@ private static void appendBlocks(final Consumer consumer) { Items.INSTANCE.getSecurityManagers().stream().map(Supplier::get).forEach(itemConsumer); Items.INSTANCE.getRelays().stream().map(Supplier::get).forEach(itemConsumer); Items.INSTANCE.getDiskInterfaces().stream().map(Supplier::get).forEach(itemConsumer); - Items.INSTANCE.getCrafters().stream().map(Supplier::get).forEach(itemConsumer); + Items.INSTANCE.getAutocrafters().stream().map(Supplier::get).forEach(itemConsumer); } private static void appendBlockColors(final Consumer consumer, final BlockColorMap map) { diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/DefaultEnergyUsage.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/DefaultEnergyUsage.java index 3ee31ab9d..594b16f5b 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/DefaultEnergyUsage.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/DefaultEnergyUsage.java @@ -22,7 +22,7 @@ public final class DefaultEnergyUsage { public static final long SECURITY_MANAGER = 16; public static final long RELAY_INPUT_NETWORK = 8; public static final long RELAY_OUTPUT_NETWORK = 8; - public static final long CRAFTER = 4; + public static final long AUTOCRAFTER = 4; public static final long CONTROLLER_CAPACITY = 1000; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Items.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Items.java index d21089a56..2dfc026af 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Items.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Items.java @@ -51,7 +51,7 @@ public final class Items { private final List> allSecurityManagers = new ArrayList<>(); private final List> allRelays = new ArrayList<>(); private final List> allDiskInterfaces = new ArrayList<>(); - private final List> allCrafters = new ArrayList<>(); + private final List> allAutocrafters = new ArrayList<>(); @Nullable private Supplier quartzEnrichedIron; @Nullable @@ -439,12 +439,12 @@ public List> getDiskInterfaces() { return Collections.unmodifiableList(allDiskInterfaces); } - public void addCrafter(final Supplier supplier) { - allCrafters.add(supplier); + public void addAutocrafter(final Supplier supplier) { + allAutocrafters.add(supplier); } - public List> getCrafters() { - return Collections.unmodifiableList(allCrafters); + public List> getAutocrafters() { + return Collections.unmodifiableList(allAutocrafters); } public Item getNetworkCard() { diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Menus.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Menus.java index 57d8771d3..4658b8af7 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Menus.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Menus.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.common.content; -import com.refinedmods.refinedstorage.common.autocrafting.CrafterContainerMenu; +import com.refinedmods.refinedstorage.common.autocrafting.AutocrafterContainerMenu; import com.refinedmods.refinedstorage.common.autocrafting.PatternGridContainerMenu; import com.refinedmods.refinedstorage.common.autocrafting.preview.AutocraftingPreviewContainerMenu; import com.refinedmods.refinedstorage.common.constructordestructor.ConstructorContainerMenu; @@ -94,7 +94,7 @@ public final class Menus { @Nullable private Supplier> diskInterface; @Nullable - private Supplier> crafter; + private Supplier> autocrafter; private Menus() { } @@ -319,11 +319,11 @@ public void setDiskInterface(final Supplier this.diskInterface = diskInterface; } - public MenuType getCrafter() { - return requireNonNull(crafter).get(); + public MenuType getAutocrafter() { + return requireNonNull(autocrafter).get(); } - public void setCrafter(final Supplier> crafter) { - this.crafter = crafter; + public void setAutocrafter(final Supplier> autocrafter) { + this.autocrafter = autocrafter; } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Tags.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Tags.java index 19f308085..8763b85fd 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Tags.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/content/Tags.java @@ -27,7 +27,7 @@ public final class Tags { public static final TagKey SECURITY_MANAGERS = createTag("security_managers"); public static final TagKey RELAYS = createTag("relays"); public static final TagKey DISK_INTERFACES = createTag("disk_interfaces"); - public static final TagKey CRAFTERS = createTag("crafters"); + public static final TagKey AUTOCRAFTERS = createTag("autocrafters"); private Tags() { } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java index 30988fee3..b845dcf99 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridBlockEntity.java @@ -61,7 +61,7 @@ public List getResources(final Class act } @Override - public Set getCraftableResources() { + public Set getAutocraftableResources() { return requireNonNull(mainNetworkNode.getNetwork()) .getComponent(AutocraftingNetworkComponent.class) .getOutputs() diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java index 158af2302..68225b188 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/AbstractGridContainerMenu.java @@ -114,7 +114,7 @@ protected AbstractGridContainerMenu( resource.resourceAmount().amount(), resource.trackedResource().orElse(null) )); - gridData.craftableResources().forEach(viewBuilder::withCraftableResource); + gridData.autocraftableResources().forEach(viewBuilder::withAutocraftableResource); this.view = viewBuilder.build(); this.view.setSortingDirection(Platform.INSTANCE.getConfig().getGrid().getSortingDirection()); @@ -162,7 +162,8 @@ private BiPredicate createResourceTypeFilter() { } private BiPredicate createViewTypeFilter() { - return (v, resource) -> Platform.INSTANCE.getConfig().getGrid().getViewType().accepts(resource.isCraftable()); + return (v, resource) -> Platform.INSTANCE.getConfig().getGrid().getViewType() + .accepts(resource.isAutocraftable()); } private static GridViewBuilder createViewBuilder() { @@ -473,7 +474,7 @@ public final AutocraftableResourceHint getAutocraftableResourceHint(final Slot s @Nullable private AutocraftableResourceHint getAutocraftableResourceHint(final ResourceKey resource) { - if (view.isCraftable(resource)) { + if (view.isAutocraftable(resource)) { return AutocraftableResourceHint.AUTOCRAFTABLE; } if (playerInventoryPatterns.getOutputs().contains(resource)) { diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridData.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridData.java index b6b086048..8dde3bc69 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridData.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/GridData.java @@ -19,7 +19,7 @@ import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; -public record GridData(boolean active, List resources, Set craftableResources) { +public record GridData(boolean active, List resources, Set autocraftableResources) { public static final StreamCodec STREAM_CODEC = StreamCodec.composite( ByteBufCodecs.BOOL, GridData::active, ByteBufCodecs.collection(ArrayList::new, StreamCodec.composite( @@ -27,7 +27,7 @@ public record GridData(boolean active, List resources, Set true; - case CRAFTABLE -> craftable; - case NON_CRAFTABLE -> !craftable; + case AUTOCRAFTABLE -> autocraftable; + case NON_AUTOCRAFTABLE -> !autocraftable; }; } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java index 765b3a92e..c9dbe75e0 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/WirelessGrid.java @@ -82,7 +82,7 @@ public List getResources(final Class act } @Override - public Set getCraftableResources() { + public Set getAutocraftableResources() { return Collections.emptySet(); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/AbstractGridScreen.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/AbstractGridScreen.java index 9747967b0..9b6514190 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/AbstractGridScreen.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/AbstractGridScreen.java @@ -292,7 +292,7 @@ private void renderResourceWithAmount(final GuiGraphics graphics, final int slotX, final int slotY, final GridResource resource) { - if (resource.isCraftable()) { + if (resource.isAutocraftable()) { renderCraftableBackground(graphics, slotX, slotY, false, AutocraftableResourceHint.AUTOCRAFTABLE.getColor()); } @@ -329,7 +329,7 @@ private void renderAmount(final GuiGraphics graphics, private int getAmountColor(final GridResource resource, final long amount) { if (amount == 0) { - if (resource.isCraftable()) { + if (resource.isAutocraftable()) { return 0xFFFFFF; } return 0xFF5555; @@ -340,7 +340,7 @@ private int getAmountColor(final GridResource resource, final long amount) { private String getAmountText(final GridResource resource, final PlatformGridResource platformResource, final long amount) { - if (amount == 0 && resource.isCraftable()) { + if (amount == 0 && resource.isAutocraftable()) { return I18n.get(createTranslationKey("gui", "grid.craft")); } return platformResource.getDisplayedAmount(getMenu().getView()); @@ -420,7 +420,7 @@ private void renderHoveredResourceTooltip(final GuiGraphics graphics, if (amount > 0 && Platform.INSTANCE.getConfig().getGrid().isDetailedTooltip()) { addDetailedTooltip(view, gridResource, processedLines); } - if (gridResource.isCraftable()) { + if (gridResource.isAutocraftable()) { processedLines.add(amount == 0 ? AutocraftableClientTooltipComponent.empty() : AutocraftableClientTooltipComponent.existing()); @@ -498,7 +498,7 @@ public boolean mouseClicked(final double mouseX, final double mouseY, final int if (resource.canExtract(carriedStack, getMenu().getView()) && !hasControlDown()) { mouseClickedInGrid(clickedButton, resource); return true; - } else if (resource.isCraftable() && tryStartAutocrafting(resource)) { + } else if (resource.isAutocraftable() && tryStartAutocrafting(resource)) { return true; } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/ViewTypeSideButtonWidget.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/ViewTypeSideButtonWidget.java index af148a083..16c7badf6 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/ViewTypeSideButtonWidget.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/screen/ViewTypeSideButtonWidget.java @@ -36,9 +36,9 @@ private static OnPress createPressAction(final AbstractGridContainerMenu menu) { private static GridViewType toggle(final GridViewType sortingType) { return switch (sortingType) { - case ALL -> GridViewType.CRAFTABLE; - case CRAFTABLE -> GridViewType.NON_CRAFTABLE; - case NON_CRAFTABLE -> GridViewType.ALL; + case ALL -> GridViewType.AUTOCRAFTABLE; + case AUTOCRAFTABLE -> GridViewType.NON_AUTOCRAFTABLE; + case NON_AUTOCRAFTABLE -> GridViewType.ALL; }; } @@ -46,8 +46,8 @@ private static GridViewType toggle(final GridViewType sortingType) { protected ResourceLocation getSprite() { return switch (menu.getViewType()) { case ALL -> ALL; - case CRAFTABLE -> CRAFTABLE; - case NON_CRAFTABLE -> NON_CRAFTABLE; + case AUTOCRAFTABLE -> CRAFTABLE; + case NON_AUTOCRAFTABLE -> NON_CRAFTABLE; }; } @@ -60,8 +60,8 @@ protected MutableComponent getTitle() { protected MutableComponent getSubText() { return switch (menu.getViewType()) { case ALL -> SUBTEXT_ALL; - case CRAFTABLE -> SUBTEXT_AUTOCRAFTABLE; - case NON_CRAFTABLE -> SUBTEXT_NON_AUTOCRAFTABLE; + case AUTOCRAFTABLE -> SUBTEXT_AUTOCRAFTABLE; + case NON_AUTOCRAFTABLE -> SUBTEXT_NON_AUTOCRAFTABLE; }; } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/AbstractFluidGridResourceFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/AbstractFluidGridResourceFactory.java index 1b0aad936..9405aeb53 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/AbstractFluidGridResourceFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/AbstractFluidGridResourceFactory.java @@ -17,7 +17,7 @@ public abstract class AbstractFluidGridResourceFactory implements GridResourceFactory { @Override - public Optional apply(final ResourceKey resource, final boolean craftable) { + public Optional apply(final ResourceKey resource, final boolean autocraftable) { if (!(resource instanceof FluidResource fluidResource)) { return Optional.empty(); } @@ -35,7 +35,7 @@ public Optional apply(final ResourceKey resource, final boolean cr GridResourceAttributeKeys.TAGS, tags, GridResourceAttributeKeys.TOOLTIP, Set.of(tooltip) ), - craftable + autocraftable )); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/AbstractItemGridResourceFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/AbstractItemGridResourceFactory.java index dfd58ebf2..ff7ccd50d 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/AbstractItemGridResourceFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/AbstractItemGridResourceFactory.java @@ -20,7 +20,7 @@ public abstract class AbstractItemGridResourceFactory implements GridResourceFactory { @Override - public Optional apply(final ResourceKey resource, final boolean craftable) { + public Optional apply(final ResourceKey resource, final boolean autocraftable) { if (!(resource instanceof ItemResource itemResource)) { return Optional.empty(); } @@ -41,7 +41,7 @@ public Optional apply(final ResourceKey resource, final boolean cr GridResourceAttributeKeys.TAGS, tags, GridResourceAttributeKeys.TOOLTIP, Set.of(tooltip) ), - craftable + autocraftable )); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/CompositeGridResourceFactory.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/CompositeGridResourceFactory.java index e73b6275b..630f1c264 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/CompositeGridResourceFactory.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/CompositeGridResourceFactory.java @@ -16,10 +16,10 @@ public CompositeGridResourceFactory(final PlatformRegistry resourc } @Override - public Optional apply(final ResourceKey resource, final boolean craftable) { + public Optional apply(final ResourceKey resource, final boolean autocraftable) { return resourceTypeRegistry.getAll() .stream() - .flatMap(type -> type.toGridResource(resource, craftable).stream()) + .flatMap(type -> type.toGridResource(resource, autocraftable).stream()) .findFirst(); } } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/FluidGridResource.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/FluidGridResource.java index 3b11cc868..b197dd9c6 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/FluidGridResource.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/FluidGridResource.java @@ -40,8 +40,8 @@ public class FluidGridResource extends AbstractPlatformGridResource> attributes, - final boolean craftable) { - super(resource, name, attributes, craftable); + final boolean autocraftable) { + super(resource, name, attributes, autocraftable); this.id = BuiltInRegistries.FLUID.getId(resource.fluid()); this.rendering = RefinedStorageApi.INSTANCE.getResourceRendering(FluidResource.class); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/ItemGridResource.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/ItemGridResource.java index dd56b2a55..912ef360d 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/ItemGridResource.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/grid/view/ItemGridResource.java @@ -41,8 +41,8 @@ public ItemGridResource(final ItemResource resource, final ItemStack itemStack, final String name, final Map> attributes, - final boolean craftable) { - super(resource, name, attributes, craftable); + final boolean autocraftable) { + super(resource, name, attributes, autocraftable); this.id = Item.getId(resource.item()); this.itemStack = itemStack; this.itemResource = resource; diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGrid.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGrid.java index f38d75ae6..90d45792b 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGrid.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/storage/portablegrid/PortableGrid.java @@ -116,7 +116,7 @@ public List getResources(final Class act } @Override - public Set getCraftableResources() { + public Set getAutocraftableResources() { return Collections.emptySet(); } diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/AutocrafterNameChangePacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/AutocrafterNameChangePacket.java new file mode 100644 index 000000000..04fc5454d --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/AutocrafterNameChangePacket.java @@ -0,0 +1,33 @@ +package com.refinedmods.refinedstorage.common.support.packet.c2s; + +import com.refinedmods.refinedstorage.common.autocrafting.AutocrafterContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; + +public record AutocrafterNameChangePacket(String name) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("autocrafter_name_change") + ); + public static final StreamCodec STREAM_CODEC = StreamCodec + .composite( + ByteBufCodecs.STRING_UTF8, AutocrafterNameChangePacket::name, + AutocrafterNameChangePacket::new + ); + + public static void handle(final AutocrafterNameChangePacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AutocrafterContainerMenu containerMenu) { + containerMenu.changeName(packet.name); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/C2SPackets.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/C2SPackets.java index bc20c2224..9737e798b 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/C2SPackets.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/c2s/C2SPackets.java @@ -128,8 +128,8 @@ public static void sendPatternGridSmithingTableRecipeTransfer(final List PACKET_TYPE = new Type<>( - createIdentifier("crafter_name_change") - ); - public static final StreamCodec STREAM_CODEC = StreamCodec - .composite( - ByteBufCodecs.STRING_UTF8, CrafterNameChangePacket::name, - CrafterNameChangePacket::new - ); - - public static void handle(final CrafterNameChangePacket packet, final PacketContext ctx) { - if (ctx.getPlayer().containerMenu instanceof CrafterContainerMenu containerMenu) { - containerMenu.changeName(packet.name); - } - } - - @Override - public Type type() { - return PACKET_TYPE; - } -} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/AutocrafterNameUpdatePacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/AutocrafterNameUpdatePacket.java new file mode 100644 index 000000000..3eb557d31 --- /dev/null +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/AutocrafterNameUpdatePacket.java @@ -0,0 +1,34 @@ +package com.refinedmods.refinedstorage.common.support.packet.s2c; + +import com.refinedmods.refinedstorage.common.autocrafting.AutocrafterContainerMenu; +import com.refinedmods.refinedstorage.common.support.packet.PacketContext; + +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.ComponentSerialization; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; + +import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; + +public record AutocrafterNameUpdatePacket(Component name) implements CustomPacketPayload { + public static final Type PACKET_TYPE = new Type<>( + createIdentifier("autocrafter_name_update") + ); + public static final StreamCodec STREAM_CODEC = + StreamCodec.composite( + ComponentSerialization.STREAM_CODEC, AutocrafterNameUpdatePacket::name, + AutocrafterNameUpdatePacket::new + ); + + public static void handle(final AutocrafterNameUpdatePacket packet, final PacketContext ctx) { + if (ctx.getPlayer().containerMenu instanceof AutocrafterContainerMenu containerMenu) { + containerMenu.nameChanged(packet.name); + } + } + + @Override + public Type type() { + return PACKET_TYPE; + } +} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/CrafterNameUpdatePacket.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/CrafterNameUpdatePacket.java deleted file mode 100644 index f681a22e9..000000000 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/CrafterNameUpdatePacket.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.refinedmods.refinedstorage.common.support.packet.s2c; - -import com.refinedmods.refinedstorage.common.autocrafting.CrafterContainerMenu; -import com.refinedmods.refinedstorage.common.support.packet.PacketContext; - -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.ComponentSerialization; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; - -import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier; - -public record CrafterNameUpdatePacket(Component name) implements CustomPacketPayload { - public static final Type PACKET_TYPE = new Type<>( - createIdentifier("crafter_name_update") - ); - public static final StreamCodec STREAM_CODEC = - StreamCodec.composite( - ComponentSerialization.STREAM_CODEC, CrafterNameUpdatePacket::name, - CrafterNameUpdatePacket::new - ); - - public static void handle(final CrafterNameUpdatePacket packet, final PacketContext ctx) { - if (ctx.getPlayer().containerMenu instanceof CrafterContainerMenu containerMenu) { - containerMenu.nameChanged(packet.name); - } - } - - @Override - public Type type() { - return PACKET_TYPE; - } -} diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/S2CPackets.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/S2CPackets.java index 08b365c36..9ddd2e9c1 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/S2CPackets.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/packet/s2c/S2CPackets.java @@ -83,8 +83,8 @@ public static void sendPatternGridAllowedAlternativesUpdate(final ServerPlayer p Platform.INSTANCE.sendPacketToClient(player, new PatternGridAllowedAlternativesUpdatePacket(index, ids)); } - public static void sendCrafterNameUpdate(final ServerPlayer player, final Component name) { - Platform.INSTANCE.sendPacketToClient(player, new CrafterNameUpdatePacket(name)); + public static void sendAutocrafterNameUpdate(final ServerPlayer player, final Component name) { + Platform.INSTANCE.sendPacketToClient(player, new AutocrafterNameUpdatePacket(name)); } public static void sendAutocraftingPreviewResponse(final ServerPlayer player, diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceType.java index 3d57926f7..d53db9d04 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/FluidResourceType.java @@ -26,8 +26,8 @@ class FluidResourceType implements ResourceType { private static final ResourceLocation SPRITE = createIdentifier("widget/side_button/resource_type/fluid"); @Override - public Optional toGridResource(final ResourceKey resource, final boolean craftable) { - return Platform.INSTANCE.getFluidGridResourceFactory().apply(resource, craftable); + public Optional toGridResource(final ResourceKey resource, final boolean autocraftable) { + return Platform.INSTANCE.getFluidGridResourceFactory().apply(resource, autocraftable); } @Override diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceType.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceType.java index 3cda9e40e..8a52dd578 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceType.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/support/resource/ItemResourceType.java @@ -26,8 +26,8 @@ class ItemResourceType implements ResourceType { private static final ResourceLocation SPRITE = createIdentifier("widget/side_button/resource_type/item"); @Override - public Optional toGridResource(final ResourceKey resource, final boolean craftable) { - return Platform.INSTANCE.getItemGridResourceFactory().apply(resource, craftable); + public Optional toGridResource(final ResourceKey resource, final boolean autocraftable) { + return Platform.INSTANCE.getItemGridResourceFactory().apply(resource, autocraftable); } @Override diff --git a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeDestinations.java b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeDestinations.java index 9e8514901..dd3697435 100644 --- a/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeDestinations.java +++ b/refinedstorage-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeDestinations.java @@ -21,7 +21,7 @@ public enum UpgradeDestinations implements UpgradeDestination { DISK_INTERFACE(ContentNames.DISK_INTERFACE, () -> new ItemStack( Items.INSTANCE.getDiskInterfaces().getFirst().get() )), - CRAFTER(ContentNames.CRAFTER, () -> new ItemStack(Items.INSTANCE.getCrafters().getFirst().get())); + AUTOCRAFTER(ContentNames.AUTOCRAFTER, () -> new ItemStack(Items.INSTANCE.getAutocrafters().getFirst().get())); private final Component name; private final Supplier stackFactory; diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json index 23b21ddc2..aa062d858 100644 --- a/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json +++ b/refinedstorage-common/src/main/resources/assets/refinedstorage/lang/en_us.json @@ -37,7 +37,7 @@ "block.refinedstorage.security_manager.help": "When this device is active, will protect the network by default and block all operations. Start adding Security Cards to permit or deny specific operations for a player.", "block.refinedstorage.relay": "Relay", "block.refinedstorage.disk_interface": "Disk Interface", - "block.refinedstorage.crafter": "Crafter", + "block.refinedstorage.autocrafter": "Autocrafter", "gui.refinedstorage.controller.redstone_mode_help": "When this device is inactive, the storage network will not be able to use this device as an energy source.", "gui.refinedstorage.disk_drive.disks": "Disks", "gui.refinedstorage.storage.redstone_mode_help": "When this device is inactive, the contained storage will no longer be accessible from within the storage network.", @@ -126,7 +126,7 @@ "gui.refinedstorage.scheduling_mode.random.help": "Use a random filter.", "gui.refinedstorage.priority": "Priority", "gui.refinedstorage.priority.storage_help": "The order in which the storage network will insert or extract resources, highest-first.", - "gui.refinedstorage.priority.crafter_help": "If multiple patterns exist for one resource, crafting tasks will prioritize the pattern in the Crafter with the highest priority.", + "gui.refinedstorage.priority.crafter_help": "If multiple patterns exist for one resource, crafting tasks will prioritize the pattern in the Autocrafter with the highest priority.", "gui.refinedstorage.configure_amount": "Configure amount", "gui.refinedstorage.configure_amount.reset": "Reset", "gui.refinedstorage.configure_amount.set": "Set", @@ -192,20 +192,20 @@ "gui.refinedstorage.disk_interface.transfer_mode.insert_into_network.help": "Insert the resources from the storage disks into the storage network.", "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network": "Extract from network", "gui.refinedstorage.disk_interface.transfer_mode.extract_from_network.help": "Insert the resources from the storage network into the storage disks.", - "gui.refinedstorage.crafter.empty_pattern_slot": "Empty pattern slot", - "gui.refinedstorage.crafter.lock_mode": "Lock mode", - "gui.refinedstorage.crafter.lock_mode.never": "Never", - "gui.refinedstorage.crafter.lock_mode.lock_until_redstone_pulse_received": "Lock until redstone pulse is received", - "gui.refinedstorage.crafter.lock_mode.lock_until_connected_machine_is_empty": "Lock until connected machine is empty", - "gui.refinedstorage.crafter.lock_mode.lock_until_all_outputs_are_received": "Lock until all outputs are received", - "gui.refinedstorage.crafter.lock_mode.lock_until_high_redstone_signal": "Lock until high redstone signal", - "gui.refinedstorage.crafter.lock_mode.lock_until_low_redstone_signal": "Lock until low redstone signal", - "gui.refinedstorage.crafter.edit_name": "Edit", - "gui.refinedstorage.crafter.chained": "Chained", - "gui.refinedstorage.crafter.chained.help": "This crafter is part of a chain.", - "gui.refinedstorage.crafter.chained.head_help": "This crafter is the head of the chain.", - "gui.refinedstorage.crafter.not_chained": "Not chained", - "gui.refinedstorage.crafter.not_chained.help": "If another crafter is facing this one, they'll form a chain, allowing you to have more patterns going into a single machine.", + "gui.refinedstorage.autocrafter.empty_pattern_slot": "Empty pattern slot", + "gui.refinedstorage.autocrafter.lock_mode": "Lock mode", + "gui.refinedstorage.autocrafter.lock_mode.never": "Never", + "gui.refinedstorage.autocrafter.lock_mode.lock_until_redstone_pulse_received": "Lock until redstone pulse is received", + "gui.refinedstorage.autocrafter.lock_mode.lock_until_connected_machine_is_empty": "Lock until connected machine is empty", + "gui.refinedstorage.autocrafter.lock_mode.lock_until_all_outputs_are_received": "Lock until all outputs are received", + "gui.refinedstorage.autocrafter.lock_mode.lock_until_high_redstone_signal": "Lock until high redstone signal", + "gui.refinedstorage.autocrafter.lock_mode.lock_until_low_redstone_signal": "Lock until low redstone signal", + "gui.refinedstorage.autocrafter.edit_name": "Edit", + "gui.refinedstorage.autocrafter.chained": "Chained", + "gui.refinedstorage.autocrafter.chained.help": "This autocrafter is part of a chain.", + "gui.refinedstorage.autocrafter.chained.head_help": "This autocrafter is the head of the chain.", + "gui.refinedstorage.autocrafter.not_chained": "Not chained", + "gui.refinedstorage.autocrafter.not_chained.help": "If another autocrafter is facing this one, they'll form a chain, allowing you to have more patterns going into a single machine.", "gui.refinedstorage.autocrafting_preview.title": "Autocrafting", "gui.refinedstorage.autocrafting_preview.start": "Start", "gui.refinedstorage.autocrafting_preview.pending": "Pending", @@ -228,7 +228,7 @@ "item.refinedstorage.constructor.help": "Places blocks from the storage network in the world.", "item.refinedstorage.destructor.help": "Destroys blocks from the world and puts them in the storage network.", "item.refinedstorage.relay.help": "Turn entire sections of a storage network on or off and create new branches of your network.", - "item.refinedstorage.crafter.help": "Accepts patterns to store autocraftable resources.", + "item.refinedstorage.autocrafter.help": "Accepts patterns to store autocraftable resources.", "item.refinedstorage.quartz_enriched_iron": "Quartz Enriched Iron", "item.refinedstorage.quartz_enriched_copper": "Quartz Enriched Copper", "item.refinedstorage.processor_binding": "Processor Binding", @@ -589,10 +589,10 @@ "text.autoconfig.refinedstorage.option.relay.inputNetworkEnergyUsage.tooltip": "Input network energy usage.", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage": "Output network energy usage (if not in pass through mode)", "text.autoconfig.refinedstorage.option.relay.outputNetworkEnergyUsage.tooltip": "Output network energy usage (if not in pass through mode).", - "text.autoconfig.refinedstorage.option.crafter": "Crafter", - "text.autoconfig.refinedstorage.option.crafter.tooltip": "Configuration for the Crafter.", - "text.autoconfig.refinedstorage.option.crafter.energyUsage": "Energy usage", - "text.autoconfig.refinedstorage.option.crafter.energyUsage.tooltip": "The energy used by the Crafter.", + "text.autoconfig.refinedstorage.option.autocrafter": "Autocrafter", + "text.autoconfig.refinedstorage.option.autocrafter.tooltip": "Configuration for the Autocrafter.", + "text.autoconfig.refinedstorage.option.autocrafter.energyUsage": "Energy usage", + "text.autoconfig.refinedstorage.option.autocrafter.energyUsage.tooltip": "The energy used by the Autocrafter.", "advancements.refinedstorage.root.description": "Use one or multiple Controllers in a storage network to provide your network with energy", "advancements.refinedstorage.connecting": "Connecting", "advancements.refinedstorage.connecting.description": "Use Cable to connect devices with each other, or place devices against each other", @@ -637,5 +637,5 @@ "advancements.refinedstorage.conditional_connecting": "Conditional connecting", "advancements.refinedstorage.conditional_connecting.description": "Turn entire sections of a storage network on or off and create new branches of your network with a Relay", "advancements.refinedstorage.autocrafting": "Autocrafting", - "advancements.refinedstorage.autocrafting.description": "Automate crafting with a Crafter by using patterns created in a Pattern Grid" + "advancements.refinedstorage.autocrafting.description": "Automate crafting with an Autocrafter by using patterns created in a Pattern Grid" } diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/black.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/black.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/blue.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/blue.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/brown.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/brown.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/cyan.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/cyan.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/gray.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/gray.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/green.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/green.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/inactive.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/inactive.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/light_blue.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/light_blue.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/light_gray.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/light_gray.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/lime.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/lime.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/magenta.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/magenta.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/orange.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/orange.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/pink.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/pink.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/purple.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/purple.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/red.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/red.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/white.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/white.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/yellow.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/side/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/side/yellow.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/black.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/black.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/black.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/black.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/blue.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/blue.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/brown.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/brown.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/brown.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/brown.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/cyan.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/cyan.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/cyan.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/cyan.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/gray.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/gray.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/green.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/green.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/green.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/green.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/inactive.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/inactive.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/inactive.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/inactive.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/light_blue.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/light_blue.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/light_blue.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/light_blue.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/light_gray.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/light_gray.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/light_gray.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/light_gray.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/lime.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/lime.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/lime.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/lime.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/magenta.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/magenta.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/magenta.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/magenta.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/orange.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/orange.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/orange.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/orange.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/pink.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/pink.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/pink.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/pink.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/purple.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/purple.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/purple.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/purple.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/red.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/red.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/red.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/red.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/white.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/white.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/white.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/white.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/yellow.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/yellow.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/cutouts/top/yellow.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/cutouts/top/yellow.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/side.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/side.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/side.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/side.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/top.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/top.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/crafter/top.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/block/autocrafter/top.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/crafter_name.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/autocrafter_name.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/crafter_name.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/autocrafter_name.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/crafter_lock_mode/lock_until_all_outputs_are_received.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/autocrafter_lock_mode/lock_until_all_outputs_are_received.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/crafter_lock_mode/lock_until_all_outputs_are_received.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/autocrafter_lock_mode/lock_until_all_outputs_are_received.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/crafter_lock_mode/lock_until_connected_machine_is_empty.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/autocrafter_lock_mode/lock_until_connected_machine_is_empty.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/crafter_lock_mode/lock_until_connected_machine_is_empty.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/autocrafter_lock_mode/lock_until_connected_machine_is_empty.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/crafter_lock_mode/lock_until_high_redstone_signal.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/autocrafter_lock_mode/lock_until_high_redstone_signal.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/crafter_lock_mode/lock_until_high_redstone_signal.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/autocrafter_lock_mode/lock_until_high_redstone_signal.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/crafter_lock_mode/lock_until_low_redstone_signal.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/autocrafter_lock_mode/lock_until_low_redstone_signal.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/crafter_lock_mode/lock_until_low_redstone_signal.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/autocrafter_lock_mode/lock_until_low_redstone_signal.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/crafter_lock_mode/lock_until_redstone_pulse_is_received.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/autocrafter_lock_mode/lock_until_redstone_pulse_is_received.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/crafter_lock_mode/lock_until_redstone_pulse_is_received.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/autocrafter_lock_mode/lock_until_redstone_pulse_is_received.png diff --git a/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/crafter_lock_mode/never.png b/refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/autocrafter_lock_mode/never.png similarity index 100% rename from refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/crafter_lock_mode/never.png rename to refinedstorage-common/src/main/resources/assets/refinedstorage/textures/gui/sprites/widget/side_button/autocrafter_lock_mode/never.png diff --git a/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/autocrafting.json b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/autocrafting.json index e8380dc4d..560bcebbc 100644 --- a/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/autocrafting.json +++ b/refinedstorage-common/src/main/resources/data/refinedstorage/advancement/autocrafting.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "id": "refinedstorage:crafter" + "id": "refinedstorage:autocrafter" }, "title": { "translate": "advancements.refinedstorage.autocrafting" @@ -12,7 +12,7 @@ }, "parent": "refinedstorage:root", "criteria": { - "crafter_in_inventory": { + "autocrafter_in_inventory": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -20,7 +20,7 @@ "items": "#refinedstorage:pattern_grids" }, { - "items": "#refinedstorage:crafters" + "items": "#refinedstorage:autocrafters" }, { "items": "refinedstorage:pattern" diff --git a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/crafter.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/autocrafter.json similarity index 92% rename from refinedstorage-common/src/main/resources/data/refinedstorage/recipe/crafter.json rename to refinedstorage-common/src/main/resources/data/refinedstorage/recipe/autocrafter.json index 28a5ec9fc..04f6c3a2e 100644 --- a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/crafter.json +++ b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/autocrafter.json @@ -23,6 +23,6 @@ } }, "result": { - "id": "refinedstorage:crafter" + "id": "refinedstorage:autocrafter" } } \ No newline at end of file diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ClientModInitializerImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ClientModInitializerImpl.java index 37e89fd79..a795f8784 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ClientModInitializerImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ClientModInitializerImpl.java @@ -19,9 +19,9 @@ import com.refinedmods.refinedstorage.common.storagemonitor.StorageMonitorBlockEntityRenderer; import com.refinedmods.refinedstorage.common.support.network.item.NetworkItemPropertyFunction; import com.refinedmods.refinedstorage.common.support.packet.PacketHandler; +import com.refinedmods.refinedstorage.common.support.packet.s2c.AutocrafterNameUpdatePacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.AutocraftingPreviewResponsePacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.AutocraftingResponsePacket; -import com.refinedmods.refinedstorage.common.support.packet.s2c.CrafterNameUpdatePacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.EnergyInfoPacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.GridActivePacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.GridClearPacket; @@ -127,7 +127,7 @@ private void setRenderLayers() { setCutout(Blocks.INSTANCE.getSecurityManager()); setCutout(Blocks.INSTANCE.getRelay()); setCutout(Blocks.INSTANCE.getDiskInterface()); - setCutout(Blocks.INSTANCE.getCrafter()); + setCutout(Blocks.INSTANCE.getAutocrafter()); } private void setCutout(final BlockColorMap blockMap) { @@ -156,7 +156,7 @@ private void registerEmissiveModels() { (color, id, block) -> registerEmissiveSecurityManagerModels(color, id) ); Blocks.INSTANCE.getRelay().forEach((color, id, block) -> registerEmissiveRelayModels(color, id)); - Blocks.INSTANCE.getCrafter().forEach((color, id, block) -> registerEmissiveCrafterModels(color, id)); + Blocks.INSTANCE.getAutocrafter().forEach((color, id, block) -> registerEmissiveAutocrafterModels(color, id)); } private void registerColoredEmissiveModels(final BlockColorMap blockMap, @@ -234,16 +234,16 @@ private void registerEmissiveRelayModels(final DyeColor color, final ResourceLoc ); } - private void registerEmissiveCrafterModels(final DyeColor color, final ResourceLocation id) { + private void registerEmissiveAutocrafterModels(final DyeColor color, final ResourceLocation id) { EmissiveModelRegistry.INSTANCE.register( - createIdentifier(BLOCK_PREFIX + "/crafter/" + color.getName()), - createIdentifier(BLOCK_PREFIX + "/crafter/cutouts/side/" + color.getName()), - createIdentifier(BLOCK_PREFIX + "/crafter/cutouts/top/" + color.getName()) + createIdentifier(BLOCK_PREFIX + "/autocrafter/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/autocrafter/cutouts/side/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/autocrafter/cutouts/top/" + color.getName()) ); EmissiveModelRegistry.INSTANCE.register( createIdentifier(ITEM_PREFIX + "/" + id.getPath()), - createIdentifier(BLOCK_PREFIX + "/crafter/cutouts/side/" + color.getName()), - createIdentifier(BLOCK_PREFIX + "/crafter/cutouts/top/" + color.getName()) + createIdentifier(BLOCK_PREFIX + "/autocrafter/cutouts/side/" + color.getName()), + createIdentifier(BLOCK_PREFIX + "/autocrafter/cutouts/top/" + color.getName()) ); } @@ -289,8 +289,8 @@ private void registerPacketHandlers() { wrapHandler(PatternGridAllowedAlternativesUpdatePacket::handle) ); ClientPlayNetworking.registerGlobalReceiver( - CrafterNameUpdatePacket.PACKET_TYPE, - wrapHandler(CrafterNameUpdatePacket::handle) + AutocrafterNameUpdatePacket.PACKET_TYPE, + wrapHandler(AutocrafterNameUpdatePacket::handle) ); ClientPlayNetworking.registerGlobalReceiver( AutocraftingPreviewResponsePacket.PACKET_TYPE, diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ConfigImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ConfigImpl.java index 1ef490941..ed77c12bf 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ConfigImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ConfigImpl.java @@ -120,8 +120,8 @@ public class ConfigImpl implements ConfigData, com.refinedmods.refinedstorage.co private RelayEntryImpl relay = new RelayEntryImpl(); @ConfigEntry.Gui.CollapsibleObject - private SimpleEnergyUsageEntryImpl crafter = new SimpleEnergyUsageEntryImpl( - DefaultEnergyUsage.CRAFTER + private SimpleEnergyUsageEntryImpl autocrafter = new SimpleEnergyUsageEntryImpl( + DefaultEnergyUsage.AUTOCRAFTER ); public static ConfigImpl get() { @@ -285,8 +285,8 @@ public RelayEntry getRelay() { } @Override - public SimpleEnergyUsageEntry getCrafter() { - return crafter; + public SimpleEnergyUsageEntry getAutocrafter() { + return autocrafter; } private static class GridEntryImpl implements GridEntry { diff --git a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java index dc3f23626..37d2390c8 100644 --- a/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java +++ b/refinedstorage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java @@ -29,9 +29,9 @@ import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridType; import com.refinedmods.refinedstorage.common.support.AbstractBaseBlock; import com.refinedmods.refinedstorage.common.support.packet.PacketHandler; +import com.refinedmods.refinedstorage.common.support.packet.c2s.AutocrafterNameChangePacket; import com.refinedmods.refinedstorage.common.support.packet.c2s.AutocraftingPreviewRequestPacket; import com.refinedmods.refinedstorage.common.support.packet.c2s.AutocraftingRequestPacket; -import com.refinedmods.refinedstorage.common.support.packet.c2s.CrafterNameChangePacket; import com.refinedmods.refinedstorage.common.support.packet.c2s.CraftingGridClearPacket; import com.refinedmods.refinedstorage.common.support.packet.c2s.CraftingGridRecipeTransferPacket; import com.refinedmods.refinedstorage.common.support.packet.c2s.FilterSlotChangePacket; @@ -55,9 +55,9 @@ import com.refinedmods.refinedstorage.common.support.packet.c2s.SingleAmountChangePacket; import com.refinedmods.refinedstorage.common.support.packet.c2s.StorageInfoRequestPacket; import com.refinedmods.refinedstorage.common.support.packet.c2s.UseSlotReferencedItemPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.AutocrafterNameUpdatePacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.AutocraftingPreviewResponsePacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.AutocraftingResponsePacket; -import com.refinedmods.refinedstorage.common.support.packet.s2c.CrafterNameUpdatePacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.EnergyInfoPacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.GridActivePacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.GridClearPacket; @@ -444,8 +444,8 @@ private void registerServerToClientPackets() { PatternGridAllowedAlternativesUpdatePacket.STREAM_CODEC ); PayloadTypeRegistry.playS2C().register( - CrafterNameUpdatePacket.PACKET_TYPE, - CrafterNameUpdatePacket.STREAM_CODEC + AutocrafterNameUpdatePacket.PACKET_TYPE, + AutocrafterNameUpdatePacket.STREAM_CODEC ); PayloadTypeRegistry.playS2C().register( AutocraftingPreviewResponsePacket.PACKET_TYPE, @@ -539,8 +539,8 @@ private void registerClientToServerPackets() { PatternGridSmithingTableRecipeTransferPacket.STREAM_CODEC ); PayloadTypeRegistry.playC2S().register( - CrafterNameChangePacket.PACKET_TYPE, - CrafterNameChangePacket.STREAM_CODEC + AutocrafterNameChangePacket.PACKET_TYPE, + AutocrafterNameChangePacket.STREAM_CODEC ); PayloadTypeRegistry.playC2S().register( AutocraftingPreviewRequestPacket.PACKET_TYPE, @@ -646,8 +646,8 @@ private void registerPacketHandlers() { wrapHandler(PatternGridSmithingTableRecipeTransferPacket::handle) ); ServerPlayNetworking.registerGlobalReceiver( - CrafterNameChangePacket.PACKET_TYPE, - wrapHandler(CrafterNameChangePacket::handle) + AutocrafterNameChangePacket.PACKET_TYPE, + wrapHandler(AutocrafterNameChangePacket::handle) ); ServerPlayNetworking.registerGlobalReceiver( AutocraftingPreviewRequestPacket.PACKET_TYPE, @@ -691,7 +691,7 @@ private void registerCapabilities() { registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getSecurityManager()); registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getStorageMonitor()); registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getWirelessTransmitter()); - registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getCrafter()); + registerNetworkNodeContainerProvider(BlockEntities.INSTANCE.getAutocrafter()); registerItemStorage( AbstractDiskDriveBlockEntity.class::isInstance, AbstractDiskDriveBlockEntity.class::cast, diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResource.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResource.java index 8000b9bdb..c90be235a 100644 --- a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResource.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResource.java @@ -20,5 +20,5 @@ public interface GridResource { Set getAttribute(GridResourceAttributeKey key); - boolean isCraftable(); + boolean isAutocraftable(); } diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceFactory.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceFactory.java index 55913ebe4..87e73bac7 100644 --- a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceFactory.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceFactory.java @@ -15,9 +15,9 @@ public interface GridResourceFactory { /** * Transforms a {@link com.refinedmods.refinedstorage.api.resource.ResourceKey} into a {@link GridResource}. * - * @param resource the resource - * @param craftable whether the resource is craftable + * @param resource the resource + * @param autocraftable whether the resource is autocraftable * @return the grid resource, if applicable */ - Optional apply(ResourceKey resource, boolean craftable); + Optional apply(ResourceKey resource, boolean autocraftable); } diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridView.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridView.java index c29deb64c..ddfce8352 100644 --- a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridView.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridView.java @@ -72,9 +72,9 @@ public interface GridView { /** * @param resource the resource - * @return whether its craftable + * @return whether its autocraftable */ - boolean isCraftable(ResourceKey resource); + boolean isAutocraftable(ResourceKey resource); /** * Sorts the view list. diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewBuilder.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewBuilder.java index 99ca4573f..fe2014157 100644 --- a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewBuilder.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewBuilder.java @@ -23,12 +23,12 @@ public interface GridViewBuilder { GridViewBuilder withResource(ResourceKey resource, long amount, @Nullable TrackedResource trackedResource); /** - * Adds a resource into the view and marks it as craftable. + * Adds a resource into the view and marks it as autocraftable. * * @param resource the resource * @return this builder */ - GridViewBuilder withCraftableResource(ResourceKey resource); + GridViewBuilder withAutocraftableResource(ResourceKey resource); /** * @return a {@link GridView} with the specified resources diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewBuilderImpl.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewBuilderImpl.java index 8bc9c0b13..4744f4dc3 100644 --- a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewBuilderImpl.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewBuilderImpl.java @@ -17,7 +17,7 @@ public class GridViewBuilderImpl implements GridViewBuilder { private final GridResourceFactory resourceFactory; private final MutableResourceList backingList = MutableResourceListImpl.create(); - private final Set craftableResources = new HashSet<>(); + private final Set autocraftableResources = new HashSet<>(); private final Map trackedResources = new HashMap<>(); private final GridSortingType identitySortingType; private final GridSortingType defaultSortingType; @@ -40,8 +40,8 @@ public GridViewBuilder withResource(final ResourceKey resource, } @Override - public GridViewBuilder withCraftableResource(final ResourceKey resource) { - craftableResources.add(resource); + public GridViewBuilder withAutocraftableResource(final ResourceKey resource) { + autocraftableResources.add(resource); return this; } @@ -51,7 +51,7 @@ public GridView build() { resourceFactory, backingList, trackedResources, - craftableResources, + autocraftableResources, identitySortingType, defaultSortingType ); diff --git a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImpl.java b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImpl.java index c4b0f4f7f..af9b066a1 100644 --- a/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImpl.java +++ b/refinedstorage-grid-api/src/main/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImpl.java @@ -28,7 +28,7 @@ public class GridViewImpl implements GridView { private final Comparator identitySort; private final GridResourceFactory resourceFactory; private final Map trackedResources = new HashMap<>(); - private final Set craftableResources; + private final Set autocraftableResources; private ViewList viewList = new ViewList(new ArrayList<>(), new HashMap<>()); private GridSortingType sortingType; @@ -44,12 +44,12 @@ public class GridViewImpl implements GridView { * @param initialTrackedResources initial tracked resources state * @param identitySortingType a sorting type required to keep a consistent sorting order with quantity sorting * @param defaultSortingType the default sorting type - * @param craftableResources resources which are craftable and must stay in the view list + * @param autocraftableResources resources which are autocraftable and must stay in the view list */ public GridViewImpl(final GridResourceFactory resourceFactory, final MutableResourceList backingList, final Map initialTrackedResources, - final Set craftableResources, + final Set autocraftableResources, final GridSortingType identitySortingType, final GridSortingType defaultSortingType) { this.resourceFactory = resourceFactory; @@ -57,7 +57,7 @@ public GridViewImpl(final GridResourceFactory resourceFactory, this.sortingType = defaultSortingType; this.backingList = backingList; this.trackedResources.putAll(initialTrackedResources); - this.craftableResources = craftableResources; + this.autocraftableResources = autocraftableResources; } @Override @@ -101,8 +101,8 @@ public long getAmount(final ResourceKey resource) { } @Override - public boolean isCraftable(final ResourceKey resource) { - return craftableResources.contains(resource); + public boolean isAutocraftable(final ResourceKey resource) { + return autocraftableResources.contains(resource); } @Override @@ -116,11 +116,11 @@ private ViewList createViewList() { final List list = new ArrayList<>(); final Map index = new HashMap<>(); for (final ResourceKey resource : backingList.getAll()) { - tryAddResourceIntoViewList(resource, list, index, craftableResources.contains(resource)); + tryAddResourceIntoViewList(resource, list, index, autocraftableResources.contains(resource)); } - for (final ResourceKey craftableResource : craftableResources) { - if (!index.containsKey(craftableResource)) { - tryAddResourceIntoViewList(craftableResource, list, index, true); + for (final ResourceKey autocraftableResource : autocraftableResources) { + if (!index.containsKey(autocraftableResource)) { + tryAddResourceIntoViewList(autocraftableResource, list, index, true); } } list.sort(getComparator()); @@ -130,12 +130,12 @@ private ViewList createViewList() { private void tryAddResourceIntoViewList(final ResourceKey resource, final List list, final Map index, - final boolean craftable) { + final boolean autocraftable) { final GridResource existingGridResource = viewList.index.get(resource); if (existingGridResource != null) { tryAddGridResourceIntoViewList(existingGridResource, list, index, resource); } else { - resourceFactory.apply(resource, craftable).ifPresent( + resourceFactory.apply(resource, autocraftable).ifPresent( gridResource -> tryAddGridResourceIntoViewList(gridResource, list, index, resource) ); } @@ -193,7 +193,7 @@ private void reinsertIntoViewList(final ResourceKey resource, final GridResource LOGGER.debug("{} was removed from backing list, reinserting now into the view list", resource); final GridResource newResource = resourceFactory.apply( resource, - craftableResources.contains(resource) + autocraftableResources.contains(resource) ).orElseThrow(); viewList.index.put(resource, newResource); final int index = CoreValidations.validateNotNegative( @@ -222,7 +222,7 @@ private void updateExistingResourceInViewList(final ResourceKey resource, final GridResource gridResource, final boolean noLongerAvailable) { viewList.list.remove(gridResource); - if (noLongerAvailable && !craftableResources.contains(resource)) { + if (noLongerAvailable && !autocraftableResources.contains(resource)) { viewList.index.remove(resource); notifyListener(); } else { diff --git a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserImplTest.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserImplTest.java index 254269cfb..e2853833a 100644 --- a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserImplTest.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/query/GridQueryParserImplTest.java @@ -324,7 +324,7 @@ public Set getAttribute(final GridResourceAttributeKey key) { } @Override - public boolean isCraftable() { + public boolean isAutocraftable() { return false; } } diff --git a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceImpl.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceImpl.java index 71ff063dc..64d8c216a 100644 --- a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceImpl.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridResourceImpl.java @@ -11,23 +11,23 @@ public class GridResourceImpl implements GridResource { private final ResourceKey resource; private final Map> attributes; - private boolean craftable; + private boolean autocraftable; public GridResourceImpl(final ResourceKey resource) { this(resource, false); } - public GridResourceImpl(final ResourceKey resource, final boolean craftable) { + public GridResourceImpl(final ResourceKey resource, final boolean autocraftable) { this.resource = resource; this.attributes = Map.of( FakeGridResourceAttributeKeys.MOD_ID, Set.of(resource.toString()), FakeGridResourceAttributeKeys.MOD_NAME, Set.of(resource.toString()) ); - this.craftable = craftable; + this.autocraftable = autocraftable; } - public GridResourceImpl craftable() { - craftable = true; + public GridResourceImpl autocraftable() { + autocraftable = true; return this; } @@ -52,8 +52,8 @@ public Set getAttribute(final GridResourceAttributeKey key) { } @Override - public boolean isCraftable() { - return craftable; + public boolean isAutocraftable() { + return autocraftable; } @Override diff --git a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java index 67b253280..e907e4eff 100644 --- a/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java +++ b/refinedstorage-grid-api/src/test/java/com/refinedmods/refinedstorage/api/grid/view/GridViewImplTest.java @@ -657,11 +657,11 @@ void shouldClear() { } @Test - void shouldIncludeCraftableResourceInViewList() { + void shouldIncludeAutocraftableResourceInViewList() { // Arrange final GridView view = viewBuilder .withResource(A, 15, null) - .withCraftableResource(B) + .withAutocraftableResource(B) .build(); // Act @@ -670,10 +670,10 @@ void shouldIncludeCraftableResourceInViewList() { // Assert assertThat(view.getViewList()).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder( new GridResourceImpl(A), - new GridResourceImpl(B).craftable() + new GridResourceImpl(B).autocraftable() ); - assertThat(view.isCraftable(A)).isFalse(); - assertThat(view.isCraftable(B)).isTrue(); + assertThat(view.isAutocraftable(A)).isFalse(); + assertThat(view.isAutocraftable(B)).isTrue(); assertThat(view.getAmount(A)).isEqualTo(15); assertThat(view.getAmount(B)).isZero(); assertThat(view.copyBackingList().copyState()).usingRecursiveFieldByFieldElementComparator() @@ -681,11 +681,11 @@ void shouldIncludeCraftableResourceInViewList() { } @Test - void shouldIncludeCraftableResourceInViewListEvenIfItIsInTheBackingList() { + void shouldIncludeAutocraftableResourceInViewListEvenIfItIsInTheBackingList() { // Arrange final GridView view = viewBuilder .withResource(A, 15, null) - .withCraftableResource(A) + .withAutocraftableResource(A) .build(); // Act @@ -693,9 +693,9 @@ void shouldIncludeCraftableResourceInViewListEvenIfItIsInTheBackingList() { // Assert assertThat(view.getViewList()).usingRecursiveFieldByFieldElementComparator().containsExactly( - new GridResourceImpl(A).craftable() + new GridResourceImpl(A).autocraftable() ); - assertThat(view.isCraftable(A)).isTrue(); + assertThat(view.isAutocraftable(A)).isTrue(); assertThat(view.getAmount(A)).isEqualTo(15); assertThat(view.copyBackingList().copyState()) .usingRecursiveFieldByFieldElementComparator() @@ -703,11 +703,11 @@ void shouldIncludeCraftableResourceInViewListEvenIfItIsInTheBackingList() { } @Test - void shouldNotRemoveCraftableResource() { + void shouldNotRemoveAutocraftableResource() { // Arrange final GridView view = viewBuilder .withResource(A, 15, null) - .withCraftableResource(A) + .withAutocraftableResource(A) .build(); view.sort(); @@ -717,19 +717,19 @@ void shouldNotRemoveCraftableResource() { // Assert assertThat(view.getViewList()).usingRecursiveFieldByFieldElementComparator().containsExactly( - new GridResourceImpl(A).craftable() + new GridResourceImpl(A).autocraftable() ); - assertThat(view.isCraftable(A)).isTrue(); + assertThat(view.isAutocraftable(A)).isTrue(); assertThat(view.getAmount(A)).isZero(); assertThat(view.copyBackingList().copyState()).isEmpty(); } @Test - void shouldNotRemoveCraftableResourceEvenWhenPreventingSorting() { + void shouldNotRemoveAutocraftableResourceEvenWhenPreventingSorting() { // Arrange final GridView view = viewBuilder .withResource(A, 15, null) - .withCraftableResource(A) + .withAutocraftableResource(A) .build(); view.sort(); @@ -739,18 +739,18 @@ void shouldNotRemoveCraftableResourceEvenWhenPreventingSorting() { view.onChange(A, -15, null); assertThat(view.getViewList()).usingRecursiveFieldByFieldElementComparator().containsExactly( - new GridResourceImpl(A).craftable() + new GridResourceImpl(A).autocraftable() ); - assertThat(view.isCraftable(A)).isTrue(); + assertThat(view.isAutocraftable(A)).isTrue(); assertThat(view.getAmount(A)).isZero(); assertThat(view.copyBackingList().copyState()).isEmpty(); view.onChange(A, 1, null); assertThat(view.getViewList()).usingRecursiveFieldByFieldElementComparator().containsExactly( - new GridResourceImpl(A).craftable() + new GridResourceImpl(A).autocraftable() ); - assertThat(view.isCraftable(A)).isTrue(); + assertThat(view.isAutocraftable(A)).isTrue(); assertThat(view.getAmount(A)).isEqualTo(1); assertThat(view.copyBackingList().copyState()).usingRecursiveFieldByFieldElementComparator().containsExactly( new ResourceAmount(A, 1) diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ConfigImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ConfigImpl.java index d92758624..ec2a356bc 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ConfigImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ConfigImpl.java @@ -52,7 +52,7 @@ public class ConfigImpl implements Config { private final SimpleEnergyUsageEntry fallbackSecurityCard; private final SimpleEnergyUsageEntry securityManager; private final RelayEntry relay; - private final SimpleEnergyUsageEntry crafter; + private final SimpleEnergyUsageEntry autocrafter; public ConfigImpl() { screenSize = builder @@ -97,7 +97,7 @@ public ConfigImpl() { ); securityManager = new SimpleEnergyUsageEntryImpl("securityManager", DefaultEnergyUsage.SECURITY_MANAGER); relay = new RelayEntryImpl(); - crafter = new SimpleEnergyUsageEntryImpl("crafter", DefaultEnergyUsage.CRAFTER); + autocrafter = new SimpleEnergyUsageEntryImpl("autocrafter", DefaultEnergyUsage.AUTOCRAFTER); spec = builder.build(); } @@ -264,8 +264,8 @@ public RelayEntry getRelay() { } @Override - public SimpleEnergyUsageEntry getCrafter() { - return crafter; + public SimpleEnergyUsageEntry getAutocrafter() { + return autocrafter; } private static String translationKey(final String value) { diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java index a8b9ebd5a..2964aed52 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/ModInitializer.java @@ -29,9 +29,9 @@ import com.refinedmods.refinedstorage.common.storage.portablegrid.PortableGridType; import com.refinedmods.refinedstorage.common.support.AbstractBaseBlock; import com.refinedmods.refinedstorage.common.support.packet.PacketHandler; +import com.refinedmods.refinedstorage.common.support.packet.c2s.AutocrafterNameChangePacket; import com.refinedmods.refinedstorage.common.support.packet.c2s.AutocraftingPreviewRequestPacket; import com.refinedmods.refinedstorage.common.support.packet.c2s.AutocraftingRequestPacket; -import com.refinedmods.refinedstorage.common.support.packet.c2s.CrafterNameChangePacket; import com.refinedmods.refinedstorage.common.support.packet.c2s.CraftingGridClearPacket; import com.refinedmods.refinedstorage.common.support.packet.c2s.CraftingGridRecipeTransferPacket; import com.refinedmods.refinedstorage.common.support.packet.c2s.FilterSlotChangePacket; @@ -55,9 +55,9 @@ import com.refinedmods.refinedstorage.common.support.packet.c2s.SingleAmountChangePacket; import com.refinedmods.refinedstorage.common.support.packet.c2s.StorageInfoRequestPacket; import com.refinedmods.refinedstorage.common.support.packet.c2s.UseSlotReferencedItemPacket; +import com.refinedmods.refinedstorage.common.support.packet.s2c.AutocrafterNameUpdatePacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.AutocraftingPreviewResponsePacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.AutocraftingResponsePacket; -import com.refinedmods.refinedstorage.common.support.packet.s2c.CrafterNameUpdatePacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.EnergyInfoPacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.GridActivePacket; import com.refinedmods.refinedstorage.common.support.packet.s2c.GridClearPacket; @@ -429,7 +429,7 @@ private void registerCapabilities(final RegisterCapabilitiesEvent event) { registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getSecurityManager()); registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getStorageMonitor()); registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getWirelessTransmitter()); - registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getCrafter()); + registerNetworkNodeContainerProvider(event, BlockEntities.INSTANCE.getAutocrafter()); event.registerBlockEntity( Capabilities.ItemHandler.BLOCK, BlockEntities.INSTANCE.getDiskDrive(), @@ -631,9 +631,9 @@ private static void registerServerToClientPackets(final PayloadRegistrar registr wrapHandler(PatternGridAllowedAlternativesUpdatePacket::handle) ); registrar.playToClient( - CrafterNameUpdatePacket.PACKET_TYPE, - CrafterNameUpdatePacket.STREAM_CODEC, - wrapHandler(CrafterNameUpdatePacket::handle) + AutocrafterNameUpdatePacket.PACKET_TYPE, + AutocrafterNameUpdatePacket.STREAM_CODEC, + wrapHandler(AutocrafterNameUpdatePacket::handle) ); registrar.playToClient( AutocraftingPreviewResponsePacket.PACKET_TYPE, @@ -764,9 +764,9 @@ private static void registerClientToServerPackets(final PayloadRegistrar registr wrapHandler(PatternGridSmithingTableRecipeTransferPacket::handle) ); registrar.playToServer( - CrafterNameChangePacket.PACKET_TYPE, - CrafterNameChangePacket.STREAM_CODEC, - wrapHandler(CrafterNameChangePacket::handle) + AutocrafterNameChangePacket.PACKET_TYPE, + AutocrafterNameChangePacket.STREAM_CODEC, + wrapHandler(AutocrafterNameChangePacket::handle) ); registrar.playToServer( AutocraftingPreviewRequestPacket.PACKET_TYPE, diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/BlockModelProviderImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/BlockModelProviderImpl.java index 9149cea2f..042161937 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/BlockModelProviderImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/BlockModelProviderImpl.java @@ -58,7 +58,7 @@ protected void registerModels() { registerSecurityManagers(); registerRelays(); registerDiskInterfaces(); - registerCrafters(); + registerAutocrafters(); } private void registerCables() { @@ -294,13 +294,13 @@ private void registerDiskInterfaces() { }).end()); } - private void registerCrafters() { - final ResourceLocation side = createIdentifier("block/crafter/side"); - final ResourceLocation top = createIdentifier("block/crafter/top"); - Blocks.INSTANCE.getCrafter().forEach((color, id, crafter) -> { - final ResourceLocation cutoutSide = createIdentifier("block/crafter/cutouts/side/" + color.getName()); - final ResourceLocation cutoutTop = createIdentifier("block/crafter/cutouts/top/" + color.getName()); - withExistingParent("block/crafter/" + color.getName(), EMISSIVE_CUTOUT) + private void registerAutocrafters() { + final ResourceLocation side = createIdentifier("block/autocrafter/side"); + final ResourceLocation top = createIdentifier("block/autocrafter/top"); + Blocks.INSTANCE.getAutocrafter().forEach((color, id, autocrafter) -> { + final ResourceLocation cutoutSide = createIdentifier("block/autocrafter/cutouts/side/" + color.getName()); + final ResourceLocation cutoutTop = createIdentifier("block/autocrafter/cutouts/top/" + color.getName()); + withExistingParent("block/autocrafter/" + color.getName(), EMISSIVE_CUTOUT) .texture(PARTICLE_TEXTURE, side) .texture(NORTH, side) .texture(EAST, side) @@ -315,9 +315,9 @@ private void registerCrafters() { .texture(CUTOUT_UP, cutoutTop) .texture(CUTOUT_DOWN, BOTTOM_TEXTURE); }); - final ResourceLocation cutoutSide = createIdentifier("block/crafter/cutouts/side/inactive"); - final ResourceLocation cutoutTop = createIdentifier("block/crafter/cutouts/top/inactive"); - withExistingParent("block/crafter/inactive", CUTOUT) + final ResourceLocation cutoutSide = createIdentifier("block/autocrafter/cutouts/side/inactive"); + final ResourceLocation cutoutTop = createIdentifier("block/autocrafter/cutouts/top/inactive"); + withExistingParent("block/autocrafter/inactive", CUTOUT) .texture(PARTICLE_TEXTURE, side) .texture(NORTH, side) .texture(EAST, side) diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/BlockStateProviderImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/BlockStateProviderImpl.java index b65ef7032..23d382e0e 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/BlockStateProviderImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/BlockStateProviderImpl.java @@ -58,7 +58,7 @@ protected void registerStatesAndModels() { registerSecurityManagers(); registerRelays(); registerDiskInterfaces(); - registerCrafters(); + registerAutocrafters(); } private void registerCables() { @@ -306,10 +306,10 @@ private void registerDiskInterfaces() { }); } - private void registerCrafters() { - final ModelFile inactive = modelFile(createIdentifier(BLOCK_PREFIX + "/crafter/inactive")); - Blocks.INSTANCE.getCrafter().forEach((color, id, block) -> { - final ModelFile active = modelFile(createIdentifier(BLOCK_PREFIX + "/crafter/" + color.getName())); + private void registerAutocrafters() { + final ModelFile inactive = modelFile(createIdentifier(BLOCK_PREFIX + "/autocrafter/inactive")); + Blocks.INSTANCE.getAutocrafter().forEach((color, id, block) -> { + final ModelFile active = modelFile(createIdentifier(BLOCK_PREFIX + "/autocrafter/" + color.getName())); final var builder = getVariantBuilder(block.get()); builder.forAllStates(blockState -> { final ConfiguredModel.Builder model = ConfiguredModel.builder(); @@ -319,7 +319,7 @@ private void registerCrafters() { model.modelFile(inactive); } final Direction direction = blockState.getValue(DefaultDirectionType.FACE_PLAYER.getProperty()); - addCrafterRotation(model, direction); + addAutocrafterRotation(model, direction); return model.build(); }); }); @@ -368,7 +368,7 @@ private void addRotationFrontFacingNorth(final ConfiguredModel.Builder model, } } - private void addCrafterRotation(final ConfiguredModel.Builder model, final Direction direction) { + private void addAutocrafterRotation(final ConfiguredModel.Builder model, final Direction direction) { if (direction.getAxis().isHorizontal()) { model.rotationX(90); } else if (direction == Direction.DOWN) { diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/ItemModelProviderImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/ItemModelProviderImpl.java index b6a8ab5a8..983a523ab 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/ItemModelProviderImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/ItemModelProviderImpl.java @@ -51,7 +51,7 @@ protected void registerModels() { registerSecurityManagers(); registerRelays(); registerDiskInterfaces(); - registerCrafters(); + registerAutocrafters(); } private void registerCables() { @@ -219,11 +219,11 @@ private void registerDiskInterfaces() { }).end()); } - private void registerCrafters() { - final var blocks = Blocks.INSTANCE.getCrafter(); + private void registerAutocrafters() { + final var blocks = Blocks.INSTANCE.getAutocrafter(); blocks.forEach((color, id, block) -> withExistingParent( id.getPath(), - createIdentifier("block/crafter/" + color.getName()) + createIdentifier("block/autocrafter/" + color.getName()) )); } diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/loot/BlockDropProvider.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/loot/BlockDropProvider.java index ef6ecb06b..32b2fa6c4 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/loot/BlockDropProvider.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/loot/BlockDropProvider.java @@ -41,7 +41,7 @@ protected void generate() { Blocks.INSTANCE.getSecurityManager().forEach((color, id, block) -> drop(block.get())); Blocks.INSTANCE.getRelay().forEach((color, id, block) -> drop(block.get())); Blocks.INSTANCE.getDiskInterface().forEach((color, id, block) -> drop(block.get())); - Blocks.INSTANCE.getCrafter().forEach((color, id, block) -> drop(block.get())); + Blocks.INSTANCE.getAutocrafter().forEach((color, id, block) -> drop(block.get())); } private void drop(final Block block) { @@ -72,7 +72,7 @@ protected Iterable getKnownBlocks() { blocks.addAll(Blocks.INSTANCE.getSecurityManager().values()); blocks.addAll(Blocks.INSTANCE.getRelay().values()); blocks.addAll(Blocks.INSTANCE.getDiskInterface().values()); - blocks.addAll(Blocks.INSTANCE.getCrafter().values()); + blocks.addAll(Blocks.INSTANCE.getAutocrafter().values()); return blocks; } } diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/recipe/RecoloringRecipeProvider.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/recipe/RecoloringRecipeProvider.java index 4429b8bcb..ac3b84b27 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/recipe/RecoloringRecipeProvider.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/recipe/RecoloringRecipeProvider.java @@ -77,9 +77,9 @@ protected void buildRecipes(final RecipeOutput output) { Blocks.INSTANCE.getDiskInterface().forEach((color, id, block) -> recipe(Tags.DISK_INTERFACES, block.get().asItem(), color) .save(output, recipeId(color, "disk_interface"))); - Blocks.INSTANCE.getCrafter().forEach((color, id, block) -> - recipe(Tags.CRAFTERS, block.get().asItem(), color) - .save(output, recipeId(color, "crafter"))); + Blocks.INSTANCE.getAutocrafter().forEach((color, id, block) -> + recipe(Tags.AUTOCRAFTERS, block.get().asItem(), color) + .save(output, recipeId(color, "autocrafter"))); } private ResourceLocation recipeId(final DyeColor color, final String suffix) { diff --git a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/tag/ItemTagsProviderImpl.java b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/tag/ItemTagsProviderImpl.java index 21a10d74f..290721ca4 100644 --- a/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/tag/ItemTagsProviderImpl.java +++ b/refinedstorage-neoforge/src/main/java/com/refinedmods/refinedstorage/neoforge/datagen/tag/ItemTagsProviderImpl.java @@ -20,10 +20,10 @@ import net.minecraft.world.level.block.Block; import net.neoforged.neoforge.common.data.ExistingFileHelper; +import static com.refinedmods.refinedstorage.common.content.Tags.AUTOCRAFTERS; import static com.refinedmods.refinedstorage.common.content.Tags.CABLES; import static com.refinedmods.refinedstorage.common.content.Tags.CONSTRUCTORS; import static com.refinedmods.refinedstorage.common.content.Tags.CONTROLLERS; -import static com.refinedmods.refinedstorage.common.content.Tags.CRAFTERS; import static com.refinedmods.refinedstorage.common.content.Tags.CRAFTING_GRIDS; import static com.refinedmods.refinedstorage.common.content.Tags.CREATIVE_CONTROLLERS; import static com.refinedmods.refinedstorage.common.content.Tags.DESTRUCTORS; @@ -131,8 +131,8 @@ protected void addTags(final HolderLookup.Provider provider) { Blocks.INSTANCE.getDiskInterface().values().stream() .map(block -> (Supplier) block::asItem) .toList()); - addAllToTag(CRAFTERS, - Blocks.INSTANCE.getCrafter().values().stream() + addAllToTag(AUTOCRAFTERS, + Blocks.INSTANCE.getAutocrafter().values().stream() .map(block -> (Supplier) block::asItem) .toList()); }