From 8fece2a51720c4ed1d6636ec51ae9e33391e855f Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Fri, 22 Dec 2023 14:53:25 +0700 Subject: [PATCH] Move capabilities impls to subpackages --- .../mc/otm/block/entity/MatteryDeviceBlockEntity.kt | 6 +++--- .../mc/otm/block/entity/decorative/FluidTankBlockEntity.kt | 2 +- .../mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt | 2 +- .../otm/block/entity/matter/MatterReplicatorBlockEntity.kt | 2 +- .../mc/otm/block/entity/tech/EssenceStorageBlockEntity.kt | 2 +- .../mc/otm/block/entity/tech/PoweredFurnaceBlockEntity.kt | 2 +- src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt | 2 ++ .../mc/otm/capability/{ => fluid}/FluidHandlerIterator.kt | 2 +- .../otm/capability/{ => fluid}/FluidHandlerSpliterator.kt | 2 +- .../mc/otm/capability/{ => item}/CombinedItemHandler.kt | 2 +- .../mc/otm/capability/{ => item}/EmptyItemHandler.kt | 2 +- .../mc/otm/capability/{ => item}/ProxiedItemHandler.kt | 2 +- .../otm/capability/{ => item}/UnmodifiableItemHandler.kt | 2 +- .../dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt | 1 - .../ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt | 1 - .../ru/dbotthepony/mc/otm/container/HandlerFilter.kt | 2 +- .../kotlin/ru/dbotthepony/mc/otm/item/FluidCapsuleItem.kt | 3 +-- .../ru/dbotthepony/mc/otm/recipe/EnergyContainerRecipe.kt | 5 ----- .../ru/dbotthepony/mc/otm/recipe/MatterEntanglerRecipe.kt | 1 - .../mc/otm/triggers/MatteryInventoryChangeTrigger.kt | 7 ------- 20 files changed, 18 insertions(+), 32 deletions(-) rename src/main/kotlin/ru/dbotthepony/mc/otm/capability/{ => fluid}/FluidHandlerIterator.kt (94%) rename src/main/kotlin/ru/dbotthepony/mc/otm/capability/{ => fluid}/FluidHandlerSpliterator.kt (96%) rename src/main/kotlin/ru/dbotthepony/mc/otm/capability/{ => item}/CombinedItemHandler.kt (98%) rename src/main/kotlin/ru/dbotthepony/mc/otm/capability/{ => item}/EmptyItemHandler.kt (93%) rename src/main/kotlin/ru/dbotthepony/mc/otm/capability/{ => item}/ProxiedItemHandler.kt (94%) rename src/main/kotlin/ru/dbotthepony/mc/otm/capability/{ => item}/UnmodifiableItemHandler.kt (89%) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryDeviceBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryDeviceBlockEntity.kt index d728a45ce..744da7694 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryDeviceBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryDeviceBlockEntity.kt @@ -16,10 +16,10 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities import net.minecraftforge.fluids.FluidStack import net.minecraftforge.fluids.capability.IFluidHandler import net.minecraftforge.items.IItemHandler -import ru.dbotthepony.mc.otm.capability.CombinedItemHandler -import ru.dbotthepony.mc.otm.capability.EmptyItemHandler +import ru.dbotthepony.mc.otm.capability.item.CombinedItemHandler +import ru.dbotthepony.mc.otm.capability.item.EmptyItemHandler import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.capability.UnmodifiableItemHandler +import ru.dbotthepony.mc.otm.capability.item.UnmodifiableItemHandler import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage import ru.dbotthepony.mc.otm.capability.moveBetweenSlots import ru.dbotthepony.mc.otm.capability.moveEnergy diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/FluidTankBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/FluidTankBlockEntity.kt index 7eadaf2e3..c3e321746 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/FluidTankBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/FluidTankBlockEntity.kt @@ -13,7 +13,7 @@ import net.minecraftforge.fluids.FluidStack import net.minecraftforge.fluids.capability.IFluidHandler import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity -import ru.dbotthepony.mc.otm.capability.CombinedItemHandler +import ru.dbotthepony.mc.otm.capability.item.CombinedItemHandler import ru.dbotthepony.mc.otm.capability.fluid.BlockMatteryFluidHandler import ru.dbotthepony.mc.otm.capability.moveFluid import ru.dbotthepony.mc.otm.config.ItemsConfig diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt index a929d2892..412486113 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt @@ -14,7 +14,7 @@ import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.capability.FlowDirection import ru.dbotthepony.mc.otm.capability.MatteryCapability -import ru.dbotthepony.mc.otm.capability.ProxiedItemHandler +import ru.dbotthepony.mc.otm.capability.item.ProxiedItemHandler import ru.dbotthepony.mc.otm.capability.UpgradeType import ru.dbotthepony.mc.otm.capability.energy.ProfiledEnergyStorage import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt index 76688494d..e95210e30 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt @@ -14,7 +14,7 @@ import ru.dbotthepony.mc.otm.block.entity.JobStatus import ru.dbotthepony.mc.otm.block.entity.ItemJob import ru.dbotthepony.mc.otm.block.entity.MachineJobEventLoop import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity -import ru.dbotthepony.mc.otm.capability.CombinedItemHandler +import ru.dbotthepony.mc.otm.capability.item.CombinedItemHandler import ru.dbotthepony.mc.otm.capability.FlowDirection import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.UpgradeType diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EssenceStorageBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EssenceStorageBlockEntity.kt index a7f83fccd..a591f74d8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EssenceStorageBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EssenceStorageBlockEntity.kt @@ -8,7 +8,7 @@ import net.minecraft.world.item.ItemStack import net.minecraft.world.item.enchantment.Enchantments import net.minecraft.world.level.block.state.BlockState import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity -import ru.dbotthepony.mc.otm.capability.CombinedItemHandler +import ru.dbotthepony.mc.otm.capability.item.CombinedItemHandler import ru.dbotthepony.mc.otm.container.HandlerFilter import ru.dbotthepony.mc.otm.container.MatteryContainer import ru.dbotthepony.mc.otm.item.EssenceCapsuleItem diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PoweredFurnaceBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PoweredFurnaceBlockEntity.kt index c8a7c9716..2226d0829 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PoweredFurnaceBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PoweredFurnaceBlockEntity.kt @@ -16,7 +16,7 @@ import ru.dbotthepony.mc.otm.block.entity.JobContainer import ru.dbotthepony.mc.otm.block.entity.JobStatus import ru.dbotthepony.mc.otm.block.entity.ItemJob import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity -import ru.dbotthepony.mc.otm.capability.CombinedItemHandler +import ru.dbotthepony.mc.otm.capability.item.CombinedItemHandler import ru.dbotthepony.mc.otm.capability.UpgradeType import ru.dbotthepony.mc.otm.capability.energy.ProfiledEnergyStorage import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt index 362f454cc..f7e7c73a4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt @@ -13,6 +13,8 @@ import net.minecraftforge.fluids.capability.IFluidHandler import net.minecraftforge.items.IItemHandler import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage +import ru.dbotthepony.mc.otm.capability.fluid.iterator +import ru.dbotthepony.mc.otm.capability.fluid.stream import ru.dbotthepony.mc.otm.client.ShiftPressedCond import ru.dbotthepony.mc.otm.compat.cos.cosmeticArmorAwareStream import ru.dbotthepony.mc.otm.compat.cos.cosmeticArmorStream diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/FluidHandlerIterator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/FluidHandlerIterator.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/capability/FluidHandlerIterator.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/FluidHandlerIterator.kt index 77984c858..6e81f7cfb 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/FluidHandlerIterator.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/FluidHandlerIterator.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability +package ru.dbotthepony.mc.otm.capability.fluid import it.unimi.dsi.fastutil.objects.ObjectIterators.AbstractIndexBasedIterator import net.minecraftforge.fluids.FluidStack diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/FluidHandlerSpliterator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/FluidHandlerSpliterator.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/mc/otm/capability/FluidHandlerSpliterator.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/FluidHandlerSpliterator.kt index 1cf554f60..4d7f874d8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/FluidHandlerSpliterator.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/FluidHandlerSpliterator.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability +package ru.dbotthepony.mc.otm.capability.fluid import it.unimi.dsi.fastutil.objects.ObjectSpliterator import it.unimi.dsi.fastutil.objects.ObjectSpliterators.AbstractIndexBasedSpliterator diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/CombinedItemHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/item/CombinedItemHandler.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/mc/otm/capability/CombinedItemHandler.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/capability/item/CombinedItemHandler.kt index 450e614cd..518d43e3e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/CombinedItemHandler.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/item/CombinedItemHandler.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability +package ru.dbotthepony.mc.otm.capability.item import com.google.common.collect.ImmutableList import net.minecraft.world.item.ItemStack diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/EmptyItemHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/item/EmptyItemHandler.kt similarity index 93% rename from src/main/kotlin/ru/dbotthepony/mc/otm/capability/EmptyItemHandler.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/capability/item/EmptyItemHandler.kt index 0cf000529..5fb9e1ff3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/EmptyItemHandler.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/item/EmptyItemHandler.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability +package ru.dbotthepony.mc.otm.capability.item import net.minecraft.world.item.ItemStack import net.minecraftforge.items.IItemHandler diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/ProxiedItemHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/item/ProxiedItemHandler.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/capability/ProxiedItemHandler.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/capability/item/ProxiedItemHandler.kt index 82393a0a9..81533ebd0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/ProxiedItemHandler.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/item/ProxiedItemHandler.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability +package ru.dbotthepony.mc.otm.capability.item import net.minecraft.world.item.ItemStack import net.minecraftforge.items.IItemHandler diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/UnmodifiableItemHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/item/UnmodifiableItemHandler.kt similarity index 89% rename from src/main/kotlin/ru/dbotthepony/mc/otm/capability/UnmodifiableItemHandler.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/capability/item/UnmodifiableItemHandler.kt index 3546158a6..7895a417b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/UnmodifiableItemHandler.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/item/UnmodifiableItemHandler.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability +package ru.dbotthepony.mc.otm.capability.item import net.minecraft.world.item.ItemStack import net.minecraftforge.items.IItemHandler diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt index 845392761..8a3c76fa4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt @@ -24,7 +24,6 @@ import ru.dbotthepony.mc.otm.client.screen.panels.button.RectangleButtonPanel import ru.dbotthepony.mc.otm.compat.cos.CosmeticToggleButton.Companion.BUTTON_ACTIVE import ru.dbotthepony.mc.otm.compat.cos.CosmeticToggleButton.Companion.BUTTON_INACTIVE import ru.dbotthepony.mc.otm.container.util.awareStream -import ru.dbotthepony.mc.otm.capability.iterator import ru.dbotthepony.mc.otm.container.util.iterator import ru.dbotthepony.mc.otm.core.collect.AwareItemStack import ru.dbotthepony.mc.otm.core.collect.emptyIterator diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt index ef035a966..82164c0f2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt @@ -10,7 +10,6 @@ import net.minecraftforge.network.PacketDistributor import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.matteryPlayer import ru.dbotthepony.mc.otm.container.util.awareStream -import ru.dbotthepony.mc.otm.capability.iterator import ru.dbotthepony.mc.otm.container.util.iterator import ru.dbotthepony.mc.otm.core.collect.AwareItemStack import ru.dbotthepony.mc.otm.core.collect.concatIterators diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/HandlerFilter.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/HandlerFilter.kt index 1d2ca7c8e..12647683a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/HandlerFilter.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/HandlerFilter.kt @@ -4,7 +4,7 @@ import net.minecraft.world.item.ItemStack import net.minecraftforge.common.ForgeHooks import net.minecraftforge.common.capabilities.ForgeCapabilities import ru.dbotthepony.mc.otm.capability.MatteryCapability -import ru.dbotthepony.mc.otm.capability.stream +import ru.dbotthepony.mc.otm.capability.fluid.stream import ru.dbotthepony.mc.otm.core.isNotEmpty interface HandlerFilter { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidCapsuleItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidCapsuleItem.kt index 7875dbb13..782884378 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidCapsuleItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidCapsuleItem.kt @@ -34,10 +34,9 @@ import net.minecraftforge.fluids.FluidUtil import net.minecraftforge.fluids.capability.IFluidHandler import ru.dbotthepony.mc.otm.capability.fluid.ItemMatteryFluidHandler import ru.dbotthepony.mc.otm.capability.fluidLevel -import ru.dbotthepony.mc.otm.capability.iterator +import ru.dbotthepony.mc.otm.capability.fluid.iterator import ru.dbotthepony.mc.otm.capability.moveFluid import ru.dbotthepony.mc.otm.container.get -import ru.dbotthepony.mc.otm.container.util.stream import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.core.collect.any import ru.dbotthepony.mc.otm.core.ifPresentK diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/EnergyContainerRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/EnergyContainerRecipe.kt index 5884c0dc7..9f3667807 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/EnergyContainerRecipe.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/EnergyContainerRecipe.kt @@ -1,11 +1,9 @@ package ru.dbotthepony.mc.otm.recipe -import com.google.gson.JsonObject import com.mojang.serialization.Codec import net.minecraft.core.NonNullList import net.minecraft.core.RegistryAccess import net.minecraft.network.FriendlyByteBuf -import net.minecraft.resources.ResourceLocation import net.minecraft.world.inventory.CraftingContainer import net.minecraft.world.item.ItemStack import net.minecraft.world.item.crafting.CraftingBookCategory @@ -17,12 +15,9 @@ import net.minecraft.world.item.crafting.ShapedRecipe import net.minecraft.world.level.Level import net.minecraftforge.common.crafting.IShapedRecipe import ru.dbotthepony.mc.otm.capability.matteryEnergy -import ru.dbotthepony.mc.otm.capability.iterator import ru.dbotthepony.mc.otm.container.util.iterator import ru.dbotthepony.mc.otm.container.util.stream import ru.dbotthepony.mc.otm.core.filterNotNull -import ru.dbotthepony.mc.otm.core.fromJson -import ru.dbotthepony.mc.otm.core.fromJsonStrict class EnergyContainerRecipe(val parent: ShapedRecipe) : CraftingRecipe, IShapedRecipe by parent { override fun canCraftInDimensions(p_43999_: Int, p_44000_: Int): Boolean { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatterEntanglerRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatterEntanglerRecipe.kt index 6a3dbe4ee..b9daa6882 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatterEntanglerRecipe.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatterEntanglerRecipe.kt @@ -15,7 +15,6 @@ import net.minecraft.world.item.crafting.RecipeType import net.minecraft.world.level.Level import ru.dbotthepony.mc.otm.capability.matter.matter import ru.dbotthepony.mc.otm.capability.matteryEnergy -import ru.dbotthepony.mc.otm.capability.iterator import ru.dbotthepony.mc.otm.container.util.iterator import ru.dbotthepony.mc.otm.core.collect.filterNotNull import ru.dbotthepony.mc.otm.core.collect.map diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MatteryInventoryChangeTrigger.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MatteryInventoryChangeTrigger.kt index 5cf93fd64..c3064c2fa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MatteryInventoryChangeTrigger.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MatteryInventoryChangeTrigger.kt @@ -14,25 +14,18 @@ import net.minecraft.advancements.CriterionTrigger import net.minecraft.advancements.critereon.DeserializationContext import net.minecraft.advancements.critereon.InventoryChangeTrigger import net.minecraft.advancements.critereon.MinMaxBounds -import net.minecraft.resources.ResourceLocation import net.minecraft.server.PlayerAdvancements import net.minecraft.server.level.ServerPlayer -import net.minecraft.tags.TagKey import net.minecraft.world.Container import net.minecraft.world.entity.player.Inventory -import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import ru.dbotthepony.mc.otm.capability.matteryPlayer -import ru.dbotthepony.mc.otm.container.CombinedContainer import ru.dbotthepony.mc.otm.container.get -import ru.dbotthepony.mc.otm.capability.iterator import ru.dbotthepony.mc.otm.container.util.iterator import ru.dbotthepony.mc.otm.core.collect.flatMap import ru.dbotthepony.mc.otm.core.collect.toList import ru.dbotthepony.mc.otm.core.isNotEmpty -import java.util.Optional import java.util.stream.Collectors -import kotlin.jvm.optionals.getOrNull /** * This object detours all necessary InventoryChangeTrigger methods