From f87b6180de39a878e46b6d9306324bcb2686cb27 Mon Sep 17 00:00:00 2001 From: LAX1DUDE Date: Sun, 23 Jan 2022 22:45:22 -0800 Subject: [PATCH] fixed illegal NPOT mipmapping, fixed SoundManager class, fixed Enderman glitch --- .../main/java/net/md_5/bungee/config/YamlConfig.java | 5 +---- .../net/lax1dude/eaglercraft/TextureTerrainMap.java | 4 ++-- src/main/java/net/minecraft/src/RenderPlayer.java | 2 +- src/main/java/net/minecraft/src/SoundManager.java | 10 +++++----- stable-download/java/bungee_command/config.yml | 4 +--- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/eaglercraftbungee/src/main/java/net/md_5/bungee/config/YamlConfig.java b/eaglercraftbungee/src/main/java/net/md_5/bungee/config/YamlConfig.java index dd049c6..20b90d4 100644 --- a/eaglercraftbungee/src/main/java/net/md_5/bungee/config/YamlConfig.java +++ b/eaglercraftbungee/src/main/java/net/md_5/bungee/config/YamlConfig.java @@ -69,10 +69,7 @@ public class YamlConfig implements ConfigurationAdapter { permissions.put("default", Arrays.asList("bungeecord.command.server", "bungeecord.command.list")); permissions.put("admin", Arrays.asList("bungeecord.command.alert", "bungeecord.command.end", "bungeecord.command.ip", "bungeecord.command.reload")); } - final Map groups = this.get("groups", new HashMap()); - if (groups.isEmpty()) { - groups.put("lax1dude", Collections.singletonList("admin")); - } + this.get("groups", new HashMap()); /* final Map auth = this.get("authservice", new HashMap()); if(auth.isEmpty()) { diff --git a/src/main/java/net/lax1dude/eaglercraft/TextureTerrainMap.java b/src/main/java/net/lax1dude/eaglercraft/TextureTerrainMap.java index 961c63b..b50af3a 100644 --- a/src/main/java/net/lax1dude/eaglercraft/TextureTerrainMap.java +++ b/src/main/java/net/lax1dude/eaglercraft/TextureTerrainMap.java @@ -198,8 +198,8 @@ public class TextureTerrainMap implements IconRegister { private int nextSlot = 0; public TextureTerrainMap(int size, String par2, String par3Str, EaglerImage par4BufferedImage) { - this.width = size / 48 * 48; - this.height = size / 48 * 48; + this.width = size; + this.height = size; this.basePath = par3Str; this.missingImage = new TerrainIcon(nextSlot++, this, null); this.iconList = new ArrayList(); diff --git a/src/main/java/net/minecraft/src/RenderPlayer.java b/src/main/java/net/minecraft/src/RenderPlayer.java index cf6559f..cd51fc7 100644 --- a/src/main/java/net/minecraft/src/RenderPlayer.java +++ b/src/main/java/net/minecraft/src/RenderPlayer.java @@ -174,7 +174,6 @@ public class RenderPlayer extends RenderLiving { EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND); EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE); - EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glTranslatef((float)par2, (float)par4 - par1EntityPlayer.yOffset + 0.05f, (float)par6); float var13 = this.handleRotationFloat(par1EntityPlayer, par9); float var10 = par1EntityPlayer.prevRenderYawOffset + (par1EntityPlayer.renderYawOffset - par1EntityPlayer.prevRenderYawOffset) * par9; @@ -195,6 +194,7 @@ public class RenderPlayer extends RenderLiving { EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA); EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE); + EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glPopMatrix(); EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/src/main/java/net/minecraft/src/SoundManager.java b/src/main/java/net/minecraft/src/SoundManager.java index ce21185..7dc1145 100644 --- a/src/main/java/net/minecraft/src/SoundManager.java +++ b/src/main/java/net/minecraft/src/SoundManager.java @@ -101,11 +101,11 @@ public class SoundManager { if(par1EntityLiving == null) { EaglerAdapter.setListenerPos(0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f); }else { - float x = (float)(par1EntityLiving.prevPosX + (par1EntityLiving.posX - par1EntityLiving.prevPosX) * par2); - float y = (float)(par1EntityLiving.prevPosY + (par1EntityLiving.posY - par1EntityLiving.prevPosY) * par2); - float z = (float)(par1EntityLiving.prevPosZ + (par1EntityLiving.posZ - par1EntityLiving.prevPosZ) * par2); - float pitch = (float)(par1EntityLiving.prevRotationPitch + (par1EntityLiving.rotationPitch - par1EntityLiving.prevRotationPitch) * par2); - float yaw = (float)(par1EntityLiving.prevRotationYaw + (par1EntityLiving.rotationYaw - par1EntityLiving.prevRotationYaw) * par2); + float x = (float)(par1EntityLiving.prevPosX + (par1EntityLiving.posX - par1EntityLiving.prevPosX) * par2); if(!Float.isFinite(x)) x = 0.0f; + float y = (float)(par1EntityLiving.prevPosY + (par1EntityLiving.posY - par1EntityLiving.prevPosY) * par2); if(!Float.isFinite(y)) y = 0.0f; + float z = (float)(par1EntityLiving.prevPosZ + (par1EntityLiving.posZ - par1EntityLiving.prevPosZ) * par2); if(!Float.isFinite(z)) z = 0.0f; + float pitch = (float)(par1EntityLiving.prevRotationPitch + (par1EntityLiving.rotationPitch - par1EntityLiving.prevRotationPitch) * par2); if(!Float.isFinite(pitch)) pitch = 0.0f; + float yaw = (float)(par1EntityLiving.prevRotationYaw + (par1EntityLiving.rotationYaw - par1EntityLiving.prevRotationYaw) * par2); if(!Float.isFinite(yaw)) yaw = 0.0f; EaglerAdapter.setListenerPos(x, y, z, (float)par1EntityLiving.motionX, (float)par1EntityLiving.motionY, (float)par1EntityLiving.motionZ, pitch, yaw); } } diff --git a/stable-download/java/bungee_command/config.yml b/stable-download/java/bungee_command/config.yml index 3ff1fc9..30bdc1d 100644 --- a/stable-download/java/bungee_command/config.yml +++ b/stable-download/java/bungee_command/config.yml @@ -11,9 +11,7 @@ listeners: default_server: lobby force_default_server: true stats: 595698b3-9c36-4e86-b1ee-cb3027038f41 -groups: - lax1dude: - - admin +groups: {} player_limit: -1 permissions: default: