Daddy wesker master (#73)

* pre-migrating to 1.21 commit

* finalizing update

* Update src/main/java/io/singularitynet/MissionHandlers/ObservationFromBlocksDropsImplementation.java

* bump version launch.sh

* java 17 -> 21

* update fabric-api to 0.100.3

* remove excessive setPosition

* wait for chunk loading on server

* Update readme.md

---------

Co-authored-by: Innokenty <[email protected]>

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         # Use these Java versions
-        java: [ 17, ]  # Current Java LTS & minimum supported by Minecraft
+        java: [ 21, ]  # Current Java LTS & minimum supported by Minecraft
     steps:
       - name: lock file
         run: lockfile /tmp/minecraft-test-lock
@@ -33,12 +33,6 @@ jobs:
         run: chmod +x ./gradlew
       - name: build
         run: ./gradlew build
-      - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
-        uses: actions/upload-artifact@v2
-        with:
-          name: Artifacts
-          path: build/libs/
       - name: install vereya
         run: rm /home/tester/.minecraft/mods/* && cp $GITHUB_WORKSPACE/build/libs/* /home/tester/.minecraft/mods/
       - name: install fabric
@@ -65,9 +59,9 @@ jobs:
           python run_tests.py
       - name: save java logs
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: JavaLogs
+          name: java.log
           path: logs/app.log
       - name: save python logs
         if: always()

build.gradle

@@ -1,11 +1,11 @@
 plugins {
-	id 'fabric-loom' version '1.2-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 	id("com.github.bjornvester.xjc") version "1.6.0"
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 version = rootProject.file('VERSION').text.trim()
 archivesBaseName = project.archives_base_name + '-fabric_' + project.fabric_version
@@ -62,8 +62,8 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
+	// Minecraft 1.21-rc1 uses Java 21.
+	it.options.release = 21
 }
 
 java {

gradle.properties

@@ -2,15 +2,15 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-	# check these on https://fabricmc.net/develop
-    minecraft_version=1.20.1
-    yarn_mappings=1.20.1+build.2
-    loader_version=0.14.21
+    # check these on https://fabricmc.net/develop
+    minecraft_version=1.21
+    yarn_mappings=1.21+build.2
+    loader_version=0.15.11
 
 # Mod Properties
-	mod_version = 1.0.0
-	maven_group = io.singularitynet
-	archives_base_name = vereya
+    mod_version = 1.0.0
+    maven_group = io.singularitynet
+    archives_base_name = vereya
 
 #Fabric api
-fabric_version=0.83.1+1.20.1
+fabric_version=0.100.3+1.21

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

launch.sh

@@ -1,5 +1,4 @@
-#!/bin/bash
-/usr/bin/xvfb-run -e /dev/stdout  --server-args "-screen 0 1024x768x24" java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8002 -Dlog4j.configurationFile=`pwd`/config.xml -Xmx2G -Xss1M -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1NewSizePercent=20 -XX:G1ReservePercent=20 -XX:MaxGCPauseMillis=50 -XX:G1HeapRegionSize=32M  -Djava.library.path=/home/tester/.minecraft/bin/bb3b4aba72553abe2f07594b36ce4c133fc66d17 -Djna.tmpdir=/home/tester/.minecraft/bin/bb3b4aba72553abe2f07594b36ce4c133fc66d17 -Dorg.lwjgl.system.SharedLibraryExtractPath=/home/tester/.minecraft/bin/bb3b4aba72553abe2f07594b36ce4c133fc66d17 -Dio.netty.native.workdir=/home/tester/.minecraft/bin/bb3b4aba72553abe2f07594b36ce4c133fc66d17 -Dminecraft.launcher.brand=minecraft-launcher -Dminecraft.launcher.version=2.4.104 -cp /home/tester/.minecraft/libraries/net/fabricmc/tiny-mappings-parser/0.3.0+build.17/tiny-mappings-parser-0.3.0+build.17.jar:/home/tester/.minecraft/libraries/net/fabricmc/sponge-mixin/0.12.5+mixin.0.8.5/sponge-mixin-0.12.5+mixin.0.8.5.jar:/home/tester/.minecraft/libraries/net/fabricmc/tiny-remapper/0.8.2/tiny-remapper-0.8.2.jar:/home/tester/.minecraft/libraries/net/fabricmc/access-widener/2.1.0/access-widener-2.1.0.jar:/home/tester/.minecraft/libraries/org/ow2/asm/asm/9.5/asm-9.5.jar:/home/tester/.minecraft/libraries/org/ow2/asm/asm-analysis/9.5/asm-analysis-9.5.jar:/home/tester/.minecraft/libraries/org/ow2/asm/asm-commons/9.5/asm-commons-9.5.jar:/home/tester/.minecraft/libraries/org/ow2/asm/asm-tree/9.5/asm-tree-9.5.jar:/home/tester/.minecraft/libraries/org/ow2/asm/asm-util/9.5/asm-util-9.5.jar:/home/tester/.minecraft/libraries/net/fabricmc/intermediary/1.20.1/intermediary-1.20.1.jar:/home/tester/.minecraft/libraries/net/fabricmc/fabric-loader/0.14.21/fabric-loader-0.14.21.jar:/home/tester/.minecraft/libraries/com/github/oshi/oshi-core/6.2.2/oshi-core-6.2.2.jar:/home/tester/.minecraft/libraries/com/google/code/gson/gson/2.10/gson-2.10.jar:/home/tester/.minecraft/libraries/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar:/home/tester/.minecraft/libraries/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar:/home/tester/.minecraft/libraries/com/ibm/icu/icu4j/71.1/icu4j-71.1.jar:/home/tester/.minecraft/libraries/com/mojang/authlib/4.0.43/authlib-4.0.43.jar:/home/tester/.minecraft/libraries/com/mojang/blocklist/1.0.10/blocklist-1.0.10.jar:/home/tester/.minecraft/libraries/com/mojang/brigadier/1.1.8/brigadier-1.1.8.jar:/home/tester/.minecraft/libraries/com/mojang/datafixerupper/6.0.8/datafixerupper-6.0.8.jar:/home/tester/.minecraft/libraries/com/mojang/logging/1.1.1/logging-1.1.1.jar:/home/tester/.minecraft/libraries/com/mojang/patchy/2.2.10/patchy-2.2.10.jar:/home/tester/.minecraft/libraries/com/mojang/text2speech/1.17.9/text2speech-1.17.9.jar:/home/tester/.minecraft/libraries/commons-codec/commons-codec/1.15/commons-codec-1.15.jar:/home/tester/.minecraft/libraries/commons-io/commons-io/2.11.0/commons-io-2.11.0.jar:/home/tester/.minecraft/libraries/commons-logging/commons-logging/1.2/commons-logging-1.2.jar:/home/tester/.minecraft/libraries/io/netty/netty-buffer/4.1.82.Final/netty-buffer-4.1.82.Final.jar:/home/tester/.minecraft/libraries/io/netty/netty-codec/4.1.82.Final/netty-codec-4.1.82.Final.jar:/home/tester/.minecraft/libraries/io/netty/netty-common/4.1.82.Final/netty-common-4.1.82.Final.jar:/home/tester/.minecraft/libraries/io/netty/netty-handler/4.1.82.Final/netty-handler-4.1.82.Final.jar:/home/tester/.minecraft/libraries/io/netty/netty-resolver/4.1.82.Final/netty-resolver-4.1.82.Final.jar:/home/tester/.minecraft/libraries/io/netty/netty-transport-classes-epoll/4.1.82.Final/netty-transport-classes-epoll-4.1.82.Final.jar:/home/tester/.minecraft/libraries/io/netty/netty-transport-native-epoll/4.1.82.Final/netty-transport-native-epoll-4.1.82.Final-linux-aarch_64.jar:/home/tester/.minecraft/libraries/io/netty/netty-transport-native-epoll/4.1.82.Final/netty-transport-native-epoll-4.1.82.Final-linux-x86_64.jar:/home/tester/.minecraft/libraries/io/netty/netty-transport-native-unix-common/4.1.82.Final/netty-transport-native-unix-common-4.1.82.Final.jar:/home/tester/.minecraft/libraries/io/netty/netty-transport/4.1.82.Final/netty-transport-4.1.82.Final.jar:/home/tester/.minecraft/libraries/it/unimi/dsi/fastutil/8.5.9/fastutil-8.5.9.jar:/home/tester/.minecraft/libraries/net/java/dev/jna/jna-platform/5.12.1/jna-platform-5.12.1.jar:/home/tester/.minecraft/libraries/net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar:/home/tester/.minecraft/libraries/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar:/home/tester/.minecraft/libraries/org/apache/commons/commons-compress/1.21/commons-compress-1.21.jar:/home/tester/.minecraft/libraries/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar:/home/tester/.minecraft/libraries/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar:/home/tester/.minecraft/libraries/org/apache/httpcomponents/httpcore/4.4.15/httpcore-4.4.15.jar:/home/tester/.minecraft/libraries/org/apache/logging/log4j/log4j-api/2.19.0/log4j-api-2.19.0.jar:/home/tester/.minecraft/libraries/org/apache/logging/log4j/log4j-core/2.19.0/log4j-core-2.19.0.jar:/home/tester/.minecraft/libraries/org/apache/logging/log4j/log4j-slf4j2-impl/2.19.0/log4j-slf4j2-impl-2.19.0.jar:/home/tester/.minecraft/libraries/org/joml/joml/1.10.5/joml-1.10.5.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-glfw/3.3.1/lwjgl-glfw-3.3.1.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-glfw/3.3.1/lwjgl-glfw-3.3.1-natives-linux.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-jemalloc/3.3.1/lwjgl-jemalloc-3.3.1.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-jemalloc/3.3.1/lwjgl-jemalloc-3.3.1-natives-linux.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-openal/3.3.1/lwjgl-openal-3.3.1.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-openal/3.3.1/lwjgl-openal-3.3.1-natives-linux.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-opengl/3.3.1/lwjgl-opengl-3.3.1.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-opengl/3.3.1/lwjgl-opengl-3.3.1-natives-linux.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-stb/3.3.1/lwjgl-stb-3.3.1.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-stb/3.3.1/lwjgl-stb-3.3.1-natives-linux.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-tinyfd/3.3.1/lwjgl-tinyfd-3.3.1.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-tinyfd/3.3.1/lwjgl-tinyfd-3.3.1-natives-linux.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl/3.3.1/lwjgl-3.3.1.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl/3.3.1/lwjgl-3.3.1-natives-linux.jar:/home/tester/.minecraft/libraries/org/slf4j/slf4j-api/2.0.1/slf4j-api-2.0.1.jar:/home/tester/.minecraft/versions/fabric-loader-0.14.21-1.20.1/fabric-loader-0.14.21-1.20.1.jar -DFabricMcEmu=net.minecraft.client.main.Main net.fabricmc.loader.impl.launch.knot.KnotClient --username SingularityNet --version fabric-loader-0.14.21-1.20.1 --gameDir /home/tester/.minecraft --assetsDir /home/tester/.minecraft/assets --assetIndex 5 --accessToken 5 --userType msa --versionType release
+/usr/bin/xvfb-run -e /dev/stdout  --server-args "-screen 0 1024x768x24" java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8002 -Dlog4j.configurationFile=`pwd`/config.xml -Xmx2G -Xss1M -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1NewSizePercent=20 -XX:G1ReservePercent=20 -XX:MaxGCPauseMillis=50 -XX:G1HeapRegionSize=32M -Djava.library.path=/home/tester/.minecraft/bin/3ad733aeb6032294b33ec0493e398208209256bd -Djna.tmpdir=/home/tester/.minecraft/bin/3ad733aeb6032294b33ec0493e398208209256bd -Dorg.lwjgl.system.SharedLibraryExtractPath=/home/tester/.minecraft/bin/3ad733aeb6032294b33ec0493e398208209256bd -Dio.netty.native.workdir=/home/tester/.minecraft/bin/3ad733aeb6032294b33ec0493e398208209256bd -Dminecraft.launcher.brand=minecraft-launcher -Dminecraft.launcher.version=2.26.2 -cp /home/tester/.minecraft/libraries/org/ow2/asm/asm/9.6/asm-9.6.jar:/home/tester/.minecraft/libraries/org/ow2/asm/asm-analysis/9.6/asm-analysis-9.6.jar:/home/tester/.minecraft/libraries/org/ow2/asm/asm-commons/9.6/asm-commons-9.6.jar:/home/tester/.minecraft/libraries/org/ow2/asm/asm-tree/9.6/asm-tree-9.6.jar:/home/tester/.minecraft/libraries/org/ow2/asm/asm-util/9.6/asm-util-9.6.jar:/home/tester/.minecraft/libraries/net/fabricmc/sponge-mixin/0.13.3+mixin.0.8.5/sponge-mixin-0.13.3+mixin.0.8.5.jar:/home/tester/.minecraft/libraries/net/fabricmc/intermediary/1.21/intermediary-1.21.jar:/home/tester/.minecraft/libraries/net/fabricmc/fabric-loader/0.15.11/fabric-loader-0.15.11.jar:/home/tester/.minecraft/libraries/com/github/oshi/oshi-core/6.4.10/oshi-core-6.4.10.jar:/home/tester/.minecraft/libraries/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar:/home/tester/.minecraft/libraries/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar:/home/tester/.minecraft/libraries/com/google/guava/guava/32.1.2-jre/guava-32.1.2-jre.jar:/home/tester/.minecraft/libraries/com/ibm/icu/icu4j/73.2/icu4j-73.2.jar:/home/tester/.minecraft/libraries/com/mojang/authlib/6.0.54/authlib-6.0.54.jar:/home/tester/.minecraft/libraries/com/mojang/blocklist/1.0.10/blocklist-1.0.10.jar:/home/tester/.minecraft/libraries/com/mojang/brigadier/1.2.9/brigadier-1.2.9.jar:/home/tester/.minecraft/libraries/com/mojang/datafixerupper/8.0.16/datafixerupper-8.0.16.jar:/home/tester/.minecraft/libraries/com/mojang/logging/1.2.7/logging-1.2.7.jar:/home/tester/.minecraft/libraries/com/mojang/patchy/2.2.10/patchy-2.2.10.jar:/home/tester/.minecraft/libraries/com/mojang/text2speech/1.17.9/text2speech-1.17.9.jar:/home/tester/.minecraft/libraries/commons-codec/commons-codec/1.16.0/commons-codec-1.16.0.jar:/home/tester/.minecraft/libraries/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar:/home/tester/.minecraft/libraries/commons-logging/commons-logging/1.2/commons-logging-1.2.jar:/home/tester/.minecraft/libraries/io/netty/netty-buffer/4.1.97.Final/netty-buffer-4.1.97.Final.jar:/home/tester/.minecraft/libraries/io/netty/netty-codec/4.1.97.Final/netty-codec-4.1.97.Final.jar:/home/tester/.minecraft/libraries/io/netty/netty-common/4.1.97.Final/netty-common-4.1.97.Final.jar:/home/tester/.minecraft/libraries/io/netty/netty-handler/4.1.97.Final/netty-handler-4.1.97.Final.jar:/home/tester/.minecraft/libraries/io/netty/netty-resolver/4.1.97.Final/netty-resolver-4.1.97.Final.jar:/home/tester/.minecraft/libraries/io/netty/netty-transport-classes-epoll/4.1.97.Final/netty-transport-classes-epoll-4.1.97.Final.jar:/home/tester/.minecraft/libraries/io/netty/netty-transport-native-epoll/4.1.97.Final/netty-transport-native-epoll-4.1.97.Final-linux-aarch_64.jar:/home/tester/.minecraft/libraries/io/netty/netty-transport-native-epoll/4.1.97.Final/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar:/home/tester/.minecraft/libraries/io/netty/netty-transport-native-unix-common/4.1.97.Final/netty-transport-native-unix-common-4.1.97.Final.jar:/home/tester/.minecraft/libraries/io/netty/netty-transport/4.1.97.Final/netty-transport-4.1.97.Final.jar:/home/tester/.minecraft/libraries/it/unimi/dsi/fastutil/8.5.12/fastutil-8.5.12.jar:/home/tester/.minecraft/libraries/net/java/dev/jna/jna-platform/5.14.0/jna-platform-5.14.0.jar:/home/tester/.minecraft/libraries/net/java/dev/jna/jna/5.14.0/jna-5.14.0.jar:/home/tester/.minecraft/libraries/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar:/home/tester/.minecraft/libraries/org/apache/commons/commons-compress/1.26.0/commons-compress-1.26.0.jar:/home/tester/.minecraft/libraries/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar:/home/tester/.minecraft/libraries/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar:/home/tester/.minecraft/libraries/org/apache/httpcomponents/httpcore/4.4.16/httpcore-4.4.16.jar:/home/tester/.minecraft/libraries/org/apache/logging/log4j/log4j-api/2.22.1/log4j-api-2.22.1.jar:/home/tester/.minecraft/libraries/org/apache/logging/log4j/log4j-core/2.22.1/log4j-core-2.22.1.jar:/home/tester/.minecraft/libraries/org/apache/logging/log4j/log4j-slf4j2-impl/2.22.1/log4j-slf4j2-impl-2.22.1.jar:/home/tester/.minecraft/libraries/org/jcraft/jorbis/0.0.17/jorbis-0.0.17.jar:/home/tester/.minecraft/libraries/org/joml/joml/1.10.5/joml-1.10.5.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-freetype/3.3.3/lwjgl-freetype-3.3.3.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-freetype/3.3.3/lwjgl-freetype-3.3.3-natives-linux.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-glfw/3.3.3/lwjgl-glfw-3.3.3.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-glfw/3.3.3/lwjgl-glfw-3.3.3-natives-linux.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-jemalloc/3.3.3/lwjgl-jemalloc-3.3.3.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-jemalloc/3.3.3/lwjgl-jemalloc-3.3.3-natives-linux.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-openal/3.3.3/lwjgl-openal-3.3.3.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-openal/3.3.3/lwjgl-openal-3.3.3-natives-linux.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-opengl/3.3.3/lwjgl-opengl-3.3.3.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-opengl/3.3.3/lwjgl-opengl-3.3.3-natives-linux.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-stb/3.3.3/lwjgl-stb-3.3.3.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-stb/3.3.3/lwjgl-stb-3.3.3-natives-linux.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-tinyfd/3.3.3/lwjgl-tinyfd-3.3.3.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl-tinyfd/3.3.3/lwjgl-tinyfd-3.3.3-natives-linux.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl/3.3.3/lwjgl-3.3.3.jar:/home/tester/.minecraft/libraries/org/lwjgl/lwjgl/3.3.3/lwjgl-3.3.3-natives-linux.jar:/home/tester/.minecraft/libraries/org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar:/home/tester/.minecraft/libraries/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.jar:/home/tester/.minecraft/versions/fabric-loader-0.15.11-1.21/fabric-loader-0.15.11-1.21.jar net.fabricmc.loader.impl.launch.knot.KnotClient -DFabricMcEmu= net.minecraft.client.main.Main --username SingularityNet --gameDir /home/tester/.minecraft --assetsDir /home/tester/.minecraft/assets --assetIndex 17 --accessToken 5 --userType msa --versionType release --version fabric-loader-0.15.11-1.21
 pid="$!"
 echo process $pid
 wait $pid

readme.md

@@ -3,10 +3,12 @@
 ## Overview
 
 Vereya provides API for controlling AI agents in Minecraft. This mod inherits some pieces of the Malmo project, but with various changes and additions. 
-Vereya should work with Minecraft 1.20.1
+Vereya should work with Minecraft 1.21
 
 ## building and installation
 
+*set pauseOnLostFocus:false* in options.txt
+
 run in project directory
 
 `./gradlew build`