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

Quick and dirty 1.13 update. I.e. it now compiles for 1.13.

Browse Source
This commit is contained in:
t00thpick1
2018-07-23 22:13:57 -04:00
parent 3d515aab23
commit 0a1559511a
25 changed files with 511 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/main/java/com/gmail/nossr50/util/BlockUtils.java
View File

@ -1,22 +1,14 @@
package com.gmail.nossr50.util;
import java.util.HashSet;
import org.bukkit.CropState;
import org.bukkit.Material;
import org.bukkit.NetherWartsState;
import org.bukkit.block.BlockState;
import org.bukkit.material.CocoaPlant;
import org.bukkit.material.CocoaPlant.CocoaPlantSize;
import org.bukkit.material.Crops;
import org.bukkit.material.NetherWarts;
import org.bukkit.material.SmoothBrick;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.skills.SkillType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.skills.repair.Repair;
import com.gmail.nossr50.skills.salvage.Salvage;
import org.bukkit.Material;
import org.bukkit.block.BlockState;
import java.util.HashSet;
public final class BlockUtils {
@ -43,32 +35,54 @@ public final class BlockUtils {
*/
public static boolean canActivateAbilities(BlockState blockState) {
switch (blockState.getType()) {
case BED_BLOCK :
case BLACK_BED:
case BLUE_BED:
case BROWN_BED:
case CYAN_BED:
case GRAY_BED:
case GREEN_BED:
case LIGHT_BLUE_BED:
case LIGHT_GRAY_BED:
case LIME_BED:
case MAGENTA_BED:
case ORANGE_BED:
case PINK_BED:
case PURPLE_BED:
case RED_BED:
case WHITE_BED:
case YELLOW_BED:
case BREWING_STAND :
case BOOKSHELF :
case BURNING_FURNACE :
case CAKE_BLOCK :
case CAKE:
case CHEST :
case DISPENSER :
case ENCHANTMENT_TABLE :
case ENCHANTING_TABLE:
case ENDER_CHEST :
case FENCE_GATE :
case OAK_FENCE_GATE:
case ACACIA_FENCE_GATE :
case DARK_OAK_FENCE_GATE :
case SPRUCE_FENCE_GATE :
case BIRCH_FENCE_GATE :
case JUNGLE_FENCE_GATE :
case FURNACE :
case IRON_DOOR_BLOCK :
case JUKEBOX :
case LEVER :
case NOTE_BLOCK :
case STONE_BUTTON :
case WOOD_BUTTON :
case TRAP_DOOR :
case OAK_BUTTON:
case BIRCH_BUTTON:
case ACACIA_BUTTON:
case DARK_OAK_BUTTON:
case JUNGLE_BUTTON:
case SPRUCE_BUTTON:
case ACACIA_TRAPDOOR:
case BIRCH_TRAPDOOR:
case DARK_OAK_TRAPDOOR:
case JUNGLE_TRAPDOOR:
case OAK_TRAPDOOR:
case SPRUCE_TRAPDOOR:
case WALL_SIGN :
case WOODEN_DOOR :
case WORKBENCH :
case CRAFTING_TABLE:
case BEACON :
case ANVIL :
case DROPPER :
@ -76,12 +90,13 @@ public final class BlockUtils {
case TRAPPED_CHEST :
case IRON_DOOR :
case IRON_TRAPDOOR :
case OAK_DOOR:
case ACACIA_DOOR :
case SPRUCE_DOOR :
case BIRCH_DOOR :
case JUNGLE_DOOR :
case DARK_OAK_DOOR :
case FENCE :
case OAK_FENCE:
case ACACIA_FENCE :
case DARK_OAK_FENCE :
case BIRCH_FENCE :
@ -101,7 +116,7 @@ public final class BlockUtils {
case PINK_SHULKER_BOX :
case PURPLE_SHULKER_BOX :
case RED_SHULKER_BOX :
case SILVER_SHULKER_BOX :
case LIGHT_GRAY_SHULKER_BOX:
case WHITE_SHULKER_BOX :
case YELLOW_SHULKER_BOX :
return false;
@ -136,11 +151,11 @@ public final class BlockUtils {
case GRASS_PATH :
return true;
case SMOOTH_BRICK :
return ((SmoothBrick) blockState.getData()).getMaterial() == Material.STONE;
case STONE_BRICKS:
return true;
case COBBLE_WALL :
return blockState.getRawData() == (byte) 0x0;
case COBBLESTONE_WALL:
return true;
default :
return false;
@ -212,8 +227,12 @@ public final class BlockUtils {
*/
public static boolean isLeaves(BlockState blockState) {
switch (blockState.getType()) {
case LEAVES :
case LEAVES_2 :
case OAK_LEAVES:
case ACACIA_LEAVES:
case BIRCH_LEAVES:
case DARK_OAK_LEAVES:
case JUNGLE_LEAVES:
case SPRUCE_LEAVES:
return true;
default :
@ -252,7 +271,7 @@ public final class BlockUtils {
case DIRT :
case GRASS :
case GRASS_PATH :
case SOIL :
case FARMLAND:
return false;
default :
@ -270,8 +289,8 @@ public final class BlockUtils {
*/
public static boolean affectedByBlockCracker(BlockState blockState) {
switch (blockState.getType()) {
case SMOOTH_BRICK :
return ((SmoothBrick) blockState.getData()).getMaterial() == Material.STONE;
case STONE_BRICKS:
return true;
default :
return false;
@ -313,7 +332,7 @@ public final class BlockUtils {
public static boolean isPistonPiece(BlockState blockState) {
Material type = blockState.getType();
return type == Material.PISTON_MOVING_PIECE || type == Material.AIR;
return type == Material.MOVING_PISTON || type == Material.AIR;
}
/**

25
src/main/java/com/gmail/nossr50/util/EventUtils.java
View File

@ -1,17 +1,5 @@
package com.gmail.nossr50.util;
import java.util.HashMap;
import java.util.Map;
import org.bukkit.block.Block;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Fish;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerFishEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.PluginManager;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.party.Party;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.datatypes.player.PlayerProfile;
@ -41,7 +29,18 @@ import com.gmail.nossr50.events.skills.repair.McMMOPlayerRepairCheckEvent;
import com.gmail.nossr50.events.skills.secondaryabilities.SecondaryAbilityEvent;
import com.gmail.nossr50.events.skills.unarmed.McMMOPlayerDisarmEvent;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.player.UserManager;
import org.bukkit.block.Block;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.FishHook;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerFishEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.PluginManager;
import java.util.HashMap;
import java.util.Map;
public class EventUtils {
public static McMMOPlayerAbilityActivateEvent callPlayerAbilityActivateEvent(Player player, SkillType skill) {
@ -252,7 +251,7 @@ public class EventUtils {
return event;
}
public static FakePlayerFishEvent callFakeFishEvent(Player player, Fish hook) {
public static FakePlayerFishEvent callFakeFishEvent(Player player, FishHook hook) {
FakePlayerFishEvent event = new FakePlayerFishEvent(player, null, hook, PlayerFishEvent.State.FISHING);
mcMMO.p.getServer().getPluginManager().callEvent(event);

44
src/main/java/com/gmail/nossr50/util/HolidayManager.java
View File

@ -1,27 +1,14 @@
package com.gmail.nossr50.util;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.EnumSet;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
import org.bukkit.ChatColor;
import org.bukkit.Color;
import org.bukkit.DyeColor;
import org.bukkit.FireworkEffect;
import com.gmail.nossr50.commands.skills.AprilCommand;
import com.gmail.nossr50.datatypes.skills.SkillType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.adapter.SoundAdapter;
import com.gmail.nossr50.util.player.UserManager;
import com.gmail.nossr50.util.skills.ParticleEffectUtils;
import com.google.common.collect.ImmutableList;
import org.bukkit.*;
import org.bukkit.FireworkEffect.Type;
import org.bukkit.Statistic;
import org.bukkit.command.CommandSender;
import org.bukkit.command.PluginCommand;
import org.bukkit.entity.EntityType;
@ -30,14 +17,9 @@ import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerStatisticIncrementEvent;
import org.bukkit.inventory.meta.FireworkMeta;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.commands.skills.AprilCommand;
import com.gmail.nossr50.datatypes.skills.SkillType;
import com.gmail.nossr50.util.adapter.SoundAdapter;
import com.gmail.nossr50.util.player.UserManager;
import com.gmail.nossr50.util.skills.ParticleEffectUtils;
import com.google.common.collect.ImmutableList;
import java.io.*;
import java.util.*;
import java.util.regex.Pattern;
public final class HolidayManager {
private ArrayList<String> hasCelebrated;
@ -95,7 +77,7 @@ public final class HolidayManager {
return FakeSkillType.CLIMBING;
case FLY_ONE_CM:
return FakeSkillType.FLYING;
case DIVE_ONE_CM:
case WALK_UNDER_WATER_ONE_CM:
return FakeSkillType.DIVING;
case PIG_ONE_CM:
return FakeSkillType.PIGGY;
@ -107,7 +89,7 @@ public final class HolidayManager {
public final Set<Statistic> movementStatistics = EnumSet.of(
Statistic.WALK_ONE_CM, Statistic.SWIM_ONE_CM, Statistic.FALL_ONE_CM,
Statistic.CLIMB_ONE_CM, Statistic.FLY_ONE_CM, Statistic.DIVE_ONE_CM,
Statistic.CLIMB_ONE_CM, Statistic.FLY_ONE_CM, Statistic.WALK_UNDER_WATER_ONE_CM,
Statistic.PIG_ONE_CM);
static {

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

@ -1,20 +1,15 @@
package com.gmail.nossr50.util;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.party.ItemWeightConfig;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO;
import org.bukkit.ChatColor;
import org.bukkit.CoalType;
import org.bukkit.DyeColor;
import org.bukkit.Material;
import org.bukkit.inventory.FurnaceRecipe;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.Recipe;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.material.Coal;
import org.bukkit.material.Dye;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.party.ItemWeightConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.locale.LocaleLoader;
public final class ItemUtils {
private ItemUtils() {}
@ -48,10 +43,10 @@ public final class ItemUtils {
switch (type) {
case DIAMOND_SWORD:
case GOLD_SWORD:
case GOLDEN_SWORD:
case IRON_SWORD:
case STONE_SWORD:
case WOOD_SWORD:
case WOODEN_SWORD:
return true;
default:
@ -70,10 +65,10 @@ public final class ItemUtils {
switch (type) {
case DIAMOND_HOE:
case GOLD_HOE:
case GOLDEN_HOE:
case IRON_HOE:
case STONE_HOE:
case WOOD_HOE:
case WOODEN_HOE:
return true;
default:
@ -91,11 +86,11 @@ public final class ItemUtils {
Material type = item.getType();
switch (type) {
case DIAMOND_SPADE:
case GOLD_SPADE:
case IRON_SPADE:
case STONE_SPADE:
case WOOD_SPADE:
case DIAMOND_SHOVEL:
case GOLDEN_SHOVEL:
case IRON_SHOVEL:
case STONE_SHOVEL:
case WOODEN_SHOVEL:
return true;
default:
@ -114,10 +109,10 @@ public final class ItemUtils {
switch (type) {
case DIAMOND_AXE:
case GOLD_AXE:
case GOLDEN_AXE:
case IRON_AXE:
case STONE_AXE:
case WOOD_AXE:
case WOODEN_AXE:
return true;
default:
@ -136,10 +131,10 @@ public final class ItemUtils {
switch (type) {
case DIAMOND_PICKAXE:
case GOLD_PICKAXE:
case GOLDEN_PICKAXE:
case IRON_PICKAXE:
case STONE_PICKAXE:
case WOOD_PICKAXE:
case WOODEN_PICKAXE:
return true;
default:
@ -172,7 +167,7 @@ public final class ItemUtils {
switch (type) {
case DIAMOND_HELMET:
case GOLD_HELMET:
case GOLDEN_HELMET:
case IRON_HELMET:
case CHAINMAIL_HELMET:
case LEATHER_HELMET:
@ -194,7 +189,7 @@ public final class ItemUtils {
switch (type) {
case DIAMOND_CHESTPLATE:
case GOLD_CHESTPLATE:
case GOLDEN_CHESTPLATE:
case IRON_CHESTPLATE:
case CHAINMAIL_CHESTPLATE:
case LEATHER_CHESTPLATE:
@ -216,7 +211,7 @@ public final class ItemUtils {
switch (type) {
case DIAMOND_LEGGINGS:
case GOLD_LEGGINGS:
case GOLDEN_LEGGINGS:
case IRON_LEGGINGS:
case CHAINMAIL_LEGGINGS:
case LEATHER_LEGGINGS:
@ -238,7 +233,7 @@ public final class ItemUtils {
switch (type) {
case DIAMOND_BOOTS:
case GOLD_BOOTS:
case GOLDEN_BOOTS:
case IRON_BOOTS:
case CHAINMAIL_BOOTS:
case LEATHER_BOOTS:
@ -296,10 +291,10 @@ public final class ItemUtils {
*/
public static boolean isGoldArmor(ItemStack item) {
switch (item.getType()) {
case GOLD_BOOTS:
case GOLD_CHESTPLATE:
case GOLD_HELMET:
case GOLD_LEGGINGS:
case GOLDEN_BOOTS:
case GOLDEN_CHESTPLATE:
case GOLDEN_HELMET:
case GOLDEN_LEGGINGS:
return true;
default:
@ -385,7 +380,7 @@ public final class ItemUtils {
case STONE_AXE:
case STONE_HOE:
case STONE_PICKAXE:
case STONE_SPADE:
case STONE_SHOVEL:
case STONE_SWORD:
return true;
@ -402,11 +397,11 @@ public final class ItemUtils {
*/
public static boolean isWoodTool(ItemStack item) {
switch (item.getType()) {
case WOOD_AXE:
case WOOD_HOE:
case WOOD_PICKAXE:
case WOOD_SPADE:
case WOOD_SWORD:
case WOODEN_AXE:
case WOODEN_HOE:
case WOODEN_PICKAXE:
case WOODEN_SHOVEL:
case WOODEN_SWORD:
return true;
default:
@ -423,7 +418,7 @@ public final class ItemUtils {
public static boolean isStringTool(ItemStack item) {
switch (item.getType()) {
case BOW:
case CARROT_STICK:
case CARROT_ON_A_STICK:
case FISHING_ROD:
return true;
@ -440,11 +435,11 @@ public final class ItemUtils {
*/
public static boolean isGoldTool(ItemStack item) {
switch (item.getType()) {
case GOLD_AXE:
case GOLD_HOE:
case GOLD_PICKAXE:
case GOLD_SPADE:
case GOLD_SWORD:
case GOLDEN_AXE:
case GOLDEN_HOE:
case GOLDEN_PICKAXE:
case GOLDEN_SHOVEL:
case GOLDEN_SWORD:
return true;
default:
@ -465,7 +460,7 @@ public final class ItemUtils {
case IRON_AXE:
case IRON_HOE:
case IRON_PICKAXE:
case IRON_SPADE:
case IRON_SHOVEL:
case IRON_SWORD:
case SHEARS:
return true;
@ -486,7 +481,7 @@ public final class ItemUtils {
case DIAMOND_AXE:
case DIAMOND_HOE:
case DIAMOND_PICKAXE:
case DIAMOND_SPADE:
case DIAMOND_SHOVEL:
case DIAMOND_SWORD:
return true;
@ -506,7 +501,7 @@ public final class ItemUtils {
case ENCHANTED_BOOK:
case SHEARS:
case FISHING_ROD:
case CARROT_STICK:
case CARROT_ON_A_STICK:
case FLINT_AND_STEEL:
return true;
@ -568,12 +563,10 @@ public final class ItemUtils {
case REDSTONE:
case GLOWSTONE_DUST: // Should we also have Glowstone here?
case QUARTZ:
case QUARTZ_ORE:
case NETHER_QUARTZ_ORE:
case LAPIS_LAZULI:
return true;
case INK_SACK:
return ((Dye) item.getData()).getColor() == DyeColor.BLUE;
default:
return false;
}
@ -588,33 +581,30 @@ public final class ItemUtils {
public static boolean isHerbalismDrop(ItemStack item) {
switch (item.getType()) {
case WHEAT:
case SEEDS:
case CARROT_ITEM:
case WHEAT_SEEDS:
case CARROT:
case CHORUS_FRUIT:
case CHORUS_FLOWER:
case POTATO_ITEM:
case POTATO:
case BEETROOT:
case BEETROOT_SEEDS:
case NETHER_WARTS:
case NETHER_WART:
case BROWN_MUSHROOM:
case RED_MUSHROOM:
case RED_ROSE:
case YELLOW_FLOWER:
case ROSE_RED:
case DANDELION_YELLOW:
case CACTUS:
case SUGAR_CANE:
case MELON:
case MELON_SEEDS:
case PUMPKIN:
case PUMPKIN_SEEDS:
case WATER_LILY:
case LILY_PAD:
case VINE:
case LONG_GRASS:
case DOUBLE_PLANT:
case TALL_GRASS:
case COCOA_BEANS:
return true;
case INK_SACK:
return ((Dye) item.getData()).getColor() == DyeColor.BROWN;
default:
return false;
}
@ -630,19 +620,34 @@ public final class ItemUtils {
switch (item.getType()) {
case STRING:
case FEATHER:
case RAW_CHICKEN:
case CHICKEN:
case COOKED_CHICKEN:
case LEATHER:
case RAW_BEEF:
case BEEF:
case COOKED_BEEF:
case PORK:
case GRILLED_PORK:
case WOOL:
case PORKCHOP:
case COOKED_PORKCHOP:
case WHITE_WOOL:
case BLACK_WOOL:
case BLUE_WOOL:
case BROWN_WOOL:
case CYAN_WOOL:
case GRAY_WOOL:
case GREEN_WOOL:
case LIGHT_BLUE_WOOL:
case LIGHT_GRAY_WOOL:
case LIME_WOOL:
case MAGENTA_WOOL:
case ORANGE_WOOL:
case PINK_WOOL:
case PURPLE_WOOL:
case RED_WOOL:
case YELLOW_WOOL:
case IRON_INGOT:
case SNOW_BALL:
case SNOWBALL:
case BLAZE_ROD:
case SPIDER_EYE:
case SULPHUR:
case GUNPOWDER:
case ENDER_PEARL:
case GHAST_TEAR:
case MAGMA_CREAM:
@ -653,14 +658,10 @@ public final class ItemUtils {
case ROTTEN_FLESH:
case GOLD_NUGGET:
case EGG:
case ROSE_RED:
case COAL:
return true;
case COAL: // Not sure we should include this, as it will also trigger when mining
return (((Coal) item.getData()).getType() == CoalType.COAL);
case RED_ROSE: // Not sure we should include this, as it will also trigger from herbalism
return (item.getData().getData() == 0x0);
default:
return false;
}
@ -674,11 +675,30 @@ public final class ItemUtils {
*/
public static boolean isWoodcuttingDrop(ItemStack item) {
switch (item.getType()) {
case LOG:
case LOG_2:
case LEAVES:
case LEAVES_2:
case SAPLING:
case ACACIA_LOG:
case BIRCH_LOG:
case DARK_OAK_LOG:
case JUNGLE_LOG:
case OAK_LOG:
case SPRUCE_LOG:
case STRIPPED_ACACIA_LOG:
case STRIPPED_BIRCH_LOG:
case STRIPPED_DARK_OAK_LOG:
case STRIPPED_JUNGLE_LOG:
case STRIPPED_OAK_LOG:
case STRIPPED_SPRUCE_LOG:
case ACACIA_SAPLING:
case SPRUCE_SAPLING:
case BIRCH_SAPLING:
case DARK_OAK_SAPLING:
case JUNGLE_SAPLING:
case OAK_SAPLING:
case ACACIA_LEAVES:
case BIRCH_LEAVES:
case DARK_OAK_LEAVES:
case JUNGLE_LEAVES:
case OAK_LEAVES:
case SPRUCE_LEAVES:
case APPLE:
return true;

6
src/main/java/com/gmail/nossr50/util/MaterialUtils.java
View File

@ -1,8 +1,7 @@
package com.gmail.nossr50.util;
import org.bukkit.material.MaterialData;
import com.gmail.nossr50.mcMMO;
import org.bukkit.material.MaterialData;
public final class MaterialUtils {
private MaterialUtils() {}
@ -11,11 +10,10 @@ public final class MaterialUtils {
switch (data.getItemType()) {
case COAL_ORE:
case DIAMOND_ORE:
case GLOWING_REDSTONE_ORE:
case NETHER_QUARTZ_ORE:
case GOLD_ORE:
case IRON_ORE:
case LAPIS_ORE:
case QUARTZ_ORE:
case REDSTONE_ORE:
case EMERALD_ORE:
return true;

297
src/main/java/com/gmail/nossr50/util/StringUtils.java
View File

@ -1,23 +1,12 @@
package com.gmail.nossr50.util;
import org.bukkit.CropState;
import org.bukkit.GrassSpecies;
import org.bukkit.Material;
import org.bukkit.NetherWartsState;
import org.bukkit.TreeSpecies;
import org.bukkit.entity.EntityType;
import org.bukkit.material.CocoaPlant;
import org.bukkit.material.Crops;
import org.bukkit.material.LongGrass;
import org.bukkit.material.MaterialData;
import org.bukkit.material.NetherWarts;
import org.bukkit.material.Sapling;
import org.bukkit.material.Tree;
import org.bukkit.material.CocoaPlant.CocoaPlantSize;
import com.gmail.nossr50.datatypes.party.PartyFeature;
import com.gmail.nossr50.datatypes.skills.AbilityType;
import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
import org.bukkit.Material;
import org.bukkit.TreeSpecies;
import org.bukkit.entity.EntityType;
import org.bukkit.material.MaterialData;
public class StringUtils {
@ -53,284 +42,6 @@ public class StringUtils {
}
public static String getFriendlyConfigMaterialDataString(MaterialData data) {
switch (data.getItemType()) {
case LOG :
case LOG_2 : {
TreeSpecies species = TreeSpecies.GENERIC;
if (data instanceof Tree) {
Tree tree = (Tree) data;
species = tree.getSpecies();
}
return createPrettyEnumString(species.name()).replace(" ", "_");
}
case LONG_GRASS : {
LongGrass grass = (LongGrass) data;
GrassSpecies species = grass.getSpecies();
switch (species) {
case DEAD :
return "Dead_Bush";
case FERN_LIKE :
return "Small_Fern";
case NORMAL :
return "Small_Grass";
}
break;
}
case RED_ROSE : {
switch (data.getData()) {
case 0x0 :
return "Poppy";
case 0x1 :
return "Blue_Orchid";
case 0x2 :
return "Allium";
case 0x3 :
return "Azure_Bluet";
case 0x4 :
return "Red_Tulip";
case 0x5 :
return "Orange_Tulip";
case 0x6 :
return "White_Tulip";
case 0x7 :
return "Pink_Tulip";
case 0x8 :
return "Oxeye_Daisy";
default :
return getExplicitConfigMaterialDataString(data);
}
}
case DOUBLE_PLANT : {
switch (data.getData()) {
case 0x0 :
return "Sunflower";
case 0x1 :
return "Lilac";
case 0x2 :
return "Tall_Grass";
case 0x3 :
return "Tall_Fern";
case 0x4 :
return "Rose_Bush";
case 0x5 :
return "Peony";
default :
return getExplicitConfigMaterialDataString(data);
}
}
case RAW_FISH : {
switch (data.getData()) {
case 0x0 :
return "Raw_Fish";
case 0x1 :
return "Raw_Salmon";
case 0x2 :
return "Clownfish";
case 0x3 :
return "Pufferfish";
default :
return getExplicitConfigMaterialDataString(data);
}
}
case COOKED_FISH : {
switch (data.getData()) {
case 0x0 :
return "Cooked_Fish";
case 0x1 :
return "Cooked_Salmon";
default :
return getExplicitConfigMaterialDataString(data);
}
}
case DIRT : {
switch (data.getData()) {
case 0x0 :
return "Dirt";
case 0x1 :
return "Coarse_Dirt";
case 0x2 :
return "Podzol";
default :
return getExplicitConfigMaterialDataString(data);
}
}
case SAND : {
switch (data.getData()) {
case 0x0 :
return "Sand";
case 0x1 :
return "Red_Sand";
default :
return getExplicitConfigMaterialDataString(data);
}
}
case QUARTZ_BLOCK : {
switch (data.getData()) {
case 0x0 :
return "Quartz_Block";
case 0x1 :
return "Chiseled_Quartz_Block";
case 0x2 :
case 0x3 :
case 0x4 :
return "Quartz_Pillar";
default :
return getExplicitConfigMaterialDataString(data);
}
}
case SPONGE : {
switch (data.getData()) {
case 0x0 :
return "Sponge";
case 0x1 :
return "Wet_Sponge";
default :
return getExplicitConfigMaterialDataString(data);
}
}
case PRISMARINE : {
switch (data.getData()) {
case 0x0 :
return "Prismarine";
case 0x1 :
return "Prismarine_Brick";
case 0x2 :
return "Dark_Prismarine";
default :
return getExplicitConfigMaterialDataString(data);
}
}
case STONE : {
switch (data.getData()) {
case 0x0 :
return "Stone";
case 0x1 :
return "Granite";
case 0x2 :
return "Polished_Granite";
case 0x3 :
return "Diorite";
case 0x4 :
return "Polished_Diorite";
case 0x5 :
return "Andesite";
case 0x6 :
return "Polished_Andesite";
default :
return getExplicitConfigMaterialDataString(data);
}
}
case WOOD : {
switch (data.getData()) {
case 0x0 :
return "Oak_Planks";
case 0x1 :
return "Spruce_Planks";
case 0x2 :
return "Birch_Planks";
case 0x3 :
return "Jungle_Planks";
case 0x4 :
return "Acacia_Planks";
case 0x5 :
return "Dark_Oak_Planks";
default :
return getExplicitConfigMaterialDataString(data);
}
}
case GLOWING_REDSTONE_ORE :
return getPrettyItemString(Material.REDSTONE_ORE).replace(" ", "_");
case BEETROOT_BLOCK :
case CARROT :
case POTATO :
case CROPS : {
if (((Crops) data).getState() == CropState.RIPE) {
return getPrettyItemString(data.getItemType()).replace(" ", "_") + "_Ripe";
}
return getPrettyItemString(data.getItemType()).replace(" ", "_") + "_Ungrown";
}
case NETHER_WARTS : {
if (((NetherWarts) data).getState() == NetherWartsState.RIPE) {
return getPrettyItemString(data.getItemType()).replace(" ", "_") + "_Ripe";
}
return getPrettyItemString(data.getItemType()).replace(" ", "_") + "_Ungrown";
}
case COCOA : {
if (((CocoaPlant) data).getSize() == CocoaPlantSize.LARGE) {
return getPrettyItemString(data.getItemType()).replace(" ", "_") + "_Ripe";
}
return getPrettyItemString(data.getItemType()).replace(" ", "_") + "_Ungrown";
}
case SAPLING:
{
TreeSpecies species = TreeSpecies.GENERIC;
if (data instanceof Sapling) {
Sapling sapling = (Sapling) data;
species = sapling.getSpecies();
}
return createPrettyEnumString(species.name()).replace(" ", "_") + "_Sapling";
}
case SMOOTH_BRICK :
case WOOL :
case INK_SACK :
case STAINED_CLAY :
case STAINED_GLASS :
case FLOWER_POT :
case MONSTER_EGGS :
return getExplicitConfigMaterialDataString(data);
default :
break;
}
return getPrettyItemString(data.getItemType()).replace(" ", "_");
}

39
src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
View File

@ -1,8 +1,21 @@
package com.gmail.nossr50.util.skills;
import java.util.ArrayList;
import java.util.List;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.HiddenConfig;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.datatypes.skills.AbilityType;
import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
import com.gmail.nossr50.datatypes.skills.SkillType;
import com.gmail.nossr50.events.skills.secondaryabilities.SecondaryAbilityEvent;
import com.gmail.nossr50.events.skills.secondaryabilities.SecondaryAbilityWeightedActivationCheckEvent;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.EventUtils;
import com.gmail.nossr50.util.ItemUtils;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.StringUtils;
import com.gmail.nossr50.util.player.UserManager;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
@ -16,22 +29,8 @@ import org.bukkit.material.MaterialData;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.HiddenConfig;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.datatypes.skills.AbilityType;
import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
import com.gmail.nossr50.datatypes.skills.SkillType;
import com.gmail.nossr50.events.skills.secondaryabilities.SecondaryAbilityEvent;
import com.gmail.nossr50.events.skills.secondaryabilities.SecondaryAbilityWeightedActivationCheckEvent;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.util.EventUtils;
import com.gmail.nossr50.util.ItemUtils;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.StringUtils;
import com.gmail.nossr50.util.player.UserManager;
import java.util.ArrayList;
import java.util.List;
public class SkillUtils {
public static int handleFoodSkills(Player player, SkillType skill, int eventFoodLevel, int baseLevel, int maxLevel, int rankChange) {
@ -256,7 +255,7 @@ public class SkillUtils {
return Material.COBBLESTONE;
}
else if (ItemUtils.isWoodTool(inHand)) {
return Material.WOOD;
return Material.OAK_WOOD;
}
else if (ItemUtils.isLeatherArmor(inHand)) {
return Material.LEATHER;