From 76afe30e94c9bceca01337be28a2342ff454be7a Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 22 Oct 2015 14:29:39 -0700 Subject: [PATCH] Make IToolWrench @Optional --- build.gradle | 3 -- src/main/java/buildcraft/LICENSE-API | 21 ---------- .../buildcraft/api/tools/IToolWrench.java | 40 ------------------- .../buildcraft/api/tools/package-info.java | 11 ----- .../java/forestry/core/items/ItemWrench.java | 3 ++ .../java/forestry/core/utils/PlayerUtil.java | 32 --------------- 6 files changed, 3 insertions(+), 107 deletions(-) delete mode 100644 src/main/java/buildcraft/LICENSE-API delete mode 100644 src/main/java/buildcraft/api/tools/IToolWrench.java delete mode 100644 src/main/java/buildcraft/api/tools/package-info.java diff --git a/build.gradle b/build.gradle index 37800be2c..12badd7bd 100755 --- a/build.gradle +++ b/build.gradle @@ -184,9 +184,6 @@ jar { into ('cofh/api') { from project.apiRedstoneFlux + "/LICENSE - LGPLv3.txt" } - into ('buildcraft/api') { - from "./src/main/java/buildcraft/LICENSE-API" - } } task mainJar(type: Jar, dependsOn: 'reobf') { diff --git a/src/main/java/buildcraft/LICENSE-API b/src/main/java/buildcraft/LICENSE-API deleted file mode 100644 index 95f750db0..000000000 --- a/src/main/java/buildcraft/LICENSE-API +++ /dev/null @@ -1,21 +0,0 @@ -BuildCraft API License - -Copyright (c) 2011-2014 SpaceToad and the BuildCraft team - -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. diff --git a/src/main/java/buildcraft/api/tools/IToolWrench.java b/src/main/java/buildcraft/api/tools/IToolWrench.java deleted file mode 100644 index 517f3e79b..000000000 --- a/src/main/java/buildcraft/api/tools/IToolWrench.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ -package buildcraft.api.tools; - -import net.minecraft.entity.player.EntityPlayer; - -/*** - * Implement this interface on subclasses of Item to have that item work as a wrench for buildcraft - */ -public interface IToolWrench { - - /*** - * Called to ensure that the wrench can be used. To get the ItemStack that is used, check player.inventory.getCurrentItem() - * - * @param player - * - The player doing the wrenching - * @param x - * ,y,z - The coordinates for the block being wrenched - * - * @return true if wrenching is allowed, false if not - */ - boolean canWrench(EntityPlayer player, int x, int y, int z); - - /*** - * Callback after the wrench has been used. This can be used to decrease durability or for other purposes. To get the ItemStack that was used, check - * player.inventory.getCurrentItem() - * - * @param player - * - The player doing the wrenching - * @param x - * ,y,z - The coordinates of the block being wrenched - */ - void wrenchUsed(EntityPlayer player, int x, int y, int z); -} diff --git a/src/main/java/buildcraft/api/tools/package-info.java b/src/main/java/buildcraft/api/tools/package-info.java deleted file mode 100644 index 9c131641e..000000000 --- a/src/main/java/buildcraft/api/tools/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * The BuildCraft API is distributed under the terms of the MIT License. - * Please check the contents of the license, which should be located - * as "LICENSE.API" in the BuildCraft source code distribution. - */ -@API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|tools") -package buildcraft.api.tools; -import cpw.mods.fml.common.API; diff --git a/src/main/java/forestry/core/items/ItemWrench.java b/src/main/java/forestry/core/items/ItemWrench.java index a7f1237db..7e31ab177 100755 --- a/src/main/java/forestry/core/items/ItemWrench.java +++ b/src/main/java/forestry/core/items/ItemWrench.java @@ -17,8 +17,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.Optional; + import buildcraft.api.tools.IToolWrench; +@Optional.Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraftAPI|tools") public class ItemWrench extends ItemForestry implements IToolWrench { public ItemWrench() { diff --git a/src/main/java/forestry/core/utils/PlayerUtil.java b/src/main/java/forestry/core/utils/PlayerUtil.java index e4cfe5a16..96868f11a 100644 --- a/src/main/java/forestry/core/utils/PlayerUtil.java +++ b/src/main/java/forestry/core/utils/PlayerUtil.java @@ -13,7 +13,6 @@ package forestry.core.utils; import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -23,8 +22,6 @@ import net.minecraftforge.common.util.FakePlayerFactory; import forestry.core.access.IOwnable; -import buildcraft.api.tools.IToolWrench; - public abstract class PlayerUtil { //TODO: use null everywhere instead of an emptyUUID @@ -53,35 +50,6 @@ public abstract class PlayerUtil { } } - public static boolean canWrench(EntityPlayer player, int x, int y, int z) { - ItemStack itemstack = player.getCurrentEquippedItem(); - if (itemstack == null) { - return false; - } - - if (!(itemstack.getItem() instanceof IToolWrench)) { - return false; - } - - IToolWrench wrench = (IToolWrench) itemstack.getItem(); - return wrench.canWrench(player, x, y, z); - } - - public static void useWrench(EntityPlayer player, int x, int y, int z) { - ItemStack itemstack = player.getCurrentEquippedItem(); - - if (itemstack == null) { - return; - } - - if (!(itemstack.getItem() instanceof IToolWrench)) { - return; - } - - IToolWrench wrench = (IToolWrench) itemstack.getItem(); - wrench.wrenchUsed(player, x, y, z); - } - /** * Get a player for a given World and GameProfile. * If they are not in the World, returns a FakePlayer.