Altered interfaces to take itemstack references, so as to use NBT
This commit is contained in:
parent
76a986361e
commit
d1a368352e
3 changed files with 30 additions and 26 deletions
|
@ -1,14 +1,16 @@
|
|||
package ee3.core.interfaces;
|
||||
|
||||
import net.minecraft.src.ItemStack;
|
||||
|
||||
public interface IItemChargeable {
|
||||
|
||||
public abstract byte getCurrentCharge();
|
||||
public abstract byte getCurrentCharge(ItemStack ist);
|
||||
|
||||
public abstract byte getMaxCharge();
|
||||
|
||||
public abstract void increaseCharge();
|
||||
public abstract void increaseCharge(ItemStack ist);
|
||||
|
||||
public abstract void decreaseCharge();
|
||||
public abstract void decreaseCharge(ItemStack ist);
|
||||
|
||||
public abstract void setCurrentCharge(byte charge);
|
||||
public abstract void setCurrentCharge(ItemStack ist, byte charge);
|
||||
}
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
package ee3.core.interfaces;
|
||||
|
||||
import net.minecraft.src.ItemStack;
|
||||
|
||||
public interface IItemModal {
|
||||
|
||||
public abstract byte getCurrentMode();
|
||||
public abstract byte getCurrentMode(ItemStack ist);
|
||||
|
||||
public abstract byte getMaxMode();
|
||||
|
||||
public abstract byte cycleMode();
|
||||
public abstract byte cycleMode(ItemStack ist);
|
||||
|
||||
public abstract void setMode(byte mode);
|
||||
public abstract void setMode(ItemStack ist, byte mode);
|
||||
}
|
||||
|
|
|
@ -23,30 +23,30 @@ public class ItemPhilosopherStone extends ItemEE implements IItemChargeable, IIt
|
|||
}
|
||||
|
||||
@Override
|
||||
public void increaseCharge() {
|
||||
if (currentCharge < maxCharge)
|
||||
currentCharge++;
|
||||
public void increaseCharge(ItemStack ist) {
|
||||
if (getCurrentCharge(ist) < getMaxCharge())
|
||||
setCurrentCharge(ist, (byte)(getCurrentCharge(ist) + 1));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void decreaseCharge() {
|
||||
if (currentCharge > 0)
|
||||
currentCharge--;
|
||||
public void decreaseCharge(ItemStack ist) {
|
||||
if (getCurrentCharge(ist) > 0)
|
||||
setCurrentCharge(ist, (byte)(getCurrentCharge(ist) - 1));
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte getCurrentCharge() {
|
||||
return currentCharge;
|
||||
public byte getCurrentCharge(ItemStack ist) {
|
||||
return this.getByte(ist, "currentCharge");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCurrentCharge(byte charge) {
|
||||
currentCharge = charge;
|
||||
public void setCurrentCharge(ItemStack ist, byte charge) {
|
||||
this.setByte(ist, "currentCharge", charge);
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte getCurrentMode() {
|
||||
return currentMode;
|
||||
public byte getCurrentMode(ItemStack ist) {
|
||||
return this.getByte(ist, "currentMode");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -55,17 +55,17 @@ public class ItemPhilosopherStone extends ItemEE implements IItemChargeable, IIt
|
|||
}
|
||||
|
||||
@Override
|
||||
public byte cycleMode() {
|
||||
if (currentMode < maxMode)
|
||||
currentMode += 1;
|
||||
public byte cycleMode(ItemStack ist) {
|
||||
if (getCurrentMode(ist) < getMaxMode())
|
||||
setMode(ist, (byte)(getCurrentMode(ist) + 1));
|
||||
else
|
||||
currentMode = 0;
|
||||
return currentMode;
|
||||
setMode(ist, (byte)0);
|
||||
return getCurrentMode(ist);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setMode(byte mode) {
|
||||
this.currentMode = mode;
|
||||
public void setMode(ItemStack ist, byte mode) {
|
||||
this.setByte(ist, "currentMode", mode);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in a new issue