Follow-up fixes for Forge version combination (#5)

* Fix spotless in wrong scope

* Add missing license headers

* Update forge mod versions in README

* Remove unused import from build script

Author: BlockyTheDev

README.md

@@ -1,4 +1,4 @@
-CommunityRadar - Official - Forge Mod 1.8.9
+CommunityRadar - Official - Forge Mod (1.8.9 & 1.12.2)
 ==========================
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4.svg)](#code-of-conduct)

build.gradle.kts

@@ -30,6 +30,30 @@ allprojects {
     repositories {
         mavenCentral()
     }
+
+    plugins.withId("com.diffplug.spotless") {
+        spotless {
+            java {
+                licenseHeaderFile(rootProject.file("HEADER"))
+                endWithNewline()
+                trimTrailingWhitespace()
+                removeUnusedImports()
+                removeWildcardImports()
+            }
+
+            kotlinGradle {
+                licenseHeaderFile(rootProject.file("HEADER"), "(plugins|import|buildscript|pluginManagement|base)")
+                endWithNewline()
+                trimTrailingWhitespace()
+            }
+
+            kotlin {
+                licenseHeaderFile(rootProject.file("HEADER"))
+                endWithNewline()
+                trimTrailingWhitespace()
+            }
+        }
+    }
 }
 
 subprojects {
@@ -97,22 +121,6 @@ subprojects {
     }
 }
 
-spotless {
-    java {
-        licenseHeaderFile(rootProject.file("HEADER"))
-        endWithNewline()
-        trimTrailingWhitespace()
-        removeUnusedImports()
-        removeWildcardImports()
-    }
-
-    kotlin {
-        licenseHeaderFile(rootProject.file("HEADER"))
-        endWithNewline()
-        trimTrailingWhitespace()
-    }
-}
-
 tasks {
     named<Jar>("jar").configure {
         enabled = false

common/build.gradle.kts

@@ -1,5 +1,18 @@
-import org.gradle.kotlin.dsl.libs
-
+/*
+ * Copyright 2024 - present CommunityRadarGG <https://community-radar.de/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 base {
     archivesName.set("common")
 }

common/src/main/java/io/github/communityradargg/forgemod/command/RootRadarCommand.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2024 - present CommunityRadarGG <https://community-radar.de/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.github.communityradargg.forgemod.command;
 
 import io.github.communityradargg.forgemod.util.CommonHandler;

common/src/main/java/io/github/communityradargg/forgemod/util/CommonHandler.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2024 - present CommunityRadarGG <https://community-radar.de/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.github.communityradargg.forgemod.util;
 
 import com.google.gson.Gson;

common/src/main/java/io/github/communityradargg/forgemod/util/PlayerInfo.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2024 - present CommunityRadarGG <https://community-radar.de/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.github.communityradargg.forgemod.util;
 
 import org.jetbrains.annotations.NotNull;

common/src/main/java/io/github/communityradargg/forgemod/util/PlayerNameUuidCache.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2024 - present CommunityRadarGG <https://community-radar.de/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.github.communityradargg.forgemod.util;
 
 import com.google.common.cache.Cache;

common/src/main/java/io/github/communityradargg/forgemod/util/VersionBridge.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2024 - present CommunityRadarGG <https://community-radar.de/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.github.communityradargg.forgemod.util;
 
 import org.jetbrains.annotations.NotNull;

settings.gradle.kts

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-rootProject.name = "communityradar-forge"
-
 pluginManagement {
     repositories {
         gradlePluginPortal()
@@ -41,6 +39,8 @@ plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
 }
 
+rootProject.name = "communityradar-forge"
+
 include("common")
 
 listOf("1.8.9", "1.12.2").forEach { version ->

versions/1.12.2/build.gradle.kts

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2024 - present CommunityRadarGG <https://community-radar.de/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import dev.architectury.pack200.java.Pack200Adapter
 
 val versionText: String by extra