Added timers and specific item based checks for items
This commit is contained in:
parent
70d7faaf98
commit
5de32258ca
|
|
@ -58,8 +58,8 @@ public class EntityItem extends EntityParticle
|
|||
|
||||
@Override
|
||||
public double getLightLevel() {
|
||||
if(this.stack.isEmpty()) return 0;
|
||||
return getLightWithHeight(this.stack.item.getLightLevel());
|
||||
if(stack.isEmpty()) return 0;
|
||||
return getLightWithHeight(stack.item.getLightLevel(stack));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ public class EntityPlayer extends Entity implements
|
|||
ItemStack item = inventory.getItem(inventory_hand);
|
||||
|
||||
if(!item.isEmpty()) {
|
||||
return getLightWithHeight(item.item.getLightLevel());
|
||||
return getLightWithHeight(item.item.getLightLevel(item));
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ public abstract class Item
|
|||
return false;
|
||||
}
|
||||
|
||||
public double getLightLevel() {
|
||||
public double getLightLevel(ItemStack stack) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ public class ItemLantern extends Item
|
|||
}
|
||||
|
||||
@Override
|
||||
public double getLightLevel() {
|
||||
public double getLightLevel(ItemStack stack) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ public class ItemTorch extends Item
|
|||
|
||||
stack.modifiers = new ItemModifier[] {
|
||||
new ItemModifierMeta(1),
|
||||
new ItemModifierTimer(1000),
|
||||
new ItemModifierTimer(12000),
|
||||
};
|
||||
|
||||
return true;
|
||||
|
|
@ -66,9 +66,12 @@ public class ItemTorch extends Item
|
|||
return false;
|
||||
}
|
||||
|
||||
System.out.println(timer.getDamage());
|
||||
|
||||
return timer.getDamage() <= 0;
|
||||
return timer.getDamage() > 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getLightLevel(ItemStack stack) {
|
||||
return ItemModifierMeta.getStackMeta(stack) == 1 ? 1 : 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ public class ItemModifierTimer extends ItemModifier
|
|||
private long start;
|
||||
|
||||
public long getLeft() {
|
||||
return GameTimer.getTime() - timer;
|
||||
return GameTimer.getTime() - end;
|
||||
}
|
||||
|
||||
public double getDamage() {
|
||||
return 1 - (double)(timer - GameTimer.getTime()) / (double)timer;
|
||||
return 1 - (double)(end - GameTimer.getTime()) / (double)(end - start);
|
||||
}
|
||||
|
||||
public ItemModifierTimer(long time) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue