clean

Author: TexBlock

build.gradle

@@ -32,7 +32,6 @@ allprojects {
 
     repositories {
         maven { url "https://maven.saps.dev/minecraft" }
-        //maven { url "https://jitpack.io" }
     }
 
     tasks.withType(JavaCompile) {

common/build.gradle

@@ -1,11 +1,6 @@
 architectury {
     common(rootProject.enabled_platforms.split(","))
 }
-/*
-loom {
-    accessWidenerPath = file("src/main/resources/examplemod.accesswidener")
-}
- */
 
 dependencies {
     // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies

common/src/main/java/org/localmc/tools/ftbqkeys/FTBQKeysMod.java

@@ -3,7 +3,7 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import dev.architectury.event.events.common.CommandRegistrationEvent;
-import dev.architectury.platform.Platform;
+import dev.latvian.mods.kubejs.KubeJSPaths;
 import org.apache.commons.io.FileUtils;
 import org.localmc.tools.ftbqkeys.command.FTBQKeysCommand;
 
@@ -16,8 +16,9 @@
 
 public class FTBQKeysMod {
     public static final String MODID = "ftbqkeys";
-
     public static final Path gameDir = FTBQKeysExpectPlatform.getGameDir();
+    public static final Path configDir = FTBQKeysExpectPlatform.getConfigDir();
+    public static final Path kubejsDir = KubeJSPaths.DIRECTORY;
 
     public static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
 

common/src/main/java/org/localmc/tools/ftbqkeys/command/FTBQKeysCommand.java

@@ -6,7 +6,6 @@
 import com.mojang.brigadier.tree.ArgumentCommandNode;
 import com.mojang.brigadier.tree.LiteralCommandNode;
 import com.mojang.brigadier.tree.RootCommandNode;
-import dev.architectury.platform.Platform;
 import dev.ftb.mods.ftbquests.FTBQuests;
 import dev.ftb.mods.ftbquests.quest.*;
 import dev.ftb.mods.ftbquests.quest.loot.RewardTable;
@@ -38,8 +37,8 @@ public static void serverRegisterCommandsEvent(CommandDispatcher<CommandSourceSt
         ArgumentCommandNode<CommandSourceStack, String> argumentCommandNode = Commands.argument("lang", StringArgumentType.word()).suggests((C1, c2) -> SharedSuggestionProvider.suggest(Minecraft.getInstance().getLanguageManager().getLanguages().stream().map(LanguageInfo::getCode).toList().toArray(new String[0]), c2)).executes(Ctx -> {
             try {
                 File parent = new File(FTBQKeysMod.gameDir.toFile(), "ftbqlocalizationkeys");
-                File transFiles = new File(parent, "kubejs/assets/kubejs/lang/");
-                File questsFolder = new File(FTBQKeysMod.gameDir.toFile(), "config/ftbquests/");
+                File transFiles = new File(parent, FTBQKeysMod.kubejsDir.toAbsolutePath() + "/assets/kubejs/lang/");
+                File questsFolder = new File(FTBQKeysMod.configDir.toFile(), "ftbquests");
 
                 if (questsFolder.exists()) {
                     File backup = new File(parent, "backup/ftbquests");

common/src/main/resources/architectury.common.json

@@ -9,12 +9,6 @@ architectury {
 
 project.archivesBaseName = rootProject.archivesBaseName + "-Fabric"
 
-/*
-loom {
-    accessWidenerPath = project(":common").loom.accessWidenerPath
-}
- */
-
 configurations {
     common
     shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
@@ -43,8 +37,6 @@ processResources {
 }
 
 shadowJar {
-    exclude "architectury.common.json"
-
     configurations = [project.configurations.shadowCommon]
     classifier "dev-shadow"
 }

common/src/main/resources/ftbqkeys.accesswidener

@@ -5,7 +5,7 @@
   "name": "FTBQLocalizationKeys",
   "description": "FTBQLocalizationKeys",
   "authors": [
-    "TexTrue, LocalizedMC"
+    "TexTrue, LocalizedMC","Yjn024","BlackAuresArt"
   ],
   "contact": {
     "homepage": "https://github.com/LocalizedMC/FTBQLocalizationKeys-Arch",
@@ -22,6 +22,8 @@
   "depends": {
     "fabric": "*",
     "minecraft": "1.18.x",
-    "architectury": "4.x"
+    "architectury": "3.x~4.x",
+    "kubejs": "*",
+    "ftbquests": "*"
   }
 }

fabric/build.gradle

@@ -9,17 +9,6 @@ architectury {
 
 project.archivesBaseName = rootProject.archivesBaseName + "-Forge"
 
-/*
-loom {
-    accessWidenerPath = project(":common").loom.accessWidenerPath
-
-    forge {
-        convertAccessWideners = true
-        extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
-    }
-}
- */
-
 configurations {
     common
     shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
@@ -53,7 +42,6 @@ processResources {
 
 shadowJar {
     exclude "fabric.mod.json"
-    exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
     classifier "dev-shadow"

fabric/src/main/resources/fabric.mod.json

@@ -8,6 +8,7 @@ modId = "ftbqkeys"
 version = "${version}"
 displayName = "FTBQLocalizationKeys"
 displayURL = "https://github.com/LocalizedMC/FTBQLocalizationKeys-Arch"
+credits = "BlackAuresArt"
 authors = "TexTrue, LocalizedMC"
 description = '''
 FTBQLocalizationKeys
@@ -31,6 +32,18 @@ side = "BOTH"
 [[dependencies.ftbqkeys]]
 modId = "architectury"
 mandatory = true
-versionRange = "[4,)"
+versionRange = "[3,4)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies.ftbqkeys]]
+modId = "kubejs"
+mandatory = true
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies.ftbqkeys]]
+modId = "ftbquests"
+mandatory = true
 ordering = "AFTER"
 side = "BOTH"