Added totem charging functionality to StrawTotemItem. Changed getMaxCharge() method to be global.
This commit is contained in:
@ -3,6 +3,7 @@ package dev.micle.totemofreviving.item;
|
|||||||
import dev.micle.totemofreviving.TotemOfReviving;
|
import dev.micle.totemofreviving.TotemOfReviving;
|
||||||
import dev.micle.totemofreviving.config.Config;
|
import dev.micle.totemofreviving.config.Config;
|
||||||
import dev.micle.totemofreviving.network.ChangeTargetPacket;
|
import dev.micle.totemofreviving.network.ChangeTargetPacket;
|
||||||
|
import dev.micle.totemofreviving.network.ChargeTotemPacket;
|
||||||
import dev.micle.totemofreviving.network.Network;
|
import dev.micle.totemofreviving.network.Network;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.util.ITooltipFlag;
|
import net.minecraft.client.util.ITooltipFlag;
|
||||||
@ -102,7 +103,7 @@ public class StrawTotemItem extends Item {
|
|||||||
Network.channel.sendToServer(new ChangeTargetPacket(hand));
|
Network.channel.sendToServer(new ChangeTargetPacket(hand));
|
||||||
} else {
|
} else {
|
||||||
if (charge.getItem() instanceof StrawChargeItem) {
|
if (charge.getItem() instanceof StrawChargeItem) {
|
||||||
// Charge totem
|
Network.channel.sendToServer(new ChargeTotemPacket(hand));
|
||||||
}
|
}
|
||||||
// Revive target
|
// Revive target
|
||||||
//totem.hurtAndBreak(1, sender, e -> e.broadcastBreakEvent(packet.hand));
|
//totem.hurtAndBreak(1, sender, e -> e.broadcastBreakEvent(packet.hand));
|
||||||
@ -110,8 +111,7 @@ public class StrawTotemItem extends Item {
|
|||||||
return super.use(world, playerEntity, hand);
|
return super.use(world, playerEntity, hand);
|
||||||
}
|
}
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
public static int getMaxCharge() {
|
||||||
private int getMaxCharge() {
|
|
||||||
if (Config.Server.getStrawTotemConfig().getChargeCost() == -1) {
|
if (Config.Server.getStrawTotemConfig().getChargeCost() == -1) {
|
||||||
return Config.Server.getStrawTotemConfig().getChargeCostLimit();
|
return Config.Server.getStrawTotemConfig().getChargeCostLimit();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user