This commit is contained in:
yrsegal@gmail.com 2022-07-02 23:58:47 -04:00
parent 1b01174186
commit 21ce790bb7
72 changed files with 429 additions and 393 deletions

View file

@ -47,6 +47,7 @@ df994438c20d9dec9009c9c56de74860a847681b assets/hexcasting/models/block/amethyst
062366f91878466f15ebeeaa11d3fa4906918f7b assets/hexcasting/models/block/ancient_scroll_paper_lantern.json
8d0e4f4235b05a66946859f4c55d787555446faf assets/hexcasting/models/block/aventurine_edified_leaves.json
4259c01bfaab2aafb547ea4d204e3807cee0493f assets/hexcasting/models/block/citrine_edified_leaves.json
447abb147b12bbfa0899cd3fb86d80fb759669b3 assets/hexcasting/models/block/conjured.json
8bec88a097cdc3a97e995b38a201468503ca191c assets/hexcasting/models/block/edified_button.json
21e8c7a96212e342b8996296445639d89a85f97b assets/hexcasting/models/block/edified_button_pressed.json
ca7bece852806ca782937b8c912a416d93a60e40 assets/hexcasting/models/block/edified_door_bottom.json

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "minecraft:block/amethyst_block"
}
}

View file

@ -24,14 +24,12 @@ public class HexItemTagProvider extends PaucalItemTagProvider {
protected void addTags() {
tag(xtags.gems()).add(HexItems.CHARGED_AMETHYST);
tag(xtags.amethystDust()).add(HexItems.AMETHYST_DUST);
tag(HexItemTags.STAVES).add(HexItems.STAFF_EDIFIED,
HexItems.STAFF_OAK, HexItems.STAFF_SPRUCE, HexItems.STAFF_BIRCH,
HexItems.STAFF_JUNGLE, HexItems.STAFF_ACACIA, HexItems.STAFF_DARK_OAK,
HexItems.STAFF_CRIMSON, HexItems.STAFF_WARPED);
tag(ItemTags.CLUSTER_MAX_HARVESTABLES).add(HexItems.JEWELER_HAMMER);
tag(HexItemTags.PHIAL_BASE).add(Items.GLASS_BOTTLE);
this.copy(HexBlockTags.EDIFIED_LOGS, HexItemTags.EDIFIED_LOGS);

View file

@ -119,12 +119,11 @@ public class HexplatRecipes extends PaucalRecipeProvider {
for (var dye : DyeColor.values()) {
var item = HexItems.DYE_COLORIZERS.get(dye);
ShapedRecipeBuilder.shaped(item)
.define('B', Items.BOWL)
.define('D', HexItems.AMETHYST_DUST)
.define('C', DyeItem.byColor(dye))
.pattern(" C ")
.pattern(" D ")
.pattern(" B ")
.pattern("DCD")
.pattern(" D ")
.unlockedBy("has_item", hasItem(HexItems.AMETHYST_DUST)).save(recipes);
}
@ -374,12 +373,11 @@ public class HexplatRecipes extends PaucalRecipeProvider {
private void gayRecipe(Consumer<FinishedRecipe> recipes, ItemPrideColorizer.Type type, Item material) {
var colorizer = HexItems.PRIDE_COLORIZERS.get(type);
ShapedRecipeBuilder.shaped(colorizer)
.define('B', Items.BOWL)
.define('D', HexItems.AMETHYST_DUST)
.define('C', material)
.pattern(" C ")
.pattern(" D ")
.pattern(" B ")
.pattern("DCD")
.pattern(" D ")
.unlockedBy("has_item", hasItem(HexItems.AMETHYST_DUST)).save(recipes);
}

View file

@ -0,0 +1,256 @@
d266f13878ba1e3de27e41c60fa86a999af2db3d data/minecraft/tags/items/wooden_doors.json
f3638ae23ee4a74fbb0f50c9cbc39e05e14d4340 data/minecraft/tags/items/planks.json
568ac8a13b7762b92cc274d74a7c729cc6e16687 data/hexcasting/recipes/pride_colorizer_pansexual.json
0ab8418b17c6becf4726a1b93549353180420793 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_button.json
c521621c409275e219f72abf5c6089d60408e646 data/hexcasting/loot_tables/blocks/impetus_rightclick.json
023c32e8834eb313c4fa94a84a8f6390ee951ef0 data/hexcasting/advancements/recipes/hexcasting.creative_tab/empty_impetus.json
3e49b1076839e73e871faf64262f96bed22a6b1d data/hexcasting/recipes/artifact.json
dde248318cc8343c6ead432aaf933bda65102f7f data/hexcasting/loot_tables/blocks/aventurine_edified_leaves.json
30b1ba88e0429e21587e6c1fa2c9383a398f19a3 data/minecraft/tags/items/wooden_pressure_plates.json
603bcdf0bce6f1db81b0c816426c9ebdb0bd6415 data/hexcasting/loot_tables/blocks/stripped_edified_wood.json
a81d1fb94d833dcc01bd73b502ab5e69a7a36514 data/minecraft/tags/blocks/mineable/hoe.json
f3e78a96f17dc5ed54047bb24be58dbf3151c8fa data/hexcasting/advancements/recipes/hexcasting.creative_tab/ancient_scroll_paper_lantern.json
4345c060715ce9bf341c5c2b9bb5ca0871282241 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_genderfluid.json
6aaf143689e8f88bb9938b98b0846ed7ee79e4ae data/hexcasting/recipes/crimson_staff.json
d5c6f9a31a8310ec440fc8c14da8988f0d166586 data/hexcasting/recipes/brainsweep/impetus_storedplayer.json
b57938b305eb37f56b8ab095527f1daab4504731 data/hexcasting/loot_tables/blocks/edified_trapdoor.json
aba5978bd1bc3c27ba92e13241e470921ad8c125 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_bisexual.json
eaedfa1810f245d21803420b87042df5e3e54510 data/hexcasting/advancements/recipes/hexcasting.creative_tab/crimson_staff.json
8da0de2d4c31c117431a2133f70f8681ca6b5f17 data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll_small.json
874ee348cf2542696b7768049529a2001f0820e7 data/hexcasting/advancements/recipes/hexcasting.creative_tab/jeweler_hammer.json
cae7d20d924f50dea08c7c56ee82ce748ed2ba8f data/hexcasting/recipes/edified_wood.json
5703cc53d18f6b3a14bb030b639d286981c4c754 data/hexcasting/recipes/spellbook.json
cd3ca380294544b07e91ce85d97808c30ffa5d17 data/hexcasting/advancements/recipes/hexcasting.creative_tab/spellbook.json
7351200c8e3eb24772852c578286384c8aab61bd data/hexcasting/advancements/recipes/hexcasting.creative_tab/empty_directrix.json
d910f10b472c3ff422f14961539e4c31b8830bff data/hexcasting/recipes/dye_colorizer_yellow.json
918075a87ccc30a489aa8cafa2de992dd179aeac data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_lime.json
720bb692ff4c79f109cc9aaef647e3df25a5253e data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_wood.json
3a2809a3ca6754fbb2b4429f83e7cf3acab06b0c data/hexcasting/loot_tables/blocks/edified_log.json
9f7a9ba332e1018098d21a5ec474440fca7f6c73 data/hexcasting/recipes/brainsweep/directrix_redstone.json
779b7b9be93062e935972af1cff9c79fa5440a23 data/hexcasting/recipes/amethyst_sconce.json
b475e6d26350d0560e2cd66879f86520faaeb68c data/hexcasting/recipes/dye_colorizer_red.json
4d4caaea035ae4ee878843dd2455042b299b4e5e data/c/tags/items/amethyst_dusts.json
5f9f0962f407062e7b6dd0e8c5f8c55ce13962a5 data/hexcasting/advancements/recipes/brainsweep/brainsweep/impetus_rightclick.json
df8cb3361fd2c2fd2d33b00642a4a24fb8bf456b data/hexcasting/advancements/recipes/hexcasting.creative_tab/cypher.json
f50c71bbbbf7d77665c9008fcdd9be0d571ce48e data/hexcasting/recipes/pride_colorizer_transgender.json
d3ad9a9e92dd125f872d9671930d4e57f24894ed data/hexcasting/recipes/pride_colorizer_demigirl.json
b684bfa3755ca25996e74152d2efecbc9d6387d8 data/hexcasting/advancements/recipes/hexcasting.creative_tab/stonecutting/amethyst_tiles.json
b3a4af0b61e4d10b022e60e5db405ca35aa611ef data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_tile.json
30b1ba88e0429e21587e6c1fa2c9383a398f19a3 data/minecraft/tags/blocks/pressure_plates.json
897bbff604181a7841a6ba9c7518a8fb24905131 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dark_oak_staff.json
3e89b354e3eb8f8ec2518b03f13c5c4295adef5f data/hexcasting/recipes/dye_colorizer_lime.json
5d4811f78feefbef0a305555143f488b3dac7ac6 data/hexcasting/advancements/recipes/brainsweep/brainsweep/impetus_storedplayer.json
85fea90b80954899f236e52d3b3a25f305f8b9d5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll_paper_lantern.json
1ba431aef086bb60bfe8fe01b4d2bf5dfb7593c4 data/hexcasting/loot_tables/blocks/impetus_look.json
14d6be5d47b54676a349564ea32c045c76c39b45 data/hexcasting/recipes/uuid_colorizer.json
d6dfd0c6e995270868cb90de818d24b8a667fd01 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_purple.json
d08696a57c8085da9093723e74363cf87ec5b74f data/hexcasting/recipes/spruce_staff.json
2ee391efafe8f8b7130e22cc07298e73d6b3a5e0 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_planks.json
9df1c9fedf3829c3a257efecccf50396c31c75bb data/hexcasting/loot_tables/blocks/edified_button.json
a584c013b337affb96c572493a6ca2b2fb957052 data/minecraft/tags/blocks/trapdoors.json
5861845c3cd84021c7c19ac4f5b3bcc8e1bd3916 data/hexcasting/recipes/brainsweep/impetus_look.json
9517d6fccefd3b1d78151fa33e3f531e6dfb1068 data/hexcasting/recipes/edified_tile.json
5a17fa9a1496f5fbedd0362f94a5231e0e5ebbfc data/hexcasting/advancements/recipes/hexcasting.creative_tab/ageing_scroll_paper_lantern.json
c51296cb7e9ae182fe569d12b80c96cd7e4bebe6 data/hexcasting/recipes/birch_staff.json
174e8880b55ae2dfbe5399d1bb87e77011c879b8 data/hexcasting/recipes/akashic_bookshelf.json
bec3f49288f4a066ee8a7b19f74d64d376e80564 data/hexcasting/advancements/recipes/hexcasting.creative_tab/stripped_edified_wood.json
e7c913cda3b23a3dddafab344795b283625c42de data/hexcasting/recipes/stripped_edified_wood.json
c26bbff5a4aaaa4b5c26f61e8177fc382425149b data/hexcasting/loot_tables/inject/amethyst_cluster.json
8f5c47c05908d9ace39c119d8a2d0a1491529d5b data/hexcasting/recipes/edified_stairs.json
0295cb6a13069d4e211c18132a2a40d57145b45c data/hexcasting/loot_tables/blocks/scroll_paper.json
c67ec88d4d78c14922825c6ad7f79530260e30a3 data/minecraft/tags/blocks/slabs.json
64aef53a076a34dbaaca0d3df8c671476729bec4 data/hexcasting/loot_tables/inject/scroll_loot_some.json
fe9fde77881dc63ea9fe1b595e03ad0c71f9775e data/minecraft/tags/blocks/logs_that_burn.json
b0b1c5fff194b92ff8c5d6468e177271fd910abd data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_red.json
9c619750b17ac95e339882ce6c097ba9a000cc82 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_pansexual.json
30b1ba88e0429e21587e6c1fa2c9383a398f19a3 data/minecraft/tags/blocks/wooden_pressure_plates.json
8334a42636f045b4dc34c0fe5b3b3d3902aa4b7e data/hexcasting/recipes/scroll_small.json
584bd8806ef8df5f0e623ed727d6e54a61e60dea data/hexcasting/loot_tables/blocks/slate_block.json
c11dc4388c18dadff5d93126eb0f7ae848d627b9 data/hexcasting/advancements/recipes/brainsweep/brainsweep/directrix_redstone.json
d839a31c122627e57117ca032d495d707f95ad0a data/minecraft/tags/items/buttons.json
310e2440f26f130c81d32d9fcd93a3384c2b1e72 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_brown.json
f3638ae23ee4a74fbb0f50c9cbc39e05e14d4340 data/hexcasting/tags/blocks/edified_planks.json
d839a31c122627e57117ca032d495d707f95ad0a data/minecraft/tags/blocks/buttons.json
8a7515e2b4bb359bb71936827b5da036f269bb81 data/hexcasting/loot_tables/blocks/edified_planks.json
df1d1318d132e8f59d18f4b0d6f7e05b84fba8f9 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_stairs.json
bceac44311dc2771c3744c0cda299f03fb957350 data/hexcasting/loot_tables/blocks/scroll_paper_lantern.json
a584c013b337affb96c572493a6ca2b2fb957052 data/minecraft/tags/items/wooden_trapdoors.json
c67ec88d4d78c14922825c6ad7f79530260e30a3 data/minecraft/tags/items/slabs.json
d3a58aa5198a9736e08a185f6fce0feea98ae128 data/hexcasting/loot_tables/blocks/edified_tile.json
bba5256d09ec3512cd8fd1898159e69b59074c80 data/hexcasting/advancements/recipes/hexcasting.creative_tab/oak_staff.json
fdce54a0e527322819787ec9232b24d401c45a29 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_demiboy.json
ef936e73eea3be9d53c4ac5c78d1477675550375 data/hexcasting/recipes/stonecutting/amethyst_tiles.json
88cf11d37222254d9e3a4bef0f9ca2de1495c31a data/hexcasting/recipes/dye_colorizer_white.json
0e95c5f97c4089d654334a0d58fbf2b808548bd0 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_gray.json
eb06eb90c08b051ff6c42215fb7c91123e240a66 data/hexcasting/recipes/dye_colorizer_purple.json
fdf6d397c6eb43101089534da337e4636b08ef4f data/hexcasting/loot_tables/blocks/citrine_edified_leaves.json
c2040cb221848ebc0a63bd168826b882d3649c89 data/hexcasting/recipes/warped_staff.json
9d4704f96cc4cfa3275092fb58ff90c98449abe3 data/hexcasting/loot_tables/blocks/ancient_scroll_paper.json
e454c9f48ec394f4d353c5a6c04641c9871b8798 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_transgender.json
683af041184fd5bcd836f5be59382ce3d0d9f88a data/hexcasting/loot_tables/blocks/edified_stairs.json
a81d1fb94d833dcc01bd73b502ab5e69a7a36514 data/minecraft/tags/blocks/leaves.json
a952d33cda8b805237052b602cf066683c4bf261 data/hexcasting/recipes/empty_directrix.json
b2d8fb979a3fbe47404da349318f38ab45bac760 data/hexcasting/recipes/pride_colorizer_plural.json
2397e64bd5fa2af12bb4f0f7efbc55f387c07a2b data/hexcasting/recipes/lens.json
d72a4675ceb721ee4ac43339d8bfbbb82c2adba2 data/hexcasting/advancements/recipes/hexcasting.creative_tab/slate_block.json
1d93665a09ee239ec7c2ba08e4b5bb6774065124 data/hexcasting/advancements/recipes/hexcasting.creative_tab/artifact.json
d14cf2f8f0895a5b6dc09b7582c0abf1c2514adf data/hexcasting/recipes/sub_sandwich.json
a584c013b337affb96c572493a6ca2b2fb957052 data/minecraft/tags/items/trapdoors.json
d282d732fc2c683c005f19ce1ad6be41036b37e3 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_staff.json
422838234b64b2bb70d48db66d5681ac8d9f77b3 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_trapdoor.json
26e9416771d97f9c716d07c27b1b5ca4a267eea2 data/hexcasting/loot_tables/blocks/amethyst_dust_block.json
05d435799cbf3ee1b51c5b4ffeace507691bcf2a data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_gay.json
44d5d32647164e5510ecdbde22addbc047e4603a data/hexcasting/recipes/dye_colorizer_cyan.json
8aa3d09d72255aa4da497ab4225654961063a496 data/hexcasting/recipes/ancient_scroll_paper.json
e5ae652aee1567ac2e626fa0f88f160993a6f9a5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/amethyst_dust_unpacking.json
f3a33396e071f3afd61eadab2aabdb9acf2ae775 data/hexcasting/recipes/slate.json
0f212b93f25991d649053fc01ff8c50a3983043a data/hexcasting/tags/items/staves.json
0529b25d154715d6b1c030d87e59e6f9d41d91d6 data/hexcasting/recipes/focus.json
5b9b1c15c7a157aa56b3caa7d43a6ad1fa8f4710 data/hexcasting/loot_tables/blocks/akashic_bookshelf.json
29260d23193f414236b0278a5abd7fe1f7ba8b46 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_black.json
b4dd0e7ce2f848fe012b12fb6f817a760970be8e data/hexcasting/recipes/acacia_staff.json
843f48698bb2041ec85375f31e19929a2e882d61 data/hexcasting/advancements/recipes/hexcasting.creative_tab/lens.json
f621748812a42d4f96031cae711950dfaf553155 data/hexcasting/recipes/edified_panel.json
d2039036604e4adfaf41fac7f909c7dcfc821a7c data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_slab.json
da2dc6734b3ff20b4ed6b0ef6bc2dee9af671406 data/hexcasting/loot_tables/blocks/edified_wood.json
66e51300dc72c27ed8024ddf852ac9a6208a66b1 data/hexcasting/advancements/recipes/hexcasting.creative_tab/akashic_bookshelf.json
0ed11a26457a65b73ca8564296acd8077ea83d65 data/hexcasting/loot_tables/blocks/edified_slab.json
3b082fff535586c13c12811a29839eb0096bfdb1 data/hexcasting/recipes/dye_colorizer_green.json
186dc05888e66e17af0217bd0680648dc3da3968 data/hexcasting/recipes/dye_colorizer_orange.json
737ac05e20d6633abd383d654f7cd7e92564447b data/hexcasting/loot_tables/blocks/directrix_redstone.json
b7c248d2627c2a2b398d1c50181c1e0863612424 data/hexcasting/recipes/empty_impetus.json
9a3c8984bcbdfa8bf68cd52f9754d361611b3282 data/hexcasting/advancements/recipes/hexcasting.creative_tab/abacus.json
4dc3f5865d69a604923cb59f4a3eed7b4aa175cf data/hexcasting/recipes/ageing_scroll_paper_lantern.json
eb4bfbd7fc7632a5c16aa1d50d6090a1f466069b data/minecraft/tags/blocks/mineable/pickaxe.json
48729ddf1f6251caa9b6d574077e211ef9c7d5e5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/jungle_staff.json
43071f2aa09fa59dd8f0211a68c842dac833be02 data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll.json
37584409884ac4d9fbf7f0a4a3cb8ef3b5d32965 data/hexcasting/recipes/pride_colorizer_agender.json
d266f13878ba1e3de27e41c60fa86a999af2db3d data/minecraft/tags/items/doors.json
ddd7bd92b9e1586cebd2cee658315a9336a80a76 data/hexcasting/advancements/recipes/hexcasting.creative_tab/amethyst_dust_packing.json
8f7feb479c4d278cf518d347068ecc29689b5fec data/hexcasting/loot_tables/blocks/amethyst_edified_leaves.json
aef9280236b950662b4f65becceb7b034aa16dd8 data/hexcasting/recipes/akashic_connector.json
afea422f3843ec31636e4ae71c98309a20983a22 data/hexcasting/loot_tables/blocks/edified_pressure_plate.json
6837c1fe0ab23167ca8475086b28115369227e0c data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_light_gray.json
5e6df78e451395e08f86c8d89dca0a2c99a69691 data/hexcasting/recipes/pride_colorizer_aromantic.json
fcf76d7c1978953a331bb6f81db9029d1df60969 data/hexcasting/loot_tables/blocks/stripped_edified_log.json
c2a362b8c19cb288187d8ff340f82198edc54378 data/hexcasting/advancements/recipes/brainsweep/brainsweep/budding_amethyst.json
b9083c4c0a7a365bdfd785a21826a89dc8d5db52 data/hexcasting/loot_tables/blocks/akashic_record.json
07e4101a29564595d4179e024858bfe9cff84d77 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_pressure_plate.json
101b92add1afe19155d4fa591b4343ad05487ef9 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_door.json
fe9fde77881dc63ea9fe1b595e03ad0c71f9775e data/minecraft/tags/blocks/logs.json
b42dae604eab34ae3831fa16c063af852c175791 data/hexcasting/advancements/recipes/hexcasting.creative_tab/ancient_scroll_paper.json
339dc062b4d8d0c4fa2d1eccd2935b4c37ec75c6 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_pink.json
2d8d55bd90fb75e3f28be7016dee1aa405150a21 data/hexcasting/advancements/recipes/hexcasting.creative_tab/birch_staff.json
2d80cb505efc0ba0d34d1768413128fcda17630f data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_demigirl.json
a639b071a5f4738ddf798fcac041a5002657e146 data/hexcasting/recipes/jeweler_hammer.json
d7f85ce9d46aacc7ec89dc7aa0f88a331ccfbae7 data/hexcasting/recipes/brainsweep/akashic_record.json
ce79c9e183b57bfbdb75cd074d7ff6e48894d05c data/hexcasting/loot_tables/blocks/akashic_connector.json
fe9fde77881dc63ea9fe1b595e03ad0c71f9775e data/minecraft/tags/items/logs.json
49b6ea97ddc55ef3d7fa47582f268a07a35cadde data/hexcasting/loot_tables/blocks/slate.json
ac128e72adda8fea0ad63d7e6e18dd9399f53d65 data/hexcasting/recipes/pride_colorizer_intersex.json
eb771389a05a4cdfb98286942f2a65bf2a77458f data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_lesbian.json
d8825a8cbaf100d309b4bd8ac26ed22b020011cb data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll_medium.json
d266f13878ba1e3de27e41c60fa86a999af2db3d data/minecraft/tags/blocks/doors.json
658016147b41a5c87b94179222e32a7320ec0c8e data/hexcasting/advancements/recipes/hexcasting.creative_tab/focus.json
39a4ba8180e45cab481184d2bcdc217893244446 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_asexual.json
cd7e618d7c08ffff67683852f799362fb8aaebaf data/hexcasting/recipes/pride_colorizer_nonbinary.json
c5144e5f76d6fe6b8e3c8d3ddc58a6b0958c27cb data/hexcasting/recipes/edified_button.json
9fcc0862c99c50a1df9d3af95b2b3c2af28afa1b data/hexcasting/advancements/recipes/hexcasting.creative_tab/slate_block_from_slates.json
c67ec88d4d78c14922825c6ad7f79530260e30a3 data/minecraft/tags/items/wooden_slabs.json
cf855b595844c6f2522c0ad18030519279b396ad data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_magenta.json
91bb341776ce64a68e1c4200aa8f5b2fa6669820 data/hexcasting/recipes/amethyst_dust_unpacking.json
3fdb1b470d3a40c683135279118fc37b47fa0752 data/hexcasting/advancements/recipes/hexcasting.creative_tab/warped_staff.json
c9cb6eace46046b03a27e3576afcd65826b06844 data/hexcasting/recipes/dark_oak_staff.json
3f9756b2c5137b285c4faa88ab43c4996b6b2bb6 data/hexcasting/recipes/ancient_scroll_paper_lantern.json
c375ba3f7105d6f57ef982f6f4e9326ad88a947d data/hexcasting/loot_tables/blocks/ancient_scroll_paper_lantern.json
0d44eaf373592c26267d782ef64badba453aa439 data/hexcasting/recipes/edified_door.json
a27a2514fd3acb6cf0a4f2a6b176ca4c2a3ee064 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_cyan.json
19205bf9b9a41aeacac35708beeab8e00eb05d5b data/hexcasting/advancements/recipes/hexcasting.creative_tab/acacia_staff.json
f3638ae23ee4a74fbb0f50c9cbc39e05e14d4340 data/minecraft/tags/blocks/planks.json
8dab47781281a29e39cb8e6c4da6a27f916e0646 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_nonbinary.json
6f904b1ac6fc5863a8e718bc42043c40d5ec4c2a data/hexcasting/recipes/dye_colorizer_pink.json
b3583f65db5e1eaae0426b14416c076982ca3685 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_aroace.json
d6355142e6edb7964c95997dc877a3652081f793 data/hexcasting/loot_tables/blocks/amethyst_tiles.json
a4f3fed2e6ddc8e60a19a1a51bd5b54904a43fa8 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_agender.json
456ae69977612b6f62c109783518e9006287e77b data/hexcasting/recipes/pride_colorizer_genderqueer.json
563cb6dda9c55864f141f2ec0ecd2a2b95f57237 data/hexcasting/advancements/recipes/hexcasting.creative_tab/amethyst_tiles.json
86ee80768fef41cf9b517564b733f4586094f367 data/hexcasting/recipes/scroll_medium.json
b519fd81671c9cb8d909bbfd0d4017d2005432d3 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_blue.json
d266f13878ba1e3de27e41c60fa86a999af2db3d data/minecraft/tags/blocks/wooden_doors.json
5c471f81cc168826f1652a39a71aeb85e786ea16 data/hexcasting/recipes/scroll_paper_lantern.json
7c607fdc60aac2b78394931fc39ae24a1a3dd3d2 data/hexcasting/loot_tables/blocks/empty_directrix.json
337c4370fd24b66a6b4b3f6c296a33d9a799034e data/hexcasting/advancements/recipes/hexcasting.creative_tab/amethyst_sconce.json
d839a31c122627e57117ca032d495d707f95ad0a data/minecraft/tags/items/wooden_buttons.json
eb17a23e7a9543f33922c056cdf0d63def176bf2 data/hexcasting/advancements/recipes/hexcasting.creative_tab/uuid_colorizer.json
d7213631b2f9075c9bdef0d5a48ca28f85f5a090 data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll_paper.json
9c857c4aeda8a1b3d7a1b5d341871a9434b5816f data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_yellow.json
fe9fde77881dc63ea9fe1b595e03ad0c71f9775e data/hexcasting/tags/items/edified_logs.json
2b9cd0e802e4db97a9d3fbbc33b24319cccd6bed data/hexcasting/loot_tables/blocks/edified_door.json
4d1c771493f5968a0878c142342ceb8717a5784f data/hexcasting/recipes/dye_colorizer_magenta.json
1dc89dff5d4fadb95d9b5a2a5a910f63ea4b02bf data/minecraft/tags/blocks/crystal_sound_blocks.json
05e86742a71afd740f47639be62f93bc9898fcde data/c/tags/items/gems.json
0a72e213fec8dd32b1ea9623a242484ce8318c47 data/hexcasting/recipes/pride_colorizer_asexual.json
b1422f965e433590962bbcf58c0840200bb7fd32 data/hexcasting/recipes/jungle_staff.json
ccf4ea841ea9a66738253385c659ff86c85a73f5 data/hexcasting/recipes/scroll_paper.json
0ca193fe94bc004aa0080826ed0fc4596f9a62dd data/hexcasting/recipes/pride_colorizer_genderfluid.json
36acd92504bccf3faa66436334ddeab7269d2209 data/hexcasting/advancements/recipes/hexcasting.creative_tab/trinket.json
a2ea936ff220d9faa168ffbc60a9823de2119ac5 data/hexcasting/recipes/cypher.json
f3638ae23ee4a74fbb0f50c9cbc39e05e14d4340 data/hexcasting/tags/items/edified_planks.json
7077bb190244008a715eab451c80e8d489844c01 data/hexcasting/loot_tables/blocks/empty_impetus.json
ccc33b4f1a43c8ecd3352ad36ae2dd2191317b5b data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_white.json
a584c013b337affb96c572493a6ca2b2fb957052 data/minecraft/tags/blocks/wooden_trapdoors.json
6f33e68b62de15df1673b772d37171b130e3c9bb data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_plural.json
f55afc2c05d93b5a44bc9fd73c5e81e71b183965 data/minecraft/tags/blocks/mineable/shovel.json
fe60c763bfe0afa0a266b7390edfc62bde8941b7 data/hexcasting/tags/items/phial_base.json
e7069ab057394c0583a6026c63d732e71e610f5f data/hexcasting/recipes/oak_staff.json
fe9fde77881dc63ea9fe1b595e03ad0c71f9775e data/hexcasting/tags/blocks/edified_logs.json
8df59ac1ca676bf1a506f3116fd273d6379f238e data/hexcasting/recipes/dye_colorizer_gray.json
c3a01df30228881c199686192d105fb2651c39c8 data/hexcasting/recipes/pride_colorizer_aroace.json
59000d9f3edb942081f7d1e03d753e9cd59690cc data/hexcasting/advancements/recipes/hexcasting.creative_tab/sub_sandwich.json
49508c455626eeca18c957edc0cde016e823f7b0 data/hexcasting/recipes/scroll.json
6f5c41ab9f87ec1206efaaab8d91adc766bb79fd data/hexcasting/recipes/slate_block_from_slates.json
1d558c1b63dd3c3e129261f53db5fd6748b59051 data/hexcasting/recipes/pride_colorizer_lesbian.json
cf0ad981bebbb79414d955fb40fbf537fe88b89d data/hexcasting/advancements/recipes/brainsweep/brainsweep/akashic_record.json
e5c835d3866e8f5ecfb03c9e7c2c134a50951d67 data/hexcasting/recipes/amethyst_tiles.json
bc490780a689c62da00244137679bbaa8a653430 data/hexcasting/recipes/dye_colorizer_brown.json
f332cdebf9c53edec6cb3903f65d4ccc1398f849 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_aromantic.json
64f60f9a123087d9a3e860a6f42069ab76a7f516 data/hexcasting/recipes/edified_trapdoor.json
64686e6d1a10a4bd16ec0378dc9ce720eff3b4d7 data/hexcasting/recipes/dye_colorizer_light_gray.json
98ab05fe581fc671aaa363fb16e97e499a9a7c52 data/hexcasting/recipes/edified_slab.json
484be1c50092772587dd18769e63ee3ab22ad971 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_orange.json
a81d1fb94d833dcc01bd73b502ab5e69a7a36514 data/minecraft/tags/items/leaves.json
b4b7b7a054ede87c63409b1d2db417f27a41f274 data/hexcasting/recipes/edified_staff.json
3c033a8a3d70e99e914c477f6cf0ac225e36e91d data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_panel.json
ef016ca292fa4edc7496b64e6f2931f4e7d90636 data/hexcasting/recipes/amethyst_dust_packing.json
35a9b4beac7c6eddb990464eaeaebec2a9ab9951 data/hexcasting/loot_tables/inject/scroll_loot_many.json
949f05968c562d5e4d35630ce8e3189a2060dee7 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_intersex.json
02dcee696b1e162f20dbfcf02bdb9e2144a64a27 data/hexcasting/recipes/pride_colorizer_gay.json
2d490c756534ad33c25ac85d7f3df0c9de2bc3a1 data/minecraft/tags/blocks/mineable/axe.json
32e3d36398fa63e017ed6c46e7e19d7ba041c3d9 data/hexcasting/recipes/pride_colorizer_bisexual.json
1af91ec74694bf90fb7f53b6d55078c7e21460cc data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_genderqueer.json
fe9fde77881dc63ea9fe1b595e03ad0c71f9775e data/minecraft/tags/items/logs_that_burn.json
ef8563a18c0bb3999a1092efe37540ea474633c5 data/hexcasting/recipes/dye_colorizer_light_blue.json
db8a00478e1c4b0f9b143b5946d1ba25e489591d data/hexcasting/recipes/dynamic/seal_focus.json
09e80537530ed51b6792f16fe8b32448e89dc334 data/hexcasting/recipes/slate_block.json
6b4459635b3d53cc2b6836fa97d29244a65b412d data/hexcasting/recipes/abacus.json
1b96773128b11946ff4f30d5aa4040f9e04d0d40 data/hexcasting/recipes/pride_colorizer_demiboy.json
076dd8bb2ce1508293384fa93fa138a369d10751 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_green.json
3147422bed290cb47ea3763dbdc6f0e96eed5c2a data/hexcasting/loot_tables/inject/scroll_loot_few.json
aab3082b3303f358cc265fb10bc9bbe08c96eef0 data/hexcasting/recipes/trinket.json
c3aed1dbaa46e084711a116d1bb4522df9a7405a data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_light_blue.json
3a376402af89128dc37adaa0a72b6de66d58309d data/hexcasting/recipes/dynamic/seal_spellbook.json
c67ec88d4d78c14922825c6ad7f79530260e30a3 data/minecraft/tags/blocks/wooden_slabs.json
4462a6a260c29016189ba79c4a46f4651d4b0c0e data/hexcasting/loot_tables/blocks/edified_panel.json
ab5d271371323d93ff6eed18179ee4f7fd8c939c data/hexcasting/recipes/brainsweep/impetus_rightclick.json
c97382eb9177d28a84116e6803c86b194fe77484 data/hexcasting/advancements/recipes/hexcasting.creative_tab/spruce_staff.json
8c22db477365a800ce1e715aeaad896550467047 data/hexcasting/recipes/dye_colorizer_black.json
c64f5e56ca18eb68d2e58827920ca0e3ae4617ca data/hexcasting/recipes/dye_colorizer_blue.json
d839a31c122627e57117ca032d495d707f95ad0a data/minecraft/tags/blocks/wooden_buttons.json
e125117befadda0785e370969a8e04eff070d057 data/hexcasting/loot_tables/blocks/amethyst_sconce.json
43862a59cfaa87ec4ca3d151fa0ec0e914ac3fc1 data/hexcasting/recipes/edified_pressure_plate.json
4da41a82a17f58c9342944f214e745696c1d8ed7 data/hexcasting/loot_tables/blocks/impetus_storedplayer.json
22ad2496732633bb5539a1fa761051d7add48055 data/hexcasting/advancements/recipes/hexcasting.creative_tab/slate.json
168749d413b20bb9c05a8e7191758e0e596a319b data/hexcasting/advancements/recipes/hexcasting.creative_tab/akashic_connector.json
30f81e0537c625a4cafcdec75314926569291171 data/hexcasting/recipes/brainsweep/budding_amethyst.json
86424d21e1bf91c128d3b0d528b813629ad962e9 data/hexcasting/advancements/recipes/brainsweep/brainsweep/impetus_look.json
689cee07b5812993cd7257ecf4d64c4105c54786 data/hexcasting/recipes/edified_planks.json

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -26,7 +26,7 @@ class FabricImpetusStorage(val impetus: BlockEntityAbstractImpetus) : SingleSlot
fun insertStack(stack: ItemStack, transaction: TransactionContext) {
val copied = stack.copy()
val extractable = impetus.extractMana(stack, false)
val extractable = impetus.extractManaFromItem(stack, false)
manaToTake -= extractable
val taken = 64 - stack.count
itemsConsumed += taken.toLong()

View file

@ -120,13 +120,9 @@ c521621c409275e219f72abf5c6089d60408e646 data/hexcasting/loot_tables/blocks/impe
bceac44311dc2771c3744c0cda299f03fb957350 data/hexcasting/loot_tables/blocks/scroll_paper_lantern.json
49b6ea97ddc55ef3d7fa47582f268a07a35cadde data/hexcasting/loot_tables/blocks/slate.json
584bd8806ef8df5f0e623ed727d6e54a61e60dea data/hexcasting/loot_tables/blocks/slate_block.json
<<<<<<< HEAD
fcf76d7c1978953a331bb6f81db9029d1df60969 data/hexcasting/loot_tables/blocks/stripped_edified_log.json
603bcdf0bce6f1db81b0c816426c9ebdb0bd6415 data/hexcasting/loot_tables/blocks/stripped_edified_wood.json
7742f3f42dd2d9354c4963e401c5ea04764d1698 data/hexcasting/loot_tables/inject/amethyst_cluster.json
=======
c26bbff5a4aaaa4b5c26f61e8177fc382425149b data/hexcasting/loot_tables/inject/amethyst_cluster.json
>>>>>>> main
3147422bed290cb47ea3763dbdc6f0e96eed5c2a data/hexcasting/loot_tables/inject/scroll_loot_few.json
35a9b4beac7c6eddb990464eaeaebec2a9ab9951 data/hexcasting/loot_tables/inject/scroll_loot_many.json
64aef53a076a34dbaaca0d3df8c671476729bec4 data/hexcasting/loot_tables/inject/scroll_loot_some.json
@ -152,22 +148,22 @@ d5c6f9a31a8310ec440fc8c14da8988f0d166586 data/hexcasting/recipes/brainsweep/impe
6aaf143689e8f88bb9938b98b0846ed7ee79e4ae data/hexcasting/recipes/crimson_staff.json
bc140b6c5d999b4bc5d12c302297f56bde3b161c data/hexcasting/recipes/cypher.json
c9cb6eace46046b03a27e3576afcd65826b06844 data/hexcasting/recipes/dark_oak_staff.json
33fed8fb8e34df026e1eea0df8161c7f842a8648 data/hexcasting/recipes/dye_colorizer_black.json
c36caf44a941a4abc44a15141eba8fe634c76fb8 data/hexcasting/recipes/dye_colorizer_blue.json
91348d69c8a49eae2bbaf9fb00b9604c43716527 data/hexcasting/recipes/dye_colorizer_brown.json
e4ef73afbd13a579493f45929c3f7adb8aa86dc2 data/hexcasting/recipes/dye_colorizer_cyan.json
c471220e70ee9ecbf58a21ea1d28e653efcc4fad data/hexcasting/recipes/dye_colorizer_gray.json
fe5f10e9258f430859f1f1f87320a2b5c7b67654 data/hexcasting/recipes/dye_colorizer_green.json
06a4f3776d2bb8f294737d100143a0914342310a data/hexcasting/recipes/dye_colorizer_light_blue.json
25f5d03a6f4290bbbe86c9cac5604b1e8a49ad84 data/hexcasting/recipes/dye_colorizer_light_gray.json
4fad619e1330e938d2e2596fc8fd4e5050a8b40e data/hexcasting/recipes/dye_colorizer_lime.json
386f1b0f7676324186d0694de3c86a77fac5ce98 data/hexcasting/recipes/dye_colorizer_magenta.json
6f1c0a84236b1e3cb4352d87bf3d553eb7e1a938 data/hexcasting/recipes/dye_colorizer_orange.json
fe8a7288aa27c07932a31c64ff8fadb943b278d5 data/hexcasting/recipes/dye_colorizer_pink.json
16fd879351f390bfa980a5f4d77e32f576de2f66 data/hexcasting/recipes/dye_colorizer_purple.json
29559dc2a5c4e189ab7edfbb71fed0a84dd96d45 data/hexcasting/recipes/dye_colorizer_red.json
bc79add419b8791e68b35076355fea11dfc640c6 data/hexcasting/recipes/dye_colorizer_white.json
c5341777604a4be5a311e300a4de89967b7caad2 data/hexcasting/recipes/dye_colorizer_yellow.json
8c22db477365a800ce1e715aeaad896550467047 data/hexcasting/recipes/dye_colorizer_black.json
c64f5e56ca18eb68d2e58827920ca0e3ae4617ca data/hexcasting/recipes/dye_colorizer_blue.json
bc490780a689c62da00244137679bbaa8a653430 data/hexcasting/recipes/dye_colorizer_brown.json
44d5d32647164e5510ecdbde22addbc047e4603a data/hexcasting/recipes/dye_colorizer_cyan.json
8df59ac1ca676bf1a506f3116fd273d6379f238e data/hexcasting/recipes/dye_colorizer_gray.json
3b082fff535586c13c12811a29839eb0096bfdb1 data/hexcasting/recipes/dye_colorizer_green.json
ef8563a18c0bb3999a1092efe37540ea474633c5 data/hexcasting/recipes/dye_colorizer_light_blue.json
64686e6d1a10a4bd16ec0378dc9ce720eff3b4d7 data/hexcasting/recipes/dye_colorizer_light_gray.json
3e89b354e3eb8f8ec2518b03f13c5c4295adef5f data/hexcasting/recipes/dye_colorizer_lime.json
4d1c771493f5968a0878c142342ceb8717a5784f data/hexcasting/recipes/dye_colorizer_magenta.json
186dc05888e66e17af0217bd0680648dc3da3968 data/hexcasting/recipes/dye_colorizer_orange.json
6f904b1ac6fc5863a8e718bc42043c40d5ec4c2a data/hexcasting/recipes/dye_colorizer_pink.json
eb06eb90c08b051ff6c42215fb7c91123e240a66 data/hexcasting/recipes/dye_colorizer_purple.json
b475e6d26350d0560e2cd66879f86520faaeb68c data/hexcasting/recipes/dye_colorizer_red.json
88cf11d37222254d9e3a4bef0f9ca2de1495c31a data/hexcasting/recipes/dye_colorizer_white.json
d910f10b472c3ff422f14961539e4c31b8830bff data/hexcasting/recipes/dye_colorizer_yellow.json
db8a00478e1c4b0f9b143b5946d1ba25e489591d data/hexcasting/recipes/dynamic/seal_focus.json
3a376402af89128dc37adaa0a72b6de66d58309d data/hexcasting/recipes/dynamic/seal_spellbook.json
c5144e5f76d6fe6b8e3c8d3ddc58a6b0958c27cb data/hexcasting/recipes/edified_button.json
@ -188,22 +184,22 @@ b7c248d2627c2a2b398d1c50181c1e0863612424 data/hexcasting/recipes/empty_impetus.j
b1422f965e433590962bbcf58c0840200bb7fd32 data/hexcasting/recipes/jungle_staff.json
2397e64bd5fa2af12bb4f0f7efbc55f387c07a2b data/hexcasting/recipes/lens.json
e7069ab057394c0583a6026c63d732e71e610f5f data/hexcasting/recipes/oak_staff.json
fa30b1fb1c6fc9e763d5ce0e4dcfd71afcc81de2 data/hexcasting/recipes/pride_colorizer_agender.json
b162dffb52838921c3a354d817465a23df64ec00 data/hexcasting/recipes/pride_colorizer_aroace.json
9b2b94e2eabaa8260a15191bb869ceb3ca80779c data/hexcasting/recipes/pride_colorizer_aromantic.json
b4f71066f51788ce3d05429dcd5d1e451bcb7503 data/hexcasting/recipes/pride_colorizer_asexual.json
791dfa661888afb8ece93c6322fd55dd342086b5 data/hexcasting/recipes/pride_colorizer_bisexual.json
77961f5c461ff869f06b10019b810edf9eac37ac data/hexcasting/recipes/pride_colorizer_demiboy.json
c331d1b6a4d3d42eac052e73ff0b90d7dc117745 data/hexcasting/recipes/pride_colorizer_demigirl.json
e4b6c8850f8517ad6af62309f173d053f1e5b364 data/hexcasting/recipes/pride_colorizer_gay.json
57fe1e77bc786588a764620e65f0631254544b1f data/hexcasting/recipes/pride_colorizer_genderfluid.json
d0e37cea33e6323cb1936c44ed959e3dc8238bb7 data/hexcasting/recipes/pride_colorizer_genderqueer.json
c830f27bdee064af5bf2f1b2466042cf208c6788 data/hexcasting/recipes/pride_colorizer_intersex.json
523d98655e0f395d65640929d4254b6d4b3163d2 data/hexcasting/recipes/pride_colorizer_lesbian.json
43c7ffd19f2364de00b1e2cf8794ce5cf36494fb data/hexcasting/recipes/pride_colorizer_nonbinary.json
a00a851be50d49034ff939ca5fb3adbe0ee47302 data/hexcasting/recipes/pride_colorizer_pansexual.json
3ce0bea99cfbac7d316f4439ee79ac6b7f6f5b61 data/hexcasting/recipes/pride_colorizer_plural.json
21765e0f23ca7932c9c4891f1c36bc5a5faa54b9 data/hexcasting/recipes/pride_colorizer_transgender.json
37584409884ac4d9fbf7f0a4a3cb8ef3b5d32965 data/hexcasting/recipes/pride_colorizer_agender.json
c3a01df30228881c199686192d105fb2651c39c8 data/hexcasting/recipes/pride_colorizer_aroace.json
5e6df78e451395e08f86c8d89dca0a2c99a69691 data/hexcasting/recipes/pride_colorizer_aromantic.json
0a72e213fec8dd32b1ea9623a242484ce8318c47 data/hexcasting/recipes/pride_colorizer_asexual.json
32e3d36398fa63e017ed6c46e7e19d7ba041c3d9 data/hexcasting/recipes/pride_colorizer_bisexual.json
1b96773128b11946ff4f30d5aa4040f9e04d0d40 data/hexcasting/recipes/pride_colorizer_demiboy.json
d3ad9a9e92dd125f872d9671930d4e57f24894ed data/hexcasting/recipes/pride_colorizer_demigirl.json
02dcee696b1e162f20dbfcf02bdb9e2144a64a27 data/hexcasting/recipes/pride_colorizer_gay.json
0ca193fe94bc004aa0080826ed0fc4596f9a62dd data/hexcasting/recipes/pride_colorizer_genderfluid.json
456ae69977612b6f62c109783518e9006287e77b data/hexcasting/recipes/pride_colorizer_genderqueer.json
ac128e72adda8fea0ad63d7e6e18dd9399f53d65 data/hexcasting/recipes/pride_colorizer_intersex.json
1d558c1b63dd3c3e129261f53db5fd6748b59051 data/hexcasting/recipes/pride_colorizer_lesbian.json
cd7e618d7c08ffff67683852f799362fb8aaebaf data/hexcasting/recipes/pride_colorizer_nonbinary.json
568ac8a13b7762b92cc274d74a7c729cc6e16687 data/hexcasting/recipes/pride_colorizer_pansexual.json
b2d8fb979a3fbe47404da349318f38ab45bac760 data/hexcasting/recipes/pride_colorizer_plural.json
f50c71bbbbf7d77665c9008fcdd9be0d571ce48e data/hexcasting/recipes/pride_colorizer_transgender.json
49508c455626eeca18c957edc0cde016e823f7b0 data/hexcasting/recipes/scroll.json
86ee80768fef41cf9b517564b733f4586094f367 data/hexcasting/recipes/scroll_medium.json
ccf4ea841ea9a66738253385c659ff86c85a73f5 data/hexcasting/recipes/scroll_paper.json
@ -236,7 +232,6 @@ fe9fde77881dc63ea9fe1b595e03ad0c71f9775e data/minecraft/tags/blocks/logs_that_bu
a81d1fb94d833dcc01bd73b502ab5e69a7a36514 data/minecraft/tags/blocks/mineable/hoe.json
eb4bfbd7fc7632a5c16aa1d50d6090a1f466069b data/minecraft/tags/blocks/mineable/pickaxe.json
f55afc2c05d93b5a44bc9fd73c5e81e71b183965 data/minecraft/tags/blocks/mineable/shovel.json
<<<<<<< HEAD
f3638ae23ee4a74fbb0f50c9cbc39e05e14d4340 data/minecraft/tags/blocks/planks.json
30b1ba88e0429e21587e6c1fa2c9383a398f19a3 data/minecraft/tags/blocks/pressure_plates.json
c67ec88d4d78c14922825c6ad7f79530260e30a3 data/minecraft/tags/blocks/slabs.json
@ -259,28 +254,3 @@ d266f13878ba1e3de27e41c60fa86a999af2db3d data/minecraft/tags/items/wooden_doors.
30b1ba88e0429e21587e6c1fa2c9383a398f19a3 data/minecraft/tags/items/wooden_pressure_plates.json
c67ec88d4d78c14922825c6ad7f79530260e30a3 data/minecraft/tags/items/wooden_slabs.json
a584c013b337affb96c572493a6ca2b2fb957052 data/minecraft/tags/items/wooden_trapdoors.json
=======
b596d96eebb4f7bad5930f4eebc589f292b59c98 data/minecraft/tags/blocks/planks.json
2d79a41ba8697f9e1fa26b1bff48f33c824d3823 data/minecraft/tags/blocks/pressure_plates.json
48e782ce4fbd486dd0d6ceb9fdcb94d0e0c727d4 data/minecraft/tags/blocks/slabs.json
b8b58bbaf1ddca3514896af14db83f304e415305 data/minecraft/tags/blocks/trapdoors.json
5f3e3813757d8300acad523d45ac7c4d85728399 data/minecraft/tags/blocks/wooden_buttons.json
556d2e6068965e90c307a435b372ae761cd1c606 data/minecraft/tags/blocks/wooden_doors.json
2d79a41ba8697f9e1fa26b1bff48f33c824d3823 data/minecraft/tags/blocks/wooden_pressure_plates.json
48e782ce4fbd486dd0d6ceb9fdcb94d0e0c727d4 data/minecraft/tags/blocks/wooden_slabs.json
b8b58bbaf1ddca3514896af14db83f304e415305 data/minecraft/tags/blocks/wooden_trapdoors.json
5f3e3813757d8300acad523d45ac7c4d85728399 data/minecraft/tags/items/buttons.json
115534970df0123519d4a0073e803007f3a6d21f data/minecraft/tags/items/cluster_max_harvestables.json
556d2e6068965e90c307a435b372ae761cd1c606 data/minecraft/tags/items/doors.json
c25784941d6416744fb2ca2d43a3203e5c3e7c8a data/minecraft/tags/items/leaves.json
f3c6b6917e504e1c3d5d8875f7cce6f311e791d2 data/minecraft/tags/items/logs.json
f3c6b6917e504e1c3d5d8875f7cce6f311e791d2 data/minecraft/tags/items/logs_that_burn.json
b596d96eebb4f7bad5930f4eebc589f292b59c98 data/minecraft/tags/items/planks.json
48e782ce4fbd486dd0d6ceb9fdcb94d0e0c727d4 data/minecraft/tags/items/slabs.json
b8b58bbaf1ddca3514896af14db83f304e415305 data/minecraft/tags/items/trapdoors.json
5f3e3813757d8300acad523d45ac7c4d85728399 data/minecraft/tags/items/wooden_buttons.json
556d2e6068965e90c307a435b372ae761cd1c606 data/minecraft/tags/items/wooden_doors.json
2d79a41ba8697f9e1fa26b1bff48f33c824d3823 data/minecraft/tags/items/wooden_pressure_plates.json
48e782ce4fbd486dd0d6ceb9fdcb94d0e0c727d4 data/minecraft/tags/items/wooden_slabs.json
b8b58bbaf1ddca3514896af14db83f304e415305 data/minecraft/tags/items/wooden_trapdoors.json
>>>>>>> main

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -1,14 +1,11 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
" D ",
" B "
"DCD",
" D "
],
"key": {
"B": {
"item": "minecraft:bowl"
},
"D": {
"item": "hexcasting:amethyst_dust"
},

View file

@ -231,7 +231,7 @@ public class HexBlockStatesAndModels extends PaucalBlockStateAndModelProvider {
simpleBlock(HexBlocks.SCONCE, sconceModel);
simpleBlockItem(HexBlocks.SCONCE, sconceModel);
var conjuredModel = models().getExistingFile(modLoc("conjured"));
var conjuredModel = models().getBuilder("conjured").texture("particle", mcLoc("block/amethyst_block"));
simpleBlock(HexBlocks.CONJURED_BLOCK, conjuredModel);
simpleBlock(HexBlocks.CONJURED_LIGHT, conjuredModel);
}