attempted fixes for spatialIO, security and ShaderTech compat

This commit is contained in:
PrototypeTrousers
2023-01-28 14:09:00 -03:00
parent 04f006695e
commit f14407b87a
5 changed files with 8 additions and 9 deletions
@@ -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());
+4 -6
View File
@@ -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);