Skip to content

Commit

Permalink
feat: migrated from xyz.theprogramsrc to cl.franciscosolis
Browse files Browse the repository at this point in the history
  • Loading branch information
Im-Fran committed Jan 19, 2024
1 parent ecb57df commit 6dc71b0
Show file tree
Hide file tree
Showing 60 changed files with 189 additions and 186 deletions.
6 changes: 4 additions & 2 deletions build-info/src/main/resource-templates/bungee.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
name: 'SimpleCoreAPI'
main: 'xyz.theprogramsrc.simplecoreapi.bungee.BungeeLoader'
version: '{{ version }}'
main: 'cl.franciscosolis.simplecoreapi.bungee.BungeeLoader'
version: '{{ version }}'
author: 'FranciscoSolis'
description: '{{ description }}'
7 changes: 5 additions & 2 deletions build-info/src/main/resource-templates/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
name: 'SimpleCoreAPI'
main: 'xyz.theprogramsrc.simplecoreapi.spigot.SpigotLoader'
main: 'cl.franciscosolis.simplecoreapi.spigot.SpigotLoader'
version: '{{ version }}'
api-version: '1.13'
api-version: '1.13'
authors: ['FranciscoSolis']
website: https://franciscosolis.cl
description: '{{ description }}'
6 changes: 3 additions & 3 deletions build-info/src/main/resource-templates/velocity-plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "simplecoreapi",
"name": "SimpleCoreAPI",
"version": "{{ version }}",
"url": "theprogramsrc.xyz",
"authors": ["TheProgramSrc"],
"main": "xyz.theprogramsrc.simplecoreapi.velocity.VelocityLoader"
"url": "https://franciscosolis.cl",
"authors": ["FranciscoSolis"],
"main": "cl.franciscosolis.simplecoreapi.velocity.VelocityLoader"
}
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ allprojects {
plugin("org.jetbrains.dokka")
}

group = "xyz.theprogramsrc"
group = "cl.franciscosolis"
version = projectVersion.replaceFirst("v", "").replace("/", "")
description = "The best way to create a kotlin project."

Expand Down Expand Up @@ -149,7 +149,7 @@ publishing {
if(env["SONATYPE_USERNAME"] != null && env["SONATYPE_PASSWORD"] != null) {
maven {
name = "Sonatype"
url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
url = uri("https://central.sonatype.org")
credentials {
username = env["SONATYPE_USERNAME"]
password = env["SONATYPE_PASSWORD"]
Expand Down
16 changes: 8 additions & 8 deletions simplecoreapi/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ dependencies {
tasks {
named<ShadowJar>("shadowJar") {
manifest {
attributes["Main-Class"] = "xyz.theprogramsrc.simplecoreapi.standalone.StandaloneLoaderKt"
attributes["Main-Class"] = "cl.franciscosolis.simplecoreapi.standalone.StandaloneLoaderKt"
}

relocate("org.apache.commons", "xyz.theprogramsrc.simplecoreapi.libs.apache.commons")
relocate("org.checkerframework", "xyz.theprogramsrc.simplecoreapi.libs.checkerframework")
relocate("org.intellij", "xyz.theprogramsrc.simplecoreapi.libs.intellij")
relocate("org.jetbrains", "xyz.theprogramsrc.simplecoreapi.libs.jetbrains")
relocate("javax.annotation", "xyz.theprogramsrc.simplecoreapi.libs.annotation")
relocate("net.lingala.zip4j", "xyz.theprogramsrc.simplecoreapi.libs.zip4j")
relocate("org.slf4j", "xyz.theprogramsrc.simplecoreapi.libs.sl4fj")
relocate("org.apache.commons", "cl.franciscosolis.simplecoreapi.libs.apache.commons")
relocate("org.checkerframework", "cl.franciscosolis.simplecoreapi.libs.checkerframework")
relocate("org.intellij", "cl.franciscosolis.simplecoreapi.libs.intellij")
relocate("org.jetbrains", "cl.franciscosolis.simplecoreapi.libs.jetbrains")
relocate("javax.annotation", "cl.franciscosolis.simplecoreapi.libs.annotation")
relocate("net.lingala.zip4j", "cl.franciscosolis.simplecoreapi.libs.zip4j")
relocate("org.slf4j", "cl.franciscosolis.simplecoreapi.libs.sl4fj")

mergeServiceFiles()
exclude("**/*.kotlin_metadata")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package cl.franciscosolis.simplecoreapi.bungee

import net.md_5.bungee.api.plugin.Plugin
import cl.franciscosolis.simplecoreapi.global.SimpleCoreAPI

class BungeeLoader: Plugin() {

companion object {
lateinit var instance: cl.franciscosolis.simplecoreapi.bungee.BungeeLoader
private set
}

override fun onLoad() {
cl.franciscosolis.simplecoreapi.bungee.BungeeLoader.Companion.instance = this
SimpleCoreAPI()
}

}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package xyz.theprogramsrc.simplecoreapi.bungee.modules.tasksmodule
package cl.franciscosolis.simplecoreapi.bungee.modules.tasksmodule

import net.md_5.bungee.api.scheduler.ScheduledTask
import net.md_5.bungee.api.scheduler.TaskScheduler
import xyz.theprogramsrc.simplecoreapi.bungee.BungeeLoader
import xyz.theprogramsrc.simplecoreapi.global.module.Module
import xyz.theprogramsrc.simplecoreapi.global.module.ModuleDescription
import xyz.theprogramsrc.simplecoreapi.global.modules.tasksmodule.models.RecurringTask
import cl.franciscosolis.simplecoreapi.bungee.BungeeLoader
import cl.franciscosolis.simplecoreapi.global.module.Module
import cl.franciscosolis.simplecoreapi.global.module.ModuleDescription
import cl.franciscosolis.simplecoreapi.global.modules.tasksmodule.models.RecurringTask
import java.util.concurrent.TimeUnit

class BungeeTasksModule: Module {
Expand All @@ -15,7 +15,7 @@ class BungeeTasksModule: Module {
/**
* Instance of the [BungeeTasksModule].
*/
lateinit var instance: BungeeTasksModule
lateinit var instance: cl.franciscosolis.simplecoreapi.bungee.modules.tasksmodule.BungeeTasksModule
private set
}

Expand All @@ -28,15 +28,15 @@ class BungeeTasksModule: Module {
/**
* BungeeCord Scheduler
*/
val scheduler: TaskScheduler = BungeeLoader.instance.proxy.scheduler
val scheduler: TaskScheduler = cl.franciscosolis.simplecoreapi.bungee.BungeeLoader.instance.proxy.scheduler

/**
* Instance of Bungee Loader
*/
private val plugin = BungeeLoader.instance
private val plugin = cl.franciscosolis.simplecoreapi.bungee.BungeeLoader.instance

override fun onEnable() {
instance = this
cl.franciscosolis.simplecoreapi.bungee.modules.tasksmodule.BungeeTasksModule.Companion.instance = this
}

override fun onDisable() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package xyz.theprogramsrc.simplecoreapi.global
package cl.franciscosolis.simplecoreapi.global

import cl.franciscosolis.simplecoreapi.global.modules.filesmodule.extensions.file
import cl.franciscosolis.simplecoreapi.global.modules.filesmodule.extensions.folder
import cl.franciscosolis.simplecoreapi.global.utils.SoftwareType
import cl.franciscosolis.simplecoreapi.global.utils.update.GitHubUpdateChecker
import cl.franciscosolis.simplecoreapi.standalone.StandaloneLoader
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.slf4j.simple.SimpleLogger
import xyz.theprogramsrc.simplecoreapi.*
import xyz.theprogramsrc.simplecoreapi.global.modules.filesmodule.extensions.file
import xyz.theprogramsrc.simplecoreapi.global.modules.filesmodule.extensions.folder
import xyz.theprogramsrc.simplecoreapi.global.utils.SoftwareType
import xyz.theprogramsrc.simplecoreapi.global.utils.update.GitHubUpdateChecker
import xyz.theprogramsrc.simplecoreapi.standalone.StandaloneLoader
import java.io.File

/**
Expand Down Expand Up @@ -68,9 +67,9 @@ class SimpleCoreAPI {
init {
instance = this

logger.info("$getName v${getVersion} (Git Commit: $getShortHash). $getDescription")
if (!getFullHash.contentEquals("unknown")) {
GitHubUpdateChecker("TheProgramSrc/SimpleCoreAPI", getVersion)
logger.info("${cl.franciscosolis.simplecoreapi.getName} v${cl.franciscosolis.simplecoreapi.getVersion} (Git Commit: ${cl.franciscosolis.simplecoreapi.getShortHash}). ${cl.franciscosolis.simplecoreapi.getDescription}")
if (!cl.franciscosolis.simplecoreapi.getFullHash.contentEquals("unknown")) {
GitHubUpdateChecker("TheProgramSrc/SimpleCoreAPI", cl.franciscosolis.simplecoreapi.getVersion)
.checkWithPrint()
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package xyz.theprogramsrc.simplecoreapi.global.exceptions
package cl.franciscosolis.simplecoreapi.global.exceptions

class NotImplementedException: Exception() {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package xyz.theprogramsrc.simplecoreapi.global.extensions
package cl.franciscosolis.simplecoreapi.global.extensions

import com.google.gson.JsonParser
import com.google.gson.internal.Streams
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package xyz.theprogramsrc.simplecoreapi.global.module
package cl.franciscosolis.simplecoreapi.global.module

import xyz.theprogramsrc.simplecoreapi.global.utils.measureLoad
import cl.franciscosolis.simplecoreapi.global.utils.measureLoad
import java.util.*

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package xyz.theprogramsrc.simplecoreapi.global.module
package cl.franciscosolis.simplecoreapi.global.module

data class ModuleDescription(
val name: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.filesmodule
package cl.franciscosolis.simplecoreapi.global.modules.filesmodule

import xyz.theprogramsrc.simplecoreapi.global.module.Module
import xyz.theprogramsrc.simplecoreapi.global.module.ModuleDescription
import cl.franciscosolis.simplecoreapi.global.module.Module
import cl.franciscosolis.simplecoreapi.global.module.ModuleDescription

class FilesModule: Module {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.filesmodule.config
package cl.franciscosolis.simplecoreapi.global.modules.filesmodule.config

import com.google.gson.JsonArray
import com.google.gson.JsonElement
import com.google.gson.JsonObject
import com.google.gson.JsonParser
import xyz.theprogramsrc.simplecoreapi.global.modules.filesmodule.extensions.file
import cl.franciscosolis.simplecoreapi.global.modules.filesmodule.extensions.file
import java.io.File

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.filesmodule.config
package cl.franciscosolis.simplecoreapi.global.modules.filesmodule.config

import xyz.theprogramsrc.simplecoreapi.global.modules.filesmodule.extensions.file
import cl.franciscosolis.simplecoreapi.global.modules.filesmodule.extensions.file
import java.io.File
import java.util.*

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.filesmodule.config
package cl.franciscosolis.simplecoreapi.global.modules.filesmodule.config

import org.simpleyaml.configuration.ConfigurationSection
import org.simpleyaml.configuration.file.YamlConfiguration
import xyz.theprogramsrc.simplecoreapi.global.modules.filesmodule.extensions.file
import cl.franciscosolis.simplecoreapi.global.modules.filesmodule.extensions.file
import java.io.File

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.filesmodule.extensions
package cl.franciscosolis.simplecoreapi.global.modules.filesmodule.extensions

import java.io.File

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.loggingmodule
package cl.franciscosolis.simplecoreapi.global.modules.loggingmodule

import xyz.theprogramsrc.simplecoreapi.global.module.Module
import xyz.theprogramsrc.simplecoreapi.global.module.ModuleDescription
import cl.franciscosolis.simplecoreapi.global.module.Module
import cl.franciscosolis.simplecoreapi.global.module.ModuleDescription

class LoggingModule: Module {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.loggingmodule.filter
package cl.franciscosolis.simplecoreapi.global.modules.loggingmodule.filter

enum class FilterResult {
DENY,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.loggingmodule.filter
package cl.franciscosolis.simplecoreapi.global.modules.loggingmodule.filter

import org.apache.logging.log4j.Level
import org.apache.logging.log4j.LogManager
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.networkingmodule
package cl.franciscosolis.simplecoreapi.global.modules.networkingmodule

import xyz.theprogramsrc.simplecoreapi.global.module.Module
import xyz.theprogramsrc.simplecoreapi.global.module.ModuleDescription
import cl.franciscosolis.simplecoreapi.global.module.Module
import cl.franciscosolis.simplecoreapi.global.module.ModuleDescription

class NetworkingModule: Module {
override val description: ModuleDescription = ModuleDescription(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.networkingmodule.models
package cl.franciscosolis.simplecoreapi.global.modules.networkingmodule.models

import com.google.gson.JsonElement
import com.google.gson.JsonObject
import xyz.theprogramsrc.simplecoreapi.global.SimpleCoreAPI
import xyz.theprogramsrc.simplecoreapi.global.extensions.prettyJson
import cl.franciscosolis.simplecoreapi.global.SimpleCoreAPI
import cl.franciscosolis.simplecoreapi.global.extensions.prettyJson
import java.net.HttpURLConnection
import java.net.URL
import java.util.concurrent.atomic.AtomicInteger
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.networkingmodule.models
package cl.franciscosolis.simplecoreapi.global.modules.networkingmodule.models

import com.google.gson.JsonArray
import com.google.gson.JsonElement
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.tasksmodule.models
package cl.franciscosolis.simplecoreapi.global.modules.tasksmodule.models

abstract class RecurringTask {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.translationsmodule
package cl.franciscosolis.simplecoreapi.global.modules.translationsmodule

import xyz.theprogramsrc.simplecoreapi.global.module.Module
import xyz.theprogramsrc.simplecoreapi.global.module.ModuleDescription
import xyz.theprogramsrc.simplecoreapi.global.modules.translationsmodule.managers.TranslationManager
import xyz.theprogramsrc.simplecoreapi.global.utils.measureLoad
import cl.franciscosolis.simplecoreapi.global.module.Module
import cl.franciscosolis.simplecoreapi.global.module.ModuleDescription
import cl.franciscosolis.simplecoreapi.global.modules.translationsmodule.managers.TranslationManager
import cl.franciscosolis.simplecoreapi.global.utils.measureLoad

class TranslationsModule: Module {
override val description: ModuleDescription = ModuleDescription(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.translationsmodule.managers
package cl.franciscosolis.simplecoreapi.global.modules.translationsmodule.managers

import xyz.theprogramsrc.simplecoreapi.global.modules.filesmodule.config.YmlConfig
import xyz.theprogramsrc.simplecoreapi.global.modules.filesmodule.extensions.folder
import xyz.theprogramsrc.simplecoreapi.global.modules.translationsmodule.models.Translation
import cl.franciscosolis.simplecoreapi.global.modules.filesmodule.config.YmlConfig
import cl.franciscosolis.simplecoreapi.global.modules.filesmodule.extensions.folder
import cl.franciscosolis.simplecoreapi.global.modules.translationsmodule.models.Translation
import java.io.File

class TranslationManager {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package xyz.theprogramsrc.simplecoreapi.global.modules.translationsmodule.models
package cl.franciscosolis.simplecoreapi.global.modules.translationsmodule.models

import xyz.theprogramsrc.simplecoreapi.global.modules.filesmodule.config.YmlConfig
import xyz.theprogramsrc.simplecoreapi.global.modules.filesmodule.extensions.folder
import xyz.theprogramsrc.simplecoreapi.global.modules.translationsmodule.managers.TranslationManager
import cl.franciscosolis.simplecoreapi.global.modules.filesmodule.config.YmlConfig
import cl.franciscosolis.simplecoreapi.global.modules.filesmodule.extensions.folder
import cl.franciscosolis.simplecoreapi.global.modules.translationsmodule.managers.TranslationManager
import java.io.File

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package xyz.theprogramsrc.simplecoreapi.global.utils
package cl.franciscosolis.simplecoreapi.global.utils

import xyz.theprogramsrc.simplecoreapi.global.SimpleCoreAPI
import cl.franciscosolis.simplecoreapi.global.SimpleCoreAPI

/**
* Measures the amount of time in milliseconds it takes to execute the given block. Example:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package xyz.theprogramsrc.simplecoreapi.global.utils
package cl.franciscosolis.simplecoreapi.global.utils

import xyz.theprogramsrc.simplecoreapi.standalone.StandaloneLoader
import cl.franciscosolis.simplecoreapi.standalone.StandaloneLoader
import java.util.Objects

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package xyz.theprogramsrc.simplecoreapi.global.utils.update
package cl.franciscosolis.simplecoreapi.global.utils.update

import com.google.gson.JsonObject
import com.google.gson.JsonParser
import xyz.theprogramsrc.simplecoreapi.global.SimpleCoreAPI
import cl.franciscosolis.simplecoreapi.global.SimpleCoreAPI
import java.net.URL
import java.time.Instant
import java.time.format.DateTimeFormatter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package xyz.theprogramsrc.simplecoreapi.global.utils.update
package cl.franciscosolis.simplecoreapi.global.utils.update

import com.google.gson.JsonObject
import com.google.gson.JsonParser
import xyz.theprogramsrc.simplecoreapi.global.SimpleCoreAPI
import cl.franciscosolis.simplecoreapi.global.SimpleCoreAPI
import java.net.URL
import java.time.Instant
import java.time.format.DateTimeFormatter
Expand Down

0 comments on commit 6dc71b0

Please sign in to comment.