Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-02-02 11:21:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed 1.12 references

Browse Source
This commit is contained in:
Indyuce 2020-08-10 16:28:59 +02:00
parent 044111b428
commit 481f328a98
9 changed files with 59 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/Indyuce/mmoitems/MMOItems.java
View File

@ -65,7 +65,6 @@ import net.Indyuce.mmoitems.listener.DurabilityListener;
import net.Indyuce.mmoitems.listener.ElementListener;
import net.Indyuce.mmoitems.listener.ItemUse;
import net.Indyuce.mmoitems.listener.PlayerListener;
import net.Indyuce.mmoitems.listener.version.Listener_v1_13;
import net.Indyuce.mmoitems.manager.AbilityManager;
import net.Indyuce.mmoitems.manager.BlockManager;
import net.Indyuce.mmoitems.manager.ConfigManager;
@ -82,7 +81,6 @@ import net.Indyuce.mmoitems.manager.TypeManager;
import net.Indyuce.mmoitems.manager.UpdaterManager;
import net.Indyuce.mmoitems.manager.UpgradeManager;
import net.Indyuce.mmoitems.manager.WorldGenManager;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.player.MMOPlayerData;
import net.mmogroup.mmolib.version.SpigotPlugin;
@ -118,7 +116,7 @@ public class MMOItems extends JavaPlugin {
plugin = this;
try {
if (getServer().getPluginManager().getPlugin("WorldGuard") != null && MMOLib.plugin.getVersion().isStrictlyHigher(1, 12)) {
if (getServer().getPluginManager().getPlugin("WorldGuard") != null) {
flagPlugin = new WorldGuardFlags();
getLogger().log(Level.INFO, "Hooked onto WorldGuard");
}
@ -151,10 +149,8 @@ public class MMOItems extends JavaPlugin {
upgradeManager = new UpgradeManager();
dropTableManager = new DropTableManager();
dynamicUpdater = new UpdaterManager();
if (MMOLib.plugin.getVersion().isStrictlyHigher(1, 12)) {
worldGenManager = new WorldGenManager();
blockManager = new BlockManager();
}
worldGenManager = new WorldGenManager();
blockManager = new BlockManager();
if (Bukkit.getPluginManager().getPlugin("Vault") != null) {
new VaultSupport();
@ -175,10 +171,7 @@ public class MMOItems extends JavaPlugin {
Bukkit.getPluginManager().registerEvents(new GuiListener(), this);
Bukkit.getPluginManager().registerEvents(new ElementListener(), this);
Bukkit.getPluginManager().registerEvents(new CraftingListener(), this);
if (MMOLib.plugin.getVersion().isStrictlyHigher(1, 12)) {
Bukkit.getPluginManager().registerEvents(new CustomBlockListener(), this);
Bukkit.getPluginManager().registerEvents(new Listener_v1_13(), this);
}
Bukkit.getPluginManager().registerEvents(new CustomBlockListener(), this);
/*
* this class implements the Listener, if the option

4
src/main/java/net/Indyuce/mmoitems/ability/Hoearthquake.java
View File

@ -16,7 +16,6 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.MMOLib;
public class Hoearthquake extends Ability {
public Hoearthquake() {
@ -25,9 +24,6 @@ public class Hoearthquake extends Ability {
addModifier("cooldown", 10);
addModifier("mana", 0);
addModifier("stamina", 0);
if (!MMOLib.plugin.getVersion().isBelowOrEqual(1, 12))
disable();
}
@Override

22
src/main/java/net/Indyuce/mmoitems/command/MMOItemsCommand.java
View File

@ -540,19 +540,17 @@ public class MMOItemsCommand implements CommandExecutor {
MMOItems.plugin.getSets().reload();
MMOItems.plugin.getUpgrades().reload();
MMOItems.plugin.getItems().reload();
if (MMOLib.plugin.getVersion().isStrictlyHigher(1, 12)) {
MMOItems.plugin.getWorldGen().reload();
MMOItems.plugin.getCustomBlocks().reload();
}
MMOItems.plugin.getWorldGen().reload();
MMOItems.plugin.getCustomBlocks().reload();
MMOItems.plugin.getItems().reload();
sender.sendMessage(MMOItems.plugin.getPrefix() + MMOItems.plugin.getName() + " "
+ MMOItems.plugin.getDescription().getVersion() + " reloaded.");
sender.sendMessage(MMOItems.plugin.getPrefix() + "- " + ChatColor.RED
+ MMOItems.plugin.getTypes().getAll().size() + ChatColor.GRAY + " Item Types");
sender.sendMessage(MMOItems.plugin.getPrefix() + "- " + ChatColor.RED
+ MMOItems.plugin.getTiers().getAll().size() + ChatColor.GRAY + " Item Tiers");
sender.sendMessage(MMOItems.plugin.getPrefix() + "- " + ChatColor.RED
+ MMOItems.plugin.getSets().getAll().size() + ChatColor.GRAY + " Item Sets");
sender.sendMessage(
MMOItems.plugin.getPrefix() + MMOItems.plugin.getName() + " " + MMOItems.plugin.getDescription().getVersion() + " reloaded.");
sender.sendMessage(
MMOItems.plugin.getPrefix() + "- " + ChatColor.RED + MMOItems.plugin.getTypes().getAll().size() + ChatColor.GRAY + " Item Types");
sender.sendMessage(
MMOItems.plugin.getPrefix() + "- " + ChatColor.RED + MMOItems.plugin.getTiers().getAll().size() + ChatColor.GRAY + " Item Tiers");
sender.sendMessage(
MMOItems.plugin.getPrefix() + "- " + ChatColor.RED + MMOItems.plugin.getSets().getAll().size() + ChatColor.GRAY + " Item Sets");
}
// ==================================================================================================================================
else if (args[0].equalsIgnoreCase("copy")) {

4
src/main/java/net/Indyuce/mmoitems/comp/mmocore/load/MMOItemsBlockType.java
View File

@ -7,7 +7,6 @@ import net.Indyuce.mmocore.api.block.BlockInfo.RegeneratingBlock;
import net.Indyuce.mmocore.api.block.BlockType;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.block.CustomBlock;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.MMOLineConfig;
public class MMOItemsBlockType implements BlockType {
@ -31,8 +30,7 @@ public class MMOItemsBlockType implements BlockType {
public void place(Location loc, RegeneratingBlock regenerating) {
CustomBlock block = MMOItems.plugin.getCustomBlocks().getBlock(id);
loc.getBlock().setType(block.getState().getType());
if (MMOLib.plugin.getVersion().isStrictlyHigher(1, 12))
loc.getBlock().setBlockData(block.getState().getBlockData());
loc.getBlock().setBlockData(block.getState().getBlockData());
}
public static boolean matches(Block block) {

47
src/main/java/net/Indyuce/mmoitems/gui/ItemBrowser.java
View File

@ -99,15 +99,6 @@ public class ItemBrowser extends PluginInventory {
ItemStack switchBrowse = new ItemStack(Material.STONE);
ItemMeta switchMeta = switchBrowse.getItemMeta();
switchMeta.setDisplayName(ChatColor.GREEN + "Switch to Block Explorer");
if (!MMOLib.plugin.getVersion().isStrictlyHigher(1, 12)) {
List<String> lore = new ArrayList<String>();
lore.add("");
lore.add("&cThis feature is disabled.");
lore.add("&cUpdating to 1.13+ is recommended.");
switchMeta.setLore(lore);
}
switchBrowse.setItemMeta(switchMeta);
while (n < slots.length)
@ -233,55 +224,40 @@ public class ItemBrowser extends PluginInventory {
if (item.getItemMeta().getDisplayName().equals(ChatColor.GREEN + "Next Page")) {
page++;
open();
return;
}
if (item.getItemMeta().getDisplayName().equals(ChatColor.GREEN + "Previous Page")) {
else if (item.getItemMeta().getDisplayName().equals(ChatColor.GREEN + "Previous Page")) {
page--;
open();
return;
}
if (item.getItemMeta().getDisplayName().equals(ChatColor.GREEN + AltChar.rightArrow + " Back"))
else if (item.getItemMeta().getDisplayName().equals(ChatColor.GREEN + AltChar.rightArrow + " Back"))
new ItemBrowser(getPlayer()).open();
if (item.getItemMeta().getDisplayName().equals(ChatColor.GREEN + "Switch to Block Explorer")) {
if (MMOLib.plugin.getVersion().isStrictlyHigher(1, 12))
new ItemBrowser(getPlayer(), Type.BLOCK).open();
else
getPlayer().sendMessage(ChatColor.RED + "Blocks are only for 1.13+.");
return;
}
else if (item.getItemMeta().getDisplayName().equals(ChatColor.GREEN + "Switch to Block Explorer"))
new ItemBrowser(getPlayer(), Type.BLOCK).open();
if (item.getItemMeta().getDisplayName().equals(ChatColor.RED + "Cancel Deletion")) {
else if (item.getItemMeta().getDisplayName().equals(ChatColor.RED + "Cancel Deletion")) {
deleteMode = false;
open();
}
if (item.getItemMeta().getDisplayName().equals(ChatColor.GREEN + "Create New"))
else if (item.getItemMeta().getDisplayName().equals(ChatColor.GREEN + "Create New"))
new NewItemEdition(this).enable("Write in the chat the text you want.");
if (type != null && item.getItemMeta().getDisplayName().equals(ChatColor.RED + "Delete Item")) {
else if (type != null && item.getItemMeta().getDisplayName().equals(ChatColor.RED + "Delete Item")) {
deleteMode = true;
open();
}
if (item.getItemMeta().getDisplayName().equals(ChatColor.GREEN + "Download Default Resourcepack")) {
else if (item.getItemMeta().getDisplayName().equals(ChatColor.GREEN + "Download Default Resourcepack")) {
MMOLib.plugin.getVersion().getWrapper().sendJson(getPlayer(),
"[{\"text\":\"Click to download!\",\"color\":\"green\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://mythiccraft.io/resources/MICustomBlockPack.zip\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":[\"\",{\"text\":\"https://drive.google.com/uc?id=1FjV7y-2cn8qzSiktZ2CUXmkdjepXdj5N\",\"italic\":true,\"color\":\"white\"}]}}]");
getPlayer().closeInventory();
return;
}
if (type == null && !item.getItemMeta().getDisplayName().equals(ChatColor.RED + "- No type -")) {
Type type = MMOItems.plugin.getTypes().get(NBTItem.get(item).getString("typeId"));
if (type == Type.BLOCK && !MMOLib.plugin.getVersion().isStrictlyHigher(1, 12)) {
getPlayer().sendMessage(ChatColor.RED + "Blocks are only for 1.13+.");
return;
}
new ItemBrowser(getPlayer(), type).open();
}
else if (type == null && !item.getItemMeta().getDisplayName().equals(ChatColor.RED + "- No type -"))
new ItemBrowser(getPlayer(), MMOItems.plugin.getTypes().get(NBTItem.get(item).getString("typeId"))).open();
}
String id = NBTItem.get(item).getString("MMOITEMS_ITEM_ID");
@ -298,8 +274,7 @@ public class ItemBrowser extends PluginInventory {
} else {
if (event.getAction() == InventoryAction.PICKUP_ALL) {
// this refreshes the item if it's unstackable
ItemStack generatedItem = (NBTItem.get(item).getBoolean("UNSTACKABLE"))
? MMOItems.plugin.getItem(type, id, playerData)
ItemStack generatedItem = (NBTItem.get(item).getBoolean("UNSTACKABLE")) ? MMOItems.plugin.getItem(type, id, playerData)
: removeLastLoreLines(item, 3);
getPlayer().getInventory().addItem(generatedItem);
getPlayer().playSound(getPlayer().getLocation(), Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 2);

30
src/main/java/net/Indyuce/mmoitems/listener/PlayerListener.java
View File

@ -2,24 +2,31 @@ package net.Indyuce.mmoitems.listener;
import java.util.Iterator;
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Trident;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.entity.ProjectileLaunchEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.inventory.ItemStack;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.MMOUtils;
import net.Indyuce.mmoitems.api.ItemAttackResult;
import net.Indyuce.mmoitems.api.SoulboundInfo;
import net.Indyuce.mmoitems.api.Type;
import net.Indyuce.mmoitems.api.ability.Ability.CastingMode;
import net.Indyuce.mmoitems.api.interaction.util.InteractItem;
import net.Indyuce.mmoitems.api.interaction.weapon.Weapon;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.DamageType;
@ -100,4 +107,27 @@ public class PlayerListener implements Listener {
public void readSoulbound(PlayerRespawnEvent event) {
SoulboundInfo.read(event.getPlayer());
}
@EventHandler
public void registerProjectiles(ProjectileLaunchEvent event) {
if (!(event.getEntity() instanceof Trident) || !(event.getEntity().getShooter() instanceof Player))
return;
InteractItem item = new InteractItem((Player) event.getEntity().getShooter(), Material.TRIDENT);
if (!item.hasItem())
return;
NBTItem nbtItem = MMOLib.plugin.getVersion().getWrapper().getNBTItem(item.getItem());
Type type = nbtItem.getType();
PlayerData playerData = PlayerData.get((Player) event.getEntity().getShooter());
if (type != null)
if (!new Weapon(playerData, nbtItem, type).canBeUsed()) {
event.setCancelled(true);
return;
}
MMOItems.plugin.getEntities().registerCustomProjectile(nbtItem, playerData.getStats().newTemporary(), (Trident) event.getEntity(),
type != null);
}
}

40
src/main/java/net/Indyuce/mmoitems/listener/version/Listener_v1_13.java
View File

@ -1,40 +0,0 @@
package net.Indyuce.mmoitems.listener.version;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.entity.Trident;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.ProjectileLaunchEvent;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.Type;
import net.Indyuce.mmoitems.api.interaction.util.InteractItem;
import net.Indyuce.mmoitems.api.interaction.weapon.Weapon;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.item.NBTItem;
public class Listener_v1_13 implements Listener {
@EventHandler
public void a(ProjectileLaunchEvent event) {
if (!(event.getEntity() instanceof Trident) || !(event.getEntity().getShooter() instanceof Player))
return;
InteractItem item = new InteractItem((Player) event.getEntity().getShooter(), Material.TRIDENT);
if (!item.hasItem())
return;
NBTItem nbtItem = MMOLib.plugin.getVersion().getWrapper().getNBTItem(item.getItem());
Type type = nbtItem.getType();
PlayerData playerData = PlayerData.get((Player) event.getEntity().getShooter());
if (type != null)
if (!new Weapon(playerData, nbtItem, type).canBeUsed()) {
event.setCancelled(true);
return;
}
MMOItems.plugin.getEntities().registerCustomProjectile(nbtItem, playerData.getStats().newTemporary(), (Trident) event.getEntity(), type != null);
}
}

8
src/main/java/net/Indyuce/mmoitems/manager/DropTableManager.java
View File

@ -93,10 +93,7 @@ public class DropTableManager implements Listener {
return;
Block block = event.getBlock();
Optional<CustomBlock> opt = MMOLib.plugin.getVersion().isStrictlyHigher(1, 12)
? MMOItems.plugin.getCustomBlocks().getFromBlock(block.getBlockData())
: Optional.empty();
Optional<CustomBlock> opt = MMOItems.plugin.getCustomBlocks().getFromBlock(block.getBlockData());
if (opt.isPresent()) {
CustomBlock customBlock = opt.get();
@ -135,8 +132,7 @@ public class DropTableManager implements Listener {
// public Collection<ItemStack> getBlockDrops(Block block, Player player) {
// final Material type = block.getType();
//
// CustomBlock custom = MMOLib.plugin.getVersion().isStrictlyHigher(1, 12) ?
// CustomBlock.getFromData(block.getBlockData()) : null;
// CustomBlock custom = CustomBlock.getFromData(block.getBlockData()) ;
// if (custom != null) {
// if (customBlocks.containsKey(custom.getId())) {
// if (CustomBlockListener.getPickaxePower(player) >=

4
src/main/java/net/Indyuce/mmoitems/stat/AttackSpeed.java
View File

@ -7,15 +7,13 @@ import net.Indyuce.mmoitems.api.util.StatFormat;
import net.Indyuce.mmoitems.stat.data.DoubleData;
import net.Indyuce.mmoitems.stat.data.type.StatData;
import net.Indyuce.mmoitems.stat.type.AttributeStat;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.version.VersionMaterial;
public class AttackSpeed extends AttributeStat {
public AttackSpeed() {
super("ATTACK_SPEED", VersionMaterial.LIGHT_GRAY_DYE.toItem(), "Attack Speed",
new String[] { "The speed at which your weapon strikes.", "In attacks/sec." }, Attribute.GENERIC_ATTACK_SPEED,
MMOLib.plugin.getVersion().isBelowOrEqual(1, 12) ? 1.6 : 4);
new String[] { "The speed at which your weapon strikes.", "In attacks/sec." }, Attribute.GENERIC_ATTACK_SPEED, 4);
}
@Override