mirror of
https://git.zelz.net/catfoolyou/Project164.git
synced 2025-12-14 08:47:40 +00:00
25w11c Add texturepack support
This commit is contained in:
@@ -1272,12 +1272,10 @@ public class EaglerAdapterImpl2 {
|
||||
}
|
||||
public static final byte[] getFileChooserResult() {
|
||||
byte[] b = fileChooserFile;
|
||||
fileChooserFile = null;
|
||||
return b;
|
||||
}
|
||||
public static final String getFileChooserResultName() {
|
||||
String s = fileChooserName;
|
||||
fileChooserName = null;
|
||||
return s;
|
||||
}
|
||||
public static final void clearFileChooserResult() {
|
||||
|
||||
@@ -5,7 +5,7 @@ import java.util.List;
|
||||
|
||||
public class ConfigConstants {
|
||||
|
||||
public static final String version = "25w11b";
|
||||
public static final String version = "25w11c";
|
||||
public static final String mainMenuString = "Eaglercraft " + version;
|
||||
|
||||
public static final String forkMe = "https://git.zelz.net/catfoolyou/Project164";
|
||||
|
||||
@@ -87,20 +87,6 @@ public class FontRenderer {
|
||||
*/
|
||||
protected boolean strikethroughStyle = false;
|
||||
|
||||
protected static char[] codepointLookup = new char[] { 192, 193, 194, 200, 202, 203, 205, 211, 212, 213, 218, 223,
|
||||
227, 245, 287, 304, 305, 338, 339, 350, 351, 372, 373, 382, 519, 0, 0, 0, 0, 0, 0, 0, 32, 33, 34, 35, 36,
|
||||
37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
|
||||
64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
|
||||
91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
|
||||
114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 0, 199, 252, 233, 226, 228, 224, 229, 231,
|
||||
234, 235, 232, 239, 238, 236, 196, 197, 201, 230, 198, 244, 246, 242, 251, 249, 255, 214, 220, 248, 163,
|
||||
216, 215, 402, 225, 237, 243, 250, 241, 209, 170, 186, 191, 174, 172, 189, 188, 161, 171, 187, 9617, 9618,
|
||||
9619, 9474, 9508, 9569, 9570, 9558, 9557, 9571, 9553, 9559, 9565, 9564, 9563, 9488, 9492, 9524, 9516, 9500,
|
||||
9472, 9532, 9566, 9567, 9562, 9556, 9577, 9574, 9568, 9552, 9580, 9575, 9576, 9572, 9573, 9561, 9560, 9554,
|
||||
9555, 9579, 9578, 9496, 9484, 9608, 9604, 9612, 9616, 9600, 945, 946, 915, 960, 931, 963, 956, 964, 934,
|
||||
920, 937, 948, 8734, 8709, 8712, 8745, 8801, 177, 8805, 8804, 8992, 8993, 247, 8776, 176, 8729, 183, 8730,
|
||||
8319, 178, 9632, 0 };
|
||||
|
||||
public FontRenderer(GameSettings par1GameSettings, String par2Str, RenderEngine par3RenderEngine, boolean par4) {
|
||||
this.fontTexture = new TextureLocation(par2Str);
|
||||
this.fontTextureName = par2Str;
|
||||
|
||||
@@ -112,7 +112,7 @@ public class GuiOptions extends GuiScreen
|
||||
if (par1GuiButton.id == 105)
|
||||
{
|
||||
this.mc.gameSettings.saveOptions();
|
||||
//this.mc.displayGuiScreen(new GuiScreenTemporaryResourcePackSelect(this, this.options));
|
||||
this.mc.displayGuiScreen(new GuiTexturePacks(this, this.options));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ public class MathHelper
|
||||
|
||||
public static final float sqrt_float(float par0)
|
||||
{
|
||||
return (float)Math.sqrt((double)par0);
|
||||
return (float)Math.sqrt(par0);
|
||||
}
|
||||
|
||||
public static final float sqrt_double(double par0)
|
||||
|
||||
@@ -1244,17 +1244,6 @@ public class NetClientHandler extends NetHandler {
|
||||
this.mc.displayGuiScreen(new GuiWinGame());
|
||||
} else if (var3 == 5) {
|
||||
GameSettings var5 = this.mc.gameSettings;
|
||||
|
||||
if (var4 == 0) {
|
||||
return;
|
||||
} else if (var4 == 101) {
|
||||
this.mc.ingameGUI.getChatGUI().addTranslatedMessage("demo.help.movement",
|
||||
new Object[] { EaglerAdapter.getKeyName(var5.keyBindForward.keyCode), EaglerAdapter.getKeyName(var5.keyBindLeft.keyCode), EaglerAdapter.getKeyName(var5.keyBindBack.keyCode), EaglerAdapter.getKeyName(var5.keyBindRight.keyCode) });
|
||||
} else if (var4 == 102) {
|
||||
this.mc.ingameGUI.getChatGUI().addTranslatedMessage("demo.help.jump", new Object[] { EaglerAdapter.getKeyName(var5.keyBindJump.keyCode) });
|
||||
} else if (var4 == 103) {
|
||||
this.mc.ingameGUI.getChatGUI().addTranslatedMessage("demo.help.inventory", new Object[] { EaglerAdapter.getKeyName(var5.keyBindInventory.keyCode) });
|
||||
}
|
||||
} else if (var3 == 6) {
|
||||
this.worldClient.playSound(var2.posX, var2.posY + (double) var2.getEyeHeight(), var2.posZ, "random.successful_hit", 0.18F, 0.45F, false);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user