restructure the project
Some checks failed
Publish to snapshot maven / build (push) Failing after 33s
Some checks failed
Publish to snapshot maven / build (push) Failing after 33s
This commit is contained in:
parent
4ce6722ae1
commit
9389a86aa5
|
@ -1,31 +1,46 @@
|
|||
plugins {
|
||||
java
|
||||
`java-library`
|
||||
`maven-publish`
|
||||
id("dev.frogmc.phytotelma") version "0.0.1-SNAPSHOT"
|
||||
id("io.freefair.lombok") version "8.+"
|
||||
id("dev.frogmc.phytotelma") version libs.versions.phytotelma
|
||||
id("io.freefair.lombok") version libs.versions.lombok
|
||||
}
|
||||
|
||||
group = "dev.frogmc"
|
||||
version = "0.0.1-SNAPSHOT"
|
||||
|
||||
repositories {
|
||||
|
||||
subprojects {
|
||||
if (!project.projectDir.resolve("src/main/resources/frog.mod.toml").exists()) {
|
||||
return@subprojects
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
||||
project.group = "dev.frogmc.froglib"
|
||||
project.version = rootProject.version
|
||||
}
|
||||
|
||||
allprojects {
|
||||
if (!project.projectDir.resolve("src/main/resources/frog.mod.toml").exists()) {
|
||||
return@allprojects
|
||||
}
|
||||
|
||||
apply(plugin = "java-library")
|
||||
apply(plugin = "dev.frogmc.phytotelma")
|
||||
apply(plugin = "maven-publish")
|
||||
apply(plugin = "io.freefair.lombok")
|
||||
|
||||
|
||||
phytotelma {
|
||||
loader(project.libs.versions.frogloader)
|
||||
minecraft(project.libs.versions.minecraft)
|
||||
loader(rootProject.libs.versions.frogloader)
|
||||
minecraft(rootProject.libs.versions.minecraft)
|
||||
}
|
||||
|
||||
|
||||
tasks.processResources {
|
||||
inputs.property("version", version)
|
||||
inputs.property("game_version", libs.versions.minecraft.get())
|
||||
|
||||
filesMatching("frog.mod.toml") {
|
||||
expand("version" to version)
|
||||
expand("version" to version,
|
||||
"game_version" to libs.versions.minecraft.get())
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -36,7 +51,7 @@ tasks.runClient {
|
|||
publishing {
|
||||
publications {
|
||||
create<MavenPublication>("mavenJava") {
|
||||
artifactId = "frogloader"
|
||||
artifactId = project.name
|
||||
from(components["java"])
|
||||
}
|
||||
}
|
||||
|
@ -61,3 +76,19 @@ publishing {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
evaluationDependsOnChildren()
|
||||
|
||||
dependencies {
|
||||
project.subprojects.filter {
|
||||
it.projectDir.resolve("src/main/resources/frog.mod.toml").exists()
|
||||
}.forEach {
|
||||
project.tasks.jar {
|
||||
dependsOn(it.tasks.jar)
|
||||
}
|
||||
implementation(it)
|
||||
include(it)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2,3 +2,6 @@
|
|||
|
||||
minecraft = "1.20.6"
|
||||
frogloader = "0.0.1-SNAPSHOT"
|
||||
phytotelma = "0.0.1-SNAPSHOT"
|
||||
lombok = "8.6"
|
||||
|
||||
|
|
0
library/branding/build.gradle.kts
Normal file
0
library/branding/build.gradle.kts
Normal file
|
@ -0,0 +1,19 @@
|
|||
package dev.frogmc.froglib.branding.impl.mixin;
|
||||
|
||||
import dev.frogmc.frogloader.api.FrogLoader;
|
||||
import dev.frogmc.frogloader.impl.mod.ModUtil;
|
||||
import net.minecraft.CrashReport;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(CrashReport.class)
|
||||
public class CrashReportMixin {
|
||||
|
||||
@Inject(method = "getDetails(Ljava/lang/StringBuilder;)V", at = @At("TAIL"))
|
||||
private void addModInfoToCrashReport(StringBuilder builder, CallbackInfo ci){
|
||||
builder.append("\n");
|
||||
builder.append(ModUtil.getModList(FrogLoader.getInstance().getMods()));
|
||||
}
|
||||
}
|
21
library/branding/src/main/resources/frog.mod.toml
Normal file
21
library/branding/src/main/resources/frog.mod.toml
Normal file
|
@ -0,0 +1,21 @@
|
|||
[frog]
|
||||
format_version = "1.0.0"
|
||||
|
||||
[frog.mod]
|
||||
id = "froglib_branding"
|
||||
name = "FrogLib Branding"
|
||||
version = "$version"
|
||||
license = "Apache-2.0"
|
||||
credits = [
|
||||
{ name = "FrogMC Team", roles = ["author"] }
|
||||
]
|
||||
|
||||
[frog.dependencies]
|
||||
depends = [
|
||||
{ id = "minecraft", versions = "~$game_version", name = "Minecraft" }
|
||||
]
|
||||
|
||||
[frog.extensions]
|
||||
mixin = [
|
||||
"froglib.branding.mixins.json",
|
||||
]
|
|
@ -4,7 +4,7 @@
|
|||
"package": "dev.frogmc.froglib.branding.impl.mixin",
|
||||
"compatibilityLevel": "JAVA_21",
|
||||
"mixins": [
|
||||
|
||||
"CrashReportMixin"
|
||||
],
|
||||
"server": [
|
||||
],
|
0
library/core/build.gradle.kts
Normal file
0
library/core/build.gradle.kts
Normal file
22
library/core/src/main/resources/frog.mod.toml
Normal file
22
library/core/src/main/resources/frog.mod.toml
Normal file
|
@ -0,0 +1,22 @@
|
|||
[frog]
|
||||
format_version = "1.0.0"
|
||||
|
||||
[frog.mod]
|
||||
id = "froglib_core"
|
||||
name = "FrogLib Core"
|
||||
version = "$version"
|
||||
license = "Apache-2.0"
|
||||
credits = [
|
||||
{ name = "FrogMC Team", roles = ["author"] }
|
||||
]
|
||||
|
||||
[frog.dependencies]
|
||||
depends = [
|
||||
{ id = "minecraft", versions = "~$game_version", name = "Minecraft" }
|
||||
]
|
||||
|
||||
[frog.extensions]
|
||||
mixin = [
|
||||
"froglib.entrypoints.mixins.json",
|
||||
"froglib.events.mixins.json"
|
||||
]
|
0
library/keybinds/build.gradle.kts
Normal file
0
library/keybinds/build.gradle.kts
Normal file
|
@ -13,6 +13,7 @@ public class KeyMappingsImpl implements KeyMappings {
|
|||
}
|
||||
|
||||
public void registerKey(KeyMapping mapping){
|
||||
// TODO maybe synchronize?
|
||||
Minecraft.getInstance().options.keyMappings = ArrayUtils.add(Minecraft.getInstance().options.keyMappings, mapping);
|
||||
}
|
||||
}
|
22
library/keybinds/src/main/resources/frog.mod.toml
Normal file
22
library/keybinds/src/main/resources/frog.mod.toml
Normal file
|
@ -0,0 +1,22 @@
|
|||
[frog]
|
||||
format_version = "1.0.0"
|
||||
|
||||
[frog.mod]
|
||||
id = "froglib_keybinds"
|
||||
name = "FrogLib Keybinds"
|
||||
version = "$version"
|
||||
license = "Apache-2.0"
|
||||
credits = [
|
||||
{ name = "FrogMC Team", roles = ["author"] }
|
||||
]
|
||||
|
||||
[frog.dependencies]
|
||||
depends = [
|
||||
{ id = "minecraft", versions = "~$game_version", name = "Minecraft" }
|
||||
]
|
||||
|
||||
[frog.extensions]
|
||||
mixin = [
|
||||
"froglib.keybinds.mixins.json"
|
||||
]
|
||||
accesswidener = "froglib.accesswidener"
|
0
library/networking/build.gradle.kts
Normal file
0
library/networking/build.gradle.kts
Normal file
4
library/resourceloader/build.gradle.kts
Normal file
4
library/resourceloader/build.gradle.kts
Normal file
|
@ -0,0 +1,4 @@
|
|||
|
||||
dependencies {
|
||||
api(project(":library:core"))
|
||||
}
|
27
library/resourceloader/src/main/resources/frog.mod.toml
Normal file
27
library/resourceloader/src/main/resources/frog.mod.toml
Normal file
|
@ -0,0 +1,27 @@
|
|||
[frog]
|
||||
format_version = "1.0.0"
|
||||
|
||||
[frog.mod]
|
||||
id = "froglib_resourceloader"
|
||||
name = "FrogLib Resource Loader"
|
||||
version = "$version"
|
||||
license = "Apache-2.0"
|
||||
credits = [
|
||||
{ name = "FrogMC Team", roles = ["author"] }
|
||||
]
|
||||
|
||||
[frog.dependencies]
|
||||
depends = [
|
||||
{ id = "minecraft", versions = "~$game_version", name = "Minecraft" }
|
||||
]
|
||||
|
||||
[frog.extensions]
|
||||
client = [
|
||||
"dev.frogmc.froglib.resources.impl.ResourceLoaderClient"
|
||||
]
|
||||
server = [
|
||||
"dev.frogmc.froglib.resources.impl.ResourceLoaderServer"
|
||||
]
|
||||
mixin = [
|
||||
"froglib.resources.mixins.json"
|
||||
]
|
|
@ -13,3 +13,13 @@ pluginManagement {
|
|||
}
|
||||
|
||||
rootProject.name = "froglib"
|
||||
include("library:networking")
|
||||
findProject(":library:networking")?.name = "networking"
|
||||
include("library:branding")
|
||||
findProject(":library:branding")?.name = "branding"
|
||||
include("library:core")
|
||||
findProject(":library:core")?.name = "core"
|
||||
include("library:keybinds")
|
||||
findProject(":library:keybinds")?.name = "keybinds"
|
||||
include("library:resourceloader")
|
||||
findProject(":library:resourceloader")?.name = "resourceloader"
|
||||
|
|
|
@ -12,21 +12,7 @@ credits = [
|
|||
|
||||
[frog.dependencies]
|
||||
depends = [
|
||||
{ id = "minecraft", versions = "~1.20.6", name = "Minecraft" }
|
||||
{ id = "minecraft", versions = "~$game_version", name = "Minecraft" }
|
||||
]
|
||||
|
||||
[frog.extensions]
|
||||
client = [
|
||||
"dev.frogmc.froglib.resources.impl.ResourceLoaderClient"
|
||||
]
|
||||
server = [
|
||||
"dev.frogmc.froglib.resources.impl.ResourceLoaderServer"
|
||||
]
|
||||
mixin = [
|
||||
"froglib.branding.mixins.json",
|
||||
"froglib.entrypoints.mixins.json",
|
||||
"froglib.events.mixins.json",
|
||||
"froglib.resources.mixins.json",
|
||||
"froglib.keybinds.mixins.json"
|
||||
]
|
||||
accesswidener = "froglib.accesswidener"
|
||||
|
|
Loading…
Reference in a new issue