Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated dependencies and added 1.19 #37

Merged
merged 12 commits into from
Oct 24, 2022
Merged
5 changes: 0 additions & 5 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ jobs:
cd example-mod16-forge
chmod +x gradlew
./gradlew build
- name: Build ExampleMod8-Fabric
run: |
cd example-mod8-fabric
chmod +x gradlew
./gradlew build
- name: Build ExampleMod8-Forge
run: |
cd example-mod8-forge
Expand Down
17 changes: 16 additions & 1 deletion .github/workflows/mc17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,21 @@ jobs:
${{ runner.os }}-gradle-
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
- name: Build PanelStudio-MC17
run: |
cd panelstudio-mc17
chmod +x gradlew
./gradlew build
- name: Build PanelStudio-MC19
run: |
cd panelstudio-mc19
chmod +x gradlew
./gradlew build
- name: Build ExampleMod8-Fabric
run: |
cd example-mod8-fabric
chmod +x gradlew
./gradlew build
- name: Build ExampleMod17
run: |
cd example-mod17
Expand All @@ -42,6 +52,11 @@ jobs:
cd example-mod18
chmod +x gradlew
./gradlew build
- name: Build ExampleMod19
run: |
cd example-mod19
chmod +x gradlew
./gradlew build
- name: Upload package
uses: actions/upload-artifact@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020,2021 lukflug
Copyright (c) 2020,2021,2022 lukflug and contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ In addition to the core PanelStudio library, there are the PanelStudio-MC suppor
| panelstudio-mc8-fabric | example-mod8-fabric | Legacy Fabric 1.8.9 |
| panelstudio-mc8-forge | example-mod8-forge | Minecraft Forge 1.8.9 |
| panelstudio-mc17 | example-mod17 & example-mod18 | FabricMC 1.17.1 & 1.18.2 |
| panelstudio-mc19 | example-mod19 | FabricMC 1.19.2 |

Minecraft versions or APIs not in this table can also be used with PanelStudio, but the small PanelStudio-MC library has to be ported, which shouldn't be hard in most cases.

## Credits
* Thanks to NirvanaNevermind for making the original port of PanelStudio-MC to Fabric 1.8.9!
* Thanks to Go_Hoosiers (aka. GooberTown or IUDevman) for designing the original PanelStudio logo!
* Thanks to Chomp for making a pull request to change the readme, I guess.
* Thanks to Diliard for porting PanelStudio-MC to Fabric 1.19.2!

## Features
* Everything is flexible and can be extended.
Expand Down
2 changes: 1 addition & 1 deletion example-mod16-fabric/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ org.gradle.jvmargs = -Xmx2500m
version = 0.2.1
versionmc = 0.2.0

loomVersion = 0.7.34
loomVersion = 0.7.35
minecraft16fabric = 1.16.5
mappings16fabric = 1.16.5+build.10
loader16fabric = 0.13.3
Expand Down
4 changes: 2 additions & 2 deletions example-mod16-forge/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ org.gradle.jvmargs = -Xmx2500m
version = 0.2.1
versionmc = 0.2.0

forgeGradle5 = 5.1.31
forgeGradle5 = 5.1.56
mappings16forge = 20210309-1.16.5
minecraft16forge = 1.16.5-36.2.20
minecraft16forge = 1.16.5-36.2.34
2 changes: 1 addition & 1 deletion example-mod17/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ processResources {
shadowJar {
classifier = "dev"
configurations = [project.configurations.shadow]
relocate "com.lukflug.panelstudio","com.lukflug.panelstudio_0_2_2"
relocate "com.lukflug.panelstudio","com.lukflug.panelstudio_0_2_3"
}

remapJar {
Expand Down
6 changes: 3 additions & 3 deletions example-mod17/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
org.gradle.jvmargs = -Xmx2500m
version = 0.2.1
versionmc = 0.2.2
versionmc = 0.2.3

loomVersion = 0.12.1
loomVersion = 1.0.11
minecraft17 = 1.17.1
mappings17 = 1.17.1+build.65
loader17 = 0.13.3
loader17 = 0.14.10
api17 = 0.46.1+1.17
2 changes: 1 addition & 1 deletion example-mod18/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ processResources {
shadowJar {
classifier = "dev"
configurations = [project.configurations.shadow]
relocate "com.lukflug.panelstudio","com.lukflug.panelstudio_0_2_2"
relocate "com.lukflug.panelstudio","com.lukflug.panelstudio_0_2_3"
}

remapJar {
Expand Down
10 changes: 5 additions & 5 deletions example-mod18/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
org.gradle.jvmargs = -Xmx2500m
version = 0.2.1
versionmc = 0.2.2
versionmc = 0.2.3

loomVersion = 0.12.1
loomVersion = 1.0.11
minecraft18 = 1.18.2
mappings18 = 1.18.2+build.2
loader18 = 0.13.3
api18 = 0.47.10+1.18.2
mappings18 = 1.18.2+build.4
loader18 = 0.14.10
api18 = 0.48.0+1.18.2
63 changes: 63 additions & 0 deletions example-mod19/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@

buildscript {
repositories {
gradlePluginPortal()
maven {
name = "Fabric"
url = "https://maven.fabricmc.net/"
}
flatDir {
dirs 'libs'
}
}
dependencies {
classpath "net.fabricmc:fabric-loom:${loomVersion}"
classpath "gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0"
}
}

apply plugin: "fabric-loom"
apply plugin: "com.github.johnrengelman.shadow"

configurations {
shadow
modImplementation.extendsFrom shadow
}

repositories {
maven {
name = "lukflug"
url = "https://lukflug.github.io/maven/"
}
}


loom {
}

dependencies {
minecraft "com.mojang:minecraft:${minecraft19}"
mappings "net.fabricmc:yarn:${mappings19}:v2"
modImplementation "net.fabricmc:fabric-loader:${loader19}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${api19}"
shadow "com.lukflug:panelstudio:${version}"
shadow "com.lukflug:panelstudio-mc19:${versionmc}"
}

processResources {
inputs.property "version", project.version
filesMatching("fabric.mod.json") {
expand "version": project.version
}
}

shadowJar {
classifier = "dev"
configurations = [project.configurations.shadow]
relocate "com.lukflug.panelstudio","com.lukflug.panelstudio_0_2_3"
}

remapJar {
dependsOn shadowJar
inputFile = shadowJar.archiveFile
}
9 changes: 9 additions & 0 deletions example-mod19/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
org.gradle.jvmargs = -Xmx2500m
version = 0.2.1
versionmc = 0.2.3

loomVersion = 1.0.11
minecraft19 = 1.19.2
mappings19 = 1.19.2+build.28
loader19 = 0.14.10
api19 = 0.64.0+1.19.2
Binary file added example-mod19/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions example-mod19/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
183 changes: 183 additions & 0 deletions example-mod19/gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
#!/usr/bin/env sh

#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn () {
echo "$*"
}

die () {
echo
echo "$*"
echo
exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

exec "$JAVACMD" "$@"
Loading