Skip to content

Commit 32f674e

Browse files
BartvHelvertBartvHelvert
committed
Fix naming convention problems
1 parent 242c008 commit 32f674e

23 files changed

+56
-58
lines changed

‎buildSrc/src/main/kotlin/CodeGenerator.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ abstract class CodeGenerator : Plugin<Project> {
2828
fun createGeneratedDir(target: Project) {
2929
target.plugins.withType(JavaPlugin::class.java) {
3030
val sourceSets = target.properties["sourceSets"] as SourceSetContainer
31-
sourceSets.getByName("main").java.srcDir(generatedFolder)
31+
sourceSets.getByName("main").java.srcDir(GENERATED_FOLDER)
3232
}
3333
}
3434

3535
companion object {
36-
const val generatedFolder: String = "src/main/generated"
36+
const val GENERATED_FOLDER: String = "src/main/generated"
3737

3838
val warningHeader: String =
3939
"/* Dont EDIT! This file is automatically generated by ${CodeGenerator::class.qualifiedName}. */"

‎buildSrc/src/main/kotlin/IdGenerator.kt‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ class IdGenerator : CodeGenerator() {
5151
val npcs = NpcConfig.load(configArchive.readGroup(NpcConfig.id))
5252
target.writeNamedConfigTemplates("Npc", npcs, false)
5353

54-
target.writeIntTemplates("Enums", enumKtFileName)
55-
target.writeIntTemplates("SpotAnims", spotAnimKtFileName)
56-
target.writeIntTemplates("Inventories", invKtFileName)
57-
target.writeIntTemplates("Sequences", sequenceKtFileName)
58-
target.writeIntTemplates("Varps", varpKtFileName)
59-
target.writeIntTemplates("Varbits", varbitKtFileName)
60-
target.writeIntTemplates("CS2s", cs2KtFileName)
61-
target.writeIntTemplates("MusicTracks", musicTrackKtFileName)
62-
target.writeIntTemplates("ObjParams", objParamFileName)
63-
target.writeIntTemplates("NpcParams", npcParamFileName)
54+
target.writeIntTemplates("Enums", ENUM_FILE_NAME)
55+
target.writeIntTemplates("SpotAnims", SPOT_ANIM_FILE_NAME)
56+
target.writeIntTemplates("Inventories", INV_FILE_NAME)
57+
target.writeIntTemplates("Sequences", SEQUENCE_FILE_NAME)
58+
target.writeIntTemplates("Varps", VARP_FILE_NAME)
59+
target.writeIntTemplates("Varbits", VARBIT_FILE_NAME)
60+
target.writeIntTemplates("CS2s", CS2_FILE_NAME)
61+
target.writeIntTemplates("MusicTracks", MUSIC_TRACK_FILE_NAME)
62+
target.writeIntTemplates("ObjParams", OBJ_PARAM_FILE_NAME)
63+
target.writeIntTemplates("NpcParams", NPC_PARAM_FILE_NAME)
6464
}
6565
}
6666
}
@@ -71,27 +71,27 @@ class IdGenerator : CodeGenerator() {
7171
}
7272

7373
companion object {
74-
const val packageName: String = "io.guthix.oldscape.cache"
75-
76-
const val cacheDir: String = "cache/src/main/resources"
77-
const val nameDir: String = "cache/names/src/main/resources"
78-
79-
const val enumKtFileName: String = "EnumId"
80-
const val spotAnimKtFileName: String = "SpotAnimId"
81-
const val invKtFileName: String = "InventoryId"
82-
const val sequenceKtFileName: String = "SequenceId"
83-
const val varpKtFileName: String = "VarpId"
84-
const val varbitKtFileName: String = "VarbitId"
85-
const val cs2KtFileName: String = "CS2Id"
86-
const val musicTrackKtFileName: String = "MusicTrackId"
87-
const val locParamFileName: String = "LocParamId"
88-
const val objParamFileName: String = "ObjParamId"
89-
const val npcParamFileName: String = "NpcParamId"
74+
const val PACKAGE_NAME: String = "io.guthix.oldscape.cache"
75+
76+
const val CACHE_DIR: String = "cache/src/main/resources"
77+
const val NAME_DIR: String = "cache/names/src/main/resources"
78+
79+
const val ENUM_FILE_NAME: String = "EnumId"
80+
const val SPOT_ANIM_FILE_NAME: String = "SpotAnimId"
81+
const val INV_FILE_NAME: String = "InventoryId"
82+
const val SEQUENCE_FILE_NAME: String = "SequenceId"
83+
const val VARP_FILE_NAME: String = "VarpId"
84+
const val VARBIT_FILE_NAME: String = "VarbitId"
85+
const val CS2_FILE_NAME: String = "CS2Id"
86+
const val MUSIC_TRACK_FILE_NAME: String = "MusicTrackId"
87+
const val LOC_PARAM_FILE_NAME: String = "LocParamId"
88+
const val OBJ_PARAM_FILE_NAME: String = "ObjParamId"
89+
const val NPC_PARAM_FILE_NAME: String = "NpcParamId"
9090
}
9191
}
9292

9393
fun createSourceTree(target: Project): Path {
94-
val srcDir = File("${target.projectDir}/${CodeGenerator.generatedFolder}")
94+
val srcDir = File("${target.projectDir}/${CodeGenerator.GENERATED_FOLDER}")
9595
srcDir.mkdirs()
9696
return srcDir.toPath()
9797
}
@@ -122,7 +122,7 @@ data class NamedId(val id: Int, val name: String)
122122
fun Project.readNamedIds(name: String): List<NamedId> {
123123
return ObjectMapper(YAMLFactory()).registerKotlinModule()
124124
.readValue(
125-
File("$rootDir/${IdGenerator.nameDir}").toPath().resolve("$name.yaml").toFile(),
125+
File("$rootDir/${IdGenerator.NAME_DIR}").toPath().resolve("$name.yaml").toFile(),
126126
object : TypeReference<List<NamedId>>() {}
127127
)
128128
}

‎buildSrc/src/main/kotlin/ServerContextGenerator.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class ServerContextGenerator : CodeGenerator() {
6262

6363

6464
companion object {
65-
const val constantPrefix: String = " const val "
66-
const val packageName: String = "io.guthix.oldscape.server.template"
65+
const val CONST_PREFIX: String = " const val "
66+
const val PACKAGE_NAME: String = "io.guthix.oldscape.server.template"
6767
}
6868
}

‎buildSrc/src/main/kotlin/codegen/ConfigGenerator.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ private fun Path.printCodeFile(templateName: String, namedIds: List<NamedId>) {
3333
val sourceFile = resolve("${templateName}s.kt").toFile()
3434
sourceFile.createNewFile()
3535
PrintWriter(sourceFile).use { pw ->
36-
pw.printFileHeader(IdGenerator.packageName)
36+
pw.printFileHeader(IdGenerator.PACKAGE_NAME)
3737
pw.println()
3838
pw.println("object ${templateName}s : TemplateLoader<$templateName>() {")
3939
for ((id, configName) in namedIds) {

‎buildSrc/src/main/kotlin/codegen/EnumGenerator.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private fun Path.printCodeFile(
8585

8686
val sourceFile = resolve("${templateName}.kt").toFile()
8787
PrintWriter(sourceFile).use { pw ->
88-
pw.printFileHeader(ServerContextGenerator.packageName,"UNCHECKED_CAST", "LongLine")
88+
pw.printFileHeader(ServerContextGenerator.PACKAGE_NAME,"UNCHECKED_CAST", "LongLine")
8989
pw.println()
9090
pw.println("import io.guthix.oldscape.cache.config.EnumConfig")
9191
pw.println("import io.guthix.oldscape.server.ServerContext")

‎buildSrc/src/main/kotlin/codegen/IntGenerator.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ private fun Path.printCodeFile(templateName: String, namedIds: List<NamedId>) {
3333
val sourceFile = resolve("${templateName}s.kt").toFile()
3434
sourceFile.createNewFile()
3535
PrintWriter(sourceFile).use { pw ->
36-
pw.printFileHeader(IdGenerator.packageName)
36+
pw.printFileHeader(IdGenerator.PACKAGE_NAME)
3737
pw.println()
3838
pw.println("object ${templateName}s {")
3939
for ((id, configName) in namedIds) {

‎buildSrc/src/main/kotlin/codegen/NamedConfigGenerator.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private fun Path.printCodeFile(fileName: String, configs: Map<Int, NamedConfig>,
3434
val sourceFile = resolve("$fileName.kt").toFile()
3535
sourceFile.createNewFile()
3636
PrintWriter(sourceFile).use { pw ->
37-
pw.printFileHeader(IdGenerator.packageName)
37+
pw.printFileHeader(IdGenerator.PACKAGE_NAME)
3838
pw.println()
3939
pw.println("object $fileName {")
4040
for (namedConfig in configs.values) {

‎buildSrc/src/main/kotlin/codegen/ParamTemplateGenerator.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private fun Path.printCodeFile(templateName: String, namedIds: List<NamedId>, pa
3939
val sourceFile = resolve("${templateName}Params.kt").toFile()
4040
sourceFile.createNewFile()
4141
PrintWriter(sourceFile).use { pw ->
42-
pw.printFileHeader(ServerContextGenerator.packageName)
42+
pw.printFileHeader(ServerContextGenerator.PACKAGE_NAME)
4343
pw.println()
4444
for ((id, configName) in namedIds) {
4545
val identifier = configNameToIdentifier(id, configName)

‎cache/src/main/kotlin/BinariesArchive.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import io.guthix.oldscape.cache.binary.Huffman
2020

2121
public class BinariesArchive(public val huffman: Huffman) {
2222
public companion object {
23-
public const val id: Int = 10
23+
public const val ID: Int = 10
2424

2525
public fun load(archive: Js5Archive): BinariesArchive =
2626
BinariesArchive(Huffman.load(archive.readGroup("huffman").files[0]!!.data))

‎cache/src/main/kotlin/CS2Archive.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import io.guthix.oldscape.cache.script.MachineScript
2020

2121
public class CS2Archive(public val scripts: Map<Int, MachineScript>) {
2222
public companion object {
23-
public const val id: Int = 12
23+
public const val ID: Int = 12
2424

2525
public fun load(archive: Js5Archive): CS2Archive {
2626
val scripts = mutableMapOf<Int, MachineScript>()

0 commit comments

Comments
 (0)