69 src/WMLLGuiLightLevel.java
View file
@@ -5,21 +5,19 @@
import org.lwjgl.input.Keyboard;


public class WMLLGuiLightLevel extends vl {
public class WMLLGuiLightLevel extends vp {

protected WMLL wmll;
private vl parent;
private vp parent;
private String title;
private Properties outputOptions;
private String lightString;
private int page = 1;
private abk parameterButton, colouringButton, doneButton;
private ago lightEditbox, skyEditbox, rawEditbox, blockEditbox, lightLevelEditbox;
private final List<ago> page3editboxes = new ArrayList<ago>();

private static zl[] enums;
private abp parameterButton, colouringButton, doneButton;
private agu lightEditbox, skyEditbox, rawEditbox, blockEditbox, lightLevelEditbox;
private final List<agu> page3editboxes = new ArrayList<agu>();

public WMLLGuiLightLevel(WMLL w, vl parent) {
public WMLLGuiLightLevel(WMLL w, vp parent) {
this.wmll = w;
this.parent = parent;
title = "WMLL Light Level Customization";
@@ -34,47 +32,48 @@ public void c() {
byte o = -16;
s.clear();

doneButton = new abk(0, q / 2 - 112, r / 4 + 150 + o, 226, 20, "Done");
doneButton = new abp(0, q / 2 - 112, r / 4 + 150 + o, 226, 20, "Done");
s.add(doneButton);

int a = wmll.getFontRenderer().a("Parameter Help") + 10;
parameterButton = new abk(1, (q - a) / 2, r / 4 + 65 + o, a, 20, "Parameter Help");
parameterButton = new abp(1, (q - a) / 2, r / 4 + 65 + o, a, 20, "Parameter Help");
s.add(parameterButton);

a = wmll.getFontRenderer().a("Colouring Options...") + 10;
colouringButton = new abk(2, (q - a) / 2, r / 4 + 75, a, 20, "Colouring Options...");
colouringButton = new abp(2, (q - a) / 2, r / 4 + 75, a, 20, "Colouring Options...");
s.add(colouringButton);

/*
* New Editbox:
* new ago(Gui, fontrenderer, posx, posy, width, height, default text);
* new agu(Gui, fontrenderer, posx, posy, width, height, default text);
*/
lightLevelEditbox = new ago(this, u, q / 2 - ((wmll.getWindowSize().a() - 20) / 2), 70, wmll.getWindowSize().a() - 20, 20, outputOptions.getProperty("lightString", "Light level: %LightLevel%"));
lightLevelEditbox.a = true;
lightLevelEditbox = new agu(/*this,*/ u, q / 2 - ((wmll.getWindowSize().a() - 20) / 2), 70, wmll.getWindowSize().a() - 20, 20/*, outputOptions.getProperty("lightString", "Light level: %LightLevel%")*/);
//lightLevelEditbox.a = true;
lightLevelEditbox.b(true);
lightLevelEditbox.a(76);

blockEditbox = new ago(this, u, q / 2 - 10, 43, 20, 10, outputOptions.getProperty("highlightBlock", "8"));
/*blockEditbox = new agu(this, u, q / 2 - 10, 43, 20, 10, outputOptions.getProperty("highlightBlock", "8"));
blockEditbox.a(2);
page3editboxes.add(blockEditbox);
skyEditbox = new ago(this, u, q / 2 - 10, 73, 20, 10, outputOptions.getProperty("highlightSky", "8"));
skyEditbox = new agu(this, u, q / 2 - 10, 73, 20, 10, outputOptions.getProperty("highlightSky", "8"));
skyEditbox.a(2);
page3editboxes.add(skyEditbox);
rawEditbox = new ago(this, u, q / 2 - 10, 103, 20, 10, outputOptions.getProperty("highlightRaw", "8"));
rawEditbox = new agu(this, u, q / 2 - 10, 103, 20, 10, outputOptions.getProperty("highlightRaw", "8"));
rawEditbox.a(2);
page3editboxes.add(rawEditbox);
lightEditbox = new ago(this, u, q / 2 - 10, 133, 20, 10, outputOptions.getProperty("highlightLight", "8"));
lightEditbox = new agu(this, u, q / 2 - 10, 133, 20, 10, outputOptions.getProperty("highlightLight", "8"));
lightEditbox.a(2);
page3editboxes.add(lightEditbox);
page3editboxes.add(lightEditbox);*/

if (WMLL.debugClassPresent)
s.add(new abk(9001, 2, r - 22, 50, 20, "Reload"));
s.add(new abp(9001, 2, r - 22, 50, 20, "Reload"));
generateLightStringPreview();
}

protected void a(abk b) {
protected void a(abp b) {
if (b.f == 0) {
if (page == 1) {
performSave();
@@ -89,13 +88,13 @@ else if (page >= 2) {
parameterButton.i = colouringButton.i = true;
doneButton.e = "Done";
for (int x = 0; x < page3editboxes.size(); x++) {
page3editboxes.get(x).a = false;
page3editboxes.get(x).b(false);
}
outputOptions.put("highlightLight", verify(lightEditbox.a()));
outputOptions.put("highlightBlock", verify(blockEditbox.a()));
outputOptions.put("highlightRaw", verify(rawEditbox.a()));
outputOptions.put("highlightSky", verify(skyEditbox.a()));
lightLevelEditbox.a = true;
outputOptions.put("highlightLight", verify(lightEditbox.b()));
outputOptions.put("highlightBlock", verify(blockEditbox.b()));
outputOptions.put("highlightRaw", verify(rawEditbox.b()));
outputOptions.put("highlightSky", verify(skyEditbox.b()));
lightLevelEditbox.b(true);
}
}
else if (b.f == 9001) // Debug button
@@ -111,7 +110,7 @@ else if (b.f == 1 || b.f == 2) {
b.i = colouringButton.i = false;
doneButton.e = "<<";
}
lightLevelEditbox.a = false;
lightLevelEditbox.b(false);
}

}
@@ -121,17 +120,17 @@ protected void a(char c, int i) {
performSave();
p.a(parent);
}
else if (lightLevelEditbox.a) {
else if (lightLevelEditbox.j()) {
lightLevelEditbox.a(c, i);
generateLightStringPreview();
}
else if (blockEditbox.a)
else if (blockEditbox.j())
blockEditbox.a(c, i);
else if (lightEditbox.a)
else if (lightEditbox.j())
lightEditbox.a(c, i);
else if (rawEditbox.a)
else if (rawEditbox.j())
rawEditbox.a(c, i);
else if (skyEditbox.a)
else if (skyEditbox.j())
skyEditbox.a(c, i);
else
super.a(c, i);
@@ -216,11 +215,11 @@ public void e() {
// Custom functions

public void generateLightStringPreview() {
lightString = wmll.generateLightString(lightLevelEditbox.a());
lightString = wmll.generateLightString(lightLevelEditbox.b());
}

public void performSave() {
outputOptions.put("lightString", lightLevelEditbox.a());
outputOptions.put("lightString", lightLevelEditbox.b());
WMLLGuiOutputOptions.outputOptions = WMLL.outputOptions = outputOptions;
System.out.println(outputOptions);
}
48 src/WMLLGuiOutputOptions.java
View file
@@ -3,17 +3,17 @@
import org.lwjgl.input.Keyboard;


public class WMLLGuiOutputOptions extends vl {
public class WMLLGuiOutputOptions extends vp {

protected WMLL wmll;
private vl parent;
private vp 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;

@SuppressWarnings("static-access")
public WMLLGuiOutputOptions(WMLL wmll, vl parent) {
public WMLLGuiOutputOptions(WMLL wmll, vp parent) {
this.wmll = wmll;
this.parent = parent;
this.outputOptions = WMLL.outputOptions;
@@ -29,33 +29,33 @@ public void c() {
byte o = -16;
/*
* New button
* abk((int)ID, x, y[, width, height], text)
* abp((int)ID, x, y[, width, height], text)
* y = y+25 for each button
*/
s.add(new abk(1, q / 2 - 112, r / 4 + 150 + o, 226, 20, "Done"));
//s.add(new abk(0, q / 2 - 152, r / 4 + 150 + o, 98, 20, "<<"));
//s.add(new abk(2, q / 2 + 2, r / 4 + 150 + o, 98, 20, ">>"));
s.add(new abk(3, q / 2 - 112, r / 4 - 5 + o, 112, 20, outputLocations[WMLL.outputLocation]));
s.add(new abk(4, q / 2 + 2, r / 4 - 5 + o, 112, 20, "\247"+Integer.toHexString(tc)+colourNames[tc]));
s.add(new abp(1, q / 2 - 112, r / 4 + 150 + o, 226, 20, "Done"));
//s.add(new abp(0, q / 2 - 152, r / 4 + 150 + o, 98, 20, "<<"));
//s.add(new abp(2, q / 2 + 2, r / 4 + 150 + o, 98, 20, ">>"));
s.add(new abp(3, q / 2 - 112, r / 4 - 5 + o, 112, 20, outputLocations[WMLL.outputLocation]));
s.add(new abp(4, q / 2 + 2, r / 4 - 5 + o, 112, 20, "\247"+Integer.toHexString(tc)+colourNames[tc]));
if (WMLL.debugClassPresent)
s.add(new abk(9001, 2, r - 22, 50, 20, "Reload"));
s.add(new abk(5, q / 2 - 112, r / 4 + 120 + o, 226, 20, "Light Level options..."));
s.add(new abk(6, q / 2 - 112, r / 4 + 20 + o, 112, 20, "Override F3: "+(wmll.wmllOverrideF3 ? "Yes" : "No")));
s.add(new abk(7, q / 2 + 2, r / 4 + 20 + o, 112, 20, "F3 Type: "+(wmll.F3Type == 1 ? "Alternate" : "Classic")));
s.add(new abk(8, q / 2 - 112, r / 4 + 45 + o, 112, 20, "Seed w/ Coords: "+(wmll.showSeedWithCoords ? "Yes" : "No")));
s.add(new abk(9, q / 2 - 112, r / 4 + 98 + o, 226, 20, "Enter seed for this server..."));
/* s.add(new abk(2, q / 2 + 2, r / 4 + 45 + o, 98, 20, "f"));
s.add(new abk(0, q / 2 - 100, r / 4 + 70 + o, 98, 20, "g"));
s.add(new abk(2, q / 2 + 2, r / 4 + 70 + o, 98, 20, "h"));
s.add(new abk(0, q / 2 - 100, r / 4 + 95 + o, 98, 20, "i"));
s.add(new abk(2, q / 2 + 2, r / 4 + 95 + o, 98, 20, "j"));*/
s.add(new abk(10, q / 2 - 112, r / 4 + 76 + o, 226, 20, "Show: "+getStringForLightOption(WMLL.WMLLI)));
((abk)s.get(6)).h = false;
((abk)s.get(8)).i = wmll.isMultiplayer();
s.add(new abp(9001, 2, r - 22, 50, 20, "Reload"));
s.add(new abp(5, q / 2 - 112, r / 4 + 120 + o, 226, 20, "Light Level options..."));
s.add(new abp(6, q / 2 - 112, r / 4 + 20 + o, 112, 20, "Override F3: "+(wmll.wmllOverrideF3 ? "Yes" : "No")));
s.add(new abp(7, q / 2 + 2, r / 4 + 20 + o, 112, 20, "F3 Type: "+(wmll.F3Type == 1 ? "Alternate" : "Classic")));
s.add(new abp(8, q / 2 - 112, r / 4 + 45 + o, 112, 20, "Seed w/ Coords: "+(wmll.showSeedWithCoords ? "Yes" : "No")));
s.add(new abp(9, q / 2 - 112, r / 4 + 98 + o, 226, 20, "Enter seed for this server..."));
/* s.add(new abp(2, q / 2 + 2, r / 4 + 45 + o, 98, 20, "f"));
s.add(new abp(0, q / 2 - 100, r / 4 + 70 + o, 98, 20, "g"));
s.add(new abp(2, q / 2 + 2, r / 4 + 70 + o, 98, 20, "h"));
s.add(new abp(0, q / 2 - 100, r / 4 + 95 + o, 98, 20, "i"));
s.add(new abp(2, q / 2 + 2, r / 4 + 95 + o, 98, 20, "j"));*/
s.add(new abp(10, q / 2 - 112, r / 4 + 76 + o, 226, 20, "Show: "+getStringForLightOption(WMLL.WMLLI)));
((abp)s.get(6)).h = false;
((abp)s.get(8)).i = wmll.isMultiplayer();

}

protected void a(abk b) {
protected void a(abp b) {
if (b.f == 1 || b.f == 2) {
if (b.f == 2) { // Next
System.out.println("NO GUI YET!");
28 src/WMLLGuiSMPSeed.java
View file
@@ -1,15 +1,15 @@
import org.lwjgl.input.Keyboard;


public class WMLLGuiSMPSeed extends vl {
public class WMLLGuiSMPSeed extends vp {

protected WMLL wmll;
private vl parent;
private vp parent;
private String title;

private ago seedBox;
private agu seedBox;

public WMLLGuiSMPSeed(WMLL wmll, vl parent) {
public WMLLGuiSMPSeed(WMLL wmll, vp parent) {
this.wmll = wmll;
this.parent = parent;
this.title = "WMLL SMP Seed Configuration";
@@ -20,25 +20,25 @@ public void c() {
s.clear();
byte o = -16;
if (WMLL.debugClassPresent)
s.add(new abk(9001, 2, r - 22, 50, 20, "Reload"));
s.add(new abp(9001, 2, r - 22, 50, 20, "Reload"));
/*
* New Editbox:
* new ago(Gui, fontrenderer, posx, posy, width, height, default text);
* new agu(Gui, fontrenderer, posx, posy, width, height, default text);
*/
seedBox = new ago(this, u, q / 2 - ((wmll.getWindowSize().a() - 20) / 2), 110, wmll.getWindowSize().a() - 20, 20, WMLL.options.getProperty("Seed:"+wmll.getWorldName().toLowerCase(), ""));
seedBox = new agu(/*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 = true;
s.add(new abk(0, q / 2 - 100, r / 4 + 90 + o, "Save Seed"));
seedBox.b(true);
s.add(new abp(0, q / 2 - 100, r / 4 + 90 + o, "Save Seed"));
}

protected void a(abk b) {
protected void a(abp b) {
if (b.f == 9001) {
p.a(new WMLLGuiSMPSeed(wmll, parent));
}
else if (b.f == 0) {
if (!seedBox.a().equals("")) {
System.out.println(true+ " | "+seedBox.a());
WMLL.options.put("Seed:"+wmll.getWorldName().toLowerCase(), seedBox.a());
if (!seedBox.b().equals("")) {
System.out.println(true+ " | "+seedBox.b());
WMLL.options.put("Seed:"+wmll.getWorldName().toLowerCase(), seedBox.b());
}
p.a(parent);
}
@@ -51,7 +51,7 @@ public void a() {
protected void a(char c, int i) {
if (Keyboard.KEY_ESCAPE == i)
p.a(parent);
else if (seedBox.a)
else if (seedBox.j())
seedBox.a(c, i);
else
super.a(c, i);
13 src/WMLLImprovedChat.java
View file
@@ -1,12 +1,15 @@
import org.lwjgl.opengl.GL11;


public class WMLLImprovedChat extends ok {
// Coding is updated here but due to ImprovedChat's code requiring nq instad of 1.2.4's nt, it will error - iPeer


public class WMLLImprovedChat extends oo {

public static final WMLLImprovedChat i = new WMLLImprovedChat();
private static int fade = 0;

public void run(boolean chatActive, ni localni, int i, int i3) {
public void run(boolean chatActive, nl localni, int i, int i3) {
if(ImprovedChat.Current != null)
{
if(ImprovedChat.Current.tabs.size() > 1)
@@ -66,9 +69,9 @@ public void run(boolean chatActive, ni localni, int i, int i3) {
}
for(int it = ImprovedChat.currentTab().chatScroll; it < ImprovedChat.currentTab().e.size() && it < i3 + ImprovedChat.currentTab().chatScroll; it++)
{
if(((nq)ImprovedChat.currentTab().e.get(it)).b >= 200 && !chatActive)
if(((nt)ImprovedChat.currentTab().e.get(it)).b >= 200 && !chatActive)
continue;
double d1 = (double)((nq)ImprovedChat.currentTab().e.get(it)).b / 200D;
double d1 = (double)((nt)ImprovedChat.currentTab().e.get(it)).b / 200D;
d1 = 1.0D - d1;
d1 *= 10D;
if(d1 < 0.0D)
@@ -83,7 +86,7 @@ public void run(boolean chatActive, ni localni, int i, int i3) {
{
int i120 = 2;
int i131 = (-it + ImprovedChat.currentTab().chatScroll) * 9;
String str2 = ((nq)ImprovedChat.currentTab().e.get(it)).a;
String str2 = ((nt)ImprovedChat.currentTab().e.get(it)).a;
a(i120, i131 - 1, i120 + 320, i131 + 8, (i110 << 24) + ImprovedChat.historyColor);
GL11.glEnable(3042);
localni.a(str2, i120, i131, 0xffffff);
32 src/WMLLOptions.java
View file
@@ -4,7 +4,7 @@

import org.lwjgl.input.Keyboard;

public class WMLLOptions extends vl {
public class WMLLOptions extends vp {

private int updateDelay = 0;

@@ -29,28 +29,28 @@ public void c() {
byte offset = -16;
/*
* New button
* abk((int)ID, x, y[, width, height], text)
* abp((int)ID, x, y[, width, height], text)
*/
s.add(new abk(1, q / 2 - 100, r / 4 + 170 + offset, "Done"));
s.add(new abk(0, q / 2 - 100, r / 4 - 5 + offset, 98, 20, "Debug: "+debug));
s.add(new abk(2, q / 2 + 2, r / 4 - 5 + offset, 98, 20, "Cycle Key: "+ikey));
s.add(new abk(5, q / 2 - 100, r / 4 + 20 + offset, 98, 20, (clockformat == "OFF" ? "Clock is " : "Time Format: ")+clockformat));
s.add(new abk(6, q / 2 + 2, r / 4 + 20 + offset, 98, 20, "Images: "+(wmll.useImages ? "ON" : "OFF")));
s.add(new abk(3, q / 2 - 100, r / 4 + 125 + offset, "Output options..."));
s.add(new abk(4, q / 2 - 100, r / 4 + 85 + offset, "Force options reload"));
//s.add(new abk(4, q / 2 - 100, r / 4 + 130 + offset, "\247"+Integer.toHexString(TextColour)+"Text Colour"));
s.add(new abp(1, q / 2 - 100, r / 4 + 170 + offset, "Done"));
s.add(new abp(0, q / 2 - 100, r / 4 - 5 + offset, 98, 20, "Debug: "+debug));
s.add(new abp(2, q / 2 + 2, r / 4 - 5 + offset, 98, 20, "Cycle Key: "+ikey));
s.add(new abp(5, q / 2 - 100, r / 4 + 20 + offset, 98, 20, (clockformat == "OFF" ? "Clock is " : "Time Format: ")+clockformat));
s.add(new abp(6, q / 2 + 2, r / 4 + 20 + offset, 98, 20, "Images: "+(wmll.useImages ? "ON" : "OFF")));
s.add(new abp(3, q / 2 - 100, r / 4 + 125 + offset, "Output options..."));
s.add(new abp(4, q / 2 - 100, r / 4 + 85 + offset, "Force options reload"));
//s.add(new abp(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 abk(8, (q - (i + 10)) / 2, r / 4 + 45 + offset, i + 10, 20, enabledString));
s.add(new abp(8, (q - (i + 10)) / 2, r / 4 + 45 + offset, i + 10, 20, enabledString));
if (WMLL.debugClassPresent)
s.add(new abk(9001, 2, r - 22, 50, 20, "Reload"));
s.add(new abp(9001, 2, r - 22, 50, 20, "Reload"));
if (!wmll.Enabled)
for (int x = 3; x < 6; x++)
((abk)s.get(x)).h = false;
((abp)s.get(x)).h = false;
}

@SuppressWarnings("static-access")
protected void a(abk button) {
protected void a(abp button) {
if (button.f == 1) {
//p.a(null);
wmll.optionsOpen = false;
@@ -90,7 +90,7 @@ protected void a(abk button) {
wmll.Enabled = !a;
wmll.options.setProperty("World-"+wmll.getWorldName(), Boolean.toString(!a));
for (int x = 3; x < 6; x++)
((abk)s.get(x)).h = !a;
((abp)s.get(x)).h = !a;
button.e = "Enabled on "+(wmll.getWorldName() == "MpServer" ? "SMP" : "this world")+": "+(!a ? "Yes" : "No");
}
if (button.f == 9001) // Debug button
@@ -137,7 +137,7 @@ protected void a(char c1, int i1) {
if (isBinding) {
WMLL.F4Key = i1;
isBinding = false;
((abk)s.get(2)).e = "Cycle Key: "+Keyboard.getKeyName(i1);
((abp)s.get(2)).e = "Cycle Key: "+Keyboard.getKeyName(i1);
}
else {
super.a(c1, i1);
2 src/WMLLRenderer.java
View file
@@ -4,7 +4,7 @@

import org.lwjgl.opengl.GL11;

public class WMLLRenderer extends ok {
public class WMLLRenderer extends oo {

public int updateVersion = 0;
private int StringY = 12, notifyTick = 200;
664 src/ais.java
View file

This file was deleted.

744 src/aiy.java
View file

Large diffs are not rendered by default.