Skip to content

make the ingredients shown in the craft-phial recipe viewer tag-based #1241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
s5bug wants to merge 1 commit into
base: 1.21
Choose a base branch
from
Open

make the ingredients shown in the craft-phial recipe viewer tag-based #1241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Common/src/generated/resources/data/hexcasting/tags/item/phial_raw_ingredients.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"values": [
"hexcasting:amethyst_dust",
"minecraft:amethyst_shard",
"hexcasting:charged_amethyst",
"hexcasting:quenched_allay_shard",
"hexcasting:quenched_allay"
]
}
2 changes: 2 additions & 0 deletions Common/src/main/java/at/petrak/hexcasting/api/mod/HexTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public static final class Items {
public static final TagKey<Item> PHIAL_BASE = create("phial_base");
public static final TagKey<Item> GRANTS_ROOT_ADVANCEMENT = create("grants_root_advancement");
public static final TagKey<Item> SEAL_MATERIALS = create("seal_materials");
public static final TagKey<Item> PHIAL_RAW_INGREDIENTS = create("phial_raw_ingredients");

public static final TagKey<Item> IMPETI = create("impeti");
public static final TagKey<Item> DIRECTRICES = create("directrices");
Expand All @@ -28,6 +29,7 @@ public static final class Items {
public static final TagKey<Item> AMETHYST_BLOCKS = create("amethyst_blocks");
public static final TagKey<Item> QUENCHED_ALLAY_BLOCKS = create("quenched_allay_blocks");


public static TagKey<Item> create(String name) {
return create(modLoc(name));
}
Expand Down
6 changes: 6 additions & 0 deletions Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexItemTagProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package at.petrak.hexcasting.datagen.tag;

import at.petrak.hexcasting.api.mod.HexTags;
import at.petrak.hexcasting.common.lib.HexBlocks;
import at.petrak.hexcasting.common.lib.HexItems;
import at.petrak.hexcasting.xplat.IXplatTags;
import net.minecraft.core.HolderLookup;
Expand Down Expand Up @@ -46,6 +47,11 @@ protected void addTags(HolderLookup.Provider provider) {
add(tag(HexTags.Items.SEAL_MATERIALS),
Items.HONEYCOMB);

add(tag(HexTags.Items.PHIAL_RAW_INGREDIENTS),
HexItems.AMETHYST_DUST.get(), Items.AMETHYST_SHARD,
HexItems.CHARGED_AMETHYST.get(), HexItems.QUENCHED_SHARD.get(),
HexBlocks.QUENCHED_ALLAY.get().asItem());

this.copy(HexTags.Blocks.EDIFIED_LOGS, HexTags.Items.EDIFIED_LOGS);
this.copy(HexTags.Blocks.EDIFIED_PLANKS, HexTags.Items.EDIFIED_PLANKS);
this.copy(HexTags.Blocks.IMPETI, HexTags.Items.IMPETI);
Expand Down
73 changes: 36 additions & 37 deletions Common/src/main/java/at/petrak/hexcasting/interop/utils/PhialRecipeStackBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,63 +2,62 @@

import at.petrak.hexcasting.api.misc.MediaConstants;
import at.petrak.hexcasting.api.mod.HexConfig;
import at.petrak.hexcasting.api.mod.HexTags;
import at.petrak.hexcasting.api.utils.MediaHelper;
import at.petrak.hexcasting.common.items.magic.ItemMediaBattery;
import at.petrak.hexcasting.common.lib.HexBlocks;
import at.petrak.hexcasting.common.lib.HexItems;
import com.google.common.collect.Lists;
import com.mojang.datafixers.util.Pair;
import java.util.Optional;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderSet;
import net.minecraft.core.RegistryAccess;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;

import java.util.List;
import net.minecraft.world.level.ItemLike;

public class PhialRecipeStackBuilder {
private static ItemStack makeBattery(long unit, int size) {
return ItemMediaBattery.withMedia(new ItemStack(HexItems.BATTERY.get()), unit * size, unit * size);
private static ItemStack makeBattery(long media) {
return ItemMediaBattery.withMedia(new ItemStack(HexItems.BATTERY.get()), media, media);
}

public static Pair<List<ItemStack>, List<ItemStack>> createStacks() {
List<ItemStack> inputItems = Lists.newArrayList();
List<ItemStack> outputItems = Lists.newArrayList();
private static final List<Item> FALLBACK_BATTERY_LIST = List.of(
HexItems.AMETHYST_DUST.get(),
Items.AMETHYST_SHARD,
HexItems.CHARGED_AMETHYST.get(),
HexItems.QUENCHED_SHARD.get(),
HexBlocks.QUENCHED_ALLAY.get().asItem()
);

long dust = HexConfig.common().dustMediaAmount();
long shard = HexConfig.common().shardMediaAmount();
long charged = HexConfig.common().chargedCrystalMediaAmount();
long quenchedShard = MediaConstants.QUENCHED_SHARD_UNIT;
long quenchedBlock = MediaConstants.QUENCHED_BLOCK_UNIT;
private static void addPhialRecipe(Item of, int count, List<ItemStack> from, List<ItemStack> to) {
ItemStack stack = new ItemStack(of, count);
long resultMedia = MediaHelper.extractMedia(stack, -1L, true, true);

from.add(stack);
to.add(makeBattery(resultMedia));
}

if (dust > 0) {
inputItems.add(new ItemStack(HexItems.AMETHYST_DUST.get(), 1));
outputItems.add(makeBattery(dust, 1));
inputItems.add(new ItemStack(HexItems.AMETHYST_DUST.get(), 64));
outputItems.add(makeBattery(dust, 64));
}
public static Pair<List<ItemStack>, List<ItemStack>> createStacks() {
List<ItemStack> inputItems = Lists.newArrayList();
List<ItemStack> outputItems = Lists.newArrayList();

if (shard > 0) {
inputItems.add(new ItemStack(Items.AMETHYST_SHARD, 1));
outputItems.add(makeBattery(shard, 1));
inputItems.add(new ItemStack(Items.AMETHYST_SHARD, 64));
outputItems.add(makeBattery(shard, 64));
}
List<Item> toUse = BuiltInRegistries.ITEM.getTag(HexTags.Items.PHIAL_RAW_INGREDIENTS)
.map(h -> h.stream().map(Holder::value).toList())
.orElse(FALLBACK_BATTERY_LIST);

if (charged > 0) {
inputItems.add(new ItemStack(HexItems.CHARGED_AMETHYST.get(), 1));
outputItems.add(makeBattery(charged, 1));
inputItems.add(new ItemStack(HexItems.CHARGED_AMETHYST.get(), 64));
outputItems.add(makeBattery(charged, 64));
for(Item i : toUse) {
addPhialRecipe(i, 1, inputItems, outputItems);
if(i.getDefaultMaxStackSize() > 1) {
addPhialRecipe(i, i.getDefaultMaxStackSize(), inputItems, outputItems);
}
}

inputItems.add(new ItemStack(HexItems.QUENCHED_SHARD.get(), 1));
outputItems.add(makeBattery(quenchedShard, 1));
inputItems.add(new ItemStack(HexItems.QUENCHED_SHARD.get(), 64));
outputItems.add(makeBattery(quenchedShard, 64));

inputItems.add(new ItemStack(HexBlocks.QUENCHED_ALLAY.get(), 1));
outputItems.add(makeBattery(quenchedBlock, 1));
inputItems.add(new ItemStack(HexBlocks.QUENCHED_ALLAY.get(), 64));
outputItems.add(makeBattery(quenchedBlock, 64));

return new Pair<>(inputItems, outputItems);
}

Expand Down
9 changes: 9 additions & 0 deletions Fabric/src/generated/resources/data/hexcasting/tags/item/phial_raw_ingredients.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"values": [
"hexcasting:amethyst_dust",
"minecraft:amethyst_shard",
"hexcasting:charged_amethyst",
"hexcasting:quenched_allay_shard",
"hexcasting:quenched_allay"
]
}
9 changes: 9 additions & 0 deletions Neoforge/src/generated/resources/data/hexcasting/tags/item/phial_raw_ingredients.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"values": [
"hexcasting:amethyst_dust",
"minecraft:amethyst_shard",
"hexcasting:charged_amethyst",
"hexcasting:quenched_allay_shard",
"hexcasting:quenched_allay"
]
}
Loading