Skip to content

Commit

Permalink
1.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
MelanX committed Jul 16, 2023
1 parent cd1eef9 commit f265a39
Show file tree
Hide file tree
Showing 39 changed files with 509 additions and 713 deletions.
6 changes: 4 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Expand Up @@ -2,11 +2,13 @@ name: Bug Report
description: Report an issue with supported versions of Sky GUIs
labels: [ bug ]
body:
- type: input
- type: dropdown
id: mc-version
attributes:
label: Minecraft version
placeholder: eg. 1.18.2
options:
- 1.19.2
- 1.20.1
validations:
required: true
- type: input
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Expand Up @@ -5,7 +5,7 @@ pipeline {
tools {
jdk 'java17'
}
environment {
environment {
MODGRADLE_CI = 'true'
}
stages {
Expand Down
14 changes: 7 additions & 7 deletions build.gradle
@@ -1,13 +1,13 @@
buildscript {
apply from: 'https://moddingx.github.io/ModUtils/v4/buildscript.gradle', to: buildscript
apply from: 'https://moddingx.github.io/ModUtils/v5/buildscript.gradle', to: buildscript
}

apply from: 'https://moddingx.github.io/ModUtils/v4/mod.gradle'
apply from: 'https://moddingx.github.io/ModUtils/v5/mod.gradle'

repositories {
maven {
name = "JEI"
url = "https://dvs1.progwml6.com/files/maven/"
url = "https://modmaven.dev/"
}
maven {
name = "MelanX Maven"
Expand All @@ -16,10 +16,10 @@ repositories {
}

dependencies {
annotationProcessor "org.moddingx:LibX:1.19.1-4.1.3"
annotationProcessor "org.moddingx:LibX:1.20.1-5.0.5"

implementation fg.deobf("org.moddingx:LibX:1.19.1-4.1.3")
implementation fg.deobf("de.melanx:SkyblockBuilder:1.19.1-4.1.1")
implementation fg.deobf("org.moddingx:LibX:1.20.1-5.0.5")
implementation fg.deobf("de.melanx:SkyblockBuilder:1.20.1-5.0.5")

runtimeOnly fg.deobf("mezz.jei:jei-1.19.1-forge:11.2.0.244")
runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.0.0.12")
}
22 changes: 0 additions & 22 deletions gradle.properties
@@ -1,24 +1,2 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

# mod properties
modid=skyguis
group=de.melanx
base_version=2.1

# dependencies
forge_version=1.19.1-42.0.1
#mappings=sugarcane_2022.05.22-1.18.2

# Curse properties
upload_release=beta
upload_versions=1.19.1, 1.19.2
modrinth_project=3Gdi7Qgq
modrinth_requirements=libx, skyblock-builder
curse_project=557696
curse_requirements=libx, skyblock-builder

# misc
local_maven=/var/www/maven
license_name=The Apache License, Version 2.0
license_url=https://www.apache.org/licenses/LICENSE-2.0.txt
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 6 additions & 0 deletions gradlew
Expand Up @@ -205,6 +205,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
14 changes: 8 additions & 6 deletions gradlew.bat
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down
21 changes: 21 additions & 0 deletions mod.properties
@@ -0,0 +1,21 @@
# mod properties
modid=skyguis
group=de.melanx
base_version=3.0

# dependencies
forge_version=1.20.1-47.1.0
mappings=sugarcane_2023.07.09-1.20.1

# Curse properties
upload_release=beta
upload_versions=1.20.1
upload_requirements=libx, skyblock-builder
modrinth_project=3Gdi7Qgq
curse_project=557696

# misc
local_maven=/var/www/maven
license=The Apache License, Version 2.0
license_url=https://www.apache.org/licenses/LICENSE-2.0.txt
changelog_repository=https://github.com/MelanX/SkyGUIs/commit/%H
176 changes: 0 additions & 176 deletions src/main/java/de/melanx/skyguis/client/TemplateRenderer.java

This file was deleted.

0 comments on commit f265a39

Please sign in to comment.