Skip to content

Commit b3e20f7

Browse files
authored
Merge pull request #7 from TonimatasDEV/dev
Develop version 10
2 parents 9dadc86 + 6ccd332 commit b3e20f7

45 files changed

Lines changed: 218 additions & 105 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ jobs:
3232
- name: Upload artifacts
3333
uses: actions/upload-artifact@v4
3434
with:
35-
name: PolarisCore
36-
path: build/libs/PolarisCore**.jar
35+
name: Ethylene
36+
path: build/libs/Ethylene**.jar
3737

3838
- name: Create Release
3939
if: ${{ format('refs/heads/{0}', github.event.repository.default_branch) == github.ref }}
4040
run: |
41-
jar_file=$(basename build/libs/PolarisCore**.jar)
41+
jar_file=$(basename build/libs/Ethylene**.jar)
4242
file_name_no_ext="${jar_file%.jar}"
4343
formatted_name=$(echo "$file_name_no_ext" | sed 's/-/ /g')
4444
45-
gh release create "${{ github.run_number }}" build/libs/PolarisCore**.jar \
45+
gh release create "${{ github.run_number }}" build/libs/Ethylene**.jar \
4646
--repo="$GITHUB_REPOSITORY" \
4747
--title="${formatted_name}" \
4848
--generate-notes

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# PolarisCore
2-
PolarisCore is a server software for Minecraft based on Minestom
1+
# Ethylene
2+
Ethylene is a server software for Minecraft based on Minestom

build.gradle.kts

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,70 @@
1-
import dev.polariscore.tasks.CreateTextFile
2-
import dev.polariscore.tasks.Utils
1+
import net.ethylene.tasks.CreateTextFile
2+
import net.ethylene.tasks.Utils
3+
import kotlin.io.path.createDirectory
4+
import kotlin.io.path.exists
35

46
plugins {
57
java
8+
application
69
}
710

8-
group = "dev.polariscore"
9-
version = "1.21-" + (System.getenv("VERSION") ?: "dev")
10-
base.archivesName.set("PolarisCore")
11+
val minecraftVersion: String by extra
12+
val minestomVersion: String by extra
13+
val logbackVersion: String by extra
14+
15+
group = "net.etyhelene"
16+
version = minecraftVersion + "-" + (System.getenv("VERSION") ?: "dev")
17+
base.archivesName.set("Ethylene")
18+
sourceSets.main.get().resources.srcDirs("src/main/resources")
1119

1220
repositories {
1321
mavenCentral()
1422
}
1523

1624
dependencies {
17-
implementation("net.minestom:minestom-snapshots:1_21_2-59a97ca99e")
18-
implementation("ch.qos.logback:logback-classic:1.5.7")
25+
implementation("net.minestom:minestom-snapshots:$minestomVersion")
26+
implementation("ch.qos.logback:logback-classic:$logbackVersion")
1927
}
2028

2129
tasks.register<CreateTextFile>("createLibrariesFile") {
2230
fileName = "libraries.txt"
23-
content = Utils.getDependencies(configurations.implementation.get().copy())
31+
content = Utils.getDependencies(configurations.runtimeClasspath.get())
2432
}
2533

2634
tasks.register<CreateTextFile>("createRepositoriesFile") {
2735
fileName = "repositories.txt"
2836
content = Utils.getRepositories(repositories)
2937
}
3038

39+
tasks.processResources {
40+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
41+
}
42+
3143
tasks.jar {
3244
from(tasks.getByName("createLibrariesFile"))
3345
from(tasks.getByName("createRepositoriesFile"))
3446

3547
manifest {
3648
attributes(
37-
"Launcher-Agent-Class" to "dev.polariscore.server.launcher.Agent",
38-
"Agent-Class" to "dev.polariscore.server.launcher.Agent",
39-
"Premain-Class" to "dev.polariscore.server.launcher.Agent",
40-
"Main-Class" to "dev.polariscore.server.launcher.Launcher",
41-
"Multi-Release" to true
49+
"Launcher-Agent-Class" to "net.ethylene.server.launcher.Agent",
50+
"Agent-Class" to "net.ethylene.server.launcher.Agent",
51+
"Premain-Class" to "net.ethylene.server.launcher.Agent",
52+
"Main-Class" to "net.ethylene.server.launcher.Launcher",
53+
"Multi-Release" to true
4254
)
4355
}
56+
}
4457

45-
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
58+
application {
59+
mainClass = "net.ethylene.server.launcher.Launcher"
4660
}
4761

62+
tasks.named<JavaExec>("run") {
63+
val path = rootDir.toPath().resolve("run")
64+
65+
args = listOf("-nolibraries", "-accepteula")
66+
workingDir = path.toFile()
67+
standardInput = System.`in`
4868

69+
if (!path.exists()) path.createDirectory()
70+
}

buildSrc/src/main/java/dev/polariscore/tasks/CreateTextFile.java renamed to buildSrc/src/main/java/net/ethylene/tasks/CreateTextFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.polariscore.tasks;
1+
package net.ethylene.tasks;
22

33
import org.gradle.api.DefaultTask;
44
import org.gradle.api.file.RegularFileProperty;

buildSrc/src/main/java/dev/polariscore/tasks/Utils.java renamed to buildSrc/src/main/java/net/ethylene/tasks/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.polariscore.tasks;
1+
package net.ethylene.tasks;
22

33
import org.gradle.api.artifacts.Configuration;
44
import org.gradle.api.artifacts.ResolvedArtifact;

gradle.properties

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Properties
2+
minecraftVersion=1.21.3
3+
4+
# Libraries
5+
# https://mvnrepository.com/artifact/net.minestom/minestom-snapshots
6+
minestomVersion=10d6d2bb2e
7+
# https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
8+
logbackVersion=1.5.15

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ pluginManagement {
44
}
55
}
66

7-
rootProject.name = "PolarisCore"
7+
rootProject.name = "Ethylene"

src/main/java/dev/polariscore/server/utils/PolarisHighlightingConverter.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)