frogmc/phytotelma
6
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

move maven group

Browse source
This commit is contained in:
moehreag 2024-06-02 16:19:16 +02:00
parent 709f5fbbe7
commit d68aae3066
8 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.forgejo/workflows/publish.yml
View file

@ -18,6 +18,6 @@ jobs:
- name: Build
run: |
chmod +x ./gradlew
./gradlew publishAllPublicationsToEsnesnonSnapshotsMavenRepository \
-PEsnesnonSnapshotsMavenUsername=${{ secrets.MAVEN_PUSH_USER }} \
-PEsnesnonSnapshotsMavenPassword=${{ secrets.MAVEN_PUSH_TOKEN }}
./gradlew publishAllPublicationsToFrogMCSnapshotsMavenRepository \
-PFrogMCSnapshotsMavenUsername=${{ secrets.MAVEN_PUSH_USER }} \
-PFrogMCSnapshotsMavenPassword=${{ secrets.MAVEN_PUSH_TOKEN }}

26
build.gradle.kts
View file

@ -4,24 +4,24 @@ plugins {
`maven-publish`
}
group = "org.ecorous.esnesnon"
version = "0.0.1-SNAPSHOT"
group = "org.ecorous.frogmc"
version = "0.0.0-SNAPSHOT"
repositories {
maven {
name = "Esnesnos Maven Releases"
url = uri("https://maven-esnesnon.ecorous.org/releases")
name = "FrogMC Maven Releases"
url = uri("https://maven-frogmc.ecorous.org/releases")
}
maven {
name = "Esnesnos Maven Snapshots"
url = uri("https://maven-esnesnon.ecorous.org/snapshots")
name = "FrogMC Maven Snapshots"
url = uri("https://maven-frogmc.ecorous.org/snapshots")
}
mavenCentral()
}
dependencies {
implementation("org.ecorous.esnesnon:thyroxine:1.0.0-SNAPSHOT")
implementation("org.ecorous.frogmc:thyroxine:1.0.0-SNAPSHOT")
implementation("org.ow2.asm:asm:9.7")
implementation("com.google.code.gson:gson:2.10.1")
implementation("org.vineflower:vineflower:1.10.1")
@ -33,8 +33,8 @@ dependencies {
gradlePlugin {
plugins {
create("phytotelma") {
id = "org.ecorous.esnesnon.phytotelma"
implementationClass = "org.ecorous.esnesnon.gradle.PhytotelmaPlugin"
id = "org.ecorous.frogmc.phytotelma"
implementationClass = "org.ecorous.frogmc.gradle.PhytotelmaPlugin"
}
}
}
@ -59,8 +59,8 @@ publishing {
repositories {
maven {
name = "EsnesnonSnapshotsMaven"
url = uri("https://maven-esnesnon.ecorous.org/snapshots")
name = "FrogMCSnapshotsMaven"
url = uri("https://maven-frogmc.ecorous.org/snapshots")
credentials(PasswordCredentials::class)
authentication {
create<BasicAuthentication>("basic")
@ -68,8 +68,8 @@ publishing {
}
maven {
name = "EsnesnonReleasesMaven"
url = uri("https://maven-esnesnon.ecorous.org/releases")
name = "FrogMCReleasesMaven"
url = uri("https://maven-frogmc.ecorous.org/releases")
credentials(PasswordCredentials::class)
authentication {
create<BasicAuthentication>("basic")

22
src/main/kotlin/org/ecorous/esnesnon/gradle/PhytotelmaPlugin.kt
View file

@ -13,7 +13,7 @@ import org.ecorous.esnesnon.gradle.run.AssetDownloader
import org.ecorous.esnesnon.gradle.run.RunConfigGenerator
import org.ecorous.esnesnon.gradle.run.task.RunGameTask
import org.ecorous.esnesnon.gradle.vineflower.ParchmentJavadocProvider
import org.ecorous.esnesnon.nonsense_remapper.provider.ParchmentProvider
import org.ecorous.frogmc.thyroxine.provider.ParchmentProvider
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.jetbrains.java.decompiler.main.Fernflower
@ -32,11 +32,11 @@ import kotlin.io.path.*
class PhytotelmaPlugin : Plugin<Project> {
private val taskGroup = "frog"
private val taskGroup = "frogmc"
override fun apply(project: Project) {
println("> Applying Nonsense Gradle Plugin")
nonsenseCacheDir = project.gradle.gradleUserHomeDir.resolve("caches/nonsense-gradle/").toPath()
println("> Applying FrogMC Gradle Plugin")
nonsenseCacheDir = project.gradle.gradleUserHomeDir.resolve("caches/phytotelma/").toPath()
nonsenseCacheDir.createDirectories()
project.plugins.let {
@ -47,16 +47,16 @@ class PhytotelmaPlugin : Plugin<Project> {
project.repositories.apply {
maven {
it.name = "Esnesnon Releases"
it.url = URI.create("https://maven-esnesnon.ecorous.org/releases")
it.name = "FrogMC Releases"
it.url = URI.create("https://maven-frogmc.ecorous.org/releases")
}
maven {
it.name = "Esnesnon Snapshots"
it.url = URI.create("https://maven-esnesnon.ecorous.org/snapshots")
it.name = "FrogMC Snapshots"
it.url = URI.create("https://maven-frogmc.ecorous.org/snapshots")
}
maven {
it.name = "Minecraft/Local"
it.url = project.gradle.gradleUserHomeDir.resolve("caches/nonsense-gradle/").toURI()
it.url = project.gradle.gradleUserHomeDir.resolve("caches/phytotelma/").toURI()
}
maven {
it.name = "Minecraft Libraries"
@ -85,7 +85,7 @@ class PhytotelmaPlugin : Plugin<Project> {
val parchment = ParchmentProvider.getParchment(
minecraftVersion,
parchmentVersion,
project.gradle.gradleUserHomeDir.resolve("nonsense-gradle/org/parchmentmc/parchment/$minecraftVersion/$parchmentVersion/")
project.gradle.gradleUserHomeDir.resolve("phytotelma/org/parchmentmc/parchment/$minecraftVersion/$parchmentVersion/")
.toPath()
)
options[IFabricJavadocProvider.PROPERTY_NAME] = ParchmentJavadocProvider(parchment)
@ -139,7 +139,7 @@ class PhytotelmaPlugin : Plugin<Project> {
task.outputs.upToDateWhen { false }
task.actions.addLast { _ ->
task.outputs.files.forEach { file ->
val output = file.toPath().parent.resolveSibling("frog")
val output = file.toPath().parent.resolveSibling("frogmc")
output.createDirectories()
if (file.name.endsWith(".jar") && !(file.name.contains("-dev.") || file.name.contains("-sources."))) {
val outFile = output.resolve(file.name.substring(0, file.name.length - 4) + ".frogmod")

10
src/main/kotlin/org/ecorous/esnesnon/gradle/ext/Stuff.kt
View file

@ -4,10 +4,10 @@ import org.ecorous.esnesnon.gradle.PhytotelmaPlugin
import org.ecorous.esnesnon.gradle.VersionChecker
import org.ecorous.esnesnon.gradle.accesswidener.AccessWidener
import org.ecorous.esnesnon.gradle.run.RunConfigGenerator
import org.ecorous.esnesnon.nonsense_remapper.Thyroxine
import org.ecorous.esnesnon.nonsense_remapper.parser.ProguardParser
import org.ecorous.esnesnon.nonsense_remapper.provider.MojmapProvider
import org.ecorous.esnesnon.nonsense_remapper.provider.ParchmentProvider
import org.ecorous.frogmc.thyroxine.Thyroxine
import org.ecorous.frogmc.thyroxine.parser.ProguardParser
import org.ecorous.frogmc.thyroxine.provider.MojmapProvider
import org.ecorous.frogmc.thyroxine.provider.ParchmentProvider
import org.gradle.api.Project
import org.gradle.api.provider.Provider
import kotlin.io.path.notExists
@ -89,7 +89,7 @@ fun Project.minecraft(
}
fun Project.loader(version: String) {
dependencies.add("implementation", "org.ecorous.esnesnon:frogloader:$version")
dependencies.add("implementation", "org.ecorous.frogmc:frogloader:$version")
}
fun Project.loader(version: Provider<String>) {

12
src/main/kotlin/org/ecorous/esnesnon/gradle/run/RunConfigGenerator.kt
View file

@ -14,7 +14,7 @@ import kotlin.io.path.createParentDirectories
import kotlin.io.path.notExists
object RunConfigGenerator {
private const val LOG4J_CONFIG_PATH = ".gradle/nonsense-gradle/log4j.xml"
private const val LOG4J_CONFIG_PATH = ".gradle/phytotelma/log4j.xml"
private const val ASSET_DIR = "assets"
private val ADAPTERS = arrayOf(EclipseAdapter(), IdeaAdapter())
@ -42,16 +42,16 @@ object RunConfigGenerator {
adapter.generate(
project,
"Minecraft ${env.pascalName}",
"org.ecorous.esnesnon.nonsense.loader.impl.launch.${env.id}.Nonsense${env.pascalName}",
"org.ecorous.frogmc.frogloader.impl.launch.${env.id}.Nonsense${env.pascalName}",
mutableListOf(
"-Xmx${project.properties.getOrDefault("nonsense.gameHeap", "2048M")}",
"-Dnonsense.development=true",
"-Dnonsense.plugin.minecraft.gameJar=${PhytotelmaPlugin.remappedGameJarPath}",
"-Xmx${project.properties.getOrDefault("frogmc.gameHeap", "2048M")}",
"-Dfrogmc.development=true",
"-Dfrogmc.plugin.minecraft.gameJar=${PhytotelmaPlugin.remappedGameJarPath}",
"-Dlog4j2.configurationFile=$log4jPath",
"-Dlog4j2.formatMsgLookups=true"
).apply {
if (project.gradle.startParameter.consoleOutput != ConsoleOutput.Plain){
add("-Dnonsense.log.disableAnsi=false")
add("-Dfrogmc.log.disableAnsi=false")
}
}.toTypedArray(), if (env == Env.CLIENT) {
arrayOf(

16
src/main/kotlin/org/ecorous/esnesnon/gradle/run/task/RunGameTask.kt
View file

@ -21,14 +21,14 @@ abstract class RunGameTask @Inject constructor(env: Env) : JavaExec() {
private val classpath: ConfigurableFileCollection = project.objects.fileCollection()
init {
group = "frog"
group = "frogmc"
val assetPath = PhytotelmaPlugin.nonsenseCacheDir.resolve("assets").absolute()
val assetIndexPath = assetPath.resolve("indexes")
if (assetIndexPath.notExists()) {
assetIndexPath.createDirectories()
}
val indexId = VersionChecker.downloadAssetIndex(PhytotelmaPlugin.minecraftVersion, assetIndexPath)
val log4jPath = project.rootDir.resolve(".gradle/nonsense-gradle/log4j.xml").toPath().absolute()
val log4jPath = project.rootDir.resolve(".gradle/phytotelma/log4j.xml").toPath().absolute()
if (log4jPath.notExists()) {
log4jPath.createParentDirectories()
this::class.java.getResourceAsStream("/log4j.xml").use { input ->
@ -53,23 +53,23 @@ abstract class RunGameTask @Inject constructor(env: Env) : JavaExec() {
).runtimeClasspath.filter { it.exists() })
jvmArguments.addAll(
"-Xmx${project.properties.getOrDefault("nonsense.gameHeap", "2048M")}",
"-Dnonsense.development=true",
"-Dnonsense.plugin.minecraft.gameJar=${PhytotelmaPlugin.remappedGameJarPath}",
"-Xmx${project.properties.getOrDefault("frogmc.gameHeap", "2048M")}",
"-Dfrogmc.development=true",
"-Dfrogmc.plugin.minecraft.gameJar=${PhytotelmaPlugin.remappedGameJarPath}",
"-Dlog4j2.configurationFile=$log4jPath",
"-Dlog4j2.formatMsgNoLookups=true",
writeArgFile()
)
if (project.gradle.startParameter.consoleOutput != ConsoleOutput.Plain){
jvmArguments.add("-Dnonsense.log.disableAnsi=false")
jvmArguments.add("-Dfrogmc.log.disableAnsi=false")
}
mainClass.set("org.ecorous.esnesnon.nonsense.loader.impl.launch.${env.id}.Nonsense${env.pascalName}")
mainClass.set("org.ecorous.frogmc.frogloader.impl.launch.${env.id}.Nonsense${env.pascalName}")
}
private fun writeArgFile(): String {
val file = Files.createTempFile("nonsense-classpath", ".args")
val file = Files.createTempFile("phytotelma-classpath", ".args")
val content = "-classpath " + classpath.files.stream()
.map { it.absolutePath }

2
src/main/kotlin/org/ecorous/esnesnon/gradle/vineflower/ParchmentJavadocProvider.kt
View file

@ -1,7 +1,7 @@
package org.ecorous.esnesnon.gradle.vineflower
import net.fabricmc.fernflower.api.IFabricJavadocProvider
import org.ecorous.esnesnon.nonsense_remapper.api.data.Parchment
import org.ecorous.frogmc.thyroxine.api.data.Parchment
import org.jetbrains.java.decompiler.struct.StructClass
import org.jetbrains.java.decompiler.struct.StructField
import org.jetbrains.java.decompiler.struct.StructMethod

12
src/main/resources/log4j.xml
View file

@ -11,7 +11,7 @@
<RegexFilter regex="^Couldn't connect to realms$" onMatch="DENY" onMismatch="NEUTRAL"/>
</Filters>
<PatternLayout>
<LoggerNamePatternSelector defaultPattern="%style{[%d{HH:mm:ss}]}{blue} %highlight{[%t/%level]}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=green, TRACE=blue} %style{(%logger{1})}{cyan} %highlight{%msg%n}{FATAL=red, ERROR=red, WARN=normal, INFO=normal, DEBUG=normal, TRACE=normal}" disableAnsi="${sys:nonsense.log.disableAnsi:-true}">
<LoggerNamePatternSelector defaultPattern="%style{[%d{HH:mm:ss}]}{blue} %highlight{[%t/%level]}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=green, TRACE=blue} %style{(%logger{1})}{cyan} %highlight{%msg%n}{FATAL=red, ERROR=red, WARN=normal, INFO=normal, DEBUG=normal, TRACE=normal}" disableAnsi="${sys:frogmc.log.disableAnsi:-true}">
<!-- Dont show the logger name for minecraft classes-->
<PatternMatch key="net.minecraft.,com.mojang." pattern="%style{[%d{HH:mm:ss}]}{blue} %highlight{[%t/%level]}{FATAL=red, ERROR=red, WARN=yellow, INFO=green, DEBUG=green, TRACE=blue} %style{(Minecraft)}{cyan} %highlight{%msg{nolookups}%n}{FATAL=red, ERROR=red, WARN=normal, INFO=normal, DEBUG=normal, TRACE=normal}"/>
</LoggerNamePatternSelector>
@ -57,12 +57,12 @@
</RollingRandomAccessFile>
</Appenders>
<Loggers>
<Logger level="${sys:nonsense.log.level:-info}" name="net.minecraft"/>
<Logger level="${sys:frogmc.log.level:-info}" name="net.minecraft"/>
<Root level="all">
<AppenderRef ref="DebugFile" level="${sys:nonsense.log.debug.level:-debug}"/>
<AppenderRef ref="SysOut" level="${sys:nonsense.log.level:-info}"/>
<AppenderRef ref="LatestFile" level="${sys:nonsense.log.level:-info}"/>
<AppenderRef ref="ServerGuiConsole" level="${sys:nonsense.log.level:-info}"/>
<AppenderRef ref="DebugFile" level="${sys:frogmc.log.debug.level:-debug}"/>
<AppenderRef ref="SysOut" level="${sys:frogmc.log.level:-info}"/>
<AppenderRef ref="LatestFile" level="${sys:frogmc.log.level:-info}"/>
<AppenderRef ref="ServerGuiConsole" level="${sys:frogmc.log.level:-info}"/>
</Root>
</Loggers>
</Configuration>