@@ -3,18 +3,18 @@
import org.lwjgl.input.Keyboard;


public class WMLLGuiOutputOptions extends aay {
public class WMLLGuiOutputOptions extends aba {

protected WMLL wmll;
private aay parent;
private aba parent;
private String title;
private static final String[] colourNames = {"Black", "Dark Blue", "Dark Green", "Cyan", "Red", "Purple", "Orange", "Light Grey", "Dark Grey", "Lavender?", "Lime Green", "Light Blue", "Bright Red", "Pink", "Yellow", "White"};
private static final String[] outputLocations = {"Top Left", "Top Right", "Bottom Left", "Bottom Right"};
public static Properties outputOptions;
private ahy F3TypeButton, SMPSeedButton;
private aia SMPSeedButton;

@SuppressWarnings("static-access")
public WMLLGuiOutputOptions(WMLL wmll, aay parent) {
public WMLLGuiOutputOptions(WMLL wmll, aba parent) {
this.wmll = wmll;
this.parent = parent;
this.outputOptions = WMLL.outputOptions;
@@ -29,20 +29,20 @@ public void c() {
int tc = WMLL.TextColour;
byte o = -16;
if (WMLL.debugClassPresent)
s.add(new ahy(9001, q - 52, r - 22, 50, 20, "Reload"));
s.add(new ahy(1, q / 2 - 112, r / 4 + 150 + o, 226, 20, "Done"));
s.add(new ahy(3, q / 2 - 112, r / 4 - 5 + o, 112, 20, outputLocations[WMLL.outputLocation]));
s.add(new ahy(4, q / 2 + 2, r / 4 - 5 + o, 112, 20, "\247"+Integer.toHexString(tc)+colourNames[tc]));
s.add(new ahy(5, q / 2 + 2, r / 4 + 100 + o, 112, 20, "Light Level options..."));
s.add(new ahy(6, q / 2 - 112, r / 4 + 20 + o, 112, 20, "Override F3: "+(wmll.wmllOverrideF3 ? "Yes" : "No")));
s.add(new ahy(8, q / 2 + 2, r / 4 + 20 + o, 112, 20, "Seed w/ Coords: "+(wmll.showSeedWithCoords ? "Yes" : "No")));
s.add(SMPSeedButton = new ahy(9, q / 2 - 112, r / 4 + 125 + o, 226, 20, "Enter seed for this server..."));
s.add(new ahy(11, q / 2 - 112, r / 4 + 100 + o, 112, 20, "Enabled outputs..."));
s.add(new ahy(10, q / 2 - 112, r / 4 + 75 + o, 226, 20, "Show: "+getStringForLightOption(WMLL.WMLLI)));
s.add(new aia(9001, q - 52, r - 22, 50, 20, "Reload"));
s.add(new aia(1, q / 2 - 112, r / 4 + 150 + o, 226, 20, "Done"));
s.add(new aia(3, q / 2 - 112, r / 4 - 5 + o, 112, 20, outputLocations[WMLL.outputLocation]));
s.add(new aia(4, q / 2 + 2, r / 4 - 5 + o, 112, 20, "\247"+Integer.toHexString(tc)+colourNames[tc]));
s.add(new aia(5, q / 2 + 2, r / 4 + 100 + o, 112, 20, "Light Level options..."));
s.add(new aia(6, q / 2 - 112, r / 4 + 20 + o, 112, 20, "Override F3: "+(wmll.wmllOverrideF3 ? "Yes" : "No")));
s.add(new aia(8, q / 2 + 2, r / 4 + 20 + o, 112, 20, "Seed w/ Coords: "+(wmll.showSeedWithCoords ? "Yes" : "No")));
s.add(SMPSeedButton = new aia(9, q / 2 - 112, r / 4 + 125 + o, 226, 20, "Enter seed for this server..."));
s.add(new aia(11, q / 2 - 112, r / 4 + 100 + o, 112, 20, "Enabled outputs..."));
s.add(new aia(10, q / 2 - 112, r / 4 + 75 + o, 226, 20, "Show: "+getStringForLightOption(WMLL.WMLLI)));
SMPSeedButton.i = (wmll.isMultiplayer() || WMLL.debugClassPresent);
}

protected void a(ahy b) {
protected void a(aia b) {
if (b.f == 1 || b.f == 2) {
if (b.f == 2) { // Next
System.out.println("NO GUI YET!");
@@ -1,15 +1,15 @@
import org.lwjgl.input.Keyboard;


public class WMLLGuiSMPSeed extends aay {
public class WMLLGuiSMPSeed extends aba {

protected WMLL wmll;
private aay parent;
private aba parent;
private String title;

private anw seedBox;
private any seedBox;

public WMLLGuiSMPSeed(WMLL wmll, aay parent) {
public WMLLGuiSMPSeed(WMLL wmll, aba parent) {
this.wmll = wmll;
this.parent = parent;
this.title = "WMLL SMP Seed Configuration";
@@ -20,21 +20,21 @@ public void c() {
s.clear();
byte o = -16;
if (WMLL.debugClassPresent)
s.add(new ahy(9001, q - 52, r - 22, 50, 20, "Reload"));
s.add(new aia(9001, q - 52, r - 22, 50, 20, "Reload"));
/*
* New Editbox:
* new anw(Gui, fontrenderer, posx, posy, width, height, default text);
* new any(Gui, fontrenderer, posx, posy, width, height, default text);
*/
seedBox = new anw(/*this,*/ u, q / 2 - ((wmll.getWindowSize().a() - 20) / 2), 110, wmll.getWindowSize().a() - 20, 20/*, WMLL.options.getProperty("Seed:"+wmll.getWorldName().toLowerCase(), "")*/);
seedBox = new any(/*this,*/ u, q / 2 - ((wmll.getWindowSize().a() - 20) / 2), 110, wmll.getWindowSize().a() - 20, 20/*, WMLL.options.getProperty("Seed:"+wmll.getWorldName().toLowerCase(), "")*/);
//s.add(seedBox);
seedBox.a(72);
if (wmll.getWorldSeed() != 0)
seedBox.a(Long.toString(wmll.getWorldSeed()));
seedBox.b(true);
s.add(new ahy(0, q / 2 - 100, r / 4 + 90 + o, "Save Seed"));
s.add(new aia(0, q / 2 - 100, r / 4 + 90 + o, "Save Seed"));
}

protected void a(ahy b) {
protected void a(aia b) {
if (b.f == 9001) {
p.a(new WMLLGuiSMPSeed(wmll, parent));
}
@@ -1,12 +1,12 @@
import org.lwjgl.input.Keyboard;

public class WMLLOptions extends aay {
public class WMLLOptions extends aba {

public WMLLOptions() {
this.wmll = WMLL.i;
}

public WMLLOptions(aay parent) {
public WMLLOptions(aba parent) {
this.parent = parent;
this.wmll = WMLL.i;
}
@@ -16,7 +16,7 @@ public WMLLOptions(WMLL i) {
}


public WMLLOptions(WMLL wmll, aay parent) {
public WMLLOptions(WMLL wmll, aba parent) {
this.wmll = wmll;
this.parent = parent;
}
@@ -37,28 +37,28 @@ public void c() {
byte offset = -16;
/*
* New button
* ahy((int)ID, x, y[, width, height], text)
* aia((int)ID, x, y[, width, height], text)
*/
s.add(new ahy(1, q / 2 - 100, r / 4 + 150 + offset, "Done"));
s.add(new ahy(0, q / 2 - 100, r / 4 - 5 + offset, 98, 20, "Debug: "+debug));
s.add(new ahy(2, q / 2 + 2, r / 4 - 5 + offset, 98, 20, "Cycle Key: "+ikey));
s.add(new ahy(5, q / 2 - 100, r / 4 + 20 + offset, 98, 20, (clockformat == "OFF" ? "Clock is " : "Time Format: ")+clockformat));
s.add(new ahy(6, q / 2 + 2, r / 4 + 20 + offset, 98, 20, "Images: "+(wmll.useImages ? "ON" : "OFF")));
s.add(new ahy(3, q / 2 - 100, r / 4 + 125 + offset, "Output options..."));
s.add(new ahy(4, q / 2 - 100, r / 4 + 85 + offset, "Reset settings to defaults"));
//s.add(new ahy(4, q / 2 - 100, r / 4 + 130 + offset, "\247"+Integer.toHexString(TextColour)+"Text Colour"));
s.add(new aia(1, q / 2 - 100, r / 4 + 150 + offset, "Done"));
s.add(new aia(0, q / 2 - 100, r / 4 - 5 + offset, 98, 20, "Debug: "+debug));
s.add(new aia(2, q / 2 + 2, r / 4 - 5 + offset, 98, 20, "Cycle Key: "+ikey));
s.add(new aia(5, q / 2 - 100, r / 4 + 20 + offset, 98, 20, (clockformat == "OFF" ? "Clock is " : "Time Format: ")+clockformat));
s.add(new aia(6, q / 2 + 2, r / 4 + 20 + offset, 98, 20, "Images: "+(wmll.useImages ? "ON" : "OFF")));
s.add(new aia(3, q / 2 - 100, r / 4 + 125 + offset, "Output options..."));
s.add(new aia(4, q / 2 - 100, r / 4 + 85 + offset, "Reset settings to defaults"));
//s.add(new aia(4, q / 2 - 100, r / 4 + 130 + offset, "\247"+Integer.toHexString(TextColour)+"Text Colour"));
String enabledString = "Enabled on "+(wmll.getWorldName() == "MpServer" ? "SMP" : "this world")+": "+(wmll.Enabled ? "Yes" : "No");
int i = wmll.getFontRenderer().a(enabledString);
s.add(new ahy(8, (q - (i + 10)) / 2, r / 4 + 45 + offset, i + 10, 20, enabledString));
s.add(new aia(8, (q - (i + 10)) / 2, r / 4 + 45 + offset, i + 10, 20, enabledString));
if (WMLL.debugClassPresent)
s.add(new ahy(9001, q - 52, r - 22, 50, 20, "Reload"));
s.add(new aia(9001, q - 52, r - 22, 50, 20, "Reload"));
if (!wmll.Enabled)
for (int x = 3; x < 6; x++)
((ahy)s.get(x)).h = false;
((aia)s.get(x)).h = false;
}

@SuppressWarnings("static-access")
protected void a(ahy button) {
protected void a(aia button) {
if (button.f == 1) {
wmll.optionsOpen = false;
wmll.saveOptions();
@@ -102,7 +102,7 @@ protected void a(ahy button) {
wmll.Enabled = !a;
wmll.options.setProperty("World-"+wmll.getWorldName(), Boolean.toString(!a));
for (int x = 3; x < 6; x++)
((ahy)s.get(x)).h = !a;
((aia)s.get(x)).h = !a;
button.e = "Enabled on "+(wmll.getWorldName() == "MpServer" ? "SMP" : "this world")+": "+(!a ? "Yes" : "No");
}

@@ -153,7 +153,7 @@ protected void a(char c1, int i1) {
else if (isBinding && i1 != Keyboard.KEY_ESCAPE) {
WMLL.F4Key = i1;
isBinding = false;
((ahy)s.get(2)).e = "Cycle Key: "+Keyboard.getKeyName(i1);
((aia)s.get(2)).e = "Cycle Key: "+Keyboard.getKeyName(i1);
}
else {
super.a(c1, i1);
@@ -179,13 +179,13 @@ public static void renderWMLLVersion() {
wmll.drawStringUsingPixels(ver, 2, r - 9, 0x444444);
}

public aay getParent() {
public aba getParent() {
return parent;
}

private String title = "WMLL Configuration";;
private WMLL wmll;
public aay parent;
public aba parent;
public static boolean isBinding;

}
@@ -6,7 +6,7 @@
import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11;

public class WMLLRenderer extends sk {
public class WMLLRenderer extends sl {

public int updateVersion = 0;
private int StringY = 12, notifyTick = 200, StringY1 = 50, notifyTick1 = 800;
@@ -1,27 +1,27 @@
import org.lwjgl.input.Keyboard;


public class WMLLYesNo extends aay {
public class WMLLYesNo extends aba {

protected WMLL wmll;
protected aay parent;
protected aba parent;
byte offset = -16;

public WMLLYesNo(WMLL wmll, aay parent) {
public WMLLYesNo(WMLL wmll, aba parent) {
this.parent = parent;
this.wmll = wmll;
}

@SuppressWarnings("unchecked")
public void c() {
s.clear();
s.add(new ahy(0, q / 2 - 100, r / 2 + 10 + offset, 98, 20, "Yes"));
s.add(new ahy(1, q / 2 + 2, r / 2 + 10 + offset, 98, 20, "No"));
s.add(new aia(0, q / 2 - 100, r / 2 + 10 + offset, 98, 20, "Yes"));
s.add(new aia(1, q / 2 + 2, r / 2 + 10 + offset, 98, 20, "No"));
if (WMLL.debugClassPresent)
s.add(new ahy(9001, q - 52, r - 22, 50, 20, "Reload"));
s.add(new aia(9001, q - 52, r - 22, 50, 20, "Reload"));
}

protected void a(ahy b) {
protected void a(aia b) {
if (b.f == 9001)
p.a(new WMLLYesNo(wmll, parent));
if (b.f == 0 || b.f == 1) {
@@ -35,7 +35,7 @@ protected void a(ahy b) {
p.a(parent.getClass().newInstance());
} catch (Exception e) {
e.printStackTrace();
p.a((aay)null);
p.a((aba)null);
}
}
}

This file was deleted.

Large diffs are not rendered by default.

@@ -3,44 +3,45 @@
// Decompiler options: packimports(3) braces deadcode fieldsfirst noconv
// Source File Name: SourceFile

import java.util.List;
import net.minecraft.client.Minecraft;

public class ok extends aay
public class ok extends aba
{

private int a;
private int b;
@SuppressWarnings("unused")
private int a;
@SuppressWarnings("unused")
private int b;

public ok()
{
a = 0;
b = 0;
}

public void c()
@SuppressWarnings("unchecked")
public void c()
{
a = 0;
s.clear();
byte byte0 = -16;
s.add(new ahy(1, q / 2 - 100, r / 4 + 120 + byte0, ej.a("menu.returnToMenu")));
s.add(new aia(1, q / 2 - 100, r / 4 + 120 + byte0, ej.a("menu.returnToMenu")));
if(!p.z())
{
((ahy)s.get(0)).e = ej.a("menu.disconnect");
((aia)s.get(0)).e = ej.a("menu.disconnect");
}
s.add(new ahy(4, q / 2 - 100, r / 4 + 24 + byte0, ej.a("menu.returnToGame")));
//s.add(new ahy(0, q / 2 - 100, r / 4 + 96 + byte0, ej.a("menu.options")));
s.add(new ahy(5, q / 2 - 100, r / 4 + 48 + byte0, 98, 20, ej.a("gui.achievements")));
s.add(new ahy(6, q / 2 + 2, r / 4 + 48 + byte0, 98, 20, ej.a("gui.stats")));
s.add(new ahy(0, q / 2 - 100, r / 4 + 96 + byte0, 98, 20, ej.a("menu.options")));
s.add(new ahy(7, q / 2 + 2, r / 4 + 96 + byte0, 98, 20, "WMLL Options..."));
s.add(new aia(4, q / 2 - 100, r / 4 + 24 + byte0, ej.a("menu.returnToGame")));
//s.add(new aia(0, q / 2 - 100, r / 4 + 96 + byte0, ej.a("menu.options")));
s.add(new aia(5, q / 2 - 100, r / 4 + 48 + byte0, 98, 20, ej.a("gui.achievements")));
s.add(new aia(6, q / 2 + 2, r / 4 + 48 + byte0, 98, 20, ej.a("gui.stats")));
s.add(new aia(0, q / 2 - 100, r / 4 + 96 + byte0, 98, 20, ej.a("menu.options")));
s.add(new aia(7, q / 2 + 2, r / 4 + 96 + byte0, 98, 20, "WMLL Options..."));
if (WMLL.debugClassPresent)
s.add(new ahy(9001, q - 52, r - 22, 50, 20, "Reload"));
s.add(new aia(9001, q - 52, r - 22, 50, 20, "Reload"));
}

protected void a(ahy ahy1)
protected void a(aia aia1)
{
switch(ahy1.f)
switch(aia1.f)
{
case 7:
p.a(new WMLLOptions(this));
@@ -56,16 +57,16 @@ protected void a(ahy ahy1)
p.I.a(jk.j, 1);
p.f.f();
p.a((mf)null);
p.a(new adq());
p.a(new ads());
break;

case 4: // '\004'
p.a((aay)null);
p.a((aba)null);
p.g();
break;

case 5: // '\005'
p.a(new wb(p.I));
p.a(new wd(p.I));
break;

case 6: // '\006'