From 3579a5f5208d67832ff2145b055f3c5998b59610 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Mon, 9 May 2022 09:21:15 +0200 Subject: [PATCH] Debug for all the experience source. Added VanillaExperience & Resource ExperienceSource and added inCombat for Playing Experience Source. --- .../java/net/Indyuce/mmocore/api/load/DefaultMMOLoader.java | 1 - src/main/java/net/Indyuce/mmocore/api/load/MMOLoader.java | 2 +- .../java/net/Indyuce/mmocore/comp/region/RegionCondition.java | 4 ++-- .../net/Indyuce/mmocore/comp/region/WorldGuardMMOLoader.java | 2 +- src/main/java/net/Indyuce/mmocore/listener/BlockListener.java | 2 +- .../mmocore/{api => loot}/condition/BiomeCondition.java | 2 +- .../Indyuce/mmocore/{api => loot}/condition/Condition.java | 2 +- .../mmocore/{api => loot}/condition/ConditionInstance.java | 2 +- .../mmocore/{api => loot}/condition/DistanceCondition.java | 2 +- .../mmocore/{api => loot}/condition/LevelCondition.java | 2 +- .../mmocore/{api => loot}/condition/PermissionCondition.java | 2 +- .../mmocore/{api => loot}/condition/WorldCondition.java | 2 +- .../java/net/Indyuce/mmocore/loot/droptable/DropTable.java | 4 ++-- .../mmocore/loot/droptable/dropitem/DropTableDropItem.java | 2 +- src/main/java/net/Indyuce/mmocore/manager/MMOLoadManager.java | 2 +- .../mmocore/manager/profession/CustomBlockManager.java | 4 ++-- .../Indyuce/mmocore/manager/profession/FishingManager.java | 4 ++-- src/main/java/net/Indyuce/mmocore/waypoint/Waypoint.java | 4 ++-- 18 files changed, 22 insertions(+), 23 deletions(-) rename src/main/java/net/Indyuce/mmocore/{api => loot}/condition/BiomeCondition.java (92%) rename src/main/java/net/Indyuce/mmocore/{api => loot}/condition/Condition.java (86%) rename src/main/java/net/Indyuce/mmocore/{api => loot}/condition/ConditionInstance.java (95%) rename src/main/java/net/Indyuce/mmocore/{api => loot}/condition/DistanceCondition.java (96%) rename src/main/java/net/Indyuce/mmocore/{api => loot}/condition/LevelCondition.java (94%) rename src/main/java/net/Indyuce/mmocore/{api => loot}/condition/PermissionCondition.java (92%) rename src/main/java/net/Indyuce/mmocore/{api => loot}/condition/WorldCondition.java (91%) diff --git a/src/main/java/net/Indyuce/mmocore/api/load/DefaultMMOLoader.java b/src/main/java/net/Indyuce/mmocore/api/load/DefaultMMOLoader.java index 09524a8c..a2c8389a 100644 --- a/src/main/java/net/Indyuce/mmocore/api/load/DefaultMMOLoader.java +++ b/src/main/java/net/Indyuce/mmocore/api/load/DefaultMMOLoader.java @@ -2,7 +2,6 @@ package net.Indyuce.mmocore.api.load; import net.Indyuce.mmocore.experience.dispenser.ExperienceDispenser; import net.Indyuce.mmocore.experience.source.*; -import net.Indyuce.mmocore.api.condition.*; import org.bukkit.configuration.ConfigurationSection; import net.Indyuce.mmocore.api.block.BlockType; diff --git a/src/main/java/net/Indyuce/mmocore/api/load/MMOLoader.java b/src/main/java/net/Indyuce/mmocore/api/load/MMOLoader.java index 91489e44..10ca9c12 100644 --- a/src/main/java/net/Indyuce/mmocore/api/load/MMOLoader.java +++ b/src/main/java/net/Indyuce/mmocore/api/load/MMOLoader.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.api.load; import io.lumine.mythic.lib.api.MMOLineConfig; import net.Indyuce.mmocore.api.block.BlockType; -import net.Indyuce.mmocore.api.condition.Condition; +import net.Indyuce.mmocore.loot.condition.Condition; import net.Indyuce.mmocore.loot.droptable.dropitem.DropItem; import net.Indyuce.mmocore.experience.dispenser.ExperienceDispenser; import net.Indyuce.mmocore.experience.source.type.ExperienceSource; diff --git a/src/main/java/net/Indyuce/mmocore/comp/region/RegionCondition.java b/src/main/java/net/Indyuce/mmocore/comp/region/RegionCondition.java index 21e9bd7a..4f2876c2 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/region/RegionCondition.java +++ b/src/main/java/net/Indyuce/mmocore/comp/region/RegionCondition.java @@ -3,8 +3,8 @@ package net.Indyuce.mmocore.comp.region; import java.util.Arrays; import java.util.List; -import net.Indyuce.mmocore.api.condition.Condition; -import net.Indyuce.mmocore.api.condition.ConditionInstance; +import net.Indyuce.mmocore.loot.condition.Condition; +import net.Indyuce.mmocore.loot.condition.ConditionInstance; import io.lumine.mythic.lib.api.MMOLineConfig; public class RegionCondition extends Condition { diff --git a/src/main/java/net/Indyuce/mmocore/comp/region/WorldGuardMMOLoader.java b/src/main/java/net/Indyuce/mmocore/comp/region/WorldGuardMMOLoader.java index 949f2335..d1903d70 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/region/WorldGuardMMOLoader.java +++ b/src/main/java/net/Indyuce/mmocore/comp/region/WorldGuardMMOLoader.java @@ -1,6 +1,6 @@ package net.Indyuce.mmocore.comp.region; -import net.Indyuce.mmocore.api.condition.Condition; +import net.Indyuce.mmocore.loot.condition.Condition; import net.Indyuce.mmocore.api.load.MMOLoader; import io.lumine.mythic.lib.api.MMOLineConfig; diff --git a/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java b/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java index e9dc299b..1346b23f 100644 --- a/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java +++ b/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java @@ -11,7 +11,7 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.experience.source.MineBlockExperienceSource; import net.Indyuce.mmocore.loot.LootBuilder; -import net.Indyuce.mmocore.api.condition.ConditionInstance; +import net.Indyuce.mmocore.loot.condition.ConditionInstance; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; diff --git a/src/main/java/net/Indyuce/mmocore/api/condition/BiomeCondition.java b/src/main/java/net/Indyuce/mmocore/loot/condition/BiomeCondition.java similarity index 92% rename from src/main/java/net/Indyuce/mmocore/api/condition/BiomeCondition.java rename to src/main/java/net/Indyuce/mmocore/loot/condition/BiomeCondition.java index a90cbbac..ae2f9922 100644 --- a/src/main/java/net/Indyuce/mmocore/api/condition/BiomeCondition.java +++ b/src/main/java/net/Indyuce/mmocore/loot/condition/BiomeCondition.java @@ -1,4 +1,4 @@ -package net.Indyuce.mmocore.api.condition; +package net.Indyuce.mmocore.loot.condition; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/net/Indyuce/mmocore/api/condition/Condition.java b/src/main/java/net/Indyuce/mmocore/loot/condition/Condition.java similarity index 86% rename from src/main/java/net/Indyuce/mmocore/api/condition/Condition.java rename to src/main/java/net/Indyuce/mmocore/loot/condition/Condition.java index 8f302a9a..c925c1ba 100644 --- a/src/main/java/net/Indyuce/mmocore/api/condition/Condition.java +++ b/src/main/java/net/Indyuce/mmocore/loot/condition/Condition.java @@ -1,4 +1,4 @@ -package net.Indyuce.mmocore.api.condition; +package net.Indyuce.mmocore.loot.condition; import io.lumine.mythic.lib.api.MMOLineConfig; diff --git a/src/main/java/net/Indyuce/mmocore/api/condition/ConditionInstance.java b/src/main/java/net/Indyuce/mmocore/loot/condition/ConditionInstance.java similarity index 95% rename from src/main/java/net/Indyuce/mmocore/api/condition/ConditionInstance.java rename to src/main/java/net/Indyuce/mmocore/loot/condition/ConditionInstance.java index 93a9688f..d74a0454 100644 --- a/src/main/java/net/Indyuce/mmocore/api/condition/ConditionInstance.java +++ b/src/main/java/net/Indyuce/mmocore/loot/condition/ConditionInstance.java @@ -1,4 +1,4 @@ -package net.Indyuce.mmocore.api.condition; +package net.Indyuce.mmocore.loot.condition; import java.util.List; import java.util.stream.Stream; diff --git a/src/main/java/net/Indyuce/mmocore/api/condition/DistanceCondition.java b/src/main/java/net/Indyuce/mmocore/loot/condition/DistanceCondition.java similarity index 96% rename from src/main/java/net/Indyuce/mmocore/api/condition/DistanceCondition.java rename to src/main/java/net/Indyuce/mmocore/loot/condition/DistanceCondition.java index 9b52203e..de9cef5e 100644 --- a/src/main/java/net/Indyuce/mmocore/api/condition/DistanceCondition.java +++ b/src/main/java/net/Indyuce/mmocore/loot/condition/DistanceCondition.java @@ -1,4 +1,4 @@ -package net.Indyuce.mmocore.api.condition; +package net.Indyuce.mmocore.loot.condition; import io.lumine.mythic.lib.api.MMOLineConfig; import org.apache.commons.lang.Validate; diff --git a/src/main/java/net/Indyuce/mmocore/api/condition/LevelCondition.java b/src/main/java/net/Indyuce/mmocore/loot/condition/LevelCondition.java similarity index 94% rename from src/main/java/net/Indyuce/mmocore/api/condition/LevelCondition.java rename to src/main/java/net/Indyuce/mmocore/loot/condition/LevelCondition.java index 9d121e7b..087a379f 100644 --- a/src/main/java/net/Indyuce/mmocore/api/condition/LevelCondition.java +++ b/src/main/java/net/Indyuce/mmocore/loot/condition/LevelCondition.java @@ -1,4 +1,4 @@ -package net.Indyuce.mmocore.api.condition; +package net.Indyuce.mmocore.loot.condition; import net.Indyuce.mmocore.api.player.PlayerData; import io.lumine.mythic.lib.api.MMOLineConfig; diff --git a/src/main/java/net/Indyuce/mmocore/api/condition/PermissionCondition.java b/src/main/java/net/Indyuce/mmocore/loot/condition/PermissionCondition.java similarity index 92% rename from src/main/java/net/Indyuce/mmocore/api/condition/PermissionCondition.java rename to src/main/java/net/Indyuce/mmocore/loot/condition/PermissionCondition.java index f6bd9f58..6a97e8ab 100644 --- a/src/main/java/net/Indyuce/mmocore/api/condition/PermissionCondition.java +++ b/src/main/java/net/Indyuce/mmocore/loot/condition/PermissionCondition.java @@ -1,4 +1,4 @@ -package net.Indyuce.mmocore.api.condition; +package net.Indyuce.mmocore.loot.condition; import io.lumine.mythic.lib.api.MMOLineConfig; import org.bukkit.entity.Player; diff --git a/src/main/java/net/Indyuce/mmocore/api/condition/WorldCondition.java b/src/main/java/net/Indyuce/mmocore/loot/condition/WorldCondition.java similarity index 91% rename from src/main/java/net/Indyuce/mmocore/api/condition/WorldCondition.java rename to src/main/java/net/Indyuce/mmocore/loot/condition/WorldCondition.java index 1985f732..955d0289 100644 --- a/src/main/java/net/Indyuce/mmocore/api/condition/WorldCondition.java +++ b/src/main/java/net/Indyuce/mmocore/loot/condition/WorldCondition.java @@ -1,4 +1,4 @@ -package net.Indyuce.mmocore.api.condition; +package net.Indyuce.mmocore.loot.condition; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/net/Indyuce/mmocore/loot/droptable/DropTable.java b/src/main/java/net/Indyuce/mmocore/loot/droptable/DropTable.java index dd8e4db2..aa7a602d 100644 --- a/src/main/java/net/Indyuce/mmocore/loot/droptable/DropTable.java +++ b/src/main/java/net/Indyuce/mmocore/loot/droptable/DropTable.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; -import net.Indyuce.mmocore.api.condition.Condition; -import net.Indyuce.mmocore.api.condition.ConditionInstance; +import net.Indyuce.mmocore.loot.condition.Condition; +import net.Indyuce.mmocore.loot.condition.ConditionInstance; import net.Indyuce.mmocore.loot.droptable.dropitem.DropItem; import org.apache.commons.lang.Validate; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/net/Indyuce/mmocore/loot/droptable/dropitem/DropTableDropItem.java b/src/main/java/net/Indyuce/mmocore/loot/droptable/dropitem/DropTableDropItem.java index 5b52a5a5..4f21174c 100644 --- a/src/main/java/net/Indyuce/mmocore/loot/droptable/dropitem/DropTableDropItem.java +++ b/src/main/java/net/Indyuce/mmocore/loot/droptable/dropitem/DropTableDropItem.java @@ -3,7 +3,7 @@ package net.Indyuce.mmocore.loot.droptable.dropitem; import io.lumine.mythic.lib.api.MMOLineConfig; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.loot.droptable.DropTable; -import net.Indyuce.mmocore.api.condition.ConditionInstance; +import net.Indyuce.mmocore.loot.condition.ConditionInstance; import net.Indyuce.mmocore.loot.LootBuilder; import net.Indyuce.mmocore.api.player.PlayerData; import org.apache.commons.lang.Validate; diff --git a/src/main/java/net/Indyuce/mmocore/manager/MMOLoadManager.java b/src/main/java/net/Indyuce/mmocore/manager/MMOLoadManager.java index 6f397d4f..4b9e4444 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/MMOLoadManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/MMOLoadManager.java @@ -11,7 +11,7 @@ import org.bukkit.configuration.ConfigurationSection; import com.google.gson.JsonParseException; import net.Indyuce.mmocore.api.block.BlockType; -import net.Indyuce.mmocore.api.condition.Condition; +import net.Indyuce.mmocore.loot.condition.Condition; import net.Indyuce.mmocore.loot.droptable.dropitem.DropItem; import net.Indyuce.mmocore.experience.source.type.ExperienceSource; import net.Indyuce.mmocore.api.load.DefaultMMOLoader; diff --git a/src/main/java/net/Indyuce/mmocore/manager/profession/CustomBlockManager.java b/src/main/java/net/Indyuce/mmocore/manager/profession/CustomBlockManager.java index 8264da46..57ddf5f7 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/profession/CustomBlockManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/profession/CustomBlockManager.java @@ -7,8 +7,8 @@ import net.Indyuce.mmocore.api.block.BlockInfo.RegeneratingBlock; import net.Indyuce.mmocore.api.block.BlockType; import net.Indyuce.mmocore.api.block.SkullBlockType; import net.Indyuce.mmocore.api.block.VanillaBlockType; -import net.Indyuce.mmocore.api.condition.Condition; -import net.Indyuce.mmocore.api.condition.ConditionInstance; +import net.Indyuce.mmocore.loot.condition.Condition; +import net.Indyuce.mmocore.loot.condition.ConditionInstance; import net.Indyuce.mmocore.api.util.MMOCoreUtils; import io.lumine.mythic.lib.api.MMOLineConfig; import org.bukkit.Bukkit; diff --git a/src/main/java/net/Indyuce/mmocore/manager/profession/FishingManager.java b/src/main/java/net/Indyuce/mmocore/manager/profession/FishingManager.java index d2d94a37..133de2ee 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/profession/FishingManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/profession/FishingManager.java @@ -4,8 +4,8 @@ import io.lumine.mythic.lib.api.MMOLineConfig; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.stats.StatType; -import net.Indyuce.mmocore.api.condition.Condition; -import net.Indyuce.mmocore.api.condition.ConditionInstance; +import net.Indyuce.mmocore.loot.condition.Condition; +import net.Indyuce.mmocore.loot.condition.ConditionInstance; import net.Indyuce.mmocore.loot.droptable.dropitem.fishing.FishingDropItem; import org.apache.commons.lang.Validate; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/net/Indyuce/mmocore/waypoint/Waypoint.java b/src/main/java/net/Indyuce/mmocore/waypoint/Waypoint.java index bbbd1ab3..288a8796 100644 --- a/src/main/java/net/Indyuce/mmocore/waypoint/Waypoint.java +++ b/src/main/java/net/Indyuce/mmocore/waypoint/Waypoint.java @@ -2,8 +2,8 @@ package net.Indyuce.mmocore.waypoint; import io.lumine.mythic.lib.api.MMOLineConfig; import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.condition.Condition; -import net.Indyuce.mmocore.api.condition.ConditionInstance; +import net.Indyuce.mmocore.loot.condition.Condition; +import net.Indyuce.mmocore.loot.condition.ConditionInstance; import net.Indyuce.mmocore.player.Unlockable; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit;