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

25w15b fix the shit

This commit is contained in:
Catfoolyou 2025-04-07 18:05:22 -04:00
parent dc1a756a72
commit 9646f9d855
7 changed files with 34383 additions and 34528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34203
javascript/Eaglercraft_1.6.4_Offline.html
View File

File diff suppressed because it is too large Load Diff

34203
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

BIN
lwjgl-rundir/eaglercraft.jar
View File

Binary file not shown.

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

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

460
src/main/java/net/minecraft/src/GuiContainer.java
View File

@ -1,16 +1,20 @@
package net.minecraft.src; package net.minecraft.src;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import java.util.*;
public abstract class GuiContainer extends GuiScreen public abstract class GuiContainer extends GuiScreen
{ {
protected static final TextureLocation field_110408_a = new TextureLocation("textures/gui/container/inventory.png"); protected static final TextureLocation field_110408_a = new TextureLocation("textures/gui/container/inventory.png");
/** Stacks renderer. Icons, stack size, health, etc... */ /** Stacks renderer. Icons, stack size, health, etc... */
protected static RenderItem itemRenderer = new RenderItem(); protected static RenderItem itemRenderer = null;
/** The X size of the inventory window in pixels. */ /** The X size of the inventory window in pixels. */
protected int xSize = 176; protected int xSize = 176;
@ -33,45 +37,44 @@ public abstract class GuiContainer extends GuiScreen
private Slot theSlot; private Slot theSlot;
/** Used when touchscreen is enabled */ /** Used when touchscreen is enabled */
private Slot clickedSlot; private Slot clickedSlot = null;
/** Used when touchscreen is enabled */ /** Used when touchscreen is enabled */
private boolean isRightMouseClick; private boolean isRightMouseClick = false;
/** Used when touchscreen is enabled */ /** Used when touchscreen is enabled */
private ItemStack draggedStack; private ItemStack draggedStack = null;
private int field_85049_r; private int field_85049_r = 0;
private int field_85048_s; private int field_85048_s = 0;
private Slot returningStackDestSlot; private Slot returningStackDestSlot = null;
private long returningStackTime; private long returningStackTime = 0L;
/** Used when touchscreen is enabled */ /** Used when touchscreen is enabled */
private ItemStack returningStack; private ItemStack returningStack = null;
private Slot field_92033_y; private Slot field_92033_y = null;
private long field_92032_z; private long field_92032_z = 0L;
protected final Set field_94077_p = new HashSet(); protected final Set field_94077_p = new HashSet();
protected boolean field_94076_q; protected boolean field_94076_q;
private int field_94071_C; private int field_94071_C = 0;
private int field_94067_D; private int field_94067_D = 0;
private boolean field_94068_E; private boolean field_94068_E = false;
private int field_94069_F; private int field_94069_F;
private long field_94070_G; private long field_94070_G = 0L;
private Slot field_94072_H; private Slot field_94072_H = null;
private int field_94073_I; private int field_94073_I = 0;
private boolean field_94074_J; private boolean field_94074_J;
private ItemStack field_94075_K; private ItemStack field_94075_K = null;
public GuiContainer(Container par1Container) public GuiContainer(Container par1Container) {
{
this.inventorySlots = par1Container; this.inventorySlots = par1Container;
this.field_94068_E = true; this.field_94068_E = true;
if(itemRenderer == null) itemRenderer = new RenderItem();
} }
/** /**
* Adds the buttons (and other controls) to the screen in question. * Adds the buttons (and other controls) to the screen in question.
*/ */
public void initGui() public void initGui() {
{
super.initGui(); super.initGui();
this.mc.thePlayer.openContainer = this.inventorySlots; this.mc.thePlayer.openContainer = this.inventorySlots;
this.guiLeft = (this.width - this.xSize) / 2; this.guiLeft = (this.width - this.xSize) / 2;
@ -81,8 +84,7 @@ public abstract class GuiContainer extends GuiScreen
/** /**
* Draws the screen and all the components in it. * 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.drawDefaultBackground();
int var4 = this.guiLeft; int var4 = this.guiLeft;
int var5 = this.guiTop; int var5 = this.guiTop;
@ -92,7 +94,7 @@ public abstract class GuiContainer extends GuiScreen
EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST);
super.drawScreen(par1, par2, par3); super.drawScreen(par1, par2, par3);
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting2();
EaglerAdapter.glPushMatrix(); EaglerAdapter.glPushMatrix();
EaglerAdapter.glTranslatef((float) var4, (float) var5, 0.0F); EaglerAdapter.glTranslatef((float) var4, (float) var5, 0.0F);
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@ -104,13 +106,11 @@ public abstract class GuiContainer extends GuiScreen
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
int var9; int var9;
for (int var13 = 0; var13 < this.inventorySlots.inventorySlots.size(); ++var13) for (int var13 = 0; var13 < this.inventorySlots.inventorySlots.size(); ++var13) {
{
Slot var15 = (Slot) this.inventorySlots.inventorySlots.get(var13); Slot var15 = (Slot) this.inventorySlots.inventorySlots.get(var13);
this.drawSlotInventory(var15); this.drawSlotInventory(var15);
if (this.isMouseOverSlot(var15, par1, par2) && var15.func_111238_b()) if (this.isMouseOverSlot(var15, par1, par2)) {
{
this.theSlot = var15; this.theSlot = var15;
EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST);
@ -126,24 +126,19 @@ public abstract class GuiContainer extends GuiScreen
InventoryPlayer var14 = this.mc.thePlayer.inventory; InventoryPlayer var14 = this.mc.thePlayer.inventory;
ItemStack var16 = this.draggedStack == null ? var14.getItemStack() : this.draggedStack; ItemStack var16 = this.draggedStack == null ? var14.getItemStack() : this.draggedStack;
if (var16 != null) if (var16 != null) {
{
byte var17 = 8; byte var17 = 8;
var9 = this.draggedStack == null ? 8 : 16; var9 = this.draggedStack == null ? 8 : 16;
String var10 = null; String var10 = null;
if (this.draggedStack != null && this.isRightMouseClick) if (this.draggedStack != null && this.isRightMouseClick) {
{
var16 = var16.copy(); var16 = var16.copy();
var16.stackSize = MathHelper.ceiling_float_int((float) var16.stackSize / 2.0F); var16.stackSize = MathHelper.ceiling_float_int((float) var16.stackSize / 2.0F);
} } else if (this.field_94076_q && this.field_94077_p.size() > 1) {
else if (this.field_94076_q && this.field_94077_p.size() > 1)
{
var16 = var16.copy(); var16 = var16.copy();
var16.stackSize = this.field_94069_F; var16.stackSize = this.field_94069_F;
if (var16.stackSize == 0) if (var16.stackSize == 0) {
{
var10 = "" + EnumChatFormatting.YELLOW + "0"; var10 = "" + EnumChatFormatting.YELLOW + "0";
} }
} }
@ -151,12 +146,10 @@ public abstract class GuiContainer extends GuiScreen
this.drawItemStack(var16, par1 - var4 - var17, par2 - var5 - var9, var10); this.drawItemStack(var16, par1 - var4 - var17, par2 - var5 - var9, var10);
} }
if (this.returningStack != null) if (this.returningStack != null) {
{
float var18 = (float) (Minecraft.getSystemTime() - this.returningStackTime) / 100.0F; float var18 = (float) (Minecraft.getSystemTime() - this.returningStackTime) / 100.0F;
if (var18 >= 1.0F) if (var18 >= 1.0F) {
{
var18 = 1.0F; var18 = 1.0F;
this.returningStack = null; this.returningStack = null;
} }
@ -170,40 +163,34 @@ public abstract class GuiContainer extends GuiScreen
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
if (var14.getItemStack() == null && this.theSlot != null && this.theSlot.getHasStack()) if (var14.getItemStack() == null && this.theSlot != null && this.theSlot.getHasStack()) {
{
ItemStack var19 = this.theSlot.getStack(); ItemStack var19 = this.theSlot.getStack();
this.drawItemStackTooltip(var19, par1, par2); this.drawItemStackTooltip(var19, par1, par2);
} }
EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST);
RenderHelper.enableStandardItemLighting(); RenderHelper.enableStandardItemLighting();
} }
private void drawItemStack(ItemStack par1ItemStack, int par2, int par3, String par4Str) private void drawItemStack(ItemStack par1ItemStack, int par2, int par3, String par4Str) {
{
EaglerAdapter.glTranslatef(0.0F, 0.0F, 32.0F); EaglerAdapter.glTranslatef(0.0F, 0.0F, 32.0F);
this.zLevel = 200.0F; this.zLevel = 200.0F;
itemRenderer.zLevel = 200.0F; itemRenderer.zLevel = 200.0F;
itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.getTextureManager(), par1ItemStack, par2, par3); itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.renderEngine, par1ItemStack, par2, par3);
itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.getTextureManager(), par1ItemStack, par2, par3 - (this.draggedStack == null ? 0 : 8), par4Str); itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.renderEngine, par1ItemStack, par2, par3 - (this.draggedStack == null ? 0 : 8), par4Str);
this.zLevel = 0.0F; this.zLevel = 0.0F;
itemRenderer.zLevel = 0.0F; itemRenderer.zLevel = 0.0F;
} }
protected void drawItemStackTooltip(ItemStack par1ItemStack, int par2, int par3) protected void drawItemStackTooltip(ItemStack par1ItemStack, int par2, int par3) {
{
List var4 = par1ItemStack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips); List var4 = par1ItemStack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips);
for (int var5 = 0; var5 < var4.size(); ++var5) for (int var5 = 0; var5 < var4.size(); ++var5) {
{ if (var5 == 0) {
if (var5 == 0)
{
var4.set(var5, "\u00a7" + Integer.toHexString(par1ItemStack.getRarity().rarityColor) + (String) var4.get(var5)); var4.set(var5, "\u00a7" + Integer.toHexString(par1ItemStack.getRarity().rarityColor) + (String) var4.get(var5));
} } else {
else
{
var4.set(var5, EnumChatFormatting.GRAY + (String) var4.get(var5)); var4.set(var5, EnumChatFormatting.GRAY + (String) var4.get(var5));
} }
} }
@ -212,18 +199,16 @@ public abstract class GuiContainer extends GuiScreen
} }
/** /**
* Draws the text when mouse is over creative inventory tab. Params: current creative tab to be checked, current * Draws the text when mouse is over creative inventory tab. Params: current
* mouse x position, current mouse y position. * creative tab to be checked, current mouse x position, current mouse y
* position.
*/ */
protected void drawCreativeTabHoveringText(String par1Str, int par2, int par3) protected void drawCreativeTabHoveringText(String par1Str, int par2, int par3) {
{
this.func_102021_a(Arrays.asList(new String[] { par1Str }), par2, par3); this.func_102021_a(Arrays.asList(new String[] { par1Str }), par2, par3);
} }
protected void func_102021_a(List par1List, int par2, int par3) protected void func_102021_a(List par1List, int par2, int par3) {
{ if (!par1List.isEmpty()) {
if (!par1List.isEmpty())
{
EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING);
@ -231,13 +216,11 @@ public abstract class GuiContainer extends GuiScreen
int var4 = 0; int var4 = 0;
Iterator var5 = par1List.iterator(); Iterator var5 = par1List.iterator();
while (var5.hasNext()) while (var5.hasNext()) {
{
String var6 = (String) var5.next(); String var6 = (String) var5.next();
int var7 = this.fontRenderer.getStringWidth(var6); int var7 = this.fontRenderer.getStringWidth(var6);
if (var7 > var4) if (var7 > var4) {
{
var4 = var7; var4 = var7;
} }
} }
@ -246,18 +229,15 @@ public abstract class GuiContainer extends GuiScreen
int var15 = par3 - 12; int var15 = par3 - 12;
int var8 = 8; int var8 = 8;
if (par1List.size() > 1) if (par1List.size() > 1) {
{
var8 += 2 + (par1List.size() - 1) * 10; var8 += 2 + (par1List.size() - 1) * 10;
} }
if (var14 + var4 > this.width) if (var14 + var4 > this.width) {
{
var14 -= 28 + var4; var14 -= 28 + var4;
} }
if (var15 + var8 + 6 > this.height) if (var15 + var8 + 6 > this.height) {
{
var15 = this.height - var8 - 6; var15 = this.height - var8 - 6;
} }
@ -276,13 +256,11 @@ public abstract class GuiContainer extends GuiScreen
this.drawGradientRect(var14 - 3, var15 - 3, var14 + var4 + 3, var15 - 3 + 1, var10, var10); this.drawGradientRect(var14 - 3, var15 - 3, var14 + var4 + 3, var15 - 3 + 1, var10, var10);
this.drawGradientRect(var14 - 3, var15 + var8 + 2, var14 + var4 + 3, var15 + var8 + 3, var11, var11); this.drawGradientRect(var14 - 3, var15 + var8 + 2, var14 + var4 + 3, var15 + var8 + 3, var11, var11);
for (int var12 = 0; var12 < par1List.size(); ++var12) for (int var12 = 0; var12 < par1List.size(); ++var12) {
{
String var13 = (String) par1List.get(var12); String var13 = (String) par1List.get(var12);
this.fontRenderer.drawStringWithShadow(var13, var14, var15, -1); this.fontRenderer.drawStringWithShadow(var13, var14, var15, -1);
if (var12 == 0) if (var12 == 0) {
{
var15 += 2; var15 += 2;
} }
@ -293,26 +271,29 @@ public abstract class GuiContainer extends GuiScreen
itemRenderer.zLevel = 0.0F; itemRenderer.zLevel = 0.0F;
EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST);
RenderHelper.enableStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting2();
EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
} }
} }
/** /**
* Draw the foreground layer for the GuiContainer (everything in front of the items) * Draw the foreground layer for the GuiContainer (everything in front of the
* items)
*/ */
protected void drawGuiContainerForegroundLayer(int par1, int par2) {} protected void drawGuiContainerForegroundLayer(int par1, int par2) {
}
/** /**
* Draw the background layer for the GuiContainer (everything behind the items) * Draw the background layer for the GuiContainer (everything behind the items)
*/ */
protected abstract void drawGuiContainerBackgroundLayer(float var1, int var2, int var3); protected abstract void drawGuiContainerBackgroundLayer(float var1, int var2, int var3);
private static final TextureLocation items = new TextureLocation("/gui/items.png");
/** /**
* Draws an inventory slot * Draws an inventory slot
*/ */
private void drawSlotInventory(Slot par1Slot) private void drawSlotInventory(Slot par1Slot) {
{
int var2 = par1Slot.xDisplayPosition; int var2 = par1Slot.xDisplayPosition;
int var3 = par1Slot.yDisplayPosition; int var3 = par1Slot.yDisplayPosition;
ItemStack var4 = par1Slot.getStack(); ItemStack var4 = par1Slot.getStack();
@ -321,15 +302,11 @@ public abstract class GuiContainer extends GuiScreen
ItemStack var7 = this.mc.thePlayer.inventory.getItemStack(); ItemStack var7 = this.mc.thePlayer.inventory.getItemStack();
String var8 = null; String var8 = null;
if (par1Slot == this.clickedSlot && this.draggedStack != null && this.isRightMouseClick && var4 != null) if (par1Slot == this.clickedSlot && this.draggedStack != null && this.isRightMouseClick && var4 != null) {
{
var4 = var4.copy(); var4 = var4.copy();
var4.stackSize /= 2; var4.stackSize /= 2;
} } else if (this.field_94076_q && this.field_94077_p.contains(par1Slot) && var7 != null) {
else if (this.field_94076_q && this.field_94077_p.contains(par1Slot) && var7 != null) if (this.field_94077_p.size() == 1) {
{
if (this.field_94077_p.size() == 1)
{
return; return;
} }
@ -339,20 +316,16 @@ public abstract class GuiContainer extends GuiScreen
var5 = true; var5 = true;
Container.func_94525_a(this.field_94077_p, this.field_94071_C, var4, par1Slot.getStack() == null ? 0 : par1Slot.getStack().stackSize); Container.func_94525_a(this.field_94077_p, this.field_94071_C, var4, par1Slot.getStack() == null ? 0 : par1Slot.getStack().stackSize);
if (var4.stackSize > var4.getMaxStackSize()) if (var4.stackSize > var4.getMaxStackSize()) {
{
var8 = EnumChatFormatting.YELLOW + "" + var4.getMaxStackSize(); var8 = EnumChatFormatting.YELLOW + "" + var4.getMaxStackSize();
var4.stackSize = var4.getMaxStackSize(); var4.stackSize = var4.getMaxStackSize();
} }
if (var4.stackSize > par1Slot.getSlotStackLimit()) if (var4.stackSize > par1Slot.getSlotStackLimit()) {
{
var8 = EnumChatFormatting.YELLOW + "" + par1Slot.getSlotStackLimit(); var8 = EnumChatFormatting.YELLOW + "" + par1Slot.getSlotStackLimit();
var4.stackSize = par1Slot.getSlotStackLimit(); var4.stackSize = par1Slot.getSlotStackLimit();
} }
} } else {
else
{
this.field_94077_p.remove(par1Slot); this.field_94077_p.remove(par1Slot);
this.func_94066_g(); this.func_94066_g();
} }
@ -361,60 +334,51 @@ public abstract class GuiContainer extends GuiScreen
this.zLevel = 100.0F; this.zLevel = 100.0F;
itemRenderer.zLevel = 100.0F; itemRenderer.zLevel = 100.0F;
if (var4 == null) if (var4 == null) {
{
Icon var9 = par1Slot.getBackgroundIconIndex(); Icon var9 = par1Slot.getBackgroundIconIndex();
if (var9 != null) if (var9 != null) {
{
EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING);
TextureMap.locationItemsTexture.bindTexture(); items.bindTexture();
this.drawTexturedModelRectFromIcon(var2, var3, var9, 16, 16); this.drawTexturedModelRectFromIcon(var2, var3, var9, 16, 16);
EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING);
var6 = true; var6 = true;
} }
} }
if (!var6) if (!var6) {
{ if (var5) {
if (var5)
{
drawRect(var2, var3, var2 + 16, var3 + 16, -2130706433); drawRect(var2, var3, var2 + 16, var3 + 16, -2130706433);
} }
EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST);
itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.getTextureManager(), var4, var2, var3); itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.renderEngine, var4, var2, var3);
itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.getTextureManager(), var4, var2, var3, var8); itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.renderEngine, var4, var2, var3, var8);
} }
itemRenderer.zLevel = 0.0F; itemRenderer.zLevel = 0.0F;
this.zLevel = 0.0F; this.zLevel = 0.0F;
} }
private void func_94066_g() private void func_94066_g() {
{
ItemStack var1 = this.mc.thePlayer.inventory.getItemStack(); ItemStack var1 = this.mc.thePlayer.inventory.getItemStack();
if (var1 != null && this.field_94076_q) if (var1 != null && this.field_94076_q) {
{
this.field_94069_F = var1.stackSize; this.field_94069_F = var1.stackSize;
ItemStack var4; ItemStack var4;
int var5; int var5;
for (Iterator var2 = this.field_94077_p.iterator(); var2.hasNext(); this.field_94069_F -= var4.stackSize - var5) for (Iterator var2 = this.field_94077_p.iterator(); var2.hasNext(); this.field_94069_F -= var4.stackSize - var5) {
{
Slot var3 = (Slot) var2.next(); Slot var3 = (Slot) var2.next();
var4 = var1.copy(); var4 = var1.copy();
var5 = var3.getStack() == null ? 0 : var3.getStack().stackSize; var5 = var3.getStack() == null ? 0 : var3.getStack().stackSize;
Container.func_94525_a(this.field_94077_p, this.field_94071_C, var4, var5); Container.func_94525_a(this.field_94077_p, this.field_94071_C, var4, var5);
if (var4.stackSize > var4.getMaxStackSize()) if (var4.stackSize > var4.getMaxStackSize()) {
{
var4.stackSize = var4.getMaxStackSize(); var4.stackSize = var4.getMaxStackSize();
} }
if (var4.stackSize > var3.getSlotStackLimit()) if (var4.stackSize > var3.getSlotStackLimit()) {
{
var4.stackSize = var3.getSlotStackLimit(); var4.stackSize = var3.getSlotStackLimit();
} }
} }
@ -424,14 +388,11 @@ public abstract class GuiContainer extends GuiScreen
/** /**
* Returns the slot at the given coordinates or null if there is none. * Returns the slot at the given coordinates or null if there is none.
*/ */
private Slot getSlotAtPosition(int par1, int par2) private Slot getSlotAtPosition(int par1, int par2) {
{ for (int var3 = 0; var3 < this.inventorySlots.inventorySlots.size(); ++var3) {
for (int var3 = 0; var3 < this.inventorySlots.inventorySlots.size(); ++var3)
{
Slot var4 = (Slot) this.inventorySlots.inventorySlots.get(var3); Slot var4 = (Slot) this.inventorySlots.inventorySlots.get(var3);
if (this.isMouseOverSlot(var4, par1, par2)) if (this.isMouseOverSlot(var4, par1, par2)) {
{
return var4; return var4;
} }
} }
@ -442,8 +403,7 @@ public abstract class GuiContainer extends GuiScreen
/** /**
* Called when the mouse is clicked. * Called when the mouse is clicked.
*/ */
protected void mouseClicked(int par1, int par2, int par3) protected void mouseClicked(int par1, int par2, int par3) {
{
super.mouseClicked(par1, par2, par3); super.mouseClicked(par1, par2, par3);
boolean var4 = par3 == this.mc.gameSettings.keyBindPickBlock.keyCode + 100; boolean var4 = par3 == this.mc.gameSettings.keyBindPickBlock.keyCode + 100;
Slot var5 = this.getSlotAtPosition(par1, par2); Slot var5 = this.getSlotAtPosition(par1, par2);
@ -451,64 +411,46 @@ public abstract class GuiContainer extends GuiScreen
this.field_94074_J = this.field_94072_H == var5 && var6 - this.field_94070_G < 250L && this.field_94073_I == par3; this.field_94074_J = this.field_94072_H == var5 && var6 - this.field_94070_G < 250L && this.field_94073_I == par3;
this.field_94068_E = false; this.field_94068_E = false;
if (par3 == 0 || par3 == 1 || var4) if (par3 == 0 || par3 == 1 || var4) {
{
int var8 = this.guiLeft; int var8 = this.guiLeft;
int var9 = this.guiTop; int var9 = this.guiTop;
boolean var10 = par1 < var8 || par2 < var9 || par1 >= var8 + this.xSize || par2 >= var9 + this.ySize; boolean var10 = par1 < var8 || par2 < var9 || par1 >= var8 + this.xSize || par2 >= var9 + this.ySize;
int var11 = -1; int var11 = -1;
if (var5 != null) if (var5 != null) {
{
var11 = var5.slotNumber; var11 = var5.slotNumber;
} }
if (var10) if (var10) {
{
var11 = -999; var11 = -999;
} }
if (this.mc.gameSettings.touchscreen && var10 && this.mc.thePlayer.inventory.getItemStack() == null) if (this.mc.gameSettings.touchscreen && var10 && this.mc.thePlayer.inventory.getItemStack() == null) {
{
this.mc.displayGuiScreen((GuiScreen) null); this.mc.displayGuiScreen((GuiScreen) null);
return; return;
} }
if (var11 != -1) if (var11 != -1) {
{ if (this.mc.gameSettings.touchscreen) {
if (this.mc.gameSettings.touchscreen) if (var5 != null && var5.getHasStack()) {
{
if (var5 != null && var5.getHasStack())
{
this.clickedSlot = var5; this.clickedSlot = var5;
this.draggedStack = null; this.draggedStack = null;
this.isRightMouseClick = par3 == 1; this.isRightMouseClick = par3 == 1;
} } else {
else
{
this.clickedSlot = null; this.clickedSlot = null;
} }
} } else if (!this.field_94076_q) {
else if (!this.field_94076_q) if (this.mc.thePlayer.inventory.getItemStack() == null) {
{ if (par3 == this.mc.gameSettings.keyBindPickBlock.keyCode + 100) {
if (this.mc.thePlayer.inventory.getItemStack() == null)
{
if (par3 == this.mc.gameSettings.keyBindPickBlock.keyCode + 100)
{
this.handleMouseClick(var5, var11, par3, 3); this.handleMouseClick(var5, var11, par3, 3);
} } else {
else
{
boolean var12 = var11 != -999 && (EaglerAdapter.isKeyDown(42) || EaglerAdapter.isKeyDown(54)); boolean var12 = var11 != -999 && (EaglerAdapter.isKeyDown(42) || EaglerAdapter.isKeyDown(54));
byte var13 = 0; byte var13 = 0;
if (var12) if (var12) {
{
this.field_94075_K = var5 != null && var5.getHasStack() ? var5.getStack() : null; this.field_94075_K = var5 != null && var5.getHasStack() ? var5.getStack() : null;
var13 = 1; var13 = 1;
} } else if (var11 == -999) {
else if (var11 == -999)
{
var13 = 4; var13 = 4;
} }
@ -516,19 +458,14 @@ public abstract class GuiContainer extends GuiScreen
} }
this.field_94068_E = true; this.field_94068_E = true;
} } else {
else
{
this.field_94076_q = true; this.field_94076_q = true;
this.field_94067_D = par3; this.field_94067_D = par3;
this.field_94077_p.clear(); this.field_94077_p.clear();
if (par3 == 0) if (par3 == 0) {
{
this.field_94071_C = 0; this.field_94071_C = 0;
} } else if (par3 == 1) {
else if (par3 == 1)
{
this.field_94071_C = 1; this.field_94071_C = 1;
} }
} }
@ -541,43 +478,28 @@ public abstract class GuiContainer extends GuiScreen
this.field_94073_I = par3; this.field_94073_I = par3;
} }
/** protected void func_85041_a(int par1, int par2, int par3, long par4) {
* Called when a mouse button is pressed and the mouse is moved around. Parameters are : mouseX, mouseY,
* lastButtonClicked & timeSinceMouseClick.
*/
protected void mouseClickMove(int par1, int par2, int par3, long par4)
{
Slot var6 = this.getSlotAtPosition(par1, par2); Slot var6 = this.getSlotAtPosition(par1, par2);
ItemStack var7 = this.mc.thePlayer.inventory.getItemStack(); ItemStack var7 = this.mc.thePlayer.inventory.getItemStack();
if (this.clickedSlot != null && this.mc.gameSettings.touchscreen) if (this.clickedSlot != null && this.mc.gameSettings.touchscreen) {
{ if (par3 == 0 || par3 == 1) {
if (par3 == 0 || par3 == 1) if (this.draggedStack == null) {
{ if (var6 != this.clickedSlot) {
if (this.draggedStack == null)
{
if (var6 != this.clickedSlot)
{
this.draggedStack = this.clickedSlot.getStack().copy(); this.draggedStack = this.clickedSlot.getStack().copy();
} }
} } else if (this.draggedStack.stackSize > 1 && var6 != null && Container.func_94527_a(var6, this.draggedStack, false)) {
else if (this.draggedStack.stackSize > 1 && var6 != null && Container.func_94527_a(var6, this.draggedStack, false))
{
long var8 = Minecraft.getSystemTime(); long var8 = Minecraft.getSystemTime();
if (this.field_92033_y == var6) if (this.field_92033_y == var6) {
{ if (var8 - this.field_92032_z > 500L) {
if (var8 - this.field_92032_z > 500L)
{
this.handleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, 0, 0); this.handleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, 0, 0);
this.handleMouseClick(var6, var6.slotNumber, 1, 0); this.handleMouseClick(var6, var6.slotNumber, 1, 0);
this.handleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, 0, 0); this.handleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, 0, 0);
this.field_92032_z = var8 + 750L; this.field_92032_z = var8 + 750L;
--this.draggedStack.stackSize; --this.draggedStack.stackSize;
} }
} } else {
else
{
this.field_92033_y = var6; this.field_92033_y = var6;
this.field_92032_z = var8; this.field_92032_z = var8;
} }
@ -592,107 +514,85 @@ public abstract class GuiContainer extends GuiScreen
} }
/** /**
* Called when the mouse is moved or a mouse button is released. Signature: (mouseX, mouseY, which) which==-1 is * Called when the mouse is moved or a mouse button is released. Signature:
* mouseMove, which==0 or which==1 is mouseUp * (mouseX, mouseY, which) which==-1 is mouseMove, which==0 or which==1 is
* mouseUp
*/ */
protected void mouseMovedOrUp(int par1, int par2, int par3) protected void mouseMovedOrUp(int par1, int par2, int par3) {
{
Slot var4 = this.getSlotAtPosition(par1, par2); Slot var4 = this.getSlotAtPosition(par1, par2);
int var5 = this.guiLeft; int var5 = this.guiLeft;
int var6 = this.guiTop; int var6 = this.guiTop;
boolean var7 = par1 < var5 || par2 < var6 || par1 >= var5 + this.xSize || par2 >= var6 + this.ySize; boolean var7 = par1 < var5 || par2 < var6 || par1 >= var5 + this.xSize || par2 >= var6 + this.ySize;
int var8 = -1; int var8 = -1;
if (var4 != null) if (var4 != null) {
{
var8 = var4.slotNumber; var8 = var4.slotNumber;
} }
if (var7) if (var7) {
{
var8 = -999; var8 = -999;
} }
Slot var10; Slot var10;
Iterator var11; Iterator var11;
if (this.field_94074_J && var4 != null && par3 == 0 && this.inventorySlots.func_94530_a((ItemStack)null, var4)) if (this.field_94074_J && var4 != null && par3 == 0 && this.inventorySlots.func_94530_a((ItemStack) null, var4)) {
{ if (isShiftKeyDown()) {
if (isShiftKeyDown()) if (var4 != null && var4.inventory != null && this.field_94075_K != null) {
{
if (var4 != null && var4.inventory != null && this.field_94075_K != null)
{
var11 = this.inventorySlots.inventorySlots.iterator(); var11 = this.inventorySlots.inventorySlots.iterator();
while (var11.hasNext()) while (var11.hasNext()) {
{
var10 = (Slot) var11.next(); var10 = (Slot) var11.next();
if (var10 != null && var10.canTakeStack(this.mc.thePlayer) && var10.getHasStack() && var10.inventory == var4.inventory && Container.func_94527_a(var10, this.field_94075_K, true)) if (var10 != null && var10.canTakeStack(this.mc.thePlayer) && var10.getHasStack() && var10.inventory == var4.inventory && Container.func_94527_a(var10, this.field_94075_K, true)) {
{
this.handleMouseClick(var10, var10.slotNumber, par3, 1); this.handleMouseClick(var10, var10.slotNumber, par3, 1);
} }
} }
} }
} } else {
else
{
this.handleMouseClick(var4, var8, par3, 6); this.handleMouseClick(var4, var8, par3, 6);
} }
this.field_94074_J = false; this.field_94074_J = false;
this.field_94070_G = 0L; this.field_94070_G = 0L;
} } else {
else if (this.field_94076_q && this.field_94067_D != par3) {
{
if (this.field_94076_q && this.field_94067_D != par3)
{
this.field_94076_q = false; this.field_94076_q = false;
this.field_94077_p.clear(); this.field_94077_p.clear();
this.field_94068_E = true; this.field_94068_E = true;
return; return;
} }
if (this.field_94068_E) if (this.field_94068_E) {
{
this.field_94068_E = false; this.field_94068_E = false;
return; return;
} }
boolean var9; boolean var9;
if (this.clickedSlot != null && this.mc.gameSettings.touchscreen) if (this.clickedSlot != null && this.mc.gameSettings.touchscreen) {
{ if (par3 == 0 || par3 == 1) {
if (par3 == 0 || par3 == 1) if (this.draggedStack == null && var4 != this.clickedSlot) {
{
if (this.draggedStack == null && var4 != this.clickedSlot)
{
this.draggedStack = this.clickedSlot.getStack(); this.draggedStack = this.clickedSlot.getStack();
} }
var9 = Container.func_94527_a(var4, this.draggedStack, false); var9 = Container.func_94527_a(var4, this.draggedStack, false);
if (var8 != -1 && this.draggedStack != null && var9) if (var8 != -1 && this.draggedStack != null && var9) {
{
this.handleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, par3, 0); this.handleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, par3, 0);
this.handleMouseClick(var4, var8, 0, 0); this.handleMouseClick(var4, var8, 0, 0);
if (this.mc.thePlayer.inventory.getItemStack() != null) if (this.mc.thePlayer.inventory.getItemStack() != null) {
{
this.handleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, par3, 0); this.handleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, par3, 0);
this.field_85049_r = par1 - var5; this.field_85049_r = par1 - var5;
this.field_85048_s = par2 - var6; this.field_85048_s = par2 - var6;
this.returningStackDestSlot = this.clickedSlot; this.returningStackDestSlot = this.clickedSlot;
this.returningStack = this.draggedStack; this.returningStack = this.draggedStack;
this.returningStackTime = Minecraft.getSystemTime(); this.returningStackTime = Minecraft.getSystemTime();
} } else {
else
{
this.returningStack = null; this.returningStack = null;
} }
} } else if (this.draggedStack != null) {
else if (this.draggedStack != null)
{
this.field_85049_r = par1 - var5; this.field_85049_r = par1 - var5;
this.field_85048_s = par2 - var6; this.field_85048_s = par2 - var6;
this.returningStackDestSlot = this.clickedSlot; this.returningStackDestSlot = this.clickedSlot;
@ -703,32 +603,23 @@ public abstract class GuiContainer extends GuiScreen
this.draggedStack = null; this.draggedStack = null;
this.clickedSlot = null; this.clickedSlot = null;
} }
} } else if (this.field_94076_q && !this.field_94077_p.isEmpty()) {
else if (this.field_94076_q && !this.field_94077_p.isEmpty())
{
this.handleMouseClick((Slot) null, -999, Container.func_94534_d(0, this.field_94071_C), 5); this.handleMouseClick((Slot) null, -999, Container.func_94534_d(0, this.field_94071_C), 5);
var11 = this.field_94077_p.iterator(); var11 = this.field_94077_p.iterator();
while (var11.hasNext()) while (var11.hasNext()) {
{
var10 = (Slot) var11.next(); var10 = (Slot) var11.next();
this.handleMouseClick(var10, var10.slotNumber, Container.func_94534_d(1, this.field_94071_C), 5); this.handleMouseClick(var10, var10.slotNumber, Container.func_94534_d(1, this.field_94071_C), 5);
} }
this.handleMouseClick((Slot) null, -999, Container.func_94534_d(2, this.field_94071_C), 5); this.handleMouseClick((Slot) null, -999, Container.func_94534_d(2, this.field_94071_C), 5);
} } else if (this.mc.thePlayer.inventory.getItemStack() != null) {
else if (this.mc.thePlayer.inventory.getItemStack() != null) if (par3 == this.mc.gameSettings.keyBindPickBlock.keyCode + 100) {
{
if (par3 == this.mc.gameSettings.keyBindPickBlock.keyCode + 100)
{
this.handleMouseClick(var4, var8, par3, 3); this.handleMouseClick(var4, var8, par3, 3);
} } else {
else
{
var9 = var8 != -999 && (EaglerAdapter.isKeyDown(42) || EaglerAdapter.isKeyDown(54)); var9 = var8 != -999 && (EaglerAdapter.isKeyDown(42) || EaglerAdapter.isKeyDown(54));
if (var9) if (var9) {
{
this.field_94075_K = var4 != null && var4.getHasStack() ? var4.getStack() : null; this.field_94075_K = var4 != null && var4.getHasStack() ? var4.getStack() : null;
} }
@ -737,8 +628,7 @@ public abstract class GuiContainer extends GuiScreen
} }
} }
if (this.mc.thePlayer.inventory.getItemStack() == null) if (this.mc.thePlayer.inventory.getItemStack() == null) {
{
this.field_94070_G = 0L; this.field_94070_G = 0L;
} }
@ -748,17 +638,15 @@ public abstract class GuiContainer extends GuiScreen
/** /**
* Returns if the passed mouse position is over the specified slot. * Returns if the passed mouse position is over the specified slot.
*/ */
private boolean isMouseOverSlot(Slot par1Slot, int par2, int par3) private boolean isMouseOverSlot(Slot par1Slot, int par2, int par3) {
{
return this.isPointInRegion(par1Slot.xDisplayPosition, par1Slot.yDisplayPosition, 16, 16, par2, par3); return this.isPointInRegion(par1Slot.xDisplayPosition, par1Slot.yDisplayPosition, 16, 16, par2, par3);
} }
/** /**
* Args: left, top, width, height, pointX, pointY. Note: left, top are local to Gui, pointX, pointY are local to * Args: left, top, width, height, pointX, pointY. Note: left, top are local to
* screen * Gui, pointX, pointY are local to screen
*/ */
protected boolean isPointInRegion(int par1, int par2, int par3, int par4, int par5, int par6) protected boolean isPointInRegion(int par1, int par2, int par3, int par4, int par5, int par6) {
{
int var7 = this.guiLeft; int var7 = this.guiLeft;
int var8 = this.guiTop; int var8 = this.guiTop;
par5 -= var7; par5 -= var7;
@ -766,10 +654,8 @@ public abstract class GuiContainer extends GuiScreen
return par5 >= par1 - 1 && par5 < par1 + par3 + 1 && par6 >= par2 - 1 && par6 < par2 + par4 + 1; return par5 >= par1 - 1 && par5 < par1 + par3 + 1 && par6 >= par2 - 1 && par6 < par2 + par4 + 1;
} }
protected void handleMouseClick(Slot par1Slot, int par2, int par3, int par4) protected void handleMouseClick(Slot par1Slot, int par2, int par3, int par4) {
{ if (par1Slot != null) {
if (par1Slot != null)
{
par2 = par1Slot.slotNumber; par2 = par1Slot.slotNumber;
} }
@ -777,41 +663,33 @@ public abstract class GuiContainer extends GuiScreen
} }
/** /**
* 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) protected void keyTyped(char par1, int par2) {
{ if (par2 == 1 || par2 == this.mc.gameSettings.keyBindInventory.keyCode) {
if (par2 == 1 || par2 == this.mc.gameSettings.keyBindInventory.keyCode)
{
this.mc.thePlayer.closeScreen(); this.mc.thePlayer.closeScreen();
} }
this.checkHotbarKeys(par2); this.checkHotbarKeys(par2);
if (this.theSlot != null && this.theSlot.getHasStack()) if (this.theSlot != null && this.theSlot.getHasStack()) {
{ if (par2 == this.mc.gameSettings.keyBindPickBlock.keyCode) {
if (par2 == this.mc.gameSettings.keyBindPickBlock.keyCode)
{
this.handleMouseClick(this.theSlot, this.theSlot.slotNumber, 0, 3); this.handleMouseClick(this.theSlot, this.theSlot.slotNumber, 0, 3);
} } else if (par2 == this.mc.gameSettings.keyBindDrop.keyCode) {
else if (par2 == this.mc.gameSettings.keyBindDrop.keyCode)
{
this.handleMouseClick(this.theSlot, this.theSlot.slotNumber, isCtrlKeyDown() ? 1 : 0, 4); this.handleMouseClick(this.theSlot, this.theSlot.slotNumber, isCtrlKeyDown() ? 1 : 0, 4);
} }
} }
} }
/** /**
* This function is what controls the hotbar shortcut check when you press a number key when hovering a stack. * This function is what controls the hotbar shortcut check when you press a
* number key when hovering a stack.
*/ */
protected boolean checkHotbarKeys(int par1) protected boolean checkHotbarKeys(int par1) {
{ if (this.mc.thePlayer.inventory.getItemStack() == null && this.theSlot != null) {
if (this.mc.thePlayer.inventory.getItemStack() == null && this.theSlot != null) for (int var2 = 0; var2 < 9; ++var2) {
{ if (par1 == 2 + var2) {
for (int var2 = 0; var2 < 9; ++var2)
{
if (par1 == 2 + var2)
{
this.handleMouseClick(this.theSlot, this.theSlot.slotNumber, var2, 2); this.handleMouseClick(this.theSlot, this.theSlot.slotNumber, var2, 2);
return true; return true;
} }
@ -833,22 +711,20 @@ public abstract class GuiContainer extends GuiScreen
} }
/** /**
* Returns true if this GUI should pause the game when it is displayed in single-player * Returns true if this GUI should pause the game when it is displayed in
* single-player
*/ */
public boolean doesGuiPauseGame() public boolean doesGuiPauseGame() {
{
return false; return false;
} }
/** /**
* Called from the main game loop to update the screen. * Called from the main game loop to update the screen.
*/ */
public void updateScreen() public void updateScreen() {
{
super.updateScreen(); super.updateScreen();
if (!this.mc.thePlayer.isEntityAlive() || this.mc.thePlayer.isDead) if (!this.mc.thePlayer.isEntityAlive() || this.mc.thePlayer.isDead) {
{
this.mc.thePlayer.closeScreen(); this.mc.thePlayer.closeScreen();
} }
} }

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

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