Skip to content

Wand Cap and Core Refactor #18

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
Dream-Master merged 15 commits into from
Oct 12, 2025
Merged

Wand Cap and Core Refactor #18

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b95d777
Add support for the Blood Iron Caps from Blood Arsenal. They now redu…
koolkrafter5 Aug 13, 2025
c116902
Clean up the wand update classes:
koolkrafter5 Aug 13, 2025
4216eb9
Spotless
koolkrafter5 Aug 13, 2025
1b2f2a5
Add Equivalent Rod Placeholder Item (#16)
koolkrafter5 Aug 14, 2025
0b3655e
Move duplicate primal arrays, max vis checks, and hotbar checks to ne…
koolkrafter5 Aug 14, 2025
1ff5a32
Merge branch 'master' into bloody-caps
koolkrafter5 Aug 14, 2025
79d45fa
Merge branch 'master' into bloody-caps
koolkrafter5 Aug 18, 2025
571360b
Merge branch 'master' into bloody-caps
Dream-Master Sep 30, 2025
920ce49
Readd null check
koolkrafter5 Oct 7, 2025
97b7889
Merge branch 'master' into bloody-caps
koolkrafter5 Oct 7, 2025
5de71f8
Contract review suggestion
koolkrafter5 Oct 8, 2025
0d1393f
Enable Jabel and Generic Injection
koolkrafter5 Oct 8, 2025
96b4d8d
Pattern variables and fix logic
koolkrafter5 Oct 8, 2025
8939088
Make staves extend their wand counterparts instead of copying logic
koolkrafter5 Oct 8, 2025
091f1e4
Replace part name checks with checks against ForbiddenItems.
koolkrafter5 Oct 8, 2025
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
7 changes: 4 additions & 3 deletions src/main/java/fox/spiteful/forbidden/FMEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,10 +495,11 @@ public void onGetHurt(LivingHurtEvent event) {
}
}

if (event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) {
if (event.source.getEntity() instanceof EntityPlayer) {
ItemStack equip = ((EntityPlayer) event.source.getEntity()).getCurrentEquippedItem();
if (equip != null && equip.getItem() instanceof ItemWandCasting) {
if (((ItemWandCasting) equip.getItem()).getCap(equip).getTag().equals("alchemical")
if (equip.getItem() instanceof ItemWandCasting) {
String capTag = ((ItemWandCasting) equip.getItem()).getCap(equip).getTag();
if (capTag.equals("alchemical") || capTag.equals("blood_iron")
&& ((ItemWandCasting) equip.getItem()).getRod(equip).getTag().startsWith("blood")) {
event.entityLiving.addPotionEffect(new PotionEffect(Potion.weakness.id, 60, 2));
}
Expand Down
70 changes: 31 additions & 39 deletions src/main/java/fox/spiteful/forbidden/items/wands/BloodStaffUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,47 +8,45 @@
import fox.spiteful.forbidden.Config;
import fox.spiteful.forbidden.compat.Compat;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.wands.IWandRodOnUpdate;
import thaumcraft.common.items.wands.ItemWandCasting;

public class BloodStaffUpdate implements IWandRodOnUpdate {

Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]);
public class BloodStaffUpdate extends DarkWandRodOnUpdate {

public void onUpdate(ItemStack itemstack, EntityPlayer player) {
if (Compat.bm && Config.crossWand && player.ticksExisted % 25 == 0) {
try {
if (!checkHotbar(itemstack, player)) return;
if (!Compat.bm || !Config.crossWand || player.ticksExisted % 25 != 0) {
return;
}
try {
if (!checkHotbar(itemstack, player)) return;

SoulNetworkHandler.checkAndSetItemOwner(itemstack, player);
SoulNetworkHandler.checkAndSetItemOwner(itemstack, player);

int cost;
if (((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("alchemical"))
cost = Config.bloodvis - 1;
else cost = Config.bloodvis;
String capTag = ((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag();
int cost = capTag.equals("alchemical") || capTag.equals("blood_iron") ? Config.bloodvis - 1
: Config.bloodvis;

cost = Math.max(0, cost);
cost = Math.max(0, cost);

for (int x = 0; x < primals.length; x++) {
int deficit = ((ItemWandCasting) itemstack.getItem()).getMaxVis(itemstack)
- ((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primals[x]);
if (deficit > 0) {
deficit = Math.min(deficit, 100);
if (player.capabilities.isCreativeMode)
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
else if (SoulNetworkHandler.syphonFromNetwork(itemstack, cost * deficit) > 0)
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
else if (syphonHealth(player)) {
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
return;
} else return;
}
int maxVis = getMaxVis(itemstack);
for (Aspect primal : primals) {
int deficit = maxVis - ((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primal);
if (deficit <= 0) {
continue;
}
deficit = Math.min(deficit, 100);
if (player.capabilities.isCreativeMode)
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primal, 1, true);
else if (SoulNetworkHandler.syphonFromNetwork(itemstack, cost * deficit) > 0)
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primal, 1, true);
else if (syphonHealth(player)) {
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primal, 1, true);
return;
} else {
return;
}

} catch (Exception e) {
return;
}
}

} catch (Exception ignored) {}
}

public boolean syphonHealth(EntityPlayer player) {
Expand All @@ -60,14 +58,8 @@ public boolean syphonHealth(EntityPlayer player) {
player.setHealth(0);
player.onDeath(new DamageSource("blooderp"));
return true;
} else return false;
}

private boolean checkHotbar(ItemStack stack, EntityPlayer player) {
for (int x = 0; x < 9; ++x) {
ItemStack item = player.inventory.getStackInSlot(x);
if (item == stack) return true;
} else {
return false;
}
return false;
}
}
68 changes: 34 additions & 34 deletions src/main/java/fox/spiteful/forbidden/items/wands/BloodWandUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,51 +7,51 @@
import fox.spiteful.forbidden.Config;
import fox.spiteful.forbidden.compat.Compat;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.wands.IWandRodOnUpdate;
import thaumcraft.common.items.wands.ItemWandCasting;

public class BloodWandUpdate implements IWandRodOnUpdate {

Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]);
public class BloodWandUpdate extends DarkWandRodOnUpdate {

public void onUpdate(ItemStack itemstack, EntityPlayer player) {
if (Compat.bm && Config.crossWand && player.ticksExisted % 100 == 0) {
try {
SoulNetworkHandler.checkAndSetItemOwner(itemstack, player);

int cost;
if (((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("alchemical"))
cost = Config.bloodvis - 1;
else cost = Config.bloodvis;

cost = Math.max(0, cost);

for (int x = 0; x < primals.length; x++) {
int deficit = ((ItemWandCasting) itemstack.getItem()).getMaxVis(itemstack)
- ((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primals[x]);
if (deficit > 0) {
deficit = Math.min(deficit, 100);
if (player.capabilities.isCreativeMode)
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
else if (SoulNetworkHandler.syphonFromNetwork(itemstack, cost * deficit) > 0)
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
else if (syphonHealth(player)) {
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
return;
} else return;
}
}
if (!Compat.bm || !Config.crossWand || player.ticksExisted % 100 != 0) {
return;
}
try {
SoulNetworkHandler.checkAndSetItemOwner(itemstack, player);

String capTag = ((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag();
int cost = capTag.equals("alchemical") || capTag.equals("blood_iron") ? Config.bloodvis - 1
: Config.bloodvis;

cost = Math.max(0, cost);

} catch (Throwable e) {
return;
int maxVis = getMaxVis(itemstack);
for (Aspect primal : primals) {
int deficit = maxVis - ((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primal);
if (deficit <= 0) {
continue;
}
deficit = Math.min(deficit, 100);
if (player.capabilities.isCreativeMode)
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primal, 1, true);
else if (SoulNetworkHandler.syphonFromNetwork(itemstack, cost * deficit) > 0)
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primal, 1, true);
else if (syphonHealth(player)) {
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primal, 1, true);
return;
} else {
return;
}
}
}

} catch (Exception ignored) {}
}

public boolean syphonHealth(EntityPlayer player) {
if (player.getHealth() > 6) {
player.setHealth(player.getHealth() - 3);
return true;
} else return false;
} else {
return false;
}
}
}
18 changes: 5 additions & 13 deletions src/main/java/fox/spiteful/forbidden/items/wands/CreativeWandUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,15 @@
import net.minecraft.item.ItemStack;

import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.wands.IWandRodOnUpdate;
import thaumcraft.common.items.wands.ItemWandCasting;

public class CreativeWandUpdate implements IWandRodOnUpdate {

Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]);
public class CreativeWandUpdate extends DarkWandRodOnUpdate {

public void onUpdate(ItemStack itemstack, EntityPlayer player) {
for (int x = 0; x < primals.length; x++) {
if (((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primals[x])
< ((ItemWandCasting) itemstack.getItem()).getMaxVis(itemstack)) {
((ItemWandCasting) itemstack.getItem()).addVis(
itemstack,
primals[x],
((ItemWandCasting) itemstack.getItem()).getMaxVis(itemstack)
- ((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primals[x]),
true);
int maxVis = getMaxVis(itemstack);
for (Aspect primal : primals) {
if (((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primal) < maxVis) {
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primal, maxVis, true);
}
}
}
Expand Down
25 changes: 25 additions & 0 deletions src/main/java/fox/spiteful/forbidden/items/wands/DarkWandRodOnUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package fox.spiteful.forbidden.items.wands;

import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;

import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.wands.IWandRodOnUpdate;
import thaumcraft.common.items.wands.ItemWandCasting;

public abstract class DarkWandRodOnUpdate implements IWandRodOnUpdate {

static final Aspect[] primals = Aspect.getPrimalAspects().toArray(new Aspect[0]);

protected static int getMaxVis(ItemStack itemstack) {
return ((ItemWandCasting) itemstack.getItem()).getMaxVis(itemstack);
}

protected boolean checkHotbar(ItemStack stack, EntityPlayer player) {
for (int x = 0; x < 9; ++x) {
ItemStack item = player.inventory.getStackInSlot(x);
if (item == stack) return true;
}
return false;
}
}
16 changes: 7 additions & 9 deletions src/main/java/fox/spiteful/forbidden/items/wands/InfernalWandUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,24 @@
import net.minecraft.potion.Potion;

import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.wands.IWandRodOnUpdate;
import thaumcraft.common.items.wands.ItemWandCasting;

public class InfernalWandUpdate implements IWandRodOnUpdate {
public class InfernalWandUpdate extends DarkWandRodOnUpdate {

Aspect primals[] = { Aspect.ORDER, Aspect.ENTROPY, Aspect.AIR, Aspect.EARTH, Aspect.WATER };
static final Aspect[] primals = { Aspect.ORDER, Aspect.ENTROPY, Aspect.AIR, Aspect.EARTH, Aspect.WATER };

public void onUpdate(ItemStack itemstack, EntityPlayer player) {
if (player.ticksExisted % 100 == 0) {
int maxVis = getMaxVis(itemstack);
if (player.worldObj.provider.dimensionId == -1) {
for (int x = 0; x < primals.length; x++) {
if (((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primals[x])
< ((ItemWandCasting) itemstack.getItem()).getMaxVis(itemstack) / 10) {
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
for (Aspect primal : primals) {
if (((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primal) < maxVis / 10) {
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primal, 1, true);
}
}
}

if (((ItemWandCasting) itemstack.getItem()).getVis(itemstack, Aspect.FIRE)
< ((ItemWandCasting) itemstack.getItem()).getMaxVis(itemstack) / 5) {
if (((ItemWandCasting) itemstack.getItem()).getVis(itemstack, Aspect.FIRE) < maxVis / 5) {
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, Aspect.FIRE, 1, true);
}
}
Expand Down
51 changes: 22 additions & 29 deletions src/main/java/fox/spiteful/forbidden/items/wands/ManaStaffUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,40 +8,33 @@
import fox.spiteful.forbidden.Config;
import fox.spiteful.forbidden.compat.Compat;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.wands.IWandRodOnUpdate;
import thaumcraft.common.items.wands.ItemWandCasting;

public class ManaStaffUpdate implements IWandRodOnUpdate {

Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]);
public class ManaStaffUpdate extends DarkWandRodOnUpdate {

public void onUpdate(ItemStack itemstack, EntityPlayer player) {
if (Compat.am2 && Config.crossWand) {
if (player.ticksExisted % 40 == 0) {

try {
IExtendedProperties prop = ArsMagicaApi.instance.getExtendedProperties(player);

float cost;
if (((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("vinteum"))
cost = 0.5F;
else cost = 1.0F;

if (prop == null || prop.getCurrentMana() <= 0) return;
if (!Compat.am2 || !Config.crossWand || player.ticksExisted % 40 != 0) {
return;
}

for (int x = 0; x < primals.length; x++) {
int deficit = ((ItemWandCasting) itemstack.getItem()).getMaxVis(itemstack)
- ((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primals[x]);
if (deficit > 0) {
deficit = Math.min(deficit, 100);
if (prop.getCurrentMana() > cost * deficit) {
prop.setCurrentMana(prop.getCurrentMana() - cost * deficit);
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primals[x], 1, true);
}
}
}
} catch (Throwable e) {}
try {
IExtendedProperties prop = ArsMagicaApi.instance.getExtendedProperties(player);
if (prop == null || prop.getCurrentMana() <= 0) return;

float cost = ((ItemWandCasting) itemstack.getItem()).getCap(itemstack).getTag().equals("vinteum") ? 0.5F
: 1.0F;
int maxVis = getMaxVis(itemstack);
for (Aspect primal : primals) {
int deficit = maxVis - ((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primal);
if (deficit <= 0) {
continue;
}
deficit = Math.min(deficit, 100);
if (prop.getCurrentMana() > cost * deficit) {
prop.setCurrentMana(prop.getCurrentMana() - cost * deficit);
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, primal, 1, true);
}
}
}
} catch (Exception ignored) {}
}
}
Loading