diff --git a/build.gradle b/build.gradle index d329615..2351a18 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,7 @@ repositories { maven {name = 'bg-software repo'; url = 'https://repo.bg-software.com/repository/api/'} maven {name = 'aswm repo'; url = 'https://repo.infernalsuite.com/repository/maven-snapshots/' } maven {name = 'aswm repo'; url = 'https://repo.rapture.pw/repository/maven-releases/' } + maven {name = 'mmo-repo'; url = 'https://nexus.phoenixdevt.fr/repository/maven-public/'} } dependencies { @@ -37,11 +38,12 @@ dependencies { compileOnly ('net.objecthunter:exp4j:0.4.8') compileOnly ('io.lumine:Mythic-Dist:5.2.1') compileOnly ('com.infernalsuite.aswm:api:1.19.4-R0.1-SNAPSHOT') + compileOnly ('net.Indyuce:MMOItems-API:6.9.2-SNAPSHOT') compileOnly fileTree (dir:'libs',includes:['*.jar']) - implementation ('net.kyori:adventure-api:4.13.1') + implementation ('net.kyori:adventure-api:4.14.0') implementation ('net.kyori:adventure-platform-bukkit:4.3.0') - implementation ('net.kyori:adventure-text-minimessage:4.13.1') - implementation ("de.tr7zw:item-nbt-api:2.11.2") + implementation ('net.kyori:adventure-text-minimessage:4.14.0') + implementation ("de.tr7zw:item-nbt-api:2.11.3") implementation ('org.bstats:bstats-bukkit:3.0.1') implementation fileTree (dir:'libs',includes:['BiomeAPI.jar','ProtectionLib.jar']) } diff --git a/libs/AureliumSkills-Beta1.3.6.jar b/libs/AureliumSkills-Beta1.3.6.jar new file mode 100644 index 0000000..ed284b9 Binary files /dev/null and b/libs/AureliumSkills-Beta1.3.6.jar differ diff --git a/libs/ClueScrolls-api.jar b/libs/ClueScrolls-api.jar new file mode 100644 index 0000000..38234c6 Binary files /dev/null and b/libs/ClueScrolls-api.jar differ diff --git a/libs/EcoSkills v3.0.0-api.jar b/libs/EcoSkills v3.0.0-api.jar new file mode 100644 index 0000000..0f648d8 Binary files /dev/null and b/libs/EcoSkills v3.0.0-api.jar differ diff --git a/libs/MMOCore-1.11-api.jar b/libs/MMOCore-1.11-api.jar new file mode 100644 index 0000000..f7a424b Binary files /dev/null and b/libs/MMOCore-1.11-api.jar differ diff --git a/libs/RealisticSeasons-api.jar b/libs/RealisticSeasons-api.jar new file mode 100644 index 0000000..6777a7d Binary files /dev/null and b/libs/RealisticSeasons-api.jar differ diff --git a/libs/Vault.jar b/libs/Vault.jar new file mode 100644 index 0000000..4bcaa89 Binary files /dev/null and b/libs/Vault.jar differ diff --git a/libs/battle-pass-api.jar b/libs/battle-pass-api.jar new file mode 100644 index 0000000..608df8c Binary files /dev/null and b/libs/battle-pass-api.jar differ diff --git a/libs/mcMMO-api.jar b/libs/mcMMO-api.jar new file mode 100644 index 0000000..a2ac22e Binary files /dev/null and b/libs/mcMMO-api.jar differ diff --git a/libs/oraxen-api.jar b/libs/oraxen-api.jar new file mode 100644 index 0000000..8aca071 Binary files /dev/null and b/libs/oraxen-api.jar differ diff --git a/libs/premiumlibs.txt b/libs/premiumlibs.txt deleted file mode 100644 index 5ee1e42..0000000 --- a/libs/premiumlibs.txt +++ /dev/null @@ -1,7 +0,0 @@ -BattlePass-3.16.4 -ClueScrolls-4.8.6 -mcMMO -MMOCore-1.11.3 -MMOItems-6.9.3 -oraxen-1.155.1 -RealisticSeasons-10.4.3 \ No newline at end of file diff --git a/src/main/java/net/momirealms/customcrops/api/customplugin/crucible/CrucibleHandler.java b/src/main/java/net/momirealms/customcrops/api/customplugin/crucible/CrucibleHandler.java index 83fc3df..d1ab08a 100644 --- a/src/main/java/net/momirealms/customcrops/api/customplugin/crucible/CrucibleHandler.java +++ b/src/main/java/net/momirealms/customcrops/api/customplugin/crucible/CrucibleHandler.java @@ -1,30 +1,30 @@ -/* - * Copyright (C) <2022> - * - * 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 - * 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 . - */ - -package net.momirealms.customcrops.api.customplugin.crucible; - -import net.momirealms.customcrops.api.customplugin.Handler; -import net.momirealms.customcrops.api.customplugin.PlatformManager; - -@Deprecated -public class CrucibleHandler extends Handler { - - public CrucibleHandler(PlatformManager platformManager) { - super(platformManager); - //TODO NO API Events Available - } -} +///* +// * Copyright (C) <2022> +// * +// * 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 +// * 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 . +// */ +// +//package net.momirealms.customcrops.api.customplugin.crucible; +// +//import net.momirealms.customcrops.api.customplugin.Handler; +//import net.momirealms.customcrops.api.customplugin.PlatformManager; +// +//@Deprecated +//public class CrucibleHandler extends Handler { +// +// public CrucibleHandler(PlatformManager platformManager) { +// super(platformManager); +// //TODO NO API Events Available +// } +//} diff --git a/src/main/java/net/momirealms/customcrops/api/customplugin/crucible/CruciblePluginImpl.java b/src/main/java/net/momirealms/customcrops/api/customplugin/crucible/CruciblePluginImpl.java index 4e5e217..e1814db 100644 --- a/src/main/java/net/momirealms/customcrops/api/customplugin/crucible/CruciblePluginImpl.java +++ b/src/main/java/net/momirealms/customcrops/api/customplugin/crucible/CruciblePluginImpl.java @@ -1,154 +1,154 @@ -/* - * Copyright (C) <2022> - * - * 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 - * 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 . - */ - -package net.momirealms.customcrops.api.customplugin.crucible; - -import io.lumine.mythic.bukkit.BukkitAdapter; -import io.lumine.mythiccrucible.MythicCrucible; -import io.lumine.mythiccrucible.items.CrucibleItem; -import io.lumine.mythiccrucible.items.blocks.CustomBlockItemContext; -import net.momirealms.customcrops.api.customplugin.PlatformInterface; -import net.momirealms.customcrops.api.util.AdventureUtils; -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.entity.ItemDisplay; -import org.bukkit.entity.ItemFrame; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.Optional; - -@Deprecated -public class CruciblePluginImpl implements PlatformInterface { - - @Override - public boolean removeCustomBlock(Location location) { - Optional optionalCB = MythicCrucible.inst().getItemManager().getCustomBlockManager().getBlockFromBlock(location.getBlock()); - if (optionalCB.isEmpty()) return false; - optionalCB.get().remove(location.getBlock(), null, false); - return true; - } - - @Nullable - @Override - public String getCustomBlockID(Location location) { - Optional optionalCB = MythicCrucible.inst().getItemManager().getCustomBlockManager().getBlockFromBlock(location.getBlock()); - if (optionalCB.isEmpty()) return null; - else return optionalCB.get().getCrucibleItem().getInternalName(); - } - - @Nullable - @Override - public ItemStack getItemStack(String id) { - Optional optionalCI = MythicCrucible.inst().getItemManager().getItem(id); - if (optionalCI.isEmpty()) return null; - else return BukkitAdapter.adapt(optionalCI.get().getMythicItem().generateItemStack(1)); - } - - @Nullable - @Override - @Deprecated - public ItemFrame placeItemFrame(Location location, String id) { - Optional optionalCI = MythicCrucible.inst().getItemManager().getItem(id); - if (optionalCI.isPresent()) { - optionalCI.get().getFurnitureData().place(location.getBlock(), BlockFace.UP, 0); - } else { - AdventureUtils.consoleMessage("[CustomCrop] ItemFrame not exists: " + id); - } - //TODO API limits (It's using private methods to place) - return null; - } - - @Nullable - @Override - @Deprecated - public ItemDisplay placeItemDisplay(Location location, String id) { - //TODO Not implemented feature - return null; - } - - @Override - public void placeNoteBlock(Location location, String id) { - Optional optionalCI = MythicCrucible.inst().getItemManager().getItem(id); - if (optionalCI.isPresent()) { - location.getBlock().setBlockData(optionalCI.get().getBlockData().getBlockData()); - } else { - AdventureUtils.consoleMessage("[CustomCrop] NoteBlock not exists: " + id); - } - } - - @Override - public void placeTripWire(Location location, String id) { - Optional optionalCI = MythicCrucible.inst().getItemManager().getItem(id); - if (optionalCI.isPresent()) { - location.getBlock().setBlockData(optionalCI.get().getBlockData().getBlockData()); - } else { - AdventureUtils.consoleMessage("[CustomCrop] Tirpwire not exists: " + id); - } - } - - @NotNull - @Override - public String getBlockID(Block block) { - Optional optionalCB = MythicCrucible.inst().getItemManager().getCustomBlockManager().getBlockFromBlock(block); - if (optionalCB.isEmpty()) return block.getType().name(); - else return optionalCB.get().getCrucibleItem().getInternalName(); - } - - @Override - public boolean doesItemExist(String id) { - Optional optionalCI = MythicCrucible.inst().getItemManager().getItem(id); - return optionalCI.isPresent(); - } - - @Override - @Deprecated - public void dropBlockLoot(Block block) { - //TODO - } - - @Override - @Deprecated - public void placeChorus(Location location, String id) { - //TODO - } - - @NotNull - @Override - public String getItemStackID(@NotNull ItemStack itemStack) { - Optional optionalCI = MythicCrucible.inst().getItemManager().getItem(itemStack); - if (optionalCI.isEmpty()) return itemStack.getType().name(); - else return optionalCI.get().getInternalName(); - } - - @Nullable - @Override - @Deprecated - public String getItemDisplayID(ItemDisplay itemDisplay) { - return null; - } - - @Nullable - @Override - public String getItemFrameID(ItemFrame itemFrame) { - Optional optionalCI = MythicCrucible.inst().getItemManager().getFurnitureManager().getItemFromFrame(itemFrame); - if (optionalCI.isEmpty()) return null; - else return optionalCI.get().getInternalName(); - } -} +///* +// * Copyright (C) <2022> +// * +// * 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 +// * 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 . +// */ +// +//package net.momirealms.customcrops.api.customplugin.crucible; +// +//import io.lumine.mythic.bukkit.BukkitAdapter; +//import io.lumine.mythiccrucible.MythicCrucible; +//import io.lumine.mythiccrucible.items.CrucibleItem; +//import io.lumine.mythiccrucible.items.blocks.CustomBlockItemContext; +//import net.momirealms.customcrops.api.customplugin.PlatformInterface; +//import net.momirealms.customcrops.api.util.AdventureUtils; +//import org.bukkit.Location; +//import org.bukkit.block.Block; +//import org.bukkit.block.BlockFace; +//import org.bukkit.entity.ItemDisplay; +//import org.bukkit.entity.ItemFrame; +//import org.bukkit.inventory.ItemStack; +//import org.jetbrains.annotations.NotNull; +//import org.jetbrains.annotations.Nullable; +// +//import java.util.Optional; +// +//@Deprecated +//public class CruciblePluginImpl implements PlatformInterface { +// +// @Override +// public boolean removeCustomBlock(Location location) { +// Optional optionalCB = MythicCrucible.inst().getItemManager().getCustomBlockManager().getBlockFromBlock(location.getBlock()); +// if (optionalCB.isEmpty()) return false; +// optionalCB.get().remove(location.getBlock(), null, false); +// return true; +// } +// +// @Nullable +// @Override +// public String getCustomBlockID(Location location) { +// Optional optionalCB = MythicCrucible.inst().getItemManager().getCustomBlockManager().getBlockFromBlock(location.getBlock()); +// if (optionalCB.isEmpty()) return null; +// else return optionalCB.get().getCrucibleItem().getInternalName(); +// } +// +// @Nullable +// @Override +// public ItemStack getItemStack(String id) { +// Optional optionalCI = MythicCrucible.inst().getItemManager().getItem(id); +// if (optionalCI.isEmpty()) return null; +// else return BukkitAdapter.adapt(optionalCI.get().getMythicItem().generateItemStack(1)); +// } +// +// @Nullable +// @Override +// @Deprecated +// public ItemFrame placeItemFrame(Location location, String id) { +// Optional optionalCI = MythicCrucible.inst().getItemManager().getItem(id); +// if (optionalCI.isPresent()) { +// optionalCI.get().getFurnitureData().place(location.getBlock(), BlockFace.UP, 0); +// } else { +// AdventureUtils.consoleMessage("[CustomCrop] ItemFrame not exists: " + id); +// } +// //TODO API limits (It's using private methods to place) +// return null; +// } +// +// @Nullable +// @Override +// @Deprecated +// public ItemDisplay placeItemDisplay(Location location, String id) { +// //TODO Not implemented feature +// return null; +// } +// +// @Override +// public void placeNoteBlock(Location location, String id) { +// Optional optionalCI = MythicCrucible.inst().getItemManager().getItem(id); +// if (optionalCI.isPresent()) { +// location.getBlock().setBlockData(optionalCI.get().getBlockData().getBlockData()); +// } else { +// AdventureUtils.consoleMessage("[CustomCrop] NoteBlock not exists: " + id); +// } +// } +// +// @Override +// public void placeTripWire(Location location, String id) { +// Optional optionalCI = MythicCrucible.inst().getItemManager().getItem(id); +// if (optionalCI.isPresent()) { +// location.getBlock().setBlockData(optionalCI.get().getBlockData().getBlockData()); +// } else { +// AdventureUtils.consoleMessage("[CustomCrop] Tirpwire not exists: " + id); +// } +// } +// +// @NotNull +// @Override +// public String getBlockID(Block block) { +// Optional optionalCB = MythicCrucible.inst().getItemManager().getCustomBlockManager().getBlockFromBlock(block); +// if (optionalCB.isEmpty()) return block.getType().name(); +// else return optionalCB.get().getCrucibleItem().getInternalName(); +// } +// +// @Override +// public boolean doesItemExist(String id) { +// Optional optionalCI = MythicCrucible.inst().getItemManager().getItem(id); +// return optionalCI.isPresent(); +// } +// +// @Override +// @Deprecated +// public void dropBlockLoot(Block block) { +// //TODO +// } +// +// @Override +// @Deprecated +// public void placeChorus(Location location, String id) { +// //TODO +// } +// +// @NotNull +// @Override +// public String getItemStackID(@NotNull ItemStack itemStack) { +// Optional optionalCI = MythicCrucible.inst().getItemManager().getItem(itemStack); +// if (optionalCI.isEmpty()) return itemStack.getType().name(); +// else return optionalCI.get().getInternalName(); +// } +// +// @Nullable +// @Override +// @Deprecated +// public String getItemDisplayID(ItemDisplay itemDisplay) { +// return null; +// } +// +// @Nullable +// @Override +// public String getItemFrameID(ItemFrame itemFrame) { +// Optional optionalCI = MythicCrucible.inst().getItemManager().getFurnitureManager().getItemFromFrame(itemFrame); +// if (optionalCI.isEmpty()) return null; +// else return optionalCI.get().getInternalName(); +// } +//} diff --git a/src/main/java/net/momirealms/customcrops/api/customplugin/oraxen/OraxenPluginImpl.java b/src/main/java/net/momirealms/customcrops/api/customplugin/oraxen/OraxenPluginImpl.java index 867d964..ffb6bfb 100644 --- a/src/main/java/net/momirealms/customcrops/api/customplugin/oraxen/OraxenPluginImpl.java +++ b/src/main/java/net/momirealms/customcrops/api/customplugin/oraxen/OraxenPluginImpl.java @@ -35,7 +35,6 @@ import net.momirealms.customcrops.api.customplugin.PlatformInterface; import net.momirealms.customcrops.api.util.AdventureUtils; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.Rotation; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.entity.Entity;