keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Add GuiContainerEvent.DrawBackground event. (#5595)

Browse source
This commit is contained in:
Lars Gerrits 2019-04-16 03:56:58 +02:00 committed by LexManos
parent bbc92fa51c
commit 273b1b110a
2 changed files with 56 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch
View file

@ -8,7 +8,15 @@
import net.minecraft.client.util.InputMappings; import net.minecraft.client.util.InputMappings;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ClickType; import net.minecraft.inventory.ClickType;
@@ -97,7 +96,8 @@ @@ -68,6 +67,7 @@
int i = this.field_147003_i;
int j = this.field_147009_r;
this.func_146976_a(p_73863_3_, p_73863_1_, p_73863_2_);
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiContainerEvent.DrawBackground(this, p_73863_1_, p_73863_2_));
GlStateManager.func_179101_C();
RenderHelper.func_74518_a();
GlStateManager.func_179140_f();
@@ -97,7 +97,8 @@
int j1 = slot.field_75223_e; int j1 = slot.field_75223_e;
int k1 = slot.field_75221_f; int k1 = slot.field_75221_f;
GlStateManager.func_179135_a(true, true, true, false); GlStateManager.func_179135_a(true, true, true, false);
@ -18,7 +26,7 @@
GlStateManager.func_179135_a(true, true, true, true); GlStateManager.func_179135_a(true, true, true, true);
GlStateManager.func_179145_e(); GlStateManager.func_179145_e();
GlStateManager.func_179126_j(); GlStateManager.func_179126_j();
@@ -107,6 +107,7 @@ @@ -107,6 +108,7 @@
RenderHelper.func_74518_a(); RenderHelper.func_74518_a();
this.func_146979_b(p_73863_1_, p_73863_2_); this.func_146979_b(p_73863_1_, p_73863_2_);
RenderHelper.func_74520_c(); RenderHelper.func_74520_c();
@ -26,7 +34,7 @@
InventoryPlayer inventoryplayer = this.field_146297_k.field_71439_g.field_71071_by; InventoryPlayer inventoryplayer = this.field_146297_k.field_71439_g.field_71071_by;
ItemStack itemstack = this.field_147012_x.func_190926_b() ? inventoryplayer.func_70445_o() : this.field_147012_x; ItemStack itemstack = this.field_147012_x.func_190926_b() ? inventoryplayer.func_70445_o() : this.field_147012_x;
if (!itemstack.func_190926_b()) { if (!itemstack.func_190926_b()) {
@@ -158,8 +159,10 @@ @@ -158,8 +160,10 @@
GlStateManager.func_179109_b(0.0F, 0.0F, 32.0F); GlStateManager.func_179109_b(0.0F, 0.0F, 32.0F);
this.field_73735_i = 200.0F; this.field_73735_i = 200.0F;
this.field_146296_j.field_77023_b = 200.0F; this.field_146296_j.field_77023_b = 200.0F;
@ -38,7 +46,7 @@
this.field_73735_i = 0.0F; this.field_73735_i = 0.0F;
this.field_146296_j.field_77023_b = 0.0F; this.field_146296_j.field_77023_b = 0.0F;
} }
@@ -203,11 +206,10 @@ @@ -203,11 +207,10 @@
this.field_73735_i = 100.0F; this.field_73735_i = 100.0F;
this.field_146296_j.field_77023_b = 100.0F; this.field_146296_j.field_77023_b = 100.0F;
if (itemstack.func_190926_b() && p_146977_1_.func_111238_b()) { if (itemstack.func_190926_b() && p_146977_1_.func_111238_b()) {
@ -53,7 +61,7 @@
this.func_175175_a(i, j, textureatlassprite, 16, 16); this.func_175175_a(i, j, textureatlassprite, 16, 16);
GlStateManager.func_179145_e(); GlStateManager.func_179145_e();
flag1 = true; flag1 = true;
@@ -268,7 +270,8 @@ @@ -268,7 +271,8 @@
if (super.mouseClicked(p_mouseClicked_1_, p_mouseClicked_3_, p_mouseClicked_5_)) { if (super.mouseClicked(p_mouseClicked_1_, p_mouseClicked_3_, p_mouseClicked_5_)) {
return true; return true;
} else { } else {
@ -63,7 +71,7 @@
Slot slot = this.func_195360_a(p_mouseClicked_1_, p_mouseClicked_3_); Slot slot = this.func_195360_a(p_mouseClicked_1_, p_mouseClicked_3_);
long i = Util.func_211177_b(); long i = Util.func_211177_b();
this.field_146993_M = this.field_146998_K == slot && i - this.field_146997_J < 250L && this.field_146992_L == p_mouseClicked_5_; this.field_146993_M = this.field_146998_K == slot && i - this.field_146997_J < 250L && this.field_146992_L == p_mouseClicked_5_;
@@ -277,6 +280,7 @@ @@ -277,6 +281,7 @@
int j = this.field_147003_i; int j = this.field_147003_i;
int k = this.field_147009_r; int k = this.field_147009_r;
boolean flag1 = this.func_195361_a(p_mouseClicked_1_, p_mouseClicked_3_, j, k, p_mouseClicked_5_); boolean flag1 = this.func_195361_a(p_mouseClicked_1_, p_mouseClicked_3_, j, k, p_mouseClicked_5_);
@ -71,7 +79,7 @@
int l = -1; int l = -1;
if (slot != null) { if (slot != null) {
l = slot.field_75222_d; l = slot.field_75222_d;
@@ -302,7 +306,7 @@ @@ -302,7 +307,7 @@
} }
} else if (!this.field_147007_t) { } else if (!this.field_147007_t) {
if (this.field_146297_k.field_71439_g.field_71071_by.func_70445_o().func_190926_b()) { if (this.field_146297_k.field_71439_g.field_71071_by.func_70445_o().func_190926_b()) {
@ -80,7 +88,7 @@
this.func_184098_a(slot, l, p_mouseClicked_5_, ClickType.CLONE); this.func_184098_a(slot, l, p_mouseClicked_5_, ClickType.CLONE);
} else { } else {
boolean flag2 = l != -999 && (InputMappings.func_197956_a(340) || InputMappings.func_197956_a(344)); boolean flag2 = l != -999 && (InputMappings.func_197956_a(340) || InputMappings.func_197956_a(344));
@@ -326,7 +330,7 @@ @@ -326,7 +331,7 @@
this.field_146987_F = 0; this.field_146987_F = 0;
} else if (p_mouseClicked_5_ == 1) { } else if (p_mouseClicked_5_ == 1) {
this.field_146987_F = 1; this.field_146987_F = 1;
@ -89,7 +97,7 @@
this.field_146987_F = 2; this.field_146987_F = 2;
} }
} }
@@ -379,10 +383,13 @@ @@ -379,10 +384,13 @@
} }
public boolean mouseReleased(double p_mouseReleased_1_, double p_mouseReleased_3_, int p_mouseReleased_5_) { public boolean mouseReleased(double p_mouseReleased_1_, double p_mouseReleased_3_, int p_mouseReleased_5_) {
@ -103,7 +111,7 @@
int k = -1; int k = -1;
if (slot != null) { if (slot != null) {
k = slot.field_75222_d; k = slot.field_75222_d;
@@ -396,7 +403,7 @@ @@ -396,7 +404,7 @@
if (func_146272_n()) { if (func_146272_n()) {
if (!this.field_146994_N.func_190926_b()) { if (!this.field_146994_N.func_190926_b()) {
for(Slot slot2 : this.field_147002_h.field_75151_b) { for(Slot slot2 : this.field_147002_h.field_75151_b) {
@ -112,7 +120,7 @@
this.func_184098_a(slot2, slot2.field_75222_d, p_mouseReleased_5_, ClickType.QUICK_MOVE); this.func_184098_a(slot2, slot2.field_75222_d, p_mouseReleased_5_, ClickType.QUICK_MOVE);
} }
} }
@@ -460,7 +467,7 @@ @@ -460,7 +468,7 @@
this.func_184098_a((Slot)null, -999, Container.func_94534_d(2, this.field_146987_F), ClickType.QUICK_CRAFT); this.func_184098_a((Slot)null, -999, Container.func_94534_d(2, this.field_146987_F), ClickType.QUICK_CRAFT);
} else if (!this.field_146297_k.field_71439_g.field_71071_by.func_70445_o().func_190926_b()) { } else if (!this.field_146297_k.field_71439_g.field_71071_by.func_70445_o().func_190926_b()) {
@ -121,7 +129,7 @@
this.func_184098_a(slot, k, p_mouseReleased_5_, ClickType.CLONE); this.func_184098_a(slot, k, p_mouseReleased_5_, ClickType.CLONE);
} else { } else {
boolean flag1 = k != -999 && (InputMappings.func_197956_a(340) || InputMappings.func_197956_a(344)); boolean flag1 = k != -999 && (InputMappings.func_197956_a(340) || InputMappings.func_197956_a(344));
@@ -509,15 +516,15 @@ @@ -509,15 +517,15 @@
if (super.keyPressed(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_)) { if (super.keyPressed(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_)) {
return true; return true;
} else { } else {
@ -140,7 +148,7 @@
this.func_184098_a(this.field_147006_u, this.field_147006_u.field_75222_d, func_146271_m() ? 1 : 0, ClickType.THROW); this.func_184098_a(this.field_147006_u, this.field_147006_u.field_75222_d, func_146271_m() ? 1 : 0, ClickType.THROW);
} }
} }
@@ -529,7 +536,7 @@ @@ -529,7 +537,7 @@
protected boolean func_195363_d(int p_195363_1_, int p_195363_2_) { protected boolean func_195363_d(int p_195363_1_, int p_195363_2_) {
if (this.field_146297_k.field_71439_g.field_71071_by.func_70445_o().func_190926_b() && this.field_147006_u != null) { if (this.field_146297_k.field_71439_g.field_71071_by.func_70445_o().func_190926_b() && this.field_147006_u != null) {
for(int i = 0; i < 9; ++i) { for(int i = 0; i < 9; ++i) {
@ -149,7 +157,7 @@
this.func_184098_a(this.field_147006_u, this.field_147006_u.field_75222_d, i, ClickType.SWAP); this.func_184098_a(this.field_147006_u, this.field_147006_u.field_75222_d, i, ClickType.SWAP);
return true; return true;
} }
@@ -556,4 +563,16 @@ @@ -556,4 +564,16 @@
} }
} }

34
src/main/java/net/minecraftforge/client/event/GuiContainerEvent.java
View file

@ -75,4 +75,38 @@ public class GuiContainerEvent extends Event
return mouseY; return mouseY;
} }
} }
/**
* This event is fired directly after the GuiContainer has draw any background elements,
* This is useful for drawing new background elements.
*/
public static class DrawBackground extends GuiContainerEvent
{
private final int mouseX;
private final int mouseY;
/**
* Called directly after the GuiContainer has drawn any background elements.
*
* @param guiContainer The container.
* @param mouseX The current X position of the players mouse.
* @param mouseY The current Y position of the players mouse.
*/
public DrawBackground(GuiContainer guiContainer, int mouseX, int mouseY)
{
super(guiContainer);
this.mouseX = mouseX;
this.mouseY = mouseY;
}
public int getMouseX()
{
return mouseX;
}
public int getMouseY()
{
return mouseY;
}
}
} }