Skip to content

Fix Wand Metadata #25

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

Merged
Nikolay-Sitnikov merged 2 commits into from
Mar 7, 2026
Merged

Fix Wand Metadata #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a726deb
Simplify wand creation and fix metadata
koolkrafter5 Mar 7, 2026
34c374c
Remove redundant checks
koolkrafter5 Mar 7, 2026
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
5 changes: 4 additions & 1 deletion src/main/java/fox/spiteful/forbidden/VillagerHereticManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeL
new ItemStack(Items.emerald, 1),
new ItemStack(Items.glowstone_dust, 8 + random.nextInt(9))));

ItemStack wand = new ItemStack(ConfigItems.itemWandCasting, 1, 36);
ItemStack wand = new ItemStack(
ConfigItems.itemWandCasting,
1,
ConfigItems.WAND_CAP_IRON.getCraftCost() * ForbiddenItems.WAND_ROD_PROFANE.getCraftCost());
((ItemWandCasting) wand.getItem()).setCap(wand, ConfigItems.WAND_CAP_IRON);
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_PROFANE);
((ItemWandCasting) wand.getItem()).storeAllVis(
Expand Down
92 changes: 32 additions & 60 deletions src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import fox.spiteful.forbidden.items.ForbiddenItems;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.wands.WandCap;
import thaumcraft.api.wands.WandRod;
import thaumcraft.common.config.ConfigItems;
import thaumcraft.common.items.wands.ItemWandCasting;

Expand Down Expand Up @@ -48,81 +50,51 @@ public IIcon getIconFromDamage(int meta) {

@SideOnly(Side.CLIENT)
@Override
public void getSubItems(Item item, CreativeTabs xCreativeTabs, List list) {
public void getSubItems(Item item, CreativeTabs xCreativeTabs, List<ItemStack> list) {
for (int x = 0; x < types.length; x++) {
list.add(new ItemStack(this, 1, x));
}

ItemStack wand = new ItemStack(ConfigItems.itemWandCasting, 1, 72);
((ItemWandCasting) wand.getItem()).setCap(wand, ConfigItems.WAND_CAP_THAUMIUM);
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_TAINTED);
list.add(wand);
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 72);
((ItemWandCasting) wand.getItem()).setCap(wand, ConfigItems.WAND_CAP_THAUMIUM);
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_INFERNAL);
list.add(wand);
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 2000);
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_ORICHALCUM);
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_NEUTRONIUM);
list.add(wand);
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 2000);
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_ORICHALCUM);
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.STAFF_ROD_NEUTRONIUM);
list.add(wand);
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 36);
((ItemWandCasting) wand.getItem()).setCap(wand, ConfigItems.WAND_CAP_IRON);
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_PROFANE);
list.add(buildWand(ConfigItems.WAND_CAP_THAUMIUM, ForbiddenItems.WAND_ROD_TAINTED));
list.add(buildWand(ConfigItems.WAND_CAP_THAUMIUM, ForbiddenItems.WAND_ROD_INFERNAL));
list.add(buildWand(ForbiddenItems.WAND_CAP_ORICHALCUM, ForbiddenItems.WAND_ROD_NEUTRONIUM));
list.add(buildWand(ForbiddenItems.WAND_CAP_ORICHALCUM, ForbiddenItems.STAFF_ROD_NEUTRONIUM));
ItemStack wand = buildWand(ConfigItems.WAND_CAP_IRON, ForbiddenItems.WAND_ROD_PROFANE);
((ItemWandCasting) wand.getItem()).storeAllVis(
wand,
new AspectList().add(Aspect.FIRE, 5000).add(Aspect.WATER, 5000).add(Aspect.EARTH, 5000)
.add(Aspect.AIR, 5000).add(Aspect.ORDER, 5000).add(Aspect.ENTROPY, 5000));
list.add(wand);
if (Compat.bm && Config.crossWand) {
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84);
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_ALCHEMICAL);
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_BLOOD);
list.add(wand);
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 168);
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_ALCHEMICAL);
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.STAFF_ROD_BLOOD);
list.add(wand);
if (!Config.crossWand) return;
if (Compat.bm) {
list.add(buildWand(ForbiddenItems.WAND_CAP_ALCHEMICAL, ForbiddenItems.WAND_ROD_BLOOD));
list.add(buildWand(ForbiddenItems.WAND_CAP_ALCHEMICAL, ForbiddenItems.STAFF_ROD_BLOOD));
}
if (Compat.am2 && Config.crossWand) {
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 72);
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_VINTEUM);
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_WITCHWOOD);
list.add(wand);
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 144);
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_VINTEUM);
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.STAFF_ROD_WITCHWOOD);
list.add(wand);
if (Compat.am2) {
list.add(buildWand(ForbiddenItems.WAND_CAP_VINTEUM, ForbiddenItems.WAND_ROD_WITCHWOOD));
list.add(buildWand(ForbiddenItems.WAND_CAP_VINTEUM, ForbiddenItems.STAFF_ROD_WITCHWOOD));
}
if (Compat.botan && Config.crossWand) {
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84);
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_MANASTEEL);
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_LIVINGWOOD);
list.add(wand);
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84);
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_ELEMENTIUM);
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_DREAMWOOD);
list.add(wand);
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 144);
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_ELEMENTIUM);
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.STAFF_ROD_DREAMWOOD);
list.add(wand);
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 1);
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_TERRASTEEL);
((ItemWandCasting) wand.getItem()).setRod(wand, ConfigItems.WAND_ROD_WOOD);
list.add(wand);
if (Compat.botan) {
list.add(buildWand(ForbiddenItems.WAND_CAP_MANASTEEL, ForbiddenItems.WAND_ROD_LIVINGWOOD));
list.add(buildWand(ForbiddenItems.WAND_CAP_ELEMENTIUM, ForbiddenItems.WAND_ROD_DREAMWOOD));
list.add(buildWand(ForbiddenItems.WAND_CAP_ELEMENTIUM, ForbiddenItems.STAFF_ROD_DREAMWOOD));
list.add(buildWand(ForbiddenItems.WAND_CAP_TERRASTEEL, ConfigItems.WAND_ROD_WOOD));
}
if (Compat.ee3 && Config.crossWand) {
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84);
((ItemWandCasting) wand.getItem()).setCap(wand, ConfigItems.WAND_CAP_VOID);
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_EQUIVALENT);
list.add(wand);
if (Compat.ee3) {
list.add(buildWand(ConfigItems.WAND_CAP_VOID, ForbiddenItems.WAND_ROD_EQUIVALENT));
}
}

private static ItemStack buildWand(WandCap cap, WandRod rod) {
ItemStack wand = new ItemStack(
ConfigItems.itemWandCasting,
1,
Math.min(rod.getCraftCost() * cap.getCraftCost(), Short.MAX_VALUE - 1));
((ItemWandCasting) wand.getItem()).setCap(wand, cap);
((ItemWandCasting) wand.getItem()).setRod(wand, rod);
Comment thread
Nikolay-Sitnikov marked this conversation as resolved.
return wand;
}

@Override
public String getUnlocalizedName(ItemStack stack) {
return super.getUnlocalizedName() + "." + types[stack.getItemDamage()];
Expand Down