removed herobrine??!
This commit is contained in:
parent
560bc1399a
commit
3a38411e13
242 changed files with 749 additions and 1407 deletions
|
@ -115,6 +115,7 @@ import common.entity.animal.EntityHorse;
|
|||
import common.entity.npc.Energy;
|
||||
import common.entity.npc.EntityCpu;
|
||||
import common.entity.npc.EntityNPC;
|
||||
import common.entity.npc.EntityWaterNPC;
|
||||
import common.entity.npc.PlayerCharacter;
|
||||
import common.entity.types.EntityLiving;
|
||||
import common.future.Futures;
|
||||
|
@ -1022,7 +1023,6 @@ public class Client implements IThreadListener {
|
|||
int color = potion.getColor();
|
||||
String name = (potion.isBadEffect() ? TextColor.ORANGE : TextColor.ACID) + effect.getEffectName();
|
||||
String desc = TextColor.NEON + effect.getDurationString();
|
||||
// Drawing.drawRectColor(x, y, 250, Font.DEFAULT.yglyph + 2, color | 0xff000000);
|
||||
Drawing.drawRectBorder(x, y, 250, Font.YGLYPH + 6, 0xff000000, 0xff202020, 0xffcfcfcf, 0xff6f6f6f);
|
||||
Drawing.drawGradient(x + 2, y + 2, effect.isInfinite() ? 246 : ((int)(246.0f * ((float)effect.getRemaining() / (float)effect.getDuration()))), Font.YGLYPH + 2, color | 0xff000000, Util.mixColor(color | 0xff000000, 0xff000000));
|
||||
Drawing.drawText(name, x + 4, y + 3, 0xffffffff);
|
||||
|
@ -1035,7 +1035,7 @@ public class Client implements IThreadListener {
|
|||
int absorb = entity.getAbsorptionAmount();
|
||||
int armor = entity.getTotalArmorValue();
|
||||
int stats = 1 + (absorb > 0 ? 1 : 0) + (armor > 0 ? 1 : 0) + (entity.vehicle instanceof EntityLiving ? 1 : 0)
|
||||
+ (entity instanceof EntityNPC npc && npc.getManaPoints() > 0 ? 1 : 0);
|
||||
+ (entity.getManaPoints() > 0 ? 1 : 0) + (entity instanceof EntityWaterNPC ? 1 : 0);
|
||||
for(Energy energy : Energy.values()) {
|
||||
if(entity.getEnergy(energy) > 0)
|
||||
stats += 1;
|
||||
|
@ -1047,17 +1047,21 @@ public class Client implements IThreadListener {
|
|||
y = stats(x, y, TextColor.RED + "Schaden", hp, max, 0xff0000);
|
||||
if(absorb > 0)
|
||||
y = stats(x, y, TextColor.YELLOW + "Schadenspuffer", absorb, 1024, 0xffff00);
|
||||
if(entity instanceof EntityWaterNPC npc) {
|
||||
int moist = npc.getMoisture();
|
||||
int maxm = npc.getMaxMoisture();
|
||||
y = stats(x, y, TextColor.BLUE + "Feuchtigkeit", moist, maxm, 0x4f4fff);
|
||||
}
|
||||
if(armor > 0)
|
||||
y = stats(x, y, TextColor.GRAY + "Rüstung", armor, 1024, 0x707070);
|
||||
if(entity.vehicle instanceof EntityLiving) {
|
||||
EntityLiving living = (EntityLiving)entity.vehicle;
|
||||
if(entity.vehicle instanceof EntityLiving living) {
|
||||
int vh = living.getHealth();
|
||||
int vhMax = living.getMaxHealth();
|
||||
y = stats(x, y, living.getDisplayName() /* + " (Reittier)" */, vh, vhMax, 0xff6060);
|
||||
y = stats(x, y, living.getDisplayName(), vh, vhMax, 0xff6060);
|
||||
}
|
||||
if(entity instanceof EntityNPC npc && npc.getManaPoints() > 0) {
|
||||
int mana = npc.getManaPoints();
|
||||
int maxm = npc.getMaxMana();
|
||||
if(entity.getManaPoints() > 0) {
|
||||
int mana = entity.getManaPoints();
|
||||
int maxm = entity.getMaxMana();
|
||||
y = stats(x, y, TextColor.CYAN + "Mana", mana, maxm, 0x0000ff);
|
||||
}
|
||||
for(int z = 0; z < Energy.values().length; z++) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue