mirror of
https://github.com/catfoolyou/Alpha-1.1.2_01.git
synced 2025-06-05 14:00:56 -05:00
Need to fix lightmap bug
This commit is contained in:
parent
be3f7eea3d
commit
25fc33cd32
Binary file not shown.
@ -804,7 +804,7 @@ public class Minecraft implements Runnable {
|
|||||||
// this.setIngameNotInFocus();
|
// this.setIngameNotInFocus();
|
||||||
// Display.setFullscreen(this.fullscreen);
|
// Display.setFullscreen(this.fullscreen);
|
||||||
// Display.update();
|
// Display.update();
|
||||||
// Thread.sleep(1000L);
|
// `Thread`.sleep(1000L);
|
||||||
// if(this.fullscreen) {
|
// if(this.fullscreen) {
|
||||||
// this.setIngameFocus();
|
// this.setIngameFocus();
|
||||||
// }
|
// }
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
package net.minecraft.src;
|
|
||||||
|
|
||||||
import java.awt.Canvas;
|
|
||||||
import java.awt.Dimension;
|
|
||||||
|
|
||||||
class CanvasCrashReport extends Canvas {
|
|
||||||
public CanvasCrashReport(int var1) {
|
|
||||||
this.setPreferredSize(new Dimension(var1, var1));
|
|
||||||
this.setMinimumSize(new Dimension(var1, var1));
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,27 +0,0 @@
|
|||||||
package net.minecraft.src;
|
|
||||||
|
|
||||||
import java.awt.event.WindowAdapter;
|
|
||||||
import java.awt.event.WindowEvent;
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
|
|
||||||
public final class GameWindowListener extends WindowAdapter {
|
|
||||||
final Minecraft mc;
|
|
||||||
final Thread thread;
|
|
||||||
|
|
||||||
public GameWindowListener(Minecraft var1, Thread var2) {
|
|
||||||
this.mc = var1;
|
|
||||||
this.thread = var2;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void windowClosing(WindowEvent var1) {
|
|
||||||
this.mc.shutdown();
|
|
||||||
|
|
||||||
try {
|
|
||||||
this.thread.join();
|
|
||||||
} catch (InterruptedException var3) {
|
|
||||||
var3.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
System.exit(0);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,10 +1,11 @@
|
|||||||
package net.minecraft.src;
|
package net.minecraft.src;
|
||||||
|
|
||||||
import java.awt.Color;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.peyton.java.awt.Color;
|
||||||
import org.lwjgl.input.Keyboard;
|
import org.lwjgl.input.Keyboard;
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
import org.lwjgl.opengl.GL12;
|
import org.lwjgl.opengl.GL12;
|
||||||
|
@ -2,6 +2,7 @@ package net.minecraft.src;
|
|||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
import net.lax1dude.eaglercraft.EagRuntime;
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
import org.lwjgl.util.glu.GLU;
|
import org.lwjgl.util.glu.GLU;
|
||||||
|
|
||||||
@ -14,7 +15,7 @@ public class GuiMainMenu extends GuiScreen {
|
|||||||
|
|
||||||
public GuiMainMenu() {
|
public GuiMainMenu() {
|
||||||
ArrayList<String> splashes = new ArrayList<>(Arrays.asList("Darviglet!", "eaglerenophile!", "You Eagler!", "Yeeeeeee!", "yeee", "EEEEEEEEE!", "You Darvig!", "You Vigg!", ":>", "|>", "You Yumpster!", "No longer on Gitpod", "MiG Mad Marine", "Wild Weasel", "YGBSM", "Union Aerospace Corporation"));
|
ArrayList<String> splashes = new ArrayList<>(Arrays.asList("Darviglet!", "eaglerenophile!", "You Eagler!", "Yeeeeeee!", "yeee", "EEEEEEEEE!", "You Darvig!", "You Vigg!", ":>", "|>", "You Yumpster!", "No longer on Gitpod", "MiG Mad Marine", "Wild Weasel", "YGBSM", "Union Aerospace Corporation"));
|
||||||
this.splashString = (String)splashes.get(rand.nextInt(splashes.size()));
|
this.splashString = splashes.get(rand.nextInt(splashes.size()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateScreen() {
|
public void updateScreen() {
|
||||||
@ -42,7 +43,6 @@ public class GuiMainMenu extends GuiScreen {
|
|||||||
if(this.mc.session == null) {
|
if(this.mc.session == null) {
|
||||||
((GuiButton)this.controlList.get(1)).enabled = false;
|
((GuiButton)this.controlList.get(1)).enabled = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void actionPerformed(GuiButton var1) {
|
protected void actionPerformed(GuiButton var1) {
|
||||||
@ -75,11 +75,14 @@ public class GuiMainMenu extends GuiScreen {
|
|||||||
GL11.glScalef(var5, var5, var5);
|
GL11.glScalef(var5, var5, var5);
|
||||||
this.drawCenteredString(this.fontRenderer, this.splashString, 0, -8, 16776960);
|
this.drawCenteredString(this.fontRenderer, this.splashString, 0, -8, 16776960);
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
String var6 = "Copyright Mojang Specifications. Do not distribute.";
|
this.drawString(this.fontRenderer, "Minecraft Alpha v1.1.2_01", 2, this.height - 20, 16777215);
|
||||||
|
this.drawString(this.fontRenderer, "Eaglercraft 25w19a", 2, this.height - 10, 16777215);
|
||||||
|
String var6 = "copyright 2010 Mojang AB";
|
||||||
|
this.drawString(this.fontRenderer, "site resources are", this.width - this.fontRenderer.getStringWidth("site resources are") - 2, this.height - 20, 16777215);
|
||||||
this.drawString(this.fontRenderer, var6, this.width - this.fontRenderer.getStringWidth(var6) - 2, this.height - 10, 16777215);
|
this.drawString(this.fontRenderer, var6, this.width - this.fontRenderer.getStringWidth(var6) - 2, this.height - 10, 16777215);
|
||||||
long var7 = Runtime.getRuntime().maxMemory();
|
long var7 = EagRuntime.maxMemory();
|
||||||
long var9 = Runtime.getRuntime().totalMemory();
|
long var9 = EagRuntime.totalMemory();
|
||||||
long var11 = Runtime.getRuntime().freeMemory();
|
long var11 = EagRuntime.freeMemory();
|
||||||
long var13 = var7 - var11;
|
long var13 = var7 - var11;
|
||||||
var6 = "Free memory: " + var13 * 100L / var7 + "% of " + var7 / 1024L / 1024L + "MB";
|
var6 = "Free memory: " + var13 * 100L / var7 + "% of " + var7 / 1024L / 1024L + "MB";
|
||||||
this.drawString(this.fontRenderer, var6, this.width - this.fontRenderer.getStringWidth(var6) - 2, 2, 8421504);
|
this.drawString(this.fontRenderer, var6, this.width - this.fontRenderer.getStringWidth(var6) - 2, 2, 8421504);
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
package net.minecraft.src;
|
package net.minecraft.src;
|
||||||
|
|
||||||
import java.awt.Toolkit;
|
|
||||||
import java.awt.datatransfer.DataFlavor;
|
|
||||||
import java.awt.datatransfer.Transferable;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -38,16 +35,7 @@ public class GuiScreen extends Gui {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String getClipboardString() {
|
public static String getClipboardString() {
|
||||||
try {
|
return EagRuntime.getClipboard();
|
||||||
Transferable var0 = Toolkit.getDefaultToolkit().getSystemClipboard().getContents((Object)null);
|
|
||||||
if(var0 != null && var0.isDataFlavorSupported(DataFlavor.stringFlavor)) {
|
|
||||||
String var1 = (String)var0.getTransferData(DataFlavor.stringFlavor);
|
|
||||||
return var1;
|
|
||||||
}
|
|
||||||
} catch (Exception var2) {
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void setClipboardString(String text){
|
public static void setClipboardString(String text){
|
||||||
|
@ -1,7 +0,0 @@
|
|||||||
package net.minecraft.src;
|
|
||||||
|
|
||||||
import java.awt.image.BufferedImage;
|
|
||||||
|
|
||||||
public interface ImageBuffer {
|
|
||||||
BufferedImage parseUserSkin(BufferedImage var1);
|
|
||||||
}
|
|
@ -1,88 +0,0 @@
|
|||||||
package net.minecraft.src;
|
|
||||||
|
|
||||||
import java.awt.Graphics;
|
|
||||||
import java.awt.image.BufferedImage;
|
|
||||||
import java.awt.image.DataBufferInt;
|
|
||||||
import java.awt.image.ImageObserver;
|
|
||||||
|
|
||||||
public class ImageBufferDownload implements ImageBuffer {
|
|
||||||
private int[] imageData;
|
|
||||||
private int imageWidth;
|
|
||||||
private int imageHeight;
|
|
||||||
|
|
||||||
public BufferedImage parseUserSkin(BufferedImage var1) {
|
|
||||||
if(var1 == null) {
|
|
||||||
return null;
|
|
||||||
} else {
|
|
||||||
this.imageWidth = 64;
|
|
||||||
this.imageHeight = 32;
|
|
||||||
BufferedImage var2 = new BufferedImage(this.imageWidth, this.imageHeight, 2);
|
|
||||||
Graphics var3 = var2.getGraphics();
|
|
||||||
var3.drawImage(var1, 0, 0, (ImageObserver)null);
|
|
||||||
var3.dispose();
|
|
||||||
this.imageData = ((DataBufferInt)var2.getRaster().getDataBuffer()).getData();
|
|
||||||
this.setAreaOpaque(0, 0, 32, 16);
|
|
||||||
this.setAreaTransparent(32, 0, 64, 32);
|
|
||||||
this.setAreaOpaque(0, 16, 64, 32);
|
|
||||||
boolean var4 = false;
|
|
||||||
|
|
||||||
int var5;
|
|
||||||
int var6;
|
|
||||||
int var7;
|
|
||||||
for(var5 = 32; var5 < 64; ++var5) {
|
|
||||||
for(var6 = 0; var6 < 16; ++var6) {
|
|
||||||
var7 = this.imageData[var5 + var6 * 64];
|
|
||||||
if((var7 >> 24 & 255) < 128) {
|
|
||||||
var4 = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!var4) {
|
|
||||||
for(var5 = 32; var5 < 64; ++var5) {
|
|
||||||
for(var6 = 0; var6 < 16; ++var6) {
|
|
||||||
var7 = this.imageData[var5 + var6 * 64];
|
|
||||||
if((var7 >> 24 & 255) < 128) {
|
|
||||||
var4 = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return var2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setAreaTransparent(int var1, int var2, int var3, int var4) {
|
|
||||||
if(!this.hasTransparency(var1, var2, var3, var4)) {
|
|
||||||
for(int var5 = var1; var5 < var3; ++var5) {
|
|
||||||
for(int var6 = var2; var6 < var4; ++var6) {
|
|
||||||
this.imageData[var5 + var6 * this.imageWidth] &= 16777215;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setAreaOpaque(int var1, int var2, int var3, int var4) {
|
|
||||||
for(int var5 = var1; var5 < var3; ++var5) {
|
|
||||||
for(int var6 = var2; var6 < var4; ++var6) {
|
|
||||||
this.imageData[var5 + var6 * this.imageWidth] |= -16777216;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasTransparency(int var1, int var2, int var3, int var4) {
|
|
||||||
for(int var5 = var1; var5 < var3; ++var5) {
|
|
||||||
for(int var6 = var2; var6 < var4; ++var6) {
|
|
||||||
int var7 = this.imageData[var5 + var6 * this.imageWidth];
|
|
||||||
if((var7 >> 24 & 255) < 128) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,5 +1,7 @@
|
|||||||
package net.minecraft.src;
|
package net.minecraft.src;
|
||||||
|
|
||||||
|
import net.lax1dude.eaglercraft.EagUtils;
|
||||||
|
|
||||||
import java.io.DataInputStream;
|
import java.io.DataInputStream;
|
||||||
import java.io.DataOutputStream;
|
import java.io.DataOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@ -86,9 +88,8 @@ public class NetworkManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(var1) {
|
if(var1) {
|
||||||
Thread.sleep(10L);
|
EagUtils.sleep(10L);
|
||||||
}
|
}
|
||||||
} catch (InterruptedException var8) {
|
|
||||||
} catch (Exception var9) {
|
} catch (Exception var9) {
|
||||||
if(!this.isTerminating) {
|
if(!this.isTerminating) {
|
||||||
this.onNetworkError(var9);
|
this.onNetworkError(var9);
|
||||||
|
@ -1,98 +1,98 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
|
* Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
||||||
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
||||||
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||||
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||||
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
* POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.lax1dude.eaglercraft.profile;
|
package net.lax1dude.eaglercraft.profile;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import net.lax1dude.eaglercraft.EagRuntime;
|
import net.lax1dude.eaglercraft.EagRuntime;
|
||||||
import net.lax1dude.eaglercraft.EaglerInputStream;
|
import net.lax1dude.eaglercraft.EaglerInputStream;
|
||||||
import net.lax1dude.eaglercraft.EaglerOutputStream;
|
import net.lax1dude.eaglercraft.EaglerOutputStream;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.src.CompressedStreamTools;
|
import net.minecraft.src.CompressedStreamTools;
|
||||||
import net.minecraft.src.NBTTagCompound;
|
import net.minecraft.src.NBTTagCompound;
|
||||||
|
|
||||||
public class EaglerProfile {
|
public class EaglerProfile {
|
||||||
|
|
||||||
private static String username = "Socket";
|
private static String username = "Socket";
|
||||||
|
|
||||||
public static String getName() {
|
public static String getName() {
|
||||||
return username;
|
return username;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void setName(String str) {
|
public static void setName(String str) {
|
||||||
username = str;
|
username = str;
|
||||||
Minecraft mc = Minecraft.getMinecraft();
|
Minecraft mc = Minecraft.getMinecraft();
|
||||||
if(mc != null && mc.session != null) {
|
if(mc != null && mc.session != null) {
|
||||||
mc.session.username = str;
|
mc.session.username = str;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void read() {
|
public static void read() {
|
||||||
read(EagRuntime.getStorage("p"));
|
read(EagRuntime.getStorage("p"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void read(byte[] profileStorage) {
|
public static void read(byte[] profileStorage) {
|
||||||
if (profileStorage == null) {
|
if (profileStorage == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NBTTagCompound profile;
|
NBTTagCompound profile;
|
||||||
try {
|
try {
|
||||||
profile = CompressedStreamTools.readCompressed(new EaglerInputStream(profileStorage));
|
profile = CompressedStreamTools.readCompressed(new EaglerInputStream(profileStorage));
|
||||||
}catch(IOException ex) {
|
}catch(IOException ex) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (profile == null || profile.hasNoTags()) {
|
if (profile == null || profile.hasNoTags()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
String loadUsername = profile.getString("username").trim();
|
String loadUsername = profile.getString("username").trim();
|
||||||
|
|
||||||
if(!loadUsername.isEmpty()) {
|
if(!loadUsername.isEmpty()) {
|
||||||
username = loadUsername.replaceAll("[^A-Za-z0-9]", "_");
|
username = loadUsername.replaceAll("[^A-Za-z0-9]", "_");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static byte[] write() {
|
public static byte[] write() {
|
||||||
NBTTagCompound profile = new NBTTagCompound();
|
NBTTagCompound profile = new NBTTagCompound();
|
||||||
profile.setString("username", username);
|
profile.setString("username", username);
|
||||||
EaglerOutputStream bao = new EaglerOutputStream();
|
EaglerOutputStream bao = new EaglerOutputStream();
|
||||||
try {
|
try {
|
||||||
CompressedStreamTools.writeCompressed(profile, bao);
|
CompressedStreamTools.writeCompressed(profile, bao);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return bao.toByteArray();
|
return bao.toByteArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void save() {
|
public static void save() {
|
||||||
byte[] b = write();
|
byte[] b = write();
|
||||||
if(b != null) {
|
if(b != null) {
|
||||||
EagRuntime.setStorage("p", b);
|
EagRuntime.setStorage("p", b);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static {
|
static {
|
||||||
read();
|
read();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isDefaultUsername(String str) {
|
public static boolean isDefaultUsername(String str) {
|
||||||
return str.toLowerCase().matches("^(yeeish|yee|yeer|yeeler|eagler|eagl|darver|darvler|vool|vigg|deev|yigg|yeeg){2}\\d{2,4}$");
|
return str.toLowerCase().matches("^(yeeish|yee|yeer|yeeler|eagler|eagl|darver|darvler|vool|vigg|deev|yigg|yeeg){2}\\d{2,4}$");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user