From d2295704959cd29810da3930b56cb4827f8ce9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Salom=C3=A3o?= <salomaoo@gmail.com>
Date: Sat, 4 Sep 2021 18:59:28 -0300
Subject: [PATCH] try to fix energy issues again

fix issue with voiding p2p parts when shift-right clicking with a memory card
---
 gradle.properties                                  | 2 +-
 src/main/java/appeng/me/cache/EnergyGridCache.java | 9 ++++-----
 src/main/java/appeng/parts/p2p/PartP2PTunnel.java  | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 3beb812cb..4cb324836 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ aechannel=stable
 aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
-trousers=omni-fixes-v46o
+trousers=omni-fixes-v46p
 
 #########################################################
 # Versions                                              #
diff --git a/src/main/java/appeng/me/cache/EnergyGridCache.java b/src/main/java/appeng/me/cache/EnergyGridCache.java
index 7bdd61f4e..9fbb417da 100644
--- a/src/main/java/appeng/me/cache/EnergyGridCache.java
+++ b/src/main/java/appeng/me/cache/EnergyGridCache.java
@@ -191,6 +191,10 @@ public class EnergyGridCache implements IEnergyGrid
 	@Override
 	public void onUpdateTick()
 	{
+		if( localStorage.stored < MAX_BUFFER_STORAGE - 0.001 )
+		{
+			this.myGrid.postEvent( new MENetworkPowerStorage( localStorage, PowerEventType.REQUEST_POWER ) );
+		}
 		if( !this.interests.isEmpty() )
 		{
 			final double oldPower = this.lastStoredPower;
@@ -833,11 +837,6 @@ public class EnergyGridCache implements IEnergyGrid
 		{
 			this.stored -= amount;
 
-			if( this.stored < MAX_BUFFER_STORAGE - 0.001 )
-			{
-				EnergyGridCache.this.myGrid.postEvent( new MENetworkPowerStorage( this, PowerEventType.REQUEST_POWER ) );
-			}
-
 			if( this.stored < 0.01 )
 			{
 				EnergyGridCache.this.ticksSinceHasPowerChange = 0;
diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java
index d591506ee..4d30c45c5 100644
--- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java
+++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java
@@ -351,7 +351,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 				{
 					newFreq = this.getProxy().getP2P().newFrequency();
 
-					final ItemStack newType = new ItemStack( data );
+					final ItemStack newType = this.getHost().getPart( this.getSide() ).getItemStack( PartItemStack.WRENCH );
 
 					this.getHost().removePart( this.getSide(), false );
 					final AEPartLocation dir = this.getHost().addPart( newType, this.getSide(), player, hand );