EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-10-31 09:13:43 +01:00
Code Issues Projects Releases Wiki Activity

Begin trying to remove newly-deprecated "magic numbers"

Browse Source
This commit is contained in:
GJ
2013-09-05 14:55:08 -04:00
parent a639a37637
commit fd8d9b02a9
10 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
View File

@@ -29,6 +29,7 @@ import org.bukkit.entity.Skeleton.SkeletonType;
import org.bukkit.event.player.PlayerFishEvent;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.inventory.ItemStack;
import org.bukkit.material.Wool;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.AdvancedConfig;
@@ -386,7 +387,7 @@ public class FishingManager extends SkillManager {
return;
}
drop.setDurability(sheep.getColor().getWoolData());
drop.setData(new Wool(sheep.getColor()));
sheep.setSheared(true);
}
break;

1
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
View File

@@ -226,7 +226,6 @@ public class HerbalismManager extends SkillManager {
return false;
}
blockState.setRawData((byte) 0x0);
blockState.setType(Material.AIR);
Misc.dropItem(blockState.getLocation(), treasures.get(Misc.getRandom().nextInt(treasures.size())).getDrop());

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

@@ -105,7 +105,6 @@ public class MiningManager extends SkillManager {
tnt.setMetadata(mcMMO.tntMetadataKey, new FixedMetadataValue(mcMMO.p, player.getName()));
tnt.setFuseTicks(0);
targetBlock.setData((byte) 0x0);
targetBlock.setType(Material.AIR);
getProfile().setSkillDATS(AbilityType.BLAST_MINING, System.currentTimeMillis());

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

@@ -77,7 +77,7 @@ public class RepairManager extends SkillManager {
// Level check
if (skillLevel < minimumRepairableLevel) {
player.sendMessage(LocaleLoader.getString("Repair.Skills.Adept", minimumRepairableLevel, StringUtils.getPrettyItemString(itemId)));
player.sendMessage(LocaleLoader.getString("Repair.Skills.Adept", minimumRepairableLevel, StringUtils.getPrettyItemString(item.getType())));
return;
}

1
src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java
View File

@@ -65,7 +65,6 @@ public class SmeltingManager extends SkillManager {
Misc.dropItem(location, item);
}
blockState.setRawData((byte) 0x0);
blockState.setType(Material.AIR);
player.sendMessage(LocaleLoader.getString("Smelting.FluxMining.Success"));
return true;

2
src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
View File

@@ -206,7 +206,7 @@ public class TamingManager extends SkillManager {
int heldItemAmount = heldItem.getAmount();
if (heldItemAmount < summonAmount) {
player.sendMessage(LocaleLoader.getString("Skills.NeedMore", StringUtils.getPrettyItemString(heldItem.getTypeId())));
player.sendMessage(LocaleLoader.getString("Skills.NeedMore", StringUtils.getPrettyItemString(heldItem.getType())));
return;
}

19
src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java
View File

@@ -5,6 +5,8 @@ import org.bukkit.block.BlockState;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.material.MaterialData;
import org.bukkit.material.SmoothBrick;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
@@ -51,13 +53,22 @@ public class UnarmedManager extends SkillManager {
}
public boolean blockCrackerCheck(BlockState blockState) {
Material type = blockState.getType();
MaterialData data = blockState.getData();
switch (type) {
switch (blockState.getType()) {
case SMOOTH_BRICK:
if (Unarmed.blockCrackerSmoothBrick && blockState.getRawData() == (byte) 0x0) {
blockState.setRawData((byte) 0x2);
if (!Unarmed.blockCrackerSmoothBrick) {
return false;
}
// Yes, this is awkward, but it's the *right* way to do it.
SmoothBrick smoothBrick = (SmoothBrick) data;
if (smoothBrick.getMaterial() != Material.STONE) {
return false;
}
smoothBrick.setMaterial(Material.COBBLESTONE);
return true;
default:

4
src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java
View File

@@ -103,9 +103,9 @@ public final class Woodcutting {
else {
Location location = blockState.getLocation();
Tree tree = (Tree) blockState.getData();
ItemStack item = new ItemStack(Material.LOG, 1, tree.getSpecies().getData());
ItemStack item = tree.toItemStack(1);
switch (((Tree) blockState.getData()).getSpecies()) {
switch (tree.getSpecies()) {
case GENERIC:
if (Config.getInstance().getOakDoubleDropsEnabled()) {
Misc.dropItem(location, item);

7
src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java
View File

@@ -8,7 +8,6 @@ import org.bukkit.Material;
import org.bukkit.block.BlockState;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.material.Tree;
import com.gmail.nossr50.datatypes.mods.CustomBlock;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
@@ -161,18 +160,17 @@ public class WoodcuttingManager extends SkillManager {
Misc.randomDropItem(blockState.getLocation(), ModUtils.getCustomBlock(blockState).getItemDrop(), 10);
}
else {
Tree tree = (Tree) blockState.getData();
switch (material) {
case LOG:
if (canGetDoubleDrops()) {
Woodcutting.checkForDoubleDrop(blockState);
}
xp += Woodcutting.getExperienceFromLog(blockState, ExperienceGainMethod.TREE_FELLER);
Misc.dropItem(blockState.getLocation(), new ItemStack(Material.LOG, 1, tree.getSpecies().getData()));
Misc.dropItem(blockState.getLocation(), blockState.getData().toItemStack(1));
break;
case LEAVES:
Misc.randomDropItem(blockState.getLocation(), new ItemStack(Material.SAPLING, 1, tree.getSpecies().getData()), 10);
Misc.randomDropItem(blockState.getLocation(), blockState.getData().toItemStack(1), 10);
break;
default:
@@ -180,7 +178,6 @@ public class WoodcuttingManager extends SkillManager {
}
}
blockState.setRawData((byte) 0x0);
blockState.setType(Material.AIR);
blockState.update(true);
}

7
src/main/java/com/gmail/nossr50/util/ItemUtils.java
View File

@@ -5,6 +5,7 @@ import org.bukkit.DyeColor;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.material.Dye;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.api.SpoutToolsAPI;
@@ -499,7 +500,7 @@ public class ItemUtils {
return true;
case INK_SACK:
return item.getData().getData() == DyeColor.BLUE.getDyeData();
return ((Dye) item.getData()).getColor() == DyeColor.BLUE;
default:
return false;
@@ -545,7 +546,7 @@ public class ItemUtils {
return true;
case INK_SACK:
return item.getData().getData() == DyeColor.BLUE.getDyeData();
return ((Dye) item.getData()).getColor() == DyeColor.BLUE;
default:
return false;
@@ -580,7 +581,7 @@ public class ItemUtils {
return true;
case INK_SACK:
return item.getData().getData() == DyeColor.BROWN.getDyeData();
return ((Dye) item.getData()).getColor() == DyeColor.BROWN;
default:
return false;