Skip to content

Commit 3c3cab9

Browse files
committed
Improve generator classes
1 parent 8e41d74 commit 3c3cab9

8 files changed

Lines changed: 13 additions & 21 deletions

File tree

src/main/kotlin/net/theevilreaper/stelaris/cli/generator/dart/MaterialGenerator.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class MaterialGenerator : BaseGenerator(
2929
* @param javaPath the path to store the content
3030
*/
3131
override fun generate(javaPath: Path) {
32+
val folder = checkPackageFolder(javaPath, packageName)
3233
val models = Material.values()
3334
val enumFiles = mutableListOf<DartFile>()
3435

@@ -45,7 +46,7 @@ class MaterialGenerator : BaseGenerator(
4546
}
4647

4748
if (enumFiles.isEmpty()) return
48-
enumFiles.forEach { it.write(javaPath) }
49+
enumFiles.forEach { it.write(folder) }
4950
}
5051

5152
private fun mapTypeToBoolean(subType: MaterialSubType, material: Material): Boolean {

src/main/kotlin/net/theevilreaper/stelaris/cli/generator/dart/bossbar/BossBarColorGenerator.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class BossBarColorGenerator : BaseGenerator(
1919
) {
2020

2121
override fun generate(javaPath: Path) {
22+
val folder = checkPackageFolder(javaPath, packageName)
2223
val file = DartFile.builder("boss_bar_color")
2324
.type(
2425
ClassSpec.enumClass(className)
@@ -51,7 +52,7 @@ class BossBarColorGenerator : BaseGenerator(
5152
)
5253
)
5354
.build()
54-
file.write(javaPath)
55+
file.write(folder)
5556
}
5657

5758
override fun getName(): String = "BossBarColorGenerator"

src/main/kotlin/net/theevilreaper/stelaris/cli/generator/dart/bossbar/BossBarFlagGenerator.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class BossBarFlagGenerator : BaseGenerator(
1919
) {
2020

2121
override fun generate(javaPath: Path) {
22+
val folder = checkPackageFolder(javaPath, packageName)
2223
val file = DartFile.builder("boss_bar_flag")
2324
.type(
2425
ClassSpec.enumClass(className)
@@ -51,7 +52,7 @@ class BossBarFlagGenerator : BaseGenerator(
5152
)
5253
)
5354
.build()
54-
file.write(javaPath)
55+
file.write(folder)
5556
}
5657

5758
override fun getName(): String = "BossBarFlagGenerator"

src/main/kotlin/net/theevilreaper/stelaris/cli/generator/dart/bossbar/BossBarOverlayGenerator.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class BossBarOverlayGenerator: BaseGenerator(
1818
packageName = "bossbar"
1919
) {
2020
override fun generate(javaPath: Path) {
21+
val folder = checkPackageFolder(javaPath, packageName)
2122
val file = DartFile.builder("boss_bar_overlay")
2223
.type(
2324
ClassSpec.enumClass(className)
@@ -45,7 +46,7 @@ class BossBarOverlayGenerator: BaseGenerator(
4546
)
4647
)
4748
.build()
48-
file.write(javaPath)
49+
file.write(folder)
4950
}
5051

5152
override fun getName(): String = "BossbarOverlayGenerator"

src/main/kotlin/net/theevilreaper/stelaris/cli/generator/dart/enchantment/EnchantmentGenerator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class EnchantmentGenerator : BaseGenerator(
3333

3434
override fun generate(javaPath: Path) {
3535
val enchantmentFolder = javaPath.resolve(packageName)
36-
Files.createDirectory(enchantmentFolder)
36+
checkPackageFolder(javaPath, packageName)
3737
val enchantmentData: MutableCollection<Enchantment> = MinecraftServer.getEnchantmentRegistry().values()
3838
val mappedEnchantments: Map<EnchantmentGroup, List<Enchantment>> = enchantmentData.mapNotNull { enchantment ->
3939
val key = enchantment.supportedItems().key()?.key()?.asString() ?: EMPTY_STRING

src/main/kotlin/net/theevilreaper/stelaris/cli/generator/dart/sound/SoundEventGenerator.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import net.theevilreaper.dartpoet.enum.parameter.EnumParameterSpec
1111
import net.theevilreaper.dartpoet.property.PropertySpec
1212
import net.theevilreaper.stelaris.cli.generator.BaseGenerator
1313
import net.theevilreaper.stelaris.cli.util.StringHelper
14-
import java.nio.file.Files
1514
import java.nio.file.Path
1615

1716
class SoundEventGenerator : BaseGenerator(
@@ -20,10 +19,7 @@ class SoundEventGenerator : BaseGenerator(
2019
) {
2120

2221
override fun generate(javaPath: Path) {
23-
val folder = javaPath.resolve("sound")
24-
if (!Files.exists(folder)) {
25-
Files.createDirectory(folder)
26-
}
22+
val folder = checkPackageFolder(javaPath, packageName)
2723
val soundEntries = SoundEvent.values()
2824
val mappedEntries = SoundHelper.mapSoundEvents(soundEntries)
2925

src/main/kotlin/net/theevilreaper/stelaris/cli/generator/dart/sound/SoundSourceGenerator.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import net.theevilreaper.dartpoet.parameter.ParameterSpec
1111
import net.theevilreaper.dartpoet.property.PropertySpec
1212
import net.theevilreaper.stelaris.cli.generator.BaseGenerator
1313
import net.theevilreaper.stelaris.cli.util.StringHelper
14-
import java.nio.file.Files
1514
import java.nio.file.Path
1615

1716
class SoundSourceGenerator : BaseGenerator(
@@ -20,13 +19,10 @@ class SoundSourceGenerator : BaseGenerator(
2019
) {
2120

2221
override fun generate(javaPath: Path) {
23-
val folder = javaPath.resolve("sound")
24-
if (!Files.exists(folder)) {
25-
Files.createDirectory(folder)
26-
}
22+
val folder = checkPackageFolder(javaPath, packageName)
2723

2824
val soundSourceEntries = Sound.Source.entries
29-
val enumProperties = soundSourceEntries.map { it ->
25+
val enumProperties = soundSourceEntries.map {
3026
val source = it.name
3127
EnumEntrySpec.builder(source)
3228
.parameter(

src/main/kotlin/net/theevilreaper/stelaris/cli/generator/dart/sound/SoundTypeGenerator.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,14 @@ import net.theevilreaper.dartpoet.parameter.ParameterSpec
1010
import net.theevilreaper.dartpoet.property.PropertySpec
1111
import net.theevilreaper.stelaris.cli.generator.BaseGenerator
1212
import net.theevilreaper.stelaris.cli.util.StringHelper
13-
import java.nio.file.Files
1413
import java.nio.file.Path
1514

1615
class SoundTypeGenerator: BaseGenerator(
1716
className = "SoundType",
1817
packageName = "sound"
1918
) {
2019
override fun generate(javaPath: Path) {
21-
val folder = javaPath.resolve("sound")
22-
if (!Files.exists(folder)) {
23-
Files.createDirectory(folder)
24-
}
20+
val folder = checkPackageFolder(javaPath, packageName)
2521

2622
val entries = SoundType.entries
2723
val enumFile = ClassSpec.enumClass(className)

0 commit comments

Comments
 (0)