From 6ce223e141d1386255ace9595fce046bbc527515 Mon Sep 17 00:00:00 2001 From: Unix Date: Wed, 12 Jun 2024 21:01:38 -0500 Subject: [PATCH] feature update --- .../assets/alchemist/lang/en_us.json | 9 +- .../misc/aeternalis_fuel_to_mobius_fuel.json | 32 +++++++ ...json => alchemical_coal_to_coal_coke.json} | 4 +- .../misc/coal_coke_to_alchemical_coal.json | 32 +++++++ ...al_to_coal.json => coal_coke_to_coal.json} | 4 +- .../recipes/misc/cobblestone.json | 54 +++++++++++ .../recipes/misc/dark_matter.json | 43 +++++++++ .../misc/mobius_fuel_to_aeternalis_fuel.json | 32 +++++++ .../advancements/recipes/misc/obsidian.json | 54 +++++++++++ .../advancements/recipes/misc/red_matter.json | 43 +++++++++ .../advancements/recipes/misc/stone.json | 54 +++++++++++ .../recipes/tools/catalytic_lens.json | 10 +- .../recipes/tools/destruction_catalyst.json | 23 +++-- .../recipes/tools/evertide_gem.json | 43 +++++++++ .../recipes/tools/volcanite_gem.json | 43 +++++++++ .../aeternalis_fuel_to_mobius_fuel.json | 37 +++++++ .../recipes/alchemical_coal_to_coal_coke.json | 37 +++++++ .../alchemical_coal_to_mobius_fuel.json | 2 +- .../alchemist/recipes/catalytic_lens.json | 2 +- .../alchemist/recipes/charcoal_to_coal.json | 2 +- ...json => coal_coke_to_alchemical_coal.json} | 4 +- ...al_to_coal.json => coal_coke_to_coal.json} | 10 +- .../alchemist/recipes/coal_to_charcoal.json | 9 -- .../data/alchemist/recipes/cobblestone.json | 22 +++++ .../data/alchemist/recipes/dark_matter.json | 21 ++++ .../recipes/destruction_catalyst.json | 13 ++- .../data/alchemist/recipes/evertide_gem.json | 21 ++++ .../data/alchemist/recipes/iron_band.json | 2 +- .../mobius_fuel_to_aeternalis_fuel.json | 16 ++++ .../mobius_fuel_to_alchemical_coal.json | 12 +++ .../data/alchemist/recipes/obsidian.json | 22 +++++ .../data/alchemist/recipes/red_matter.json | 21 ++++ .../data/alchemist/recipes/stone.json | 22 +++++ .../data/alchemist/recipes/volcanite_gem.json | 21 ++++ .../data/c/tags/items/buckets/lava.json | 5 + .../data/c/tags/items/buckets/water.json | 5 + .../io/github/unix_supremacist/Alchemist.java | 40 ++++---- .../github/unix_supremacist/Entrypoint.java | 12 --- .../content/AlchemistItems.java | 20 ++-- .../github/unix_supremacist/data/ItemTag.java | 8 +- .../unix_supremacist/data/Language.java | 4 - .../github/unix_supremacist/data/Recipe.java | 90 +++++++++++++++--- .../item/AlchemistBlockItem.java | 69 ++++++++++++++ .../unix_supremacist/item/ChalkItem.java | 37 ------- .../unix_supremacist/item/GaleItem.java | 5 - .../models/item/aeternalis_fuel.json | 6 ++ .../alchemist/models/item/coal_coke.json | 6 ++ .../models/item/dark_matter_hammer.json | 6 ++ .../alchemist/models/item/evertide_gem.json | 6 ++ .../alchemist/models/item/red_matter.json | 6 ++ .../alchemist/models/item/volcanite_gem.json | 6 ++ .../textures/item/aeternalis_fuel.png | Bin 0 -> 295 bytes .../alchemist/textures/item/coal_coke.png | Bin 0 -> 237 bytes .../textures/item/dark_matter_hammer.png | Bin 0 -> 312 bytes .../alchemist/textures/item/evertide_gem.png | Bin 0 -> 232 bytes .../textures/item/philosophers_stone.png | Bin 237 -> 262 bytes .../alchemist/textures/item/red_matter.png | Bin 0 -> 237 bytes .../alchemist/textures/item/volcanite_gem.png | Bin 0 -> 238 bytes src/main/resources/assets/spritesheet.ase | Bin 1358 -> 2444 bytes src/main/resources/fabric.mod.json | 2 +- 60 files changed, 963 insertions(+), 146 deletions(-) create mode 100644 src/main/generated/data/alchemist/advancements/recipes/misc/aeternalis_fuel_to_mobius_fuel.json rename src/main/generated/data/alchemist/advancements/recipes/misc/{coal_to_alchemical_coal.json => alchemical_coal_to_coal_coke.json} (83%) create mode 100644 src/main/generated/data/alchemist/advancements/recipes/misc/coal_coke_to_alchemical_coal.json rename src/main/generated/data/alchemist/advancements/recipes/misc/{alchemical_coal_to_coal.json => coal_coke_to_coal.json} (84%) create mode 100644 src/main/generated/data/alchemist/advancements/recipes/misc/cobblestone.json create mode 100644 src/main/generated/data/alchemist/advancements/recipes/misc/dark_matter.json create mode 100644 src/main/generated/data/alchemist/advancements/recipes/misc/mobius_fuel_to_aeternalis_fuel.json create mode 100644 src/main/generated/data/alchemist/advancements/recipes/misc/obsidian.json create mode 100644 src/main/generated/data/alchemist/advancements/recipes/misc/red_matter.json create mode 100644 src/main/generated/data/alchemist/advancements/recipes/misc/stone.json create mode 100644 src/main/generated/data/alchemist/advancements/recipes/tools/evertide_gem.json create mode 100644 src/main/generated/data/alchemist/advancements/recipes/tools/volcanite_gem.json create mode 100644 src/main/generated/data/alchemist/recipes/aeternalis_fuel_to_mobius_fuel.json create mode 100644 src/main/generated/data/alchemist/recipes/alchemical_coal_to_coal_coke.json rename src/main/generated/data/alchemist/recipes/{coal_to_alchemical_coal.json => coal_coke_to_alchemical_coal.json} (82%) rename src/main/generated/data/alchemist/recipes/{alchemical_coal_to_coal.json => coal_coke_to_coal.json} (64%) create mode 100644 src/main/generated/data/alchemist/recipes/cobblestone.json create mode 100644 src/main/generated/data/alchemist/recipes/dark_matter.json create mode 100644 src/main/generated/data/alchemist/recipes/evertide_gem.json create mode 100644 src/main/generated/data/alchemist/recipes/mobius_fuel_to_aeternalis_fuel.json create mode 100644 src/main/generated/data/alchemist/recipes/obsidian.json create mode 100644 src/main/generated/data/alchemist/recipes/red_matter.json create mode 100644 src/main/generated/data/alchemist/recipes/stone.json create mode 100644 src/main/generated/data/alchemist/recipes/volcanite_gem.json create mode 100644 src/main/generated/data/c/tags/items/buckets/lava.json create mode 100644 src/main/generated/data/c/tags/items/buckets/water.json delete mode 100644 src/main/java/io/github/unix_supremacist/Entrypoint.java create mode 100644 src/main/java/io/github/unix_supremacist/item/AlchemistBlockItem.java delete mode 100644 src/main/java/io/github/unix_supremacist/item/ChalkItem.java create mode 100644 src/main/resources/assets/alchemist/models/item/aeternalis_fuel.json create mode 100644 src/main/resources/assets/alchemist/models/item/coal_coke.json create mode 100644 src/main/resources/assets/alchemist/models/item/dark_matter_hammer.json create mode 100644 src/main/resources/assets/alchemist/models/item/evertide_gem.json create mode 100644 src/main/resources/assets/alchemist/models/item/red_matter.json create mode 100644 src/main/resources/assets/alchemist/models/item/volcanite_gem.json create mode 100644 src/main/resources/assets/alchemist/textures/item/aeternalis_fuel.png create mode 100644 src/main/resources/assets/alchemist/textures/item/coal_coke.png create mode 100644 src/main/resources/assets/alchemist/textures/item/dark_matter_hammer.png create mode 100644 src/main/resources/assets/alchemist/textures/item/evertide_gem.png create mode 100644 src/main/resources/assets/alchemist/textures/item/red_matter.png create mode 100644 src/main/resources/assets/alchemist/textures/item/volcanite_gem.png diff --git a/src/main/generated/assets/alchemist/lang/en_us.json b/src/main/generated/assets/alchemist/lang/en_us.json index 9cf7835..b8b3632 100644 --- a/src/main/generated/assets/alchemist/lang/en_us.json +++ b/src/main/generated/assets/alchemist/lang/en_us.json @@ -1,15 +1,18 @@ { "block.alchemist.transmutation_circle": "Transmutation Circle", + "item.alchemist.aeternalis_fuel": "Aeternalis Fuel", "item.alchemist.alchemical_coal": "Alchemical Coal", "item.alchemist.catalytic_lens": "Catalytic Lens", "item.alchemist.chalk": "Chalk", + "item.alchemist.coal_coke": "Coal Coke", "item.alchemist.dark_matter": "Dark Matter", "item.alchemist.destruction_catalyst": "Destruction Catalyst", + "item.alchemist.evertide_gem": "Evertide Gem", "item.alchemist.iron_band": "Iron Band", "item.alchemist.mobius_fuel": "Mobius Fuel", "item.alchemist.philosophers_stone": "Philosophers Stone", + "item.alchemist.red_matter": "Red Matter", "item.alchemist.swiftwolfs_rending_gale": "Swiftwolfs Rending Gale", - "itemGroup.alchemist": "Alchemist", - "key.alchemist.empower": "Empower", - "key.categories.alchemist": "Alchemist" + "item.alchemist.volcanite_gem": "Volcanite Gem", + "itemGroup.alchemist": "Alchemist" } \ No newline at end of file diff --git a/src/main/generated/data/alchemist/advancements/recipes/misc/aeternalis_fuel_to_mobius_fuel.json b/src/main/generated/data/alchemist/advancements/recipes/misc/aeternalis_fuel_to_mobius_fuel.json new file mode 100644 index 0000000..6807d16 --- /dev/null +++ b/src/main/generated/data/alchemist/advancements/recipes/misc/aeternalis_fuel_to_mobius_fuel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_philosophers_stone": { + "conditions": { + "items": [ + { + "items": "alchemist:philosophers_stone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "alchemist:aeternalis_fuel_to_mobius_fuel" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_philosophers_stone" + ] + ], + "rewards": { + "recipes": [ + "alchemist:aeternalis_fuel_to_mobius_fuel" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/advancements/recipes/misc/coal_to_alchemical_coal.json b/src/main/generated/data/alchemist/advancements/recipes/misc/alchemical_coal_to_coal_coke.json similarity index 83% rename from src/main/generated/data/alchemist/advancements/recipes/misc/coal_to_alchemical_coal.json rename to src/main/generated/data/alchemist/advancements/recipes/misc/alchemical_coal_to_coal_coke.json index 52cb931..118f5e6 100644 --- a/src/main/generated/data/alchemist/advancements/recipes/misc/coal_to_alchemical_coal.json +++ b/src/main/generated/data/alchemist/advancements/recipes/misc/alchemical_coal_to_coal_coke.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "alchemist:coal_to_alchemical_coal" + "recipe": "alchemist:alchemical_coal_to_coal_coke" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "alchemist:coal_to_alchemical_coal" + "alchemist:alchemical_coal_to_coal_coke" ] } } \ No newline at end of file diff --git a/src/main/generated/data/alchemist/advancements/recipes/misc/coal_coke_to_alchemical_coal.json b/src/main/generated/data/alchemist/advancements/recipes/misc/coal_coke_to_alchemical_coal.json new file mode 100644 index 0000000..12db18a --- /dev/null +++ b/src/main/generated/data/alchemist/advancements/recipes/misc/coal_coke_to_alchemical_coal.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_philosophers_stone": { + "conditions": { + "items": [ + { + "items": "alchemist:philosophers_stone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "alchemist:coal_coke_to_alchemical_coal" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_philosophers_stone" + ] + ], + "rewards": { + "recipes": [ + "alchemist:coal_coke_to_alchemical_coal" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/advancements/recipes/misc/alchemical_coal_to_coal.json b/src/main/generated/data/alchemist/advancements/recipes/misc/coal_coke_to_coal.json similarity index 84% rename from src/main/generated/data/alchemist/advancements/recipes/misc/alchemical_coal_to_coal.json rename to src/main/generated/data/alchemist/advancements/recipes/misc/coal_coke_to_coal.json index 31fe690..4373fde 100644 --- a/src/main/generated/data/alchemist/advancements/recipes/misc/alchemical_coal_to_coal.json +++ b/src/main/generated/data/alchemist/advancements/recipes/misc/coal_coke_to_coal.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "alchemist:alchemical_coal_to_coal" + "recipe": "alchemist:coal_coke_to_coal" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "alchemist:alchemical_coal_to_coal" + "alchemist:coal_coke_to_coal" ] } } \ No newline at end of file diff --git a/src/main/generated/data/alchemist/advancements/recipes/misc/cobblestone.json b/src/main/generated/data/alchemist/advancements/recipes/misc/cobblestone.json new file mode 100644 index 0000000..cef7fa2 --- /dev/null +++ b/src/main/generated/data/alchemist/advancements/recipes/misc/cobblestone.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lava_bucket": { + "conditions": { + "items": [ + { + "items": "minecraft:lava_bucket" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_philosophers_stone": { + "conditions": { + "items": [ + { + "items": "alchemist:philosophers_stone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cobblestone" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_water_bucket": { + "conditions": { + "items": [ + { + "items": "minecraft:water_bucket" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lava_bucket", + "has_water_bucket", + "has_philosophers_stone" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cobblestone" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/advancements/recipes/misc/dark_matter.json b/src/main/generated/data/alchemist/advancements/recipes/misc/dark_matter.json new file mode 100644 index 0000000..e37ae1b --- /dev/null +++ b/src/main/generated/data/alchemist/advancements/recipes/misc/dark_matter.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_mobius_fuel": { + "conditions": { + "items": [ + { + "items": "alchemist:mobius_fuel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_netherite_block": { + "conditions": { + "items": [ + { + "items": "minecraft:netherite_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "alchemist:dark_matter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_mobius_fuel", + "has_netherite_block" + ] + ], + "rewards": { + "recipes": [ + "alchemist:dark_matter" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/advancements/recipes/misc/mobius_fuel_to_aeternalis_fuel.json b/src/main/generated/data/alchemist/advancements/recipes/misc/mobius_fuel_to_aeternalis_fuel.json new file mode 100644 index 0000000..ce0df10 --- /dev/null +++ b/src/main/generated/data/alchemist/advancements/recipes/misc/mobius_fuel_to_aeternalis_fuel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_philosophers_stone": { + "conditions": { + "items": [ + { + "items": "alchemist:philosophers_stone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "alchemist:mobius_fuel_to_aeternalis_fuel" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_philosophers_stone" + ] + ], + "rewards": { + "recipes": [ + "alchemist:mobius_fuel_to_aeternalis_fuel" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/advancements/recipes/misc/obsidian.json b/src/main/generated/data/alchemist/advancements/recipes/misc/obsidian.json new file mode 100644 index 0000000..168d151 --- /dev/null +++ b/src/main/generated/data/alchemist/advancements/recipes/misc/obsidian.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lava_bucket": { + "conditions": { + "items": [ + { + "items": "minecraft:lava_bucket" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_philosophers_stone": { + "conditions": { + "items": [ + { + "items": "alchemist:philosophers_stone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:obsidian" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_water_bucket": { + "conditions": { + "items": [ + { + "items": "minecraft:water_bucket" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lava_bucket", + "has_water_bucket", + "has_philosophers_stone" + ] + ], + "rewards": { + "recipes": [ + "minecraft:obsidian" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/advancements/recipes/misc/red_matter.json b/src/main/generated/data/alchemist/advancements/recipes/misc/red_matter.json new file mode 100644 index 0000000..3449f12 --- /dev/null +++ b/src/main/generated/data/alchemist/advancements/recipes/misc/red_matter.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_aeternalis_fuel": { + "conditions": { + "items": [ + { + "items": "alchemist:aeternalis_fuel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dark_matter": { + "conditions": { + "items": [ + { + "items": "alchemist:dark_matter" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "alchemist:red_matter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dark_matter", + "has_aeternalis_fuel" + ] + ], + "rewards": { + "recipes": [ + "alchemist:red_matter" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/advancements/recipes/misc/stone.json b/src/main/generated/data/alchemist/advancements/recipes/misc/stone.json new file mode 100644 index 0000000..e05499f --- /dev/null +++ b/src/main/generated/data/alchemist/advancements/recipes/misc/stone.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lava_bucket": { + "conditions": { + "items": [ + { + "items": "minecraft:lava_bucket" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_philosophers_stone": { + "conditions": { + "items": [ + { + "items": "alchemist:philosophers_stone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:stone" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_water_bucket": { + "conditions": { + "items": [ + { + "items": "minecraft:water_bucket" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lava_bucket", + "has_water_bucket", + "has_philosophers_stone" + ] + ], + "rewards": { + "recipes": [ + "minecraft:stone" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/advancements/recipes/tools/catalytic_lens.json b/src/main/generated/data/alchemist/advancements/recipes/tools/catalytic_lens.json index d9bf687..bb3eb71 100644 --- a/src/main/generated/data/alchemist/advancements/recipes/tools/catalytic_lens.json +++ b/src/main/generated/data/alchemist/advancements/recipes/tools/catalytic_lens.json @@ -1,21 +1,21 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_dark_matter": { + "has_destruction_catalyst": { "conditions": { "items": [ { - "items": "alchemist:dark_matter" + "items": "alchemist:destruction_catalyst" } ] }, "trigger": "minecraft:inventory_changed" }, - "has_destruction_catalyst": { + "has_red_matter": { "conditions": { "items": [ { - "items": "alchemist:destruction_catalyst" + "items": "alchemist:red_matter" } ] }, @@ -31,7 +31,7 @@ "requirements": [ [ "has_the_recipe", - "has_dark_matter", + "has_red_matter", "has_destruction_catalyst" ] ], diff --git a/src/main/generated/data/alchemist/advancements/recipes/tools/destruction_catalyst.json b/src/main/generated/data/alchemist/advancements/recipes/tools/destruction_catalyst.json index 76132cf..4c4aaf4 100644 --- a/src/main/generated/data/alchemist/advancements/recipes/tools/destruction_catalyst.json +++ b/src/main/generated/data/alchemist/advancements/recipes/tools/destruction_catalyst.json @@ -1,21 +1,21 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_flint_and_steel": { + "has_aeternalis_fuel": { "conditions": { "items": [ { - "items": "minecraft:flint_and_steel" + "items": "alchemist:aeternalis_fuel" } ] }, "trigger": "minecraft:inventory_changed" }, - "has_mobius_fuel": { + "has_flint_and_steel": { "conditions": { "items": [ { - "items": "alchemist:mobius_fuel" + "items": "minecraft:flint_and_steel" } ] }, @@ -31,6 +31,16 @@ }, "trigger": "minecraft:inventory_changed" }, + "has_red_matter": { + "conditions": { + "items": [ + { + "items": "alchemist:red_matter" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_the_recipe": { "conditions": { "recipe": "alchemist:destruction_catalyst" @@ -42,8 +52,9 @@ [ "has_the_recipe", "has_flint_and_steel", - "has_mobius_fuel", - "has_philosophers_stone" + "has_aeternalis_fuel", + "has_philosophers_stone", + "has_red_matter" ] ], "rewards": { diff --git a/src/main/generated/data/alchemist/advancements/recipes/tools/evertide_gem.json b/src/main/generated/data/alchemist/advancements/recipes/tools/evertide_gem.json new file mode 100644 index 0000000..498a33b --- /dev/null +++ b/src/main/generated/data/alchemist/advancements/recipes/tools/evertide_gem.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_matter": { + "conditions": { + "items": [ + { + "items": "alchemist:dark_matter" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "alchemist:evertide_gem" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_water_bucket": { + "conditions": { + "items": [ + { + "items": "minecraft:water_bucket" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dark_matter", + "has_water_bucket" + ] + ], + "rewards": { + "recipes": [ + "alchemist:evertide_gem" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/advancements/recipes/tools/volcanite_gem.json b/src/main/generated/data/alchemist/advancements/recipes/tools/volcanite_gem.json new file mode 100644 index 0000000..797a947 --- /dev/null +++ b/src/main/generated/data/alchemist/advancements/recipes/tools/volcanite_gem.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_matter": { + "conditions": { + "items": [ + { + "items": "alchemist:dark_matter" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lava_bucket": { + "conditions": { + "items": [ + { + "items": "minecraft:lava_bucket" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "alchemist:volcanite_gem" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_dark_matter", + "has_lava_bucket" + ] + ], + "rewards": { + "recipes": [ + "alchemist:volcanite_gem" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/recipes/aeternalis_fuel_to_mobius_fuel.json b/src/main/generated/data/alchemist/recipes/aeternalis_fuel_to_mobius_fuel.json new file mode 100644 index 0000000..2b1e179 --- /dev/null +++ b/src/main/generated/data/alchemist/recipes/aeternalis_fuel_to_mobius_fuel.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "alchemist:philosophers_stone" + }, + { + "item": "alchemist:mobius_fuel" + }, + { + "item": "alchemist:mobius_fuel" + }, + { + "item": "alchemist:mobius_fuel" + }, + { + "item": "alchemist:mobius_fuel" + }, + { + "item": "alchemist:mobius_fuel" + }, + { + "item": "alchemist:mobius_fuel" + }, + { + "item": "alchemist:mobius_fuel" + }, + { + "item": "alchemist:mobius_fuel" + } + ], + "result": { + "count": 1, + "id": "alchemist:aeternalis_fuel" + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/recipes/alchemical_coal_to_coal_coke.json b/src/main/generated/data/alchemist/recipes/alchemical_coal_to_coal_coke.json new file mode 100644 index 0000000..9b7dcfe --- /dev/null +++ b/src/main/generated/data/alchemist/recipes/alchemical_coal_to_coal_coke.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "alchemist:philosophers_stone" + }, + { + "item": "alchemist:coal_coke" + }, + { + "item": "alchemist:coal_coke" + }, + { + "item": "alchemist:coal_coke" + }, + { + "item": "alchemist:coal_coke" + }, + { + "item": "alchemist:coal_coke" + }, + { + "item": "alchemist:coal_coke" + }, + { + "item": "alchemist:coal_coke" + }, + { + "item": "alchemist:coal_coke" + } + ], + "result": { + "count": 1, + "id": "alchemist:alchemical_coal" + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/recipes/alchemical_coal_to_mobius_fuel.json b/src/main/generated/data/alchemist/recipes/alchemical_coal_to_mobius_fuel.json index 83033f1..64cf1d0 100644 --- a/src/main/generated/data/alchemist/recipes/alchemical_coal_to_mobius_fuel.json +++ b/src/main/generated/data/alchemist/recipes/alchemical_coal_to_mobius_fuel.json @@ -10,7 +10,7 @@ } ], "result": { - "count": 4, + "count": 8, "id": "alchemist:alchemical_coal" } } \ No newline at end of file diff --git a/src/main/generated/data/alchemist/recipes/catalytic_lens.json b/src/main/generated/data/alchemist/recipes/catalytic_lens.json index eac7a32..3eff182 100644 --- a/src/main/generated/data/alchemist/recipes/catalytic_lens.json +++ b/src/main/generated/data/alchemist/recipes/catalytic_lens.json @@ -6,7 +6,7 @@ "item": "alchemist:destruction_catalyst" }, "D": { - "item": "alchemist:dark_matter" + "item": "alchemist:red_matter" } }, "pattern": [ diff --git a/src/main/generated/data/alchemist/recipes/charcoal_to_coal.json b/src/main/generated/data/alchemist/recipes/charcoal_to_coal.json index abcc74f..b7fea93 100644 --- a/src/main/generated/data/alchemist/recipes/charcoal_to_coal.json +++ b/src/main/generated/data/alchemist/recipes/charcoal_to_coal.json @@ -10,7 +10,7 @@ } ], "result": { - "count": 4, + "count": 1, "id": "minecraft:charcoal" } } \ No newline at end of file diff --git a/src/main/generated/data/alchemist/recipes/coal_to_alchemical_coal.json b/src/main/generated/data/alchemist/recipes/coal_coke_to_alchemical_coal.json similarity index 82% rename from src/main/generated/data/alchemist/recipes/coal_to_alchemical_coal.json rename to src/main/generated/data/alchemist/recipes/coal_coke_to_alchemical_coal.json index 2d2c2ce..264fb2f 100644 --- a/src/main/generated/data/alchemist/recipes/coal_to_alchemical_coal.json +++ b/src/main/generated/data/alchemist/recipes/coal_coke_to_alchemical_coal.json @@ -10,7 +10,7 @@ } ], "result": { - "count": 4, - "id": "minecraft:coal" + "count": 8, + "id": "alchemist:coal_coke" } } \ No newline at end of file diff --git a/src/main/generated/data/alchemist/recipes/alchemical_coal_to_coal.json b/src/main/generated/data/alchemist/recipes/coal_coke_to_coal.json similarity index 64% rename from src/main/generated/data/alchemist/recipes/alchemical_coal_to_coal.json rename to src/main/generated/data/alchemist/recipes/coal_coke_to_coal.json index a57a823..aeec7a1 100644 --- a/src/main/generated/data/alchemist/recipes/alchemical_coal_to_coal.json +++ b/src/main/generated/data/alchemist/recipes/coal_coke_to_coal.json @@ -8,18 +8,12 @@ { "item": "minecraft:coal" }, - { - "item": "minecraft:coal" - }, - { - "item": "minecraft:coal" - }, { "item": "minecraft:coal" } ], "result": { - "count": 1, - "id": "alchemist:alchemical_coal" + "count": 2, + "id": "alchemist:coal_coke" } } \ No newline at end of file diff --git a/src/main/generated/data/alchemist/recipes/coal_to_charcoal.json b/src/main/generated/data/alchemist/recipes/coal_to_charcoal.json index 72d90d7..d2f3236 100644 --- a/src/main/generated/data/alchemist/recipes/coal_to_charcoal.json +++ b/src/main/generated/data/alchemist/recipes/coal_to_charcoal.json @@ -5,15 +5,6 @@ { "item": "alchemist:philosophers_stone" }, - { - "item": "minecraft:charcoal" - }, - { - "item": "minecraft:charcoal" - }, - { - "item": "minecraft:charcoal" - }, { "item": "minecraft:charcoal" } diff --git a/src/main/generated/data/alchemist/recipes/cobblestone.json b/src/main/generated/data/alchemist/recipes/cobblestone.json new file mode 100644 index 0000000..4328d04 --- /dev/null +++ b/src/main/generated/data/alchemist/recipes/cobblestone.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "L": { + "tag": "c:buckets/lava" + }, + "P": { + "item": "alchemist:philosophers_stone" + }, + "W": { + "tag": "c:buckets/water" + } + }, + "pattern": [ + "WPL" + ], + "result": { + "count": 1, + "id": "minecraft:cobblestone" + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/recipes/dark_matter.json b/src/main/generated/data/alchemist/recipes/dark_matter.json new file mode 100644 index 0000000..0da7398 --- /dev/null +++ b/src/main/generated/data/alchemist/recipes/dark_matter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": { + "item": "alchemist:mobius_fuel" + }, + "N": { + "item": "minecraft:netherite_block" + } + }, + "pattern": [ + "MMM", + "MNM", + "MMM" + ], + "result": { + "count": 1, + "id": "alchemist:dark_matter" + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/recipes/destruction_catalyst.json b/src/main/generated/data/alchemist/recipes/destruction_catalyst.json index 2d6ccf2..a1e48e1 100644 --- a/src/main/generated/data/alchemist/recipes/destruction_catalyst.json +++ b/src/main/generated/data/alchemist/recipes/destruction_catalyst.json @@ -2,20 +2,23 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { + "A": { + "item": "alchemist:aeternalis_fuel" + }, "F": { "item": "minecraft:flint_and_steel" }, - "M": { - "item": "alchemist:mobius_fuel" + "R": { + "item": "alchemist:red_matter" }, "S": { "item": "alchemist:philosophers_stone" } }, "pattern": [ - "FMF", - "MSM", - "FMF" + "FRF", + "ASA", + "FRF" ], "result": { "count": 1, diff --git a/src/main/generated/data/alchemist/recipes/evertide_gem.json b/src/main/generated/data/alchemist/recipes/evertide_gem.json new file mode 100644 index 0000000..805922b --- /dev/null +++ b/src/main/generated/data/alchemist/recipes/evertide_gem.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "D": { + "item": "alchemist:dark_matter" + }, + "W": { + "tag": "c:buckets/water" + } + }, + "pattern": [ + "WWW", + "DDD", + "WWW" + ], + "result": { + "count": 1, + "id": "alchemist:evertide_gem" + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/recipes/iron_band.json b/src/main/generated/data/alchemist/recipes/iron_band.json index 41134ee..b80562e 100644 --- a/src/main/generated/data/alchemist/recipes/iron_band.json +++ b/src/main/generated/data/alchemist/recipes/iron_band.json @@ -6,7 +6,7 @@ "item": "minecraft:iron_ingot" }, "L": { - "item": "minecraft:lava_bucket" + "tag": "c:buckets/lava" } }, "pattern": [ diff --git a/src/main/generated/data/alchemist/recipes/mobius_fuel_to_aeternalis_fuel.json b/src/main/generated/data/alchemist/recipes/mobius_fuel_to_aeternalis_fuel.json new file mode 100644 index 0000000..e2b96c5 --- /dev/null +++ b/src/main/generated/data/alchemist/recipes/mobius_fuel_to_aeternalis_fuel.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "alchemist:philosophers_stone" + }, + { + "item": "alchemist:aeternalis_fuel" + } + ], + "result": { + "count": 8, + "id": "alchemist:mobius_fuel" + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/recipes/mobius_fuel_to_alchemical_coal.json b/src/main/generated/data/alchemist/recipes/mobius_fuel_to_alchemical_coal.json index 7948d5f..07a45a1 100644 --- a/src/main/generated/data/alchemist/recipes/mobius_fuel_to_alchemical_coal.json +++ b/src/main/generated/data/alchemist/recipes/mobius_fuel_to_alchemical_coal.json @@ -14,6 +14,18 @@ { "item": "alchemist:alchemical_coal" }, + { + "item": "alchemist:alchemical_coal" + }, + { + "item": "alchemist:alchemical_coal" + }, + { + "item": "alchemist:alchemical_coal" + }, + { + "item": "alchemist:alchemical_coal" + }, { "item": "alchemist:alchemical_coal" } diff --git a/src/main/generated/data/alchemist/recipes/obsidian.json b/src/main/generated/data/alchemist/recipes/obsidian.json new file mode 100644 index 0000000..cfae3ba --- /dev/null +++ b/src/main/generated/data/alchemist/recipes/obsidian.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "L": { + "tag": "c:buckets/lava" + }, + "P": { + "item": "alchemist:philosophers_stone" + }, + "W": { + "tag": "c:buckets/water" + } + }, + "pattern": [ + "PWL" + ], + "result": { + "count": 1, + "id": "minecraft:obsidian" + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/recipes/red_matter.json b/src/main/generated/data/alchemist/recipes/red_matter.json new file mode 100644 index 0000000..cb13226 --- /dev/null +++ b/src/main/generated/data/alchemist/recipes/red_matter.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "item": "alchemist:aeternalis_fuel" + }, + "D": { + "item": "alchemist:dark_matter" + } + }, + "pattern": [ + "AAA", + "DDD", + "AAA" + ], + "result": { + "count": 1, + "id": "alchemist:red_matter" + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/recipes/stone.json b/src/main/generated/data/alchemist/recipes/stone.json new file mode 100644 index 0000000..701c6f7 --- /dev/null +++ b/src/main/generated/data/alchemist/recipes/stone.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "L": { + "tag": "c:buckets/lava" + }, + "P": { + "item": "alchemist:philosophers_stone" + }, + "W": { + "tag": "c:buckets/water" + } + }, + "pattern": [ + "PLW" + ], + "result": { + "count": 1, + "id": "minecraft:stone" + } +} \ No newline at end of file diff --git a/src/main/generated/data/alchemist/recipes/volcanite_gem.json b/src/main/generated/data/alchemist/recipes/volcanite_gem.json new file mode 100644 index 0000000..8bfed60 --- /dev/null +++ b/src/main/generated/data/alchemist/recipes/volcanite_gem.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "D": { + "item": "alchemist:dark_matter" + }, + "L": { + "tag": "c:buckets/lava" + } + }, + "pattern": [ + "LLL", + "DDD", + "LLL" + ], + "result": { + "count": 1, + "id": "alchemist:volcanite_gem" + } +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/items/buckets/lava.json b/src/main/generated/data/c/tags/items/buckets/lava.json new file mode 100644 index 0000000..ec1890a --- /dev/null +++ b/src/main/generated/data/c/tags/items/buckets/lava.json @@ -0,0 +1,5 @@ +{ + "values": [ + "alchemist:volcanite_gem" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/items/buckets/water.json b/src/main/generated/data/c/tags/items/buckets/water.json new file mode 100644 index 0000000..ecc431d --- /dev/null +++ b/src/main/generated/data/c/tags/items/buckets/water.json @@ -0,0 +1,5 @@ +{ + "values": [ + "alchemist:evertide_gem" + ] +} \ No newline at end of file diff --git a/src/main/java/io/github/unix_supremacist/Alchemist.java b/src/main/java/io/github/unix_supremacist/Alchemist.java index 6e2010e..a7fa77e 100644 --- a/src/main/java/io/github/unix_supremacist/Alchemist.java +++ b/src/main/java/io/github/unix_supremacist/Alchemist.java @@ -5,6 +5,7 @@ import io.github.unix_supremacist.content.AlchemistBlocks; import io.github.unix_supremacist.content.AlchemistItems; import io.github.unix_supremacist.data.BlockTag; +import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.CommonLifecycleEvents; import net.minecraft.core.Registry; import net.minecraft.core.component.DataComponentType; @@ -18,23 +19,24 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class Alchemist { - public static final String MODID = "alchemist"; - public static final Logger LOGGER = LoggerFactory.getLogger(MODID); - public static final ResourceLocation empower_packet = new ResourceLocation(Alchemist.MODID, "empower_packet"); - public static final CreativeModeTab tab = PolymerItemGroupUtils.builder() - .icon(() -> new ItemStack(AlchemistItems.philosophers_stone.getItem())) - .title(Component.translatable("itemGroup."+MODID)) - .build(); - public static final DataComponentType POWER = DataComponentType.builder().persistent(ExtraCodecs.NON_NEGATIVE_INT).networkSynchronized(ByteBufCodecs.VAR_INT).build(); +public class Alchemist implements ModInitializer { + public static final String MODID = "alchemist"; + public static final Logger LOGGER = LoggerFactory.getLogger(MODID); + public static final CreativeModeTab tab = PolymerItemGroupUtils.builder() + .icon(() -> new ItemStack(AlchemistItems.philosophers_stone.getItem())) + .title(Component.translatable("itemGroup."+MODID)) + .build(); + public static final DataComponentType POWER = DataComponentType.builder().persistent(ExtraCodecs.NON_NEGATIVE_INT).networkSynchronized(ByteBufCodecs.VAR_INT).build(); - public static void Init(){ - LOGGER.info("Welcome to the World of Alchemy!"); - Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, new ResourceLocation(MODID, "empowered"), POWER); - Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, new ResourceLocation(MODID, "tab"), tab); - AlchemistBlocks.values(); //force the enum to load - AlchemistItems.values(); //force the enum to load - CommonLifecycleEvents.TAGS_LOADED.register((registries, client) -> BlockTag.init()); - PolymerResourcePackUtils.addModAssets(MODID); - } -} + + @Override + public void onInitialize() { + LOGGER.info("Welcome to the World of Alchemy!"); + Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, new ResourceLocation(MODID, "empowered"), Alchemist.POWER); + Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, new ResourceLocation(MODID, "tab"), Alchemist.tab); + AlchemistBlocks.values(); //force the enum to load + AlchemistItems.values(); //force the enum to load + CommonLifecycleEvents.TAGS_LOADED.register((registries, client) -> BlockTag.init()); + PolymerResourcePackUtils.addModAssets(MODID); + } +} \ No newline at end of file diff --git a/src/main/java/io/github/unix_supremacist/Entrypoint.java b/src/main/java/io/github/unix_supremacist/Entrypoint.java deleted file mode 100644 index d955a5e..0000000 --- a/src/main/java/io/github/unix_supremacist/Entrypoint.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.github.unix_supremacist; - -import net.fabricmc.api.ModInitializer; - -public class Entrypoint implements ModInitializer { - - - @Override - public void onInitialize() { - Alchemist.Init(); - } -} \ No newline at end of file diff --git a/src/main/java/io/github/unix_supremacist/content/AlchemistItems.java b/src/main/java/io/github/unix_supremacist/content/AlchemistItems.java index 24613dc..d510413 100644 --- a/src/main/java/io/github/unix_supremacist/content/AlchemistItems.java +++ b/src/main/java/io/github/unix_supremacist/content/AlchemistItems.java @@ -2,7 +2,7 @@ import eu.pb4.factorytools.api.item.ModeledItem; import io.github.unix_supremacist.Alchemist; -import io.github.unix_supremacist.item.ChalkItem; +import io.github.unix_supremacist.item.AlchemistBlockItem; import io.github.unix_supremacist.item.DestructionItem; import io.github.unix_supremacist.item.GaleItem; import io.github.unix_supremacist.item.PhilosophersStoneItem; @@ -16,13 +16,16 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.Item.Properties; import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Blocks; public enum AlchemistItems { - alchemical_coal(6400, Items.DIAMOND), + alchemical_coal(25600, Items.DIAMOND), + aeternalis_fuel(1638400, Items.NETHERITE_SCRAP), //archangels_smite, //black_hole_band, catalytic_lens(new DestructionItem(new Properties().stacksTo(1).durability(30), 3, 10, 5, Items.GOLD_NUGGET)), - chalk(new ChalkItem(AlchemistBlocks.transmutation_circle.getBlock(), new Properties().durability(64))), + chalk(new AlchemistBlockItem(AlchemistBlocks.transmutation_circle.getBlock(), new Properties().durability(64), Items.STICK)), + coal_coke(3200, Items.COOKED_BEEF), dark_matter(0, Items.FIRE_CHARGE), //dark_matter_pickaxe, //dark_matter_shovel, @@ -32,15 +35,16 @@ public enum AlchemistItems { //dark_matter_shears, //dark_matter_hammer, destruction_catalyst(new DestructionItem(new Properties().stacksTo(1).durability(15), 3, 5, 1, Items.GOLD_INGOT)), - //evertide_amulet, + evertide_gem(new AlchemistBlockItem(Blocks.WATER, new Properties().stacksTo(1), Items.LAPIS_LAZULI)), //gem_of_eternal_density, //harvest_goddess_band, //hyperkinetic_lens, iron_band(0, Items.IRON_BARS), - mobius_fuel(25600, Items.EMERALD), + mobius_fuel(204800, Items.EMERALD), philosophers_stone(new PhilosophersStoneItem(new Properties().stacksTo(1).durability(3))), + red_matter(0, Items.MAGMA_CREAM), swiftwolfs_rending_gale(new GaleItem(new Properties().stacksTo(1))), - //volcanite_amulet, + volcanite_gem(new AlchemistBlockItem(Blocks.LAVA, new Properties().durability(64), Items.BLAZE_POWDER)), ; @Getter Item item; @@ -60,8 +64,6 @@ public enum AlchemistItems { this.item = item; FuelRegistry.INSTANCE.add(item, burntime); Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(Alchemist.MODID, this.name()), item); - ItemGroupEvents.modifyEntriesEvent(ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), new ResourceLocation(Alchemist.MODID, "tab"))).register(content -> { - content.accept(item); - }); + ItemGroupEvents.modifyEntriesEvent(ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), new ResourceLocation(Alchemist.MODID, "tab"))).register(content -> content.accept(item)); } } diff --git a/src/main/java/io/github/unix_supremacist/data/ItemTag.java b/src/main/java/io/github/unix_supremacist/data/ItemTag.java index a07eba7..2f29d33 100644 --- a/src/main/java/io/github/unix_supremacist/data/ItemTag.java +++ b/src/main/java/io/github/unix_supremacist/data/ItemTag.java @@ -11,12 +11,14 @@ import java.util.concurrent.CompletableFuture; -import static io.github.unix_supremacist.content.AlchemistItems.swiftwolfs_rending_gale; +import static io.github.unix_supremacist.content.AlchemistItems.*; public class ItemTag extends FabricTagProvider.ItemTagProvider { + public static String common = "c"; public static TagKey handring = TagKey.create(BuiltInRegistries.ITEM.key(), new ResourceLocation(TrinketsMain.MOD_ID, "hand/ring")); public static TagKey offhandring = TagKey.create(BuiltInRegistries.ITEM.key(), new ResourceLocation(TrinketsMain.MOD_ID, "offhand/ring")); - + public static TagKey water_bucket = TagKey.create(BuiltInRegistries.ITEM.key(), new ResourceLocation(common, "buckets/water")); + public static TagKey lava_bucket = TagKey.create(BuiltInRegistries.ITEM.key(), new ResourceLocation(common, "buckets/lava")); public ItemTag(FabricDataOutput output, CompletableFuture completableFuture) { super(output, completableFuture); } @@ -25,5 +27,7 @@ public ItemTag(FabricDataOutput output, CompletableFuture protected void addTags(HolderLookup.Provider arg) { getOrCreateTagBuilder(handring).add(swiftwolfs_rending_gale.getItem()); getOrCreateTagBuilder(offhandring).add(swiftwolfs_rending_gale.getItem()); + getOrCreateTagBuilder(water_bucket).add(evertide_gem.getItem()); + getOrCreateTagBuilder(lava_bucket).add(volcanite_gem.getItem()); } } diff --git a/src/main/java/io/github/unix_supremacist/data/Language.java b/src/main/java/io/github/unix_supremacist/data/Language.java index 5a76cfe..d5065e0 100644 --- a/src/main/java/io/github/unix_supremacist/data/Language.java +++ b/src/main/java/io/github/unix_supremacist/data/Language.java @@ -13,7 +13,6 @@ import java.util.concurrent.CompletableFuture; - public class Language extends FabricLanguageProvider { protected Language(FabricDataOutput dataOutput, CompletableFuture registryLookup) { super(dataOutput, registryLookup); @@ -28,8 +27,5 @@ public void generateTranslations(HolderLookup.Provider registryLookup, Translati translationBuilder.add(block.getBlock(), WordUtils.capitalize(block.name().replace("_", " "))); translationBuilder.add(ResourceKey.create(BuiltInRegistries.CREATIVE_MODE_TAB.key(), new ResourceLocation(Alchemist.MODID, "tab")), WordUtils.capitalize(Alchemist.MODID.replace("_", " "))); - - translationBuilder.add("key.categories.alchemist", WordUtils.capitalize(Alchemist.MODID.replace("_", " "))); - translationBuilder.add("key.alchemist.empower", "Empower"); } } diff --git a/src/main/java/io/github/unix_supremacist/data/Recipe.java b/src/main/java/io/github/unix_supremacist/data/Recipe.java index 88606be..2d6b335 100644 --- a/src/main/java/io/github/unix_supremacist/data/Recipe.java +++ b/src/main/java/io/github/unix_supremacist/data/Recipe.java @@ -33,7 +33,7 @@ public void buildRecipes(RecipeOutput recipeoutput) { .pattern("ILI") .pattern("III") .define('I', Items.IRON_INGOT) - .define('L', Items.LAVA_BUCKET) + .define('L', ItemTag.lava_bucket) .unlockedBy(RecipeProvider.getHasName(Items.IRON_INGOT), RecipeProvider.has(Items.IRON_INGOT)) .unlockedBy(RecipeProvider.getHasName(Items.LAVA_BUCKET), RecipeProvider.has(Items.LAVA_BUCKET)) .save(recipeoutput); @@ -41,21 +41,41 @@ public void buildRecipes(RecipeOutput recipeoutput) { .pattern("DDD") .pattern("CDC") .pattern("DDD") - .define('D', dark_matter.getItem()) + .define('D', red_matter.getItem()) .define('C', destruction_catalyst.getItem()) - .unlockedBy(RecipeProvider.getHasName(dark_matter.getItem()), RecipeProvider.has(dark_matter.getItem())) + .unlockedBy(RecipeProvider.getHasName(red_matter.getItem()), RecipeProvider.has(red_matter.getItem())) .unlockedBy(RecipeProvider.getHasName(destruction_catalyst.getItem()), RecipeProvider.has(destruction_catalyst.getItem())) .save(recipeoutput); ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, destruction_catalyst.getItem()) - .pattern("FMF") - .pattern("MSM") - .pattern("FMF") + .pattern("FRF") + .pattern("ASA") + .pattern("FRF") .define('F', Items.FLINT_AND_STEEL) - .define('M', mobius_fuel.getItem()) + .define('A', aeternalis_fuel.getItem()) .define('S', philosophers_stone.getItem()) + .define('R', red_matter.getItem()) .unlockedBy(RecipeProvider.getHasName(Items.FLINT_AND_STEEL), RecipeProvider.has(Items.FLINT_AND_STEEL)) - .unlockedBy(RecipeProvider.getHasName(mobius_fuel.getItem()), RecipeProvider.has(mobius_fuel.getItem())) + .unlockedBy(RecipeProvider.getHasName(aeternalis_fuel.getItem()), RecipeProvider.has(aeternalis_fuel.getItem())) .unlockedBy(RecipeProvider.getHasName(philosophers_stone.getItem()), RecipeProvider.has(philosophers_stone.getItem())) + .unlockedBy(RecipeProvider.getHasName(red_matter.getItem()), RecipeProvider.has(red_matter.getItem())) + .save(recipeoutput); + ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, volcanite_gem.getItem()) + .pattern("LLL") + .pattern("DDD") + .pattern("LLL") + .define('D', dark_matter.getItem()) + .define('L', ItemTag.lava_bucket) + .unlockedBy(RecipeProvider.getHasName(dark_matter.getItem()), RecipeProvider.has(dark_matter.getItem())) + .unlockedBy(RecipeProvider.getHasName(Items.LAVA_BUCKET), RecipeProvider.has(Items.LAVA_BUCKET)) + .save(recipeoutput); + ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, evertide_gem.getItem()) + .pattern("WWW") + .pattern("DDD") + .pattern("WWW") + .define('D', dark_matter.getItem()) + .define('W', ItemTag.water_bucket) + .unlockedBy(RecipeProvider.getHasName(dark_matter.getItem()), RecipeProvider.has(dark_matter.getItem())) + .unlockedBy(RecipeProvider.getHasName(Items.WATER_BUCKET), RecipeProvider.has(Items.WATER_BUCKET)) .save(recipeoutput); ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, chalk.getItem()) .pattern("CD") @@ -65,9 +85,57 @@ public void buildRecipes(RecipeOutput recipeoutput) { .unlockedBy(RecipeProvider.getHasName(Items.DIORITE), RecipeProvider.has(Items.DIORITE)) .unlockedBy(RecipeProvider.getHasName(Items.CLAY_BALL), RecipeProvider.has(Items.CLAY_BALL)) .save(recipeoutput); - twoWayPhilStoneRecipe(Items.COAL, Items.CHARCOAL, 4, recipeoutput); - twoWayPhilStoneRecipe(alchemical_coal.getItem(), Items.COAL, 4, recipeoutput); - twoWayPhilStoneRecipe(mobius_fuel.getItem(), alchemical_coal.getItem(), 4, recipeoutput); + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, Items.COBBLESTONE) + .pattern("WPL") + .define('W', ItemTag.water_bucket) + .define('P', philosophers_stone.getItem()) + .define('L', ItemTag.lava_bucket) + .unlockedBy(RecipeProvider.getHasName(Items.LAVA_BUCKET), RecipeProvider.has(Items.LAVA_BUCKET)) + .unlockedBy(RecipeProvider.getHasName(Items.WATER_BUCKET), RecipeProvider.has(Items.WATER_BUCKET)) + .unlockedBy(RecipeProvider.getHasName(philosophers_stone.getItem()), RecipeProvider.has(philosophers_stone.getItem())) + .save(recipeoutput); + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, Items.OBSIDIAN) + .pattern("PWL") + .define('W', ItemTag.water_bucket) + .define('P', philosophers_stone.getItem()) + .define('L', ItemTag.lava_bucket) + .unlockedBy(RecipeProvider.getHasName(Items.LAVA_BUCKET), RecipeProvider.has(Items.LAVA_BUCKET)) + .unlockedBy(RecipeProvider.getHasName(Items.WATER_BUCKET), RecipeProvider.has(Items.WATER_BUCKET)) + .unlockedBy(RecipeProvider.getHasName(philosophers_stone.getItem()), RecipeProvider.has(philosophers_stone.getItem())) + .save(recipeoutput); + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, Items.STONE) + .pattern("PLW") + .define('W', ItemTag.water_bucket) + .define('P', philosophers_stone.getItem()) + .define('L', ItemTag.lava_bucket) + .unlockedBy(RecipeProvider.getHasName(Items.LAVA_BUCKET), RecipeProvider.has(Items.LAVA_BUCKET)) + .unlockedBy(RecipeProvider.getHasName(Items.WATER_BUCKET), RecipeProvider.has(Items.WATER_BUCKET)) + .unlockedBy(RecipeProvider.getHasName(philosophers_stone.getItem()), RecipeProvider.has(philosophers_stone.getItem())) + .save(recipeoutput); + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, dark_matter.getItem()) + .pattern("MMM") + .pattern("MNM") + .pattern("MMM") + .define('M', mobius_fuel.getItem()) + .define('N', Items.NETHERITE_BLOCK) + .unlockedBy(RecipeProvider.getHasName(mobius_fuel.getItem()), RecipeProvider.has(mobius_fuel.getItem())) + .unlockedBy(RecipeProvider.getHasName(Items.NETHERITE_BLOCK), RecipeProvider.has(Items.NETHERITE_BLOCK)) + .save(recipeoutput); + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, red_matter.getItem()) + .pattern("AAA") + .pattern("DDD") + .pattern("AAA") + .define('D', dark_matter.getItem()) + .define('A', aeternalis_fuel.getItem()) + .unlockedBy(RecipeProvider.getHasName(dark_matter.getItem()), RecipeProvider.has(dark_matter.getItem())) + .unlockedBy(RecipeProvider.getHasName(aeternalis_fuel.getItem()), RecipeProvider.has(aeternalis_fuel.getItem())) + .save(recipeoutput); + twoWayPhilStoneRecipe(Items.COAL, Items.CHARCOAL, 1, recipeoutput); + philStoneRecipe(coal_coke.getItem(), 2, Items.COAL, 2, recipeoutput); + twoWayPhilStoneRecipe(alchemical_coal.getItem(), coal_coke.getItem(), 8, recipeoutput); + twoWayPhilStoneRecipe(mobius_fuel.getItem(), alchemical_coal.getItem(), 8, recipeoutput); + twoWayPhilStoneRecipe(aeternalis_fuel.getItem(), mobius_fuel.getItem(), 8, recipeoutput); + twoWayPhilStoneRecipe(Items.IRON_INGOT, Items.COPPER_INGOT, 8, recipeoutput); twoWayPhilStoneRecipe(Items.DIAMOND, Items.GOLD_INGOT, 4, recipeoutput); twoWayPhilStoneRecipe(Items.NETHERITE_SCRAP, Items.DIAMOND, 4, recipeoutput); diff --git a/src/main/java/io/github/unix_supremacist/item/AlchemistBlockItem.java b/src/main/java/io/github/unix_supremacist/item/AlchemistBlockItem.java new file mode 100644 index 0000000..a7de4d5 --- /dev/null +++ b/src/main/java/io/github/unix_supremacist/item/AlchemistBlockItem.java @@ -0,0 +1,69 @@ +package io.github.unix_supremacist.item; + +import eu.pb4.factorytools.api.item.AutoModeledPolymerItem; +import eu.pb4.factorytools.api.item.FactoryBlockItem; +import io.github.unix_supremacist.block.TransmutionCircleBlock; +import io.github.unix_supremacist.content.AlchemistItems; +import lombok.Getter; +import net.minecraft.core.BlockPos; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.network.protocol.game.ClientboundSoundPacket; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.phys.Vec3; + +public class AlchemistBlockItem extends BlockItem implements AutoModeledPolymerItem { + @Getter Item polymerItem; + Block block; + + public AlchemistBlockItem(Block block, Properties properties, Item polymerItem) { + super(block, properties); + this.polymerItem = polymerItem; + this.block = block; + } + + @Override + public InteractionResult useOn(UseOnContext context) { + InteractionResult interactionResult; + ItemStack item = context.getItemInHand(); + BlockPos blockPos = context.getClickedPos().relative(context.getClickedFace()); + if(context.getLevel().getBlockState(blockPos) == Blocks.LAVA.defaultBlockState() && block.equals(Blocks.LAVA)){ + if (item.getDamageValue() > 0 || context.getPlayer().isCreative()){ + context.getLevel().setBlock(blockPos, Blocks.AIR.defaultBlockState(), 0); + if(!context.getPlayer().isCreative()) context.getItemInHand().setDamageValue(item.getDamageValue()-1); + interactionResult = InteractionResult.SUCCESS; + } else interactionResult = InteractionResult.PASS; + } else if (block.equals(Blocks.WATER) || block.equals(Blocks.LAVA)) { + context.getLevel().setBlock(blockPos, block.defaultBlockState(), 0); + if (item.getMaxDamage() > 0) context.getItemInHand().hurtAndBreak(1, context.getPlayer(), EquipmentSlot.MAINHAND); + interactionResult = InteractionResult.SUCCESS; + } else { + context.getItemInHand().grow(1); + interactionResult = this.place(new BlockPlaceContext(context)); + if(interactionResult == InteractionResult.FAIL) context.getItemInHand().shrink(1); + if (item.getMaxDamage() > 0) context.getItemInHand().hurtAndBreak(1, context.getPlayer(), EquipmentSlot.MAINHAND); + } + + return interactionResult; + } + + @Override + public ItemStack getRecipeRemainder(ItemStack stack) { + return new ItemStack(this); + } + + @Override + public String getDescriptionId() { + return this.getOrCreateDescriptionId(); + } +} diff --git a/src/main/java/io/github/unix_supremacist/item/ChalkItem.java b/src/main/java/io/github/unix_supremacist/item/ChalkItem.java deleted file mode 100644 index 48d4700..0000000 --- a/src/main/java/io/github/unix_supremacist/item/ChalkItem.java +++ /dev/null @@ -1,37 +0,0 @@ -package io.github.unix_supremacist.item; - -import eu.pb4.factorytools.api.item.FactoryBlockItem; -import io.github.unix_supremacist.block.TransmutionCircleBlock; -import net.minecraft.util.Mth; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.item.context.UseOnContext; - -public class ChalkItem extends FactoryBlockItem { - public ChalkItem(TransmutionCircleBlock block, Properties properties) { - super(block, properties, Items.STICK); - } - - @Override - public InteractionResult useOn(UseOnContext context) { - context.getItemInHand().grow(1); - InteractionResult interactionResult = this.place(new BlockPlaceContext(context)); - if(interactionResult == InteractionResult.FAIL) context.getItemInHand().shrink(1); - context.getItemInHand().hurtAndBreak(1, context.getPlayer(), EquipmentSlot.MAINHAND); - return interactionResult; - } - - @Override - public int getBarColor(ItemStack item) { - float f = Math.max(0.0F, ((float)item.getMaxDamage() - (float)item.getDamageValue()) / (float)item.getMaxDamage()); - return Mth.hsvToRgb(f / 1.1F, 1.0F, 1.0F); - } - - @Override - public String getDescriptionId() { - return this.getOrCreateDescriptionId(); - } -} diff --git a/src/main/java/io/github/unix_supremacist/item/GaleItem.java b/src/main/java/io/github/unix_supremacist/item/GaleItem.java index 6d54617..7a01cd7 100644 --- a/src/main/java/io/github/unix_supremacist/item/GaleItem.java +++ b/src/main/java/io/github/unix_supremacist/item/GaleItem.java @@ -1,15 +1,11 @@ package io.github.unix_supremacist.item; -import dev.emi.trinkets.TrinketSlot; import dev.emi.trinkets.api.*; import eu.pb4.factorytools.api.item.AutoModeledPolymerItem; -import eu.pb4.factorytools.api.item.ModeledItem; import io.github.ladysnake.pal.AbilitySource; import io.github.ladysnake.pal.Pal; import io.github.ladysnake.pal.VanillaAbilities; import io.github.unix_supremacist.Alchemist; -import net.minecraft.core.Holder; -import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.LivingEntity; @@ -18,7 +14,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -import net.minecraft.world.level.gameevent.GameEvent; public class GaleItem extends TrinketItem implements AutoModeledPolymerItem { public GaleItem(Properties properties) { diff --git a/src/main/resources/assets/alchemist/models/item/aeternalis_fuel.json b/src/main/resources/assets/alchemist/models/item/aeternalis_fuel.json new file mode 100644 index 0000000..7773e1b --- /dev/null +++ b/src/main/resources/assets/alchemist/models/item/aeternalis_fuel.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "alchemist:item/aeternalis_fuel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemist/models/item/coal_coke.json b/src/main/resources/assets/alchemist/models/item/coal_coke.json new file mode 100644 index 0000000..dd600de --- /dev/null +++ b/src/main/resources/assets/alchemist/models/item/coal_coke.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "alchemist:item/coal_coke" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemist/models/item/dark_matter_hammer.json b/src/main/resources/assets/alchemist/models/item/dark_matter_hammer.json new file mode 100644 index 0000000..465c872 --- /dev/null +++ b/src/main/resources/assets/alchemist/models/item/dark_matter_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "alchemist:item/dark_matter_hammer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemist/models/item/evertide_gem.json b/src/main/resources/assets/alchemist/models/item/evertide_gem.json new file mode 100644 index 0000000..466fd16 --- /dev/null +++ b/src/main/resources/assets/alchemist/models/item/evertide_gem.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "alchemist:item/evertide_gem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemist/models/item/red_matter.json b/src/main/resources/assets/alchemist/models/item/red_matter.json new file mode 100644 index 0000000..b2262ab --- /dev/null +++ b/src/main/resources/assets/alchemist/models/item/red_matter.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "alchemist:item/red_matter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemist/models/item/volcanite_gem.json b/src/main/resources/assets/alchemist/models/item/volcanite_gem.json new file mode 100644 index 0000000..77f5b76 --- /dev/null +++ b/src/main/resources/assets/alchemist/models/item/volcanite_gem.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "alchemist:item/volcanite_gem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemist/textures/item/aeternalis_fuel.png b/src/main/resources/assets/alchemist/textures/item/aeternalis_fuel.png new file mode 100644 index 0000000000000000000000000000000000000000..9188b3eefff57a3cc571937528e4176f2dc851ee GIT binary patch literal 295 zcmV+?0oeYDP)Xa&a@59e^S(eFjNr3l07-LjzS(aVM-EVW2WdMlCHjFX!eIE`1 z0Mj%fA{2SY<$P5z=UfDd0071PGs9T%^7^zv0IanUWCN^k7ZHZfM*uG8YZB77ZHNFV z-QFM6oYF3!$UBCy0$>;`io8?%P1A(K1SyHgae}ppN^c*C2=hFvvicm(xnQl0ZUK~0 tM5ycf6afI$;l0?aISGL82Bi%DPhZi_bS1WDEf)X)002ovPDHLkV1fpxdi4MR literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/alchemist/textures/item/coal_coke.png b/src/main/resources/assets/alchemist/textures/item/coal_coke.png new file mode 100644 index 0000000000000000000000000000000000000000..dc6b9aaa0835626763b5aeca25acd84e48fcc35f GIT binary patch literal 237 zcmV`%*3oyn+A}VS^h(pM!Hc!(800>0+5D~Q2@go2LoO1}(1PQb#)j%4+JB?B{ zkPJw>*WEeD`Et#WuO{Hs4VdRSb^$i;`zP4E2Zb`D;&UuY#Zk(p3xLA-xZkj@>(BrI n6bbJQdnGdq0A2xchX2zOBDGi)LGyj-00000NkvXXu0mjf94B0Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/alchemist/textures/item/dark_matter_hammer.png b/src/main/resources/assets/alchemist/textures/item/dark_matter_hammer.png new file mode 100644 index 0000000000000000000000000000000000000000..3af012dbc536d9994a30891c5274c06443819668 GIT binary patch literal 312 zcmV-80muG{P)mAcib4 z$4NNWBHZDU!`+BeE_~noGqd1W-J?@o_P*r`w~m{Hey}F73Uc`Fam3k4o6rw*6w5*+ zTw#DTNdfp!Q~Gistb$xpsa6Vj_Nf3^qzN~#_rfXw2>n3s)prXx%d%CX<(EA{6iZ#L z)p@$;;CWsFzt5*UOkTvVON?TvclH~o@sPe8h(($hu(k8m?OdN<$HwUn8waKT!3i#_ zwHW!#YCNQO*|zS;*ul@4U0@@@rkxGJUtxf4faTjW3O0uSrM?04riNHx9jI^s0000< KMNUMnLSTXsbBYrH literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/alchemist/textures/item/evertide_gem.png b/src/main/resources/assets/alchemist/textures/item/evertide_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..3f6d6b432ab496d60fbfd71d8b53a643a0c15a67 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>pfi@Lo9le6C_xBeyDg)`}?0i z`MZl@QfPOmz_O3O^*R0@&u43smzOit(Vcoc;Czek<}C^?pZo6%oH+mliVDXC?*9E? z@5n3x1n>5^WVo>9->W|=;B2@c<>vqY2D2|ReqJAbbP0l+XkKqtaje literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/alchemist/textures/item/philosophers_stone.png b/src/main/resources/assets/alchemist/textures/item/philosophers_stone.png index eb6723daaf63715bce3749af572d8cc81312ae8d..1ce336e82a5165fb1f56e45d90c5447fb0598e87 100644 GIT binary patch delta 234 zcmVj{ISB3;m403SZzlJ@_Aeg zFqfdXfEdl_0B*pae~Kh)W?;Y)h=jnW@821I{6ILI36EN$0Aoo8eER;K;RnYbhCd(g z!o^VH^vzT6|8I*VuxeyrU|{&c@rOY(;thjH&_1|6jFk0ZZ|eWcGe2T=0lH?a1~4!% kFuYmkgf%InYaSc`0PUPwFrb`Iwg3PC07*qoM6N<$f>JSZ@&Et; delta 209 zcmV;?051QA0__2iB!9F?L_t(IjbmUKXuya~@MTune{AC7)4DL!V+g#=D*ONA>sPF{ zy?Xzi!F1Cy6g^Dnn#Igb7=HZtffe&{ax$Fui$ZZ7BeLcnU%xW^`0)d)?a1KM_wR6* zptyh-&FBDb04{$MZ2+<0)A#QTKREu7ZvaIufZ6`>%^SEFN=lqQjL-g$Eg(OA|IWa` zzyR0mvu__+m((_E!C$cd+ELk%+C&i&;m{_)66M`Ozr)xv*1bOT&{!PedaMf$L z`S0Ud=^YYYbL@J~|LfOPu&@1p?!bWq4AmdKI;Vst0Ab!`!~g&Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/alchemist/textures/item/volcanite_gem.png b/src/main/resources/assets/alchemist/textures/item/volcanite_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..bdba3010463b9cf42f1bb1523e19b1ee9f9de9a3 GIT binary patch literal 238 zcmVVWkK|%r*q|={G7qty^mmf`dYBTe` zd6QZAtM{&%C6PAo!D8d|I*SG@B?myMno2c{mwU_ax#0e2LMb^))hJa15cnQx9O{n) z08WQp3qDGuuxd{OvLw07*qoM6N<$g22*T&Hw-a literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/spritesheet.ase b/src/main/resources/assets/spritesheet.ase index 42a233e6e9993d889bd9dc000d3e7c76df76e294..af04d284fe7859f6518926473958bf63d79c2cac 100644 GIT binary patch delta 1903 zcmYL{c~p~E7Qn-z3DsefYDGf`*isx2Jy>OrCPR^9DbxlASC(bwd0w2=e*zhcgP4-tw{GH zfcyl&(8x%@FHfBUB#}sfX=!PIG#U-CrKJVX^&=<1`}gky-o1MlaA;@u9_;yT~_RO0ZLXd6yQWS~D6bLn=5)lKV| zA58D1;sdS9;|GJ@Zn<*IBqq?*`6684^1-R&oaTy)6+`;>l6qoh8>39m330 z6+>dDzL7>zsfzB|+QSDYJ}D__eiB+gLLd+U;zrBPsk`}^sdb28abXtf*ySTV)??gLUh3!=jAmMHEGG9Rn_`!@dNjjP z5fPr-iy4xMk|?AK-duj2r^vYC`OmaqiR$@iSzmk)p_ravh!B&+9(gJVqr2A`)=&7Z z<^kQwF1JRWiP<|M9}qx-eOVSKU@A=FsooAWtcfBwiG~Q6q@$^q%U81$HD^Z&-{k~o z-Wj2(Y|WUI8>p{lG7k)F%U-%TOHPn4R6p7fKByPs#hX);b0Z@?)Np<8x?VBaCbNK_ zpNx_ltxKt*bY0?_ML%>1$<3yu#JJ_@Z44LYe$rCdddRW&PiojpZd3;~(^EUz)J99} zU7fp>BI)Z{O2=pFV6pecVC4hdHa6PD@Y_0f5{nIfQsgB!TN$XOJ`wMjx=x!bq$S>< zYom)d&_rpRYJ*ruKfhEg2u!fEO%KL+Hun$vT9az-<=lC}Oq$FHXQI0Tb5*k+QteV* zY!V>3S?WHU1i9HyQH4*2eTTMW=AJb3QC`UOc@KYnJHEh@h}oT=Y8c+dRyv%iai+GP zw8#`i3%fjt93n3rdSbX{3qNvv@qocXrd3d!da>QO+`BAr%Qu6T+OErCT{+{o8JyTr zjc4TI__kTg#cpML^+P}DL67Z_;(+097;m*NRD0bhf+1raA7-*M-TsPpHOL^{7x>e^ zxjigo%MBENUB_!~h&tD=?v1$6GQ-Vnr-rDBuxqrEeoOF3`zUL|o2)y6gim*kwr+N- zR1tPjO%VPXW2u&#FQ|g{Pfh58p<(_PCy+XdEOVJAO8060KC3Sba{ps%UfzfL`(#H; zeC;|YGQ?TwcDP75i(4X-iJ8HeQP1Z*_nA78@8f|-IJtlj($xP(`+6rr6kYB09pmR- z8TG|CK?(8(b(6~NA@g5nk=U#3#HWq_PM+teU+{V1ViRX+-HJ#`Zc~51e-gG-c6^D% z?nkP|mTjOx5Qj~iMcwPVN{&XkfwtXr+RPVpd+DJd*kYEl0hL?ZDP}+ZmM3jolv>CY zw(GZHM%E#X=>}`-Le}tCO=Wjdkl0t^Lv!U(o2qGUMp>pCE_9Lk$(mFlsTuVSYNoKx z;(}pAH%CwJveU45CT;ZWmajF3udO9EKyO-F-W(ktTZ&RXz3L7&_G?YS=?EyO)krZ< z_M3_UY0CtMg3B2zTIlgJ54C=#U>tG$TVVr2sac6Z%Jk6V{(~x{WCzcHYdKFQombrK z`z*G7iTMMLjFg32AuBQ0C3~^w%sY^P`1P^iOLP{)GbcRY!;N!HAWDG1x0mppF2;`QeHt;F_9sHO3iDc(Zh43tPLv_lXF7LQ zk9-`8Oy2sH6Hryricp5)V8@nv%4j{kV1}WGe&1aDz{{5}Kh2mC7F`ZB>Pk*YF*n8T zyOlTfN+=XIKvX`t11C8x*I{-i-ctYKxquAYvD({T94AH+b-j`9X{F}YLw+1JTh2CT zu~PgwmWft&kdWc29pW&Bf@_GaOUj* delta 835 zcmeAXKF6i#$I8I)U@0R50}}(20t1j{NC9F5Fr26uFMp1Of#KIj7PyoHP@SZLAyk#Y z#`%VfTyudu7LWmklTDZ=*UN*r3d{(D82$s<>2=HZ) zW2l((cIL(`X-9#!uS$&OZ6YgM3{_af+1Ih;HHmVth`)StZ|mwk4cd=S^>#Z1amMW8 zSow!VF*E4M1O<*Ip%3O5_DJ-mr~R*wy*pQDjeOf=KkIUH`OW3q_gC%x{j1J+?OKC2 zyDHb3T`AwQOF~X({H|G=Bvv*1*V#$yESHx_eSiF*K(A=$-n*5d(G!b%rr3yu#V_3v zX<8ifey``Ib?5Ex^#1+z>#mN4{L0oFZ}NH1tT3Bze$02%#lKI#&OX|cJ?-nOjva>Y zC&knYeYBF?yS{w>zLLe9d2#x#Z`RbVteSXhVsgdKJMn_+WAbWzx@X>bReR!Z?`zkJ z%F^cs|7~RMonHP+AWp;hWPJbkUz{^1e=?5Bk3Mrj?(|DzsqaaP-+zk?KhrTiv{-L* zVdz;|<@C5HnJw$~|6QFLaYk(J>{!Fcf6QiPx-I#5b$b1p-_}NH6RQH#=ER@ssr)+M zhI^)`-I~q))ARnG*xmMT&Lg+2ZhIn3-1?>;T(c;-;yhzg>!(dWD$eNeslMN`$xK#o zy~g}cDK0;c9OZ5i@0KW(nIAW!^2Du^zt=6zcFF4fbkRm^<3^?L79Db@q-sUCerviG zWjggo!sRbJQh?q3bE?EaOWyJE}p`u_*#Gp;PJQpx{R9N_;y zFa2k_Z@1;keeOk_;rQ=RaG1r|jsN)r&pjR9@Gef1Q2g_J!-KEKj~aam)16{xlocJwdk9 zPIsq#+*B7mMe<3%${&6IiT3gz7kz&ENlEccz<(b*=Cm{a-go~o);#jR>sfljQ!me@jXK$=A9c!-}@#{O@V~5g&9dCS&&0E1Ujq4qEtp4{P9-)mH&G CEq$;6 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 04ddada..d0da1e0 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -19,7 +19,7 @@ "environment": "*", "entrypoints": { "main": [ - "io.github.unix_supremacist.Entrypoint" + "io.github.unix_supremacist.Alchemist" ], "fabric-datagen": [ "io.github.unix_supremacist.data.Datagen"