fixed illegal NPOT mipmapping, fixed SoundManager class, fixed Enderman glitch
This commit is contained in:
parent
27e0225c4b
commit
f87b6180de
|
@ -69,10 +69,7 @@ public class YamlConfig implements ConfigurationAdapter {
|
||||||
permissions.put("default", Arrays.asList("bungeecord.command.server", "bungeecord.command.list"));
|
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"));
|
permissions.put("admin", Arrays.asList("bungeecord.command.alert", "bungeecord.command.end", "bungeecord.command.ip", "bungeecord.command.reload"));
|
||||||
}
|
}
|
||||||
final Map<String, Object> groups = this.get("groups", new HashMap<String, Object>());
|
this.get("groups", new HashMap<String, Object>());
|
||||||
if (groups.isEmpty()) {
|
|
||||||
groups.put("lax1dude", Collections.singletonList("admin"));
|
|
||||||
}
|
|
||||||
/*
|
/*
|
||||||
final Map<String, Object> auth = this.get("authservice", new HashMap<String, Object>());
|
final Map<String, Object> auth = this.get("authservice", new HashMap<String, Object>());
|
||||||
if(auth.isEmpty()) {
|
if(auth.isEmpty()) {
|
||||||
|
|
|
@ -198,8 +198,8 @@ public class TextureTerrainMap implements IconRegister {
|
||||||
private int nextSlot = 0;
|
private int nextSlot = 0;
|
||||||
|
|
||||||
public TextureTerrainMap(int size, String par2, String par3Str, EaglerImage par4BufferedImage) {
|
public TextureTerrainMap(int size, String par2, String par3Str, EaglerImage par4BufferedImage) {
|
||||||
this.width = size / 48 * 48;
|
this.width = size;
|
||||||
this.height = size / 48 * 48;
|
this.height = size;
|
||||||
this.basePath = par3Str;
|
this.basePath = par3Str;
|
||||||
this.missingImage = new TerrainIcon(nextSlot++, this, null);
|
this.missingImage = new TerrainIcon(nextSlot++, this, null);
|
||||||
this.iconList = new ArrayList();
|
this.iconList = new ArrayList();
|
||||||
|
|
|
@ -174,7 +174,6 @@ public class RenderPlayer extends RenderLiving {
|
||||||
EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE);
|
EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE);
|
||||||
EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND);
|
EaglerAdapter.glEnable(EaglerAdapter.GL_BLEND);
|
||||||
EaglerAdapter.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE);
|
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);
|
EaglerAdapter.glTranslatef((float)par2, (float)par4 - par1EntityPlayer.yOffset + 0.05f, (float)par6);
|
||||||
float var13 = this.handleRotationFloat(par1EntityPlayer, par9);
|
float var13 = this.handleRotationFloat(par1EntityPlayer, par9);
|
||||||
float var10 = par1EntityPlayer.prevRenderYawOffset + (par1EntityPlayer.renderYawOffset - par1EntityPlayer.prevRenderYawOffset) * 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.glBlendFunc(EaglerAdapter.GL_SRC_ALPHA, EaglerAdapter.GL_ONE_MINUS_SRC_ALPHA);
|
||||||
EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST);
|
EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST);
|
||||||
EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE);
|
EaglerAdapter.glEnable(EaglerAdapter.GL_CULL_FACE);
|
||||||
|
EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING);
|
||||||
EaglerAdapter.glPopMatrix();
|
EaglerAdapter.glPopMatrix();
|
||||||
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
|
||||||
|
|
|
@ -101,11 +101,11 @@ public class SoundManager {
|
||||||
if(par1EntityLiving == null) {
|
if(par1EntityLiving == null) {
|
||||||
EaglerAdapter.setListenerPos(0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f);
|
EaglerAdapter.setListenerPos(0f, 0f, 0f, 0f, 0f, 0f, 0f, 0f);
|
||||||
}else {
|
}else {
|
||||||
float x = (float)(par1EntityLiving.prevPosX + (par1EntityLiving.posX - par1EntityLiving.prevPosX) * 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);
|
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);
|
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);
|
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);
|
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);
|
EaglerAdapter.setListenerPos(x, y, z, (float)par1EntityLiving.motionX, (float)par1EntityLiving.motionY, (float)par1EntityLiving.motionZ, pitch, yaw);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,9 +11,7 @@ listeners:
|
||||||
default_server: lobby
|
default_server: lobby
|
||||||
force_default_server: true
|
force_default_server: true
|
||||||
stats: 595698b3-9c36-4e86-b1ee-cb3027038f41
|
stats: 595698b3-9c36-4e86-b1ee-cb3027038f41
|
||||||
groups:
|
groups: {}
|
||||||
lax1dude:
|
|
||||||
- admin
|
|
||||||
player_limit: -1
|
player_limit: -1
|
||||||
permissions:
|
permissions:
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user