EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 10:14:43 +02:00
Code Issues Projects Releases Wiki Activity

Add missing XP tables to 2.2

Browse Source
This commit is contained in:
nossr50
2019-04-28 06:05:39 -07:00
parent 986162803b
commit d1085aa8f8
6 changed files with 98 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceCombat.java
View File

@ -22,6 +22,7 @@ public class ConfigExperienceCombat {
COMBAT_EXPERIENCE_DEFAULT.put("pillager", 2.0D);
COMBAT_EXPERIENCE_DEFAULT.put("ravager", 4.0D);
COMBAT_EXPERIENCE_DEFAULT.put("trader_llama", 1.0D);
COMBAT_EXPERIENCE_DEFAULT.put("wandering_trader", 1.0D);
COMBAT_EXPERIENCE_DEFAULT.put("skeleton", 3.0D);
COMBAT_EXPERIENCE_DEFAULT.put("spider", 2.0D);
COMBAT_EXPERIENCE_DEFAULT.put("giant", 4.0D);

4
src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceHerbalism.java
View File

@ -67,12 +67,14 @@ public class ConfigExperienceHerbalism {
HERBALISM_EXPERIENCE_DEFAULT.put(Material.OXEYE_DAISY.getKey().toString(), 150);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.PEONY.getKey().toString(), 50);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.PINK_TULIP.getKey().toString(), 150);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.LILY_OF_THE_VALLEY.getKey().toString(), 150);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.WHITE_TULIP.getKey().toString(), 150);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.POPPY.getKey().toString(), 100);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.DANDELION.getKey().toString(), 100);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.RED_TULIP.getKey().toString(), 150);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.ROSE_BUSH.getKey().toString(), 50);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.SUNFLOWER.getKey().toString(), 50);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.CORNFLOWER.getKey().toString(), 50);
/* WEEDS */
HERBALISM_EXPERIENCE_DEFAULT.put(Material.FERN.getKey().toString(), 10);
@ -99,11 +101,13 @@ public class ConfigExperienceHerbalism {
HERBALISM_EXPERIENCE_DEFAULT.put(Material.MELON.getKey().toString(), 20);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.WHEAT.getKey().toString(), 50);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.SUGAR_CANE.getKey().toString(), 30);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.BAMBOO.getKey().toString(), 20);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.NETHER_WART.getKey().toString(), 30);
/* END PLANTS */
HERBALISM_EXPERIENCE_DEFAULT.put(Material.CHORUS_PLANT.getKey().toString(), 1);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.CHORUS_FLOWER.getKey().toString(), 25);
HERBALISM_EXPERIENCE_DEFAULT.put(Material.WITHER_ROSE.getKey().toString(), 500);
}
@Setting(value = "Herbalism-Experience")

1
src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceMining.java
View File

@ -20,6 +20,7 @@ public class ConfigExperienceMining {
MINING_EXPERIENCE_DEFAULT.put(Material.BUBBLE_CORAL_BLOCK.getKey().toString(), 70);
MINING_EXPERIENCE_DEFAULT.put(Material.FIRE_CORAL_BLOCK.getKey().toString(), 90);
MINING_EXPERIENCE_DEFAULT.put(Material.HORN_CORAL_BLOCK.getKey().toString(), 125);
MINING_EXPERIENCE_DEFAULT.put(Material.SEA_LANTERN.getKey().toString(), 70);
MINING_EXPERIENCE_DEFAULT.put(Material.PRISMARINE.getKey().toString(), 30);
MINING_EXPERIENCE_DEFAULT.put(Material.PRISMARINE_BRICK_SLAB.getKey().toString(), 30);
MINING_EXPERIENCE_DEFAULT.put(Material.PRISMARINE_BRICK_STAIRS.getKey().toString(), 30);

2
src/main/java/com/gmail/nossr50/listeners/SelfListener.java
View File

@ -71,11 +71,11 @@ public class SelfListener implements Listener {
McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
PrimarySkillType primarySkillType = event.getSkill();
//WorldGuard XP Check
if (event.getXpGainReason() == XPGainReason.PVE ||
event.getXpGainReason() == XPGainReason.PVP ||
event.getXpGainReason() == XPGainReason.SHARED_PVE ||
event.getXpGainReason() == XPGainReason.SHARED_PVP) {
//WorldGuard XP Check
if (WorldGuardUtils.isWorldGuardLoaded()) {
if (!WorldGuardManager.getInstance().hasXPFlag(player)) {
event.setRawXpGained(0);

62
src/main/java/com/gmail/nossr50/util/MaterialMapStore.java
View File

@ -7,9 +7,8 @@ import java.util.HashSet;
/**
* Stores hash tables for item and block names
* This allows for better support across multiple versions of Minecraft
*
* <p>
* This is a temporary class, mcMMO is spaghetti and I'l clean it up later
*
*/
public class MaterialMapStore {
@ -22,8 +21,7 @@ public class MaterialMapStore {
private HashSet<String> canMakeShroomyWhiteList;
private HashSet<String> multiBlockEntities;
public MaterialMapStore()
{
public MaterialMapStore() {
abilityBlackList = new HashSet<>();
toolBlackList = new HashSet<>();
mossyWhiteList = new HashSet<>();
@ -36,48 +34,39 @@ public class MaterialMapStore {
fillHardcodedHashSets();
}
public boolean isMultiBlock(Material material)
{
public boolean isMultiBlock(Material material) {
return multiBlockEntities.contains(material.getKey().getKey());
}
public boolean isAbilityActivationBlackListed(Material material)
{
public boolean isAbilityActivationBlackListed(Material material) {
return abilityBlackList.contains(material.getKey().getKey());
}
public boolean isToolActivationBlackListed(Material material)
{
public boolean isToolActivationBlackListed(Material material) {
return toolBlackList.contains(material.getKey().getKey());
}
public boolean isMossyWhiteListed(Material material)
{
public boolean isMossyWhiteListed(Material material) {
return mossyWhiteList.contains(material.getKey().getKey());
}
public boolean isLeavesWhiteListed(Material material)
{
public boolean isLeavesWhiteListed(Material material) {
return leavesWhiteList.contains(material.getKey().getKey());
}
public boolean isHerbalismAbilityWhiteListed(Material material)
{
public boolean isHerbalismAbilityWhiteListed(Material material) {
return herbalismAbilityBlackList.contains(material.getKey().getKey());
}
public boolean isBlockCrackerWhiteListed(Material material)
{
public boolean isBlockCrackerWhiteListed(Material material) {
return blockCrackerWhiteList.contains(material.getKey().getKey());
}
public boolean isShroomyWhiteListed(Material material)
{
public boolean isShroomyWhiteListed(Material material) {
return canMakeShroomyWhiteList.contains(material.getKey().getKey());
}
private void fillHardcodedHashSets()
{
private void fillHardcodedHashSets() {
fillAbilityBlackList();
filltoolBlackList();
fillMossyWhiteList();
@ -88,8 +77,7 @@ public class MaterialMapStore {
fillMultiBlockEntitiesList();
}
private void fillMultiBlockEntitiesList()
{
private void fillMultiBlockEntitiesList() {
multiBlockEntities.add("cactus");
multiBlockEntities.add("chorus_plant");
multiBlockEntities.add("sugar_cane");
@ -100,28 +88,24 @@ public class MaterialMapStore {
multiBlockEntities.add("bamboo");
}
private void fillShroomyWhiteList()
{
private void fillShroomyWhiteList() {
canMakeShroomyWhiteList.add("dirt");
canMakeShroomyWhiteList.add("grass");
canMakeShroomyWhiteList.add("grass_path");
}
private void fillBlockCrackerWhiteList()
{
private void fillBlockCrackerWhiteList() {
blockCrackerWhiteList.add("stone_bricks");
}
private void fillHerbalismAbilityBlackList()
{
private void fillHerbalismAbilityBlackList() {
herbalismAbilityBlackList.add("dirt");
herbalismAbilityBlackList.add("grass");
herbalismAbilityBlackList.add("grass_path");
herbalismAbilityBlackList.add("farmland");
}
private void fillLeavesWhiteList()
{
private void fillLeavesWhiteList() {
leavesWhiteList.add("oak_leaves");
leavesWhiteList.add("acacia_leaves");
leavesWhiteList.add("birch_leaves");
@ -130,8 +114,7 @@ public class MaterialMapStore {
leavesWhiteList.add("spruce_leaves");
}
private void fillMossyWhiteList()
{
private void fillMossyWhiteList() {
mossyWhiteList.add("cobblestone");
mossyWhiteList.add("dirt");
mossyWhiteList.add("grass_path");
@ -139,8 +122,7 @@ public class MaterialMapStore {
mossyWhiteList.add("cobblestone_wall");
}
private void fillAbilityBlackList()
{
private void fillAbilityBlackList() {
abilityBlackList.add("black_bed");
abilityBlackList.add("blue_bed");
abilityBlackList.add("brown_bed");
@ -239,9 +221,8 @@ public class MaterialMapStore {
abilityBlackList.add("wall_sign"); //1.13 and lower?
abilityBlackList.add("sign"); //1.13 and lower?
}
private void filltoolBlackList()
{
private void filltoolBlackList() {
//TODO: Add anvils / missing logs
toolBlackList.add("black_bed");
toolBlackList.add("blue_bed");
@ -364,8 +345,7 @@ public class MaterialMapStore {
toolBlackList.add("spruce_wood");
}
private void addToHashSet(String string, HashSet<String> stringHashSet)
{
private void addToHashSet(String string, HashSet<String> stringHashSet) {
stringHashSet.add(string.toLowerCase());
}
}