SacredRealms/SR-Game
1
0
Fork 0
Code Issues 19 Pull requests Projects 1 Releases Activity Actions

add of treasure and code moving around

Browse source
This commit is contained in:
unurled 2024-04-08 17:03:37 +02:00
parent e250eca841
commit cd84847c14
Signed by: unurled
GPG key ID: FDBC9CBE1F82423F
18 changed files with 19 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build.gradle.kts
View file

@ -63,7 +63,6 @@ tasks {
relocate("org.json", "libs.org.json")
exclude("org.slf4j")
relocate("redis", "libs.redis")
// minimize()
}
sonar {
properties {

3
src/main/java/me/unurled/sacredrealms/sr/data/gson/ClientBuildDeserializer.java → src/main/java/me/unurled/sacredrealms/sr/components/clientbuild/ClientBuildDeserializer.java
View file

@ -1,4 +1,4 @@
package me.unurled.sacredrealms.sr.data.gson;
package me.unurled.sacredrealms.sr.components.clientbuild;
import static me.unurled.sacredrealms.sr.utils.Logger.error;
@ -7,7 +7,6 @@ import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import java.lang.reflect.Type;
import me.unurled.sacredrealms.sr.components.clientbuild.ClientBuild;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;

2
src/main/java/me/unurled/sacredrealms/sr/components/clientbuild/ClientBuildManager.java
View file

@ -15,8 +15,6 @@ import me.unurled.sacredrealms.sr.SR;
import me.unurled.sacredrealms.sr.commands.admin.ClientBuildCommand;
import me.unurled.sacredrealms.sr.data.DataHandler;
import me.unurled.sacredrealms.sr.data.DataManager;
import me.unurled.sacredrealms.sr.data.gson.ClientBuildDeserializer;
import me.unurled.sacredrealms.sr.data.gson.ClientBuildSerializer;
import me.unurled.sacredrealms.sr.managers.Manager;
import org.bukkit.Bukkit;
import org.bukkit.Location;

3
src/main/java/me/unurled/sacredrealms/sr/data/gson/ClientBuildSerializer.java → src/main/java/me/unurled/sacredrealms/sr/components/clientbuild/ClientBuildSerializer.java
View file

@ -1,4 +1,4 @@
package me.unurled.sacredrealms.sr.data.gson;
package me.unurled.sacredrealms.sr.components.clientbuild;
import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;
@ -6,7 +6,6 @@ import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import java.lang.reflect.Type;
import java.util.Map.Entry;
import me.unurled.sacredrealms.sr.components.clientbuild.ClientBuild;
import org.bukkit.Location;
import org.bukkit.block.data.BlockData;

6
src/main/java/me/unurled/sacredrealms/sr/components/entity/EntityManager.java
View file

@ -8,11 +8,11 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
import me.unurled.sacredrealms.sr.components.item.ItemStackDeserializer;
import me.unurled.sacredrealms.sr.components.item.ItemStackSerializer;
import me.unurled.sacredrealms.sr.components.player.PotionEffectDeserializer;
import me.unurled.sacredrealms.sr.data.DataHandler;
import me.unurled.sacredrealms.sr.data.DataManager;
import me.unurled.sacredrealms.sr.data.gson.ItemStackDeserializer;
import me.unurled.sacredrealms.sr.data.gson.ItemStackSerializer;
import me.unurled.sacredrealms.sr.data.gson.PotionEffectDeserializer;
import me.unurled.sacredrealms.sr.managers.Manager;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Mob;

2
src/main/java/me/unurled/sacredrealms/sr/components/item/Item.java
View file

@ -14,8 +14,8 @@ import java.util.List;
import java.util.Map;
import me.unurled.sacredrealms.sr.components.attributes.Attribute;
import me.unurled.sacredrealms.sr.components.item.abilities.Ability;
import me.unurled.sacredrealms.sr.components.item.abilities.AbilityDeserializer;
import me.unurled.sacredrealms.sr.components.item.enchantments.Enchantment;
import me.unurled.sacredrealms.sr.data.gson.AbilityDeserializer;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;

3
src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemDeserializer.java → src/main/java/me/unurled/sacredrealms/sr/components/item/ItemDeserializer.java
View file

@ -1,11 +1,10 @@
package me.unurled.sacredrealms.sr.data.gson;
package me.unurled.sacredrealms.sr.components.item;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import java.lang.reflect.Type;
import me.unurled.sacredrealms.sr.components.item.Item;
public class ItemDeserializer implements JsonDeserializer<Item> {

2
src/main/java/me/unurled/sacredrealms/sr/components/item/ItemManager.java
View file

@ -6,8 +6,6 @@ import java.util.HashMap;
import java.util.List;
import me.unurled.sacredrealms.sr.data.DataHandler;
import me.unurled.sacredrealms.sr.data.DataManager;
import me.unurled.sacredrealms.sr.data.gson.ItemDeserializer;
import me.unurled.sacredrealms.sr.data.gson.ItemStackSerializer;
import me.unurled.sacredrealms.sr.managers.Manager;
import org.bukkit.NamespacedKey;
import org.bukkit.inventory.ItemStack;

3
src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemSerializer.java → src/main/java/me/unurled/sacredrealms/sr/components/item/ItemSerializer.java
View file

@ -1,11 +1,10 @@
package me.unurled.sacredrealms.sr.data.gson;
package me.unurled.sacredrealms.sr.components.item;
import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import java.lang.reflect.Type;
import me.unurled.sacredrealms.sr.components.item.Item;
public class ItemSerializer implements JsonSerializer<Item> {

2
src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemStackDeserializer.java → src/main/java/me/unurled/sacredrealms/sr/components/item/ItemStackDeserializer.java
View file

@ -1,4 +1,4 @@
package me.unurled.sacredrealms.sr.data.gson;
package me.unurled.sacredrealms.sr.components.item;
import com.google.gson.Gson;
import com.google.gson.JsonDeserializationContext;

2
src/main/java/me/unurled/sacredrealms/sr/data/gson/ItemStackSerializer.java → src/main/java/me/unurled/sacredrealms/sr/components/item/ItemStackSerializer.java
View file

@ -1,4 +1,4 @@
package me.unurled.sacredrealms.sr.data.gson;
package me.unurled.sacredrealms.sr.components.item;
import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;

3
src/main/java/me/unurled/sacredrealms/sr/data/gson/AbilityDeserializer.java → src/main/java/me/unurled/sacredrealms/sr/components/item/abilities/AbilityDeserializer.java
View file

@ -1,4 +1,4 @@
package me.unurled.sacredrealms.sr.data.gson;
package me.unurled.sacredrealms.sr.components.item.abilities;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
@ -6,7 +6,6 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import java.lang.reflect.Type;
import me.unurled.sacredrealms.sr.components.item.abilities.Ability;
public class AbilityDeserializer implements JsonDeserializer<Ability> {

3
src/main/java/me/unurled/sacredrealms/sr/data/gson/InventoryDeserializer.java → src/main/java/me/unurled/sacredrealms/sr/components/player/InventoryDeserializer.java
View file

@ -1,4 +1,4 @@
package me.unurled.sacredrealms.sr.data.gson;
package me.unurled.sacredrealms.sr.components.player;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@ -7,6 +7,7 @@ import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import java.lang.reflect.Type;
import me.unurled.sacredrealms.sr.components.item.ItemStackDeserializer;
import org.bukkit.Bukkit;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;

2
src/main/java/me/unurled/sacredrealms/sr/data/gson/InventorySerializer.java → src/main/java/me/unurled/sacredrealms/sr/components/player/InventorySerializer.java
View file

@ -1,4 +1,4 @@
package me.unurled.sacredrealms.sr.data.gson;
package me.unurled.sacredrealms.sr.components.player;
import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;

4
src/main/java/me/unurled/sacredrealms/sr/components/player/PlayerManager.java
View file

@ -11,10 +11,6 @@ import java.util.UUID;
import me.unurled.sacredrealms.sr.SR;
import me.unurled.sacredrealms.sr.data.DataHandler;
import me.unurled.sacredrealms.sr.data.DataManager;
import me.unurled.sacredrealms.sr.data.gson.InventoryDeserializer;
import me.unurled.sacredrealms.sr.data.gson.InventorySerializer;
import me.unurled.sacredrealms.sr.data.gson.PotionEffectDeserializer;
import me.unurled.sacredrealms.sr.data.gson.PotionEffectSerializer;
import me.unurled.sacredrealms.sr.events.player.PlayerLevelUpEvent;
import me.unurled.sacredrealms.sr.managers.Manager;
import me.unurled.sacredrealms.sr.utils.Items;

2
src/main/java/me/unurled/sacredrealms/sr/data/gson/PotionEffectDeserializer.java → src/main/java/me/unurled/sacredrealms/sr/components/player/PotionEffectDeserializer.java
View file

@ -1,4 +1,4 @@
package me.unurled.sacredrealms.sr.data.gson;
package me.unurled.sacredrealms.sr.components.player;
import static me.unurled.sacredrealms.sr.utils.Logger.error;

2
src/main/java/me/unurled/sacredrealms/sr/data/gson/PotionEffectSerializer.java → src/main/java/me/unurled/sacredrealms/sr/components/player/PotionEffectSerializer.java
View file

@ -1,4 +1,4 @@
package me.unurled.sacredrealms.sr.data.gson;
package me.unurled.sacredrealms.sr.components.player;
import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;

4
src/main/java/me/unurled/sacredrealms/sr/managers/Managers.java
View file

@ -12,6 +12,7 @@ import me.unurled.sacredrealms.sr.components.combat.CombatManager;
import me.unurled.sacredrealms.sr.components.entity.EntityManager;
import me.unurled.sacredrealms.sr.components.item.ItemManager;
import me.unurled.sacredrealms.sr.components.player.PlayerManager;
import me.unurled.sacredrealms.sr.components.treasure.TreasureManager;
import me.unurled.sacredrealms.sr.data.DataManager;
import org.bukkit.Bukkit;
import org.jetbrains.annotations.Nullable;
@ -32,7 +33,8 @@ public class Managers {
CombatManager.class,
CommandManager.class,
EntityManager.class,
ClientBuildManager.class));
ClientBuildManager.class,
TreasureManager.class));
}
private void register(List<Class<? extends Manager>> clazz) {