From f5102508a640fd45cc926ba029f546a7143681d7 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 9 Jul 2024 21:30:25 +0200 Subject: [PATCH] refactor: rename projects to remove "platform" --- .../build.gradle | 2 +- .../refinedarchitect/template}/common/Common.java | 2 +- .../refinedarchitect/template/common}/package-info.java | 2 +- .../build.gradle.kts | 4 ++-- .../template}/fabric/ClientModInitializerImpl.java | 2 +- .../template}/fabric/ModInitializerImpl.java | 4 ++-- .../refinedarchitect/template/fabric}/package-info.java | 2 +- .../src/main/resources/fabric.mod.json | 4 ++-- .../build.gradle.kts | 4 ++-- .../template}/forge/ClientModInitializer.java | 2 +- .../refinedarchitect/template}/forge/ModInitializer.java | 4 ++-- .../refinedarchitect/template/forge}/package-info.java | 2 +- .../src/main/resources/META-INF/neoforge.mods.toml | 0 .../src/main/resources/pack.mcmeta | 0 settings.gradle.kts | 6 +++--- 15 files changed, 20 insertions(+), 20 deletions(-) rename {refinedarchitect-template-platform-common => refinedarchitect-template-common}/build.gradle (67%) rename {refinedarchitect-template-platform-common/src/main/java/com/refinedmods/refinedarchitect/template/platform => refinedarchitect-template-common/src/main/java/com/refinedmods/refinedarchitect/template}/common/Common.java (84%) rename {refinedarchitect-template-platform-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/platform/forge => refinedarchitect-template-common/src/main/java/com/refinedmods/refinedarchitect/template/common}/package-info.java (56%) rename {refinedarchitect-template-platform-fabric => refinedarchitect-template-fabric}/build.gradle.kts (62%) rename {refinedarchitect-template-platform-fabric/src/main/java/com/refinedmods/refinedarchitect/template/platform => refinedarchitect-template-fabric/src/main/java/com/refinedmods/refinedarchitect/template}/fabric/ClientModInitializerImpl.java (77%) rename {refinedarchitect-template-platform-fabric/src/main/java/com/refinedmods/refinedarchitect/template/platform => refinedarchitect-template-fabric/src/main/java/com/refinedmods/refinedarchitect/template}/fabric/ModInitializerImpl.java (57%) rename {refinedarchitect-template-platform-common/src/main/java/com/refinedmods/refinedarchitect/template/platform/common => refinedarchitect-template-fabric/src/main/java/com/refinedmods/refinedarchitect/template/fabric}/package-info.java (56%) rename {refinedarchitect-template-platform-fabric => refinedarchitect-template-fabric}/src/main/resources/fabric.mod.json (81%) rename {refinedarchitect-template-platform-neoforge => refinedarchitect-template-neoforge}/build.gradle.kts (62%) rename {refinedarchitect-template-platform-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/platform => refinedarchitect-template-neoforge/src/main/java/com/refinedmods/refinedarchitect/template}/forge/ClientModInitializer.java (84%) rename {refinedarchitect-template-platform-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/platform => refinedarchitect-template-neoforge/src/main/java/com/refinedmods/refinedarchitect/template}/forge/ModInitializer.java (82%) rename {refinedarchitect-template-platform-fabric/src/main/java/com/refinedmods/refinedarchitect/template/platform/fabric => refinedarchitect-template-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/forge}/package-info.java (56%) rename {refinedarchitect-template-platform-neoforge => refinedarchitect-template-neoforge}/src/main/resources/META-INF/neoforge.mods.toml (100%) rename {refinedarchitect-template-platform-neoforge => refinedarchitect-template-neoforge}/src/main/resources/pack.mcmeta (100%) diff --git a/refinedarchitect-template-platform-common/build.gradle b/refinedarchitect-template-common/build.gradle similarity index 67% rename from refinedarchitect-template-platform-common/build.gradle rename to refinedarchitect-template-common/build.gradle index aa83352..7f230eb 100644 --- a/refinedarchitect-template-platform-common/build.gradle +++ b/refinedarchitect-template-common/build.gradle @@ -10,5 +10,5 @@ refinedarchitect { } base { - archivesName.set("refinedarchitect-template-platform-common") + archivesName.set("refinedarchitect-template-common") } diff --git a/refinedarchitect-template-platform-common/src/main/java/com/refinedmods/refinedarchitect/template/platform/common/Common.java b/refinedarchitect-template-common/src/main/java/com/refinedmods/refinedarchitect/template/common/Common.java similarity index 84% rename from refinedarchitect-template-platform-common/src/main/java/com/refinedmods/refinedarchitect/template/platform/common/Common.java rename to refinedarchitect-template-common/src/main/java/com/refinedmods/refinedarchitect/template/common/Common.java index 9088bb4..53df5d5 100644 --- a/refinedarchitect-template-platform-common/src/main/java/com/refinedmods/refinedarchitect/template/platform/common/Common.java +++ b/refinedarchitect-template-common/src/main/java/com/refinedmods/refinedarchitect/template/common/Common.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedarchitect.template.platform.common; +package com.refinedmods.refinedarchitect.template.common; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.level.block.Blocks; diff --git a/refinedarchitect-template-platform-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/platform/forge/package-info.java b/refinedarchitect-template-common/src/main/java/com/refinedmods/refinedarchitect/template/common/package-info.java similarity index 56% rename from refinedarchitect-template-platform-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/platform/forge/package-info.java rename to refinedarchitect-template-common/src/main/java/com/refinedmods/refinedarchitect/template/common/package-info.java index e444ecf..46dfea7 100644 --- a/refinedarchitect-template-platform-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/platform/forge/package-info.java +++ b/refinedarchitect-template-common/src/main/java/com/refinedmods/refinedarchitect/template/common/package-info.java @@ -1,4 +1,4 @@ @ParametersAreNonnullByDefault -package com.refinedmods.refinedarchitect.template.platform.forge; +package com.refinedmods.refinedarchitect.template.common; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedarchitect-template-platform-fabric/build.gradle.kts b/refinedarchitect-template-fabric/build.gradle.kts similarity index 62% rename from refinedarchitect-template-platform-fabric/build.gradle.kts rename to refinedarchitect-template-fabric/build.gradle.kts index e853b83..62cf072 100644 --- a/refinedarchitect-template-platform-fabric/build.gradle.kts +++ b/refinedarchitect-template-fabric/build.gradle.kts @@ -5,7 +5,7 @@ plugins { refinedarchitect { modId = "refinedarchitecttemplate" fabric() - compileWithProject(project(":refinedarchitect-template-platform-common")) + compileWithProject(project(":refinedarchitect-template-common")) publishing { // maven = true // curseForge = "123" @@ -14,5 +14,5 @@ refinedarchitect { } base { - archivesName.set("refinedarchitect-template-platform-fabric") + archivesName.set("refinedarchitect-template-fabric") } diff --git a/refinedarchitect-template-platform-fabric/src/main/java/com/refinedmods/refinedarchitect/template/platform/fabric/ClientModInitializerImpl.java b/refinedarchitect-template-fabric/src/main/java/com/refinedmods/refinedarchitect/template/fabric/ClientModInitializerImpl.java similarity index 77% rename from refinedarchitect-template-platform-fabric/src/main/java/com/refinedmods/refinedarchitect/template/platform/fabric/ClientModInitializerImpl.java rename to refinedarchitect-template-fabric/src/main/java/com/refinedmods/refinedarchitect/template/fabric/ClientModInitializerImpl.java index 46a9429..73eea9a 100644 --- a/refinedarchitect-template-platform-fabric/src/main/java/com/refinedmods/refinedarchitect/template/platform/fabric/ClientModInitializerImpl.java +++ b/refinedarchitect-template-fabric/src/main/java/com/refinedmods/refinedarchitect/template/fabric/ClientModInitializerImpl.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedarchitect.template.platform.fabric; +package com.refinedmods.refinedarchitect.template.fabric; import net.fabricmc.api.ClientModInitializer; diff --git a/refinedarchitect-template-platform-fabric/src/main/java/com/refinedmods/refinedarchitect/template/platform/fabric/ModInitializerImpl.java b/refinedarchitect-template-fabric/src/main/java/com/refinedmods/refinedarchitect/template/fabric/ModInitializerImpl.java similarity index 57% rename from refinedarchitect-template-platform-fabric/src/main/java/com/refinedmods/refinedarchitect/template/platform/fabric/ModInitializerImpl.java rename to refinedarchitect-template-fabric/src/main/java/com/refinedmods/refinedarchitect/template/fabric/ModInitializerImpl.java index 200d5b3..3703849 100644 --- a/refinedarchitect-template-platform-fabric/src/main/java/com/refinedmods/refinedarchitect/template/platform/fabric/ModInitializerImpl.java +++ b/refinedarchitect-template-fabric/src/main/java/com/refinedmods/refinedarchitect/template/fabric/ModInitializerImpl.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedarchitect.template.platform.fabric; +package com.refinedmods.refinedarchitect.template.fabric; -import com.refinedmods.refinedarchitect.template.platform.common.Common; +import com.refinedmods.refinedarchitect.template.common.Common; import net.fabricmc.api.ModInitializer; diff --git a/refinedarchitect-template-platform-common/src/main/java/com/refinedmods/refinedarchitect/template/platform/common/package-info.java b/refinedarchitect-template-fabric/src/main/java/com/refinedmods/refinedarchitect/template/fabric/package-info.java similarity index 56% rename from refinedarchitect-template-platform-common/src/main/java/com/refinedmods/refinedarchitect/template/platform/common/package-info.java rename to refinedarchitect-template-fabric/src/main/java/com/refinedmods/refinedarchitect/template/fabric/package-info.java index cb4632e..ae15bbf 100644 --- a/refinedarchitect-template-platform-common/src/main/java/com/refinedmods/refinedarchitect/template/platform/common/package-info.java +++ b/refinedarchitect-template-fabric/src/main/java/com/refinedmods/refinedarchitect/template/fabric/package-info.java @@ -1,4 +1,4 @@ @ParametersAreNonnullByDefault -package com.refinedmods.refinedarchitect.template.platform.common; +package com.refinedmods.refinedarchitect.template.fabric; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedarchitect-template-platform-fabric/src/main/resources/fabric.mod.json b/refinedarchitect-template-fabric/src/main/resources/fabric.mod.json similarity index 81% rename from refinedarchitect-template-platform-fabric/src/main/resources/fabric.mod.json rename to refinedarchitect-template-fabric/src/main/resources/fabric.mod.json index e851e72..b6bfd5b 100644 --- a/refinedarchitect-template-platform-fabric/src/main/resources/fabric.mod.json +++ b/refinedarchitect-template-fabric/src/main/resources/fabric.mod.json @@ -15,10 +15,10 @@ "environment": "*", "entrypoints": { "main": [ - "com.refinedmods.refinedarchitect.template.platform.fabric.ModInitializerImpl" + "com.refinedmods.refinedarchitect.template.fabric.ModInitializerImpl" ], "client": [ - "com.refinedmods.refinedarchitect.template.platform.fabric.ClientModInitializerImpl" + "com.refinedmods.refinedarchitect.template.fabric.ClientModInitializerImpl" ] }, "custom": { diff --git a/refinedarchitect-template-platform-neoforge/build.gradle.kts b/refinedarchitect-template-neoforge/build.gradle.kts similarity index 62% rename from refinedarchitect-template-platform-neoforge/build.gradle.kts rename to refinedarchitect-template-neoforge/build.gradle.kts index 25bb9d7..bddf45d 100644 --- a/refinedarchitect-template-platform-neoforge/build.gradle.kts +++ b/refinedarchitect-template-neoforge/build.gradle.kts @@ -5,7 +5,7 @@ plugins { refinedarchitect { modId = "refinedarchitecttemplate" neoForge() - compileWithProject(project(":refinedarchitect-template-platform-common")) + compileWithProject(project(":refinedarchitect-template-common")) publishing { // maven = true // curseForge = "123" @@ -14,5 +14,5 @@ refinedarchitect { } base { - archivesName.set("refinedarchitect-template-platform-neoforge") + archivesName.set("refinedarchitect-template-neoforge") } diff --git a/refinedarchitect-template-platform-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/platform/forge/ClientModInitializer.java b/refinedarchitect-template-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/forge/ClientModInitializer.java similarity index 84% rename from refinedarchitect-template-platform-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/platform/forge/ClientModInitializer.java rename to refinedarchitect-template-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/forge/ClientModInitializer.java index d83ac4d..d435fe1 100644 --- a/refinedarchitect-template-platform-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/platform/forge/ClientModInitializer.java +++ b/refinedarchitect-template-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/forge/ClientModInitializer.java @@ -1,4 +1,4 @@ -package com.refinedmods.refinedarchitect.template.platform.forge; +package com.refinedmods.refinedarchitect.template.forge; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; diff --git a/refinedarchitect-template-platform-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/platform/forge/ModInitializer.java b/refinedarchitect-template-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/forge/ModInitializer.java similarity index 82% rename from refinedarchitect-template-platform-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/platform/forge/ModInitializer.java rename to refinedarchitect-template-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/forge/ModInitializer.java index 3033ddb..4598371 100644 --- a/refinedarchitect-template-platform-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/platform/forge/ModInitializer.java +++ b/refinedarchitect-template-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/forge/ModInitializer.java @@ -1,6 +1,6 @@ -package com.refinedmods.refinedarchitect.template.platform.forge; +package com.refinedmods.refinedarchitect.template.forge; -import com.refinedmods.refinedarchitect.template.platform.common.Common; +import com.refinedmods.refinedarchitect.template.common.Common; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.IEventBus; diff --git a/refinedarchitect-template-platform-fabric/src/main/java/com/refinedmods/refinedarchitect/template/platform/fabric/package-info.java b/refinedarchitect-template-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/forge/package-info.java similarity index 56% rename from refinedarchitect-template-platform-fabric/src/main/java/com/refinedmods/refinedarchitect/template/platform/fabric/package-info.java rename to refinedarchitect-template-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/forge/package-info.java index f707a56..2c724fa 100644 --- a/refinedarchitect-template-platform-fabric/src/main/java/com/refinedmods/refinedarchitect/template/platform/fabric/package-info.java +++ b/refinedarchitect-template-neoforge/src/main/java/com/refinedmods/refinedarchitect/template/forge/package-info.java @@ -1,4 +1,4 @@ @ParametersAreNonnullByDefault -package com.refinedmods.refinedarchitect.template.platform.fabric; +package com.refinedmods.refinedarchitect.template.forge; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/refinedarchitect-template-platform-neoforge/src/main/resources/META-INF/neoforge.mods.toml b/refinedarchitect-template-neoforge/src/main/resources/META-INF/neoforge.mods.toml similarity index 100% rename from refinedarchitect-template-platform-neoforge/src/main/resources/META-INF/neoforge.mods.toml rename to refinedarchitect-template-neoforge/src/main/resources/META-INF/neoforge.mods.toml diff --git a/refinedarchitect-template-platform-neoforge/src/main/resources/pack.mcmeta b/refinedarchitect-template-neoforge/src/main/resources/pack.mcmeta similarity index 100% rename from refinedarchitect-template-platform-neoforge/src/main/resources/pack.mcmeta rename to refinedarchitect-template-neoforge/src/main/resources/pack.mcmeta diff --git a/settings.gradle.kts b/settings.gradle.kts index 4594ba5..8769bb3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -45,6 +45,6 @@ pluginManagement { } rootProject.name = "refinedarchitect-template" -include("refinedarchitect-template-platform-common") -include("refinedarchitect-template-platform-neoforge") -include("refinedarchitect-template-platform-fabric") +include("refinedarchitect-template-common") +include("refinedarchitect-template-neoforge") +include("refinedarchitect-template-fabric")