From 272ef5bbab4ee49887111f3e91174763ffb3c571 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Apr 2020 15:24:09 -0500 Subject: [PATCH] Start API cleanup: Move ManaItemHandler to an interface implemented in the mod proper. Also move ColorHelper into mod proper. --- build.gradle | 7 + .../botania/api/mana/ManaItemHandler.java | 212 +++-------------- .../botania/api/mana/ManaItemsEvent.java | 7 +- .../client/core/handler/HUDHandler.java | 4 +- .../render/tile/RenderTileSpreader.java | 2 +- .../java/vazkii/botania/common/Botania.java | 2 +- .../botania/common/block/BlockAltar.java | 4 +- .../common/block/mana/BlockSpreader.java | 2 +- .../subtile/generating/SubTileSpectrolus.java | 2 +- .../common/core/handler/IMCSender.java | 2 +- .../core/helper}/ColorHelper.java | 2 +- .../common/impl/ManaItemHandlerImpl.java | 220 ++++++++++++++++++ .../botania/common/item/ItemAstrolabe.java | 4 +- .../botania/common/item/ItemEnderHand.java | 12 +- .../botania/common/item/ItemManaGun.java | 4 +- .../armor/manasteel/ItemManasteelArmor.java | 2 +- .../armor/manaweave/ItemManaweaveHelm.java | 2 +- .../armor/terrasteel/ItemTerrasteelHelm.java | 2 +- .../item/equipment/bauble/ItemAuraRing.java | 2 +- .../equipment/bauble/ItemBloodPendant.java | 4 +- .../item/equipment/bauble/ItemDivaCharm.java | 4 +- .../equipment/bauble/ItemFlightTiara.java | 4 +- .../equipment/bauble/ItemGoddessCharm.java | 2 +- .../equipment/bauble/ItemGreaterAuraRing.java | 2 +- .../bauble/ItemInvisibilityCloak.java | 2 +- .../item/equipment/bauble/ItemMiningRing.java | 4 +- .../item/equipment/bauble/ItemThirdEye.java | 2 +- .../item/equipment/bauble/ItemTravelBelt.java | 6 +- .../item/equipment/bauble/ItemWaterRing.java | 2 +- .../item/equipment/tool/ToolCommons.java | 4 +- .../equipment/tool/bow/ItemCrystalBow.java | 4 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 2 +- .../tool/manasteel/ItemManasteelAxe.java | 2 +- .../tool/manasteel/ItemManasteelPick.java | 2 +- .../tool/manasteel/ItemManasteelShears.java | 2 +- .../tool/manasteel/ItemManasteelShovel.java | 2 +- .../tool/manasteel/ItemManasteelSword.java | 2 +- .../botania/common/item/material/ItemDye.java | 2 +- .../common/item/relic/ItemFlugelEye.java | 2 +- .../common/item/relic/ItemInfiniteFruit.java | 2 +- .../common/item/relic/ItemKingKey.java | 2 +- .../common/item/relic/ItemLokiRing.java | 4 +- .../common/item/rod/ItemCobbleRod.java | 2 +- .../botania/common/item/rod/ItemDirtRod.java | 6 +- .../common/item/rod/ItemDiviningRod.java | 2 +- .../common/item/rod/ItemExchangeRod.java | 8 +- .../botania/common/item/rod/ItemFireRod.java | 4 +- .../common/item/rod/ItemGravityRod.java | 2 +- .../common/item/rod/ItemMissileRod.java | 4 +- .../common/item/rod/ItemRainbowRod.java | 4 +- .../common/item/rod/ItemSkyDirtRod.java | 4 +- .../botania/common/item/rod/ItemSmeltRod.java | 4 +- .../common/item/rod/ItemTerraformRod.java | 4 +- .../common/item/rod/ItemTornadoRod.java | 4 +- .../botania/common/item/rod/ItemWaterRod.java | 2 +- .../java/vazkii/botania/test/APITest.java | 17 ++ 56 files changed, 361 insertions(+), 264 deletions(-) rename src/main/java/vazkii/botania/{api => common/core/helper}/ColorHelper.java (99%) create mode 100644 src/main/java/vazkii/botania/common/impl/ManaItemHandlerImpl.java create mode 100644 src/test/java/vazkii/botania/test/APITest.java diff --git a/build.gradle b/build.gradle index 06d956811..d4abfac69 100644 --- a/build.gradle +++ b/build.gradle @@ -97,6 +97,10 @@ repositories { } } +test { + useJUnitPlatform() +} + dependencies { minecraft "net.minecraftforge:forge:${mc_version}-31.1.24" compile fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-28.146") { transitive = false } @@ -106,6 +110,9 @@ dependencies { compileOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.2-2.0:api") runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.2-2.0") + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.1' } spotless { diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java index 00e1769d4..97e0fbccc 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java @@ -8,21 +8,28 @@ */ package vazkii.botania.api.mana; -import com.google.common.collect.Iterables; - import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; +import net.minecraft.util.LazyValue; -import vazkii.botania.api.BotaniaAPI; +import org.apache.logging.log4j.LogManager; -import java.util.ArrayList; import java.util.Collections; import java.util.List; -public final class ManaItemHandler { +public interface ManaItemHandler { + LazyValue INSTANCE = new LazyValue<>(() -> { + try { + return (ManaItemHandler) Class.forName("vazkii.botania.common.impl.ManaItemHandlerImpl").newInstance(); + } catch (ReflectiveOperationException e) { + LogManager.getLogger().warn("Unable to find ManaItemHandlerImpl, using a dummy"); + return new ManaItemHandler() {}; + } + }); + + static ManaItemHandler instance() { + return INSTANCE.getValue(); + } /** * Gets a list containing all mana-holding items in a player's inventory. @@ -31,27 +38,8 @@ public final class ManaItemHandler { * * @return The list of items */ - public static List getManaItems(PlayerEntity player) { - if (player == null) { - return Collections.emptyList(); - } - - List toReturn = new ArrayList<>(); - player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).ifPresent(mainInv -> { - int size = mainInv.getSlots(); - - for (int slot = 0; slot < size; slot++) { - ItemStack stackInSlot = mainInv.getStackInSlot(slot); - - if (!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof IManaItem) { - toReturn.add(stackInSlot); - } - } - }); - - ManaItemsEvent event = new ManaItemsEvent(player, toReturn); - MinecraftForge.EVENT_BUS.post(event); - return event.getItems(); + default List getManaItems(PlayerEntity player) { + return Collections.emptyList(); } /** @@ -59,27 +47,8 @@ public final class ManaItemHandler { * * @return The list of items */ - public static List getManaAccesories(PlayerEntity player) { - if (player == null) { - return Collections.emptyList(); - } - - IItemHandler acc = BotaniaAPI.internalHandler.getAccessoriesInventory(player); - if (acc == null) { - return Collections.emptyList(); - } - - List toReturn = new ArrayList<>(acc.getSlots()); - - for (int slot = 0; slot < acc.getSlots(); slot++) { - ItemStack stackInSlot = acc.getStackInSlot(slot); - - if (!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof IManaItem) { - toReturn.add(stackInSlot); - } - } - - return toReturn; + default List getManaAccesories(PlayerEntity player) { + return Collections.emptyList(); } /** @@ -87,37 +56,11 @@ public final class ManaItemHandler { * * @param manaToGet How much mana is to be requested, if less mana exists than this amount, * the amount of mana existent will be returned instead, if you want exact values use - * requestManaExact. + * {@link #requestManaExact}. * @param remove If true, the mana will be removed from the target item. Set to false to just check. * @return The amount of mana received from the request. */ - public static int requestMana(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { - if (stack.isEmpty()) { - return 0; - } - - List items = getManaItems(player); - List acc = getManaAccesories(player); - for (ItemStack stackInSlot : Iterables.concat(items, acc)) { - if (stackInSlot == stack) { - continue; - } - IManaItem manaItem = (IManaItem) stackInSlot.getItem(); - if (manaItem.canExportManaToItem(stackInSlot, stack) && manaItem.getMana(stackInSlot) > 0) { - if (stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canReceiveManaFromItem(stack, stackInSlot)) { - continue; - } - - int mana = Math.min(manaToGet, manaItem.getMana(stackInSlot)); - - if (remove) { - manaItem.addMana(stackInSlot, -mana); - } - - return mana; - } - } - + default int requestMana(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { return 0; } @@ -129,31 +72,7 @@ public final class ManaItemHandler { * @param remove If true, the mana will be removed from the target item. Set to false to just check. * @return If the request was succesful. */ - public static boolean requestManaExact(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { - if (stack.isEmpty()) { - return false; - } - - List items = getManaItems(player); - List acc = getManaAccesories(player); - for (ItemStack stackInSlot : Iterables.concat(items, acc)) { - if (stackInSlot == stack) { - continue; - } - IManaItem manaItemSlot = (IManaItem) stackInSlot.getItem(); - if (manaItemSlot.canExportManaToItem(stackInSlot, stack) && manaItemSlot.getMana(stackInSlot) > manaToGet) { - if (stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canReceiveManaFromItem(stack, stackInSlot)) { - continue; - } - - if (remove) { - manaItemSlot.addMana(stackInSlot, -manaToGet); - } - - return true; - } - } - + default boolean requestManaExact(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { return false; } @@ -165,38 +84,7 @@ public final class ManaItemHandler { * @param add If true, the mana will be added from the target item. Set to false to just check. * @return The amount of mana actually sent. */ - public static int dispatchMana(ItemStack stack, PlayerEntity player, int manaToSend, boolean add) { - if (stack.isEmpty()) { - return 0; - } - - List items = getManaItems(player); - List acc = getManaAccesories(player); - for (ItemStack stackInSlot : Iterables.concat(items, acc)) { - if (stackInSlot == stack) { - continue; - } - IManaItem manaItemSlot = (IManaItem) stackInSlot.getItem(); - if (manaItemSlot.canReceiveManaFromItem(stackInSlot, stack)) { - if (stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canExportManaToItem(stack, stackInSlot)) { - continue; - } - - int received; - if (manaItemSlot.getMana(stackInSlot) + manaToSend <= manaItemSlot.getMaxMana(stackInSlot)) { - received = manaToSend; - } else { - received = manaToSend - (manaItemSlot.getMana(stackInSlot) + manaToSend - manaItemSlot.getMaxMana(stackInSlot)); - } - - if (add) { - manaItemSlot.addMana(stackInSlot, manaToSend); - } - - return received; - } - } - + default int dispatchMana(ItemStack stack, PlayerEntity player, int manaToSend, boolean add) { return 0; } @@ -208,31 +96,7 @@ public final class ManaItemHandler { * @param add If true, the mana will be added from the target item. Set to false to just check. * @return If an item received the mana sent. */ - public static boolean dispatchManaExact(ItemStack stack, PlayerEntity player, int manaToSend, boolean add) { - if (stack.isEmpty()) { - return false; - } - - List items = getManaItems(player); - List acc = getManaAccesories(player); - for (ItemStack stackInSlot : Iterables.concat(items, acc)) { - if (stackInSlot == stack) { - continue; - } - IManaItem manaItemSlot = (IManaItem) stackInSlot.getItem(); - if (manaItemSlot.getMana(stackInSlot) + manaToSend <= manaItemSlot.getMaxMana(stackInSlot) && manaItemSlot.canReceiveManaFromItem(stackInSlot, stack)) { - if (stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canExportManaToItem(stack, stackInSlot)) { - continue; - } - - if (add) { - manaItemSlot.addMana(stackInSlot, manaToSend); - } - - return true; - } - } - + default boolean dispatchManaExact(ItemStack stack, PlayerEntity player, int manaToSend, boolean add) { return false; } @@ -246,10 +110,8 @@ public final class ManaItemHandler { * @param remove If true, the mana will be removed from the target item. Set to false to just check. * @return The amount of mana received from the request. */ - public static int requestManaForTool(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { - float multiplier = Math.max(0F, 1F - getFullDiscountForTools(player, stack)); - int cost = (int) (manaToGet * multiplier); - return (int) (requestMana(stack, player, cost, remove) / multiplier); + default int requestManaForTool(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { + return 0; } /** @@ -261,29 +123,15 @@ public final class ManaItemHandler { * @param remove If true, the mana will be removed from the target item. Set to false to just check. * @return If the request was succesful. */ - public static boolean requestManaExactForTool(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { - float multiplier = Math.max(0F, 1F - getFullDiscountForTools(player, stack)); - int cost = (int) (manaToGet * multiplier); - return requestManaExact(stack, player, cost, remove); + default boolean requestManaExactForTool(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { + return false; } /** * Gets the sum of all the discounts on IManaDiscountArmor items equipped * on the player passed in. This discount can vary based on what the passed tool is. */ - public static float getFullDiscountForTools(PlayerEntity player, ItemStack tool) { - float discount = 0F; - for (int i = 0; i < player.inventory.armorInventory.size(); i++) { - ItemStack armor = player.inventory.armorInventory.get(i); - if (!armor.isEmpty() && armor.getItem() instanceof IManaDiscountArmor) { - discount += ((IManaDiscountArmor) armor.getItem()).getDiscount(armor, i, player, tool); - } - } - - ManaDiscountEvent event = new ManaDiscountEvent(player, discount, tool); - MinecraftForge.EVENT_BUS.post(event); - discount = event.getDiscount(); - - return discount; + default float getFullDiscountForTools(PlayerEntity player, ItemStack tool) { + return 0; } } diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemsEvent.java b/src/main/java/vazkii/botania/api/mana/ManaItemsEvent.java index a189b8d30..98a3ab651 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemsEvent.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemsEvent.java @@ -14,6 +14,11 @@ import net.minecraftforge.eventbus.api.Event; import java.util.List; +/** + * Fired when the mod is gathering all items on a player that have mana. + * For example, if you are an accessory mod, you would listen to this event and add stacks in your + * accessory slots to the list using {@link #add}. + */ public class ManaItemsEvent extends Event { private final PlayerEntity entityPlayer; @@ -24,7 +29,7 @@ public class ManaItemsEvent extends Event { this.items = items; } - public PlayerEntity getEntityPlayer() { + public PlayerEntity getPlayer() { return entityPlayer; } diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 373fdb33f..f351c8c74 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -199,7 +199,7 @@ public final class HUDHandler { } } - List items = ManaItemHandler.getManaItems(player); + List items = ManaItemHandler.instance().getManaItems(player); for (ItemStack stack : items) { Item item = stack.getItem(); if (!((IManaItem) item).isNoExport(stack)) { @@ -211,7 +211,7 @@ public final class HUDHandler { } } - List acc = ManaItemHandler.getManaAccesories(player); + List acc = ManaItemHandler.instance().getManaAccesories(player); for (ItemStack stack : acc) { Item item = stack.getItem(); if (!((IManaItem) item).isNoExport(stack)) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 5471154f7..a7abd14f2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -24,7 +24,7 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import net.minecraft.util.math.MathHelper; -import vazkii.botania.api.ColorHelper; +import vazkii.botania.common.core.helper.ColorHelper; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.mana.BlockSpreader; diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index e96dd7bfd..0ed028483 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -33,7 +33,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.ColorHelper; +import vazkii.botania.common.core.helper.ColorHelper; import vazkii.botania.api.capability.FloatingFlowerImpl; import vazkii.botania.api.item.IExoflameHeatable; import vazkii.botania.api.item.IFloatingFlower; diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 66a33259c..a3b80dc5a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -111,10 +111,10 @@ public class BlockAltar extends BlockMod { tile.trySetLastRecipe(player); return ActionResultType.SUCCESS; } else { - if (!stack.isEmpty() && (isValidWaterContainer(stack) || stack.getItem() == ModItems.waterRod && ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, false))) { + if (!stack.isEmpty() && (isValidWaterContainer(stack) || stack.getItem() == ModItems.waterRod && ManaItemHandler.instance().requestManaExact(stack, player, ItemWaterRod.COST, false))) { if (tile.getFluid() == Fluids.EMPTY) { if (stack.getItem() == ModItems.waterRod) { - ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, true); + ManaItemHandler.instance().requestManaExact(stack, player, ItemWaterRod.COST, true); } else if (!player.abilities.isCreativeMode) { player.setHeldItem(hand, drain(Fluids.WATER, stack)); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 771e2b75f..c8d2e9680 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -33,7 +33,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; -import vazkii.botania.api.ColorHelper; +import vazkii.botania.common.core.helper.ColorHelper; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index b62ab56c4..a0eb3d2b6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -31,7 +31,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.ColorHelper; +import vazkii.botania.common.core.helper.ColorHelper; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.lib.LibMisc; diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCSender.java b/src/main/java/vazkii/botania/common/core/handler/IMCSender.java index 18465b87f..6de0bb657 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCSender.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCSender.java @@ -15,7 +15,7 @@ import net.minecraftforge.fml.InterModComms; import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; import net.minecraftforge.registries.IRegistryDelegate; -import vazkii.botania.api.ColorHelper; +import vazkii.botania.common.core.helper.ColorHelper; import vazkii.botania.api.imc.IMC; import vazkii.botania.api.imc.OreWeightMessage; import vazkii.botania.api.imc.PaintableBlockMessage; diff --git a/src/main/java/vazkii/botania/api/ColorHelper.java b/src/main/java/vazkii/botania/common/core/helper/ColorHelper.java similarity index 99% rename from src/main/java/vazkii/botania/api/ColorHelper.java rename to src/main/java/vazkii/botania/common/core/helper/ColorHelper.java index e07baa591..4091faf09 100644 --- a/src/main/java/vazkii/botania/api/ColorHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ColorHelper.java @@ -6,7 +6,7 @@ * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ -package vazkii.botania.api; +package vazkii.botania.common.core.helper; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; diff --git a/src/main/java/vazkii/botania/common/impl/ManaItemHandlerImpl.java b/src/main/java/vazkii/botania/common/impl/ManaItemHandlerImpl.java new file mode 100644 index 000000000..56bc4acde --- /dev/null +++ b/src/main/java/vazkii/botania/common/impl/ManaItemHandlerImpl.java @@ -0,0 +1,220 @@ +package vazkii.botania.common.impl; + +import com.google.common.collect.Iterables; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.mana.*; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class ManaItemHandlerImpl implements ManaItemHandler { + @Override + public List getManaItems(PlayerEntity player) { + if (player == null) { + return Collections.emptyList(); + } + + List toReturn = new ArrayList<>(); + player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).ifPresent(mainInv -> { + int size = mainInv.getSlots(); + + for (int slot = 0; slot < size; slot++) { + ItemStack stackInSlot = mainInv.getStackInSlot(slot); + + if (!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof IManaItem) { + toReturn.add(stackInSlot); + } + } + }); + + ManaItemsEvent event = new ManaItemsEvent(player, toReturn); + MinecraftForge.EVENT_BUS.post(event); + return event.getItems(); + } + + @Override + public List getManaAccesories(PlayerEntity player) { + if (player == null) { + return Collections.emptyList(); + } + + IItemHandler acc = BotaniaAPI.internalHandler.getAccessoriesInventory(player); + if (acc == null) { + return Collections.emptyList(); + } + + List toReturn = new ArrayList<>(acc.getSlots()); + + for (int slot = 0; slot < acc.getSlots(); slot++) { + ItemStack stackInSlot = acc.getStackInSlot(slot); + + if (!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof IManaItem) { + toReturn.add(stackInSlot); + } + } + + return toReturn; + } + + @Override + public int requestMana(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { + if (stack.isEmpty()) { + return 0; + } + + List items = getManaItems(player); + List acc = getManaAccesories(player); + for (ItemStack stackInSlot : Iterables.concat(items, acc)) { + if (stackInSlot == stack) { + continue; + } + IManaItem manaItem = (IManaItem) stackInSlot.getItem(); + if (manaItem.canExportManaToItem(stackInSlot, stack) && manaItem.getMana(stackInSlot) > 0) { + if (stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canReceiveManaFromItem(stack, stackInSlot)) { + continue; + } + + int mana = Math.min(manaToGet, manaItem.getMana(stackInSlot)); + + if (remove) { + manaItem.addMana(stackInSlot, -mana); + } + + return mana; + } + } + + return 0; + } + + @Override + public boolean requestManaExact(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { + if (stack.isEmpty()) { + return false; + } + + List items = getManaItems(player); + List acc = getManaAccesories(player); + for (ItemStack stackInSlot : Iterables.concat(items, acc)) { + if (stackInSlot == stack) { + continue; + } + IManaItem manaItemSlot = (IManaItem) stackInSlot.getItem(); + if (manaItemSlot.canExportManaToItem(stackInSlot, stack) && manaItemSlot.getMana(stackInSlot) > manaToGet) { + if (stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canReceiveManaFromItem(stack, stackInSlot)) { + continue; + } + + if (remove) { + manaItemSlot.addMana(stackInSlot, -manaToGet); + } + + return true; + } + } + + return false; + } + + @Override + public int dispatchMana(ItemStack stack, PlayerEntity player, int manaToSend, boolean add) { + if (stack.isEmpty()) { + return 0; + } + + List items = getManaItems(player); + List acc = getManaAccesories(player); + for (ItemStack stackInSlot : Iterables.concat(items, acc)) { + if (stackInSlot == stack) { + continue; + } + IManaItem manaItemSlot = (IManaItem) stackInSlot.getItem(); + if (manaItemSlot.canReceiveManaFromItem(stackInSlot, stack)) { + if (stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canExportManaToItem(stack, stackInSlot)) { + continue; + } + + int received; + if (manaItemSlot.getMana(stackInSlot) + manaToSend <= manaItemSlot.getMaxMana(stackInSlot)) { + received = manaToSend; + } else { + received = manaToSend - (manaItemSlot.getMana(stackInSlot) + manaToSend - manaItemSlot.getMaxMana(stackInSlot)); + } + + if (add) { + manaItemSlot.addMana(stackInSlot, manaToSend); + } + + return received; + } + } + + return 0; + } + + @Override + public boolean dispatchManaExact(ItemStack stack, PlayerEntity player, int manaToSend, boolean add) { + if (stack.isEmpty()) { + return false; + } + + List items = getManaItems(player); + List acc = getManaAccesories(player); + for (ItemStack stackInSlot : Iterables.concat(items, acc)) { + if (stackInSlot == stack) { + continue; + } + IManaItem manaItemSlot = (IManaItem) stackInSlot.getItem(); + if (manaItemSlot.getMana(stackInSlot) + manaToSend <= manaItemSlot.getMaxMana(stackInSlot) && manaItemSlot.canReceiveManaFromItem(stackInSlot, stack)) { + if (stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canExportManaToItem(stack, stackInSlot)) { + continue; + } + + if (add) { + manaItemSlot.addMana(stackInSlot, manaToSend); + } + + return true; + } + } + + return false; + } + + @Override + public int requestManaForTool(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { + float multiplier = Math.max(0F, 1F - getFullDiscountForTools(player, stack)); + int cost = (int) (manaToGet * multiplier); + return (int) (requestMana(stack, player, cost, remove) / multiplier); + } + + @Override + public boolean requestManaExactForTool(ItemStack stack, PlayerEntity player, int manaToGet, boolean remove) { + float multiplier = Math.max(0F, 1F - getFullDiscountForTools(player, stack)); + int cost = (int) (manaToGet * multiplier); + return requestManaExact(stack, player, cost, remove); + } + + @Override + public float getFullDiscountForTools(PlayerEntity player, ItemStack tool) { + float discount = 0F; + for (int i = 0; i < player.inventory.armorInventory.size(); i++) { + ItemStack armor = player.inventory.armorInventory.get(i); + if (!armor.isEmpty() && armor.getItem() instanceof IManaDiscountArmor) { + discount += ((IManaDiscountArmor) armor.getItem()).getDiscount(armor, i, player, tool); + } + } + + ManaDiscountEvent event = new ManaDiscountEvent(player, discount, tool); + MinecraftForge.EVENT_BUS.post(event); + discount = event.getDiscount(); + + return discount; + } +} diff --git a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java index ae3c914b1..db94ada05 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java +++ b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java @@ -104,7 +104,7 @@ public class ItemAstrolabe extends Item { int size = getSize(stack); int cost = size * 320; - if (!ManaItemHandler.requestManaExact(stack, player, cost, false)) { + if (!ManaItemHandler.instance().requestManaExact(stack, player, cost, false)) { return false; } @@ -112,7 +112,7 @@ public class ItemAstrolabe extends Item { for (BlockPos coords : blocksToPlace) { placeBlockAndConsume(player, stack, stackToPlace, coords); } - ManaItemHandler.requestManaExact(stack, player, cost, true); + ManaItemHandler.instance().requestManaExact(stack, player, cost, true); return true; } diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index 9a3137278..8165aa882 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -44,12 +44,12 @@ public class ItemEnderHand extends Item implements IManaUsingItem, IBlockProvide @Override public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { ItemStack stack = player.getHeldItem(hand); - if (ManaItemHandler.requestManaExact(stack, player, COST_SELF, false)) { + if (ManaItemHandler.instance().requestManaExact(stack, player, COST_SELF, false)) { if (!player.world.isRemote) { player.openContainer(new SimpleNamedContainerProvider((windowId, playerInv, p) -> { return ChestContainer.createGeneric9X3(windowId, playerInv, p.getInventoryEnderChest()); }, EnderChestBlock.field_220115_d)); - ManaItemHandler.requestManaExact(stack, player, COST_SELF, true); + ManaItemHandler.instance().requestManaExact(stack, player, COST_SELF, true); } player.playSound(SoundEvents.BLOCK_ENDER_CHEST_OPEN, 1F, 1F); return ActionResult.success(stack); @@ -59,14 +59,14 @@ public class ItemEnderHand extends Item implements IManaUsingItem, IBlockProvide @Override public boolean itemInteractionForEntity(ItemStack stack, PlayerEntity player, LivingEntity entity, Hand hand) { - if (ConfigHandler.COMMON.enderPickpocketEnabled.get() && entity instanceof PlayerEntity && ManaItemHandler.requestManaExact(stack, player, COST_OTHER, false)) { + if (ConfigHandler.COMMON.enderPickpocketEnabled.get() && entity instanceof PlayerEntity && ManaItemHandler.instance().requestManaExact(stack, player, COST_OTHER, false)) { if (!player.world.isRemote) { PlayerEntity other = (PlayerEntity) entity; player.openContainer(new SimpleNamedContainerProvider((windowId, playerInv, p) -> { return ChestContainer.createGeneric9X3(windowId, playerInv, other.getInventoryEnderChest()); }, EnderChestBlock.field_220115_d)); } - ManaItemHandler.requestManaExact(stack, player, COST_OTHER, true); + ManaItemHandler.instance().requestManaExact(stack, player, COST_OTHER, true); player.playSound(SoundEvents.BLOCK_ENDER_CHEST_OPEN, 1F, 1F); return true; } @@ -87,10 +87,10 @@ public class ItemEnderHand extends Item implements IManaUsingItem, IBlockProvide ItemStack istack = ItemExchangeRod.removeFromInventory(player, new InvWrapper(player.getInventoryEnderChest()), stack, block, false); if (!istack.isEmpty()) { - boolean mana = ManaItemHandler.requestManaExact(stack, player, COST_PROVIDE, false); + boolean mana = ManaItemHandler.instance().requestManaExact(stack, player, COST_PROVIDE, false); if (mana) { if (doit) { - ManaItemHandler.requestManaExact(stack, player, COST_PROVIDE, true); + ManaItemHandler.instance().requestManaExact(stack, player, COST_PROVIDE, true); ItemExchangeRod.removeFromInventory(player, new InvWrapper(player.getInventoryEnderChest()), stack, block, true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 0324ed958..dae71fe3e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -87,7 +87,7 @@ public class ItemManaGun extends Item implements IManaUsingItem { return ActionResult.success(stack); } else if (stack.getDamage() == 0) { EntityManaBurst burst = getBurst(player, stack, true, hand); - if (burst != null && ManaItemHandler.requestManaExact(stack, player, burst.getMana(), true)) { + if (burst != null && ManaItemHandler.instance().requestManaExact(stack, player, burst.getMana(), true)) { if (!world.isRemote) { world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.manaBlaster, SoundCategory.PLAYERS, 0.6F, 1); world.addEntity(burst); @@ -157,7 +157,7 @@ public class ItemManaGun extends Item implements IManaUsingItem { BurstProperties props = getBurstProps(player, stack, request, hand); burst.setSourceLens(getLens(stack)); - if (!request || ManaItemHandler.requestManaExact(stack, player, props.maxMana, false)) { + if (!request || ManaItemHandler.instance().requestManaExact(stack, player, props.maxMana, false)) { burst.setColor(props.color); burst.setMana(props.maxMana); burst.setStartingMana(props.maxMana); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 894874353..1807d9730 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -74,7 +74,7 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh @Override public void onArmorTick(ItemStack stack, World world, PlayerEntity player) { - if (!world.isRemote && stack.getDamage() > 0 && ManaItemHandler.requestManaExact(stack, player, MANA_PER_DAMAGE * 2, true)) { + if (!world.isRemote && stack.getDamage() > 0 && ManaItemHandler.instance().requestManaExact(stack, player, MANA_PER_DAMAGE * 2, true)) { stack.setDamage(stack.getDamage() - 1); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java index e42b08515..1cd919666 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java @@ -43,7 +43,7 @@ public class ItemManaweaveHelm extends ItemManaweaveArmor implements IManaDiscou @Override public void onArmorTick(ItemStack stack, World world, PlayerEntity player) { - if (!world.isRemote && stack.getDamage() > 0 && ManaItemHandler.requestManaExact(stack, player, MANA_PER_DAMAGE * 2, true)) { + if (!world.isRemote && stack.getDamage() > 0 && ManaItemHandler.instance().requestManaExact(stack, player, MANA_PER_DAMAGE * 2, true)) { stack.setDamage(stack.getDamage() - 1); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 1015f16ec..0bad2099f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -62,7 +62,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc if (food > 0 && food < 18 && player.shouldHeal() && player.ticksExisted % 80 == 0) { player.heal(1F); } - ManaItemHandler.dispatchManaExact(stack, player, 1, true); + ManaItemHandler.instance().dispatchManaExact(stack, player, 1, true); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java index 2b86cd51d..af29b9a33 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java @@ -24,7 +24,7 @@ public class ItemAuraRing extends ItemBauble implements IManaGivingItem { @Override public void onWornTick(ItemStack stack, LivingEntity player) { if (!player.world.isRemote && player instanceof PlayerEntity && player.ticksExisted % 10 == 0) { - ManaItemHandler.dispatchManaExact(stack, (PlayerEntity) player, 1, true); + ManaItemHandler.instance().dispatchManaExact(stack, (PlayerEntity) player, 1, true); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index b1a74cf52..92cf07820 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -98,7 +98,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre EffectInstance effect = brew.getPotionEffects(stack).get(0); float cost = (float) brew.getManaCost(stack) / effect.getDuration() / (1 + effect.getAmplifier()) * 2.5F; boolean doRand = cost < 1; - if (ManaItemHandler.requestManaExact(stack, eplayer, (int) Math.ceil(cost), false)) { + if (ManaItemHandler.instance().requestManaExact(stack, eplayer, (int) Math.ceil(cost), false)) { EffectInstance currentEffect = player.getActivePotionEffect(effect.getPotion()); boolean nightVision = effect.getPotion() == Effects.NIGHT_VISION; if (currentEffect == null || currentEffect.getDuration() < (nightVision ? 305 : 3)) { @@ -107,7 +107,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } if (!doRand || Math.random() < cost) { - ManaItemHandler.requestManaExact(stack, eplayer, (int) Math.ceil(cost), true); + ManaItemHandler.instance().requestManaExact(stack, eplayer, (int) Math.ceil(cost), true); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index f7791838d..8cb06a46d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -66,7 +66,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem { if (!amulet.isEmpty()) { final int cost = 250; - if (ManaItemHandler.requestManaExact(amulet, player, cost, false)) { + if (ManaItemHandler.instance().requestManaExact(amulet, player, cost, false)) { final int range = 20; List mobs = player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(target.getX() - range, target.getY() - range, target.getZ() - range, target.getX() + range, target.getY() + range, target.getZ() + range), Predicates.instanceOf(IMob.class)); @@ -78,7 +78,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem { ((CreeperEntity) event.getEntityLiving()).timeSinceIgnited = 2; } - ManaItemHandler.requestManaExact(amulet, player, cost, true); + ManaItemHandler.instance().requestManaExact(amulet, player, cost, true); player.world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.divaCharm, SoundCategory.PLAYERS, 1F, 1F); PacketHandler.sendToNearby(target.world, target, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.DIVA_EFFECT, target.getX(), target.getY(), target.getZ(), target.getEntityId())); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index aa7363815..cee3edab9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -122,7 +122,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { player.abilities.allowFlying = true; if (player.abilities.isFlying) { if (!player.world.isRemote) { - ManaItemHandler.requestManaExact(tiara, player, getCost(tiara, left), true); + ManaItemHandler.instance().requestManaExact(tiara, player, getCost(tiara, left), true); } else if (Math.abs(player.getMotion().getX()) > 0.1 || Math.abs(player.getMotion().getZ()) > 0.1) { double x = event.getEntityLiving().getX() - 0.5; double y = event.getEntityLiving().getY() - 0.5; @@ -218,7 +218,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { if (!armor.isEmpty()) { int left = ItemNBTHelper.getInt(armor, TAG_TIME_LEFT, MAX_FLY_TIME); boolean flying = ItemNBTHelper.getBoolean(armor, TAG_FLYING, false); - return (left > (flying ? 0 : MAX_FLY_TIME / 10) || player.inventory.hasItemStack(new ItemStack(ModItems.flugelEye))) && ManaItemHandler.requestManaExact(armor, player, getCost(armor, left), false); + return (left > (flying ? 0 : MAX_FLY_TIME / 10) || player.inventory.hasItemStack(new ItemStack(ModItems.flugelEye))) && ManaItemHandler.instance().requestManaExact(armor, player, getCost(armor, left), false); } return false; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java index 87b437712..b51981d45 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java @@ -54,7 +54,7 @@ public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem { for (PlayerEntity player : players) { ItemStack charm = EquipmentHandler.findOrEmpty(ModItems.goddessCharm, player); - if (!charm.isEmpty() && ManaItemHandler.requestManaExact(charm, player, COST, true)) { + if (!charm.isEmpty() && ManaItemHandler.instance().requestManaExact(charm, player, COST, true)) { event.getAffectedBlocks().clear(); return; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java index b22cc645d..ffa656cd0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java @@ -24,7 +24,7 @@ public class ItemGreaterAuraRing extends ItemBauble implements IManaGivingItem { @Override public void onWornTick(ItemStack stack, LivingEntity player) { if (!player.world.isRemote && player instanceof PlayerEntity && player.ticksExisted % 2 == 0) { - ManaItemHandler.dispatchManaExact(stack, (PlayerEntity) player, 1, true); + ManaItemHandler.instance().dispatchManaExact(stack, (PlayerEntity) player, 1, true); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemInvisibilityCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemInvisibilityCloak.java index dc2e19a96..c8d7562be 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemInvisibilityCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemInvisibilityCloak.java @@ -35,7 +35,7 @@ public class ItemInvisibilityCloak extends ItemBauble implements IManaUsingItem public void onWornTick(ItemStack stack, LivingEntity player) { if (player instanceof PlayerEntity && !player.world.isRemote) { int manaCost = 2; - boolean hasMana = ManaItemHandler.requestManaExact(stack, (PlayerEntity) player, manaCost, false); + boolean hasMana = ManaItemHandler.instance().requestManaExact(stack, (PlayerEntity) player, manaCost, false); if (!hasMana) { onUnequipped(stack, player); } else { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java index 609a82e7e..b7ae67178 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java @@ -27,7 +27,7 @@ public class ItemMiningRing extends ItemBauble implements IManaUsingItem { public void onWornTick(ItemStack stack, LivingEntity player) { if (player instanceof PlayerEntity && !player.world.isRemote) { int manaCost = 5; - boolean hasMana = ManaItemHandler.requestManaExact(stack, (PlayerEntity) player, manaCost, false); + boolean hasMana = ManaItemHandler.instance().requestManaExact(stack, (PlayerEntity) player, manaCost, false); if (!hasMana) { onUnequipped(stack, player); } else { @@ -39,7 +39,7 @@ public class ItemMiningRing extends ItemBauble implements IManaUsingItem { } if (player.swingProgress == 0.25F) { - ManaItemHandler.requestManaExact(stack, (PlayerEntity) player, manaCost, true); + ManaItemHandler.instance().requestManaExact(stack, (PlayerEntity) player, manaCost, true); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java index 0ece5668a..2abc224eb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java @@ -58,7 +58,7 @@ public class ItemThirdEye extends ItemBauble implements IManaUsingItem { for (LivingEntity e : mobs) { EffectInstance potion = e.getActivePotionEffect(Effects.GLOWING); - if ((potion == null || potion.getDuration() <= 2) && ManaItemHandler.requestManaExact(stack, eplayer, COST, true)) { + if ((potion == null || potion.getDuration() <= 2) && ManaItemHandler.instance().requestManaExact(stack, eplayer, COST, true)) { e.addPotionEffect(new EffectInstance(Effects.GLOWING, 12, 0)); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 992f3f5c6..eac91ce65 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -81,7 +81,7 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem { beltItem.onMovedTick(belt, player); if (player.ticksExisted % COST_INTERVAL == 0) { - ManaItemHandler.requestManaExact(belt, player, COST, true); + ManaItemHandler.instance().requestManaExact(belt, player, COST, true); } } else { beltItem.onNotMovingTick(belt, player); @@ -118,7 +118,7 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem { PlayerEntity player = (PlayerEntity) event.getEntityLiving(); ItemStack belt = EquipmentHandler.findOrEmpty(s -> s.getItem() instanceof ItemTravelBelt, player); - if (!belt.isEmpty() && ManaItemHandler.requestManaExact(belt, player, COST, false)) { + if (!belt.isEmpty() && ManaItemHandler.instance().requestManaExact(belt, player, COST, false)) { player.setMotion(player.getMotion().add(0, ((ItemTravelBelt) belt.getItem()).jump, 0)); player.fallDistance = -((ItemTravelBelt) belt.getItem()).fallBuffer; } @@ -127,7 +127,7 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem { private boolean shouldPlayerHaveStepup(PlayerEntity player) { ItemStack result = EquipmentHandler.findOrEmpty(s -> s.getItem() instanceof ItemTravelBelt, player); - return !result.isEmpty() && ManaItemHandler.requestManaExact(result, player, COST, false); + return !result.isEmpty() && ManaItemHandler.instance().requestManaExact(result, player, COST, false); } private void playerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java index 226278812..bb8b6b968 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java @@ -38,7 +38,7 @@ public class ItemWaterRing extends ItemBauble implements IManaUsingItem { } if (!living.world.isRemote) { - if (living instanceof PlayerEntity && !ManaItemHandler.requestManaExact(stack, (PlayerEntity) living, COST, true)) { + if (living instanceof PlayerEntity && !ManaItemHandler.instance().requestManaExact(stack, (PlayerEntity) living, COST, true)) { onUnequipped(stack, living); } else { addEffect(living, Effects.CONDUIT_POWER); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index 1b2e2597e..e955ce46e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -57,7 +57,7 @@ public final class ToolCommons { PlayerEntity player = (PlayerEntity) entity; while (amount > 0) { - if (ManaItemHandler.requestManaExactForTool(stack, player, manaPerDamage, true)) { + if (ManaItemHandler.instance().requestManaExactForTool(stack, player, manaPerDamage, true)) { amount--; } else { break; @@ -69,7 +69,7 @@ public final class ToolCommons { public static void damageItem(ItemStack stack, int dmg, LivingEntity entity, int manaPerDamage) { int manaToRequest = dmg * manaPerDamage; - boolean manaRequested = entity instanceof PlayerEntity && ManaItemHandler.requestManaExactForTool(stack, (PlayerEntity) entity, manaToRequest, true); + boolean manaRequested = entity instanceof PlayerEntity && ManaItemHandler.instance().requestManaExactForTool(stack, (PlayerEntity) entity, manaToRequest, true); if (!manaRequested) { stack.damageItem(dmg, entity, e -> {}); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java index 932ed5a1a..bd80d0700 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java @@ -33,14 +33,14 @@ public class ItemCrystalBow extends ItemLivingwoodBow { @Override boolean canFire(ItemStack stack, PlayerEntity player) { boolean infinity = EnchantmentHelper.getEnchantmentLevel(Enchantments.INFINITY, stack) > 0; - return player.abilities.isCreativeMode || ManaItemHandler.requestManaExactForTool(stack, player, ARROW_COST / (infinity ? 2 : 1), false); + return player.abilities.isCreativeMode || ManaItemHandler.instance().requestManaExactForTool(stack, player, ARROW_COST / (infinity ? 2 : 1), false); } @Override void onFire(ItemStack stack, LivingEntity living, boolean infinity, AbstractArrowEntity arrow) { arrow.pickupStatus = AbstractArrowEntity.PickupStatus.CREATIVE_ONLY; if (living instanceof PlayerEntity) { - ManaItemHandler.requestManaExactForTool(stack, (PlayerEntity) living, ARROW_COST / (infinity ? 2 : 1), true); + ManaItemHandler.instance().requestManaExactForTool(stack, (PlayerEntity) living, ARROW_COST / (infinity ? 2 : 1), true); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index c24c3f6fe..711dc504b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -155,7 +155,7 @@ public class ItemLivingwoodBow extends BowItem implements IManaUsingItem { @Override public void inventoryTick(ItemStack stack, World world, Entity player, int slot, boolean selected) { - if (!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (PlayerEntity) player, MANA_PER_DAMAGE * 2, true)) { + if (!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.instance().requestManaExactForTool(stack, (PlayerEntity) player, MANA_PER_DAMAGE * 2, true)) { stack.setDamage(stack.getDamage() - 1); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index d2774795b..29df85661 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -76,7 +76,7 @@ public class ItemManasteelAxe extends AxeItem implements IManaUsingItem, ISortab @Override public void inventoryTick(ItemStack stack, World world, Entity player, int slot, boolean selected) { - if (!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (PlayerEntity) player, getManaPerDamage() * 2, true)) { + if (!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.instance().requestManaExactForTool(stack, (PlayerEntity) player, getManaPerDamage() * 2, true)) { stack.setDamage(stack.getDamage() - 1); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index d944b6687..574b6df93 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -76,7 +76,7 @@ public class ItemManasteelPick extends PickaxeItem implements IManaUsingItem, IS @Override public void inventoryTick(ItemStack stack, World world, Entity player, int slot, boolean selected) { - if (!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (PlayerEntity) player, MANA_PER_DAMAGE * 2, true)) { + if (!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.instance().requestManaExactForTool(stack, (PlayerEntity) player, MANA_PER_DAMAGE * 2, true)) { stack.setDamage(stack.getDamage() - 1); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index e1c69e654..687526cf5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -108,7 +108,7 @@ public class ItemManasteelShears extends ShearsItem implements IManaUsingItem { @Override public void inventoryTick(ItemStack stack, World world, Entity player, int slot, boolean selected) { - if (!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (PlayerEntity) player, MANA_PER_DAMAGE * 2, true)) { + if (!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.instance().requestManaExactForTool(stack, (PlayerEntity) player, MANA_PER_DAMAGE * 2, true)) { stack.setDamage(stack.getDamage() - 1); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index eda527c6f..720d39acf 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -120,7 +120,7 @@ public class ItemManasteelShovel extends ShovelItem implements IManaUsingItem, I @Override public void inventoryTick(ItemStack stack, World world, Entity player, int slot, boolean selected) { - if (!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (PlayerEntity) player, getManaPerDamage() * 2, true)) { + if (!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.instance().requestManaExactForTool(stack, (PlayerEntity) player, getManaPerDamage() * 2, true)) { stack.setDamage(stack.getDamage() - 1); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index 934085dbb..f8bc7ff61 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -45,7 +45,7 @@ public class ItemManasteelSword extends SwordItem implements IManaUsingItem { @Override public void inventoryTick(ItemStack stack, World world, Entity player, int slot, boolean selected) { - if (!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (PlayerEntity) player, getManaPerDamage() * 2, true)) { + if (!world.isRemote && player instanceof PlayerEntity && stack.getDamage() > 0 && ManaItemHandler.instance().requestManaExactForTool(stack, (PlayerEntity) player, getManaPerDamage() * 2, true)) { stack.setDamage(stack.getDamage() - 1); } } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java index 3d8655ddd..b539556bb 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -22,7 +22,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.ColorHelper; +import vazkii.botania.common.core.helper.ColorHelper; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.item.Item16Colors; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index 4aa4939c3..6dbec7f71 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -108,7 +108,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs int cost = (int) (MathHelper.pointDistanceSpace(x + 0.5, y + 0.5, z + 0.5, living.getX(), living.getY(), living.getZ()) * 10); if (loc.getDimension() == world.getDimension().getType() - && (!(living instanceof PlayerEntity) || ManaItemHandler.requestManaExact(stack, (PlayerEntity) living, cost, true))) { + && (!(living instanceof PlayerEntity) || ManaItemHandler.instance().requestManaExact(stack, (PlayerEntity) living, cost, true))) { moveParticlesAndSound(living); living.setPositionAndUpdate(x + 0.5, y + 1.5, z + 0.5); moveParticlesAndSound(living); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index fa463c465..1d8a0fcd2 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -61,7 +61,7 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { return; } PlayerEntity player = (PlayerEntity) living; - if (ManaItemHandler.requestManaExact(stack, player, 500, true)) { + if (ManaItemHandler.instance().requestManaExact(stack, player, 500, true)) { if (count % 5 == 0) { player.getFoodStats().addStats(1, 1F); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index c20d42737..a152a916e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -63,7 +63,7 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { public void onUsingTick(ItemStack stack, LivingEntity living, int count) { int spawned = getWeaponsSpawned(stack); - if (count != getUseDuration(stack) && spawned < 20 && !living.world.isRemote && (!(living instanceof PlayerEntity) || ManaItemHandler.requestManaExact(stack, (PlayerEntity) living, 150, true))) { + if (count != getUseDuration(stack) && spawned < 20 && !living.world.isRemote && (!(living instanceof PlayerEntity) || ManaItemHandler.instance().requestManaExact(stack, (PlayerEntity) living, 150, true))) { Vector3 look = new Vector3(living.getLookVec()).multiply(1, 0, 1); double playerRot = Math.toRadians(living.rotationYaw + 90); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 0f22d7b16..e92575279 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -114,7 +114,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat int successes = 0; for (BlockPos cursor : cursors) { BlockPos pos = hit.add(cursor); - if (ManaItemHandler.requestManaExact(lokiRing, player, cost, false)) { + if (ManaItemHandler.instance().requestManaExact(lokiRing, player, cost, false)) { Vec3d lookHit = lookPos.getHitVec(); Vec3d newHitVec = new Vec3d(pos.getX() + MathHelper.frac(lookHit.getX()), pos.getY() + MathHelper.frac(lookHit.getY()), pos.getZ() + MathHelper.frac(lookHit.getZ())); BlockRayTraceResult newHit = new BlockRayTraceResult(newHitVec, lookPos.getFace(), pos, false); @@ -128,7 +128,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat } if (result == ActionResultType.SUCCESS) { - ManaItemHandler.requestManaExact(lokiRing, player, cost, true); + ManaItemHandler.instance().requestManaExact(lokiRing, player, cost, true); successes++; } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java index 10e242076..c6efbfcdc 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -44,7 +44,7 @@ public class ItemCobbleRod extends Item implements IManaUsingItem, IBlockProvide @Override public boolean provideBlock(PlayerEntity player, ItemStack requestor, ItemStack stack, Block block, boolean doit) { if (block == Blocks.COBBLESTONE) { - return !doit || ManaItemHandler.requestManaExactForTool(requestor, player, COST, true); + return !doit || ManaItemHandler.instance().requestManaExactForTool(requestor, player, COST, true); } return false; } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java index 1877a3be6..408d179ab 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -58,7 +58,7 @@ public class ItemDirtRod extends Item implements IManaUsingItem, IBlockProvider, Direction side = ctx.getFace(); BlockPos pos = ctx.getPos(); - if (player != null && ManaItemHandler.requestManaExactForTool(stack, player, cost, false)) { + if (player != null && ManaItemHandler.instance().requestManaExactForTool(stack, player, cost, false)) { int entities = world.getEntitiesWithinAABB(LivingEntity.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size(); @@ -67,7 +67,7 @@ public class ItemDirtRod extends Item implements IManaUsingItem, IBlockProvider, PlayerHelper.substituteUse(ctx, stackToPlace); if (stackToPlace.isEmpty()) { - ManaItemHandler.requestManaExactForTool(stack, player, cost, true); + ManaItemHandler.instance().requestManaExactForTool(stack, player, cost, true); SparkleParticleData data = SparkleParticleData.sparkle(1F, r, g, b, 5); for (int i = 0; i < 6; i++) { world.addParticle(data, pos.getX() + side.getXOffset() + Math.random(), pos.getY() + side.getYOffset() + Math.random(), pos.getZ() + side.getZOffset() + Math.random(), 0, 0, 0); @@ -90,7 +90,7 @@ public class ItemDirtRod extends Item implements IManaUsingItem, IBlockProvider, @Override public boolean provideBlock(PlayerEntity player, ItemStack requestor, ItemStack stack, Block block, boolean doit) { if (block == Blocks.DIRT) { - return !doit || ManaItemHandler.requestManaExactForTool(requestor, player, COST, true); + return !doit || ManaItemHandler.instance().requestManaExactForTool(requestor, player, COST, true); } return false; } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index a521834e5..7ffa7f856 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -49,7 +49,7 @@ public class ItemDiviningRod extends Item implements IManaUsingItem, IAvatarWiel @Override public ActionResult onItemRightClick(World world, PlayerEntity p, @Nonnull Hand hand) { ItemStack stack = p.getHeldItem(hand); - if (ManaItemHandler.requestManaExactForTool(stack, p, COST, true)) { + if (ManaItemHandler.instance().requestManaExactForTool(stack, p, COST, true)) { if (world.isRemote) { int range = IManaProficiencyArmor.hasProficiency(p, stack) ? 20 : 15; long seedxor = world.rand.nextLong(); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index f467d1972..5da401b30 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -107,9 +107,9 @@ public class ItemExchangeRod extends Item implements IManaUsingItem, IWireframeC private void onLeftClick(PlayerInteractEvent.LeftClickBlock event) { ItemStack stack = event.getItemStack(); - if (!stack.isEmpty() && stack.getItem() == this && canExchange(stack) && ManaItemHandler.requestManaExactForTool(stack, event.getPlayer(), COST, false)) { + if (!stack.isEmpty() && stack.getItem() == this && canExchange(stack) && ManaItemHandler.instance().requestManaExactForTool(stack, event.getPlayer(), COST, false)) { if (exchange(event.getWorld(), event.getPlayer(), event.getPos(), stack, getState(stack))) { - ManaItemHandler.requestManaExactForTool(stack, event.getPlayer(), COST, true); + ManaItemHandler.instance().requestManaExactForTool(stack, event.getPlayer(), COST, true); } } } @@ -130,7 +130,7 @@ public class ItemExchangeRod extends Item implements IManaUsingItem, IWireframeC BlockState state = getState(stack); if (ItemNBTHelper.getBoolean(stack, TAG_SWAPPING, false)) { - if (!ManaItemHandler.requestManaExactForTool(stack, player, COST, false)) { + if (!ManaItemHandler.instance().requestManaExactForTool(stack, player, COST, false)) { ItemNBTHelper.setBoolean(stack, TAG_SWAPPING, false); return; } @@ -148,7 +148,7 @@ public class ItemExchangeRod extends Item implements IManaUsingItem, IWireframeC BlockPos coords = swap.get(world.rand.nextInt(swap.size())); boolean exchange = exchange(world, player, coords, stack, state); if (exchange) { - ManaItemHandler.requestManaExactForTool(stack, player, COST, true); + ManaItemHandler.instance().requestManaExactForTool(stack, player, COST, true); } else { ItemNBTHelper.setBoolean(stack, TAG_SWAPPING, false); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java index a852a526b..ed4c01ce7 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -49,13 +49,13 @@ public class ItemFireRod extends Item implements IManaUsingItem, IAvatarWieldabl ItemStack stack = ctx.getItem(); BlockPos pos = ctx.getPos(); - if (!world.isRemote && player != null && ManaItemHandler.requestManaExactForTool(stack, player, COST, false)) { + if (!world.isRemote && player != null && ManaItemHandler.instance().requestManaExactForTool(stack, player, COST, false)) { EntityFlameRing entity = new EntityFlameRing(world); entity.setPosition(pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5); world.addEntity(entity); player.getCooldownTracker().setCooldown(this, IManaProficiencyArmor.hasProficiency(player, stack) ? COOLDOWN / 2 : COOLDOWN); - ManaItemHandler.requestManaExactForTool(stack, player, COST, true); + ManaItemHandler.instance().requestManaExactForTool(stack, player, COST, true); ctx.getWorld().playSound(null, pos.getX(), pos.getY(), pos.getZ(), SoundEvents.ENTITY_BLAZE_AMBIENT, player != null ? SoundCategory.PLAYERS : SoundCategory.BLOCKS, 1F, 1F); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index d1951200a..334518d45 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -145,7 +145,7 @@ public class ItemGravityRod extends Item implements IManaUsingItem { return ActionResult.fail(stack); } - if (ManaItemHandler.requestManaExactForTool(stack, player, COST, true)) { + if (ManaItemHandler.instance().requestManaExactForTool(stack, player, COST, true)) { if (target instanceof ItemEntity) { ((ItemEntity) target).setPickupDelay(5); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index 7acabd506..48fea37ce 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -60,9 +60,9 @@ public class ItemMissileRod extends Item implements IManaUsingItem, IAvatarWield } PlayerEntity player = (PlayerEntity) living; - if (count != getUseDuration(stack) && count % (IManaProficiencyArmor.hasProficiency(player, stack) ? 1 : 2) == 0 && !player.world.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST_PER, false)) { + if (count != getUseDuration(stack) && count % (IManaProficiencyArmor.hasProficiency(player, stack) ? 1 : 2) == 0 && !player.world.isRemote && ManaItemHandler.instance().requestManaExactForTool(stack, player, COST_PER, false)) { if (spawnMissile(player.world, player, player.getX() + (Math.random() - 0.5 * 0.1), player.getY() + 2.4 + (Math.random() - 0.5 * 0.1), player.getZ() + (Math.random() - 0.5 * 0.1))) { - ManaItemHandler.requestManaExactForTool(stack, player, COST_PER, true); + ManaItemHandler.instance().requestManaExactForTool(stack, player, COST_PER, true); } SparkleParticleData data = SparkleParticleData.sparkle(6F, 1F, 0.4F, 1F, 6); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 1606ddb5f..5a0c17b69 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -55,7 +55,7 @@ public class ItemRainbowRod extends Item implements IManaUsingItem, IAvatarWield @Override public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { ItemStack stack = player.getHeldItem(hand); - if (!world.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, MANA_COST, false)) { + if (!world.isRemote && ManaItemHandler.instance().requestManaExactForTool(stack, player, MANA_COST, false)) { Block place = ModBlocks.bifrost; Vector3 vector = new Vector3(player.getLookVec()).normalize(); @@ -113,7 +113,7 @@ public class ItemRainbowRod extends Item implements IManaUsingItem, IAvatarWield if (count > 0) { world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.bifrostRod, SoundCategory.PLAYERS, 0.5F, 0.25F); - ManaItemHandler.requestManaExactForTool(stack, player, MANA_COST, false); + ManaItemHandler.instance().requestManaExactForTool(stack, player, MANA_COST, false); player.getCooldownTracker().setCooldown(this, TIME); } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java index 0df96870b..8ec3bf889 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -40,7 +40,7 @@ public class ItemSkyDirtRod extends ItemDirtRod { @Override public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { ItemStack stack = player.getHeldItem(hand); - if (!world.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST * 2, false)) { + if (!world.isRemote && ManaItemHandler.instance().requestManaExactForTool(stack, player, COST * 2, false)) { Vector3 playerVec = Vector3.fromEntityCenter(player); Vector3 lookVec = new Vector3(player.getLookVec()).multiply(3); Vector3 placeVec = playerVec.add(lookVec); @@ -57,7 +57,7 @@ public class ItemSkyDirtRod extends ItemDirtRod { PlayerHelper.substituteUse(new ItemUseContext(player, hand, hit), stackToPlace); if (stackToPlace.isEmpty()) { - ManaItemHandler.requestManaExactForTool(stack, player, COST * 2, true); + ManaItemHandler.instance().requestManaExactForTool(stack, player, COST * 2, true); SparkleParticleData data = SparkleParticleData.sparkle(1F, 0.35F, 0.2F, 0.05F, 5); for (int i = 0; i < 6; i++) { world.addParticle(data, x + Math.random(), y + Math.random(), z + Math.random(), 0, 0, 0); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index a3ce2dee4..de7280571 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -77,7 +77,7 @@ public class ItemSmeltRod extends Item implements IManaUsingItem { PlayerEntity p = (PlayerEntity) living; IInventory dummyInv = new Inventory(1); - if (!ManaItemHandler.requestManaExactForTool(stack, p, COST_PER_TICK, false)) { + if (!ManaItemHandler.instance().requestManaExactForTool(stack, p, COST_PER_TICK, false)) { return; } @@ -109,7 +109,7 @@ public class ItemSmeltRod extends Item implements IManaUsingItem { p.world.playSound(null, p.getX(), p.getY(), p.getZ(), SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.PLAYERS, 0.6F, 1F); p.world.playSound(null, p.getX(), p.getY(), p.getZ(), SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.PLAYERS, 1F, 1F); - ManaItemHandler.requestManaExactForTool(stack, p, COST_PER_TICK, true); + ManaItemHandler.instance().requestManaExactForTool(stack, p, COST_PER_TICK, true); playerData.remove(p); decremented = false; } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index 6e1efe89d..dd1e69fc6 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -135,7 +135,7 @@ public class ItemTerraformRod extends Item implements IManaUsingItem, IBlockProv int cost = COST_PER * blocks.size(); - if (world.isRemote || ManaItemHandler.requestManaExactForTool(stack, player, cost, true)) { + if (world.isRemote || ManaItemHandler.instance().requestManaExactForTool(stack, player, cost, true)) { if (!world.isRemote) { for (CoordsWithBlock block : blocks) { world.setBlockState(block, block.block.getDefaultState()); @@ -173,7 +173,7 @@ public class ItemTerraformRod extends Item implements IManaUsingItem, IBlockProv @Override public boolean provideBlock(PlayerEntity player, ItemStack requestor, ItemStack stack, Block block, boolean doit) { if (block == Blocks.DIRT) { - return !doit || ManaItemHandler.requestManaExactForTool(requestor, player, ItemDirtRod.COST, true); + return !doit || ManaItemHandler.instance().requestManaExactForTool(requestor, player, ItemDirtRod.COST, true); } return false; } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 9e07fe9d9..fe17fddb7 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -108,8 +108,8 @@ public class ItemTornadoRod extends Item implements IManaUsingItem, IAvatarWield public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { ItemStack stack = player.getHeldItem(hand); int fly = getFlyCounter(stack); - if (fly == 0 && ManaItemHandler.requestManaExactForTool(stack, player, COST, false)) { - ManaItemHandler.requestManaExactForTool(stack, player, COST, true); + if (fly == 0 && ManaItemHandler.instance().requestManaExactForTool(stack, player, COST, false)) { + ManaItemHandler.instance().requestManaExactForTool(stack, player, COST, true); setFlying(stack, true); return ActionResult.success(stack); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java index b390692e2..3f6755c30 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -61,7 +61,7 @@ public class ItemWaterRod extends Item implements IManaUsingItem { if (worldIn.isBlockModifiable(playerIn, blockpos) && playerIn.canPlayerEdit(blockpos, blockraytraceresult.getFace(), itemstack)) { BlockState blockstate = worldIn.getBlockState(blockpos); BlockPos blockpos1 = blockstate.getBlock() instanceof ILiquidContainer ? blockpos : blockraytraceresult.getPos().offset(blockraytraceresult.getFace()); - if (ManaItemHandler.requestManaExactForTool(itemstack, playerIn, COST, true) + if (ManaItemHandler.instance().requestManaExactForTool(itemstack, playerIn, COST, true) && ((BucketItem) Items.WATER_BUCKET).tryPlaceContainedLiquid(playerIn, worldIn, blockpos1, blockraytraceresult)) { if (playerIn instanceof ServerPlayerEntity) { CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayerEntity) playerIn, blockpos1, itemstack); diff --git a/src/test/java/vazkii/botania/test/APITest.java b/src/test/java/vazkii/botania/test/APITest.java new file mode 100644 index 000000000..3333f5d27 --- /dev/null +++ b/src/test/java/vazkii/botania/test/APITest.java @@ -0,0 +1,17 @@ +package vazkii.botania.test; + +import org.junit.jupiter.api.Test; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.impl.ManaItemHandlerImpl; + +import static org.junit.jupiter.api.Assertions.*; + +/** + * Basic smoke test to ensure the class name strings in the API are still accurate + */ +public class APITest { + @Test + public void testManaItemHandler() { + assertEquals(ManaItemHandler.instance().getClass(), ManaItemHandlerImpl.class); + } +}