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

move packages

Browse source
This commit is contained in:
moehreag 2024-06-02 16:36:49 +02:00
parent 5353fe7d60
commit 999dad62bc
16 changed files with 55 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -34,7 +34,7 @@ gradlePlugin {
plugins { plugins {
create("phytotelma") { create("phytotelma") {
id = "org.ecorous.frogmc.phytotelma" id = "org.ecorous.frogmc.phytotelma"
implementationClass = "org.ecorous.frogmc.gradle.PhytotelmaPlugin" implementationClass = "org.ecorous.frogmc.phytotelma.PhytotelmaPlugin"
} }
} }
} }

16
src/main/kotlin/org/ecorous/esnesnon/gradle/PhytotelmaPlugin.kt → src/main/kotlin/org/ecorous/frogmc/phytotelma/PhytotelmaPlugin.kt
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.gradle package org.ecorous.frogmc.phytotelma
import com.electronwill.nightconfig.core.CommentedConfig import com.electronwill.nightconfig.core.CommentedConfig
import com.electronwill.nightconfig.core.file.FileNotFoundAction import com.electronwill.nightconfig.core.file.FileNotFoundAction
@ -6,13 +6,13 @@ import com.electronwill.nightconfig.core.io.WritingMode
import com.electronwill.nightconfig.toml.TomlParser import com.electronwill.nightconfig.toml.TomlParser
import com.electronwill.nightconfig.toml.TomlWriter import com.electronwill.nightconfig.toml.TomlWriter
import net.fabricmc.fernflower.api.IFabricJavadocProvider import net.fabricmc.fernflower.api.IFabricJavadocProvider
import org.ecorous.esnesnon.gradle.accesswidener.AccessWidener import org.ecorous.frogmc.phytotelma.accesswidener.AccessWidener
import org.ecorous.esnesnon.gradle.common.Env import org.ecorous.frogmc.phytotelma.common.Env
import org.ecorous.esnesnon.gradle.nest.Nester import org.ecorous.frogmc.phytotelma.nest.Nester
import org.ecorous.esnesnon.gradle.run.AssetDownloader import org.ecorous.frogmc.phytotelma.run.AssetDownloader
import org.ecorous.esnesnon.gradle.run.RunConfigGenerator import org.ecorous.frogmc.phytotelma.run.RunConfigGenerator
import org.ecorous.esnesnon.gradle.run.task.RunGameTask import org.ecorous.frogmc.phytotelma.run.task.RunGameTask
import org.ecorous.esnesnon.gradle.vineflower.ParchmentJavadocProvider import org.ecorous.frogmc.phytotelma.vineflower.ParchmentJavadocProvider
import org.ecorous.frogmc.thyroxine.provider.ParchmentProvider import org.ecorous.frogmc.thyroxine.provider.ParchmentProvider
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project

4
src/main/kotlin/org/ecorous/esnesnon/gradle/VersionChecker.kt → src/main/kotlin/org/ecorous/frogmc/phytotelma/VersionChecker.kt
View file

@ -1,8 +1,8 @@
package org.ecorous.esnesnon.gradle package org.ecorous.frogmc.phytotelma
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import org.ecorous.esnesnon.gradle.common.CachingHttpClient import org.ecorous.frogmc.phytotelma.common.CachingHttpClient
import java.net.URI import java.net.URI
import java.nio.file.Files import java.nio.file.Files
import java.nio.file.Path import java.nio.file.Path

2
src/main/kotlin/org/ecorous/esnesnon/gradle/accesswidener/AccessWidener.kt → src/main/kotlin/org/ecorous/frogmc/phytotelma/accesswidener/AccessWidener.kt
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.gradle.accesswidener package org.ecorous.frogmc.phytotelma.accesswidener
import com.electronwill.nightconfig.core.file.FileNotFoundAction import com.electronwill.nightconfig.core.file.FileNotFoundAction
import com.electronwill.nightconfig.toml.TomlParser import com.electronwill.nightconfig.toml.TomlParser

4
src/main/kotlin/org/ecorous/esnesnon/gradle/common/CachingHttpClient.kt → src/main/kotlin/org/ecorous/frogmc/phytotelma/common/CachingHttpClient.kt
View file

@ -1,6 +1,6 @@
package org.ecorous.esnesnon.gradle.common package org.ecorous.frogmc.phytotelma.common
import org.ecorous.esnesnon.gradle.PhytotelmaPlugin import org.ecorous.frogmc.phytotelma.PhytotelmaPlugin
import java.io.InputStream import java.io.InputStream
import java.net.URI import java.net.URI
import java.nio.charset.StandardCharsets import java.nio.charset.StandardCharsets

2
src/main/kotlin/org/ecorous/esnesnon/gradle/common/Env.kt → src/main/kotlin/org/ecorous/frogmc/phytotelma/common/Env.kt
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.gradle.common package org.ecorous.frogmc.phytotelma.common
enum class Env(val id: String, val pascalName: String) { enum class Env(val id: String, val pascalName: String) {
SERVER("server", "Server"), SERVER("server", "Server"),

2
src/main/kotlin/org/ecorous/esnesnon/gradle/common/Strings.kt → src/main/kotlin/org/ecorous/frogmc/phytotelma/common/Strings.kt
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.gradle.common package org.ecorous.frogmc.phytotelma.common
fun sanitizeXmlValue(value: String): String { fun sanitizeXmlValue(value: String): String {
return value.replace("&", "&").replace("\"", """) return value.replace("&", "&").replace("\"", """)

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

@ -1,9 +1,9 @@
package org.ecorous.esnesnon.gradle.ext package org.ecorous.frogmc.phytotelma.ext
import org.ecorous.esnesnon.gradle.PhytotelmaPlugin import org.ecorous.frogmc.phytotelma.PhytotelmaPlugin
import org.ecorous.esnesnon.gradle.VersionChecker import org.ecorous.frogmc.phytotelma.VersionChecker
import org.ecorous.esnesnon.gradle.accesswidener.AccessWidener import org.ecorous.frogmc.phytotelma.accesswidener.AccessWidener
import org.ecorous.esnesnon.gradle.run.RunConfigGenerator import org.ecorous.frogmc.phytotelma.run.RunConfigGenerator
import org.ecorous.frogmc.thyroxine.Thyroxine import org.ecorous.frogmc.thyroxine.Thyroxine
import org.ecorous.frogmc.thyroxine.parser.ProguardParser import org.ecorous.frogmc.thyroxine.parser.ProguardParser
import org.ecorous.frogmc.thyroxine.provider.MojmapProvider import org.ecorous.frogmc.thyroxine.provider.MojmapProvider

14
src/main/kotlin/org/ecorous/esnesnon/gradle/nest/Nester.kt → src/main/kotlin/org/ecorous/frogmc/phytotelma/nest/Nester.kt
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.gradle.nest package org.ecorous.frogmc.phytotelma.nest
import com.electronwill.nightconfig.core.Config import com.electronwill.nightconfig.core.Config
import com.electronwill.nightconfig.core.UnmodifiableConfig import com.electronwill.nightconfig.core.UnmodifiableConfig
@ -36,10 +36,12 @@ object Nester {
path.createDirectories() path.createDirectories()
val target = path.resolve(location.fileName.toString()) val target = path.resolve(location.fileName.toString())
Files.copy(location, target) Files.copy(location, target)
files.add(NestedJar(("${dependency.group}_${dependency.name}${if (task.archiveClassifier.isPresent) "_${task.archiveClassifier}" else ""}").replace( files.add(
NestedJar(("${dependency.group}_${dependency.name}${if (task.archiveClassifier.isPresent) "_${task.archiveClassifier}" else ""}").replace(
"\\.".toRegex(), "\\.".toRegex(),
"_" "_"
).lowercase(Locale.ROOT), target.absolute().toString())) ).lowercase(Locale.ROOT), target.absolute().toString())
)
} }
} }
configuration.resolvedConfiguration.firstLevelModuleDependencies.forEach { dep -> configuration.resolvedConfiguration.firstLevelModuleDependencies.forEach { dep ->
@ -55,10 +57,12 @@ object Nester {
path.createDirectories() path.createDirectories()
val target = path.resolve(location.fileName.toString()) val target = path.resolve(location.fileName.toString())
Files.copy(location, target) Files.copy(location, target)
files.add(NestedJar(("${dep.moduleGroup}_${dep.moduleName}${if (artifact.classifier != null) "_${artifact.classifier}" else ""}").replace( files.add(
NestedJar(("${dep.moduleGroup}_${dep.moduleName}${if (artifact.classifier != null) "_${artifact.classifier}" else ""}").replace(
"\\.".toRegex(), "\\.".toRegex(),
"_" "_"
).lowercase(Locale.ROOT), target.absolute().toString())) ).lowercase(Locale.ROOT), target.absolute().toString())
)
} }
} }
} }

8
src/main/kotlin/org/ecorous/esnesnon/gradle/run/AssetDownloader.kt → src/main/kotlin/org/ecorous/frogmc/phytotelma/run/AssetDownloader.kt
View file

@ -1,10 +1,10 @@
package org.ecorous.esnesnon.gradle.run package org.ecorous.frogmc.phytotelma.run
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.JsonObject import com.google.gson.JsonObject
import org.ecorous.esnesnon.gradle.PhytotelmaPlugin import org.ecorous.frogmc.phytotelma.PhytotelmaPlugin
import org.ecorous.esnesnon.gradle.VersionChecker import org.ecorous.frogmc.phytotelma.VersionChecker
import org.ecorous.esnesnon.gradle.common.CachingHttpClient import org.ecorous.frogmc.phytotelma.common.CachingHttpClient
import java.net.URI import java.net.URI
import java.nio.charset.StandardCharsets import java.nio.charset.StandardCharsets
import java.nio.file.Path import java.nio.file.Path

4
src/main/kotlin/org/ecorous/esnesnon/gradle/run/RunConfigAdapter.kt → src/main/kotlin/org/ecorous/frogmc/phytotelma/run/RunConfigAdapter.kt
View file

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.gradle.run package org.ecorous.frogmc.phytotelma.run
import org.gradle.api.Project import org.gradle.api.Project
@ -12,5 +12,5 @@ interface RunConfigAdapter {
) )
/** Typically, return whether we are running within the IDE which makes use of this format. */ /** Typically, return whether we are running within the IDE which makes use of this format. */
fun shouldGenerate(): Boolean; fun shouldGenerate(): Boolean
} }

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

@ -1,10 +1,10 @@
package org.ecorous.esnesnon.gradle.run package org.ecorous.frogmc.phytotelma.run
import org.ecorous.esnesnon.gradle.PhytotelmaPlugin import org.ecorous.frogmc.phytotelma.PhytotelmaPlugin
import org.ecorous.esnesnon.gradle.VersionChecker import org.ecorous.frogmc.phytotelma.VersionChecker
import org.ecorous.esnesnon.gradle.common.Env import org.ecorous.frogmc.phytotelma.common.Env
import org.ecorous.esnesnon.gradle.run.adapter.EclipseAdapter import org.ecorous.frogmc.phytotelma.run.adapter.EclipseAdapter
import org.ecorous.esnesnon.gradle.run.adapter.IdeaAdapter import org.ecorous.frogmc.phytotelma.run.adapter.IdeaAdapter
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.logging.configuration.ConsoleOutput import org.gradle.api.logging.configuration.ConsoleOutput
import java.nio.file.Files import java.nio.file.Files

8
src/main/kotlin/org/ecorous/esnesnon/gradle/run/adapter/EclipseAdapter.kt → src/main/kotlin/org/ecorous/frogmc/phytotelma/run/adapter/EclipseAdapter.kt
View file

@ -1,8 +1,8 @@
package org.ecorous.esnesnon.gradle.run.adapter package org.ecorous.frogmc.phytotelma.run.adapter
import org.ecorous.esnesnon.gradle.common.formatXmlList import org.ecorous.frogmc.phytotelma.common.formatXmlList
import org.ecorous.esnesnon.gradle.common.sanitizeXmlValue import org.ecorous.frogmc.phytotelma.common.sanitizeXmlValue
import org.ecorous.esnesnon.gradle.run.RunConfigAdapter import org.ecorous.frogmc.phytotelma.run.RunConfigAdapter
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.plugins.ide.eclipse.model.EclipseModel import org.gradle.plugins.ide.eclipse.model.EclipseModel
import java.nio.charset.StandardCharsets import java.nio.charset.StandardCharsets

8
src/main/kotlin/org/ecorous/esnesnon/gradle/run/adapter/IdeaAdapter.kt → src/main/kotlin/org/ecorous/frogmc/phytotelma/run/adapter/IdeaAdapter.kt
View file

@ -1,8 +1,8 @@
package org.ecorous.esnesnon.gradle.run.adapter package org.ecorous.frogmc.phytotelma.run.adapter
import org.ecorous.esnesnon.gradle.common.formatXmlList import org.ecorous.frogmc.phytotelma.common.formatXmlList
import org.ecorous.esnesnon.gradle.common.sanitizeXmlValue import org.ecorous.frogmc.phytotelma.common.sanitizeXmlValue
import org.ecorous.esnesnon.gradle.run.RunConfigAdapter import org.ecorous.frogmc.phytotelma.run.RunConfigAdapter
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.SourceSet

8
src/main/kotlin/org/ecorous/esnesnon/gradle/run/task/RunGameTask.kt → src/main/kotlin/org/ecorous/frogmc/phytotelma/run/task/RunGameTask.kt
View file

@ -1,8 +1,8 @@
package org.ecorous.esnesnon.gradle.run.task package org.ecorous.frogmc.phytotelma.run.task
import org.ecorous.esnesnon.gradle.PhytotelmaPlugin import org.ecorous.frogmc.phytotelma.PhytotelmaPlugin
import org.ecorous.esnesnon.gradle.VersionChecker import org.ecorous.frogmc.phytotelma.VersionChecker
import org.ecorous.esnesnon.gradle.common.Env import org.ecorous.frogmc.phytotelma.common.Env
import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.file.FileCollection import org.gradle.api.file.FileCollection
import org.gradle.api.logging.configuration.ConsoleOutput import org.gradle.api.logging.configuration.ConsoleOutput

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

@ -1,4 +1,4 @@
package org.ecorous.esnesnon.gradle.vineflower package org.ecorous.frogmc.phytotelma.vineflower
import net.fabricmc.fernflower.api.IFabricJavadocProvider import net.fabricmc.fernflower.api.IFabricJavadocProvider
import org.ecorous.frogmc.thyroxine.api.data.Parchment import org.ecorous.frogmc.thyroxine.api.data.Parchment