tikaiz/hytale-solar-cell-plugin
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge upstream Changes #2

Open
KainTim wants to merge 9 commits from realBritakee/main into main
pull from: realBritakee/main
merge into: tikaiz:main
Conversation 0 Commits 9 Files Changed 7 +6 -5
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b6a2a9d515 - Show all commits

9
build.gradle
View File

@@ -9,8 +9,9 @@ import org.gradle.internal.os.OperatingSystem
ext { ext {
if (project.hasProperty('hytale_home')) { if (project.hasProperty('hytale_home')) {
hytaleHome = project.findProperty('hytale_home') hytaleHome = project.findProperty('hytale_home')
} } else if (System.getenv('HYTALE_HOME')) {
else { hytaleHome = System.getenv('HYTALE_HOME')
} else {
def os = OperatingSystem.current() def os = OperatingSystem.current()
if (os.isWindows()) { if (os.isWindows()) {
hytaleHome = "${System.getProperty("user.home")}/AppData/Roaming/Hytale" hytaleHome = "${System.getProperty("user.home")}/AppData/Roaming/Hytale"
@@ -27,8 +28,8 @@ ext {
} }
} }
def hytaleHomePath = project.findProperty('hytaleHome') def hytaleHomePath = ext.has('hytaleHome') ? hytaleHome : null
def hasHytaleHome = hytaleHomePath && file(hytaleHomePath).exists() def hasHytaleHome = (hytaleHomePath != null) && file(hytaleHomePath).exists()
if (!hasHytaleHome) { if (!hasHytaleHome) {
logger.lifecycle("Hytale install not detected; run configs that launch the server will be skipped. Set -Phytale_home=/path/to/Hytale to enable them.") logger.lifecycle("Hytale install not detected; run configs that launch the server will be skipped. Set -Phytale_home=/path/to/Hytale to enable them.")
} }

2
src/main/resources/manifest.json
View File

@@ -1,7 +1,7 @@
{ {
"Group": "Example", "Group": "Example",
"Name": "ExamplePlugin", "Name": "ExamplePlugin",
"Version": "0.0.3", "Version": "0.0.2",
"Description": "An example plugin for HyTale!", "Description": "An example plugin for HyTale!",
"Authors": [ "Authors": [
{ {