mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-07-12 23:12:52 +00:00
f9e13ca67a
Look, I originally had this split into several commits, but lots of
other cleanups got mixed in. I then backported some of the cleanups to
1.12, did other tidy ups there, and eventually the web of merges was
unreadable.
Yes, this is a horrible mess, but it's still nicer than it was. Anyway,
changes:
- Flatten everything. For instance, there are now three instances of
BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no
more BlockPeripheral (thank heavens) - there's separate block classes
for each peripheral type.
- Remove pretty much all legacy code. As we're breaking world
compatibility anyway, we can remove all the code to load worlds from
1.4 days.
- The command system is largely rewriten to take advantage of 1.13's
new system. It's very fancy!
- WidgetTerminal now uses Minecraft's "GUI listener" system.
- BREAKING CHANGE: All the codes in keys.lua are different, due to the
move to LWJGL 3. Hopefully this won't have too much of an impact.
I don't want to map to the old key codes on the Java side, as there
always ends up being small but slight inconsistencies. IMO it's
better to make a clean break - people should be using keys rather
than hard coding the constants anyway.
- commands.list now allows fetching sub-commands. The ROM has already
been updated to allow fancy usage such as commands.time.set("noon").
- Turtles, modems and cables can be waterlogged.
74 lines
1.7 KiB
Java
74 lines
1.7 KiB
Java
/*
|
|
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
* Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
|
|
* Send enquiries to dratcliffe@gmail.com
|
|
*/
|
|
|
|
package dan200.computercraft.shared.command;
|
|
|
|
import net.minecraft.command.CommandSource;
|
|
import net.minecraft.entity.Entity;
|
|
import net.minecraft.entity.player.EntityPlayer;
|
|
import net.minecraft.server.MinecraftServer;
|
|
|
|
import java.util.function.Predicate;
|
|
|
|
/**
|
|
* The level a user must be at in order to execute a command.
|
|
*/
|
|
public enum UserLevel implements Predicate<CommandSource>
|
|
{
|
|
/**
|
|
* Only can be used by the owner of the server: namely the server console or the player in SSP.
|
|
*/
|
|
OWNER,
|
|
|
|
/**
|
|
* Can only be used by ops.
|
|
*/
|
|
OP,
|
|
|
|
/**
|
|
* Can be used by any op, or the player in SSP.
|
|
*/
|
|
OWNER_OP,
|
|
|
|
/**
|
|
* Can be used by anyone.
|
|
*/
|
|
ANYONE;
|
|
|
|
public int toLevel()
|
|
{
|
|
switch( this )
|
|
{
|
|
case OWNER:
|
|
return 4;
|
|
case OP:
|
|
case OWNER_OP:
|
|
return 2;
|
|
case ANYONE:
|
|
default:
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public boolean test( CommandSource source )
|
|
{
|
|
if( this == ANYONE ) return true;
|
|
|
|
// We *always* allow level 0 stuff, even if the
|
|
MinecraftServer server = source.getServer();
|
|
Entity sender = source.getEntity();
|
|
|
|
if( server.isSinglePlayer() && sender instanceof EntityPlayer &&
|
|
((EntityPlayer) sender).getGameProfile().getName().equalsIgnoreCase( server.getServerModName() ) )
|
|
{
|
|
if( this == OWNER || this == OWNER_OP ) return true;
|
|
}
|
|
|
|
return source.hasPermissionLevel( toLevel() );
|
|
}
|
|
}
|