mirror of
https://github.com/DRE2N/DungeonsXL.git
synced 2024-11-04 17:59:31 +01:00
Update to Caliburn 1.0
This commit is contained in:
Daniel Saukel
parent
d56379b523
commit
82d38a4432
@ -17,7 +17,6 @@
|
||||
package de.erethon.dungeonsxl;
|
||||
|
||||
import de.erethon.caliburn.CaliburnAPI;
|
||||
import de.erethon.caliburn.loottable.LootTable;
|
||||
import de.erethon.caliburn.mob.ExMob;
|
||||
import de.erethon.commons.chat.MessageUtil;
|
||||
import de.erethon.commons.compatibility.Internals;
|
||||
@ -60,7 +59,6 @@ import de.erethon.dungeonsxl.mob.CitizensMobProvider;
|
||||
import de.erethon.dungeonsxl.mob.CustomExternalMobProvider;
|
||||
import de.erethon.dungeonsxl.mob.DMob;
|
||||
import de.erethon.dungeonsxl.mob.DMobListener;
|
||||
import de.erethon.dungeonsxl.mob.DMobType;
|
||||
import de.erethon.dungeonsxl.mob.ExternalMobPlugin;
|
||||
import de.erethon.dungeonsxl.player.DGamePlayer;
|
||||
import de.erethon.dungeonsxl.player.DGlobalPlayer;
|
||||
@ -114,8 +112,6 @@ public class DungeonsXL extends DREPlugin implements DungeonsAPI {
|
||||
|
||||
public static final String[] EXCLUDED_FILES = {"config.yml", "uid.dat", "DXLData.data", "data"};
|
||||
public static final File ANNOUNCERS = new File(SCRIPTS, "announcers");
|
||||
public static final File LOOT_TABLES = new File(SCRIPTS, "loottables");
|
||||
public static final File MOBS = new File(SCRIPTS, "mobs");
|
||||
public static final File SIGNS = new File(SCRIPTS, "signs");
|
||||
public static final File COMMANDS = new File(SCRIPTS, "commands");
|
||||
public static final Map<String, Class<? extends DungeonSign>> LEGACY_SIGNS = new HashMap<>();
|
||||
@ -210,7 +206,9 @@ public class DungeonsXL extends DREPlugin implements DungeonsAPI {
|
||||
|
||||
instance = this;
|
||||
initFolders();
|
||||
loadCaliburnAPI();
|
||||
caliburn = CaliburnAPI.getInstance() == null ? new CaliburnAPI(this) : CaliburnAPI.getInstance();
|
||||
caliburn.loadDataFiles();
|
||||
caliburn.finishInitialization();
|
||||
DPermission.register();
|
||||
loadConfig();
|
||||
createCaches();
|
||||
@ -249,8 +247,6 @@ public class DungeonsXL extends DREPlugin implements DungeonsAPI {
|
||||
ANNOUNCERS.mkdir();
|
||||
CLASSES.mkdir();
|
||||
DUNGEONS.mkdir();
|
||||
LOOT_TABLES.mkdir();
|
||||
MOBS.mkdir();
|
||||
SIGNS.mkdir();
|
||||
COMMANDS.mkdir();
|
||||
}
|
||||
@ -472,16 +468,6 @@ public class DungeonsXL extends DREPlugin implements DungeonsAPI {
|
||||
return caliburn;
|
||||
}
|
||||
|
||||
private void loadCaliburnAPI() {
|
||||
caliburn = CaliburnAPI.getInstance() == null ? new CaliburnAPI(this) : CaliburnAPI.getInstance();
|
||||
if (LOOT_TABLES.isDirectory()) {
|
||||
FileUtil.getFilesForFolder(LOOT_TABLES).forEach(s -> new LootTable(caliburn, s));
|
||||
}
|
||||
if (MOBS.isDirectory()) {
|
||||
FileUtil.getFilesForFolder(MOBS).forEach(s -> caliburn.getExMobs().add(new DMobType(this, s)));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public PlayerCache getPlayerCache() {
|
||||
return playerCache;
|
||||
|
||||
@ -28,12 +28,10 @@ import de.erethon.dungeonsxl.dungeon.DGame;
|
||||
import de.erethon.dungeonsxl.trigger.MobTrigger;
|
||||
import de.erethon.dungeonsxl.trigger.WaveTrigger;
|
||||
import de.erethon.dungeonsxl.world.DGameWorld;
|
||||
import java.util.Random;
|
||||
import java.util.Set;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.event.entity.EntityDeathEvent;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
/**
|
||||
* @author Frank Baumann, Milan Albrecht, Daniel Saukel
|
||||
@ -115,18 +113,7 @@ public class DMob implements DungeonMob {
|
||||
return;
|
||||
}
|
||||
|
||||
if (type instanceof DMobType) {
|
||||
event.getDrops().clear();
|
||||
|
||||
for (ItemStack itemStack : ((DMobType) type).getDrops().keySet()) {
|
||||
Random randomGenerator = new Random();
|
||||
int random = randomGenerator.nextInt(100);
|
||||
|
||||
if (((DMobType) type).getDrops().get(itemStack) > random) {
|
||||
event.getDrops().add(itemStack);
|
||||
}
|
||||
}
|
||||
|
||||
if (!isExternalMob()) {
|
||||
name = type.getId();
|
||||
|
||||
} else if (isExternalMob() && trigger != null) {
|
||||
|
||||
@ -1,404 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2012-2020 Frank Baumann
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.erethon.dungeonsxl.mob;
|
||||
|
||||
import de.erethon.caliburn.CaliburnAPI;
|
||||
import de.erethon.caliburn.item.ExItem;
|
||||
import de.erethon.caliburn.mob.ExMob;
|
||||
import de.erethon.commons.chat.MessageUtil;
|
||||
import de.erethon.commons.misc.EnumUtil;
|
||||
import de.erethon.commons.misc.NumberUtil;
|
||||
import de.erethon.dungeonsxl.DungeonsXL;
|
||||
import de.erethon.dungeonsxl.api.world.GameWorld;
|
||||
import java.io.File;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.configuration.ConfigurationSection;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.enchantments.Enchantment;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Ocelot;
|
||||
import org.bukkit.entity.Skeleton;
|
||||
import org.bukkit.entity.Skeleton.SkeletonType;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.meta.ItemMeta;
|
||||
|
||||
/**
|
||||
* @author Frank Baumann, Milan Albrecht, Daniel Saukel
|
||||
*/
|
||||
@Deprecated
|
||||
public class DMobType extends ExMob {
|
||||
|
||||
private DungeonsXL plugin;
|
||||
private CaliburnAPI caliburn;
|
||||
|
||||
private String name;
|
||||
private EntityType type;
|
||||
|
||||
private int maxHealth;
|
||||
|
||||
private ItemStack itemHand;
|
||||
private ItemStack itemHelmet;
|
||||
private ItemStack itemChestplate;
|
||||
private ItemStack itemLeggings;
|
||||
private ItemStack itemBoots;
|
||||
|
||||
private Map<ItemStack, Integer> drops = new HashMap<>();
|
||||
|
||||
/* Extra Values for different Mob Types */
|
||||
private boolean witherSkeleton = false;
|
||||
private String ocelotType = null;
|
||||
|
||||
/**
|
||||
* @param plugin the plugin instance
|
||||
* @param file the script file
|
||||
*/
|
||||
public DMobType(DungeonsXL plugin, File file) {
|
||||
this(plugin, file.getName().substring(0, file.getName().length() - 4), YamlConfiguration.loadConfiguration(file));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param plugin the plugin instance
|
||||
* @param name the name of the DMobType
|
||||
* @param config the config that stores the information
|
||||
*/
|
||||
public DMobType(DungeonsXL plugin, String name, FileConfiguration config) {
|
||||
this.plugin = plugin;
|
||||
caliburn = plugin.getCaliburn();
|
||||
|
||||
this.name = name;
|
||||
|
||||
// Read Mobs
|
||||
type = EntityType.fromName(config.getString("type"));
|
||||
|
||||
// Load MaxHealth
|
||||
if (config.contains("maxHealth")) {
|
||||
maxHealth = config.getInt("maxHealth");
|
||||
}
|
||||
|
||||
// Load Items
|
||||
ExItem itemHelmet = caliburn.deserializeExItem(config, "itemHelmet");
|
||||
if (itemHelmet != null) {
|
||||
this.itemHelmet = itemHelmet.toItemStack();
|
||||
}
|
||||
|
||||
ExItem itemChestplate = caliburn.deserializeExItem(config, "itemChestplate");
|
||||
if (itemChestplate != null) {
|
||||
this.itemChestplate = itemChestplate.toItemStack();
|
||||
}
|
||||
|
||||
ExItem itemBoots = caliburn.deserializeExItem(config, "itemBoots");
|
||||
if (itemBoots != null) {
|
||||
this.itemBoots = itemBoots.toItemStack();
|
||||
}
|
||||
|
||||
ExItem itemLeggings = caliburn.deserializeExItem(config, "itemLeggings");
|
||||
if (itemLeggings != null) {
|
||||
this.itemLeggings = itemLeggings.toItemStack();
|
||||
}
|
||||
|
||||
ExItem itemHand = caliburn.deserializeExItem(config, "itemHand");
|
||||
if (itemHand != null) {
|
||||
this.itemHand = itemHand.toItemStack();
|
||||
}
|
||||
|
||||
// Load different Mob options
|
||||
witherSkeleton = config.getBoolean("isWitherSkeleton", false);
|
||||
|
||||
ocelotType = config.getString("ocelotType", null);
|
||||
|
||||
// Drops
|
||||
ConfigurationSection configSetion = config.getConfigurationSection("drops");
|
||||
if (configSetion != null) {
|
||||
Set<String> list = configSetion.getKeys(false);
|
||||
for (String dropPath : list) {
|
||||
ItemStack item = null;
|
||||
ItemMeta itemMeta = null;
|
||||
int chance = 100;
|
||||
|
||||
/* Item Stack */
|
||||
ExItem mat = caliburn.deserializeExItem(configSetion, dropPath + ".id");
|
||||
int amount = 1;
|
||||
short data = 0;
|
||||
|
||||
if (configSetion.contains(dropPath + ".amount")) {
|
||||
amount = configSetion.getInt(dropPath + ".amount");
|
||||
}
|
||||
if (configSetion.contains(dropPath + ".data")) {
|
||||
data = Short.parseShort(configSetion.getString(dropPath + ".data"));
|
||||
}
|
||||
|
||||
item = mat.toItemStack(amount);
|
||||
item.setDurability(data);
|
||||
itemMeta = item.getItemMeta();
|
||||
|
||||
/* Enchantments */
|
||||
if (configSetion.contains(dropPath + ".enchantments")) {
|
||||
for (String enchantment : configSetion.getStringList(dropPath + ".enchantments")) {
|
||||
String[] splittedEnchantment = enchantment.split(" ");
|
||||
if (Enchantment.getByName(splittedEnchantment[0].toUpperCase()) != null) {
|
||||
if (splittedEnchantment.length > 1) {
|
||||
itemMeta.addEnchant(Enchantment.getByName(splittedEnchantment[0].toUpperCase()), NumberUtil.parseInt(splittedEnchantment[1]), true);
|
||||
} else {
|
||||
itemMeta.addEnchant(Enchantment.getByName(splittedEnchantment[0].toUpperCase()), 1, true);
|
||||
}
|
||||
} else {
|
||||
MessageUtil.log("&4An error occurred while loading mob.yml: Enchantment &6" + splittedEnchantment[0] + "&4 doesn''t exist!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Item Name */
|
||||
if (configSetion.contains(dropPath + ".name")) {
|
||||
itemMeta.setDisplayName(configSetion.getString(dropPath + ".name"));
|
||||
}
|
||||
|
||||
/* Item Lore */
|
||||
if (configSetion.contains(dropPath + ".lore")) {
|
||||
String[] lore = configSetion.getString(dropPath + ".lore").split("//");
|
||||
itemMeta.setLore(Arrays.asList(lore));
|
||||
}
|
||||
|
||||
/* Drop chance */
|
||||
if (configSetion.contains(dropPath + ".chance")) {
|
||||
chance = configSetion.getInt(dropPath + ".chance");
|
||||
}
|
||||
|
||||
/* Add Item to the drops map */
|
||||
item.setItemMeta(itemMeta);
|
||||
drops.put(item, chance);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param name the name of the DMobType
|
||||
* @param type the EntityType of the mob
|
||||
*/
|
||||
public DMobType(String name, EntityType type) {
|
||||
this.name = name;
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
/* Getters and setters */
|
||||
@Override
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param name the name to set
|
||||
*/
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the type
|
||||
*/
|
||||
public EntityType getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param type the type to set
|
||||
*/
|
||||
public void setType(EntityType type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the maxHealth
|
||||
*/
|
||||
public int getMaxHealth() {
|
||||
return maxHealth;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param maxHealth the maxHealth to set
|
||||
*/
|
||||
public void setMaxHealth(int maxHealth) {
|
||||
this.maxHealth = maxHealth;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the itemHand
|
||||
*/
|
||||
public ItemStack getitemHand() {
|
||||
return itemHand;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param itemHand the itemHand to set
|
||||
*/
|
||||
public void setitemHand(ItemStack itemHand) {
|
||||
this.itemHand = itemHand;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the itemHelmet
|
||||
*/
|
||||
public ItemStack getitemHelmet() {
|
||||
return itemHelmet;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param itemHelmet the itemHelmet to set
|
||||
*/
|
||||
public void setitemHelmet(ItemStack itemHelmet) {
|
||||
this.itemHelmet = itemHelmet;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the itemChestplate
|
||||
*/
|
||||
public ItemStack getitemChestplate() {
|
||||
return itemChestplate;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param itemChestplate the itemChestplate to set
|
||||
*/
|
||||
public void setitemChestplate(ItemStack itemChestplate) {
|
||||
this.itemChestplate = itemChestplate;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the itemLeggings
|
||||
*/
|
||||
public ItemStack getitemLeggings() {
|
||||
return itemLeggings;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param itemLeggings the itemLeggings to set
|
||||
*/
|
||||
public void setitemLeggings(ItemStack itemLeggings) {
|
||||
this.itemLeggings = itemLeggings;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the itemBoots
|
||||
*/
|
||||
public ItemStack getitemBoots() {
|
||||
return itemBoots;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param itemBoots the itemBoots to set
|
||||
*/
|
||||
public void setitemBoots(ItemStack itemBoots) {
|
||||
this.itemBoots = itemBoots;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the drops
|
||||
*/
|
||||
public Map<ItemStack, Integer> getDrops() {
|
||||
return drops;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param drops the drops to set
|
||||
*/
|
||||
public void setDrops(Map<ItemStack, Integer> drops) {
|
||||
this.drops = drops;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return if the skeleton is a wither skeleton
|
||||
*/
|
||||
public boolean isWitherSkeleton() {
|
||||
return witherSkeleton;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param witherSkeleton set if the skeleton is a wither skeleton
|
||||
*/
|
||||
public void setWitherSkeleton(boolean witherSkeleton) {
|
||||
this.witherSkeleton = witherSkeleton;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the ocelotType
|
||||
*/
|
||||
public String getOcelotType() {
|
||||
return ocelotType;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param ocelotType the ocelotType to set
|
||||
*/
|
||||
public void setOcelotType(String ocelotType) {
|
||||
this.ocelotType = ocelotType;
|
||||
}
|
||||
|
||||
/* Actions */
|
||||
@Override
|
||||
public Entity toEntity(Location loc) {
|
||||
World world = loc.getWorld();
|
||||
GameWorld gameWorld = plugin.getGameWorld(world);
|
||||
if (gameWorld == null) {
|
||||
return null;
|
||||
}
|
||||
LivingEntity entity = (LivingEntity) world.spawnEntity(loc, type);
|
||||
|
||||
/* Set the Items */
|
||||
entity.getEquipment().setItemInHand(itemHand);
|
||||
entity.getEquipment().setHelmet(itemHelmet);
|
||||
entity.getEquipment().setChestplate(itemChestplate);
|
||||
entity.getEquipment().setLeggings(itemLeggings);
|
||||
entity.getEquipment().setBoots(itemBoots);
|
||||
|
||||
/* Check mob specified stuff */
|
||||
if (type == EntityType.SKELETON) {
|
||||
if (witherSkeleton) {
|
||||
((Skeleton) entity).setSkeletonType(SkeletonType.WITHER);
|
||||
} else {
|
||||
((Skeleton) entity).setSkeletonType(SkeletonType.NORMAL);
|
||||
}
|
||||
}
|
||||
|
||||
if (type == EntityType.OCELOT) {
|
||||
Ocelot ocelot = (Ocelot) entity;
|
||||
if (EnumUtil.isValidEnum(Ocelot.Type.class, ocelotType.toUpperCase())) {
|
||||
ocelot.setCatType(Ocelot.Type.valueOf(ocelotType.toUpperCase()));
|
||||
}
|
||||
}
|
||||
|
||||
/* Set Health */
|
||||
if (maxHealth > 0) {
|
||||
entity.setMaxHealth(maxHealth);
|
||||
entity.setHealth(maxHealth);
|
||||
}
|
||||
|
||||
/* Disable Despawning */
|
||||
entity.setRemoveWhenFarAway(false);
|
||||
|
||||
/* Spawn Mob */
|
||||
new DMob(entity, gameWorld, this);
|
||||
return entity;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user