catfoolyou
/
Project164
mirror of https://github.com/catfoolyou/Project164.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

25w13a rendering and bugfixes

This commit is contained in:
catfoolyou 2025-03-25 11:14:44 -04:00
parent 3476e01118
commit a6719bab9c
23 changed files with 1753960 additions and 65577 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/compiler.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="18" />
<bytecodeTargetLevel target="17" />
</component>
</project>

2
build.gradle
View File

@ -40,7 +40,7 @@ def folder = "javascript"
def name = "classes.js"
teavm.js {
obfuscated = true
obfuscated = false
sourceMap = true
targetFileName = "../" + name
optimization = OptimizationLevel.AGGRESSIVE

56742
javascript/Eaglercraft_1.6.4_Offline.html
View File

File diff suppressed because one or more lines are too long

BIN
javascript/assets.epk
View File

Binary file not shown.

801690
javascript/classes.js
View File

File diff suppressed because it is too large Load Diff

2
javascript/classes.js.map
View File

File diff suppressed because one or more lines are too long

960555
javascript/classes_server.js
View File

File diff suppressed because it is too large Load Diff

2
javascript/classes_server.js.map
View File

File diff suppressed because one or more lines are too long

BIN
lwjgl-rundir/_eagstorage.a.dat
View File

Binary file not shown.

BIN
lwjgl-rundir/_eagstorage.g.dat
View File

Binary file not shown.

BIN
lwjgl-rundir/eaglercraft.jar
View File

Binary file not shown.

3
lwjgl-rundir/resources/lang/en_US.lang
View File

@ -414,6 +414,9 @@ key.use=Use Item
key.pickItem=Pick Block
key.mouseButton=Button %1$s
key.command=Command
key.sprint=Sprint
key.zoom=Zoom
key.function=Function
resourcePack.openFolder=Open resource pack folder
resourcePack.title=Select Resource Pack

2
sp-server/build.gradle
View File

@ -36,7 +36,7 @@ def folder = "../javascript"
def name = "classes_server.js"
teavm.js {
obfuscated = true
obfuscated = false
sourceMap = true
targetFileName = "../" + name
optimization = OptimizationLevel.AGGRESSIVE

2
src/main/java/net/lax1dude/eaglercraft/ConfigConstants.java
View File

@ -5,7 +5,7 @@ import java.util.List;
public class ConfigConstants {
public static final String version = "25w12a";
public static final String version = "25w13a";
public static final String mainMenuString = "Eaglercraft " + version;
public static final String forkMe = "https://git.zelz.net/catfoolyou/Project164";

4
src/main/java/net/minecraft/src/ChestItemRenderHelper.java
View File

@ -7,7 +7,7 @@ public class ChestItemRenderHelper
/** Instance of Chest's Tile Entity. */
private TileEntityChest theChest = new TileEntityChest(0);
private TileEntityChest field_142033_c = new TileEntityChest(1);
private TileEntityChest theTrappedChest = new TileEntityChest(1);
/** Instance of Ender Chest's Tile Entity. */
private TileEntityEnderChest theEnderChest = new TileEntityEnderChest();
@ -23,7 +23,7 @@ public class ChestItemRenderHelper
}
else if (par1Block.blockID == Block.chestTrapped.blockID)
{
TileEntityRenderer.instance.renderTileEntityAt(this.field_142033_c, 0.0D, 0.0D, 0.0D, 0.0F);
TileEntityRenderer.instance.renderTileEntityAt(this.theTrappedChest, 0.0D, 0.0D, 0.0D, 0.0F);
}
else
{

2
src/main/java/net/minecraft/src/EntityClientPlayerMP.java
View File

@ -24,7 +24,7 @@ public class EntityClientPlayerMP extends EntityPlayerSP
private boolean hasSetHealth;
private String field_142022_ce;
public EntityClientPlayerMP(Minecraft par1Minecraft, World par2World, Session par3Session, NetClientHandler par4NetClientHandler)
public EntityClientPlayerMP(Minecraft par1Minecraft, World par2World, String par3Session, NetClientHandler par4NetClientHandler)
{
super(par1Minecraft, par2World, par3Session, 0);
this.sendQueue = par4NetClientHandler;

4
src/main/java/net/minecraft/src/EntityPlayerSP.java
View File

@ -32,9 +32,9 @@ public class EntityPlayerSP extends EntityPlayer
/** The amount of time an entity has been in a Portal the previous tick */
public float prevTimeInPortal;
public EntityPlayerSP(Minecraft par1Minecraft, World par2World, Session par3Session, int par4)
public EntityPlayerSP(Minecraft par1Minecraft, World par2World, String par3Session, int par4)
{
super(par2World, par3Session.getUsername());
super(par2World, par3Session);
this.mc = par1Minecraft;
this.dimension = par4;
}

113
src/main/java/net/minecraft/src/GuiControls.java
View File

@ -1,9 +1,9 @@
package net.minecraft.src;
public class GuiControls extends GuiScreen
{
public class GuiControls extends GuiScreen {
/**
* A reference to the screen object that created this. Used for navigating between screens.
* A reference to the screen object that created this. Used for navigating
* between screens.
*/
private GuiScreen parentScreen;
@ -13,55 +13,49 @@ public class GuiControls extends GuiScreen
/** Reference to the GameSettings object. */
private GameSettings options;
/** The ID of the button that has been pressed. */
/** The ID of the button that has been pressed. */
private int buttonId = -1;
public GuiControls(GuiScreen par1GuiScreen, GameSettings par2GameSettings)
{
public GuiControls(GuiScreen par1GuiScreen, GameSettings par2GameSettings) {
this.parentScreen = par1GuiScreen;
this.options = par2GameSettings;
}
/**
* Gets the distance from the left border of the window to left border of the controls screen
* Gets the distance from the left border of the window to left border of the
* controls screen
*/
private int getLeftBorder()
{
private int getLeftBorder() {
return this.width / 2 - 155;
}
/**
* Adds the buttons (and other controls) to the screen in question.
*/
public void initGui()
{
int var1 = this.getLeftBorder();
public void initGui() {
StringTranslate var1 = StringTranslate.getInstance();
int var2 = this.getLeftBorder();
for (int var2 = 0; var2 < this.options.keyBindings.length; ++var2)
{
this.buttonList.add(new GuiSmallButton(var2, var1 + var2 % 2 * 160, this.height / 6 + 24 * (var2 >> 1), 70, 20, this.options.getOptionDisplayString(var2)));
for (int var3 = 0; var3 < this.options.keyBindings.length; ++var3) {
this.buttonList.add(new GuiSmallButton(var3, var2 + var3 % 2 * 160, this.height / 6 + 20 * (var3 >> 1), 70, 20, this.options.getOptionDisplayString(var3)));
}
this.buttonList.add(new GuiButton(200, this.width / 2 - 100, this.height / 6 + 168, StatCollector.translateToLocal("gui.done")));
this.screenTitle = StatCollector.translateToLocal("controls.title");
this.buttonList.add(new GuiButton(200, this.width / 2 - 100, this.height / 6 + 168, var1.translateKey("gui.done")));
this.screenTitle = var1.translateKey("controls.title");
}
/**
* Fired when a control is clicked. This is the equivalent of ActionListener.actionPerformed(ActionEvent e).
* Fired when a control is clicked. This is the equivalent of
* ActionListener.actionPerformed(ActionEvent e).
*/
protected void actionPerformed(GuiButton par1GuiButton)
{
for (int var2 = 0; var2 < this.options.keyBindings.length; ++var2)
{
((GuiButton)this.buttonList.get(var2)).displayString = this.options.getOptionDisplayString(var2);
protected void actionPerformed(GuiButton par1GuiButton) {
for (int var2 = 0; var2 < this.options.keyBindings.length; ++var2) {
((GuiButton) this.buttonList.get(var2)).displayString = this.options.getOptionDisplayString(var2);
}
if (par1GuiButton.id == 200)
{
if (par1GuiButton.id == 200) {
this.mc.displayGuiScreen(this.parentScreen);
}
else
{
} else {
this.buttonId = par1GuiButton.id;
par1GuiButton.displayString = "> " + this.options.getOptionDisplayString(par1GuiButton.id) + " <";
}
@ -70,35 +64,28 @@ public class GuiControls extends GuiScreen
/**
* Called when the mouse is clicked.
*/
protected void mouseClicked(int par1, int par2, int par3)
{
if (this.buttonId >= 0)
{
protected void mouseClicked(int par1, int par2, int par3) {
if (this.buttonId >= 0) {
this.options.setKeyBinding(this.buttonId, -100 + par3);
((GuiButton)this.buttonList.get(this.buttonId)).displayString = this.options.getOptionDisplayString(this.buttonId);
((GuiButton) this.buttonList.get(this.buttonId)).displayString = this.options.getOptionDisplayString(this.buttonId);
this.buttonId = -1;
KeyBinding.resetKeyBindingArrayAndHash();
}
else
{
} else {
super.mouseClicked(par1, par2, par3);
}
}
/**
* Fired when a key is typed. This is the equivalent of KeyListener.keyTyped(KeyEvent e).
* Fired when a key is typed. This is the equivalent of
* KeyListener.keyTyped(KeyEvent e).
*/
protected void keyTyped(char par1, int par2)
{
if (this.buttonId >= 0)
{
protected void keyTyped(char par1, int par2) {
if (this.buttonId >= 0) {
this.options.setKeyBinding(this.buttonId, par2);
((GuiButton)this.buttonList.get(this.buttonId)).displayString = this.options.getOptionDisplayString(this.buttonId);
((GuiButton) this.buttonList.get(this.buttonId)).displayString = this.options.getOptionDisplayString(this.buttonId);
this.buttonId = -1;
KeyBinding.resetKeyBindingArrayAndHash();
}
else
{
} else {
super.keyTyped(par1, par2);
}
}
@ -106,24 +93,19 @@ public class GuiControls extends GuiScreen
/**
* Draws the screen and all the components in it.
*/
public void drawScreen(int par1, int par2, float par3)
{
public void drawScreen(int par1, int par2, float par3) {
this.drawDefaultBackground();
this.drawCenteredString(this.fontRenderer, this.screenTitle, this.width / 2, 20, 16777215);
int var4 = this.getLeftBorder();
int var5 = 0;
while (var5 < this.options.keyBindings.length)
{
while (var5 < this.options.keyBindings.length) {
boolean var6 = false;
int var7 = 0;
while (true)
{
if (var7 < this.options.keyBindings.length)
{
if (var7 == var5 || this.options.keyBindings[var5].keyCode != this.options.keyBindings[var7].keyCode)
{
while (true) {
if (var7 < this.options.keyBindings.length) {
if (var7 == var5 || this.options.keyBindings[var5].keyCode != this.options.keyBindings[var7].keyCode) {
++var7;
continue;
}
@ -131,20 +113,15 @@ public class GuiControls extends GuiScreen
var6 = true;
}
if (this.buttonId == var5)
{
((GuiButton)this.buttonList.get(var5)).displayString = "" + EnumChatFormatting.WHITE + "> " + EnumChatFormatting.YELLOW + "??? " + EnumChatFormatting.WHITE + "<";
}
else if (var6)
{
((GuiButton)this.buttonList.get(var5)).displayString = EnumChatFormatting.RED + this.options.getOptionDisplayString(var5);
}
else
{
((GuiButton)this.buttonList.get(var5)).displayString = this.options.getOptionDisplayString(var5);
if (this.buttonId == var5) {
((GuiButton) this.buttonList.get(var5)).displayString = "" + EnumChatFormatting.WHITE + "> " + EnumChatFormatting.YELLOW + "??? " + EnumChatFormatting.WHITE + "<";
} else if (var6) {
((GuiButton) this.buttonList.get(var5)).displayString = EnumChatFormatting.RED + this.options.getOptionDisplayString(var5);
} else {
((GuiButton) this.buttonList.get(var5)).displayString = this.options.getOptionDisplayString(var5);
}
this.drawString(this.fontRenderer, this.options.getKeyBindingDescription(var5), var4 + var5 % 2 * 160 + 70 + 6, this.height / 6 + 24 * (var5 >> 1) + 7, -1);
this.drawString(this.fontRenderer, this.options.getKeyBindingDescription(var5), var4 + var5 % 2 * 160 + 70 + 6, this.height / 6 + 20 * (var5 >> 1) + 7, -1);
++var5;
break;
}
@ -152,4 +129,4 @@ public class GuiControls extends GuiScreen
super.drawScreen(par1, par2, par3);
}
}
}

112
src/main/java/net/minecraft/src/Minecraft.java
View File

@ -691,30 +691,23 @@ public class Minecraft
}
}
private void sendClickBlockToController(int par1, boolean par2)
{
if (!par2)
{
private void sendClickBlockToController(int par1, boolean par2) {
if (!par2) {
this.leftClickCounter = 0;
}
if (par1 != 0 || this.leftClickCounter <= 0)
{
if (par2 && this.objectMouseOver != null && this.objectMouseOver.typeOfHit == EnumMovingObjectType.TILE && par1 == 0)
{
if (par1 != 0 || this.leftClickCounter <= 0) {
if (par2 && this.objectMouseOver != null && this.objectMouseOver.typeOfHit == EnumMovingObjectType.TILE && par1 == 0) {
int var3 = this.objectMouseOver.blockX;
int var4 = this.objectMouseOver.blockY;
int var5 = this.objectMouseOver.blockZ;
this.playerController.onPlayerDamageBlock(var3, var4, var5, this.objectMouseOver.sideHit);
if (this.thePlayer.isCurrentToolAdventureModeExempt(var3, var4, var5))
{
if (this.thePlayer.isCurrentToolAdventureModeExempt(var3, var4, var5)) {
this.effectRenderer.addBlockHitEffects(var3, var4, var5, this.objectMouseOver.sideHit);
this.thePlayer.swingItem();
}
}
else
{
} else {
this.playerController.resetBlockRemoving();
}
}
@ -724,85 +717,63 @@ public class Minecraft
* Called whenever the mouse is clicked. Button clicked is 0 for left clicking and 1 for right clicking. Args:
* buttonClicked
*/
private void clickMouse(int par1)
{
if (par1 != 0 || this.leftClickCounter <= 0)
{
if (par1 == 0)
{
private void clickMouse(int par1) {
if (par1 != 0 || this.leftClickCounter <= 0) {
if (par1 == 0) {
this.thePlayer.swingItem();
}
if (par1 == 1)
{
if (par1 == 1) {
this.rightClickDelayTimer = 4;
}
boolean var2 = true;
ItemStack var3 = this.thePlayer.inventory.getCurrentItem();
if (this.objectMouseOver == null)
{
if (par1 == 0 && this.playerController.isNotCreative())
{
if (this.objectMouseOver == null) {
if (par1 == 0 && this.playerController.isNotCreative()) {
this.leftClickCounter = 10;
}
}
else if (this.objectMouseOver.typeOfHit == EnumMovingObjectType.ENTITY)
{
if (par1 == 0)
{
} else if (this.objectMouseOver.typeOfHit == EnumMovingObjectType.ENTITY) {
if (par1 == 0) {
this.playerController.attackEntity(this.thePlayer, this.objectMouseOver.entityHit);
}
if (par1 == 1 && this.playerController.func_78768_b(this.thePlayer, this.objectMouseOver.entityHit))
{
if (par1 == 1 && this.playerController.func_78768_b(this.thePlayer, this.objectMouseOver.entityHit)) {
var2 = false;
}
}
else if (this.objectMouseOver.typeOfHit == EnumMovingObjectType.TILE)
{
} else if (this.objectMouseOver.typeOfHit == EnumMovingObjectType.TILE) {
int var4 = this.objectMouseOver.blockX;
int var5 = this.objectMouseOver.blockY;
int var6 = this.objectMouseOver.blockZ;
int var7 = this.objectMouseOver.sideHit;
if (par1 == 0)
{
if (par1 == 0) {
this.playerController.clickBlock(var4, var5, var6, this.objectMouseOver.sideHit);
}
else
{
} else {
int var8 = var3 != null ? var3.stackSize : 0;
if (this.playerController.onPlayerRightClick(this.thePlayer, this.theWorld, var3, var4, var5, var6, var7, this.objectMouseOver.hitVec))
{
if (this.playerController.onPlayerRightClick(this.thePlayer, this.theWorld, var3, var4, var5, var6, var7, this.objectMouseOver.hitVec)) {
var2 = false;
this.thePlayer.swingItem();
}
if (var3 == null)
{
if (var3 == null) {
return;
}
if (var3.stackSize == 0)
{
if (var3.stackSize == 0) {
this.thePlayer.inventory.mainInventory[this.thePlayer.inventory.currentItem] = null;
}
else if (var3.stackSize != var8 || this.playerController.isInCreativeMode())
{
} else if (var3.stackSize != var8 || this.playerController.isInCreativeMode()) {
this.entityRenderer.itemRenderer.resetEquippedProgress();
}
}
}
if (var2 && par1 == 1)
{
if (var2 && par1 == 1) {
ItemStack var9 = this.thePlayer.inventory.getCurrentItem();
if (var9 != null && this.playerController.sendUseItem(this.thePlayer, this.theWorld, var9))
{
if (var9 != null && this.playerController.sendUseItem(this.thePlayer, this.theWorld, var9)) {
this.entityRenderer.itemRenderer.resetEquippedProgress2();
}
}
@ -1622,28 +1593,6 @@ public class Minecraft
{
return this.integratedServerIsRunning && this.theIntegratedServer != null;
}
/**
* Returns the currently running integrated server
*/
public IntegratedServer getIntegratedServer()
{
return this.theIntegratedServer;
}
public static void stopIntegratedServer() // FIX THIS SHIT
{
/*if (theMinecraft != null)
{
IntegratedServer var0 = theMinecraft.getIntegratedServer();
if (var0 != null)
{
var0.stopServer();
}
}*/
}
/**
* Gets the system time in milliseconds.
*/
@ -1651,14 +1600,6 @@ public class Minecraft
return EaglerAdapter.steadyTimeMillis();
}
/**
* Returns whether we're in full screen or not.
*/
public boolean isFullScreen()
{
return this.fullscreen;
}
public Session getSession()
{
return new Session(EaglerProfile.username, EaglerProfile.username);
@ -1669,11 +1610,6 @@ public class Minecraft
return this.renderEngine;
}
static String getLaunchedVersion(Minecraft par0Minecraft)
{
return "1.6.4";
}
public String getServerURI() {
return this.getNetHandler() != null ? this.getNetHandler().getNetManager().getServerURI() : "[not connected]";
}

4
src/main/java/net/minecraft/src/PlayerControllerMP.java
View File

@ -1,5 +1,7 @@
package net.minecraft.src;
import net.lax1dude.eaglercraft.EaglerProfile;
public class PlayerControllerMP
{
/** The Minecraft instance. */
@ -399,7 +401,7 @@ public class PlayerControllerMP
public EntityClientPlayerMP func_78754_a(World par1World)
{
return new EntityClientPlayerMP(this.mc, par1World, this.mc.getSession(), this.netClientHandler);
return new EntityClientPlayerMP(this.mc, par1World, EaglerProfile.username, this.netClientHandler);
}
/**

1
src/main/java/net/minecraft/src/RenderBlocks.java
View File

@ -7628,7 +7628,6 @@ public class RenderBlocks
var4.draw();
EaglerAdapter.glTranslatef(0.5F, 0.5F, 0.5F);
} else if (var6 == 22) {
RenderHelper.enableStandardItemLighting();
EaglerAdapter.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F);
ChestItemRenderHelper.instance.renderChest(par1Block, par2, par3);

293
src/main/java/net/minecraft/src/ServerConfigurationManager.java
View File

@ -1,7 +1,6 @@
package net.minecraft.src;
import java.io.File;
import java.net.SocketAddress;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
@ -60,63 +59,63 @@ public abstract class ServerConfigurationManager
this.maxPlayers = 8;
}
public void initializeConnectionToPlayer(INetworkManager par1INetworkManager, EntityPlayerMP par2EntityPlayerMP)
{
NBTTagCompound var3 = this.readPlayerDataFromFile(par2EntityPlayerMP);
par2EntityPlayerMP.setWorld(this.mcServer.worldServerForDimension(par2EntityPlayerMP.dimension));
par2EntityPlayerMP.theItemInWorldManager.setWorld((WorldServer)par2EntityPlayerMP.worldObj);
String var4 = "local";
/*if (par1INetworkManager.getSocketAddress() != null)
{
var4 = par1INetworkManager.getSocketAddress().toString();
}*/
this.mcServer.getLogAgent().logInfo(par2EntityPlayerMP.getCommandSenderName() + "[" + var4 + "] logged in with entity id " + par2EntityPlayerMP.entityId + " at (" + par2EntityPlayerMP.posX + ", " + par2EntityPlayerMP.posY + ", " + par2EntityPlayerMP.posZ + ")");
WorldServer var5 = this.mcServer.worldServerForDimension(par2EntityPlayerMP.dimension);
ChunkCoordinates var6 = var5.getSpawnPoint();
this.func_72381_a(par2EntityPlayerMP, (EntityPlayerMP)null, var5);
NetServerHandler var7 = new NetServerHandler(this.mcServer, par1INetworkManager, par2EntityPlayerMP);
var7.sendPacketToPlayer(new Packet1Login(par2EntityPlayerMP.entityId, var5.getWorldInfo().getTerrainType(), par2EntityPlayerMP.theItemInWorldManager.getGameType(), var5.getWorldInfo().isHardcoreModeEnabled(), var5.provider.dimensionId, var5.difficultySetting, var5.getHeight(), this.getMaxPlayers()));
//var7.sendPacketToPlayer(new Packet250CustomPayload("MC|Brand", this.getServerInstance().getServerModName().getBytes(Charset.UTF_8)));
var7.sendPacketToPlayer(new Packet6SpawnPosition(var6.posX, var6.posY, var6.posZ));
var7.sendPacketToPlayer(new Packet202PlayerAbilities(par2EntityPlayerMP.capabilities));
var7.sendPacketToPlayer(new Packet16BlockItemSwitch(par2EntityPlayerMP.inventory.currentItem));
this.func_96456_a((ServerScoreboard)var5.getScoreboard(), par2EntityPlayerMP);
this.updateTimeAndWeatherForPlayer(par2EntityPlayerMP, var5);
this.sendChatMsg(StatCollector.translateToLocalFormatted(EnumChatFormatting.YELLOW + "multiplayer.player.joined", new Object[] {par2EntityPlayerMP.getTranslatedEntityName()}));
this.playerLoggedIn(par2EntityPlayerMP);
var7.setPlayerLocation(par2EntityPlayerMP.posX, par2EntityPlayerMP.posY, par2EntityPlayerMP.posZ, par2EntityPlayerMP.rotationYaw, par2EntityPlayerMP.rotationPitch);
var7.sendPacketToPlayer(new Packet4UpdateTime(var5.getTotalWorldTime(), var5.getWorldTime(), var5.getGameRules().getGameRuleBooleanValue("doDaylightCycle")));
if (this.mcServer.getTexturePack().length() > 0)
{
par2EntityPlayerMP.requestTexturePackLoad(this.mcServer.getTexturePack(), this.mcServer.textureSize());
}
Iterator var8 = par2EntityPlayerMP.getActivePotionEffects().iterator();
while (var8.hasNext())
{
PotionEffect var9 = (PotionEffect)var8.next();
var7.sendPacketToPlayer(new Packet41EntityEffect(par2EntityPlayerMP.entityId, var9));
}
par2EntityPlayerMP.addSelfToInternalCraftingInventory();
if (var3 != null && var3.hasKey("Riding"))
{
Entity var10 = EntityList.createEntityFromNBT(var3.getCompoundTag("Riding"), var5);
if (var10 != null)
{
var10.forceSpawn = true;
var5.spawnEntityInWorld(var10);
par2EntityPlayerMP.mountEntity(var10);
var10.forceSpawn = false;
}
}
}
// public void initializeConnectionToPlayer(INetworkManager par1INetworkManager, EntityPlayerMP par2EntityPlayerMP)
// {
// NBTTagCompound var3 = this.readPlayerDataFromFile(par2EntityPlayerMP);
// par2EntityPlayerMP.setWorld(this.mcServer.worldServerForDimension(par2EntityPlayerMP.dimension));
// par2EntityPlayerMP.theItemInWorldManager.setWorld((WorldServer)par2EntityPlayerMP.worldObj);
// String var4 = "local";
//
// /*if (par1INetworkManager.getSocketAddress() != null)
// {
// var4 = par1INetworkManager.getSocketAddress().toString();
// }*/
//
// this.mcServer.getLogAgent().logInfo(par2EntityPlayerMP.getCommandSenderName() + "[" + var4 + "] logged in with entity id " + par2EntityPlayerMP.entityId + " at (" + par2EntityPlayerMP.posX + ", " + par2EntityPlayerMP.posY + ", " + par2EntityPlayerMP.posZ + ")");
// WorldServer var5 = this.mcServer.worldServerForDimension(par2EntityPlayerMP.dimension);
// ChunkCoordinates var6 = var5.getSpawnPoint();
// this.func_72381_a(par2EntityPlayerMP, (EntityPlayerMP)null, var5);
// NetServerHandler var7 = new NetServerHandler(this.mcServer, par1INetworkManager, par2EntityPlayerMP);
// var7.sendPacketToPlayer(new Packet1Login(par2EntityPlayerMP.entityId, var5.getWorldInfo().getTerrainType(), par2EntityPlayerMP.theItemInWorldManager.getGameType(), var5.getWorldInfo().isHardcoreModeEnabled(), var5.provider.dimensionId, var5.difficultySetting, var5.getHeight(), this.getMaxPlayers()));
// //var7.sendPacketToPlayer(new Packet250CustomPayload("MC|Brand", this.getServerInstance().getServerModName().getBytes(Charset.UTF_8)));
// var7.sendPacketToPlayer(new Packet6SpawnPosition(var6.posX, var6.posY, var6.posZ));
// var7.sendPacketToPlayer(new Packet202PlayerAbilities(par2EntityPlayerMP.capabilities));
// var7.sendPacketToPlayer(new Packet16BlockItemSwitch(par2EntityPlayerMP.inventory.currentItem));
// this.func_96456_a((ServerScoreboard)var5.getScoreboard(), par2EntityPlayerMP);
// this.updateTimeAndWeatherForPlayer(par2EntityPlayerMP, var5);
// this.sendChatMsg(StatCollector.translateToLocalFormatted(EnumChatFormatting.YELLOW + "multiplayer.player.joined", new Object[] {par2EntityPlayerMP.getTranslatedEntityName()}));
// this.playerLoggedIn(par2EntityPlayerMP);
// var7.setPlayerLocation(par2EntityPlayerMP.posX, par2EntityPlayerMP.posY, par2EntityPlayerMP.posZ, par2EntityPlayerMP.rotationYaw, par2EntityPlayerMP.rotationPitch);
// var7.sendPacketToPlayer(new Packet4UpdateTime(var5.getTotalWorldTime(), var5.getWorldTime(), var5.getGameRules().getGameRuleBooleanValue("doDaylightCycle")));
//
// if (this.mcServer.getTexturePack().length() > 0)
// {
// par2EntityPlayerMP.requestTexturePackLoad(this.mcServer.getTexturePack(), this.mcServer.textureSize());
// }
//
// Iterator var8 = par2EntityPlayerMP.getActivePotionEffects().iterator();
//
// while (var8.hasNext())
// {
// PotionEffect var9 = (PotionEffect)var8.next();
// var7.sendPacketToPlayer(new Packet41EntityEffect(par2EntityPlayerMP.entityId, var9));
// }
//
// par2EntityPlayerMP.addSelfToInternalCraftingInventory();
//
// if (var3 != null && var3.hasKey("Riding"))
// {
// Entity var10 = EntityList.createEntityFromNBT(var3.getCompoundTag("Riding"), var5);
//
// if (var10 != null)
// {
// var10.forceSpawn = true;
// var5.spawnEntityInWorld(var10);
// par2EntityPlayerMP.mountEntity(var10);
// var10.forceSpawn = false;
// }
// }
// }
protected void func_96456_a(ServerScoreboard par1ServerScoreboard, EntityPlayerMP par2EntityPlayerMP)
{
@ -254,95 +253,95 @@ public abstract class ServerConfigurationManager
/**
* checks ban-lists, then white-lists, then space for the server. Returns null on success, or an error message
*/
public String allowUserToConnect(String par2Str) {
if(this.playerEntityList.size() >= this.maxPlayers) {
return "The server is full!";
}else {
for(EntityPlayerMP pp : (List<EntityPlayerMP>)this.playerEntityList) {
if(pp.username.equalsIgnoreCase(par2Str)) {
return "Someone with your username is already on this world";
}
}
return null;
}
}
public String allowUserToConnect(SocketAddress par1SocketAddress, String par2Str)
{
if (this.bannedPlayers.isBanned(par2Str))
{
BanEntry var6 = (BanEntry)this.bannedPlayers.getBannedList().get(par2Str);
String var7 = "You are banned from this server!\nReason: " + var6.getBanReason();
if (var6.getBanEndDate() != null)
{
var7 = var7 + "\nYour ban will be removed on " + dateFormat.format(var6.getBanEndDate());
}
return var7;
}
else if (!this.isAllowedToLogin(par2Str))
{
return "You are not white-listed on this server!";
}
else
{
String var3 = par1SocketAddress.toString();
var3 = var3.substring(var3.indexOf("/") + 1);
var3 = var3.substring(0, var3.indexOf(":"));
if (this.bannedIPs.isBanned(var3))
{
BanEntry var4 = (BanEntry)this.bannedIPs.getBannedList().get(var3);
String var5 = "Your IP address is banned from this server!\nReason: " + var4.getBanReason();
if (var4.getBanEndDate() != null)
{
var5 = var5 + "\nYour ban will be removed on " + dateFormat.format(var4.getBanEndDate());
}
return var5;
}
else
{
return this.playerEntityList.size() >= this.maxPlayers ? "The server is full!" : null;
}
}
}
/**
* also checks for multiple logins
*/
public EntityPlayerMP createPlayerForUser(String par1Str)
{
ArrayList var2 = new ArrayList();
EntityPlayerMP var4;
for (int var3 = 0; var3 < this.playerEntityList.size(); ++var3)
{
var4 = (EntityPlayerMP)this.playerEntityList.get(var3);
if (var4.getCommandSenderName().equalsIgnoreCase(par1Str))
{
var2.add(var4);
}
}
Iterator var5 = var2.iterator();
while (var5.hasNext())
{
var4 = (EntityPlayerMP)var5.next();
var4.playerNetServerHandler.kickPlayerFromServer("You logged in from another location");
}
Object var6;
var6 = new ItemInWorldManager(this.mcServer.worldServerForDimension(0));
return new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(0), par1Str, (ItemInWorldManager)var6);
}
// public String allowUserToConnect(String par2Str) {
// if(this.playerEntityList.size() >= this.maxPlayers) {
// return "The server is full!";
// }else {
// for(EntityPlayerMP pp : (List<EntityPlayerMP>)this.playerEntityList) {
// if(pp.username.equalsIgnoreCase(par2Str)) {
// return "Someone with your username is already on this world";
// }
// }
// return null;
// }
// }
//
// public String allowUserToConnect(SocketAddress par1SocketAddress, String par2Str)
// {
// if (this.bannedPlayers.isBanned(par2Str))
// {
// BanEntry var6 = (BanEntry)this.bannedPlayers.getBannedList().get(par2Str);
// String var7 = "You are banned from this server!\nReason: " + var6.getBanReason();
//
// if (var6.getBanEndDate() != null)
// {
// var7 = var7 + "\nYour ban will be removed on " + dateFormat.format(var6.getBanEndDate());
// }
//
// return var7;
// }
// else if (!this.isAllowedToLogin(par2Str))
// {
// return "You are not white-listed on this server!";
// }
// else
// {
// String var3 = par1SocketAddress.toString();
// var3 = var3.substring(var3.indexOf("/") + 1);
// var3 = var3.substring(0, var3.indexOf(":"));
//
// if (this.bannedIPs.isBanned(var3))
// {
// BanEntry var4 = (BanEntry)this.bannedIPs.getBannedList().get(var3);
// String var5 = "Your IP address is banned from this server!\nReason: " + var4.getBanReason();
//
// if (var4.getBanEndDate() != null)
// {
// var5 = var5 + "\nYour ban will be removed on " + dateFormat.format(var4.getBanEndDate());
// }
//
// return var5;
// }
// else
// {
// return this.playerEntityList.size() >= this.maxPlayers ? "The server is full!" : null;
// }
// }
// }
//
// /**
// * also checks for multiple logins
// */
// public EntityPlayerMP createPlayerForUser(String par1Str)
// {
// ArrayList var2 = new ArrayList();
// EntityPlayerMP var4;
//
// for (int var3 = 0; var3 < this.playerEntityList.size(); ++var3)
// {
// var4 = (EntityPlayerMP)this.playerEntityList.get(var3);
//
// if (var4.getCommandSenderName().equalsIgnoreCase(par1Str))
// {
// var2.add(var4);
// }
// }
//
// Iterator var5 = var2.iterator();
//
// while (var5.hasNext())
// {
// var4 = (EntityPlayerMP)var5.next();
// var4.playerNetServerHandler.kickPlayerFromServer("You logged in from another location");
// }
//
// Object var6;
//
// var6 = new ItemInWorldManager(this.mcServer.worldServerForDimension(0));
//
//
// return new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(0), par1Str, (ItemInWorldManager)var6);
// }
/**
* creates and returns a respawned player based on the provided PlayerEntity. Args are the PlayerEntityMP to

2
src/main/java/net/minecraft/src/TileEntityChestRenderer.java
View File

@ -135,7 +135,7 @@ public class TileEntityChestRenderer extends TileEntitySpecialRenderer
EaglerAdapter.glTranslatef(0.0F, 0.0F, -1.0F);
}
EaglerAdapter.glRotatef((float)var11, 0.0F, 1.0F, 0.0F);
EaglerAdapter.glRotatef(var11, 0.0F, 1.0F, 0.0F);
EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F);
float var12 = par1TileEntityChest.prevLidAngle + (par1TileEntityChest.lidAngle - par1TileEntityChest.prevLidAngle) * par8;
float var13;