EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Use doubles in config.yml where appropriate. Change item IDs to item names

Browse Source 
in light of upcoming Minecraft changes that will remove access to item
IDs.
This commit is contained in:
GJ
2013-09-13 09:12:21 -04:00
parent 800a452d62
commit 4eba33a1c6
12 changed files with 92 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java
View File

@ -1,5 +1,7 @@
package com.gmail.nossr50.skills.mining;
import org.bukkit.Material;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
@ -81,7 +83,7 @@ public class BlastMining {
abstract protected int getDropMultiplier();
}
public static int detonatorID = Config.getInstance().getDetonatorItemID();
public static Material detonator = Config.getInstance().getDetonatorItem();
public final static int MAXIMUM_REMOTE_DETONATION_DISTANCE = 100;
}

2
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
View File

@ -38,7 +38,7 @@ public class MiningManager extends SkillManager {
public boolean canDetonate() {
Player player = getPlayer();
return canUseBlastMining() && player.isSneaking() && player.getItemInHand().getTypeId() == BlastMining.detonatorID && Permissions.remoteDetonation(player);
return canUseBlastMining() && player.isSneaking() && player.getItemInHand().getType() == BlastMining.detonator && Permissions.remoteDetonation(player);
}
public boolean canUseBlastMining() {

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

@ -19,9 +19,9 @@ public class Repair {
public static int salvageUnlockLevel = AdvancedConfig.getInstance().getSalvageUnlockLevel();
public static int salvageAnvilId = Config.getInstance().getSalvageAnvilId();
public static int repairAnvilId = Config.getInstance().getRepairAnvilId();
public static boolean anvilMessagesEnabled = Config.getInstance().getRepairAnvilMessagesEnabled();
public static Material salvageAnvilMaterial = Config.getInstance().getSalvageAnvilMaterial();
public static Material repairAnvilMaterial = Config.getInstance().getRepairAnvilMaterial();
public static boolean anvilMessagesEnabled = Config.getInstance().getRepairAnvilMessagesEnabled();
/**
* Checks if the item is salvageable.
@ -41,25 +41,25 @@ public class Repair {
return false;
}
public static String getAnvilMessage(int blockId) {
if (blockId == repairAnvilId) {
public static String getAnvilMessage(Material type) {
if (type == repairAnvilMaterial) {
return LocaleLoader.getString("Repair.Listener.Anvil");
}
if (blockId == salvageAnvilId) {
if (type == salvageAnvilMaterial) {
return LocaleLoader.getString("Repair.Listener.Anvil2");
}
return "";
}
public static String[] getSpoutAnvilMessages(int blockId) {
if (blockId == repairAnvilId) {
public static String[] getSpoutAnvilMessages(Material type) {
if (type == repairAnvilMaterial) {
return new String[] {LocaleLoader.getString("Repair.AnvilPlaced.Spout1"), LocaleLoader.getString("Repair.AnvilPlaced.Spout2")};
}
if (blockId == salvageAnvilId) {
return new String[] {"[mcMMO] Anvil Placed", "Right click to salvage!"};
if (type == salvageAnvilMaterial) {
return new String[] {"[mcMMO] Anvil Placed", "Right click to salvage!"}; //TODO: Localize
}
return new String[] {"", ""};

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

@ -37,22 +37,22 @@ public class RepairManager extends SkillManager {
*
* @param anvilId The item ID of the anvil block
*/
public void placedAnvilCheck(int anvilId) {
public void placedAnvilCheck(Material anvilType) {
Player player = getPlayer();
if (mcMMOPlayer.getPlacedAnvil(anvilId)) {
if (mcMMOPlayer.getPlacedAnvil(anvilType)) {
return;
}
if (mcMMO.isSpoutEnabled()) {
SpoutUtils.sendRepairNotifications(player, anvilId);
SpoutUtils.sendRepairNotifications(player, anvilType);
}
else {
player.sendMessage(Repair.getAnvilMessage(anvilId));
player.sendMessage(Repair.getAnvilMessage(anvilType));
}
player.playSound(player.getLocation(), Sound.ANVIL_LAND, Misc.ANVIL_USE_VOLUME, Misc.ANVIL_USE_PITCH);
mcMMOPlayer.togglePlacedAnvil(anvilId);
mcMMOPlayer.togglePlacedAnvil(anvilType);
}
public void handleRepair(ItemStack item) {
@ -196,10 +196,10 @@ public class RepairManager extends SkillManager {
*
* @return true if the player has confirmed using an Anvil
*/
public boolean checkConfirmation(int anvilId, boolean actualize) {
public boolean checkConfirmation(Material anvilType, boolean actualize) {
Player player = getPlayer();
McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
long lastUse = mcMMOPlayer.getLastAnvilUse(anvilId);
long lastUse = mcMMOPlayer.getLastAnvilUse(anvilType);
// Don't use SkillUtils.cooldownOver() here since that also accounts for the cooldown perks
if ((((lastUse + 3) * Misc.TIME_CONVERSION_FACTOR) >= System.currentTimeMillis()) || !Config.getInstance().getRepairConfirmRequired()) {
@ -210,12 +210,12 @@ public class RepairManager extends SkillManager {
return false;
}
mcMMOPlayer.actualizeLastAnvilUse(anvilId);
mcMMOPlayer.actualizeLastAnvilUse(anvilType);
if (anvilId == Repair.repairAnvilId) {
if (anvilType == Repair.repairAnvilMaterial) {
player.sendMessage(LocaleLoader.getString("Skills.ConfirmOrCancel", LocaleLoader.getString("Repair.Pretty.Name")));
}
else if (anvilId == Repair.salvageAnvilId) {
else if (anvilType == Repair.salvageAnvilMaterial) {
player.sendMessage(LocaleLoader.getString("Skills.ConfirmOrCancel", LocaleLoader.getString("Salvage.Pretty.Name")));
}