diff --git a/java/src/game/gui/character/GuiChar.java b/java/src/game/gui/character/GuiChar.java index 3fad22e..05c4447 100755 --- a/java/src/game/gui/character/GuiChar.java +++ b/java/src/game/gui/character/GuiChar.java @@ -374,8 +374,9 @@ public class GuiChar extends GuiList } }, "Vorlage kopieren")); this.adjust = this.add(new DragAdjust(width / 2 - 230, height - 64 - 640, 460, 640)); - - this.add(new NavButton(width - 396, 36, 392, 24, GuiSpecies.INSTANCE, "Spezies ändern")); + + this.add(new Label(width - 396, 36, 392, 20, this.gm.thePlayer == null ? "" : this.gm.thePlayer.getSpecies().name, true)); + this.add(new NavButton(width - 396, 56, 392, 24, GuiSpecies.INSTANCE, "Spezies ändern")); // for(int z = 0; z < SpeciesRegistry.SPECIMEN.size(); z++) { // final SpeciesInfo species = SpeciesRegistry.SPECIMEN.get(z); // this.add(new ActButton(width - 396 + (z % 2) * 198, 36 + 28 * (z / 2), 194, 24, new ActButton.Callback() { diff --git a/java/src/game/gui/character/GuiSpecies.java b/java/src/game/gui/character/GuiSpecies.java index ae1c0b1..2823c11 100644 --- a/java/src/game/gui/character/GuiSpecies.java +++ b/java/src/game/gui/character/GuiSpecies.java @@ -11,13 +11,13 @@ import game.init.SpeciesRegistry; import game.packet.CPacketAction; import game.renderer.Drawing; -public class GuiSpecies extends GuiList implements ActButton.Callback +public class GuiSpecies extends GuiList implements ActButton.Callback { - protected class SkinEntry implements ListEntry + protected class SpeciesEntry implements ListEntry { private final SpeciesInfo species; - protected SkinEntry(SpeciesInfo species) + protected SpeciesEntry(SpeciesInfo species) { this.species = species; } @@ -49,7 +49,7 @@ public class GuiSpecies extends GuiList implements ActButt this.setDimensions(400, height, 32, height - 32); this.elements.clear(); for(SpeciesInfo species : SpeciesRegistry.SPECIMEN) { - this.elements.add(new SkinEntry(species)); + this.elements.add(new SpeciesEntry(species)); } this.add(new NavButton(width - 198 * 2, height - 28, 194, 24, GuiChar.INSTANCE, "Zurück")); this.selectButton = this.add(new ActButton(width - 198, height - 28, 194, 24, this, "Spezies ändern")); @@ -70,7 +70,7 @@ public class GuiSpecies extends GuiList implements ActButt } public void use(ActButton elem, Mode action) { - SkinEntry entry = this.getSelected(); + SpeciesEntry entry = this.getSelected(); if(entry != null && GuiSpecies.this.gm.thePlayer != null) GuiSpecies.this.gm.thePlayer.sendQueue.addToSendQueue(new CPacketAction(CPacketAction.Action.SET_SPECIES, EntityRegistry.getEntityID(entry.species.clazz))); }