From f14407b87a17438a7cb70b8af9984b405996327f Mon Sep 17 00:00:00 2001
From: PrototypeTrousers <salomaoo@gmail.com>
Date: Sat, 28 Jan 2023 14:09:00 -0300
Subject: [PATCH] attempted fixes for spatialIO, security and ShaderTech compat

---
 gradle.properties                                 |   2 +-
 src/main/java/appeng/core/api/imc/IMCSpatial.java |   3 ++-
 src/main/java/appeng/me/cache/SecurityCache.java  |  10 ++++------
 .../models/part/p2p/p2p_tunnel_redstone.json      |   2 +-
 .../textures/blocks/redstone_p2p.png              | Bin 0 -> 140 bytes
 5 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/redstone_p2p.png

diff --git a/gradle.properties b/gradle.properties
index 490568804..236e2c8ad 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
 extended=extended_life
-extendedversion=v0.54.19
+extendedversion=v0.54.20
 #########################################################
 # Versions                                              #
 #########################################################
diff --git a/src/main/java/appeng/core/api/imc/IMCSpatial.java b/src/main/java/appeng/core/api/imc/IMCSpatial.java
index af6ea75c2..90fc94b26 100644
--- a/src/main/java/appeng/core/api/imc/IMCSpatial.java
+++ b/src/main/java/appeng/core/api/imc/IMCSpatial.java
@@ -28,6 +28,7 @@ package appeng.core.api.imc;
 import appeng.api.AEApi;
 import appeng.core.AELog;
 import appeng.core.api.IIMCProcessor;
+import net.minecraft.launchwrapper.Launch;
 import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
 
 
@@ -37,7 +38,7 @@ public class IMCSpatial implements IIMCProcessor {
     public void process(final IMCMessage m) {
 
         try {
-            final Class classInstance = Class.forName(m.getStringValue());
+            final Class classInstance = Class.forName(m.getStringValue(), false, Launch.classLoader);
             AEApi.instance().registries().movable().whiteListTileEntity(classInstance);
         } catch (final ClassNotFoundException e) {
             AELog.info("Bad Class Registered: " + m.getStringValue() + " by " + m.getSender());
diff --git a/src/main/java/appeng/me/cache/SecurityCache.java b/src/main/java/appeng/me/cache/SecurityCache.java
index 8b74d0453..7ff92367a 100644
--- a/src/main/java/appeng/me/cache/SecurityCache.java
+++ b/src/main/java/appeng/me/cache/SecurityCache.java
@@ -138,16 +138,14 @@ public class SecurityCache implements ISecurityGrid {
 
     @Override
     public boolean hasPermission(final int playerID, final SecurityPermissions perm) {
+        if (playerID == -1) {
+            return true;
+        }
         if (this.isAvailable()) {
             final EnumSet<SecurityPermissions> perms = this.playerPerms.get(playerID);
 
             if (perms == null) {
-                if (playerID == -1) // no default?
-                {
-                    return false;
-                } else {
-                    return this.hasPermission(-1, perm);
-                }
+                return this.hasPermission(-1, perm);
             }
 
             return perms.contains(perm);
diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_redstone.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_redstone.json
index c63cf2f71..8e523bb51 100644
--- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_redstone.json
+++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_redstone.json
@@ -1,6 +1,6 @@
 {
     "parent": "appliedenergistics2:part/p2p/p2p_tunnel_base",
     "textures": {
-        "type": "blocks/redstone_block"
+        "type": "appliedenergistics2:blocks/redstone_p2p"
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/redstone_p2p.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/redstone_p2p.png
new file mode 100644
index 0000000000000000000000000000000000000000..01d8213b1fdd43b1df5ac1c3c88185097aabee1e
GIT binary patch
literal 140
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&C3
z=<CS9u(6-}Pa-P=0|RG)M`SSrgHQ<wGu}&+uV7$cQ1o<h46*P})_Icn<Gcf7Ler&`
o=0IjQUWUd%X103_Y-|i3OBv_rN1Xn~z`(%Z>FVdQ&MBb@0CMUh8vp<R

literal 0
HcmV?d00001