Treer
/
amidstest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactored SeedWidget and CursorInformationWidget to a similar structure

master
Stefan Dollase 2015-11-17 23:52:16 +01:00
parent 4b5c6b2575
commit 7262bfdce4
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/amidst/map/widget/CursorInformationWidget.java
View File

@ -8,7 +8,7 @@ import amidst.map.MapViewer;
import amidst.minecraft.world.World;
public class CursorInformationWidget extends Widget {
private String message = "";
private String text = "";
public CursorInformationWidget(MapViewer mapViewer, Map map, World world,
CornerAnchorPoint anchor) {
@ -20,23 +20,29 @@ public class CursorInformationWidget extends Widget {
@Override
public void draw(Graphics2D g2d, float time) {
Point mouseLocation = null;
if ((mouseLocation = mapViewer.getMousePosition()) != null) {
mouseLocation = map.screenToLocal(mouseLocation);
String biomeName = map.getBiomeAliasAt(mouseLocation);
message = biomeName + " [ " + mouseLocation.x + ", "
+ mouseLocation.y + " ]";
String newText = getText();
if (newText != null) {
text = newText;
}
int stringWidth = mapViewer.getFontMetrics().stringWidth(message);
setWidth(stringWidth + 20);
setWidth(mapViewer.getFontMetrics().stringWidth(text) + 20);
super.draw(g2d, time);
g2d.setColor(TEXT_COLOR);
g2d.drawString(message, getX() + 10, getY() + 20);
g2d.drawString(text, getX() + 10, getY() + 20);
}
private String getText() {
Point mouse = mapViewer.getMousePosition();
if (mouse != null) {
Point pointInWorld = map.screenToLocal(mouse);
return map.getBiomeAliasAt(pointInWorld) + " [ " + pointInWorld.x
+ ", " + pointInWorld.y + " ]";
} else {
return null;
}
}
@Override
protected boolean onVisibilityCheck() {
return (mapViewer.getMousePosition() != null);
return mapViewer.getMousePosition() != null;
}
}

16
src/amidst/map/widget/SeedWidget.java
View File

@ -2,7 +2,6 @@ package amidst.map.widget;
import java.awt.Graphics2D;
import amidst.Options;
import amidst.map.Map;
import amidst.map.MapViewer;
import amidst.minecraft.world.World;
@ -17,15 +16,18 @@ public class SeedWidget extends Widget {
@Override
public void draw(Graphics2D g2d, float time) {
String seedMessage = getSeedMessage();
setWidth(mapViewer.getFontMetrics().stringWidth(seedMessage) + 20);
String text = getText();
setWidth(mapViewer.getFontMetrics().stringWidth(text) + 20);
super.draw(g2d, time);
g2d.setColor(TEXT_COLOR);
g2d.drawString(seedMessage, getX() + 10, getY() + 20);
drawText(g2d, text);
}
public String getSeedMessage() {
World world = Options.instance.world;
private void drawText(Graphics2D g2d, String text) {
g2d.setColor(TEXT_COLOR);
g2d.drawString(text, getX() + 10, getY() + 20);
}
public String getText() {
String seedText = world.getSeedText();
if (seedText == null) {
return "Seed: " + world.getSeed();