Permalink
Browse files

(finally) updated items.csv for 1.7 (i though i already did that) and…

… 1.8 items,

Fixed some issues with the Permissions Resolver,
Changed the Admin IRC Endpoint back to MINECRAFT,
Fixed the playerlist name colors/length,
Added the option to cancel nick chat or not (for CraftIRC)
Fixed /whois,
Fixed "what was i thinking" moment with /ext,
Added %clearcolors% to the IRC messageformat
  • Loading branch information...
1 parent 59882ab commit c1e64f3773138bffbe7624e0e506f5a936e031de @GuntherDW committed Oct 11, 2011
View
@@ -1,4 +1,7 @@
-invisible-playerlist: []
+# This is a special feature of TCUtils, where a player_join and kick/quit even will be invisible.
+# It will also be impossible for players that do not have the required permission to teleport to
+# him and/or show up in /who
+invisible-playerlist: [ 'notch' ]
extra:
# Set this to true if you want pigs to drop a saddle if you kill them when
@@ -7,9 +10,17 @@ extra:
recoverPigSaddle: false
# This features stops the ignite if you have god mode enabled in WorldGuard.
# doesn't work flawlessly though.
- StopGodIgnite: false
+ stopGodIgnite: false
# Stops chunks unloading when there's a burning furnace inside of the chunk.
stopChunkUnloadBurningFurnace: false
+# Enables the Support for our ImprovedChat fork, to display your current chatmode in your chat bar
+ CUI: false
+# This enables support for our Bukkit tool durability per-world status mod.
+# Needs a custom diff to work. Will send you the diff if you need it
+ mod_InfDura: false
+# This is mostly for the older Bukkit builds where exp orbs would lag your server
+ stopExperienceOrbs: false
+
mount:
# Pay a saddle to mount something. When you set this to false, saddling pigs don't charge
@@ -57,13 +68,31 @@ CraftIRC:
tag: 'mchatadmin'
# Support : %name% -> Sendername
# %message% -> The sent message
+# %clearcolor%> ((char) 3) char
# The other stuff will get parsed by CraftIRC itself.
- MessageFormat: '[A] <%name%> %message%'
+ MessageFormat: '[A] <%sender%%clearcolors%> %message%'
regular:
- enabled: true
+ enabled: false
tag: 'mchat'
MessageFormat: '<%name%> %message%'
+
+# Pretty rudimentary spam control, should be self explanitory?
+spamcontrol:
+ enable: false
+ checkTime: 10
+ muteTime: 5
+ maxMessages: 5
+ muteMessage: '{displayname} has been auto-muted for {mins} mins for spamming!'
+
+
+# This will enable a respawn hook, that will set your respawn point to the world
+# you died in (and drop you from its nether if you were in one)
+# Will also heal you to full HP if enabled
+respawn:
+ enableHook: false
+ healOnRespawn: false
+
extrahelp:
plugins: [TweakWarp, Homes, WorldEdit]
hide: []
@@ -83,6 +112,10 @@ worlds:
pvp: true
animals: true
monsters: false
+# This flag needs extra.mod_InfDura set to true, and a custom patch installed!
+ durability: false
+ addnether: false
+ portalSearchRadius: 32
mobs:
environment: normal
enabled: true
View
@@ -58,15 +58,24 @@ note,25,0,64
musicblock,25,0,64
poweredrail,27,0,64
poweredtracks,27,0,64
-detectrail,27,0,64
-detecttracks,27,0,64
+detectrail,28,0,64
+detecttracks,28,0,64
+stickypiston,29,0,64
+pistonsticky,29,0,64
web,30,0,64
spiderweb,30,0,64
longgrass,31,0,64
tallgrass,31,0,64
deadbush,32,0,64
shrub,32,0,64
tumbleweed,32,0,64
+pistonbase,33,0,64
+piston,33,0,64
+normapiston,33,0,64
+pistonext,34,0,64
+pistonextension,34,0,64
+pistonmoving,36,0,64
+pistonshove,36,0,64
cloth,35,0,64
wool,35,0,64
whitewool,35,0,64
@@ -229,6 +238,29 @@ lockedchest,95,0,64
chestlocked,95,0,64
trapdoor,96,0,64
hatch,96,0,64
+silverfishblock,97,0,64
+silverfish,97,0,64
+smoothbrick,98,0,64
+stonebrick,98,0,64
+mossysmoothbrick,98,1,64
+crackedsmoothbrick,98,2,64
+crackedstonebrick,98,2,64
+brokensmoothbrick,98,2,64
+brownmushroomblock,99,0,64
+redmushroomblock,100,0,64
+ironbars,101,0,64
+glasspane,102,0,64
+melonblock,103,0,64
+melon,103,0,64
+pumpkinstem,104,0,64
+melonstem,105,0,64
+vine,106,0,64
+vines,106,0,64
+ironfence,107,0,64
+fencegate,107,0,64
+brickstairs,108,0,64
+smoothbrickstairs,108,0,64
+stonebrickstairs,108,0,64
ironshovel,256,0,1
ironpickaxe,257,0,1
ironpick,257,0,1
@@ -278,11 +310,11 @@ string,287,0,64
feather,288,0,64
sulphur,289,0,64
gunpowder,289,0,64
-woodhoe,290,0,64
-stonehoe,291,0,64
-ironhoe,292,0,64
-diamondhoe,293,0,64
-goldhoe,294,0,64
+woodhoe,290,0,1
+stonehoe,291,0,1
+ironhoe,292,0,1
+diamondhoe,293,0,1
+goldhoe,294,0,1
seeds,295,0,64
seed,295,0,64
wheat,296,0,64
@@ -399,6 +431,20 @@ delayer,356,0,64
diode,356,0,64
cookie,357,0,64
map,358,0,1
+shears,359,0,1
+scissors,359,0,1
+pumpkinseeds,361,0,64
+beef,363,0,64
+rawbeef,363,0,64
+cookedbeef,364,0,64
+rawchicken,365,0,64
+chicken,365,0,64
+cookedchicken,366,0,64
+rottenflesh,367,0,64
+zombieflesh,367,0,64
+zombiemeat,367,0,64
+enderpearl,368,0,64
+pearl,368,0,64
redstonerepeater,356,0,64
golddisc,2256,0,64
goldrecord,2256,0,64
View
@@ -1,6 +1,6 @@
name: TweakcraftUtils
main: com.guntherdw.bukkit.tweakcraft.TweakcraftUtils
-version: 2.2.6-pre-alpha
+version: 2.2.6
authors:
- GuntherDW
- Meaglin
@@ -75,6 +75,8 @@ public boolean sendMessage(CommandSender sender, String message) {
targetmsg = targetmsg.replace("%message%", message);
targetmsg = targetmsg.replace("%dispname%", ChatColor.stripColor(sendername));
+ targetmsg = targetmsg.replace("%clearcolors%", Character.toString((char) 3));
+
// plugin.getCraftIRC().sendMessageToTag(targetmsg, plugin.getConfigHandler().AIRCtag);
/// plugin.getCraftIRC().newMsgToTag(this, plugin.getConfigHandler().AIRCtag, targetmsg);
@@ -26,7 +26,7 @@
import com.guntherdw.bukkit.tweakcraft.Exceptions.PermissionsException;
import com.guntherdw.bukkit.tweakcraft.Packages.ItemDB;
import com.guntherdw.bukkit.tweakcraft.TweakcraftUtils;
-import com.guntherdw.bukkit.tweakcraft.Worlds.IWorld;
+import com.guntherdw.bukkit.tweakcraft.Worlds.iWorld;
import com.guntherdw.bukkit.tweakcraft.Worlds.TweakWorld;
import org.bukkit.ChatColor;
import org.bukkit.World;
@@ -67,8 +67,8 @@ public boolean executeCommand(CommandSender sender, String command, String[] arg
String displayName = plugin.getNickWithColors(p.getName());
String ldisplayname = displayName.substring(0, displayName.length()-2);
p.setDisplayName(displayName);
- if(ldisplayname.length()<16)
- p.setListName(ldisplayname);
+ if(ldisplayname.length()<=16)
+ p.setPlayerListName(ldisplayname);
}
plugin.getPlayerListener().reloadInvisTable();
/**
@@ -86,7 +86,7 @@ public boolean executeCommand(CommandSender sender, String command, String[] arg
String modus = args[1];
String world = args[2];
String arg = args.length>3? args[3] : null;
- IWorld iw = plugin.getworldManager().getWorld(world);
+ iWorld iw = plugin.getworldManager().getWorld(world);
if(modus.equalsIgnoreCase("unload")) {
if(iw!=null) {
if(iw.isEnabled()) {
@@ -32,6 +32,7 @@
import org.bukkit.entity.*;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Random;
@@ -46,7 +47,7 @@ public boolean executeCommand(CommandSender sender, String command, String[] rea
if (!plugin.check(player, "spawnmob"))
throw new PermissionsException(command);
- Location loc = player.getTargetBlock(null, 200).getLocation();
+ Location loc = player.getTargetBlock((HashSet<Byte>)null, 200).getLocation();
ArgumentParser ap = new ArgumentParser(realargs);
String[] args = ap.getNormalArgs();
Random rnd = new Random();
@@ -62,12 +62,15 @@ public boolean executeCommand(CommandSender sender, String command, String[] arg
if (modus == ExtMode.SELF) {
if (sender instanceof Player) {
Player player = (Player) sender;
- if(!plugin.check(player, "ext.self"))
- if (player.getFireTicks() != 0) {
- player.setFireTicks(0);
- player.sendMessage(ChatColor.YELLOW + "You have been extinguished!");
+ if(plugin.check(player, "ext.self")) {
+ if (player.getFireTicks() != 0) {
+ player.setFireTicks(0);
+ player.sendMessage(ChatColor.YELLOW + "You have been extinguished!");
+ } else {
+ player.sendMessage(ChatColor.YELLOW + "You're not on fire!");
+ }
} else {
- player.sendMessage(ChatColor.YELLOW + "You're not on fire!");
+ throw new PermissionsException(command);
}
} else {
sender.sendMessage("A console can't be on fire, right?");
@@ -48,18 +48,11 @@ public boolean executeCommand(CommandSender sender, String command, String[] arg
plugin.getPlayerListener().removeNick(player.getName());
} else {
sender.sendMessage(ChatColor.GOLD + "Setting nick to : "+args[0]);
- /* List<Player> find = plugin.getServer().matchPlayer(args[0]);
- for(Player f : find) {
- if(f.getName().toLowerCase().equals(args[0].toLowerCase()))
- throw new CommandException("Nick is already taken!");
- } */
- // if() {
if(!plugin.getPlayerListener().nickTakenPersistance(player.getName(), args[0])
&& !plugin.getPlayerListener().nickTakenCheck(player.getName(), args[0]))
plugin.getPlayerListener().setNick(player.getName(), args[0]);
else
throw new CommandException("Nick is already taken!");
- // }
}
} else if(args.length==2) {
if(!plugin.check(player, "nick.other"))
@@ -81,10 +74,10 @@ public boolean executeCommand(CommandSender sender, String command, String[] arg
throw new CommandException("Nick is already taken!");
}
if(!plugin.getPlayerListener().nickTakenPersistance(otherplayer.getName(), args[1])
- && !plugin.getPlayerListener().nickTakenCheck(otherplayer.getName(), args[1]))
- plugin.getPlayerListener().setNick(otherplayer.getName(), args[1]);
- else
- throw new CommandException("Nick is already taken!");
+ && !plugin.getPlayerListener().nickTakenCheck(otherplayer.getName(), args[1]))
+ plugin.getPlayerListener().setNick(otherplayer.getName(), args[1]);
+ else
+ throw new CommandException("Nick is already taken!");
}
}
} else {
@@ -24,6 +24,9 @@
import com.guntherdw.bukkit.tweakcraft.Exceptions.CommandUsageException;
import com.guntherdw.bukkit.tweakcraft.Exceptions.PermissionsException;
import com.guntherdw.bukkit.tweakcraft.TweakcraftUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -45,45 +48,63 @@ public boolean executeCommand(CommandSender sender, String command, String[] arg
if(args.length==1) {
+ String nick_origplayer = plugin.getPlayerListener().findPlayerNameByNick(args[0]);
+ String nickname = null;
Player nick = plugin.getPlayerListener().findPlayerByNick(args[0]);
// sender.sendMessage(nick.toString());
String gname = null;
// Group g = null;
Player sp = findPlayer(args[0], plugin);
Player who = nick==null?sp:nick;
- String groups = "";
+ String groups = "";
String playername = null;
boolean online = (who!=null);
if(who==null) { // Is it an offline player? Check permissions
- /* if(plugin.getPermissionHandler()!=null) {
+ if(plugin.getPermissionsResolver()!=null) {
// Check for nicks
- String pname = args[0];
- String findnick = plugin.getPlayerListener().findPlayerNameByNick(pname);
- if(findnick != null) pname = findnick;
-
+ // String pname = args[0];
+ OfflinePlayer offlineplayer = plugin.getServer().getOfflinePlayer(nick_origplayer!=null?nick_origplayer:args[0]);
+ String pname = offlineplayer.getName();
+ String wname = null;
+ World defworld = plugin.getServer().getWorlds().get(0);
+ if(defworld!=null) {
+ wname = defworld.getName();
+ }
- PermissionHandler handler = plugin.getPermissionHandler();
- String wname = plugin.getServer().getWorlds().get(0).getName();
- User user = plugin.getPermissionHandler().getUserObject(wname, pname);
- // groups = plugin.getPermissionHandler().getPrimaryGroup(wname, args[0]);
- if(user!=null) {
- playername = user.getName();
- groups = plugin.getPermissionHandler().getPrimaryGroup(wname, pname);
+ groups = plugin.getPermissionsResolver().getPrimaryUserGroup(wname, pname);
+ if(groups!=null) {
+ String n = plugin.getNickWithColors(pname);
+ if(n!=null) {
+ nickname = n;
+ }
+ // String prefix = plugin.getPermissionsResolver().getUserPrefix(wname, pname);
+ playername = pname;
+
}
+
+
}
} else {
playername = who.getName();
- if(plugin.getPermissionHandler()!=null) {
+ String wname = null;
+ World defworld = plugin.getServer().getWorlds().get(0);
+ if(defworld!=null) {
+ wname = defworld.getName();
+ }
- String wname = plugin.getServer().getWorlds().get(0).getName();
- groups = plugin.getPermissionHandler().getPrimaryGroup(wname, playername);
+ groups = plugin.getPermissionsResolver().getPrimaryUserGroup(wname, playername);
+ // Check for a nick!
+ String n = plugin.getNickWithColors(playername);
+ if(n!=null) {
+ nickname = n;
}
}
if(playername!=null) {
- sender.sendMessage(ChatColor.YELLOW+"Playername : "+playername+" "+(nick!=null?"("+plugin.getNickWithColors(who.getName())+ChatColor.YELLOW+")":""));
+ // sender.sendMessage(ChatColor.YELLOW+"Playername : "+playername+" "+(nick!=null?"("+plugin.getNickWithColors(who.getName())+ChatColor.YELLOW+")":""));
+ sender.sendMessage(ChatColor.YELLOW+"Playername : "+playername+" "+(nickname!=null?ChatColor.YELLOW+"("+nickname + ChatColor.YELLOW+")":""));
// String group = plugin.getPermissionHandler.getG(who.getWorld().getName(), who.getName());
sender.sendMessage(ChatColor.YELLOW+"Groups : "+groups);
if(!getIP && online) {
@@ -94,7 +115,7 @@ public boolean executeCommand(CommandSender sender, String command, String[] arg
sender.sendMessage(ChatColor.YELLOW + "IP: " + who.getAddress().getAddress().getHostName());
} else {
throw new CommandException("Can't find player!");
- */ }
+ }
} else {
throw new CommandUsageException("I need a player!");
}
Oops, something went wrong.

0 comments on commit c1e64f3

Please sign in to comment.