diff --git a/Hook_EpicSpawners6/build.gradle b/Hooks/Hook_EpicSpawners6/build.gradle similarity index 86% rename from Hook_EpicSpawners6/build.gradle rename to Hooks/Hook_EpicSpawners6/build.gradle index 8a83c30..46ffef0 100644 --- a/Hook_EpicSpawners6/build.gradle +++ b/Hooks/Hook_EpicSpawners6/build.gradle @@ -1,10 +1,10 @@ -group 'Hook_EpicSpawners6' +group 'Hooks:EpicSpawners6' dependencies { compileOnly "com.songoda:EpicSpawners:6.0.6" compileOnly "org.spigotmc:v1_8_R3-Taco:latest" compileOnly project(":API") - compileOnly parent + compileOnly rootProject } if (project.hasProperty('hook.compile_epicspawners6') && diff --git a/Hook_EpicSpawners6/src/main/java/com/bgsoftware/wildloaders/hooks/TickableProvider_EpicSpawners6.java b/Hooks/Hook_EpicSpawners6/src/main/java/com/bgsoftware/wildloaders/hooks/TickableProvider_EpicSpawners6.java similarity index 100% rename from Hook_EpicSpawners6/src/main/java/com/bgsoftware/wildloaders/hooks/TickableProvider_EpicSpawners6.java rename to Hooks/Hook_EpicSpawners6/src/main/java/com/bgsoftware/wildloaders/hooks/TickableProvider_EpicSpawners6.java diff --git a/Hook_EpicSpawners7/build.gradle b/Hooks/Hook_EpicSpawners7/build.gradle similarity index 86% rename from Hook_EpicSpawners7/build.gradle rename to Hooks/Hook_EpicSpawners7/build.gradle index c96f5f4..31e10be 100644 --- a/Hook_EpicSpawners7/build.gradle +++ b/Hooks/Hook_EpicSpawners7/build.gradle @@ -1,10 +1,10 @@ -group 'Hook_EpicSpawners6' +group 'Hooks:EpicSpawners6' dependencies { compileOnly "com.songoda:EpicSpawners:7.0.2" compileOnly "org.spigotmc:v1_8_R3-Taco:latest" compileOnly project(":API") - compileOnly parent + compileOnly rootProject } if (project.hasProperty('hook.compile_epicspawners7') && diff --git a/Hook_EpicSpawners7/src/main/java/com/bgsoftware/wildloaders/hooks/TickableProvider_EpicSpawners7.java b/Hooks/Hook_EpicSpawners7/src/main/java/com/bgsoftware/wildloaders/hooks/TickableProvider_EpicSpawners7.java similarity index 100% rename from Hook_EpicSpawners7/src/main/java/com/bgsoftware/wildloaders/hooks/TickableProvider_EpicSpawners7.java rename to Hooks/Hook_EpicSpawners7/src/main/java/com/bgsoftware/wildloaders/hooks/TickableProvider_EpicSpawners7.java diff --git a/Hook_FactionsUUID/build.gradle b/Hooks/Hook_FactionsUUID/build.gradle similarity index 86% rename from Hook_FactionsUUID/build.gradle rename to Hooks/Hook_FactionsUUID/build.gradle index b4ae45e..8535b06 100644 --- a/Hook_FactionsUUID/build.gradle +++ b/Hooks/Hook_FactionsUUID/build.gradle @@ -1,10 +1,10 @@ -group 'Hook_FactionsUUID' +group 'Hooks:FactionsUUID' dependencies { compileOnly "com.drtshock:Factions:1.6.9.5-U0.6.22-b309" compileOnly "org.spigotmc:v1_8_R3-Taco:latest" compileOnly project(":API") - compileOnly parent + compileOnly rootProject } if (project.hasProperty('hook.compile_factionsuuid') && diff --git a/Hook_FactionsUUID/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_FactionsUUID.java b/Hooks/Hook_FactionsUUID/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_FactionsUUID.java similarity index 100% rename from Hook_FactionsUUID/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_FactionsUUID.java rename to Hooks/Hook_FactionsUUID/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_FactionsUUID.java diff --git a/Hook_FactionsX/build.gradle b/Hooks/Hook_FactionsX/build.gradle similarity index 86% rename from Hook_FactionsX/build.gradle rename to Hooks/Hook_FactionsX/build.gradle index 88fa43a..88c76ec 100644 --- a/Hook_FactionsX/build.gradle +++ b/Hooks/Hook_FactionsX/build.gradle @@ -1,10 +1,10 @@ -group 'Hook_FactionsX' +group 'Hooks:FactionsX' dependencies { compileOnly "net.prosavage:FactionsX:0.4.2" compileOnly "org.spigotmc:v1_8_R3-Taco:latest" compileOnly project(":API") - compileOnly parent + compileOnly rootProject } if (project.hasProperty('hook.compile_factionsx') && diff --git a/Hook_FactionsX/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_FactionsX.java b/Hooks/Hook_FactionsX/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_FactionsX.java similarity index 100% rename from Hook_FactionsX/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_FactionsX.java rename to Hooks/Hook_FactionsX/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_FactionsX.java diff --git a/Hook_Lands/build.gradle b/Hooks/Hook_Lands/build.gradle similarity index 87% rename from Hook_Lands/build.gradle rename to Hooks/Hook_Lands/build.gradle index 0220eff..823ce40 100644 --- a/Hook_Lands/build.gradle +++ b/Hooks/Hook_Lands/build.gradle @@ -1,10 +1,10 @@ -group 'Hook_Lands' +group 'Hooks:Lands' dependencies { compileOnly 'me.angeschossen:Lands:4.5.2.7' compileOnly "org.spigotmc:v1_8_R3-Taco:latest" compileOnly project(":API") - compileOnly parent + compileOnly rootProject } if (project.hasProperty('hook.compile_lands') && diff --git a/Hook_Lands/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_Lands.java b/Hooks/Hook_Lands/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_Lands.java similarity index 100% rename from Hook_Lands/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_Lands.java rename to Hooks/Hook_Lands/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_Lands.java diff --git a/Hook_MassiveFactions/build.gradle b/Hooks/Hook_MassiveFactions/build.gradle similarity index 87% rename from Hook_MassiveFactions/build.gradle rename to Hooks/Hook_MassiveFactions/build.gradle index 0107ac2..4596f09 100644 --- a/Hook_MassiveFactions/build.gradle +++ b/Hooks/Hook_MassiveFactions/build.gradle @@ -1,11 +1,11 @@ -group 'Hook_MassiveFactions' +group 'Hooks:MassiveFactions' dependencies { compileOnly "com.massivecraft:Factions:2.13.6" compileOnly "com.massivecraft:MassiveCore:2.13.6" compileOnly "org.spigotmc:v1_8_R3-Taco:latest" compileOnly project(":API") - compileOnly parent + compileOnly rootProject } if (project.hasProperty('hook.compile_massivefactions') && diff --git a/Hook_MassiveFactions/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_MassiveFactions.java b/Hooks/Hook_MassiveFactions/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_MassiveFactions.java similarity index 100% rename from Hook_MassiveFactions/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_MassiveFactions.java rename to Hooks/Hook_MassiveFactions/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_MassiveFactions.java diff --git a/Hook_SuperiorSkyblock/build.gradle b/Hooks/Hook_SuperiorSkyblock/build.gradle similarity index 86% rename from Hook_SuperiorSkyblock/build.gradle rename to Hooks/Hook_SuperiorSkyblock/build.gradle index f86ce5c..423a9cd 100644 --- a/Hook_SuperiorSkyblock/build.gradle +++ b/Hooks/Hook_SuperiorSkyblock/build.gradle @@ -1,10 +1,10 @@ -group 'Hook_SuperiorSkyblock' +group 'Hooks:SuperiorSkyblock' dependencies { compileOnly "com.bgsoftware:SuperiorSkyblockAPI:1.8.2" compileOnly "org.spigotmc:v1_8_R3-Taco:latest" compileOnly project(":API") - compileOnly parent + compileOnly rootProject } if (project.hasProperty('hook.compile_superiorskyblock') && diff --git a/Hook_SuperiorSkyblock/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_SuperiorSkyblock.java b/Hooks/Hook_SuperiorSkyblock/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_SuperiorSkyblock.java similarity index 100% rename from Hook_SuperiorSkyblock/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_SuperiorSkyblock.java rename to Hooks/Hook_SuperiorSkyblock/src/main/java/com/bgsoftware/wildloaders/hooks/ClaimsProvider_SuperiorSkyblock.java diff --git a/Hooks/build.gradle b/Hooks/build.gradle new file mode 100644 index 0000000..7d9dc07 --- /dev/null +++ b/Hooks/build.gradle @@ -0,0 +1 @@ +group 'Hooks' \ No newline at end of file diff --git a/NMS/build.gradle b/NMS/build.gradle new file mode 100644 index 0000000..fce298d --- /dev/null +++ b/NMS/build.gradle @@ -0,0 +1 @@ +group 'NMS' \ No newline at end of file diff --git a/v117/build.gradle b/NMS/v117/build.gradle similarity index 86% rename from v117/build.gradle rename to NMS/v117/build.gradle index 40ab87a..9e9824a 100644 --- a/v117/build.gradle +++ b/NMS/v117/build.gradle @@ -8,10 +8,12 @@ java { } } +group 'NMS:v117' + dependencies { paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.17.1-R0.1-SNAPSHOT") compileOnly project(":API") - compileOnly parent + compileOnly rootProject } shadowJar { @@ -24,7 +26,7 @@ assemble { tasks { reobfJar { - File outputFile = new File(parent.projectDir, "archive/reobf/${project.name}.jar") + File outputFile = new File(rootProject.archiveFolder, "reobf/${project.name}.jar") outputJar.set(layout.buildDirectory.file(outputFile.getPath())) } } diff --git a/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/EntityHologram.java b/NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/EntityHologram.java similarity index 100% rename from v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/EntityHologram.java rename to NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/EntityHologram.java diff --git a/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/NMSAdapter.java b/NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/NMSAdapter.java similarity index 100% rename from v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/NMSAdapter.java rename to NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/NMSAdapter.java diff --git a/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/loader/ChunkLoaderBlockEntity.java b/NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/loader/ChunkLoaderBlockEntity.java similarity index 100% rename from v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/loader/ChunkLoaderBlockEntity.java rename to NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/loader/ChunkLoaderBlockEntity.java diff --git a/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/loader/ChunkLoaderBlockEntityTicker.java b/NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/loader/ChunkLoaderBlockEntityTicker.java similarity index 100% rename from v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/loader/ChunkLoaderBlockEntityTicker.java rename to NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/loader/ChunkLoaderBlockEntityTicker.java diff --git a/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/npc/ChunkLoaderNPCWrapper.java b/NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/npc/ChunkLoaderNPCWrapper.java similarity index 100% rename from v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/npc/ChunkLoaderNPCWrapper.java rename to NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/npc/ChunkLoaderNPCWrapper.java diff --git a/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/npc/ChunkLoaderPlayer.java b/NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/npc/ChunkLoaderPlayer.java similarity index 100% rename from v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/npc/ChunkLoaderPlayer.java rename to NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/npc/ChunkLoaderPlayer.java diff --git a/v1181/build.gradle b/NMS/v1181/build.gradle similarity index 86% rename from v1181/build.gradle rename to NMS/v1181/build.gradle index 043e132..c92473b 100644 --- a/v1181/build.gradle +++ b/NMS/v1181/build.gradle @@ -8,10 +8,12 @@ java { } } +group 'NMS:v1181' + dependencies { paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.18.1-R0.1-SNAPSHOT") compileOnly project(":API") - compileOnly parent + compileOnly rootProject } shadowJar { @@ -24,7 +26,7 @@ assemble { tasks { reobfJar { - File outputFile = new File(parent.projectDir, "archive/reobf/${project.name}.jar") + File outputFile = new File(rootProject.archiveFolder, "reobf/${project.name}.jar") outputJar.set(layout.buildDirectory.file(outputFile.getPath())) } } diff --git a/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/ChunkLoaderNPCImpl.java b/NMS/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/ChunkLoaderNPCImpl.java similarity index 100% rename from v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/ChunkLoaderNPCImpl.java rename to NMS/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/ChunkLoaderNPCImpl.java diff --git a/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/EntityHologram.java b/NMS/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/EntityHologram.java similarity index 100% rename from v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/EntityHologram.java rename to NMS/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/EntityHologram.java diff --git a/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/NMSAdapter.java b/NMS/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/NMSAdapter.java similarity index 100% rename from v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/NMSAdapter.java rename to NMS/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/NMSAdapter.java diff --git a/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/loader/ChunkLoaderBlockEntity.java b/NMS/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/loader/ChunkLoaderBlockEntity.java similarity index 100% rename from v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/loader/ChunkLoaderBlockEntity.java rename to NMS/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/loader/ChunkLoaderBlockEntity.java diff --git a/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/loader/ChunkLoaderBlockEntityTicker.java b/NMS/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/loader/ChunkLoaderBlockEntityTicker.java similarity index 100% rename from v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/loader/ChunkLoaderBlockEntityTicker.java rename to NMS/v1181/src/main/java/com/bgsoftware/wildloaders/nms/v1181/loader/ChunkLoaderBlockEntityTicker.java diff --git a/v1182/build.gradle b/NMS/v1182/build.gradle similarity index 86% rename from v1182/build.gradle rename to NMS/v1182/build.gradle index d0966e5..176297f 100644 --- a/v1182/build.gradle +++ b/NMS/v1182/build.gradle @@ -8,10 +8,12 @@ java { } } +group 'NMS:v1182' + dependencies { paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.18.2-R0.1-SNAPSHOT") compileOnly project(":API") - compileOnly parent + compileOnly rootProject } shadowJar { @@ -24,7 +26,7 @@ assemble { tasks { reobfJar { - File outputFile = new File(parent.projectDir, "archive/reobf/${project.name}.jar") + File outputFile = new File(rootProject.archiveFolder, "reobf/${project.name}.jar") outputJar.set(layout.buildDirectory.file(outputFile.getPath())) } } diff --git a/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/ChunkLoaderNPCImpl.java b/NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/ChunkLoaderNPCImpl.java similarity index 100% rename from v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/ChunkLoaderNPCImpl.java rename to NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/ChunkLoaderNPCImpl.java diff --git a/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/EntityHologram.java b/NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/EntityHologram.java similarity index 100% rename from v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/EntityHologram.java rename to NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/EntityHologram.java diff --git a/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/NMSAdapter.java b/NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/NMSAdapter.java similarity index 100% rename from v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/NMSAdapter.java rename to NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/NMSAdapter.java diff --git a/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/loader/ChunkLoaderBlockEntity.java b/NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/loader/ChunkLoaderBlockEntity.java similarity index 100% rename from v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/loader/ChunkLoaderBlockEntity.java rename to NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/loader/ChunkLoaderBlockEntity.java diff --git a/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/loader/ChunkLoaderBlockEntityTicker.java b/NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/loader/ChunkLoaderBlockEntityTicker.java similarity index 100% rename from v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/loader/ChunkLoaderBlockEntityTicker.java rename to NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/loader/ChunkLoaderBlockEntityTicker.java diff --git a/v119/build.gradle b/NMS/v119/build.gradle similarity index 86% rename from v119/build.gradle rename to NMS/v119/build.gradle index 16c350b..171634a 100644 --- a/v119/build.gradle +++ b/NMS/v119/build.gradle @@ -8,10 +8,12 @@ java { } } +group 'NMS:v119' + dependencies { paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.19-R0.1-SNAPSHOT") compileOnly project(":API") - compileOnly parent + compileOnly rootProject } shadowJar { @@ -24,7 +26,7 @@ assemble { tasks { reobfJar { - File outputFile = new File(parent.projectDir, "archive/reobf/${project.name}.jar") + File outputFile = new File(rootProject.archiveFolder, "reobf/${project.name}.jar") outputJar.set(layout.buildDirectory.file(outputFile.getPath())) } } diff --git a/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/ChunkLoaderNPCImpl.java b/NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/ChunkLoaderNPCImpl.java similarity index 100% rename from v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/ChunkLoaderNPCImpl.java rename to NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/ChunkLoaderNPCImpl.java diff --git a/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/EntityHologram.java b/NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/EntityHologram.java similarity index 100% rename from v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/EntityHologram.java rename to NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/EntityHologram.java diff --git a/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/NMSAdapter.java b/NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/NMSAdapter.java similarity index 100% rename from v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/NMSAdapter.java rename to NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/NMSAdapter.java diff --git a/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/loader/ChunkLoaderBlockEntity.java b/NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/loader/ChunkLoaderBlockEntity.java similarity index 100% rename from v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/loader/ChunkLoaderBlockEntity.java rename to NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/loader/ChunkLoaderBlockEntity.java diff --git a/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/loader/ChunkLoaderBlockEntityTicker.java b/NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/loader/ChunkLoaderBlockEntityTicker.java similarity index 100% rename from v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/loader/ChunkLoaderBlockEntityTicker.java rename to NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/loader/ChunkLoaderBlockEntityTicker.java diff --git a/v1191/build.gradle b/NMS/v1191/build.gradle similarity index 86% rename from v1191/build.gradle rename to NMS/v1191/build.gradle index 4f5304e..612e03b 100644 --- a/v1191/build.gradle +++ b/NMS/v1191/build.gradle @@ -8,10 +8,12 @@ java { } } +group 'NMS:v1191' + dependencies { paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.19.1-R0.1-SNAPSHOT") compileOnly project(":API") - compileOnly parent + compileOnly rootProject } shadowJar { @@ -24,7 +26,7 @@ assemble { tasks { reobfJar { - File outputFile = new File(parent.projectDir, "archive/reobf/${project.name}.jar") + File outputFile = new File(rootProject.archiveFolder, "reobf/${project.name}.jar") outputJar.set(layout.buildDirectory.file(outputFile.getPath())) } } diff --git a/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/ChunkLoaderNPCImpl.java b/NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/ChunkLoaderNPCImpl.java similarity index 100% rename from v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/ChunkLoaderNPCImpl.java rename to NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/ChunkLoaderNPCImpl.java diff --git a/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/EntityHologram.java b/NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/EntityHologram.java similarity index 100% rename from v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/EntityHologram.java rename to NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/EntityHologram.java diff --git a/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/NMSAdapter.java b/NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/NMSAdapter.java similarity index 100% rename from v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/NMSAdapter.java rename to NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/NMSAdapter.java diff --git a/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/loader/ChunkLoaderBlockEntity.java b/NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/loader/ChunkLoaderBlockEntity.java similarity index 100% rename from v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/loader/ChunkLoaderBlockEntity.java rename to NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/loader/ChunkLoaderBlockEntity.java diff --git a/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/loader/ChunkLoaderBlockEntityTicker.java b/NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/loader/ChunkLoaderBlockEntityTicker.java similarity index 100% rename from v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/loader/ChunkLoaderBlockEntityTicker.java rename to NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/loader/ChunkLoaderBlockEntityTicker.java diff --git a/v1192/build.gradle b/NMS/v1192/build.gradle similarity index 86% rename from v1192/build.gradle rename to NMS/v1192/build.gradle index e8f1bc9..7f98ce4 100644 --- a/v1192/build.gradle +++ b/NMS/v1192/build.gradle @@ -8,10 +8,12 @@ java { } } +group 'NMS:v1192' + dependencies { paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.19.2-R0.1-SNAPSHOT") compileOnly project(":API") - compileOnly parent + compileOnly rootProject } shadowJar { @@ -24,7 +26,7 @@ assemble { tasks { reobfJar { - File outputFile = new File(parent.projectDir, "archive/reobf/${project.name}.jar") + File outputFile = new File(rootProject.archiveFolder, "reobf/${project.name}.jar") outputJar.set(layout.buildDirectory.file(outputFile.getPath())) } } diff --git a/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/ChunkLoaderNPCImpl.java b/NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/ChunkLoaderNPCImpl.java similarity index 100% rename from v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/ChunkLoaderNPCImpl.java rename to NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/ChunkLoaderNPCImpl.java diff --git a/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/EntityHologram.java b/NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/EntityHologram.java similarity index 100% rename from v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/EntityHologram.java rename to NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/EntityHologram.java diff --git a/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/NMSAdapter.java b/NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/NMSAdapter.java similarity index 100% rename from v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/NMSAdapter.java rename to NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/NMSAdapter.java diff --git a/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/loader/ChunkLoaderBlockEntity.java b/NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/loader/ChunkLoaderBlockEntity.java similarity index 100% rename from v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/loader/ChunkLoaderBlockEntity.java rename to NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/loader/ChunkLoaderBlockEntity.java diff --git a/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/loader/ChunkLoaderBlockEntityTicker.java b/NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/loader/ChunkLoaderBlockEntityTicker.java similarity index 100% rename from v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/loader/ChunkLoaderBlockEntityTicker.java rename to NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/loader/ChunkLoaderBlockEntityTicker.java diff --git a/v1193/build.gradle b/NMS/v1193/build.gradle similarity index 86% rename from v1193/build.gradle rename to NMS/v1193/build.gradle index 8bcfd8a..3aba0f8 100644 --- a/v1193/build.gradle +++ b/NMS/v1193/build.gradle @@ -8,10 +8,12 @@ java { } } +group 'NMS:v1193' + dependencies { paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.19.3-R0.1-SNAPSHOT") compileOnly project(":API") - compileOnly parent + compileOnly rootProject } shadowJar { @@ -24,7 +26,7 @@ assemble { tasks { reobfJar { - File outputFile = new File(parent.projectDir, "archive/reobf/${project.name}.jar") + File outputFile = new File(rootProject.archiveFolder, "reobf/${project.name}.jar") outputJar.set(layout.buildDirectory.file(outputFile.getPath())) } } diff --git a/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/ChunkLoaderNPCImpl.java b/NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/ChunkLoaderNPCImpl.java similarity index 100% rename from v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/ChunkLoaderNPCImpl.java rename to NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/ChunkLoaderNPCImpl.java diff --git a/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/EntityHologram.java b/NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/EntityHologram.java similarity index 100% rename from v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/EntityHologram.java rename to NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/EntityHologram.java diff --git a/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/NMSAdapter.java b/NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/NMSAdapter.java similarity index 100% rename from v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/NMSAdapter.java rename to NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/NMSAdapter.java diff --git a/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/loader/ChunkLoaderBlockEntity.java b/NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/loader/ChunkLoaderBlockEntity.java similarity index 100% rename from v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/loader/ChunkLoaderBlockEntity.java rename to NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/loader/ChunkLoaderBlockEntity.java diff --git a/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/loader/ChunkLoaderBlockEntityTicker.java b/NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/loader/ChunkLoaderBlockEntityTicker.java similarity index 100% rename from v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/loader/ChunkLoaderBlockEntityTicker.java rename to NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/loader/ChunkLoaderBlockEntityTicker.java diff --git a/v1194/build.gradle b/NMS/v1194/build.gradle similarity index 86% rename from v1194/build.gradle rename to NMS/v1194/build.gradle index 9e6cb05..0b82c24 100644 --- a/v1194/build.gradle +++ b/NMS/v1194/build.gradle @@ -8,10 +8,12 @@ java { } } +group 'NMS:v1194' + dependencies { paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.19.4-R0.1-SNAPSHOT") compileOnly project(":API") - compileOnly parent + compileOnly rootProject } shadowJar { @@ -24,7 +26,7 @@ assemble { tasks { reobfJar { - File outputFile = new File(parent.projectDir, "archive/reobf/${project.name}.jar") + File outputFile = new File(rootProject.archiveFolder, "reobf/${project.name}.jar") outputJar.set(layout.buildDirectory.file(outputFile.getPath())) } } diff --git a/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/ChunkLoaderNPCImpl.java b/NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/ChunkLoaderNPCImpl.java similarity index 100% rename from v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/ChunkLoaderNPCImpl.java rename to NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/ChunkLoaderNPCImpl.java diff --git a/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/EntityHologram.java b/NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/EntityHologram.java similarity index 100% rename from v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/EntityHologram.java rename to NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/EntityHologram.java diff --git a/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/NMSAdapter.java b/NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/NMSAdapter.java similarity index 100% rename from v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/NMSAdapter.java rename to NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/NMSAdapter.java diff --git a/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/loader/ChunkLoaderBlockEntity.java b/NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/loader/ChunkLoaderBlockEntity.java similarity index 100% rename from v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/loader/ChunkLoaderBlockEntity.java rename to NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/loader/ChunkLoaderBlockEntity.java diff --git a/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/loader/ChunkLoaderBlockEntityTicker.java b/NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/loader/ChunkLoaderBlockEntityTicker.java similarity index 100% rename from v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/loader/ChunkLoaderBlockEntityTicker.java rename to NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/loader/ChunkLoaderBlockEntityTicker.java diff --git a/v1_12_R1/build.gradle b/NMS/v1_12_R1/build.gradle similarity index 84% rename from v1_12_R1/build.gradle rename to NMS/v1_12_R1/build.gradle index 59eeb5e..e078b94 100644 --- a/v1_12_R1/build.gradle +++ b/NMS/v1_12_R1/build.gradle @@ -1,9 +1,9 @@ -group 'v1_12_R1' +group 'NMS:v1_12_R1' dependencies { compileOnly "org.spigotmc:v1_12_R1:latest" compileOnly project(":API") - compileOnly parent + compileOnly rootProject } if (project.hasProperty('nms.compile_v1_12') && !Boolean.valueOf(project.findProperty("nms.compile_v1_12").toString())) { diff --git a/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/ChunkLoaderNPC.java b/NMS/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/ChunkLoaderNPC.java similarity index 100% rename from v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/ChunkLoaderNPC.java rename to NMS/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/ChunkLoaderNPC.java diff --git a/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/EntityHolograms.java b/NMS/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/EntityHolograms.java similarity index 100% rename from v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/EntityHolograms.java rename to NMS/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/EntityHolograms.java diff --git a/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/NMSAdapter.java b/NMS/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/NMSAdapter.java similarity index 100% rename from v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/NMSAdapter.java rename to NMS/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/NMSAdapter.java diff --git a/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/loader/TileEntityChunkLoader.java b/NMS/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/loader/TileEntityChunkLoader.java similarity index 100% rename from v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/loader/TileEntityChunkLoader.java rename to NMS/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/loader/TileEntityChunkLoader.java diff --git a/v1_16_R3/build.gradle b/NMS/v1_16_R3/build.gradle similarity index 84% rename from v1_16_R3/build.gradle rename to NMS/v1_16_R3/build.gradle index be1ff2a..7abaff7 100644 --- a/v1_16_R3/build.gradle +++ b/NMS/v1_16_R3/build.gradle @@ -1,9 +1,9 @@ -group 'v1_16_R3' +group 'NMS:v1_16_R3' dependencies { compileOnly "org.spigotmc:v1_16_R3-Tuinity:latest" compileOnly project(":API") - compileOnly parent + compileOnly rootProject } if (project.hasProperty('nms.compile_v1_16') && !Boolean.valueOf(project.findProperty("nms.compile_v1_16").toString())) { diff --git a/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/ChunkLoaderNPC.java b/NMS/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/ChunkLoaderNPC.java similarity index 100% rename from v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/ChunkLoaderNPC.java rename to NMS/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/ChunkLoaderNPC.java diff --git a/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/EntityHolograms.java b/NMS/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/EntityHolograms.java similarity index 100% rename from v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/EntityHolograms.java rename to NMS/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/EntityHolograms.java diff --git a/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/NMSAdapter.java b/NMS/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/NMSAdapter.java similarity index 100% rename from v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/NMSAdapter.java rename to NMS/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/NMSAdapter.java diff --git a/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/loader/TileEntityChunkLoader.java b/NMS/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/loader/TileEntityChunkLoader.java similarity index 100% rename from v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/loader/TileEntityChunkLoader.java rename to NMS/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/loader/TileEntityChunkLoader.java diff --git a/v1_7_R4/build.gradle b/NMS/v1_7_R4/build.gradle similarity index 84% rename from v1_7_R4/build.gradle rename to NMS/v1_7_R4/build.gradle index 48dec90..4a82d2a 100644 --- a/v1_7_R4/build.gradle +++ b/NMS/v1_7_R4/build.gradle @@ -1,9 +1,9 @@ -group 'v1_7_R4' +group 'NMS:v1_7_R4' dependencies { compileOnly "org.spigotmc:v1_7_R4:latest" compileOnly project(":API") - compileOnly parent + compileOnly rootProject } if (project.hasProperty('nms.compile_v1_7') && !Boolean.valueOf(project.findProperty("nms.compile_v1_7").toString())) { diff --git a/v1_7_R4/src/main/java/com/bgsoftware/wildloaders/nms/v1_7_R4/ChunkLoaderNPC.java b/NMS/v1_7_R4/src/main/java/com/bgsoftware/wildloaders/nms/v1_7_R4/ChunkLoaderNPC.java similarity index 100% rename from v1_7_R4/src/main/java/com/bgsoftware/wildloaders/nms/v1_7_R4/ChunkLoaderNPC.java rename to NMS/v1_7_R4/src/main/java/com/bgsoftware/wildloaders/nms/v1_7_R4/ChunkLoaderNPC.java diff --git a/v1_7_R4/src/main/java/com/bgsoftware/wildloaders/nms/v1_7_R4/NMSAdapter.java b/NMS/v1_7_R4/src/main/java/com/bgsoftware/wildloaders/nms/v1_7_R4/NMSAdapter.java similarity index 100% rename from v1_7_R4/src/main/java/com/bgsoftware/wildloaders/nms/v1_7_R4/NMSAdapter.java rename to NMS/v1_7_R4/src/main/java/com/bgsoftware/wildloaders/nms/v1_7_R4/NMSAdapter.java diff --git a/v1_7_R4/src/main/java/com/bgsoftware/wildloaders/nms/v1_7_R4/loader/TileEntityChunkLoader.java b/NMS/v1_7_R4/src/main/java/com/bgsoftware/wildloaders/nms/v1_7_R4/loader/TileEntityChunkLoader.java similarity index 100% rename from v1_7_R4/src/main/java/com/bgsoftware/wildloaders/nms/v1_7_R4/loader/TileEntityChunkLoader.java rename to NMS/v1_7_R4/src/main/java/com/bgsoftware/wildloaders/nms/v1_7_R4/loader/TileEntityChunkLoader.java diff --git a/v1_8_R3/build.gradle b/NMS/v1_8_R3/build.gradle similarity index 84% rename from v1_8_R3/build.gradle rename to NMS/v1_8_R3/build.gradle index 3f61f25..6788f5e 100644 --- a/v1_8_R3/build.gradle +++ b/NMS/v1_8_R3/build.gradle @@ -1,9 +1,9 @@ -group 'v1_8_R3' +group 'NMS:v1_8_R3' dependencies { compileOnly "org.spigotmc:v1_8_R3-Taco:latest" compileOnly project(":API") - compileOnly parent + compileOnly rootProject } if (project.hasProperty('nms.compile_v1_8') && !Boolean.valueOf(project.findProperty("nms.compile_v1_8").toString())) { diff --git a/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/ChunkLoaderNPC.java b/NMS/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/ChunkLoaderNPC.java similarity index 100% rename from v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/ChunkLoaderNPC.java rename to NMS/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/ChunkLoaderNPC.java diff --git a/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/EntityHolograms.java b/NMS/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/EntityHolograms.java similarity index 100% rename from v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/EntityHolograms.java rename to NMS/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/EntityHolograms.java diff --git a/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/NMSAdapter.java b/NMS/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/NMSAdapter.java similarity index 100% rename from v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/NMSAdapter.java rename to NMS/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/NMSAdapter.java diff --git a/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/loader/TileEntityChunkLoader.java b/NMS/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/loader/TileEntityChunkLoader.java similarity index 100% rename from v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/loader/TileEntityChunkLoader.java rename to NMS/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/loader/TileEntityChunkLoader.java diff --git a/build.gradle b/build.gradle index 66beb19..6c6c42d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,18 @@ -import org.gradle.api.GradleException - plugins { id 'java' - id 'com.github.johnrengelman.shadow' version '7.0.0' + id 'com.github.johnrengelman.shadow' version '7.1.2' id 'maven-publish' } group 'WildLoaders' version = "2022.7" +project.ext { + archiveFolder = file("archive/") + targetFolder = file("target/") + buildVersion = System.getenv("BUILD_NUMBER") == null ? version : version + "-b" + System.getenv("BUILD_NUMBER") +} + allprojects { apply plugin: 'java' apply plugin: 'com.github.johnrengelman.shadow' @@ -42,13 +46,13 @@ allprojects { subprojects { shadowJar { archiveFileName = "${project.name}.jar" - destinationDirectory = file("../archive/") + destinationDirectory = rootProject.archiveFolder } } dependencies { + implementation fileTree(rootProject.archiveFolder.getAbsolutePath()) implementation project(":API") - implementation fileTree("archive") implementation 'com.bgsoftware.common.reflection:ReflectionUtils:latest' implementation 'com.bgsoftware.common.config:CommentedConfiguration:1.0.3' @@ -60,7 +64,7 @@ dependencies { jar { from { - for (File file : new File("archive").listFiles()) { + for (File file : rootProject.archiveFolder.listFiles()) { zipTree(file) } } @@ -68,11 +72,10 @@ jar { processResources { outputs.upToDateWhen { false } - String versionNumber = System.getenv("BUILD_NUMBER") == null ? version : version + "-b" + System.getenv("BUILD_NUMBER") eachFile { details -> if (details.name.contentEquals('plugin.yml')) { filter { String line -> - line.replace('${project.version}', versionNumber) + line.replace('${project.version}', rootProject.buildVersion) } } } @@ -81,31 +84,25 @@ processResources { shadowJar { dependsOn(jar) - if (System.getenv("BUILD_NUMBER") == null) { - archiveName = rootProject.name + "-" + version + ".jar" - } else { - archiveName = rootProject.name + "-" + version + "-b" + System.getenv("BUILD_NUMBER") + ".jar" - } + archiveFileName = rootProject.name + "-" + rootProject.buildVersion + ".jar" - delete fileTree('./target/') { - exclude archiveName - } + delete fileTree(rootProject.targetFolder.getAbsolutePath()) exclude '*exclude.jar' - destinationDir = file("./target/") + destinationDirectory = rootProject.targetFolder from sourceSets.getByName("main").output configurations = [project.configurations.getByName("runtimeClasspath")] } task copyAPI(type: Copy) { - from './archive/API.jar' - into './target/' + from rootProject.archiveFolder.getAbsolutePath() + '/API.jar' + into rootProject.targetFolder.getAbsolutePath() rename('API.jar', rootProject.name + 'API.jar') } clean { - delete file('./archive/') + delete rootProject.archiveFolder } build { diff --git a/settings.gradle b/settings.gradle index cf56c74..fc57745 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,23 +8,25 @@ pluginManagement { rootProject.name = 'WildLoaders' include 'API' -include 'Hook_EpicSpawners6' -include 'Hook_EpicSpawners7' -include 'Hook_FactionsUUID' -include 'Hook_FactionsX' -include 'Hook_Lands' -include 'Hook_MassiveFactions' -include 'Hook_SuperiorSkyblock' -include 'v1_7_R4' -include 'v1_8_R3' -include 'v1_12_R1' -include 'v1_16_R3' -include 'v117' -include 'v1181' -include 'v1182' -include 'v119' -include 'v1191' -include 'v1192' -include 'v1193' -include 'v1194' +include 'Hooks' +include 'Hooks:EpicSpawners6' +include 'Hooks:EpicSpawners7' +include 'Hooks:FactionsUUID' +include 'Hooks:FactionsX' +include 'Hooks:Lands' +include 'Hooks:MassiveFactions' +include 'Hooks:SuperiorSkyblock' +include 'NMS' +include 'NMS:v1_7_R4' +include 'NMS:v1_8_R3' +include 'NMS:v1_12_R1' +include 'NMS:v1_16_R3' +include 'NMS:v117' +include 'NMS:v1181' +include 'NMS:v1182' +include 'NMS:v119' +include 'NMS:v1191' +include 'NMS:v1192' +include 'NMS:v1193' +include 'NMS:v1194'