mirror of
https://git.zelz.net/catfoolyou/Project164.git
synced 2025-12-14 10:57:42 +00:00
The other half of 25w11c
This commit is contained in:
@@ -1,10 +0,0 @@
|
||||
package net.minecraft.src;
|
||||
|
||||
public enum EnumOS
|
||||
{
|
||||
LINUX,
|
||||
SOLARIS,
|
||||
WINDOWS,
|
||||
MACOS,
|
||||
UNKNOWN;
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
package net.minecraft.src;
|
||||
|
||||
public class EnumOSHelper {
|
||||
public static final int[] field_90049_a = new int[EnumOS.values().length];
|
||||
|
||||
static {
|
||||
try {
|
||||
field_90049_a[EnumOS.LINUX.ordinal()] = 1;
|
||||
} catch (NoSuchFieldError var4) {
|
||||
;
|
||||
}
|
||||
|
||||
try {
|
||||
field_90049_a[EnumOS.SOLARIS.ordinal()] = 2;
|
||||
} catch (NoSuchFieldError var3) {
|
||||
;
|
||||
}
|
||||
|
||||
try {
|
||||
field_90049_a[EnumOS.WINDOWS.ordinal()] = 3;
|
||||
} catch (NoSuchFieldError var2) {
|
||||
;
|
||||
}
|
||||
|
||||
try {
|
||||
field_90049_a[EnumOS.MACOS.ordinal()] = 4;
|
||||
} catch (NoSuchFieldError var1) {
|
||||
;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -503,7 +503,6 @@ public class GuiMainMenu extends GuiScreen {
|
||||
this.drawString(this.fontRenderer, "Minecraft 1.6.4", 2, this.height - 20, 16777215);
|
||||
this.drawString(this.fontRenderer, ConfigConstants.mainMenuString + EnumChatFormatting.GRAY + " (cracked)", 2, this.height - 10, 16777215);
|
||||
|
||||
//String var10 = "Copyright " + Calendar.getInstance().get(Calendar.YEAR) + " Mojang AB.";
|
||||
String var10 = "copyright 2013 Mojang AB";
|
||||
this.drawString(this.fontRenderer, var10, this.width - this.fontRenderer.getStringWidth(var10) - 2, this.height - 10, 16777215);
|
||||
|
||||
@@ -532,19 +531,6 @@ public class GuiMainMenu extends GuiScreen {
|
||||
this.drawCenteredString(this.fontRenderer, this.splashText, 0, -8, 16776960);
|
||||
EaglerAdapter.glPopMatrix();
|
||||
}
|
||||
/*
|
||||
String lid = "(login is disabled, this copy violates Mojang's terms of service)";
|
||||
int sl = this.fontRenderer.getStringWidth(lid);
|
||||
|
||||
EaglerAdapter.glPushMatrix();
|
||||
float k = ((this.width - sl) * 3 / 4) < 80 ? 0.5f : 0.75f;
|
||||
EaglerAdapter.glScalef(k, k, k);
|
||||
EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND);
|
||||
EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA);
|
||||
this.drawString(fontRenderer, lid, (int)(this.width / k - sl) / 2, (int)((this.height - 19) / k), 0x88999999);
|
||||
EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND);
|
||||
EaglerAdapter.glPopMatrix();
|
||||
*/
|
||||
var10 = "eaglercraft readme.txt";
|
||||
int w = this.fontRenderer.getStringWidth(var10) * 3 / 4;
|
||||
if(!showAck && par1 >= (this.width - w - 4) && par1 <= this.width && par2 >= 0 && par2 <= 9) {
|
||||
|
||||
@@ -8,8 +8,6 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class GuiScreen extends Gui {
|
||||
public static final boolean isMacOs = Minecraft.getOs() == EnumOS.MACOS;
|
||||
|
||||
/** Reference to the Minecraft object. */
|
||||
protected Minecraft mc;
|
||||
|
||||
@@ -253,7 +251,7 @@ public class GuiScreen extends Gui {
|
||||
}
|
||||
|
||||
public static boolean isCtrlKeyDown() {
|
||||
return EaglerAdapter.isKeyDown(29) || EaglerAdapter.isKeyDown(157) || (isMacOs && (EaglerAdapter.isKeyDown(28) || EaglerAdapter.isKeyDown(219) || EaglerAdapter.isKeyDown(220)));
|
||||
return EaglerAdapter.isKeyDown(29) || EaglerAdapter.isKeyDown(157);
|
||||
}
|
||||
|
||||
public static boolean isShiftKeyDown() {
|
||||
|
||||
@@ -44,7 +44,7 @@ public class ItemRecord extends Item
|
||||
else
|
||||
{
|
||||
((BlockJukeBox)Block.jukebox).insertRecord(par3World, par4, par5, par6, par1ItemStack);
|
||||
par3World.playAuxSFXAtEntity((EntityPlayer)null, 1005, par4, par5, par6, this.itemID);
|
||||
par3World.playAuxSFXAtEntity(null, 1005, par4, par5, par6, this.itemID);
|
||||
--par1ItemStack.stackSize;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ public class LogAgent implements ILogAgent
|
||||
this.serverLogger.removeHandler(var4);
|
||||
}
|
||||
|
||||
LogFormatter var6 = new LogFormatter(this, (LogAgentEmptyAnon)null);
|
||||
LogFormatter var6 = new LogFormatter(this);
|
||||
ConsoleHandler var7 = new ConsoleHandler();
|
||||
var7.setFormatter(var6);
|
||||
this.serverLogger.addHandler(var7);
|
||||
|
||||
@@ -12,7 +12,7 @@ class LogFormatter extends Formatter
|
||||
|
||||
final LogAgent field_98229_a;
|
||||
|
||||
private LogFormatter(LogAgent par1LogAgent)
|
||||
LogFormatter(LogAgent par1LogAgent)
|
||||
{
|
||||
this.field_98229_a = par1LogAgent;
|
||||
this.field_98228_b = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
@@ -42,9 +42,4 @@ class LogFormatter extends Formatter
|
||||
|
||||
return var2.toString();
|
||||
}
|
||||
|
||||
LogFormatter(LogAgent par1LogAgent, LogAgentEmptyAnon par2LogAgentEmptyAnon)
|
||||
{
|
||||
this(par1LogAgent);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -157,20 +157,20 @@ public class MathHelper
|
||||
return par1 >= par3 ? par1 : par0Random.nextDouble() * (par3 - par1) + par1;
|
||||
}
|
||||
|
||||
public static double average(long[] par0ArrayOfLong)
|
||||
{
|
||||
long var1 = 0L;
|
||||
long[] var3 = par0ArrayOfLong;
|
||||
int var4 = par0ArrayOfLong.length;
|
||||
|
||||
for (int var5 = 0; var5 < var4; ++var5)
|
||||
{
|
||||
long var6 = var3[var5];
|
||||
var1 += var6;
|
||||
}
|
||||
|
||||
return (double)var1 / (double)par0ArrayOfLong.length;
|
||||
}
|
||||
// public static double average(long[] par0ArrayOfLong)
|
||||
// {
|
||||
// long var1 = 0L;
|
||||
// long[] var3 = par0ArrayOfLong;
|
||||
// int var4 = par0ArrayOfLong.length;
|
||||
//
|
||||
// for (int var5 = 0; var5 < var4; ++var5)
|
||||
// {
|
||||
// long var6 = var3[var5];
|
||||
// var1 += var6;
|
||||
// }
|
||||
//
|
||||
// return (double)var1 / (double)par0ArrayOfLong.length;
|
||||
// }
|
||||
|
||||
/**
|
||||
* the angle is reduced to an angle between -180 and +180 by mod, and a 360 check
|
||||
|
||||
@@ -413,17 +413,6 @@ public class Minecraft
|
||||
this.updateDisplay();
|
||||
}
|
||||
|
||||
public static EnumOS getOs() {
|
||||
String var0 = EaglerAdapter.getUserAgent().toLowerCase();
|
||||
return var0.contains("win") ? EnumOS.WINDOWS
|
||||
: (var0.contains("mac") ? EnumOS.MACOS
|
||||
: (var0.contains("solaris") ? EnumOS.SOLARIS : (var0.contains("sunos") ? EnumOS.SOLARIS : (var0.contains("linux") ? EnumOS.LINUX : (var0.contains("unix") ? EnumOS.LINUX : EnumOS.UNKNOWN)))));
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a new screen.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Loads Tessellator with a scaled resolution
|
||||
*/
|
||||
@@ -839,8 +828,10 @@ public class Minecraft
|
||||
if(gameSettings.enableVsync) {
|
||||
EaglerAdapter.updateDisplay(0, true);
|
||||
}else {
|
||||
int i = this.func_90020_K();
|
||||
EaglerAdapter.updateDisplay(i > 0 ? EntityRenderer.performanceToFps(i) : 0, false);
|
||||
if(EnumBrowser.getBrowser() == EnumBrowser.DESKTOP){
|
||||
int i = this.func_90020_K();
|
||||
EaglerAdapter.updateDisplay(i > 0 ? EntityRenderer.performanceToFps(i) : 0, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
package net.minecraft.src;
|
||||
|
||||
public class Util
|
||||
{
|
||||
public static EnumOS getOSType()
|
||||
{
|
||||
String var0 = System.getProperty("os.name").toLowerCase();
|
||||
return var0.contains("win") ? EnumOS.WINDOWS : (var0.contains("mac") ? EnumOS.MACOS : (var0.contains("solaris") ? EnumOS.SOLARIS : (var0.contains("sunos") ? EnumOS.SOLARIS : (var0.contains("linux") ? EnumOS.LINUX : (var0.contains("unix") ? EnumOS.LINUX : EnumOS.UNKNOWN)))));
|
||||
}
|
||||
}
|
||||
@@ -302,7 +302,7 @@ public class WorldRenderer {
|
||||
* is not initialized
|
||||
*/
|
||||
public boolean skipAllRenderPasses() {
|
||||
return !this.isInitialized ? false : this.skipRenderPass[0] && this.skipRenderPass[1];
|
||||
return !this.isInitialized ? false : (this.skipRenderPass[0] && this.skipRenderPass[1] && !this.needsUpdate);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user