Initial 1.11.2 update
This commit is contained in:
@@ -34,19 +34,20 @@ public class ContainerArcaneWorkbench extends Container {
|
||||
/** The arcane workbench tile entity associated with this container. */
|
||||
public TileEntityArcaneWorkbench tileentity;
|
||||
|
||||
public static final ResourceLocation EMPTY_SLOT_CRYSTAL = new ResourceLocation(Wizardry.MODID, "gui/empty_slot_crystal");
|
||||
public static final ResourceLocation EMPTY_SLOT_UPGRADE = new ResourceLocation(Wizardry.MODID, "gui/empty_slot_upgrade");
|
||||
public static final ResourceLocation EMPTY_SLOT_CRYSTAL = new ResourceLocation(Wizardry.MODID,
|
||||
"gui/empty_slot_crystal");
|
||||
public static final ResourceLocation EMPTY_SLOT_UPGRADE = new ResourceLocation(Wizardry.MODID,
|
||||
"gui/empty_slot_upgrade");
|
||||
|
||||
public static final int CRYSTAL_SLOT = 8;
|
||||
public static final int WAND_SLOT = 9;
|
||||
public static final int UPGRADE_SLOT = 10;
|
||||
|
||||
|
||||
private static final int[][][] SPELL_BOOK_SLOT_COORDS = {
|
||||
{{80, 22}, {121, 51}, {106, 98}, {54, 98}, {39, 51}, {-999, -999}, {-999, -999}, {-999, -999}},
|
||||
{{80, 22}, {117, 43}, {117, 85}, {80, 106}, {43, 85}, {43, 43}, {-999, -999}, {-999, -999}},
|
||||
{{80, 22}, {113, 38}, {121, 74}, {98, 102}, {62, 102}, {39, 74}, {47, 38}, {-999, -999}},
|
||||
{{80, 22}, {111, 33}, {122, 64}, {111, 95}, {80, 106}, {49, 95}, {38, 64}, {49, 33}}
|
||||
};
|
||||
{{80, 22}, {111, 33}, {122, 64}, {111, 95}, {80, 106}, {49, 95}, {38, 64}, {49, 33}}};
|
||||
|
||||
public ContainerArcaneWorkbench(IInventory inventory, TileEntityArcaneWorkbench tileentity){
|
||||
|
||||
@@ -54,12 +55,12 @@ public class ContainerArcaneWorkbench extends Container {
|
||||
|
||||
ItemStack wand = tileentity.getStackInSlot(WAND_SLOT);
|
||||
|
||||
for(int i=0; i<8; i++){
|
||||
for(int i = 0; i < 8; i++){
|
||||
this.addSlotToContainer(new SlotItemList(tileentity, i, -999, -999, 1, WizardryItems.spell_book));
|
||||
}
|
||||
|
||||
this.addSlotToContainer(new SlotItemList(tileentity, CRYSTAL_SLOT, 8, 88, 64, WizardryItems.magic_crystal))
|
||||
.setBackgroundName(EMPTY_SLOT_CRYSTAL.toString());
|
||||
.setBackgroundName(EMPTY_SLOT_CRYSTAL.toString());
|
||||
|
||||
this.addSlotToContainer(new SlotWandArmour(tileentity, WAND_SLOT, 80, 64, this));
|
||||
|
||||
@@ -68,7 +69,7 @@ public class ContainerArcaneWorkbench extends Container {
|
||||
upgrades.add(WizardryItems.armour_upgrade);
|
||||
|
||||
this.addSlotToContainer(new SlotItemList(tileentity, UPGRADE_SLOT, 8, 106, 1, upgrades.toArray(new Item[0])))
|
||||
.setBackgroundName(EMPTY_SLOT_UPGRADE.toString());
|
||||
.setBackgroundName(EMPTY_SLOT_UPGRADE.toString());
|
||||
|
||||
for(int x = 0; x < 9; x++){
|
||||
this.addSlotToContainer(new Slot(inventory, x, 8 + x * 18, 196));
|
||||
@@ -85,7 +86,7 @@ public class ContainerArcaneWorkbench extends Container {
|
||||
|
||||
@Override
|
||||
public boolean canInteractWith(EntityPlayer player){
|
||||
return this.tileentity.isUseableByPlayer(player);
|
||||
return this.tileentity.isUsableByPlayer(player);
|
||||
}
|
||||
|
||||
/** Called from the central wand/armour slot when its item is changed or removed. */
|
||||
@@ -94,21 +95,21 @@ public class ContainerArcaneWorkbench extends Container {
|
||||
|
||||
if(slotNumber == WAND_SLOT){
|
||||
|
||||
if(stack == null || (!(stack.getItem() instanceof ItemWand) && stack.getItem() != WizardryItems.blank_scroll)){
|
||||
if(!(stack.getItem() instanceof ItemWand) && stack.getItem() != WizardryItems.blank_scroll){
|
||||
// If the stack has been removed
|
||||
for(int i=0; i<CRYSTAL_SLOT; i++){
|
||||
for(int i = 0; i < CRYSTAL_SLOT; i++){
|
||||
Slot slot1 = this.getSlot(i);
|
||||
// 'Removes' the slot from the container (moves it off the screen)
|
||||
slot1.xDisplayPosition = -100;
|
||||
slot1.yDisplayPosition = -100;
|
||||
slot1.xPos = -100;
|
||||
slot1.yPos = -100;
|
||||
|
||||
ItemStack stack1 = slot1.getStack();
|
||||
// This doesn't cause an infinite loop because slot i can never be a SlotWandArmour. In effect, it's
|
||||
// exactly the same as shift-clicking the slot, so why re-invent the wheel?
|
||||
ItemStack remainder = this.transferStackInSlot(player, i);
|
||||
|
||||
if(remainder == null && stack1 != null){
|
||||
slot1.putStack(null);
|
||||
if(remainder == ItemStack.EMPTY && stack1 != ItemStack.EMPTY){
|
||||
slot1.putStack(ItemStack.EMPTY);
|
||||
// The second parameter is never used...
|
||||
if(player != null) player.dropItem(stack1, false);
|
||||
}
|
||||
@@ -119,24 +120,25 @@ public class ContainerArcaneWorkbench extends Container {
|
||||
if(stack.getItem() == WizardryItems.blank_scroll){
|
||||
// If a blank scroll is added
|
||||
// The first slot is shown
|
||||
this.getSlot(0).xDisplayPosition = SPELL_BOOK_SLOT_COORDS[0][0][0];
|
||||
this.getSlot(0).yDisplayPosition = SPELL_BOOK_SLOT_COORDS[0][0][1];
|
||||
this.getSlot(0).xPos = SPELL_BOOK_SLOT_COORDS[0][0][0];
|
||||
this.getSlot(0).yPos = SPELL_BOOK_SLOT_COORDS[0][0][1];
|
||||
|
||||
// The rest of the slots are hidden
|
||||
for(int i=1; i<CRYSTAL_SLOT; i++){
|
||||
for(int i = 1; i < CRYSTAL_SLOT; i++){
|
||||
|
||||
Slot slot1 = this.getSlot(i);
|
||||
|
||||
slot1.xDisplayPosition = -100;
|
||||
slot1.yDisplayPosition = -100;
|
||||
slot1.xPos = -100;
|
||||
slot1.yPos = -100;
|
||||
|
||||
ItemStack stack1 = slot1.getStack();
|
||||
// This doesn't cause an infinite loop because slot i can never be a SlotWandArmour. In effect, it's
|
||||
// This doesn't cause an infinite loop because slot i can never be a SlotWandArmour. In effect,
|
||||
// it's
|
||||
// exactly the same as shift-clicking the slot, so why re-invent the wheel?
|
||||
ItemStack remainder = this.transferStackInSlot(player, i);
|
||||
|
||||
if(remainder == null && stack1 != null){
|
||||
slot1.putStack(null);
|
||||
if(remainder == ItemStack.EMPTY && stack1 != ItemStack.EMPTY){
|
||||
slot1.putStack(ItemStack.EMPTY);
|
||||
// The second parameter is never used...
|
||||
if(player != null) player.dropItem(stack1, false);
|
||||
}
|
||||
@@ -144,25 +146,26 @@ public class ContainerArcaneWorkbench extends Container {
|
||||
|
||||
}else{
|
||||
|
||||
for(int i=0; i<CRYSTAL_SLOT; i++){
|
||||
for(int i = 0; i < CRYSTAL_SLOT; i++){
|
||||
|
||||
int n = WandHelper.getUpgradeLevel(stack, WizardryItems.attunement_upgrade);
|
||||
int[] coords = SPELL_BOOK_SLOT_COORDS[n][i];
|
||||
|
||||
Slot slot1 = this.getSlot(i);
|
||||
// Puts the slot back in the correct position
|
||||
slot1.xDisplayPosition = coords[0];
|
||||
slot1.yDisplayPosition = coords[1];
|
||||
slot1.xPos = coords[0];
|
||||
slot1.yPos = coords[1];
|
||||
|
||||
if(slot1.xDisplayPosition < 0 || slot1.yDisplayPosition < 0){
|
||||
if(slot1.xPos < 0 || slot1.yPos < 0){
|
||||
|
||||
ItemStack stack1 = slot1.getStack();
|
||||
// This doesn't cause an infinite loop because slot i can never be a SlotWandArmour. In effect, it's
|
||||
// This doesn't cause an infinite loop because slot i can never be a SlotWandArmour. In
|
||||
// effect, it's
|
||||
// exactly the same as shift-clicking the slot, so why re-invent the wheel?
|
||||
ItemStack remainder = this.transferStackInSlot(player, i);
|
||||
|
||||
if(remainder == null && stack1 != null){
|
||||
slot1.putStack(null);
|
||||
if(remainder == ItemStack.EMPTY && stack1 != ItemStack.EMPTY){
|
||||
slot1.putStack(ItemStack.EMPTY);
|
||||
// The second parameter is never used...
|
||||
if(player != null) player.dropItem(stack1, false);
|
||||
}
|
||||
@@ -178,21 +181,20 @@ public class ContainerArcaneWorkbench extends Container {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack transferStackInSlot(EntityPlayer player, int clickedSlotId)
|
||||
{
|
||||
ItemStack remainder = null;
|
||||
public ItemStack transferStackInSlot(EntityPlayer player, int clickedSlotId){
|
||||
|
||||
ItemStack remainder = ItemStack.EMPTY;
|
||||
Slot slot = (Slot)this.inventorySlots.get(clickedSlotId);
|
||||
|
||||
if (slot != null && slot.getHasStack())
|
||||
{
|
||||
if(slot != null && slot.getHasStack()){
|
||||
ItemStack stack = slot.getStack(); // The stack that was there originally
|
||||
remainder = stack.copy(); // A copy of that stack
|
||||
|
||||
// Workbench -> inventory
|
||||
if(clickedSlotId <= UPGRADE_SLOT){
|
||||
// Tries to move the stack into the player's inventory. If this fails...
|
||||
if (!this.mergeItemStack(stack, UPGRADE_SLOT + 1, this.inventorySlots.size(), true)){
|
||||
return null; // ...nothing else happens.
|
||||
if(!this.mergeItemStack(stack, UPGRADE_SLOT + 1, this.inventorySlots.size(), true)){
|
||||
return ItemStack.EMPTY; // ...nothing else happens.
|
||||
}
|
||||
}
|
||||
// Inventory -> workbench
|
||||
@@ -203,48 +205,39 @@ public class ContainerArcaneWorkbench extends Container {
|
||||
|
||||
if(stack.getItem() instanceof ItemSpellBook){
|
||||
minSlotId = 0;
|
||||
maxSlotId = CRYSTAL_SLOT-1;
|
||||
}
|
||||
else if(stack.getItem() == WizardryItems.magic_crystal){
|
||||
maxSlotId = CRYSTAL_SLOT - 1;
|
||||
}else if(stack.getItem() == WizardryItems.magic_crystal){
|
||||
minSlotId = CRYSTAL_SLOT;
|
||||
maxSlotId = CRYSTAL_SLOT;
|
||||
}
|
||||
else if(stack.getItem() instanceof ItemWand || stack.getItem() instanceof ItemWizardArmour
|
||||
}else if(stack.getItem() instanceof ItemWand || stack.getItem() instanceof ItemWizardArmour
|
||||
|| stack.getItem() == WizardryItems.blank_scroll){
|
||||
minSlotId = WAND_SLOT;
|
||||
maxSlotId = WAND_SLOT;
|
||||
}
|
||||
else if(stack.getItem() instanceof ItemArcaneTome
|
||||
|| stack.getItem() instanceof ItemArmourUpgrade
|
||||
}else if(stack.getItem() instanceof ItemArcaneTome || stack.getItem() instanceof ItemArmourUpgrade
|
||||
|| WandHelper.isWandUpgrade(stack.getItem())){
|
||||
minSlotId = UPGRADE_SLOT;
|
||||
maxSlotId = UPGRADE_SLOT;
|
||||
}
|
||||
else{
|
||||
return null; // If none of the above cases were true, then the item won't fit in the workbench.
|
||||
}else{
|
||||
return ItemStack.EMPTY; // If none of the above cases were true, then the item won't fit in the
|
||||
// workbench.
|
||||
}
|
||||
|
||||
if(!this.mergeItemStack(stack, minSlotId, maxSlotId + 1, false))
|
||||
{
|
||||
return null;
|
||||
if(!this.mergeItemStack(stack, minSlotId, maxSlotId + 1, false)){
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
}
|
||||
|
||||
if (stack.stackSize == 0)
|
||||
{
|
||||
slot.putStack((ItemStack)null);
|
||||
}
|
||||
else
|
||||
{
|
||||
if(stack.getCount() == 0){
|
||||
slot.putStack(ItemStack.EMPTY);
|
||||
}else{
|
||||
slot.onSlotChanged();
|
||||
}
|
||||
|
||||
if (stack.stackSize == remainder.stackSize)
|
||||
{
|
||||
return null;
|
||||
if(stack.getCount() == remainder.getCount()){
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
|
||||
slot.onPickupFromSlot(player, stack);
|
||||
slot.onTake(player, stack);
|
||||
}
|
||||
|
||||
return remainder;
|
||||
@@ -252,11 +245,11 @@ public class ContainerArcaneWorkbench extends Container {
|
||||
|
||||
// Overridden to stop stacks merging into 'removed' slots.
|
||||
@Override
|
||||
protected boolean mergeItemStack(ItemStack stack, int minSlotID, int maxSlotID, boolean p_75135_4_) {
|
||||
protected boolean mergeItemStack(ItemStack stack, int minSlotID, int maxSlotID, boolean p_75135_4_){
|
||||
|
||||
for(int i=minSlotID; i<maxSlotID; i++){
|
||||
//System.out.println(this.getSlot(i).xDisplayPosition);
|
||||
if(this.getSlot(i).xDisplayPosition >= 0 && this.getSlot(i).yDisplayPosition >= 0 && !this.getSlot(i).getHasStack()){
|
||||
for(int i = minSlotID; i < maxSlotID; i++){
|
||||
// System.out.println(this.getSlot(i).xDisplayPosition);
|
||||
if(this.getSlot(i).xPos >= 0 && this.getSlot(i).yPos >= 0 && !this.getSlot(i).getHasStack()){
|
||||
return super.mergeItemStack(stack, minSlotID, maxSlotID, p_75135_4_);
|
||||
}
|
||||
}
|
||||
@@ -264,15 +257,17 @@ public class ContainerArcaneWorkbench extends Container {
|
||||
return false;
|
||||
}
|
||||
|
||||
/** Called (via {@link electroblob.wizardry.packet.PacketControlInput PacketControlInput}) when the apply button
|
||||
* in the arcane workbench GUI is pressed. */
|
||||
/**
|
||||
* Called (via {@link electroblob.wizardry.packet.PacketControlInput PacketControlInput}) when the apply button in
|
||||
* the arcane workbench GUI is pressed.
|
||||
*/
|
||||
// All operations on the items contained in the inventory simply call the corresponding methods in the tileentity.
|
||||
// As of 2.1, for the sake of events and neatness of code, this was moved here from TileEntityArcaneWorkbench.
|
||||
public void onApplyButtonPressed(EntityPlayer player){
|
||||
|
||||
ItemStack wand = this.getSlot(WAND_SLOT).getStack();
|
||||
ItemStack[] spellBooks = new ItemStack[CRYSTAL_SLOT];
|
||||
for(int i=0; i<spellBooks.length; i++){
|
||||
for(int i = 0; i < spellBooks.length; i++){
|
||||
spellBooks[i] = this.getSlot(i).getStack();
|
||||
}
|
||||
ItemStack crystals = this.getSlot(CRYSTAL_SLOT).getStack();
|
||||
@@ -281,105 +276,108 @@ public class ContainerArcaneWorkbench extends Container {
|
||||
if(MinecraftForge.EVENT_BUS.post(new SpellBindEvent(player, this))) return;
|
||||
|
||||
// Since the workbench now accepts armour as well as wands, this check is needed.
|
||||
if(wand != null && wand.getItem() instanceof ItemWand){
|
||||
if(wand.getItem() instanceof ItemWand){
|
||||
|
||||
// Upgrades wand if necessary. Damage is copied, preserving remaining durability,
|
||||
// and also the entire NBT tag compound.
|
||||
if(upgrade != null){
|
||||
if(upgrade.getItem() == WizardryItems.arcane_tome){
|
||||
|
||||
if(upgrade.getItem() == WizardryItems.arcane_tome){
|
||||
ItemStack newWand;
|
||||
|
||||
ItemStack newWand;
|
||||
switch(Tier.values()[upgrade.getItemDamage()]){
|
||||
|
||||
switch(Tier.values()[upgrade.getItemDamage()]){
|
||||
case APPRENTICE:
|
||||
if(((ItemWand)wand.getItem()).tier == Tier.BASIC){
|
||||
newWand = new ItemStack(WizardryUtilities.getWand(Tier.values()[upgrade.getItemDamage()],
|
||||
((ItemWand)wand.getItem()).element));
|
||||
newWand.setTagCompound(wand.getTagCompound());
|
||||
// This needs to be done after copying the tag compound so the max damage for the new wand
|
||||
// takes storage
|
||||
// upgrades into account.
|
||||
newWand.setItemDamage(newWand.getMaxDamage() - (wand.getMaxDamage() - wand.getItemDamage()));
|
||||
this.putStackInSlot(WAND_SLOT, newWand);
|
||||
this.putStackInSlot(UPGRADE_SLOT, ItemStack.EMPTY);
|
||||
player.addStat(WizardryAchievements.apprentice, 1);
|
||||
}
|
||||
break;
|
||||
|
||||
case APPRENTICE:
|
||||
if(((ItemWand)wand.getItem()).tier == Tier.BASIC){
|
||||
newWand = new ItemStack(WizardryUtilities.getWand(Tier.values()[upgrade.getItemDamage()], ((ItemWand)wand.getItem()).element));
|
||||
newWand.setTagCompound(wand.getTagCompound());
|
||||
// This needs to be done after copying the tag compound so the max damage for the new wand takes storage
|
||||
// upgrades into account.
|
||||
newWand.setItemDamage(newWand.getMaxDamage() - (wand.getMaxDamage() - wand.getItemDamage()));
|
||||
this.putStackInSlot(WAND_SLOT, newWand);
|
||||
this.putStackInSlot(UPGRADE_SLOT, null);
|
||||
player.addStat(WizardryAchievements.apprentice, 1);
|
||||
case ADVANCED:
|
||||
if(((ItemWand)wand.getItem()).tier == Tier.APPRENTICE){
|
||||
newWand = new ItemStack(WizardryUtilities.getWand(Tier.values()[upgrade.getItemDamage()],
|
||||
((ItemWand)wand.getItem()).element));
|
||||
newWand.setTagCompound(wand.getTagCompound());
|
||||
newWand.setItemDamage(newWand.getMaxDamage() - (wand.getMaxDamage() - wand.getItemDamage()));
|
||||
this.putStackInSlot(WAND_SLOT, newWand);
|
||||
this.putStackInSlot(UPGRADE_SLOT, ItemStack.EMPTY);
|
||||
}
|
||||
break;
|
||||
|
||||
case MASTER:
|
||||
if(((ItemWand)wand.getItem()).tier == Tier.ADVANCED){
|
||||
newWand = new ItemStack(WizardryUtilities.getWand(Tier.values()[upgrade.getItemDamage()],
|
||||
((ItemWand)wand.getItem()).element));
|
||||
newWand.setTagCompound(wand.getTagCompound());
|
||||
newWand.setItemDamage(newWand.getMaxDamage() - (wand.getMaxDamage() - wand.getItemDamage()));
|
||||
this.putStackInSlot(WAND_SLOT, newWand);
|
||||
this.putStackInSlot(UPGRADE_SLOT, ItemStack.EMPTY);
|
||||
player.addStat(WizardryAchievements.master, 1);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// This needs to happen so the charging works on the new wand, not the old one.
|
||||
wand = this.getSlot(WAND_SLOT).getStack();
|
||||
|
||||
}else{
|
||||
|
||||
// Special upgrades
|
||||
|
||||
// Used to preserve existing mana when upgrading storage rather than creating free mana.
|
||||
int prevMana = wand.getMaxDamage() - wand.getItemDamage();
|
||||
|
||||
if(WandHelper.getTotalUpgrades(wand) < ((ItemWand)wand.getItem()).tier.upgradeLimit
|
||||
&& WandHelper.getUpgradeLevel(wand, upgrade.getItem()) < Constants.UPGRADE_STACK_LIMIT){
|
||||
|
||||
WandHelper.applyUpgrade(wand, upgrade.getItem());
|
||||
|
||||
// Special behaviours for specific upgrades
|
||||
if(upgrade.getItem() == WizardryItems.storage_upgrade){
|
||||
wand.setItemDamage(wand.getMaxDamage() - prevMana);
|
||||
}
|
||||
if(upgrade.getItem() == WizardryItems.attunement_upgrade){
|
||||
|
||||
Spell[] spells = WandHelper.getSpells(wand);
|
||||
Spell[] newSpells = new Spell[5
|
||||
+ WandHelper.getUpgradeLevel(wand, WizardryItems.attunement_upgrade)];
|
||||
|
||||
for(int i = 0; i < newSpells.length; i++){
|
||||
// Prevents both NPEs and AIOOBEs
|
||||
newSpells[i] = i < spells.length && spells[i] != null ? spells[i] : Spells.none;
|
||||
}
|
||||
break;
|
||||
|
||||
case ADVANCED:
|
||||
if(((ItemWand)wand.getItem()).tier == Tier.APPRENTICE){
|
||||
newWand = new ItemStack(WizardryUtilities.getWand(Tier.values()[upgrade.getItemDamage()], ((ItemWand)wand.getItem()).element));
|
||||
newWand.setTagCompound(wand.getTagCompound());
|
||||
newWand.setItemDamage(newWand.getMaxDamage() - (wand.getMaxDamage() - wand.getItemDamage()));
|
||||
this.putStackInSlot(WAND_SLOT, newWand);
|
||||
this.putStackInSlot(UPGRADE_SLOT, null);
|
||||
WandHelper.setSpells(wand, newSpells);
|
||||
|
||||
int[] cooldown = WandHelper.getCooldowns(wand);
|
||||
int[] newCooldown = new int[5
|
||||
+ WandHelper.getUpgradeLevel(wand, WizardryItems.attunement_upgrade)];
|
||||
|
||||
if(cooldown.length > 0){
|
||||
for(int i = 0; i < cooldown.length; i++){
|
||||
newCooldown[i] = cooldown[i];
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case MASTER:
|
||||
if(((ItemWand)wand.getItem()).tier == Tier.ADVANCED){
|
||||
newWand = new ItemStack(WizardryUtilities.getWand(Tier.values()[upgrade.getItemDamage()], ((ItemWand)wand.getItem()).element));
|
||||
newWand.setTagCompound(wand.getTagCompound());
|
||||
newWand.setItemDamage(newWand.getMaxDamage() - (wand.getMaxDamage() - wand.getItemDamage()));
|
||||
this.putStackInSlot(WAND_SLOT, newWand);
|
||||
this.putStackInSlot(UPGRADE_SLOT, null);
|
||||
player.addStat(WizardryAchievements.master, 1);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
WandHelper.setCooldowns(wand, newCooldown);
|
||||
}
|
||||
|
||||
// This needs to happen so the charging works on the new wand, not the old one.
|
||||
wand = this.getSlot(WAND_SLOT).getStack();
|
||||
this.getSlot(UPGRADE_SLOT).decrStackSize(1);
|
||||
player.addStat(WizardryAchievements.special_upgrade, 1);
|
||||
|
||||
}else{
|
||||
|
||||
// Special upgrades
|
||||
|
||||
// Used to preserve existing mana when upgrading storage rather than creating free mana.
|
||||
int prevMana = wand.getMaxDamage() - wand.getItemDamage();
|
||||
|
||||
if(WandHelper.getTotalUpgrades(wand) < ((ItemWand)wand.getItem()).tier.upgradeLimit
|
||||
&& WandHelper.getUpgradeLevel(wand, upgrade.getItem()) < Constants.UPGRADE_STACK_LIMIT){
|
||||
|
||||
WandHelper.applyUpgrade(wand, upgrade.getItem());
|
||||
|
||||
// Special behaviours for specific upgrades
|
||||
if(upgrade.getItem() == WizardryItems.storage_upgrade){
|
||||
wand.setItemDamage(wand.getMaxDamage() - prevMana);
|
||||
}
|
||||
if(upgrade.getItem() == WizardryItems.attunement_upgrade){
|
||||
|
||||
Spell[] spells = WandHelper.getSpells(wand);
|
||||
Spell[] newSpells = new Spell[5 + WandHelper.getUpgradeLevel(wand, WizardryItems.attunement_upgrade)];
|
||||
|
||||
for(int i=0; i<newSpells.length; i++){
|
||||
// Prevents both NPEs and AIOOBEs
|
||||
newSpells[i] = i < spells.length && spells[i] != null ? spells[i] : Spells.none;
|
||||
}
|
||||
|
||||
WandHelper.setSpells(wand, newSpells);
|
||||
|
||||
int[] cooldown = WandHelper.getCooldowns(wand);
|
||||
int[] newCooldown = new int[5 + WandHelper.getUpgradeLevel(wand, WizardryItems.attunement_upgrade)];
|
||||
|
||||
if(cooldown.length > 0){
|
||||
for(int i=0; i<cooldown.length; i++){
|
||||
newCooldown[i] = cooldown[i];
|
||||
}
|
||||
}
|
||||
|
||||
WandHelper.setCooldowns(wand, newCooldown);
|
||||
}
|
||||
|
||||
this.getSlot(UPGRADE_SLOT).decrStackSize(1);
|
||||
player.addStat(WizardryAchievements.special_upgrade, 1);
|
||||
|
||||
if(WandHelper.getTotalUpgrades(wand) == Tier.MASTER.upgradeLimit){
|
||||
player.addStat(WizardryAchievements.max_out_wand, 1);
|
||||
}
|
||||
if(WandHelper.getTotalUpgrades(wand) == Tier.MASTER.upgradeLimit){
|
||||
player.addStat(WizardryAchievements.max_out_wand, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -394,65 +392,72 @@ public class ContainerArcaneWorkbench extends Container {
|
||||
// 5 here because if the spell array doesn't exist, the wand can't possibly have attunement upgrades
|
||||
spells = new Spell[5];
|
||||
}
|
||||
for(int i=0; i<spells.length; i++){
|
||||
if(spellBooks[i] != null && !(Spell.get(spellBooks[i].getItemDamage()).tier.level > ((ItemWand)wand.getItem()).tier.level)){
|
||||
for(int i = 0; i < spells.length; i++){
|
||||
if(spellBooks[i] != ItemStack.EMPTY && !(Spell
|
||||
.get(spellBooks[i].getItemDamage()).tier.level > ((ItemWand)wand.getItem()).tier.level)){
|
||||
spells[i] = Spell.get(spellBooks[i].getItemDamage());
|
||||
}
|
||||
}
|
||||
WandHelper.setSpells(wand, spells);
|
||||
|
||||
// Charges wand by appropriate amount
|
||||
if(crystals != null){
|
||||
if(crystals != ItemStack.EMPTY){
|
||||
int chargeDepleted = wand.getItemDamage();
|
||||
//System.out.println("Charge depleted: " + chargeDepleted);
|
||||
//System.out.println("Crystals found: " + crystals.stackSize);
|
||||
if(crystals.stackSize * Constants.MANA_PER_CRYSTAL < chargeDepleted){
|
||||
//System.out.println("charging");
|
||||
wand.setItemDamage(chargeDepleted - crystals.stackSize * Constants.MANA_PER_CRYSTAL);
|
||||
this.getSlot(CRYSTAL_SLOT).decrStackSize(crystals.stackSize);
|
||||
// System.out.println("Charge depleted: " + chargeDepleted);
|
||||
// System.out.println("Crystals found: " + crystals.getCount());
|
||||
if(crystals.getCount() * Constants.MANA_PER_CRYSTAL < chargeDepleted){
|
||||
// System.out.println("charging");
|
||||
wand.setItemDamage(chargeDepleted - crystals.getCount() * Constants.MANA_PER_CRYSTAL);
|
||||
this.getSlot(CRYSTAL_SLOT).decrStackSize(crystals.getCount());
|
||||
}else if(chargeDepleted != 0){
|
||||
//System.out.println((int)Math.ceil(((double)chargeDepleted)/50));
|
||||
this.getSlot(CRYSTAL_SLOT).decrStackSize((int)Math.ceil(((double)chargeDepleted)/Constants.MANA_PER_CRYSTAL));
|
||||
// System.out.println((int)Math.ceil(((double)chargeDepleted)/50));
|
||||
this.getSlot(CRYSTAL_SLOT)
|
||||
.decrStackSize((int)Math.ceil(((double)chargeDepleted) / Constants.MANA_PER_CRYSTAL));
|
||||
wand.setItemDamage(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Armour
|
||||
else if(wand != null && wand.getItem() instanceof ItemWizardArmour){
|
||||
else if(wand.getItem() instanceof ItemWizardArmour){
|
||||
// Applies legendary upgrade
|
||||
if(upgrade != null && upgrade.getItem() == WizardryItems.armour_upgrade){
|
||||
if(upgrade.getItem() == WizardryItems.armour_upgrade){
|
||||
if(!wand.hasTagCompound()){
|
||||
wand.setTagCompound(new NBTTagCompound());
|
||||
}
|
||||
if(!wand.getTagCompound().hasKey("legendary")){
|
||||
wand.getTagCompound().setBoolean("legendary", true);
|
||||
this.putStackInSlot(UPGRADE_SLOT, null);
|
||||
this.putStackInSlot(UPGRADE_SLOT, ItemStack.EMPTY);
|
||||
player.addStat(WizardryAchievements.legendary);
|
||||
}
|
||||
}
|
||||
// Charges armour by appropriate amount
|
||||
if(crystals != null){
|
||||
if(crystals != ItemStack.EMPTY){
|
||||
int chargeDepleted = wand.getItemDamage();
|
||||
if(crystals.stackSize * Constants.MANA_PER_CRYSTAL < chargeDepleted){
|
||||
wand.setItemDamage(chargeDepleted - crystals.stackSize * Constants.MANA_PER_CRYSTAL);
|
||||
this.getSlot(CRYSTAL_SLOT).decrStackSize(crystals.stackSize);
|
||||
if(crystals.getCount() * Constants.MANA_PER_CRYSTAL < chargeDepleted){
|
||||
wand.setItemDamage(chargeDepleted - crystals.getCount() * Constants.MANA_PER_CRYSTAL);
|
||||
this.getSlot(CRYSTAL_SLOT).decrStackSize(crystals.getCount());
|
||||
}else if(chargeDepleted != 0){
|
||||
this.getSlot(CRYSTAL_SLOT).decrStackSize((int)Math.ceil(((double)chargeDepleted)/Constants.MANA_PER_CRYSTAL));
|
||||
this.getSlot(CRYSTAL_SLOT)
|
||||
.decrStackSize((int)Math.ceil(((double)chargeDepleted) / Constants.MANA_PER_CRYSTAL));
|
||||
wand.setItemDamage(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Scrolls
|
||||
else if(wand != null && wand.getItem() == WizardryItems.blank_scroll){
|
||||
// Spells can only be bound to scrolls if the player has already cast them (prevents casting of master spells without getting a master wand)
|
||||
// This restriction does not apply in creative mode
|
||||
if(spellBooks[0] != null && (player.capabilities.isCreativeMode || (WizardData.get(player) != null
|
||||
&& WizardData.get(player).hasSpellBeenDiscovered(Spell.get(spellBooks[0].getItemDamage()))))
|
||||
&& crystals != null && crystals.stackSize * Constants.MANA_PER_CRYSTAL > Spell.get(spellBooks[0].getItemDamage()).cost){
|
||||
|
||||
this.getSlot(CRYSTAL_SLOT).decrStackSize((int)Math.ceil(((double)Spell.get(spellBooks[0].getItemDamage()).cost)/Constants.MANA_PER_CRYSTAL));
|
||||
// Scrolls
|
||||
else if(wand.getItem() == WizardryItems.blank_scroll){
|
||||
// Spells can only be bound to scrolls if the player has already cast them (prevents casting of master
|
||||
// spells without getting a master wand)
|
||||
// This restriction does not apply in creative mode
|
||||
if(spellBooks[0] != ItemStack.EMPTY
|
||||
&& (player.capabilities.isCreativeMode || (WizardData.get(player) != null
|
||||
&& WizardData.get(player).hasSpellBeenDiscovered(Spell.get(spellBooks[0].getItemDamage()))))
|
||||
&& crystals != ItemStack.EMPTY && crystals.getCount()
|
||||
* Constants.MANA_PER_CRYSTAL > Spell.get(spellBooks[0].getItemDamage()).cost){
|
||||
|
||||
this.getSlot(CRYSTAL_SLOT).decrStackSize((int)Math
|
||||
.ceil(((double)Spell.get(spellBooks[0].getItemDamage()).cost) / Constants.MANA_PER_CRYSTAL));
|
||||
this.putStackInSlot(WAND_SLOT, new ItemStack(WizardryItems.scroll, 1, spellBooks[0].getItemDamage()));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user