diff --git a/pom.xml b/pom.xml index de1924b..1f6c7af 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ xenondevs repository https://repo.xenondevs.xyz/releases - + jitpack.io https://jitpack.io @@ -86,19 +86,6 @@ RC-35 provided - - - com.github.steve4744 - craftory-tech - v0.8.3 - provided - - - com.github.oraxen - Oraxen - - - xyz.xenondevs.nova diff --git a/src/main/java/io/github/steve4744/whatisthis/data/DataHandler.java b/src/main/java/io/github/steve4744/whatisthis/data/DataHandler.java index c63bc43..da7d44c 100644 --- a/src/main/java/io/github/steve4744/whatisthis/data/DataHandler.java +++ b/src/main/java/io/github/steve4744/whatisthis/data/DataHandler.java @@ -77,7 +77,6 @@ of this software and associated documentation files (the "Software"), to deal import io.github.steve4744.whatisthis.utils.OraxenHandler; import io.github.steve4744.whatisthis.utils.SlimefunHandler; import io.github.steve4744.whatisthis.utils.Utils; -import io.github.steve4744.whatisthis.utils.CraftoryHandler; import io.github.steve4744.whatisthis.utils.ItemsAdderHandler; import io.github.steve4744.whatisthis.utils.MythicMobsHandler; import io.github.steve4744.whatisthis.utils.NovaHandler; @@ -89,7 +88,6 @@ public class DataHandler { private boolean slimefun; private boolean itemsadder; private boolean oraxen; - private boolean craftory; private boolean mythicmobs; private static final double DEFAULT_HEALTH = 1.0; @@ -98,7 +96,6 @@ public class DataHandler { private static final String NOVA = "Nova"; private static final String ITEMSADDER = "ItemsAdder"; private static final String ORAXEN = "Oraxen"; - private static final String CRAFTORY = "Craftory"; private static final String MYTHICMOBS = "MythicMobs"; private Map itemDrops = new HashMap<>(); // material -> amount @@ -110,7 +107,6 @@ public DataHandler(WhatIsThis plugin) { this.nova = pm.isPluginEnabled(NOVA); this.itemsadder = pm.isPluginEnabled(ITEMSADDER); this.oraxen = pm.isPluginEnabled(ORAXEN); - this.craftory = pm.isPluginEnabled(CRAFTORY); this.mythicmobs = pm.isPluginEnabled(MYTHICMOBS); } @@ -150,12 +146,6 @@ public String getDisplayName(Block block, Player player) { return ""; } - } else if (isCraftoryBlock(block) && includePlugin(CRAFTORY)) { - targetName = ChatColor.stripColor(CraftoryHandler.getDisplayName(block)); - if (plugin.getSettings().getCustomBlacklist(CRAFTORY).contains(targetName)) { - return ""; - } - } else { if (block.getType() == Material.PLAYER_HEAD || block.getType() == Material.PLAYER_WALL_HEAD) { Skull skull = (Skull) block.getState(); @@ -311,10 +301,6 @@ public Set getItemDrops(Block block, Player player) { itemDrops.put(ChatColor.stripColor(OraxenHandler.getDisplayName(block)), 1); return getItemDropNames(); } - if (isCraftoryBlock(block)) { - itemDrops.put(ChatColor.stripColor(CraftoryHandler.getDisplayName(block)), 1); - return getItemDropNames(); - } Set zeroDropItems = new HashSet(); @@ -393,7 +379,7 @@ private String translateEntityName(String name, Player player) { } public boolean isCustomBlock(Block block) { - return isSlimefunBlock(block) || isNovaBlock(block) || isItemsAdderBlock(block) || isOraxenBlock(block) || isCraftoryBlock(block); + return isSlimefunBlock(block) || isNovaBlock(block) || isItemsAdderBlock(block) || isOraxenBlock(block); } private boolean isSlimefunBlock(Block block) { @@ -420,10 +406,6 @@ private boolean isOraxenEntity(Entity entity) { return oraxen ? OraxenHandler.isOraxen(entity) : false; } - private boolean isCraftoryBlock(Block block) { - return craftory ? CraftoryHandler.isCraftory(block.getLocation()) : false; - } - private boolean isMythicMobsEntity(Entity entity) { return mythicmobs ? MythicMobsHandler.isMythicMobs(entity) : false; } @@ -446,9 +428,6 @@ public String getCustomResourceName(Block block) { } else if (isOraxenBlock(block)) { return ORAXEN; - - } else if (isCraftoryBlock(block)) { - return CRAFTORY; } return ""; } diff --git a/src/main/java/io/github/steve4744/whatisthis/utils/CraftoryHandler.java b/src/main/java/io/github/steve4744/whatisthis/utils/CraftoryHandler.java deleted file mode 100644 index 7fda498..0000000 --- a/src/main/java/io/github/steve4744/whatisthis/utils/CraftoryHandler.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * MIT License - -Copyright (c) 2022 steve4744 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - */ -package io.github.steve4744.whatisthis.utils; - -import org.bukkit.Location; -import org.bukkit.block.Block; - -import tech.brettsaunders.craftory.Craftory; -import tech.brettsaunders.craftory.Utilities; -import tech.brettsaunders.craftory.api.blocks.CustomBlockManager; - -public class CraftoryHandler { - - private static CustomBlockManager manager = Craftory.customBlockManager; - - public static boolean isCraftory(Location loc) { - return manager.isCustomBlock(loc); - } - - public static String getDisplayName(Block block) { - return Utilities.getTranslation(manager.getCustomBlockName(block.getLocation())); - } -} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d1c7484..5b17b3a 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -4,7 +4,7 @@ author: steve4744 version: ${project.version} api-version: 1.20.6 description: Displays the name of the block or entity that you are looking at. -softdepend: [Slimefun, Nova, ItemsAdder, PlaceholderAPI, Oraxen, Craftory, MythicMobs] +softdepend: [Slimefun, Nova, ItemsAdder, PlaceholderAPI, Oraxen, MythicMobs] commands: whatisthis: