fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix patterns "not extracting" due to acidental dragging

Browse Source 
bump version
This commit is contained in:
PrototypeTrousers
2022-05-30 23:27:46 -03:00
parent 5b1f98b2d8
commit d77838146d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+1 -1
View File
@@ -4,7 +4,7 @@ aebuild=7
aegroup=appeng aegroup=appeng
aebasename=appliedenergistics2 aebasename=appliedenergistics2
extended=extended_life extended=extended_life
extendedversion=v0.52.7 extendedversion=v0.52.8
######################################################### #########################################################
# Versions # # Versions #
######################################################### #########################################################
src/main/java/appeng/client/gui/AEBaseGui.java
+5 -2
View File
@@ -108,6 +108,7 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
private List<IGhostIngredientHandler.Target<Object>> hoveredIngredientTargets = new ArrayList<>(); private List<IGhostIngredientHandler.Target<Object>> hoveredIngredientTargets = new ArrayList<>();
private Object bookmarkedIngredient; private Object bookmarkedIngredient;
private boolean isDraggingJeiGhostItem; private boolean isDraggingJeiGhostItem;
private boolean haltDragging = false;
public void setJeiGhostItem( boolean jeiGhostItem ) public void setJeiGhostItem( boolean jeiGhostItem )
{ {
@@ -441,6 +442,7 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
protected void mouseReleased( int mouseX, int mouseY, int state ) protected void mouseReleased( int mouseX, int mouseY, int state )
{ {
this.drag_click.clear(); this.drag_click.clear();
this.haltDragging = false;
super.mouseReleased( mouseX, mouseY, state ); super.mouseReleased( mouseX, mouseY, state );
} }
@@ -466,7 +468,7 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
} }
else if( slot instanceof SlotDisconnected ) else if( slot instanceof SlotDisconnected )
{ {
if( this.drag_click.add( slot ) ) if( !haltDragging && this.drag_click.add( slot ) )
{ {
if( !itemstack.isEmpty() ) if( !itemstack.isEmpty() )
{ {
@@ -628,7 +630,7 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
if( slot instanceof SlotDisconnected ) if( slot instanceof SlotDisconnected )
{ {
if( this.drag_click.size() > 1 ) if( this.drag_click.size() >= 1 )
{ {
return; return;
} }
@@ -645,6 +647,7 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
if( !slot.getStack().isEmpty() && player.inventory.getItemStack().getCount() <= 1 ) if( !slot.getStack().isEmpty() && player.inventory.getItemStack().getCount() <= 1 )
{ {
action = InventoryAction.PICKUP_OR_SET_DOWN; action = InventoryAction.PICKUP_OR_SET_DOWN;
this.haltDragging = true;
} }
break; break;
case QUICK_MOVE: case QUICK_MOVE: