Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Created a class for storing node constants

Browse source
This commit is contained in:
Robert 2013-11-28 09:32:02 -05:00
parent dc80c87140
commit 599a6e8770
5 changed files with 113 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
src/dark/api/access/Nodes.java Normal file
View file

@ -0,0 +1,85 @@
package dark.api.access;
/** Constants that represent nodes by which machines and entities used in combination with
* ISpecialAccess to limit users on what they can do. These nodes should be used in the same way by
* all machines, entities, and other mods. Too change the meaning of the node will make it difficult
* to offer universal meaning for all machines. As well would create the need to add a per node per
* machine per group access list making it more complicated for users to use.
*
* @author DarkGuardsman */
public class Nodes
{
/*
* Rules for using nodes with groups and your machine:
*
* Keep everything the same.
* Eg: Open should be as simple as opening the gui and no more
*
* Enable is not the same as on
* Eg: you can disable a machine preventing users from using it
* Eg: When enabled the machine can still be turned off
*
* Lock node automatically includes unlock node but not the other way around
*
*
* Machine nodes override inv node as inv nodes are only designed for containers.
* Machines nodes are global for all guis inside the machine
*
*
* Groups do not need there own nodes. Group.user, Group.owner, Group.admin are designed to flag the default groups.
*
*
* Your machine must always have a group that at least has a owner group. This group should be flagged with Group.owner but is not required.
*
*
*
*/
//Inventory only nodes, overrided by machine nodes
public static final String INV_OPEN_NODE = "inv.open";
public static final String INV_TAKE_NODE = "inv.take";
public static final String INV_GIVE_NODE = "inv.give";
public static final String INV_EDIT_NODE = "inv.edit";
public static final String INV_CHANGE_NODE = "inv.change";
public static final String INV_LOCK_NODE = "inv.lock";
public static final String INV_UNLOCK_NODE = "inv.unlock";
public static final String INV_DISABLE_NODE = "inv.disable";
public static final String INV_ENABLE_NODE = "inv.enable";
//Master machines nodes, overrides all lower nodes of the same type
public static final String MACHINE_OPEN_NODE = "machine.open";
public static final String MACHINE_LOCK_NODE = "machine.lock";
public static final String MACHINE_UNLOCK_NODE = "machine.unlock";
public static final String MACHINE_ENABLE_NODE = "machine.enable";
public static final String MACHINE_DISABLE_NODE = "machine.disable";
public static final String MACHINE_TURN_ON_NODE = "machine.on";
public static final String MACHINE_TURN_OFF_NODE = "machine.off";
public static final String MACHINE_CONFIG_NODE = "machine.config";
public static final String MACHINE_UPGRADE_NODE = "machine.upgrade";
public static final String MACHINE_DOWNGRADE_NODE = "machine.downgrade";
//Group nodes, these are almost always held by only admins and owners
public static final String GROUP_CREATE_NODE = "group.create";
public static final String GROUP_DEL_NODE = "group.del";
public static final String GROUP_EDIT_NODE = "group.edit";//Still bound by other nodes
public static final String GROUP_ADD_NODE = "group.add";
public static final String GROUP_ADD_USER_NODE = "group.add.user";
public static final String GROUP_ADD_ENTITY_NODE = "group.add.entity";
public static final String GROUP_ADD_NODE_NODE = "group.add.node";
public static final String GROUP_REMOVE_NODE = "group.remove";
public static final String GROUP_REMOVE_USER_NODE = "group.remove.user";
public static final String GROUP_REMOVE_ENTITY_NODE = "group.remove.entity";
public static final String GROUP_REMOVE_NODE_NODE = "group.remove.node";
//Nodes for editing users inside of a group
public static final String USER_EDIT_NODE = "user.edit";
public static final String USER_CHANGE_GROUP_NODE = "user.change.group";
public static final String USER_ADD_NODE = "user.add.node";
public static final String USER_REMOVE_NODE = "user.remove.node";
//Prefab group nodes, designed to be placed on the master group of the type
public static final String GROUP_OWNER_NODE = "group.owner";
public static final String GROUP_ADMIN_NODE = "group.admin";
public static final String GROUP_USER_NODE = "group.user";
}

4
src/dark/core/client/models/ModelSmallFluidCan.java
View file

@ -114,10 +114,6 @@ public class ModelSmallFluidCan extends ModelBase
edge2.render(f5);
edge3.render(f5);
edge4.render(f5);
glass1.render(f5);
glass2.render(f5);
glass3.render(f5);
glass4.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z)

12
src/dark/core/common/machines/BlockEnergyStorage.java
View file

@ -1,6 +1,9 @@
package dark.core.common.machines;
import java.util.List;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
@ -21,7 +24,7 @@ import dark.core.helpers.MathHelper;
import dark.core.prefab.machine.BlockMachine;
/** Block for energy storage devices
*
*
* @author Rseifert */
public class BlockEnergyStorage extends BlockMachine
{
@ -50,6 +53,13 @@ public class BlockEnergyStorage extends BlockMachine
return true;
}
@Override
public void getTileEntities(int blockID, Set<Pair<String, Class<? extends TileEntity>>> list)
{
list.add(new Pair<String, Class<? extends TileEntity>>("DCTileBatBox", TileEntityBatteryBox.class));
}
@Override
public TileEntity createTileEntity(World world, int metadata)
{

5
src/dark/core/prefab/machine/TileEntityInv.java
View file

@ -15,6 +15,7 @@ import universalelectricity.prefab.tile.TileEntityAdvanced;
import dark.api.access.AccessGroup;
import dark.api.access.AccessUser;
import dark.api.access.ISpecialAccess;
import dark.api.access.Nodes;
import dark.core.interfaces.IExternalInv;
import dark.core.interfaces.IInvBox;
import dark.core.prefab.invgui.InvChest;
@ -198,9 +199,9 @@ public class TileEntityInv extends TileEntityAdvanced implements IExternalInv, I
return new AccessUser(username);
}
public boolean canUserAccess(String username)
public boolean canOpen(String username)
{
return this.getUserAccess(username) != null || this.getOwnerGroup().getMembers().size() <= 0;
return this.getUserAccess(username) != null && this.getUserAccess(username).hasNode(Nodes.INV_OPEN_NODE) || this.getOwnerGroup().getMembers().size() <= 0;
}
@Override

26
src/dark/core/prefab/terminal/TerminalCommandRegistry.java
View file

@ -10,6 +10,7 @@ import dark.api.ITerminal;
import dark.api.access.AccessGroup;
import dark.api.access.ISpecialAccess;
import dark.api.access.ITerminalCommand;
import dark.api.access.Nodes;
/** @author DarkGuardsman */
public class TerminalCommandRegistry
@ -19,28 +20,29 @@ public class TerminalCommandRegistry
public static final HashMap<String, List<String>> groupDefaultNodes = new HashMap();
public static final HashMap<String, String> groupDefaultExtends = new HashMap();
static
{
List<String> list = new ArrayList<String>();
//Owner group defaults
list.add("group.owner");
list.add("inv.disable");
list.add("inv.enable");
list.add(Nodes.GROUP_OWNER_NODE);
list.add(Nodes.INV_DISABLE_NODE);
list.add(Nodes.INV_ENABLE_NODE);
createDefaultGroup("owner", "admin", list);
//Admin group defaults
list.clear();
list.add("group.admin");
list.add("inv.edit");
list.add("inv.lock");
list.add("inv.unlock");
list.add("inv.change");
list.add(Nodes.GROUP_ADMIN_NODE);
list.add(Nodes.INV_EDIT_NODE);
list.add(Nodes.INV_LOCK_NODE);
list.add(Nodes.INV_UNLOCK_NODE);
list.add(Nodes.INV_CHANGE_NODE);
createDefaultGroup("admin", "user", list);
//User group defaults
list.clear();
list.add("group.user");
list.add("inv.open");
list.add("inv.take");
list.add("inv.give");
list.add(Nodes.GROUP_USER_NODE);
list.add(Nodes.INV_OPEN_NODE);
list.add(Nodes.INV_TAKE_NODE);
list.add(Nodes.INV_GIVE_NODE);
createDefaultGroup("user", null, list);
}