Skip to content

Commit dbc4eed

Browse files
committed
feat: add combine doc generator
1 parent 08c4f26 commit dbc4eed

File tree

14 files changed

+15
-387
lines changed

14 files changed

+15
-387
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ bin/
3131
# fabric
3232

3333
run/
34+
docs/
3435

3536
# java
3637

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
For setup instructions please see the [Allium documentation page](https://moongardenmods.github.io/allium-docs/setup/get-started.html) that relates to the IDE that you are using.
66

77
Generally:
8-
1. Run the `gradle runDatagen` task. This is for lua defintions of game sources.
8+
1. Run the `gradle runGenLuaSources` task. This is for lua defintions of game sources.
99
2. Set the script ID, version, and name in the `gradle.properties`.
1010
3. Navigate to the script's directory at `src/main/resources/scripts`
1111
4. Rename the `script_id` directory to the ID that was set in `gradle.properties` in step 2

build.gradle.kts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ loom {
1111
sourceSet(sourceSets["main"])
1212
}
1313
}
14-
}
1514

16-
fabricApi {
17-
configureDataGeneration() {
18-
client = true
15+
runs {
16+
register("genLuaSources") {
17+
client()
18+
vmArg("-Dcombine.enabled")
19+
vmArg("-Dcombine.targets=net.minecraft.client.Minecraft;com.mojang.authlib.minecraft.client.MinecraftClient;net.fabricmc.loader.impl.launch.knot.Knot")
20+
vmArg("-Dcombine.output=../docs")
21+
}
1922
}
2023
}
2124

@@ -28,12 +31,14 @@ repositories {
2831
maven("https://maven.hugeblank.dev/releases") {
2932
content {
3033
includeGroup("dev.hugeblank")
34+
includeGroup("dev.moongarden")
3135
includeGroup("cc.tweaked")
3236
}
3337
}
3438
maven("https://maven.hugeblank.dev/snapshots") {
3539
content {
3640
includeGroup("dev.hugeblank")
41+
includeGroup("dev.moongarden")
3742
includeGroup("cc.tweaked")
3843
}
3944
}
@@ -47,10 +52,10 @@ repositories {
4752
dependencies {
4853
minecraft("com.mojang:minecraft:${project.properties["minecraft_version"]}")
4954
implementation("net.fabricmc:fabric-loader:${project.properties["loader_version"]}")
50-
implementation("net.fabricmc.fabric-api:fabric-api:${project.properties["fabric_api_version"]}")
55+
implementation("dev.moongarden:combine:${project.properties["combine_version"]}")
5156
implementation("dev.hugeblank:allium:${project.properties["allium_version"]}")
5257
implementation("dev.hugeblank:bouquet:${project.properties["bouquet_version"]}")
53-
implementation("me.basiqueevangelist:enhanced-reflection:${project.properties["enhanced_reflection_version"]}")
58+
// implementation("me.basiqueevangelist:enhanced-reflection:${project.properties["enhanced_reflection_version"]}")
5459
}
5560

5661
tasks {

globals/test.lua

Lines changed: 0 additions & 14 deletions
This file was deleted.

gradle.properties

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ loader_version=0.18.4
1212
loom_version=1.15-SNAPSHOT
1313

1414
# Lua Documentation Dependencies
15-
fabric_api_version=0.143.1+26.1
16-
enhanced_reflection_version=0.1.6
15+
combine_version=1.1.1
1716

1817
# Dependencies
1918
allium_version=0.5.0-rc.3
20-
bouquet_version=0.3.0-rc.3
19+
bouquet_version=0.3.0-rc.4
2120

2221
# Script Properties
2322
version=1.0.0

src/main/java/dev/moongarden/datagen/LuaTemplateGenerator.java

Lines changed: 0 additions & 70 deletions
This file was deleted.

src/main/java/dev/moongarden/datagen/structure/AbstractExecutableLuaElement.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/main/java/dev/moongarden/datagen/structure/ClassLuaElement.java

Lines changed: 0 additions & 79 deletions
This file was deleted.

src/main/java/dev/moongarden/datagen/structure/ConstructorLuaElement.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/main/java/dev/moongarden/datagen/structure/FieldLuaElement.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)