3rdparty/peytonplayz585-indev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Got it to compile with TeaVM!

Browse Source
This commit is contained in:
PeytonPlayz595 2023-07-19 15:45:22 -04:00
parent 7d92e54b1a
commit c463d9d6be
10 changed files with 178 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/teavm/java/net/PeytonPlayz585/MinecraftMain.java
View File

@ -48,8 +48,10 @@ public class MinecraftMain {
private static void run1() { private static void run1() {
Minecraft minecraft = new Minecraft(GL11.getCanvasWidth(), GL11.getCanvasHeight()); Minecraft minecraft = new Minecraft(GL11.getCanvasWidth(), GL11.getCanvasHeight());
minecraft.minecraftUri = "127.0.0.1:25565"; //minecraft.minecraftUri = "127.0.0.1:25565";
minecraft.session = new Session("PeytonPlayz595", "WebGL-Emulator"); minecraft.session = new Session("PeytonPlayz595", "WebGL-Emulator");
Thread thread = new Thread (minecraft, "Minecraft main Thread");
thread.run();
} }
@JSBody(params = { }, script = "return window.classicConfig;") @JSBody(params = { }, script = "return window.classicConfig;")

6
src/teavm/java/net/minecraft/client/GuiMainMenu.java
View File

@ -66,9 +66,9 @@ public final class GuiMainMenu extends GuiScreen {
GL11.glPopMatrix(); GL11.glPopMatrix();
String var16 = "Copyright Mojang Specifications. Do not distribute."; String var16 = "Copyright Mojang Specifications. Do not distribute.";
drawString(this.fontRenderer, var16, this.width - this.fontRenderer.getStringWidth(var16) - 2, this.height - 10, 16777215); drawString(this.fontRenderer, var16, this.width - this.fontRenderer.getStringWidth(var16) - 2, this.height - 10, 16777215);
long var7 = Runtime.getRuntime().maxMemory(); long var7 = GL11.maxMemory();
long var9 = Runtime.getRuntime().totalMemory(); long var9 = GL11.totalMemory();
long var11 = Runtime.getRuntime().freeMemory(); long var11 = GL11.freeMemory();
long var13 = var7 - var11; long var13 = var7 - var11;
var16 = "Free memory: " + var13 * 100L / var7 + "% of " + var7 / 1024L / 1024L + "MB"; var16 = "Free memory: " + var13 * 100L / var7 + "% of " + var7 / 1024L / 1024L + "MB";
drawString(this.fontRenderer, var16, this.width - this.fontRenderer.getStringWidth(var16) - 2, 2, 8421504); drawString(this.fontRenderer, var16, this.width - this.fontRenderer.getStringWidth(var16) - 2, 2, 8421504);

3
src/teavm/java/net/minecraft/client/Minecraft.java
View File

@ -23,11 +23,8 @@ import net.minecraft.client.render.EntityRenderer;
import net.minecraft.client.render.RenderEngine; import net.minecraft.client.render.RenderEngine;
import net.minecraft.client.render.RenderGlobal; import net.minecraft.client.render.RenderGlobal;
import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.render.WorldRenderer;
import net.minecraft.client.render.texture.TextureFlamesFX;
import net.minecraft.client.render.texture.TextureGearsFX;
import net.minecraft.client.render.texture.TextureLavaFX; import net.minecraft.client.render.texture.TextureLavaFX;
import net.minecraft.client.render.texture.TextureWaterFX; import net.minecraft.client.render.texture.TextureWaterFX;
import net.minecraft.client.render.texture.TextureWaterFlowFX;
import net.minecraft.game.entity.Entity; import net.minecraft.game.entity.Entity;
import net.minecraft.game.entity.EntityLiving; import net.minecraft.game.entity.EntityLiving;
import net.minecraft.game.entity.player.InventoryPlayer; import net.minecraft.game.entity.player.InventoryPlayer;

27
src/teavm/java/net/minecraft/client/gui/FontAllowedCharacters.java Normal file
View File

@ -0,0 +1,27 @@
package net.minecraft.client.gui;
public class FontAllowedCharacters {
public static int isAllowed(char c) {
int cc = (int) c;
for(int i = 0; i < allowedChars.length; ++i) {
if(cc == allowedChars[i]) {
return i;
}
}
return -1;
}
public static final int[] allowedChars = new int[]{
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,39,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,8962,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
};
public static final char field_22286_b[] = { '/', '\n', '\r', '\t', '\0', '\f', '`', '?', '*', '\\', '<', '>', '|', '"', ':' };
}

288
src/teavm/java/net/minecraft/client/gui/FontRenderer.java
View File

@ -1,179 +1,175 @@
package net.minecraft.client.gui; package net.minecraft.client.gui;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import javax.imageio.ImageIO;
import net.minecraft.client.GameSettings;
import net.minecraft.client.render.RenderEngine;
import net.minecraft.client.render.Tessellator;
import org.lwjgl.BufferUtils; import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
public final class FontRenderer { import net.PeytonPlayz585.minecraft.MinecraftImage;
private int[] charWidth = new int[256]; import net.minecraft.client.GameSettings;
private int fontTextureName = 0; import net.minecraft.client.render.RenderEngine;
private int fontDisplayLists; import net.minecraft.client.render.Tessellator;
private IntBuffer buffer = BufferUtils.createIntBuffer(1024);
public FontRenderer(GameSettings var1, String var2, RenderEngine var3) { public class FontRenderer {
BufferedImage var4;
try {
var4 = ImageIO.read(RenderEngine.class.getResourceAsStream(var2));
} catch (IOException var15) {
throw new RuntimeException(var15);
}
int var5 = var4.getWidth(); public FontRenderer(GameSettings gamesettings, String s, RenderEngine renderengine) {
int var6 = var4.getHeight(); charWidth = new int[256];
int[] var7 = new int[var5 * var6]; fontTextureName = 0;
var4.getRGB(0, 0, var5, var6, var7, 0, var5); MinecraftImage bufferedimage = GL11.loadPNG(GL11.loadResourceBytes(s));
int i = bufferedimage.w;
int var8; int j = bufferedimage.h;
int var9; int ai[] = bufferedimage.data;
int var11; for (int k = 0; k < 256; k++) {
int var13; int l = k % 16;
int var14; int k1 = k / 16;
for(int var17 = 0; var17 < 128; ++var17) { int j2 = 7;
var6 = var17 % 16; do {
var8 = var17 / 16; if (j2 < 0) {
var9 = 0; break;
}
for(boolean var10 = false; var9 < 8 && !var10; ++var9) { int i3 = l * 8 + j2;
var11 = (var6 << 3) + var9; boolean flag = true;
var10 = true; for (int l3 = 0; l3 < 8 && flag; l3++) {
int i4 = (k1 * 8 + l3) * i;
for(int var12 = 0; var12 < 8 && var10; ++var12) { int k4 = ai[i3 + i4] & 0xff;
var13 = ((var8 << 3) + var12) * var5; if (k4 > 0) {
var14 = var7[var11 + var13] & 255; flag = false;
if(var14 > 128) {
var10 = false;
} }
} }
}
if(var17 == 32) { if (!flag) {
var9 = 4; break;
}
j2--;
} while (true);
if (k == 32) {
j2 = 2;
} }
charWidth[k] = j2 + 2;
this.charWidth[var17] = var9;
} }
this.fontTextureName = var3.getTexture(var2); fontTextureName = renderengine.allocateAndSetupTexture(bufferedimage);
this.fontDisplayLists = GL11.glGenLists(288); fontDisplayLists = BufferUtils.generateDisplayLists(288);
Tessellator var18 = Tessellator.instance; Tessellator tessellator = Tessellator.instance;
for (int i1 = 0; i1 < 256; i1++) {
for(var6 = 0; var6 < 256; ++var6) { GL11.glNewList(fontDisplayLists + i1, 4864 /* GL_COMPILE */);
GL11.glNewList(this.fontDisplayLists + var6, GL11.GL_COMPILE); tessellator.startDrawingQuads();
var18.startDrawingQuads(); int l1 = (i1 % 16) * 8;
var8 = var6 % 16 << 3; int k2 = (i1 / 16) * 8;
var9 = var6 / 16 << 3; float f = 7.99F;
var18.addVertexWithUV(0.0F, 7.99F, 0.0F, (float)var8 / 128.0F, ((float)var9 + 7.99F) / 128.0F); float f1 = 0.0F;
var18.addVertexWithUV(7.99F, 7.99F, 0.0F, ((float)var8 + 7.99F) / 128.0F, ((float)var9 + 7.99F) / 128.0F); float f2 = 0.0F;
var18.addVertexWithUV(7.99F, 0.0F, 0.0F, ((float)var8 + 7.99F) / 128.0F, (float)var9 / 128.0F); tessellator.addVertexWithUV(0.0D, 0.0F + f, 0.0D, (float) l1 / 128F + f1, ((float) k2 + f) / 128F + f2);
var18.addVertexWithUV(0.0F, 0.0F, 0.0F, (float)var8 / 128.0F, (float)var9 / 128.0F); tessellator.addVertexWithUV(0.0F + f, 0.0F + f, 0.0D, ((float) l1 + f) / 128F + f1,
var18.draw(); ((float) k2 + f) / 128F + f2);
GL11.glTranslatef((float)this.charWidth[var6], 0.0F, 0.0F); tessellator.addVertexWithUV(0.0F + f, 0.0D, 0.0D, ((float) l1 + f) / 128F + f1, (float) k2 / 128F + f2);
tessellator.addVertexWithUV(0.0D, 0.0D, 0.0D, (float) l1 / 128F + f1, (float) k2 / 128F + f2);
tessellator.draw();
GL11.glEndList(); GL11.glEndList();
} }
for(var6 = 0; var6 < 32; ++var6) { for (int j1 = 0; j1 < 32; j1++) {
var8 = (var6 & 8) << 3; int i2 = (j1 >> 3 & 1) * 85;
var9 = (var6 & 1) * 191 + var8; int l2 = (j1 >> 2 & 1) * 170 + i2;
int var19 = ((var6 & 2) >> 1) * 191 + var8; int j3 = (j1 >> 1 & 1) * 170 + i2;
var11 = ((var6 & 4) >> 2) * 191 + var8; int k3 = (j1 >> 0 & 1) * 170 + i2;
boolean var20 = var6 >= 16; if (j1 == 6) {
if(var1.anaglyph) { l2 += 85;
var13 = (var11 * 30 + var19 * 59 + var9 * 11) / 100;
var14 = (var11 * 30 + var19 * 70) / 100;
int var16 = (var11 * 30 + var9 * 70) / 100;
var11 = var13;
var19 = var14;
var9 = var16;
} }
boolean flag1 = j1 >= 16;
var6 += 2; if (gamesettings.anaglyph) {
if(var20) { int j4 = (l2 * 30 + j3 * 59 + k3 * 11) / 100;
var11 /= 4; int l4 = (l2 * 30 + j3 * 70) / 100;
var19 /= 4; int i5 = (l2 * 30 + k3 * 70) / 100;
var9 /= 4; l2 = j4;
j3 = l4;
k3 = i5;
} }
if (flag1) {
GL11.glColor4f((float)var11 / 255.0F, (float)var19 / 255.0F, (float)var9 / 255.0F, 1.0F); l2 /= 4;
j3 /= 4;
k3 /= 4;
}
GL11.glNewList(fontDisplayLists + 256 + j1, 4864 /* GL_COMPILE */);
GL11.glColor3f((float) l2 / 255F, (float) j3 / 255F, (float) k3 / 255F);
GL11.glEndList();
} }
} }
public final void drawStringWithShadow(String var1, int var2, int var3, int var4) { public void drawStringWithShadow(String s, int i, int j, int k) {
this.renderString(var1, var2 + 1, var3 + 1, var4, true); renderString(s, i + 1, j + 1, k, true);
this.drawString(var1, var2, var3, var4); drawString(s, i, j, k);
} }
public final void drawString(String var1, int var2, int var3, int var4) { public void drawString(String s, int i, int j, int k) {
this.renderString(var1, var2, var3, var4, false); renderString(s, i, j, k, false);
} }
private void renderString(String var1, int var2, int var3, int var4, boolean var5) { public void renderString(String s, int i, int j, int k, boolean flag) {
if(var1 != null) { if (s == null) {
char[] var8 = var1.toCharArray(); return;
if(var5) {
var4 = (var4 & 16579836) >> 2;
}
GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.fontTextureName);
float var6 = (float)(var4 >> 16 & 255) / 255.0F;
float var7 = (float)(var4 >> 8 & 255) / 255.0F;
float var9 = (float)(var4 & 255) / 255.0F;
GL11.glColor4f(var6, var7, var9, 1.0F);
this.buffer.clear();
GL11.glPushMatrix();
GL11.glTranslatef((float)var2, (float)var3, 0.0F);
for(int var10 = 0; var10 < var8.length; ++var10) {
for(; var8[var10] == 38 && var8.length > var10 + 1; var10 += 2) {
int var11 = "0123456789abcdef".indexOf(var8[var10 + 1]);
if(var11 < 0 || var11 > 15) {
var11 = 15;
}
this.buffer.put(this.fontDisplayLists + 256 + var11 + (var5 ? 16 : 0));
if(this.buffer.remaining() == 0) {
this.buffer.flip();
GL11.glCallLists(this.buffer);
this.buffer.clear();
}
}
this.buffer.put(this.fontDisplayLists + var8[var10]);
if(this.buffer.remaining() == 0) {
this.buffer.flip();
GL11.glCallLists(this.buffer);
this.buffer.clear();
}
}
this.buffer.flip();
GL11.glCallLists(this.buffer);
GL11.glPopMatrix();
} }
if (flag) {
int l = k & 0xff000000;
k = (k & 0xfcfcfc) >> 2;
k += l;
}
GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, fontTextureName);
float f = (float) (k >> 16 & 0xff) / 255F;
float f1 = (float) (k >> 8 & 0xff) / 255F;
float f2 = (float) (k & 0xff) / 255F;
float f3 = (float) (k >> 24 & 0xff) / 255F;
if (f3 == 0.0F) {
f3 = 1.0F;
}
GL11.glColor4f(f, f1, f2, f3);
GL11.glPushMatrix();
GL11.glTranslatef(i, j, 0.0F);
for (int i1 = 0; i1 < s.length(); i1++) {
for (; s.length() > i1 + 1 && s.charAt(i1) == '\247'; i1 += 2) {
int j1 = "0123456789abcdef".indexOf(s.toLowerCase().charAt(i1 + 1));
if (j1 < 0 || j1 > 15) {
j1 = 15;
}
continue;
}
if (i1 < s.length()) {
int k1 = FontAllowedCharacters.isAllowed(s.charAt(i1));
if (k1 >= 0) {
GL11.glCallList(fontDisplayLists + k1 + 32);
GL11.glTranslatef(charWidth[k1 + 32], 0.0F, 0.0F);
}
}
}
GL11.glPopMatrix();
} }
public final int getStringWidth(String var1) { public int getStringWidth(String s) {
if(var1 == null) { if (s == null) {
return 0; return 0;
} else {
char[] var4 = var1.toCharArray();
int var2 = 0;
for(int var3 = 0; var3 < var4.length; ++var3) {
if(var4[var3] == 38) {
++var3;
} else {
var2 += this.charWidth[var4[var3]];
}
}
return var2;
} }
int i = 0;
for (int j = 0; j < s.length(); j++) {
if (s.charAt(j) == '\247') {
j++;
continue;
}
int k = FontAllowedCharacters.isAllowed(s.charAt(j));
if (k >= 0) {
i += charWidth[k + 32];
}
}
return i;
} }
}
private int charWidth[];
public int fontTextureName;
private int fontDisplayLists;
private IntBuffer buffer;
public static final char formatChar = '\247';
}

6
src/teavm/java/net/minecraft/client/gui/GuiIngame.java
View File

@ -158,9 +158,9 @@ public final class GuiIngame extends Gui {
var4.drawStringWithShadow(var23.renderGlobal.getDebugInfoEntities(), 2, 22, 16777215); var4.drawStringWithShadow(var23.renderGlobal.getDebugInfoEntities(), 2, 22, 16777215);
var23 = this.mc; var23 = this.mc;
var4.drawStringWithShadow("P: " + var23.effectRenderer.getStatistics() + ". T: " + var23.theWorld.debugSkylightUpdates(), 2, 32, 16777215); var4.drawStringWithShadow("P: " + var23.effectRenderer.getStatistics() + ". T: " + var23.theWorld.debugSkylightUpdates(), 2, 32, 16777215);
long var24 = Runtime.getRuntime().maxMemory(); long var24 = GL11.maxMemory();
long var27 = Runtime.getRuntime().totalMemory(); long var27 = GL11.totalMemory();
long var28 = Runtime.getRuntime().freeMemory(); long var28 = GL11.freeMemory();
long var16 = var24 - var28; long var16 = var24 - var28;
String var18 = "Free memory: " + var16 * 100L / var24 + "% of " + var24 / 1024L / 1024L + "MB"; String var18 = "Free memory: " + var16 * 100L / var24 + "% of " + var24 / 1024L / 1024L + "MB";
drawString(var4, var18, var3 - var4.getStringWidth(var18) - 2, 2, 14737632); drawString(var4, var18, var3 - var4.getStringWidth(var18) - 2, 2, 14737632);

8
src/teavm/java/net/minecraft/client/render/EntityRenderer.java
View File

@ -1,17 +1,10 @@
package net.minecraft.client.render; package net.minecraft.client.render;
import java.awt.Graphics;
import java.awt.image.BufferedImage;
import java.awt.image.DataBufferInt;
import java.awt.image.ImageObserver;
import java.io.File;
import java.io.FileOutputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import javax.imageio.ImageIO;
import net.PeytonPlayz585.math.MathHelper; import net.PeytonPlayz585.math.MathHelper;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@ -22,7 +15,6 @@ import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.player.EntityPlayerSP; import net.minecraft.client.player.EntityPlayerSP;
import net.minecraft.client.render.camera.ClippingHelperImplementation; import net.minecraft.client.render.camera.ClippingHelperImplementation;
import net.minecraft.client.render.camera.Frustrum; import net.minecraft.client.render.camera.Frustrum;
import net.minecraft.client.render.camera.IsomCamera;
import net.minecraft.game.entity.Entity; import net.minecraft.game.entity.Entity;
import net.minecraft.game.level.World; import net.minecraft.game.level.World;
import net.minecraft.game.level.block.Block; import net.minecraft.game.level.block.Block;

45
src/teavm/java/net/minecraft/client/render/ThreadDownloadImage.java
View File

@ -1,45 +0,0 @@
package net.minecraft.client.render;
import java.net.HttpURLConnection;
import java.net.URL;
import javax.imageio.ImageIO;
final class ThreadDownloadImage extends Thread {
private String location;
private ImageBufferDownload buffer;
private ThreadDownloadImageData imageData;
ThreadDownloadImage(ThreadDownloadImageData var1, String var2, ImageBufferDownload var3) {
this.imageData = var1;
this.location = var2;
this.buffer = var3;
}
public final void run() {
HttpURLConnection var1 = null;
try {
URL var2 = new URL(this.location);
var1 = (HttpURLConnection)var2.openConnection();
var1.setDoInput(true);
var1.setDoOutput(false);
var1.connect();
if(var1.getResponseCode() == 404) {
return;
}
if(this.buffer == null) {
this.imageData.image = ImageIO.read(var1.getInputStream());
} else {
this.imageData.image = this.buffer.parseUserSkin(ImageIO.read(var1.getInputStream()));
}
return;
} catch (Exception var5) {
var5.printStackTrace();
} finally {
var1.disconnect();
}
}
}

14
src/teavm/java/net/minecraft/client/render/ThreadDownloadImageData.java
View File

@ -1,14 +0,0 @@
package net.minecraft.client.render;
import java.awt.image.BufferedImage;
public final class ThreadDownloadImageData {
public BufferedImage image;
public int referenceCount = 1;
public int textureName = -1;
public boolean textureSetupComplete = false;
public ThreadDownloadImageData(String var1, ImageBufferDownload var2) {
(new ThreadDownloadImage(this, var1, var2)).start();
}
}

66
src/teavm/java/net/minecraft/client/render/texture/TextureGearsFX.java
View File

@ -1,66 +0,0 @@
package net.minecraft.client.render.texture;
import java.awt.image.BufferedImage;
import java.io.IOException;
import javax.imageio.ImageIO;
import net.PeytonPlayz585.math.MathHelper;
import net.minecraft.game.level.block.Block;
public class TextureGearsFX extends TextureFX {
private int gearRotation = 0;
private int[] gearColor = new int[1024];
private int[] gearMiddleColor = new int[1024];
private int gearRotationDir;
public TextureGearsFX(int var1) {
super(Block.cog.blockIndexInTexture + var1);
this.gearRotationDir = (var1 << 1) - 1;
this.gearRotation = 2;
try {
BufferedImage var3 = ImageIO.read(TextureGearsFX.class.getResource("/misc/gear.png"));
var3.getRGB(0, 0, 32, 32, this.gearColor, 0, 32);
var3 = ImageIO.read(TextureGearsFX.class.getResource("/misc/gearmiddle.png"));
var3.getRGB(0, 0, 16, 16, this.gearMiddleColor, 0, 16);
} catch (IOException var2) {
var2.printStackTrace();
}
}
public final void onTick() {
this.gearRotation = this.gearRotation + this.gearRotationDir & 63;
float var1 = MathHelper.sin((float)this.gearRotation / 64.0F * (float)Math.PI * 2.0F);
float var2 = MathHelper.cos((float)this.gearRotation / 64.0F * (float)Math.PI * 2.0F);
for(int var3 = 0; var3 < 16; ++var3) {
for(int var4 = 0; var4 < 16; ++var4) {
float var5 = ((float)var3 / 15.0F - 0.5F) * 31.0F;
float var6 = ((float)var4 / 15.0F - 0.5F) * 31.0F;
float var7 = var2 * var5 - var1 * var6;
var5 = var2 * var6 + var1 * var5;
int var11 = (int)(var7 + 16.0F);
int var10 = (int)(var5 + 16.0F);
int var12 = 0;
if(var11 >= 0 && var10 >= 0 && var11 < 32 && var10 < 32) {
var12 = this.gearColor[var11 + (var10 << 5)];
var10 = this.gearMiddleColor[var3 + (var4 << 4)];
if(var10 >>> 24 > 128) {
var12 = var10;
}
}
var10 = var12 >> 16 & 255;
var11 = var12 >> 8 & 255;
int var8 = var12 & 255;
var12 = var12 >>> 24 > 128 ? 255 : 0;
int var9 = var3 + (var4 << 4);
this.imageData[var9 << 2] = (byte)var10;
this.imageData[(var9 << 2) + 1] = (byte)var11;
this.imageData[(var9 << 2) + 2] = (byte)var8;
this.imageData[(var9 << 2) + 3] = (byte)var12;
}
}
}
}