From 493f1acf7d76dae645abdd98dc3226a62e2a7623 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Fri, 13 Jan 2023 15:39:03 +0100 Subject: [PATCH] move container actions to subpackage --- .../{click => actions}/CloneContainerActionTest.kt | 5 +++-- .../container/{click => actions}/DropContainerActionTest.kt | 5 +++-- .../{click => actions}/FastMoveContainerActionTest.kt | 3 ++- .../{click => actions}/PickAllContainerActionTest.kt | 5 +++-- .../{click => actions}/SimpleContainerActionTest.kt | 5 +++-- .../java/de/bixilon/minosoft/data/container/Container.kt | 4 ++-- .../data/container/{click => actions}/ContainerAction.kt | 4 ++-- .../{click => actions/types}/CloneContainerAction.kt | 5 +++-- .../{click => actions/types}/DistributeContainerAction.kt | 6 ++++-- .../{click => actions/types}/DropContainerAction.kt | 5 +++-- .../{click => actions/types}/FastMoveContainerAction.kt | 3 ++- .../{click => actions/types}/PickAllContainerAction.kt | 3 ++- .../{click => actions/types}/SimpleContainerAction.kt | 3 ++- .../{click => actions/types}/SlotSwapContainerAction.kt | 3 ++- .../minosoft/data/container/types/CraftingContainer.kt | 2 +- .../minosoft/data/container/types/EnchantingContainer.kt | 2 +- .../minosoft/data/container/types/PlayerInventory.kt | 2 +- .../data/container/types/generic/GenericContainer.kt | 4 ++-- .../types/processing/smelting/SmeltingContainer.kt | 4 ++-- .../gui/rendering/gui/elements/items/ItemElement.kt | 4 ++-- .../rendering/gui/gui/dragged/elements/item/FloatingItem.kt | 4 ++-- 21 files changed, 47 insertions(+), 34 deletions(-) rename src/integration-test/kotlin/de/bixilon/minosoft/data/container/{click => actions}/CloneContainerActionTest.kt (96%) rename src/integration-test/kotlin/de/bixilon/minosoft/data/container/{click => actions}/DropContainerActionTest.kt (96%) rename src/integration-test/kotlin/de/bixilon/minosoft/data/container/{click => actions}/FastMoveContainerActionTest.kt (98%) rename src/integration-test/kotlin/de/bixilon/minosoft/data/container/{click => actions}/PickAllContainerActionTest.kt (97%) rename src/integration-test/kotlin/de/bixilon/minosoft/data/container/{click => actions}/SimpleContainerActionTest.kt (97%) rename src/main/java/de/bixilon/minosoft/data/container/{click => actions}/ContainerAction.kt (93%) rename src/main/java/de/bixilon/minosoft/data/container/{click => actions/types}/CloneContainerAction.kt (92%) rename src/main/java/de/bixilon/minosoft/data/container/{click => actions/types}/DistributeContainerAction.kt (87%) rename src/main/java/de/bixilon/minosoft/data/container/{click => actions/types}/DropContainerAction.kt (92%) rename src/main/java/de/bixilon/minosoft/data/container/{click => actions/types}/FastMoveContainerAction.kt (97%) rename src/main/java/de/bixilon/minosoft/data/container/{click => actions/types}/PickAllContainerAction.kt (96%) rename src/main/java/de/bixilon/minosoft/data/container/{click => actions/types}/SimpleContainerAction.kt (98%) rename src/main/java/de/bixilon/minosoft/data/container/{click => actions/types}/SlotSwapContainerAction.kt (95%) diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/CloneContainerActionTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/CloneContainerActionTest.kt similarity index 96% rename from src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/CloneContainerActionTest.kt rename to src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/CloneContainerActionTest.kt index 80191256e..e8ad2eaba 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/CloneContainerActionTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/CloneContainerActionTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -11,10 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.container.click +package de.bixilon.minosoft.data.container.actions import de.bixilon.minosoft.data.container.ContainerTestUtil.createContainer import de.bixilon.minosoft.data.container.ContainerUtil.slotsOf +import de.bixilon.minosoft.data.container.actions.types.CloneContainerAction import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.registries.items.AppleTestO import de.bixilon.minosoft.data.registries.items.EggTestO diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/DropContainerActionTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/DropContainerActionTest.kt similarity index 96% rename from src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/DropContainerActionTest.kt rename to src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/DropContainerActionTest.kt index ddf010d6e..02571984d 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/DropContainerActionTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/DropContainerActionTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -11,10 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.container.click +package de.bixilon.minosoft.data.container.actions import de.bixilon.minosoft.data.container.ContainerTestUtil.createContainer import de.bixilon.minosoft.data.container.ContainerUtil.slotsOf +import de.bixilon.minosoft.data.container.actions.types.DropContainerAction import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.registries.items.AppleTestO import de.bixilon.minosoft.data.registries.items.EggTestO diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/FastMoveContainerActionTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/FastMoveContainerActionTest.kt similarity index 98% rename from src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/FastMoveContainerActionTest.kt rename to src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/FastMoveContainerActionTest.kt index 8bbfac392..06a7f7955 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/FastMoveContainerActionTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/FastMoveContainerActionTest.kt @@ -11,12 +11,13 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.container.click +package de.bixilon.minosoft.data.container.actions import de.bixilon.minosoft.data.container.ContainerTestUtil.createChest import de.bixilon.minosoft.data.container.ContainerTestUtil.createFurnace import de.bixilon.minosoft.data.container.ContainerTestUtil.createInventory import de.bixilon.minosoft.data.container.ContainerUtil.slotsOf +import de.bixilon.minosoft.data.container.actions.types.FastMoveContainerAction import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.registries.items.AppleTestO import de.bixilon.minosoft.data.registries.items.CoalTest0 diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/PickAllContainerActionTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/PickAllContainerActionTest.kt similarity index 97% rename from src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/PickAllContainerActionTest.kt rename to src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/PickAllContainerActionTest.kt index 6931ce8f3..20e0e98dc 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/PickAllContainerActionTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/PickAllContainerActionTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -11,10 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.container.click +package de.bixilon.minosoft.data.container.actions import de.bixilon.minosoft.data.container.ContainerTestUtil.createContainer import de.bixilon.minosoft.data.container.ContainerUtil.slotsOf +import de.bixilon.minosoft.data.container.actions.types.PickAllContainerAction import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.registries.items.AppleTestO import de.bixilon.minosoft.data.registries.items.EggTestO diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/SimpleContainerActionTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/SimpleContainerActionTest.kt similarity index 97% rename from src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/SimpleContainerActionTest.kt rename to src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/SimpleContainerActionTest.kt index 065dfaf76..f825fbb62 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/data/container/click/SimpleContainerActionTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/data/container/actions/SimpleContainerActionTest.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -11,10 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.container.click +package de.bixilon.minosoft.data.container.actions import de.bixilon.minosoft.data.container.ContainerTestUtil.createContainer import de.bixilon.minosoft.data.container.ContainerUtil.slotsOf +import de.bixilon.minosoft.data.container.actions.types.SimpleContainerAction import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.registries.items.AppleTestO import de.bixilon.minosoft.data.registries.items.EggTestO diff --git a/src/main/java/de/bixilon/minosoft/data/container/Container.kt b/src/main/java/de/bixilon/minosoft/data/container/Container.kt index bb9dbbfb4..1593f1801 100644 --- a/src/main/java/de/bixilon/minosoft/data/container/Container.kt +++ b/src/main/java/de/bixilon/minosoft/data/container/Container.kt @@ -19,8 +19,8 @@ import de.bixilon.kutil.concurrent.lock.thread.ThreadLock import de.bixilon.kutil.observer.DataObserver.Companion.observe import de.bixilon.kutil.observer.DataObserver.Companion.observed import de.bixilon.kutil.observer.map.MapObserver.Companion.observedMap -import de.bixilon.minosoft.data.container.click.ContainerAction -import de.bixilon.minosoft.data.container.click.SlotSwapContainerAction +import de.bixilon.minosoft.data.container.actions.ContainerAction +import de.bixilon.minosoft.data.container.actions.types.SlotSwapContainerAction import de.bixilon.minosoft.data.container.sections.ContainerSection import de.bixilon.minosoft.data.container.slots.DefaultSlotType import de.bixilon.minosoft.data.container.slots.SlotType diff --git a/src/main/java/de/bixilon/minosoft/data/container/click/ContainerAction.kt b/src/main/java/de/bixilon/minosoft/data/container/actions/ContainerAction.kt similarity index 93% rename from src/main/java/de/bixilon/minosoft/data/container/click/ContainerAction.kt rename to src/main/java/de/bixilon/minosoft/data/container/actions/ContainerAction.kt index 388676c32..d0e04f895 100644 --- a/src/main/java/de/bixilon/minosoft/data/container/click/ContainerAction.kt +++ b/src/main/java/de/bixilon/minosoft/data/container/actions/ContainerAction.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -11,7 +11,7 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.container.click +package de.bixilon.minosoft.data.container.actions import de.bixilon.minosoft.data.container.Container import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/container/click/CloneContainerAction.kt b/src/main/java/de/bixilon/minosoft/data/container/actions/types/CloneContainerAction.kt similarity index 92% rename from src/main/java/de/bixilon/minosoft/data/container/click/CloneContainerAction.kt rename to src/main/java/de/bixilon/minosoft/data/container/actions/types/CloneContainerAction.kt index 79dfc5a2e..e563a6c84 100644 --- a/src/main/java/de/bixilon/minosoft/data/container/click/CloneContainerAction.kt +++ b/src/main/java/de/bixilon/minosoft/data/container/actions/types/CloneContainerAction.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -11,10 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.container.click +package de.bixilon.minosoft.data.container.actions.types import de.bixilon.minosoft.data.container.Container import de.bixilon.minosoft.data.container.ContainerUtil.slotsOf +import de.bixilon.minosoft.data.container.actions.ContainerAction import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.packets.c2s.play.container.ContainerClickC2SP diff --git a/src/main/java/de/bixilon/minosoft/data/container/click/DistributeContainerAction.kt b/src/main/java/de/bixilon/minosoft/data/container/actions/types/DistributeContainerAction.kt similarity index 87% rename from src/main/java/de/bixilon/minosoft/data/container/click/DistributeContainerAction.kt rename to src/main/java/de/bixilon/minosoft/data/container/actions/types/DistributeContainerAction.kt index adcfa86e2..3b09de40f 100644 --- a/src/main/java/de/bixilon/minosoft/data/container/click/DistributeContainerAction.kt +++ b/src/main/java/de/bixilon/minosoft/data/container/actions/types/DistributeContainerAction.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -11,7 +11,9 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.container.click +package de.bixilon.minosoft.data.container.actions.types + +import de.bixilon.minosoft.data.container.actions.ContainerAction @Deprecated("Not yet implemented") class DistributeContainerAction : ContainerAction { diff --git a/src/main/java/de/bixilon/minosoft/data/container/click/DropContainerAction.kt b/src/main/java/de/bixilon/minosoft/data/container/actions/types/DropContainerAction.kt similarity index 92% rename from src/main/java/de/bixilon/minosoft/data/container/click/DropContainerAction.kt rename to src/main/java/de/bixilon/minosoft/data/container/actions/types/DropContainerAction.kt index f243d4bf2..648443454 100644 --- a/src/main/java/de/bixilon/minosoft/data/container/click/DropContainerAction.kt +++ b/src/main/java/de/bixilon/minosoft/data/container/actions/types/DropContainerAction.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -11,10 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.container.click +package de.bixilon.minosoft.data.container.actions.types import de.bixilon.minosoft.data.container.Container import de.bixilon.minosoft.data.container.ContainerUtil.slotsOf +import de.bixilon.minosoft.data.container.actions.ContainerAction import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.packets.c2s.play.container.ContainerClickC2SP diff --git a/src/main/java/de/bixilon/minosoft/data/container/click/FastMoveContainerAction.kt b/src/main/java/de/bixilon/minosoft/data/container/actions/types/FastMoveContainerAction.kt similarity index 97% rename from src/main/java/de/bixilon/minosoft/data/container/click/FastMoveContainerAction.kt rename to src/main/java/de/bixilon/minosoft/data/container/actions/types/FastMoveContainerAction.kt index 57e14be6f..bef05ecc0 100644 --- a/src/main/java/de/bixilon/minosoft/data/container/click/FastMoveContainerAction.kt +++ b/src/main/java/de/bixilon/minosoft/data/container/actions/types/FastMoveContainerAction.kt @@ -11,9 +11,10 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.container.click +package de.bixilon.minosoft.data.container.actions.types import de.bixilon.minosoft.data.container.Container +import de.bixilon.minosoft.data.container.actions.ContainerAction import de.bixilon.minosoft.data.container.sections.ContainerSection import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection diff --git a/src/main/java/de/bixilon/minosoft/data/container/click/PickAllContainerAction.kt b/src/main/java/de/bixilon/minosoft/data/container/actions/types/PickAllContainerAction.kt similarity index 96% rename from src/main/java/de/bixilon/minosoft/data/container/click/PickAllContainerAction.kt rename to src/main/java/de/bixilon/minosoft/data/container/actions/types/PickAllContainerAction.kt index 5b3646d66..d8fd614c9 100644 --- a/src/main/java/de/bixilon/minosoft/data/container/click/PickAllContainerAction.kt +++ b/src/main/java/de/bixilon/minosoft/data/container/actions/types/PickAllContainerAction.kt @@ -11,9 +11,10 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.container.click +package de.bixilon.minosoft.data.container.actions.types import de.bixilon.minosoft.data.container.Container +import de.bixilon.minosoft.data.container.actions.ContainerAction import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.packets.c2s.play.container.ContainerClickC2SP diff --git a/src/main/java/de/bixilon/minosoft/data/container/click/SimpleContainerAction.kt b/src/main/java/de/bixilon/minosoft/data/container/actions/types/SimpleContainerAction.kt similarity index 98% rename from src/main/java/de/bixilon/minosoft/data/container/click/SimpleContainerAction.kt rename to src/main/java/de/bixilon/minosoft/data/container/actions/types/SimpleContainerAction.kt index ee19c2eb1..e9d52dfe4 100644 --- a/src/main/java/de/bixilon/minosoft/data/container/click/SimpleContainerAction.kt +++ b/src/main/java/de/bixilon/minosoft/data/container/actions/types/SimpleContainerAction.kt @@ -11,10 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.container.click +package de.bixilon.minosoft.data.container.actions.types import de.bixilon.minosoft.data.container.Container import de.bixilon.minosoft.data.container.ContainerUtil.slotsOf +import de.bixilon.minosoft.data.container.actions.ContainerAction import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.packets.c2s.play.container.ContainerClickC2SP diff --git a/src/main/java/de/bixilon/minosoft/data/container/click/SlotSwapContainerAction.kt b/src/main/java/de/bixilon/minosoft/data/container/actions/types/SlotSwapContainerAction.kt similarity index 95% rename from src/main/java/de/bixilon/minosoft/data/container/click/SlotSwapContainerAction.kt rename to src/main/java/de/bixilon/minosoft/data/container/actions/types/SlotSwapContainerAction.kt index 29b8a57a5..66c2fde4f 100644 --- a/src/main/java/de/bixilon/minosoft/data/container/click/SlotSwapContainerAction.kt +++ b/src/main/java/de/bixilon/minosoft/data/container/actions/types/SlotSwapContainerAction.kt @@ -11,10 +11,11 @@ * This software is not affiliated with Mojang AB, the original developer of Minecraft. */ -package de.bixilon.minosoft.data.container.click +package de.bixilon.minosoft.data.container.actions.types import de.bixilon.minosoft.data.container.Container import de.bixilon.minosoft.data.container.ContainerUtil.slotsOf +import de.bixilon.minosoft.data.container.actions.ContainerAction import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.packets.c2s.play.container.ContainerClickC2SP diff --git a/src/main/java/de/bixilon/minosoft/data/container/types/CraftingContainer.kt b/src/main/java/de/bixilon/minosoft/data/container/types/CraftingContainer.kt index 24a1c3896..0d36c7be3 100644 --- a/src/main/java/de/bixilon/minosoft/data/container/types/CraftingContainer.kt +++ b/src/main/java/de/bixilon/minosoft/data/container/types/CraftingContainer.kt @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.container.types import de.bixilon.minosoft.data.container.InventorySynchronizedContainer -import de.bixilon.minosoft.data.container.click.SlotSwapContainerAction +import de.bixilon.minosoft.data.container.actions.types.SlotSwapContainerAction import de.bixilon.minosoft.data.container.sections.ContainerSection import de.bixilon.minosoft.data.container.sections.HotbarSection import de.bixilon.minosoft.data.container.sections.PassiveInventorySection diff --git a/src/main/java/de/bixilon/minosoft/data/container/types/EnchantingContainer.kt b/src/main/java/de/bixilon/minosoft/data/container/types/EnchantingContainer.kt index 9670ec2c5..1adb23dac 100644 --- a/src/main/java/de/bixilon/minosoft/data/container/types/EnchantingContainer.kt +++ b/src/main/java/de/bixilon/minosoft/data/container/types/EnchantingContainer.kt @@ -16,7 +16,7 @@ package de.bixilon.minosoft.data.container.types import de.bixilon.minosoft.data.abilities.Gamemodes import de.bixilon.minosoft.data.container.Container import de.bixilon.minosoft.data.container.InventorySynchronizedContainer -import de.bixilon.minosoft.data.container.click.SlotSwapContainerAction +import de.bixilon.minosoft.data.container.actions.types.SlotSwapContainerAction import de.bixilon.minosoft.data.container.sections.ContainerSection import de.bixilon.minosoft.data.container.sections.HotbarSection import de.bixilon.minosoft.data.container.sections.PassiveInventorySection diff --git a/src/main/java/de/bixilon/minosoft/data/container/types/PlayerInventory.kt b/src/main/java/de/bixilon/minosoft/data/container/types/PlayerInventory.kt index e047a1241..af94d098b 100644 --- a/src/main/java/de/bixilon/minosoft/data/container/types/PlayerInventory.kt +++ b/src/main/java/de/bixilon/minosoft/data/container/types/PlayerInventory.kt @@ -19,7 +19,7 @@ import de.bixilon.kutil.observer.map.MapObserver.Companion.observeMap import de.bixilon.minosoft.data.container.ClientContainer import de.bixilon.minosoft.data.container.Container import de.bixilon.minosoft.data.container.EquipmentSlots -import de.bixilon.minosoft.data.container.click.SlotSwapContainerAction +import de.bixilon.minosoft.data.container.actions.types.SlotSwapContainerAction import de.bixilon.minosoft.data.container.sections.ContainerSection import de.bixilon.minosoft.data.container.sections.HotbarSection import de.bixilon.minosoft.data.container.sections.PassiveInventorySection diff --git a/src/main/java/de/bixilon/minosoft/data/container/types/generic/GenericContainer.kt b/src/main/java/de/bixilon/minosoft/data/container/types/generic/GenericContainer.kt index 1f542cbc4..7ff327e14 100644 --- a/src/main/java/de/bixilon/minosoft/data/container/types/generic/GenericContainer.kt +++ b/src/main/java/de/bixilon/minosoft/data/container/types/generic/GenericContainer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.container.types.generic import de.bixilon.minosoft.data.container.InventorySynchronizedContainer -import de.bixilon.minosoft.data.container.click.SlotSwapContainerAction +import de.bixilon.minosoft.data.container.actions.types.SlotSwapContainerAction import de.bixilon.minosoft.data.container.sections.ContainerSection import de.bixilon.minosoft.data.container.sections.HotbarSection import de.bixilon.minosoft.data.container.sections.PassiveInventorySection diff --git a/src/main/java/de/bixilon/minosoft/data/container/types/processing/smelting/SmeltingContainer.kt b/src/main/java/de/bixilon/minosoft/data/container/types/processing/smelting/SmeltingContainer.kt index 0bbd3a06c..d79bc3bb7 100644 --- a/src/main/java/de/bixilon/minosoft/data/container/types/processing/smelting/SmeltingContainer.kt +++ b/src/main/java/de/bixilon/minosoft/data/container/types/processing/smelting/SmeltingContainer.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -13,7 +13,7 @@ package de.bixilon.minosoft.data.container.types.processing.smelting -import de.bixilon.minosoft.data.container.click.SlotSwapContainerAction +import de.bixilon.minosoft.data.container.actions.types.SlotSwapContainerAction import de.bixilon.minosoft.data.container.sections.* import de.bixilon.minosoft.data.container.slots.DefaultSlotType import de.bixilon.minosoft.data.container.slots.FuelSlotType diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ItemElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ItemElement.kt index 29448cc13..78801ef32 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ItemElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/elements/items/ItemElement.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.gui.elements.items import de.bixilon.kotlinglm.vec2.Vec2i import de.bixilon.minosoft.config.key.KeyCodes import de.bixilon.minosoft.data.abilities.Gamemodes -import de.bixilon.minosoft.data.container.click.* +import de.bixilon.minosoft.data.container.actions.types.* import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.data.text.formatting.color.RGBColor import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/elements/item/FloatingItem.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/elements/item/FloatingItem.kt index 916d82ae3..8d3d16f47 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/elements/item/FloatingItem.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/dragged/elements/item/FloatingItem.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2022 Moritz Zwerger + * Copyright (C) 2020-2023 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.dragged.elements.item import de.bixilon.kotlinglm.vec2.Vec2i import de.bixilon.minosoft.data.container.Container -import de.bixilon.minosoft.data.container.click.SimpleContainerAction +import de.bixilon.minosoft.data.container.actions.types.SimpleContainerAction import de.bixilon.minosoft.data.container.stack.ItemStack import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer import de.bixilon.minosoft.gui.rendering.gui.elements.Element