EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-12-10 19:28:45 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Dropped SpoutPlugin support"

Browse Source 
This reverts commit 7bac0e2ca5.

Conflicts:
	Changelog.txt
	src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java
	src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
	src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
	src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java
	src/main/java/com/gmail/nossr50/mcMMO.java
	src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
	src/main/java/com/gmail/nossr50/util/ItemUtils.java
	src/main/java/com/gmail/nossr50/util/Misc.java
	src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
	src/main/resources/plugin.yml
This commit is contained in:
TfT_02
2013-12-31 02:01:50 +01:00
parent 04a02cfdc8
commit 5029f80d29
312 changed files with 1890 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gmail/nossr50/skills/repair/Repair.java
View File

@@ -48,6 +48,18 @@ public class Repair {
return "";
}
public static String[] getSpoutAnvilMessages(Material type) {
if (type == repairAnvilMaterial) {
return new String[]{LocaleLoader.getString("Repair.AnvilPlaced.Spout1"), LocaleLoader.getString("Repair.AnvilPlaced.Spout2")};
}
if (type == salvageAnvilMaterial) {
return new String[]{"[mcMMO] Anvil Placed", "Right click to salvage!"};
}
return new String[]{"", ""};
}
protected static Material getRepairAndSalvageItem(ItemStack inHand) {
if (ItemUtils.isDiamondTool(inHand) || ItemUtils.isDiamondArmor(inHand)) {
return Material.DIAMOND;

8
src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
View File

@@ -27,6 +27,7 @@ import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.StringUtils;
import com.gmail.nossr50.util.skills.SkillUtils;
import com.gmail.nossr50.util.spout.SpoutUtils;
public class RepairManager extends SkillManager {
private boolean placedRepairAnvil;
@@ -51,7 +52,12 @@ public class RepairManager extends SkillManager {
}
if (Repair.anvilMessagesEnabled) {
player.sendMessage(Repair.getAnvilMessage(anvilType));
if (mcMMOPlayer.isSpoutPlayer()) {
SpoutUtils.sendRepairNotifications(player, anvilType);
}
else {
player.sendMessage(Repair.getAnvilMessage(anvilType));
}
}
if (Config.getInstance().getRepairAnvilPlaceSoundsEnabled()) {