Skip to content

Commit 6929365

Browse files
committed
Fix example after upgrading to Godot 4.4
1 parent fe1b635 commit 6929365

File tree

78 files changed

+305
-364
lines changed

Some content is hidden

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

78 files changed

+305
-364
lines changed

.DS_Store

8 KB
Binary file not shown.

example/.DS_Store

10 KB
Binary file not shown.
File renamed without changes.

example/.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.godot/
2+
/android/
3+
.gradle
4+
.kotlin
5+
.idea
6+
build
7+
jvm

example/kotlin/dodge_the_creeps/ColorAnimator.gdj renamed to example/ColorAnimator.gdj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ fqName = com.example.game.ColorAnimator
66
relativeSourcePath = src/main/kotlin/com/example/game/ColorAnimator.kt
77
baseType = Node2D
88
supertypes = [
9-
godot.Node2D,
10-
godot.CanvasItem,
11-
godot.Node,
12-
godot.Object,
9+
godot.api.Node2D,
10+
godot.api.CanvasItem,
11+
godot.api.Node,
12+
godot.api.Object,
1313
godot.core.KtObject,
14+
godot.common.interop.NativeWrapper,
15+
godot.common.interop.NativePointer,
1416
kotlin.Any
1517
]
1618
signals = [
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

example/dodge-the-creeps/Main.tscn renamed to example/Main.tscn

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
[gd_scene load_steps=8 format=3 uid="uid://cyfwty2q3rdse"]
1+
[gd_scene load_steps=9 format=3 uid="uid://cyfwty2q3rdse"]
22

33
[ext_resource type="Script" uid="uid://ihgudtvx8mue" path="res://Main.gd" id="1"]
44
[ext_resource type="PackedScene" uid="uid://rkdnhqgf2hpj" path="res://Mob.tscn" id="2"]
55
[ext_resource type="PackedScene" uid="uid://4vwrqjegqwpj" path="res://Player.tscn" id="3"]
6+
[ext_resource type="Script" uid="uid://dcdrtlnbiniw1" path="res://ColorAnimator.gdj" id="3_lgr22"]
67
[ext_resource type="PackedScene" uid="uid://ccqoreueuxdb7" path="res://HUD.tscn" id="4"]
78
[ext_resource type="AudioStream" uid="uid://q2pf4fr8d0ks" path="res://art/House In a Forest Loop.ogg" id="5"]
89
[ext_resource type="AudioStream" uid="uid://dw26fpygeag8o" path="res://art/gameover.wav" id="6"]
@@ -25,7 +26,8 @@ grow_horizontal = 2
2526
grow_vertical = 2
2627
color = Color(0.219608, 0.372549, 0.380392, 1)
2728

28-
[node name="ColorAnimator" type="ColorAnimator" parent="."]
29+
[node name="ColorAnimator" type="Node2D" parent="."]
30+
script = ExtResource("3_lgr22")
2931

3032
[node name="Player" parent="." instance=ExtResource("3")]
3133

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

example/build.gradle.kts

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
plugins {
2+
id("com.utopia-rise.godot-kotlin-jvm") version "0.13.1-4.4.1"
3+
id("io.github.tomwyr.godot-kotlin-tree") version "1.0.0"
4+
}
5+
6+
repositories {
7+
mavenCentral()
8+
}
9+
10+
kotlin {
11+
jvmToolchain(21)
12+
}
13+
14+
godot {
15+
// ---------Setup-----------------
16+
17+
// the script registration which you'll attach to nodes are generated into this directory
18+
registrationFileBaseDir.set(projectDir.resolve("gdj"))
19+
20+
// Create .gdj files from all JVM scripts
21+
isRegistrationFileGenerationEnabled.set(true)
22+
23+
// defines whether the script registration files should be generated hierarchically according to the classes package path or flattened into `registrationFileBaseDir`
24+
//isRegistrationFileHierarchyEnabled.set(true)
25+
26+
// defines whether your scripts should be registered with their fqName or their simple name (can help with resolving script name conflicts)
27+
//isFqNameRegistrationEnabled.set(false)
28+
}
29+
30+
godotNodeTree {
31+
// projectPath = "../dodge-the-creeps"
32+
packageName = "com.example.game"
33+
}
34+
35+
sourceSets {
36+
main {
37+
kotlin.srcDir("build/generated/godotNodeTree/kotlin")
38+
}
39+
}

example/dodge-the-creeps/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

example/dodge-the-creeps/ColorAnimator.gdj renamed to example/gdj/com/example/game/ColorAnimator.gdj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ fqName = com.example.game.ColorAnimator
66
relativeSourcePath = src/main/kotlin/com/example/game/ColorAnimator.kt
77
baseType = Node2D
88
supertypes = [
9-
godot.Node2D,
10-
godot.CanvasItem,
11-
godot.Node,
12-
godot.Object,
9+
godot.api.Node2D,
10+
godot.api.CanvasItem,
11+
godot.api.Node,
12+
godot.api.Object,
1313
godot.core.KtObject,
14+
godot.common.interop.NativeWrapper,
15+
godot.common.interop.NativePointer,
1416
kotlin.Any
1517
]
1618
signals = [
@@ -20,5 +22,5 @@ properties = [
2022

2123
]
2224
functions = [
23-
_process
25+
_ready
2426
]
42.4 KB
Binary file not shown.

example/kotlin/gradle/wrapper/gradle-wrapper.properties renamed to example/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.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

example/gradlew

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
#!/usr/bin/env sh
2+
3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
19+
##############################################################################
20+
##
21+
## Gradle start up script for UN*X
22+
##
23+
##############################################################################
24+
25+
# Attempt to set APP_HOME
26+
# Resolve links: $0 may be a link
27+
PRG="$0"
28+
# Need this for relative symlinks.
29+
while [ -h "$PRG" ] ; do
30+
ls=`ls -ld "$PRG"`
31+
link=`expr "$ls" : '.*-> \(.*\)$'`
32+
if expr "$link" : '/.*' > /dev/null; then
33+
PRG="$link"
34+
else
35+
PRG=`dirname "$PRG"`"/$link"
36+
fi
37+
done
38+
SAVED="`pwd`"
39+
cd "`dirname \"$PRG\"`/" >/dev/null
40+
APP_HOME="`pwd -P`"
41+
cd "$SAVED" >/dev/null
42+
43+
APP_NAME="Gradle"
44+
APP_BASE_NAME=`basename "$0"`
45+
46+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
48+
49+
# Use the maximum available, or set MAX_FD != -1 to use that value.
50+
MAX_FD="maximum"
51+
52+
warn () {
53+
echo "$*"
54+
}
55+
56+
die () {
57+
echo
58+
echo "$*"
59+
echo
60+
exit 1
61+
}
62+
63+
# OS specific support (must be 'true' or 'false').
64+
cygwin=false
65+
msys=false
66+
darwin=false
67+
nonstop=false
68+
case "`uname`" in
69+
CYGWIN* )
70+
cygwin=true
71+
;;
72+
Darwin* )
73+
darwin=true
74+
;;
75+
MINGW* )
76+
msys=true
77+
;;
78+
NONSTOP* )
79+
nonstop=true
80+
;;
81+
esac
82+
83+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
84+
85+
86+
# Determine the Java command to use to start the JVM.
87+
if [ -n "$JAVA_HOME" ] ; then
88+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
89+
# IBM's JDK on AIX uses strange locations for the executables
90+
JAVACMD="$JAVA_HOME/jre/sh/java"
91+
else
92+
JAVACMD="$JAVA_HOME/bin/java"
93+
fi
94+
if [ ! -x "$JAVACMD" ] ; then
95+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
96+
97+
Please set the JAVA_HOME variable in your environment to match the
98+
location of your Java installation."
99+
fi
100+
else
101+
JAVACMD="java"
102+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
103+
104+
Please set the JAVA_HOME variable in your environment to match the
105+
location of your Java installation."
106+
fi
107+
108+
# Increase the maximum file descriptors if we can.
109+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
110+
MAX_FD_LIMIT=`ulimit -H -n`
111+
if [ $? -eq 0 ] ; then
112+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
113+
MAX_FD="$MAX_FD_LIMIT"
114+
fi
115+
ulimit -n $MAX_FD
116+
if [ $? -ne 0 ] ; then
117+
warn "Could not set maximum file descriptor limit: $MAX_FD"
118+
fi
119+
else
120+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
121+
fi
122+
fi
123+
124+
# For Darwin, add options to specify how the application appears in the dock
125+
if $darwin; then
126+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
127+
fi
128+
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
134+
JAVACMD=`cygpath --unix "$JAVACMD"`
135+
136+
# We build the pattern for arguments to be converted via cygpath
137+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
138+
SEP=""
139+
for dir in $ROOTDIRSRAW ; do
140+
ROOTDIRS="$ROOTDIRS$SEP$dir"
141+
SEP="|"
142+
done
143+
OURCYGPATTERN="(^($ROOTDIRS))"
144+
# Add a user-defined pattern to the cygpath arguments
145+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
146+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
147+
fi
148+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
149+
i=0
150+
for arg in "$@" ; do
151+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
152+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
153+
154+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
155+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
156+
else
157+
eval `echo args$i`="\"$arg\""
158+
fi
159+
i=`expr $i + 1`
160+
done
161+
case $i in
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
172+
esac
173+
fi
174+
175+
# Escape application args
176+
save () {
177+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
178+
echo " "
179+
}
180+
APP_ARGS=`save "$@"`
181+
182+
# Collect all arguments for the java command, following the shell quoting and substitution rules
183+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
184+
185+
exec "$JAVACMD" "$@"

example/kotlin/gradlew.bat renamed to example/gradlew.bat

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@rem limitations under the License.
1515
@rem
1616

17-
@if "%DEBUG%"=="" @echo off
17+
@if "%DEBUG%" == "" @echo off
1818
@rem ##########################################################################
1919
@rem
2020
@rem Gradle startup script for Windows
@@ -25,8 +25,7 @@
2525
if "%OS%"=="Windows_NT" setlocal
2626

2727
set DIRNAME=%~dp0
28-
if "%DIRNAME%"=="" set DIRNAME=.
29-
@rem This is normally unused
28+
if "%DIRNAME%" == "" set DIRNAME=.
3029
set APP_BASE_NAME=%~n0
3130
set APP_HOME=%DIRNAME%
3231

@@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4140

4241
set JAVA_EXE=java.exe
4342
%JAVA_EXE% -version >NUL 2>&1
44-
if %ERRORLEVEL% equ 0 goto execute
43+
if "%ERRORLEVEL%" == "0" goto init
4544

4645
echo.
4746
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -55,7 +54,7 @@ goto fail
5554
set JAVA_HOME=%JAVA_HOME:"=%
5655
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5756

58-
if exist "%JAVA_EXE%" goto execute
57+
if exist "%JAVA_EXE%" goto init
5958

6059
echo.
6160
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -65,26 +64,39 @@ echo location of your Java installation.
6564

6665
goto fail
6766

67+
:init
68+
@rem Get command-line arguments, handling Windows variants
69+
70+
if not "%OS%" == "Windows_NT" goto win9xME_args
71+
72+
:win9xME_args
73+
@rem Slurp the command line arguments.
74+
set CMD_LINE_ARGS=
75+
set _SKIP=2
76+
77+
:win9xME_args_slurp
78+
if "x%~1" == "x" goto execute
79+
80+
set CMD_LINE_ARGS=%*
81+
6882
:execute
6983
@rem Setup the command line
7084

7185
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7286

7387

7488
@rem Execute Gradle
75-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
89+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
7690

7791
:end
7892
@rem End local scope for the variables with windows NT shell
79-
if %ERRORLEVEL% equ 0 goto mainEnd
93+
if "%ERRORLEVEL%"=="0" goto mainEnd
8094

8195
:fail
8296
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8397
rem the _cmd.exe /c_ return code!
84-
set EXIT_CODE=%ERRORLEVEL%
85-
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86-
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87-
exit /b %EXIT_CODE%
98+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
99+
exit /b 1
88100

89101
:mainEnd
90102
if "%OS%"=="Windows_NT" endlocal
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)