move packages
This commit is contained in:
parent
5353fe7d60
commit
999dad62bc
|
@ -34,7 +34,7 @@ gradlePlugin {
|
|||
plugins {
|
||||
create("phytotelma") {
|
||||
id = "org.ecorous.frogmc.phytotelma"
|
||||
implementationClass = "org.ecorous.frogmc.gradle.PhytotelmaPlugin"
|
||||
implementationClass = "org.ecorous.frogmc.phytotelma.PhytotelmaPlugin"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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.file.FileNotFoundAction
|
||||
|
@ -6,13 +6,13 @@ import com.electronwill.nightconfig.core.io.WritingMode
|
|||
import com.electronwill.nightconfig.toml.TomlParser
|
||||
import com.electronwill.nightconfig.toml.TomlWriter
|
||||
import net.fabricmc.fernflower.api.IFabricJavadocProvider
|
||||
import org.ecorous.esnesnon.gradle.accesswidener.AccessWidener
|
||||
import org.ecorous.esnesnon.gradle.common.Env
|
||||
import org.ecorous.esnesnon.gradle.nest.Nester
|
||||
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.frogmc.phytotelma.accesswidener.AccessWidener
|
||||
import org.ecorous.frogmc.phytotelma.common.Env
|
||||
import org.ecorous.frogmc.phytotelma.nest.Nester
|
||||
import org.ecorous.frogmc.phytotelma.run.AssetDownloader
|
||||
import org.ecorous.frogmc.phytotelma.run.RunConfigGenerator
|
||||
import org.ecorous.frogmc.phytotelma.run.task.RunGameTask
|
||||
import org.ecorous.frogmc.phytotelma.vineflower.ParchmentJavadocProvider
|
||||
import org.ecorous.frogmc.thyroxine.provider.ParchmentProvider
|
||||
import org.gradle.api.Plugin
|
||||
import org.gradle.api.Project
|
|
@ -1,8 +1,8 @@
|
|||
package org.ecorous.esnesnon.gradle
|
||||
package org.ecorous.frogmc.phytotelma
|
||||
|
||||
import com.google.gson.Gson
|
||||
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.nio.file.Files
|
||||
import java.nio.file.Path
|
|
@ -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.toml.TomlParser
|
|
@ -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.net.URI
|
||||
import java.nio.charset.StandardCharsets
|
|
@ -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) {
|
||||
SERVER("server", "Server"),
|
|
@ -1,4 +1,4 @@
|
|||
package org.ecorous.esnesnon.gradle.common
|
||||
package org.ecorous.frogmc.phytotelma.common
|
||||
|
||||
fun sanitizeXmlValue(value: String): String {
|
||||
return value.replace("&", "&").replace("\"", """)
|
|
@ -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.esnesnon.gradle.VersionChecker
|
||||
import org.ecorous.esnesnon.gradle.accesswidener.AccessWidener
|
||||
import org.ecorous.esnesnon.gradle.run.RunConfigGenerator
|
||||
import org.ecorous.frogmc.phytotelma.PhytotelmaPlugin
|
||||
import org.ecorous.frogmc.phytotelma.VersionChecker
|
||||
import org.ecorous.frogmc.phytotelma.accesswidener.AccessWidener
|
||||
import org.ecorous.frogmc.phytotelma.run.RunConfigGenerator
|
||||
import org.ecorous.frogmc.thyroxine.Thyroxine
|
||||
import org.ecorous.frogmc.thyroxine.parser.ProguardParser
|
||||
import org.ecorous.frogmc.thyroxine.provider.MojmapProvider
|
|
@ -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.UnmodifiableConfig
|
||||
|
@ -36,10 +36,12 @@ object Nester {
|
|||
path.createDirectories()
|
||||
val target = path.resolve(location.fileName.toString())
|
||||
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(),
|
||||
"_"
|
||||
).lowercase(Locale.ROOT), target.absolute().toString()))
|
||||
).lowercase(Locale.ROOT), target.absolute().toString())
|
||||
)
|
||||
}
|
||||
}
|
||||
configuration.resolvedConfiguration.firstLevelModuleDependencies.forEach { dep ->
|
||||
|
@ -55,10 +57,12 @@ object Nester {
|
|||
path.createDirectories()
|
||||
val target = path.resolve(location.fileName.toString())
|
||||
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(),
|
||||
"_"
|
||||
).lowercase(Locale.ROOT), target.absolute().toString()))
|
||||
).lowercase(Locale.ROOT), target.absolute().toString())
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
|
@ -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.JsonObject
|
||||
import org.ecorous.esnesnon.gradle.PhytotelmaPlugin
|
||||
import org.ecorous.esnesnon.gradle.VersionChecker
|
||||
import org.ecorous.esnesnon.gradle.common.CachingHttpClient
|
||||
import org.ecorous.frogmc.phytotelma.PhytotelmaPlugin
|
||||
import org.ecorous.frogmc.phytotelma.VersionChecker
|
||||
import org.ecorous.frogmc.phytotelma.common.CachingHttpClient
|
||||
import java.net.URI
|
||||
import java.nio.charset.StandardCharsets
|
||||
import java.nio.file.Path
|
|
@ -1,4 +1,4 @@
|
|||
package org.ecorous.esnesnon.gradle.run
|
||||
package org.ecorous.frogmc.phytotelma.run
|
||||
|
||||
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. */
|
||||
fun shouldGenerate(): Boolean;
|
||||
fun shouldGenerate(): Boolean
|
||||
}
|
|
@ -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.esnesnon.gradle.VersionChecker
|
||||
import org.ecorous.esnesnon.gradle.common.Env
|
||||
import org.ecorous.esnesnon.gradle.run.adapter.EclipseAdapter
|
||||
import org.ecorous.esnesnon.gradle.run.adapter.IdeaAdapter
|
||||
import org.ecorous.frogmc.phytotelma.PhytotelmaPlugin
|
||||
import org.ecorous.frogmc.phytotelma.VersionChecker
|
||||
import org.ecorous.frogmc.phytotelma.common.Env
|
||||
import org.ecorous.frogmc.phytotelma.run.adapter.EclipseAdapter
|
||||
import org.ecorous.frogmc.phytotelma.run.adapter.IdeaAdapter
|
||||
import org.gradle.api.Project
|
||||
import org.gradle.api.logging.configuration.ConsoleOutput
|
||||
import java.nio.file.Files
|
|
@ -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.esnesnon.gradle.common.sanitizeXmlValue
|
||||
import org.ecorous.esnesnon.gradle.run.RunConfigAdapter
|
||||
import org.ecorous.frogmc.phytotelma.common.formatXmlList
|
||||
import org.ecorous.frogmc.phytotelma.common.sanitizeXmlValue
|
||||
import org.ecorous.frogmc.phytotelma.run.RunConfigAdapter
|
||||
import org.gradle.api.Project
|
||||
import org.gradle.plugins.ide.eclipse.model.EclipseModel
|
||||
import java.nio.charset.StandardCharsets
|
|
@ -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.esnesnon.gradle.common.sanitizeXmlValue
|
||||
import org.ecorous.esnesnon.gradle.run.RunConfigAdapter
|
||||
import org.ecorous.frogmc.phytotelma.common.formatXmlList
|
||||
import org.ecorous.frogmc.phytotelma.common.sanitizeXmlValue
|
||||
import org.ecorous.frogmc.phytotelma.run.RunConfigAdapter
|
||||
import org.gradle.api.Project
|
||||
import org.gradle.api.plugins.JavaPluginExtension
|
||||
import org.gradle.api.tasks.SourceSet
|
|
@ -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.esnesnon.gradle.VersionChecker
|
||||
import org.ecorous.esnesnon.gradle.common.Env
|
||||
import org.ecorous.frogmc.phytotelma.PhytotelmaPlugin
|
||||
import org.ecorous.frogmc.phytotelma.VersionChecker
|
||||
import org.ecorous.frogmc.phytotelma.common.Env
|
||||
import org.gradle.api.file.ConfigurableFileCollection
|
||||
import org.gradle.api.file.FileCollection
|
||||
import org.gradle.api.logging.configuration.ConsoleOutput
|
|
@ -1,4 +1,4 @@
|
|||
package org.ecorous.esnesnon.gradle.vineflower
|
||||
package org.ecorous.frogmc.phytotelma.vineflower
|
||||
|
||||
import net.fabricmc.fernflower.api.IFabricJavadocProvider
|
||||
import org.ecorous.frogmc.thyroxine.api.data.Parchment
|
Loading…
Reference in a new issue