Skip to content

Support for Mineshafts #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Paril wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for Mineshafts #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 44 additions & 42 deletions src/MoF/MapViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import amidst.map.MapObjectPlayer;
import amidst.map.layers.BiomeLayer;
import amidst.map.layers.GridLayer;
import amidst.map.layers.MineshaftLayer;
import amidst.map.layers.NetherFortressLayer;
import amidst.map.layers.PlayerLayer;
import amidst.map.layers.SlimeLayer;
Expand Down Expand Up @@ -62,7 +63,7 @@ public class MapViewer extends JComponent implements MouseListener, MouseWheelLi
// TODO: This should likely be moved somewhere else.
private static FragmentManager fragmentManager;
private static PlayerLayer playerLayer;

private Widget mouseOwner;
private static BufferedImage
dropShadowBottomLeft = ResourceLoader.getImage("dropshadow/inner_bottom_left.png"),
Expand All @@ -88,39 +89,40 @@ public class MapViewer extends JComponent implements MouseListener, MouseWheelLi
new TempleLayer(),
new SpawnLayer(),
new NetherFortressLayer(),
new MineshaftLayer(),
playerLayer = new PlayerLayer()
});
}

private Project proj;

private JPopupMenu menu = new JPopupMenu();
public int strongholdCount, villageCount;

private Map worldMap;
private MapObject selectedObject = null;
private Point lastMouse;
public Point lastRightClick = null;
private Point2D.Double panSpeed;

private static int zoomLevel = 0, zoomTicksRemaining = 0;
private static double targetZoom = 0.25f, curZoom = 0.25f;
private Point zoomMouse = new Point();

private Font textFont = new Font("arial", Font.BOLD, 15);

private FontMetrics textMetrics;

private ArrayList<Widget> widgets = new ArrayList<Widget>();
private long lastTime;

public void dispose() {
Log.debug("Disposing of map viewer.");
worldMap.dispose();
menu.removeAll();
proj = null;
}

MapViewer(Project proj) {
panSpeed = new Point2D.Double();
this.proj = proj;
Expand All @@ -130,10 +132,10 @@ public void dispose() {
menu.add(new PlayerMenuItem(this, player, playerLayer));
}
}

worldMap = new Map(fragmentManager); //TODO: implement more layers
worldMap.setZoom(curZoom);

widgets.add(new FpsWidget(this).setAnchorPoint(CornerAnchorPoint.BOTTOM_LEFT));
widgets.add(new SeedWidget(this).setAnchorPoint(CornerAnchorPoint.TOP_LEFT));
widgets.add(new DebugWidget(this).setAnchorPoint(CornerAnchorPoint.BOTTOM_RIGHT));
Expand All @@ -143,33 +145,33 @@ public void dispose() {
widgets.add(BiomeWidget.get(this).setAnchorPoint(CornerAnchorPoint.NONE));
addMouseListener(this);
addMouseWheelListener(this);

setFocusable(true);
lastTime = System.currentTimeMillis();

textMetrics = getFontMetrics(textFont);
}

@Override
public void paint(Graphics g) {
public void paint(Graphics g) {
Graphics2D g2d = (Graphics2D)g.create();

long currentTime = System.currentTimeMillis();
float time = Math.min(Math.max(0, currentTime - lastTime), 100) / 1000.0f;
lastTime = currentTime;

g2d.setColor(Color.black);
g2d.fillRect(0, 0, this.getWidth(), this.getHeight());

if (zoomTicksRemaining-- > 0) {
double lastZoom = curZoom;
curZoom = (targetZoom + curZoom) * 0.5;

Point2D.Double targetZoom = worldMap.getScaled(lastZoom, curZoom, zoomMouse);
worldMap.moveBy(targetZoom);
worldMap.setZoom(curZoom);
}

Point curMouse = getMousePosition();
if (lastMouse != null) {
if (curMouse != null) {
Expand All @@ -178,7 +180,7 @@ public void paint(Graphics g) {
// TODO : Scale with time
panSpeed.setLocation(difX * 0.2, difY * 0.2);
}

lastMouse.translate((int) panSpeed.x, (int)panSpeed.y);
}

Expand All @@ -190,17 +192,17 @@ public void paint(Graphics g) {
panSpeed.x *= 0.f;
panSpeed.y *= 0.f;
}

worldMap.width = getWidth();
worldMap.height = getHeight();

g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
worldMap.draw((Graphics2D)g2d.create(), time);
g2d.drawImage(dropShadowTopLeft, 0, 0, null);
g2d.drawImage(dropShadowTopRight, getWidth() - 10, 0, null);
g2d.drawImage(dropShadowBottomLeft, 0, getHeight() - 10, null);
g2d.drawImage(dropShadowBottomRight, getWidth() - 10, getHeight() - 10, null);

g2d.drawImage(dropShadowTop, 10, 0, getWidth() - 20, 10, null);
g2d.drawImage(dropShadowBottom, 10, getHeight() - 10, getWidth() - 20, 10, null);
g2d.drawImage(dropShadowLeft, 0, 10, 10, getHeight() - 20, null);
Expand All @@ -214,12 +216,12 @@ public void paint(Graphics g) {
}
}
}


public void centerAt(long x, long y) {
worldMap.centerOn(x, y);
}

public void adjustZoom(Point position, int notches) {
zoomMouse = position;
if (notches > 0) {
Expand All @@ -236,7 +238,7 @@ public void adjustZoom(Point position, int notches) {
}
}
}

@Override
public void mouseWheelMoved(MouseWheelEvent e) {
int notches = e.getWheelRotation();
Expand Down Expand Up @@ -268,7 +270,7 @@ public void mouseClicked(MouseEvent e) {
}
}
MapObject object = worldMap.getObjectAt(mouse, 50.0);

if (selectedObject != null)
selectedObject.localScale = 1.0;

Expand All @@ -277,8 +279,8 @@ public void mouseClicked(MouseEvent e) {
selectedObject = object;
}
}


@Override
public void mouseEntered(MouseEvent arg0) {
}
Expand All @@ -304,7 +306,7 @@ public void mousePressed(MouseEvent e) {
}
lastMouse = mouse;
}

@Override
public void mouseReleased(MouseEvent e) {
if (e.isPopupTrigger() && MinecraftUtil.getVersion().saveEnabled()) {
Expand All @@ -321,38 +323,38 @@ public void mouseReleased(MouseEvent e) {
}
}
}

public MapObject getSelectedObject() {
return selectedObject;
}


public void movePlayer(String name, ActionEvent e) {
//PixelInfo p = getCursorInformation(new Point(tempX, tempY));

//proj.movePlayer(name, p);
}

public void saveToFile(File f) {
BufferedImage image = new BufferedImage(worldMap.width, worldMap.height, BufferedImage.TYPE_INT_ARGB);
Graphics2D g2d = image.createGraphics();

worldMap.draw(g2d, 0);

for (Widget widget : widgets)
if (widget.isVisible())
widget.draw(g2d, 0);

try {
ImageIO.write(image, "png", f);
} catch (IOException e) {
e.printStackTrace();
}

g2d.dispose();
image.flush();
}

@Override
public void keyPressed(KeyEvent e) {
// TODO Auto-generated method stub
Expand All @@ -368,13 +370,13 @@ else if (e.getKeyCode() == KeyEvent.VK_MINUS)
@Override
public void keyReleased(KeyEvent e) {
// TODO Auto-generated method stub

}

@Override
public void keyTyped(KeyEvent e) {
// TODO Auto-generated method stub

}

public FragmentManager getFragmentManager() {
Expand All @@ -384,7 +386,7 @@ public FragmentManager getFragmentManager() {
public Map getMap() {
return worldMap;
}

public FontMetrics getFontMetrics() {
return textMetrics;
}
Expand Down
36 changes: 19 additions & 17 deletions src/amidst/Options.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,54 +15,56 @@
*/
public enum Options {
instance;

//per-run preferences. TODO: store elsewhere?
public long seed;
public String seedText;

//permanent preferences
public final FilePrefModel jar;
public final BooleanPrefModel showSlimeChunks;
public final BooleanPrefModel showGrid;
public final BooleanPrefModel showNetherFortresses;
public final BooleanPrefModel showMineshafts;
public final BooleanPrefModel showTemples, showPlayers, showStrongholds, showVillages, showSpawn;
public final BooleanPrefModel mapFlicking, mapFading, showFPS, showDebug;
public final BooleanPrefModel updateToUnstable;
public final BooleanPrefModel maxZoom;

public final StringPreference lastProfile;

public final SelectPrefModel worldType;
public BiomeColorProfile biomeColorProfile;
private Preferences preferences;

//CLI
@Option (name="-history", usage="Sets the path to seed history file.", metaVar="<file>")
public String historyPath;

@Option (name="-log", usage="Sets the path to logging file.", metaVar="<file>")
public String logPath;

@Option (name="-mcpath", usage="Sets the path to the .minecraft directory.", metaVar="<path>")
public String minecraftPath;

@Option (name="-mcjar", usage="Sets the path to the minecraft .jar", metaVar="<path>")
public String minecraftJar;

@Option (name="-mcjson", usage="Sets the path to the minecraft .json", metaVar="<path>")
public String minecraftJson;

private Options() {
seed = 0L;
seedText = null;


Preferences pref = Preferences.userNodeForPackage(Amidst.class);
preferences = pref;
jar = new FilePrefModel( pref, "jar", new File(Util.minecraftDirectory, "bin/minecraft.jar"));
showSlimeChunks = new BooleanPrefModel(pref, "slimeChunks", false);
showGrid = new BooleanPrefModel(pref, "grid", false);
showNetherFortresses = new BooleanPrefModel(pref, "netherFortressIcons", false);
showMineshafts = new BooleanPrefModel(pref, "mineshaftIcons", false);
mapFlicking = new BooleanPrefModel(pref, "mapFlicking", true);
mapFading = new BooleanPrefModel(pref, "mapFading", true);
maxZoom = new BooleanPrefModel(pref, "maxZoom", true);
Expand All @@ -78,18 +80,18 @@ private Options() {
biomeColorProfile = new BiomeColorProfile();
worldType = new SelectPrefModel( pref, "worldType", "Prompt each time", new String[] { "Prompt each time", "Default", "Flat", "Large Biomes", "Amplified" });
biomeColorProfile.fillColorArray();


}

public Preferences getPreferences() {
return preferences;
}

public File getJar() {
return jar.get();
}

public String getSeedMessage() {
if (seedText == null)
return "Seed: " + seed;
Expand Down
Loading