added 1.5.2 support, replaced some utf-8

master
Skiphs 2013-05-07 10:58:50 -07:00
parent 65da10a43c
commit 0351a20682
7 changed files with 21 additions and 11 deletions

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src/test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>

3
.gitignore vendored
View File

@ -8,4 +8,5 @@
# IntelliJ IDEA project files #
./AMIDST.eml
./AMIDST.iml
./.idea/*
./.idea/*
/bin

View File

@ -156,7 +156,12 @@ public class FinderWindow extends JFrame {
boolean is25 = false;
boolean is131 = false;
if (typeDump.equals("[Bbeabdsbawemabdtbfzbdwngngbevawfbgfawvawvaxrawbbfrausbjhaycawwaraavybkdavwbjvbkila")) {
boolean atLeast152 = false;
if (typeDump.equals("[Bbdzbdrbawemabdsbfybdvngngbeuawfbgeawvawvaxrawbbfqausbjgaycawwaraavybkcavwbjubkila")) {
worldName = "aab";
is131 = true;
atLeast152 = true;
} else if (typeDump.equals("[Bbeabdsbawemabdtbfzbdwngngbevawfbgfawvawvaxrawbbfrausbjhaycawwaraavybkdavwbjvbkila")) {
worldName = "aab";
is131 = true;
} else if (typeDump.equals("[Baywayoaaszleaypbavaysmdazratabbaatqatqaulaswbanarnbdzauwatraohastbevasrbenbezbdmbdjkh")) {
@ -234,7 +239,12 @@ public class FinderWindow extends JFrame {
try {
m = mc.getMethod("s");
} catch (NoSuchMethodException e6) {
m = mc.getMethod("t");
try {
m = mc.getMethod("t");
} catch (NoSuchMethodException e7) {
m = mc.getMethod("u");
}
}
}

View File

@ -22,7 +22,7 @@ public enum Options {
public final BooleanPrefModel showNetherFortresses;
public final BooleanPrefModel showIcons;
//maybe temporary preferences?
//maybe temporary preferences:?
public boolean saveEnabled;
private Options() {

View File

@ -89,9 +89,9 @@ public class AmidstMenu extends JMenuBar {
@Override
public void actionPerformed(ActionEvent arg0) {
//Create the JOptionPane.
String s = JOptionPane.showInputDialog(null, "Enter seed", "New Project", JOptionPane.QUESTION_MESSAGE);
String s = JOptionPane.showInputDialog(null, "Enter seed:", "New Project", JOptionPane.QUESTION_MESSAGE);
if (s != null) {
SaveLoader.Type worldType = choose("New Project", "Enter world type\n", SaveLoader.Type.values());
SaveLoader.Type worldType = choose("New Project", "Enter world type:\n", SaveLoader.Type.values());
//If a string was returned, say so.
if (worldType != null)
@ -292,7 +292,7 @@ public class AmidstMenu extends JMenuBar {
* @param name name displayed in the choice
*/
private <T extends Point> void goToChosenPoint(T[] points, String name) {
T p = choose("Go to", "Select " + name + ":", points);
T p = choose("Go to:", "Select " + name + ":", points);
if (p != null)
window.curProject.moveMapTo(p.x >> 2, p.y >> 2);
}

View File

@ -1,7 +1,5 @@
package amidst.nbt;
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
import java.io.*;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;

View File

@ -6,12 +6,14 @@ import java.io.IOException;
import java.net.URL;
/**
* Allows to retrieve images, URLs,
* Allows to retrieve images, URLs, :
*/
public class ResourceLoader {
private ResourceLoader() {}
public static URL getResourceURL(String name) {
// This is also a valid way to load resources, although I'm not sure which is better.
//return ClassLoader.getSystemClassLoader().getResource("amidst/resources/" + name);
return ResourceLoader.class.getResource(name);
}