From 4eca96affa7dfedbd81b18e243ac67589f24129d Mon Sep 17 00:00:00 2001 From: nea Date: Tue, 1 Aug 2023 00:06:19 +0200 Subject: Make reuse compliant --- .../kotlin/moe/nea/firmament/features/FeatureManager.kt | 16 ++-------------- .../moe/nea/firmament/features/FirmamentFeature.kt | 16 ++-------------- .../kotlin/moe/nea/firmament/features/chat/ChatLinks.kt | 6 ++++++ .../kotlin/moe/nea/firmament/features/debug/DebugView.kt | 6 ++++++ .../nea/firmament/features/debug/DeveloperFeatures.kt | 6 ++++++ .../moe/nea/firmament/features/debug/ObjectRenderer.kt | 6 ++++++ .../moe/nea/firmament/features/fishing/FishingWarning.kt | 16 ++-------------- .../kotlin/moe/nea/firmament/features/fixes/Fixes.kt | 6 ++++++ .../nea/firmament/features/inventory/CraftingOverlay.kt | 6 ++++++ .../firmament/features/inventory/SaveCursorPosition.kt | 6 ++++++ .../moe/nea/firmament/features/inventory/SlotLocking.kt | 16 ++-------------- .../inventory/storageoverlay/StorageBackingHandle.kt | 6 ++++++ .../features/inventory/storageoverlay/StorageData.kt | 6 ++++++ .../features/inventory/storageoverlay/StorageOverlay.kt | 6 ++++++ .../inventory/storageoverlay/StorageOverlayScreen.kt | 6 ++++++ .../features/inventory/storageoverlay/StoragePageSlot.kt | 6 ++++++ .../inventory/storageoverlay/VirtualInventory.kt | 6 ++++++ .../features/texturepack/CustomSkyBlockTextures.kt | 6 ++++++ .../moe/nea/firmament/features/world/FairySouls.kt | 16 ++-------------- 19 files changed, 94 insertions(+), 70 deletions(-) (limited to 'src/main/kotlin/moe/nea/firmament/features') diff --git a/src/main/kotlin/moe/nea/firmament/features/FeatureManager.kt b/src/main/kotlin/moe/nea/firmament/features/FeatureManager.kt index 2182834..0c8acb9 100644 --- a/src/main/kotlin/moe/nea/firmament/features/FeatureManager.kt +++ b/src/main/kotlin/moe/nea/firmament/features/FeatureManager.kt @@ -1,19 +1,7 @@ /* - * Firmament is a Hypixel Skyblock mod for modern Minecraft versions - * Copyright (C) 2023 Linnea Gräf + * SPDX-FileCopyrightText: 2023 Linnea Gräf * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * SPDX-License-Identifier: GPL-3.0-or-later */ package moe.nea.firmament.features diff --git a/src/main/kotlin/moe/nea/firmament/features/FirmamentFeature.kt b/src/main/kotlin/moe/nea/firmament/features/FirmamentFeature.kt index 94b69f1..afd36a5 100644 --- a/src/main/kotlin/moe/nea/firmament/features/FirmamentFeature.kt +++ b/src/main/kotlin/moe/nea/firmament/features/FirmamentFeature.kt @@ -1,19 +1,7 @@ /* - * Firmament is a Hypixel Skyblock mod for modern Minecraft versions - * Copyright (C) 2023 Linnea Gräf + * SPDX-FileCopyrightText: 2023 Linnea Gräf * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * SPDX-License-Identifier: GPL-3.0-or-later */ package moe.nea.firmament.features diff --git a/src/main/kotlin/moe/nea/firmament/features/chat/ChatLinks.kt b/src/main/kotlin/moe/nea/firmament/features/chat/ChatLinks.kt index 41b2e96..7d563fa 100644 --- a/src/main/kotlin/moe/nea/firmament/features/chat/ChatLinks.kt +++ b/src/main/kotlin/moe/nea/firmament/features/chat/ChatLinks.kt @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2023 Linnea Gräf + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + package moe.nea.firmament.features.chat import io.ktor.client.request.* diff --git a/src/main/kotlin/moe/nea/firmament/features/debug/DebugView.kt b/src/main/kotlin/moe/nea/firmament/features/debug/DebugView.kt index 96ea7aa..799a9b8 100644 --- a/src/main/kotlin/moe/nea/firmament/features/debug/DebugView.kt +++ b/src/main/kotlin/moe/nea/firmament/features/debug/DebugView.kt @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2023 Linnea Gräf + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + package moe.nea.firmament.features.debug import io.github.cottonmc.cotton.gui.client.CottonHud diff --git a/src/main/kotlin/moe/nea/firmament/features/debug/DeveloperFeatures.kt b/src/main/kotlin/moe/nea/firmament/features/debug/DeveloperFeatures.kt index ffa0fd2..20d1358 100644 --- a/src/main/kotlin/moe/nea/firmament/features/debug/DeveloperFeatures.kt +++ b/src/main/kotlin/moe/nea/firmament/features/debug/DeveloperFeatures.kt @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2023 Linnea Gräf + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + package moe.nea.firmament.features.debug import java.nio.file.Path diff --git a/src/main/kotlin/moe/nea/firmament/features/debug/ObjectRenderer.kt b/src/main/kotlin/moe/nea/firmament/features/debug/ObjectRenderer.kt index f5185cd..18f502c 100644 --- a/src/main/kotlin/moe/nea/firmament/features/debug/ObjectRenderer.kt +++ b/src/main/kotlin/moe/nea/firmament/features/debug/ObjectRenderer.kt @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2023 Linnea Gräf + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + package moe.nea.firmament.features.debug import io.github.cottonmc.cotton.gui.widget.WBox diff --git a/src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt b/src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt index e133d97..77b222a 100644 --- a/src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt +++ b/src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt @@ -1,19 +1,7 @@ /* - * Firmament is a Hypixel Skyblock mod for modern Minecraft versions - * Copyright (C) 2023 Linnea Gräf + * SPDX-FileCopyrightText: 2023 Linnea Gräf * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * SPDX-License-Identifier: GPL-3.0-or-later */ package moe.nea.firmament.features.fishing diff --git a/src/main/kotlin/moe/nea/firmament/features/fixes/Fixes.kt b/src/main/kotlin/moe/nea/firmament/features/fixes/Fixes.kt index f09111c..77397bc 100644 --- a/src/main/kotlin/moe/nea/firmament/features/fixes/Fixes.kt +++ b/src/main/kotlin/moe/nea/firmament/features/fixes/Fixes.kt @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2023 Linnea Gräf + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + package moe.nea.firmament.features.fixes import moe.nea.firmament.features.FirmamentFeature diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt index bb73513..8de88aa 100644 --- a/src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt +++ b/src/main/kotlin/moe/nea/firmament/features/inventory/CraftingOverlay.kt @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2023 Linnea Gräf + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + package moe.nea.firmament.features.inventory import net.minecraft.client.gui.screen.ingame.GenericContainerScreen diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/SaveCursorPosition.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/SaveCursorPosition.kt index 577f19b..3030d6a 100644 --- a/src/main/kotlin/moe/nea/firmament/features/inventory/SaveCursorPosition.kt +++ b/src/main/kotlin/moe/nea/firmament/features/inventory/SaveCursorPosition.kt @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2023 Linnea Gräf + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + package moe.nea.firmament.features.inventory import kotlin.math.absoluteValue diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt index a601489..f6a197c 100644 --- a/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt +++ b/src/main/kotlin/moe/nea/firmament/features/inventory/SlotLocking.kt @@ -1,19 +1,7 @@ /* - * Firmament is a Hypixel Skyblock mod for modern Minecraft versions - * Copyright (C) 2023 Linnea Gräf + * SPDX-FileCopyrightText: 2023 Linnea Gräf * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * SPDX-License-Identifier: GPL-3.0-or-later */ package moe.nea.firmament.features.inventory diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageBackingHandle.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageBackingHandle.kt index 5802cb7..006ad54 100644 --- a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageBackingHandle.kt +++ b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageBackingHandle.kt @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2023 Linnea Gräf + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + package moe.nea.firmament.features.inventory.storageoverlay import net.minecraft.client.gui.screen.Screen diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageData.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageData.kt index 00714ab..a8542de 100644 --- a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageData.kt +++ b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageData.kt @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2023 Linnea Gräf + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + @file:UseSerializers(SortedMapSerializer::class) package moe.nea.firmament.features.inventory.storageoverlay diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlay.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlay.kt index ad1ca53..7d1c72e 100644 --- a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlay.kt +++ b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlay.kt @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2023 Linnea Gräf + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + package moe.nea.firmament.features.inventory.storageoverlay import java.util.* diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlayScreen.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlayScreen.kt index 1c896db..63ce134 100644 --- a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlayScreen.kt +++ b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StorageOverlayScreen.kt @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2023 Linnea Gräf + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + package moe.nea.firmament.features.inventory.storageoverlay import moe.nea.firmament.util.MC diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StoragePageSlot.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StoragePageSlot.kt index 19afeef..b71e745 100644 --- a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StoragePageSlot.kt +++ b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/StoragePageSlot.kt @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2023 Linnea Gräf + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + package moe.nea.firmament.features.inventory.storageoverlay import kotlinx.serialization.KSerializer diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/VirtualInventory.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/VirtualInventory.kt index 28280f9..3c7bedd 100644 --- a/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/VirtualInventory.kt +++ b/src/main/kotlin/moe/nea/firmament/features/inventory/storageoverlay/VirtualInventory.kt @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2023 Linnea Gräf + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + package moe.nea.firmament.features.inventory.storageoverlay import io.ktor.util.decodeBase64Bytes diff --git a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt b/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt index b73c591..b086811 100644 --- a/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt +++ b/src/main/kotlin/moe/nea/firmament/features/texturepack/CustomSkyBlockTextures.kt @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2023 Linnea Gräf + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + package moe.nea.firmament.features.texturepack import net.minecraft.client.util.ModelIdentifier diff --git a/src/main/kotlin/moe/nea/firmament/features/world/FairySouls.kt b/src/main/kotlin/moe/nea/firmament/features/world/FairySouls.kt index 91821f6..c1ccfc4 100644 --- a/src/main/kotlin/moe/nea/firmament/features/world/FairySouls.kt +++ b/src/main/kotlin/moe/nea/firmament/features/world/FairySouls.kt @@ -1,19 +1,7 @@ /* - * Firmament is a Hypixel Skyblock mod for modern Minecraft versions - * Copyright (C) 2023 Linnea Gräf + * SPDX-FileCopyrightText: 2023 Linnea Gräf * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * SPDX-License-Identifier: GPL-3.0-or-later */ package moe.nea.firmament.features.world -- cgit