attempted fixes for spatialIO, security and ShaderTech compat
This commit is contained in:
+1
-1
@@ -4,7 +4,7 @@ aebuild=7
|
|||||||
aegroup=appeng
|
aegroup=appeng
|
||||||
aebasename=appliedenergistics2
|
aebasename=appliedenergistics2
|
||||||
extended=extended_life
|
extended=extended_life
|
||||||
extendedversion=v0.54.19
|
extendedversion=v0.54.20
|
||||||
#########################################################
|
#########################################################
|
||||||
# Versions #
|
# Versions #
|
||||||
#########################################################
|
#########################################################
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ package appeng.core.api.imc;
|
|||||||
import appeng.api.AEApi;
|
import appeng.api.AEApi;
|
||||||
import appeng.core.AELog;
|
import appeng.core.AELog;
|
||||||
import appeng.core.api.IIMCProcessor;
|
import appeng.core.api.IIMCProcessor;
|
||||||
|
import net.minecraft.launchwrapper.Launch;
|
||||||
import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
|
import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
|
||||||
|
|
||||||
|
|
||||||
@@ -37,7 +38,7 @@ public class IMCSpatial implements IIMCProcessor {
|
|||||||
public void process(final IMCMessage m) {
|
public void process(final IMCMessage m) {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
final Class classInstance = Class.forName(m.getStringValue());
|
final Class classInstance = Class.forName(m.getStringValue(), false, Launch.classLoader);
|
||||||
AEApi.instance().registries().movable().whiteListTileEntity(classInstance);
|
AEApi.instance().registries().movable().whiteListTileEntity(classInstance);
|
||||||
} catch (final ClassNotFoundException e) {
|
} catch (final ClassNotFoundException e) {
|
||||||
AELog.info("Bad Class Registered: " + m.getStringValue() + " by " + m.getSender());
|
AELog.info("Bad Class Registered: " + m.getStringValue() + " by " + m.getSender());
|
||||||
|
|||||||
+3
-5
@@ -138,17 +138,15 @@ public class SecurityCache implements ISecurityGrid {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasPermission(final int playerID, final SecurityPermissions perm) {
|
public boolean hasPermission(final int playerID, final SecurityPermissions perm) {
|
||||||
|
if (playerID == -1) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
if (this.isAvailable()) {
|
if (this.isAvailable()) {
|
||||||
final EnumSet<SecurityPermissions> perms = this.playerPerms.get(playerID);
|
final EnumSet<SecurityPermissions> perms = this.playerPerms.get(playerID);
|
||||||
|
|
||||||
if (perms == null) {
|
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);
|
return perms.contains(perm);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"parent": "appliedenergistics2:part/p2p/p2p_tunnel_base",
|
"parent": "appliedenergistics2:part/p2p/p2p_tunnel_base",
|
||||||
"textures": {
|
"textures": {
|
||||||
"type": "blocks/redstone_block"
|
"type": "appliedenergistics2:blocks/redstone_p2p"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 140 B |
Reference in New Issue
Block a user