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

Fixed ItemStack deprecation issues.

Browse Source
This commit is contained in:
gmcferrin
2012-12-25 01:01:10 -05:00
parent 5e965aec2c
commit 9af66a8e69
10 changed files with 120 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/config/TreasuresConfig.java
View File

@ -11,6 +11,7 @@ import java.util.Set;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack;
import org.bukkit.material.MaterialData;
import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
@ -125,7 +126,8 @@ public class TreasuresConfig extends ConfigLoader{
* Drops From & Max Level
*/
ItemStack item = new ItemStack(id, amount, (short) 0, (byte) data);
ItemStack item = new ItemStack(id, amount, (short) 0);
item.setData(new MaterialData(id, (byte) data));
if (config.getBoolean("Treasures." + treasureName + ".Drops_From.Fishing", false)) {
if (config.getConfigurationSection("Treasures." + treasureName + ".Drops_From").getKeys(false).size() != 1) {

14
src/main/java/com/gmail/nossr50/config/mods/CustomBlocksConfig.java
View File

@ -7,6 +7,7 @@ import java.util.Set;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack;
import org.bukkit.material.MaterialData;
import com.gmail.nossr50.config.ConfigLoader;
import com.gmail.nossr50.datatypes.mods.CustomBlock;
@ -78,7 +79,9 @@ public class CustomBlocksConfig extends ConfigLoader {
}
if (skillType.equals("Ability_Blocks")) {
blockItem = new ItemStack(id, 1, (short) 0, data);
blockItem = new ItemStack(id, 1, (short) 0);
blockItem.setData(new MaterialData(id, data));
blockList.add(blockItem);
continue;
}
@ -89,14 +92,17 @@ public class CustomBlocksConfig extends ConfigLoader {
}
if (dropItem) {
itemDrop = new ItemStack(dropID, 1, (short) 0, dropData);
itemDrop = new ItemStack(dropID, 1, (short) 0);
itemDrop.setData(new MaterialData(dropID, dropData));
}
else {
itemDrop = new ItemStack(id, 1, (short) 0, data);
itemDrop = new ItemStack(id, 1, (short) 0);
itemDrop.setData(new MaterialData(id, data));
}
block = new CustomBlock(minimumDropAmount, maxiumDropAmount, itemDrop, tier, xp, data, id);
blockItem = new ItemStack(id, 1, (short) 0, data);
blockItem = new ItemStack(id, 1, (short) 0);
blockItem.setData(new MaterialData(id, data));
if (skillType.equals("Mining") && config.getBoolean(skillType + "." + blockName + ".Is_Ore")) {
customOres.add(blockItem);