创造模式下现在会无视强化点数
This commit is contained in:
parent
46f1f0f73a
commit
f544173ad0
2 changed files with 9 additions and 6 deletions
|
@ -172,12 +172,12 @@ public class ReforgingTableMenu extends AbstractContainerMenu {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPerkLevel(Perk.Type type, boolean upgrade) {
|
public void setPerkLevel(Perk.Type type, boolean upgrade, boolean isCreative) {
|
||||||
if (upgrade && this.upgradePoint.get() <= 0) {
|
if (upgrade && this.upgradePoint.get() <= 0 && !isCreative) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!upgrade && this.upgradePoint.get() >= 100) {
|
if (!upgrade && this.upgradePoint.get() >= 100 && !isCreative) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -190,8 +190,10 @@ public class ReforgingTableMenu extends AbstractContainerMenu {
|
||||||
this.damagePerkLevel.set(upgrade ? Math.min(10, this.damagePerkLevel.get() + 1) : Math.max(1, this.damagePerkLevel.get() - 1));
|
this.damagePerkLevel.set(upgrade ? Math.min(10, this.damagePerkLevel.get() + 1) : Math.max(1, this.damagePerkLevel.get() - 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!isCreative) {
|
||||||
this.upgradePoint.set(Mth.clamp(this.upgradePoint.get() + (upgrade ? -1 : 1), 0, 100));
|
this.upgradePoint.set(Mth.clamp(this.upgradePoint.get() + (upgrade ? -1 : 1), 0, 100));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void handleUpgradePoint(ItemStack stack) {
|
public void handleUpgradePoint(ItemStack stack) {
|
||||||
if (!(stack.getItem() instanceof GunItem)) {
|
if (!(stack.getItem() instanceof GunItem)) {
|
||||||
|
@ -285,7 +287,8 @@ public class ReforgingTableMenu extends AbstractContainerMenu {
|
||||||
|
|
||||||
ItemStack output = gun.copy();
|
ItemStack output = gun.copy();
|
||||||
PerkHelper.removePerkByType(output, perkItem.getPerk().type);
|
PerkHelper.removePerkByType(output, perkItem.getPerk().type);
|
||||||
output.getOrCreateTag().putDouble("UpgradePoint", Math.min(100, level + output.getOrCreateTag().getDouble("UpgradePoint")));
|
output.getOrCreateTag().putDouble("UpgradePoint", Math.min(100, level - 1 + output.getOrCreateTag().getDouble("UpgradePoint")));
|
||||||
|
this.upgradePoint.set((int) output.getOrCreateTag().getDouble("UpgradePoint"));
|
||||||
|
|
||||||
this.container.setItem(INPUT_SLOT, output);
|
this.container.setItem(INPUT_SLOT, output);
|
||||||
this.container.setChanged();
|
this.container.setChanged();
|
||||||
|
|
|
@ -40,7 +40,7 @@ public class SetPerkLevelMessage {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
menu.setPerkLevel(Perk.Type.values()[message.type], message.add);
|
menu.setPerkLevel(Perk.Type.values()[message.type], message.add, player.getAbilities().instabuild);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
ctx.get().setPacketHandled(true);
|
ctx.get().setPacketHandled(true);
|
||||||
|
|
Loading…
Add table
Reference in a new issue