Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2025-02-05 23:11:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
mung3r 2012-08-29 21:51:31 -07:00
commit 3fb0df4d5e
4 changed files with 56 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/mChatSuite.jar
View File

Binary file not shown.

2
plugin.yml
View File

@ -1,6 +1,6 @@
name: Vault
main: net.milkbowl.vault.Vault
version: 1.2.18-b${BUILD_NUMBER}
version: 1.2.19-b${BUILD_NUMBER}
authors: [cereal, Sleaker, mung3r]
website: http://dev.bukkit.org/server-mods/vault
load: startup

84
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.2.18-SNAPSHOT</version>
<version>1.2.19-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@ -14,19 +14,19 @@
<version>1.3.1-R1.0</version>
</dependency>
<dependency>
<groupId>de.hydrox.bukkit.DroxPerms</groupId>
<artifactId>DroxPerms</artifactId>
<version>0.4.0-SNAPSHOT</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/DroxPerms-0.4.0-SNAPSHOT.jar</systemPath>
<groupId>de.hydrox.bukkit.DroxPerms</groupId>
<artifactId>DroxPerms</artifactId>
<version>0.4.0-SNAPSHOT</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/DroxPerms-0.4.0-SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
<groupId>net.krinsoft.privileges</groupId>
<artifactId>Privileges</artifactId>
<version>1.4.0b45</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/Privileges.jar</systemPath>
</dependency>
<dependency>
<groupId>net.krinsoft.privileges</groupId>
<artifactId>Privileges</artifactId>
<version>1.4.0b45</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/Privileges.jar</systemPath>
</dependency>
<dependency>
<groupId>org.tyrannyofheaven.bukkit</groupId>
<artifactId>zPermissions</artifactId>
@ -49,11 +49,11 @@
<systemPath>${project.basedir}/lib/CurrencyCore.jar</systemPath>
</dependency>
<dependency>
<groupId>com.flobi.GoldIsMoney</groupId>
<artifactId>GoldIsMoney</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/GoldIsMoney.jar</systemPath>
<groupId>com.flobi.GoldIsMoney</groupId>
<artifactId>GoldIsMoney</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/GoldIsMoney.jar</systemPath>
</dependency>
<dependency>
<groupId>cosine.boseconomy.BOSEconomy</groupId>
@ -77,11 +77,11 @@
<systemPath>${project.basedir}/lib/EconXP.jar</systemPath>
</dependency>
<dependency>
<groupId>org.neocraft.AEco</groupId>
<artifactId>AEco</artifactId>
<version>2.1</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/AEco-2.1.jar</systemPath>
<groupId>org.neocraft.AEco</groupId>
<artifactId>AEco</artifactId>
<version>2.1</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/AEco-2.1.jar</systemPath>
</dependency>
<dependency>
<groupId>com.earth2me.essentials.Essentials</groupId>
@ -105,12 +105,12 @@
<systemPath>${project.basedir}/lib/eWallet.jar</systemPath>
</dependency>
<dependency>
<groupId>boardinggamer.mcmoney</groupId>
<artifactId>McMoney</artifactId>
<version>1.2</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/McMoney.jar</systemPath>
</dependency>
<groupId>boardinggamer.mcmoney</groupId>
<artifactId>McMoney</artifactId>
<version>1.2</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/McMoney.jar</systemPath>
</dependency>
<dependency>
<groupId>net.TheDgtl.iChat.iChat</groupId>
<artifactId>iChat</artifactId>
@ -149,7 +149,7 @@
<dependency>
<groupId>in.mDev</groupId>
<artifactId>mChatSuite</artifactId>
<version>DEV-b216</version>
<version>DEV-b275</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/mChatSuite.jar</systemPath>
</dependency>
@ -224,18 +224,18 @@
<systemPath>${project.basedir}/lib/Craftconomy3-b189.jar</systemPath>
</dependency>
<dependency>
<groupId>net.crystalyx.bukkit.simplyperms</groupId>
<artifactId>SimplyPerms</artifactId>
<version>1.6.2</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/SimplyPerms.jar</systemPath>
<groupId>net.crystalyx.bukkit.simplyperms</groupId>
<artifactId>SimplyPerms</artifactId>
<version>1.6.2</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/SimplyPerms.jar</systemPath>
</dependency>
<dependency>
<groupId>Gringotts</groupId>
<artifactId>Gringotts</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/Gringotts.jar</systemPath>
<groupId>Gringotts</groupId>
<artifactId>Gringotts</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/Gringotts.jar</systemPath>
</dependency>
</dependencies>
<build>
@ -300,8 +300,8 @@
<version>true</version>
<linksource>true</linksource>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
<link>http://jd.bukkit.org/apidocs/</link>
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
<link>http://jd.bukkit.org/apidocs/</link>
</links>
<bottom>
<![CDATA[<b>MilkBukkit, 2011</b>]]>

34
src/net/milkbowl/vault/chat/plugins/Chat_mChatSuite.java
View File

@ -15,10 +15,10 @@
*/
package net.milkbowl.vault.chat.plugins;
import com.miraclem4n.mchat.api.Reader;
import com.miraclem4n.mchat.api.Writer;
import com.miraclem4n.mchat.types.InfoType;
import in.mDev.MiracleM4n.mChatSuite.mChatSuite;
import in.mDev.MiracleM4n.mChatSuite.api.Reader;
import in.mDev.MiracleM4n.mChatSuite.api.Writer;
import in.mDev.MiracleM4n.mChatSuite.types.InfoType;
import java.util.logging.Logger;
@ -38,8 +38,6 @@ public class Chat_mChatSuite extends Chat {
private final String name = "mChatSuite";
private Plugin plugin = null;
private mChatSuite mChat = null;
private Reader mReader = null;
private Writer mWriter = null;
public Chat_mChatSuite(Plugin plugin, Permission perms) {
super(perms);
@ -52,8 +50,6 @@ public class Chat_mChatSuite extends Chat {
Plugin chat = plugin.getServer().getPluginManager().getPlugin("mChatSuite");
if (chat != null && chat.isEnabled()) {
mChat = (mChatSuite) chat;
mReader = mChat.getReader();
mWriter = mChat.getWriter();
log.info(String.format("[%s][Chat] %s hooked.", plugin.getDescription().getName(), "mChatSuite"));
}
}
@ -67,8 +63,6 @@ public class Chat_mChatSuite extends Chat {
Plugin chat = plugin.getServer().getPluginManager().getPlugin("mChatSuite");
if (chat != null) {
mChat = (mChatSuite) chat;
mReader = mChat.getReader();
mWriter = mChat.getWriter();
log.info(String.format("[%s][Chat] %s hooked.", plugin.getDescription().getName(), "mChatSuite"));
}
}
@ -79,8 +73,6 @@ public class Chat_mChatSuite extends Chat {
if (mChat != null) {
if (event.getPlugin().getDescription().getName().equals("mChatSuite")) {
mChat = null;
mReader = null;
mWriter = null;
log.info(String.format("[%s][Chat] %s un-hooked.", plugin.getDescription().getName(), "mChatSuite"));
}
}
@ -99,7 +91,7 @@ public class Chat_mChatSuite extends Chat {
@Override
public String getPlayerPrefix(String world, String player) {
return mReader.getPrefix(player, InfoType.USER, world);
return Reader.getPrefix(player, InfoType.USER, world);
}
@Override
@ -109,7 +101,7 @@ public class Chat_mChatSuite extends Chat {
@Override
public String getPlayerSuffix(String world, String player) {
return mReader.getSuffix(player, InfoType.USER, world);
return Reader.getSuffix(player, InfoType.USER, world);
}
@Override
@ -119,7 +111,7 @@ public class Chat_mChatSuite extends Chat {
@Override
public String getGroupPrefix(String world, String group) {
return mReader.getPrefix(group, InfoType.GROUP, world);
return Reader.getPrefix(group, InfoType.GROUP, world);
}
@Override
@ -129,7 +121,7 @@ public class Chat_mChatSuite extends Chat {
@Override
public String getGroupSuffix(String world, String group) {
return mReader.getSuffix(group, InfoType.GROUP, world);
return Reader.getSuffix(group, InfoType.GROUP, world);
}
@Override
@ -269,24 +261,24 @@ public class Chat_mChatSuite extends Chat {
private void setPlayerInfoValue(String world, String player, String node, Object value) {
if (world != null) {
mWriter.setWorldVar(player, InfoType.USER, world, node, value.toString());
Writer.setWorldVar(player, InfoType.USER, world, node, value.toString());
} else {
mWriter.setInfoVar(player, InfoType.USER, node, value.toString());
Writer.setInfoVar(player, InfoType.USER, node, value.toString());
}
}
private void setGroupInfoValue(String world, String group, String node, Object value) {
if (world != null) {
mWriter.setWorldVar(group, InfoType.GROUP, world, node, value);
Writer.setWorldVar(group, InfoType.GROUP, world, node, value);
} else {
mWriter.setInfoVar(group, InfoType.GROUP, node, value);
Writer.setInfoVar(group, InfoType.GROUP, node, value);
}
}
private String getPlayerInfoValue(String world, String player, String node) {
return mReader.getInfo(player, InfoType.USER, world, node);
return Reader.getInfo(player, InfoType.USER, world, node);
}
private String getGroupInfoValue(String world, String group, String node) {
return mReader.getInfo(group, InfoType.GROUP, world, node);
return Reader.getInfo(group, InfoType.GROUP, world, node);
}
}