Skip to content

Commit

Permalink
Update CC:T to 1.109.6
Browse files Browse the repository at this point in the history
  • Loading branch information
SquidDev committed Feb 29, 2024
1 parent 558b29e commit 790de32
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
14 changes: 7 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -202,11 +202,11 @@ fi
# 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"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
2 changes: 1 addition & 1 deletion vendor/CC-Tweaked
Submodule CC-Tweaked updated 54 files
+1 −0 .gitignore
+7 −7 buildSrc/build.gradle.kts
+11 −5 buildSrc/src/main/kotlin/cc-tweaked.vanilla.gradle.kts
+17 −99 buildSrc/src/main/kotlin/cc/tweaked/gradle/MinecraftConfigurations.kt
+1 −1 gradle.properties
+8 −3 gradle/libs.versions.toml
+ gradle/wrapper/gradle-wrapper.jar
+1 −0 gradle/wrapper/gradle-wrapper.properties
+13 −9 gradlew
+4 −0 illuaminate.sexp
+10 −0 projects/common-api/src/main/java/dan200/computercraft/api/network/wired/WiredNetwork.java
+5 −6 projects/common-api/src/main/java/dan200/computercraft/api/network/wired/WiredNode.java
+13 −2 projects/common/build.gradle.kts
+0 −36 projects/common/src/client/java/dan200/computercraft/client/ClientHooks.java
+51 −1 projects/common/src/client/java/dan200/computercraft/client/ClientRegistry.java
+0 −13 projects/common/src/client/resources/computercraft-client.mixins.json
+38 −17 projects/common/src/main/java/dan200/computercraft/impl/network/wired/InvariantChecker.java
+100 −0 projects/common/src/main/java/dan200/computercraft/impl/network/wired/NodeSet.java
+94 −42 projects/common/src/main/java/dan200/computercraft/impl/network/wired/WiredNetworkImpl.java
+8 −0 projects/common/src/main/java/dan200/computercraft/impl/network/wired/WiredNodeImpl.java
+10 −0 projects/common/src/main/java/dan200/computercraft/shared/CommonHooks.java
+7 −2 projects/common/src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java
+2 −2 projects/common/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/CableBlockEntity.java
+125 −12 projects/common/src/main/java/dan200/computercraft/shared/util/TickScheduler.java
+183 −0 projects/common/src/test/java/dan200/computercraft/impl/network/wired/NetworkBenchmark.java
+62 −172 projects/common/src/test/java/dan200/computercraft/impl/network/wired/NetworkTest.java
+22 −1 projects/core-api/src/main/java/dan200/computercraft/api/lua/ILuaAPI.java
+0 −7 projects/core/build.gradle.kts
+3 −3 projects/core/src/main/java/dan200/computercraft/core/filesystem/MemoryMount.java
+6 −4 projects/core/src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java
+16 −0 projects/core/src/main/resources/data/computercraft/lua/rom/help/changelog.md
+5 −10 projects/core/src/main/resources/data/computercraft/lua/rom/help/whatsnew.md
+37 −0 projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/internal/event.lua
+28 −7 projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/internal/syntax/errors.lua
+156 −123 projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/internal/syntax/parser.lua
+14 −5 projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/require.lua
+1 −0 projects/core/src/main/resources/data/computercraft/lua/rom/programs/edit.lua
+1 −1 projects/core/src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/paint.lua
+1 −1 projects/core/src/main/resources/data/computercraft/lua/rom/programs/help.lua
+28 −1 projects/core/src/test/java/dan200/computercraft/core/asm/MethodTest.java
+3 −2 projects/core/src/test/java/dan200/computercraft/core/computer/ComputerBootstrap.java
+43 −0 projects/core/src/test/resources/test-rom/spec/modules/cc/internal/event_spec.lua
+8 −8 projects/core/src/test/resources/test-rom/spec/modules/cc/internal/syntax/parser_exhaustive_spec.md
+105 −4 projects/core/src/test/resources/test-rom/spec/modules/cc/internal/syntax/parser_spec.md
+6 −0 projects/fabric/src/client/java/dan200/computercraft/client/ComputerCraftClient.java
+17 −0 projects/fabric/src/main/java/dan200/computercraft/mixin/ChunkMapMixin.java
+2 −0 projects/fabric/src/main/java/dan200/computercraft/shared/ComputerCraft.java
+0 −4 projects/fabric/src/main/resources/fabric.mod.json
+19 −12 projects/forge/build.gradle.kts
+7 −4 projects/forge/src/client/java/dan200/computercraft/client/ForgeClientHooks.java
+9 −3 projects/forge/src/client/java/dan200/computercraft/mixin/client/ClientPacketListenerMixin.java
+2 −1 projects/forge/src/client/resources/computercraft-client.forge.mixins.json
+16 −0 projects/forge/src/main/java/dan200/computercraft/shared/ForgeCommonHooks.java
+7 −1 settings.gradle.kts

0 comments on commit 790de32

Please sign in to comment.