diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..2ca3795 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,40 @@ +# Automatically build the project and run any configured tests for every push +# and submitted pull request. This can help catch issues that only occur on +# certain platforms or Java versions, and provides a first line of defence +# against bad commits. + +name: build +on: [pull_request, push] + +jobs: + build: + strategy: + matrix: + # Use these Java versions + java: [ + 17, # Current Java LTS & minimum supported by Minecraft + ] + # and run on both Linux and Windows + os: [ubuntu-22.04, windows-2022] + runs-on: ${{ matrix.os }} + steps: + - name: checkout repository + uses: actions/checkout@v3 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java }} + distribution: 'microsoft' + - name: make gradle wrapper executable + if: ${{ runner.os != 'Windows' }} + 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@v3 + with: + name: Artifacts + path: build/libs/ \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1625c17 --- /dev/null +++ b/LICENSE @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..3e62f53 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# Packumulator + + diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..8f99249 --- /dev/null +++ b/build.gradle @@ -0,0 +1,85 @@ +plugins { + id 'fabric-loom' version '1.3-SNAPSHOT' + id 'io.github.juuxel.loom-quiltflower' version '1.+' + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. + + mavenCentral() +} + +loom { +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + // modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + // Uncomment the following line to enable the deprecated Fabric API modules. + // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. + + // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 17 +} + +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +jar { + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}"} + } +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..8d825d2 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.9 +loader_version=0.14.21 + +# Mod Properties +mod_version=0.0.1 +maven_group=com.ishland.packumulator +archives_base_name=packumulator-fabric + +# Dependencies +#fabric_version=0.85.0+1.20.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..033e24c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d11cdd9 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..fcb6fca --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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 POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +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 + 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 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +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. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + 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. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +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. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +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. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +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! +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 + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..2256cd3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,13 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} + +rootProject.name = "packumulator" // avoid weirdness when building the project using another directory name + diff --git a/src/main/java/com/ishland/packumulator/TheMod.java b/src/main/java/com/ishland/packumulator/TheMod.java new file mode 100644 index 0000000..78d39a8 --- /dev/null +++ b/src/main/java/com/ishland/packumulator/TheMod.java @@ -0,0 +1,10 @@ +package com.ishland.packumulator; + +import net.fabricmc.api.ModInitializer; + +public class TheMod implements ModInitializer { + @Override + public void onInitialize() { + + } +} diff --git a/src/main/java/com/ishland/packumulator/common/PacketWrapper.java b/src/main/java/com/ishland/packumulator/common/PacketWrapper.java new file mode 100644 index 0000000..ab094c3 --- /dev/null +++ b/src/main/java/com/ishland/packumulator/common/PacketWrapper.java @@ -0,0 +1,6 @@ +package com.ishland.packumulator.common; + +import io.netty.channel.ChannelPromise; + +public record PacketWrapper(T msg, ChannelPromise promise) { +} diff --git a/src/main/java/com/ishland/packumulator/common/package-info.java b/src/main/java/com/ishland/packumulator/common/package-info.java new file mode 100644 index 0000000..55cf683 --- /dev/null +++ b/src/main/java/com/ishland/packumulator/common/package-info.java @@ -0,0 +1 @@ +package com.ishland.packumulator.common; \ No newline at end of file diff --git a/src/main/java/com/ishland/packumulator/common/s2c/FutureUtil.java b/src/main/java/com/ishland/packumulator/common/s2c/FutureUtil.java new file mode 100644 index 0000000..a437e0f --- /dev/null +++ b/src/main/java/com/ishland/packumulator/common/s2c/FutureUtil.java @@ -0,0 +1,28 @@ +package com.ishland.packumulator.common.s2c; + +import io.netty.channel.ChannelPromise; + +import java.util.Objects; + +public class FutureUtil { + + public static void chainPromises(ChannelPromise src, ChannelPromise... dst) { + Objects.requireNonNull(src, "src"); + Objects.requireNonNull(dst, "dst"); + for (ChannelPromise promise : dst) { + Objects.requireNonNull(promise, "dst"); + } + src.addListener(future -> { + if (future.isSuccess()) { + for (ChannelPromise promise : dst) { + promise.trySuccess(); + } + } else { + for (ChannelPromise promise : dst) { + promise.tryFailure(future.cause()); + } + } + }); + } + +} diff --git a/src/main/java/com/ishland/packumulator/common/s2c/chunkupdate/ChunkDataUtil.java b/src/main/java/com/ishland/packumulator/common/s2c/chunkupdate/ChunkDataUtil.java new file mode 100644 index 0000000..02e376a --- /dev/null +++ b/src/main/java/com/ishland/packumulator/common/s2c/chunkupdate/ChunkDataUtil.java @@ -0,0 +1,79 @@ +package com.ishland.packumulator.common.s2c.chunkupdate; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufAllocator; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.network.packet.s2c.play.ChunkData; +import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket; +import net.minecraft.network.packet.s2c.play.LightData; +import net.minecraft.network.packet.s2c.play.LightUpdateS2CPacket; + +import java.util.BitSet; +import java.util.List; +import java.util.ListIterator; + +public class ChunkDataUtil { + + + public static void mergeLightData(BitSet dstInited, BitSet dstUninited, List dstNibbles, + BitSet srcInited, BitSet srcUninited, List srcNibbles) { + final int maxHeight = Math.max(Math.max(dstInited.size(), dstUninited.size()), Math.max(srcInited.size(), srcUninited.size())); + final ListIterator dst = dstNibbles.listIterator(); + final ListIterator src = srcNibbles.listIterator(); + for (int i = 0; i < maxHeight; i++) { + // inited and uninited states: + // none are set: unchanged + // only either can be set + final boolean dstInitedValue = dstInited.get(i); + final boolean dstUninitedValue = dstUninited.get(i); + final boolean srcInitedValue = srcInited.get(i); + final boolean srcUninitedValue = srcUninited.get(i); + final boolean hasExisting = dstInitedValue || dstUninitedValue; + if (hasExisting) { + assert dst.hasNext(); // if not we are fucked + dst.next(); + } + if (srcInitedValue || srcUninitedValue) { + assert src.hasNext(); // if not we are fucked + final byte[] currentNibble = src.next(); + // copy nibbles + if (hasExisting) { + dst.set(currentNibble.clone()); + } else { + dst.add(currentNibble.clone()); + } + // copy flags + dstInited.set(i, srcInitedValue); + dstUninited.set(i, srcUninitedValue); + } + } + } + + public static ChunkDataS2CPacket makeChunkDataPacket(int x, int z, ChunkData chunkData, LightData lightData, ByteBufAllocator alloc) { + final ByteBuf parent = alloc.heapBuffer(); + try { + final PacketByteBuf buf = new PacketByteBuf(parent); + buf.writeInt(x); + buf.writeInt(z); + chunkData.write(buf); + lightData.write(buf); + return new ChunkDataS2CPacket(buf); + } finally { + parent.release(); + } + } + + public static LightUpdateS2CPacket makeLightUpdatePacket(int x, int z, LightData lightData, ByteBufAllocator alloc) { + final ByteBuf parent = alloc.heapBuffer(); + try { + final PacketByteBuf buf = new PacketByteBuf(parent); + buf.writeVarInt(x); + buf.writeVarInt(z); + lightData.write(buf); + return new LightUpdateS2CPacket(buf); + } finally { + parent.release(); + } + } + +} diff --git a/src/main/java/com/ishland/packumulator/common/s2c/chunkupdate/ChunkPendingChanges.java b/src/main/java/com/ishland/packumulator/common/s2c/chunkupdate/ChunkPendingChanges.java new file mode 100644 index 0000000..c30b970 --- /dev/null +++ b/src/main/java/com/ishland/packumulator/common/s2c/chunkupdate/ChunkPendingChanges.java @@ -0,0 +1,181 @@ +package com.ishland.packumulator.common.s2c.chunkupdate; + +import com.ishland.packumulator.common.PacketWrapper; +import com.ishland.packumulator.common.s2c.FutureUtil; +import com.ishland.packumulator.mixin.access.IChunkDeltaUpdateS2CPacket; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelPromise; +import io.netty.util.concurrent.Future; +import io.netty.util.concurrent.PromiseCombiner; +import it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap; +import it.unimi.dsi.fastutil.longs.Long2ReferenceLinkedOpenHashMap; +import it.unimi.dsi.fastutil.objects.ObjectArrayFIFOQueue; +import it.unimi.dsi.fastutil.objects.ReferenceArrayList; +import it.unimi.dsi.fastutil.shorts.Short2ReferenceLinkedOpenHashMap; +import it.unimi.dsi.fastutil.shorts.ShortSet; +import net.minecraft.block.BlockState; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; +import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket; +import net.minecraft.network.packet.s2c.play.ChunkData; +import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket; +import net.minecraft.network.packet.s2c.play.ChunkDeltaUpdateS2CPacket; +import net.minecraft.network.packet.s2c.play.LightData; +import net.minecraft.network.packet.s2c.play.LightUpdateS2CPacket; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; +import net.minecraft.util.math.ChunkSectionPos; +import org.jetbrains.annotations.Nullable; + +public class ChunkPendingChanges { + + private final long pos; + private boolean initialPacketSent = false; + private ChunkData pendingChunkData = null; + private ChannelPromise pendingChunkDataPromise = null; + private LightData pendingLightData = null; + private ChannelPromise pendingLightDataPromise = null; + private final Int2ReferenceLinkedOpenHashMap pendingDeltaUpdates = new Int2ReferenceLinkedOpenHashMap<>(); + private final Long2ReferenceLinkedOpenHashMap> blockEntityUpdates = new Long2ReferenceLinkedOpenHashMap<>(); + private final ObjectArrayFIFOQueue>> extraPackets = new ObjectArrayFIFOQueue<>(); + + public ChunkPendingChanges(long pos) { + this.pos = pos; + } + + @Nullable + public PacketWrapper> producePacket(ChannelHandlerContext ctx) { + if (this.pendingChunkData != null) { + assert this.pendingLightData != null; + final ChunkDataS2CPacket packet = ChunkDataUtil.makeChunkDataPacket(ChunkPos.getPackedX(this.pos), ChunkPos.getPackedZ(this.pos), this.pendingChunkData, this.pendingLightData, ctx.alloc()); + final ChannelPromise promise = ctx.newPromise(); + if (this.pendingChunkDataPromise != null) { + FutureUtil.chainPromises(promise, this.pendingChunkDataPromise); + } + if (this.pendingLightDataPromise != null) { + FutureUtil.chainPromises(promise, this.pendingLightDataPromise); + } + this.pendingChunkData = null; + this.pendingLightData = null; + this.pendingChunkDataPromise = null; + this.pendingLightDataPromise = null; + this.initialPacketSent = true; + return new PacketWrapper<>(packet, promise); + } + + if (!this.initialPacketSent) return null; + + if (this.pendingLightData != null) { + final LightUpdateS2CPacket packet = ChunkDataUtil.makeLightUpdatePacket(ChunkPos.getPackedX(this.pos), ChunkPos.getPackedZ(this.pos), this.pendingLightData, ctx.alloc()); + final ChannelPromise promise = this.pendingLightDataPromise; + this.pendingLightData = null; + this.pendingLightDataPromise = null; + return new PacketWrapper<>(packet, promise != null ? promise : ctx.newPromise()); + } + + while (!this.pendingDeltaUpdates.isEmpty()) { + final SectionedPendingDeltaUpdate deltaUpdate = this.pendingDeltaUpdates.removeFirst(); + final PacketWrapper> packet = deltaUpdate.producePacket(ctx); + if (packet != null) return packet; + } + + if (!this.blockEntityUpdates.isEmpty()) { + return this.blockEntityUpdates.removeFirst(); + } + + if (!this.extraPackets.isEmpty()) { + return this.extraPackets.dequeue(); + } + + return null; + } + + public void consume(ChunkData chunkData, ChannelPromise promise) { + this.pendingChunkData = chunkData; + if (this.pendingChunkDataPromise != null) this.pendingChunkDataPromise.trySuccess(); + this.pendingChunkDataPromise = promise; + } + + public void consume(LightData lightData, ChannelPromise promise) { + if (this.pendingLightData == null) { + this.pendingLightData = lightData; + if (this.pendingLightDataPromise != null) this.pendingLightDataPromise.trySuccess(); + this.pendingLightDataPromise = promise; + } else { + ChunkDataUtil.mergeLightData( + this.pendingLightData.getInitedBlock(), this.pendingLightData.getUninitedBlock(), this.pendingLightData.getBlockNibbles(), + lightData.getInitedBlock(), lightData.getUninitedBlock(), lightData.getBlockNibbles() + ); + ChunkDataUtil.mergeLightData( + this.pendingLightData.getInitedSky(), this.pendingLightData.getUninitedSky(), this.pendingLightData.getSkyNibbles(), + lightData.getInitedSky(), lightData.getUninitedSky(), lightData.getSkyNibbles() + ); + if (this.pendingLightDataPromise != null) { + FutureUtil.chainPromises(this.pendingLightDataPromise, promise); + } else { + this.pendingLightDataPromise = promise; + } + } + } + + public void consume(ChunkDeltaUpdateS2CPacket packet, ChannelPromise promise) { + final ChunkSectionPos sectionPos = ((IChunkDeltaUpdateS2CPacket) packet).getSectionPos(); + assert sectionPos.toChunkPos().toLong() == this.pos; + final SectionedPendingDeltaUpdate sectionedPendingDeltaUpdate = this.pendingDeltaUpdates.computeIfAbsent(sectionPos.getSectionY(), SectionedPendingDeltaUpdate::new); + packet.visitUpdates(sectionedPendingDeltaUpdate::consume); + sectionedPendingDeltaUpdate.promises.add(promise); + } + + public void consume(BlockPos pos, BlockState state, ChannelPromise promise) { + assert ChunkPos.toLong(pos) == this.pos; + final int sectionY = ChunkSectionPos.getSectionCoord(pos.getY()); + final SectionedPendingDeltaUpdate sectionedPendingDeltaUpdate = this.pendingDeltaUpdates.computeIfAbsent(sectionY, SectionedPendingDeltaUpdate::new); + sectionedPendingDeltaUpdate.consume(pos, state); + sectionedPendingDeltaUpdate.promises.add(promise); + } + + public void consume(BlockEntityUpdateS2CPacket packet, ChannelPromise promise) { + assert ChunkPos.toLong(packet.getPos()) == this.pos; + this.blockEntityUpdates.putAndMoveToLast(packet.getPos().asLong(), new PacketWrapper<>(packet, promise)); + } + + public void consumeRaw(Packet packet, ChannelPromise promise) { + this.extraPackets.enqueue(new PacketWrapper<>(packet, promise)); + } + + public boolean isInitialPacketSent() { + return this.initialPacketSent; + } + + private class SectionedPendingDeltaUpdate { + private final int y; + public final Short2ReferenceLinkedOpenHashMap updates = new Short2ReferenceLinkedOpenHashMap<>(); + public final ReferenceArrayList promises = new ReferenceArrayList<>(); + + private SectionedPendingDeltaUpdate(int y) { + this.y = y; + } + + public void consume(BlockPos pos, BlockState state) { + assert ChunkSectionPos.getSectionCoord(pos.getY()) == this.y; + this.updates.put(ChunkSectionPos.packLocal(pos), state); + } + + public PacketWrapper> producePacket(ChannelHandlerContext ctx) { + if (updates.isEmpty()) return null; + final ChunkDeltaUpdateS2CPacket packet = new ChunkDeltaUpdateS2CPacket( + ChunkSectionPos.from(ChunkPos.getPackedX(ChunkPendingChanges.this.pos), y, ChunkPos.getPackedZ(ChunkPendingChanges.this.pos)), + ShortSet.of(), + null + ); + ((IChunkDeltaUpdateS2CPacket) packet).setPositions(this.updates.keySet().toShortArray()); + ((IChunkDeltaUpdateS2CPacket) packet).setBlockStates(this.updates.values().toArray(BlockState[]::new)); + final ChannelPromise promise = ctx.newPromise(); + FutureUtil.chainPromises(promise, this.promises.toArray(ChannelPromise[]::new)); + this.updates.clear(); + this.promises.clear(); + return new PacketWrapper<>(packet, promise); + } + } + +} diff --git a/src/main/java/com/ishland/packumulator/common/s2c/chunkupdate/ChunkUpdateConsolidator.java b/src/main/java/com/ishland/packumulator/common/s2c/chunkupdate/ChunkUpdateConsolidator.java new file mode 100644 index 0000000..2b981e0 --- /dev/null +++ b/src/main/java/com/ishland/packumulator/common/s2c/chunkupdate/ChunkUpdateConsolidator.java @@ -0,0 +1,257 @@ +package com.ishland.packumulator.common.s2c.chunkupdate; + +import com.ishland.packumulator.common.PacketWrapper; +import com.ishland.packumulator.common.structs.DynamicPriorityQueue; +import com.ishland.packumulator.mixin.access.IChunkDeltaUpdateS2CPacket; +import io.netty.channel.ChannelDuplexHandler; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelPromise; +import io.netty.util.concurrent.Future; +import io.netty.util.concurrent.PromiseCombiner; +import it.unimi.dsi.fastutil.longs.Long2ReferenceLinkedOpenHashMap; +import it.unimi.dsi.fastutil.longs.Long2ReferenceMap; +import it.unimi.dsi.fastutil.longs.LongArrayList; +import it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.s2c.play.BlockBreakingProgressS2CPacket; +import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; +import net.minecraft.network.packet.s2c.play.BlockEventS2CPacket; +import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket; +import net.minecraft.network.packet.s2c.play.ChunkBiomeDataS2CPacket; +import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket; +import net.minecraft.network.packet.s2c.play.ChunkDeltaUpdateS2CPacket; +import net.minecraft.network.packet.s2c.play.ChunkLoadDistanceS2CPacket; +import net.minecraft.network.packet.s2c.play.ChunkRenderDistanceCenterS2CPacket; +import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket; +import net.minecraft.network.packet.s2c.play.LightUpdateS2CPacket; +import net.minecraft.network.packet.s2c.play.UnloadChunkS2CPacket; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; +import net.minecraft.util.math.ChunkSectionPos; +import net.minecraft.util.math.MathHelper; +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; + +public class ChunkUpdateConsolidator extends ChannelDuplexHandler { + + private static final int MAX_CONCURRENT_PACKETS = 64; + private static final int PRIORITY_COUNT = 256; + private static final AtomicBoolean issuedWarning = new AtomicBoolean(false); + + private ChannelHandlerContext ctx; + private final Long2ReferenceLinkedOpenHashMap chunks = new Long2ReferenceLinkedOpenHashMap<>(); + private final DynamicPriorityQueue priorityQueue = new DynamicPriorityQueue<>(PRIORITY_COUNT); + private final AtomicInteger packetsInProgress = new AtomicInteger(0); + private int centerX = 0; + private int centerZ = 0; + private int viewDistance = 3; + + @Override + public void handlerAdded(ChannelHandlerContext ctx) throws Exception { + super.handlerAdded(ctx); + this.ctx = ctx; + } + + @Override + public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) { + if (msg instanceof GameJoinS2CPacket packet) { + this.viewDistance = packet.viewDistance(); + this.handleChunkChanges(); + } else if (msg instanceof ChunkLoadDistanceS2CPacket packet) { + this.viewDistance = packet.getDistance(); + this.handleChunkChanges(); + } else if (msg instanceof ChunkRenderDistanceCenterS2CPacket packet) { + this.centerX = packet.getChunkX(); + this.centerZ = packet.getChunkZ(); + this.handleChunkChanges(); + } else if (msg instanceof UnloadChunkS2CPacket packet) { + final ChunkPendingChanges removed = this.chunks.remove(ChunkPos.toLong(packet.getX(), packet.getZ())); + if (removed != null) { + this.priorityQueue.remove(removed); + } + if (removed == null || !removed.isInitialPacketSent()) { + promise.trySuccess(); + return; // no need to send unload + } + } else if (msg instanceof ChunkDataS2CPacket packet) { + if (!this.isWithinViewDistance(packet.getX(), packet.getZ())) { + System.err.println("Discarding chunk [%d, %d] since it isn't within view distance".formatted(packet.getX(), packet.getZ())); + promise.trySuccess(); + return; + } + final ChunkPendingChanges chunkPendingChanges = this.getPendingChanges(packet.getX(), packet.getZ()); + chunkPendingChanges.consume(packet.getChunkData(), promise); + chunkPendingChanges.consume(packet.getLightData(), promise); + return; + } else if (msg instanceof LightUpdateS2CPacket packet) { + if (!this.isWithinViewDistance(packet.getChunkX(), packet.getChunkZ())) { + promise.trySuccess(); + return; + } + final ChunkPendingChanges chunkPendingChanges = this.getPendingChanges(packet.getChunkX(), packet.getChunkZ()); + chunkPendingChanges.consume(packet.getData(), promise); + return; + } else if (msg instanceof ChunkDeltaUpdateS2CPacket packet) { + final ChunkSectionPos sectionPos = ((IChunkDeltaUpdateS2CPacket) packet).getSectionPos(); + if (!this.isWithinViewDistance(sectionPos.getSectionX(), sectionPos.getSectionZ())) { + promise.trySuccess(); + return; + } + final ChunkPendingChanges chunkPendingChanges = this.getPendingChanges(sectionPos.getSectionX(), sectionPos.getSectionZ()); + chunkPendingChanges.consume(packet, promise); + return; + } else if (msg instanceof BlockUpdateS2CPacket packet) { + if (!this.isWithinViewDistance(packet.getPos())) { + promise.trySuccess(); + return; + } + final ChunkPendingChanges chunkPendingChanges = this.getPendingChanges(packet.getPos()); + chunkPendingChanges.consume(packet.getPos(), packet.getState(), promise); + return; + } else if (msg instanceof BlockEntityUpdateS2CPacket packet) { + if (!this.isWithinViewDistance(packet.getPos())) { + promise.trySuccess(); + return; + } + final ChunkPendingChanges chunkPendingChanges = this.getPendingChanges(packet.getPos()); + chunkPendingChanges.consume(packet, promise); + return; + } else if (msg instanceof BlockEventS2CPacket packet) { + if (!this.isWithinViewDistance(packet.getPos())) { + promise.trySuccess(); + return; + } + final ChunkPendingChanges chunkPendingChanges = this.getPendingChanges(packet.getPos()); + chunkPendingChanges.consumeRaw(packet, promise); + return; + } else if (msg instanceof BlockBreakingProgressS2CPacket packet) { + if (!this.isWithinViewDistance(packet.getPos())) { + promise.trySuccess(); + return; + } + final ChunkPendingChanges chunkPendingChanges = this.getPendingChanges(packet.getPos()); + chunkPendingChanges.consumeRaw(packet, promise); + return; + } else if (msg instanceof ChunkBiomeDataS2CPacket packet) { + ArrayList newList = new ArrayList<>(packet.chunkBiomeData().size()); + final PromiseCombiner combiner = new PromiseCombiner(ctx.executor()); + for (ChunkBiomeDataS2CPacket.Serialized serialized : packet.chunkBiomeData()) { + if (this.chunks.containsKey(serialized.pos().toLong())) { + newList.add(serialized); + } else { + if (!this.isWithinViewDistance(serialized.pos().x, serialized.pos().z)) { + continue; + } + final ChunkPendingChanges chunkPendingChanges = this.getPendingChanges(serialized.pos().x, serialized.pos().z); + final ChannelPromise promise1 = ctx.newPromise(); + chunkPendingChanges.consumeRaw(new ChunkBiomeDataS2CPacket(List.of(serialized)), promise1); + combiner.add((Future) promise1); + } + } + if (!newList.isEmpty()) { + final ChannelPromise promise1 = ctx.newPromise(); + ctx.write(new ChunkBiomeDataS2CPacket(Collections.unmodifiableList(newList)), promise1); + combiner.add((Future) promise1); + } + combiner.finish(promise); + return; + } + ctx.write(msg, promise); + } + + @Override + public void flush(ChannelHandlerContext ctx) { + ctx.flush(); + this.sendPackets(ctx, false); + } + + @Override + public void channelWritabilityChanged(ChannelHandlerContext ctx) { + ctx.fireChannelWritabilityChanged(); + if (false) { + ctx.channel().eventLoop().submit(() -> this.sendPackets(ctx, false)); +// ctx.flush(); +// this.sendPackets(ctx, false); + } + } + + @Override + public void handlerRemoved(ChannelHandlerContext ctx) throws Exception { + super.handlerRemoved(ctx); + this.sendPackets(ctx, true); + } + + private void sendPackets(ChannelHandlerContext ctx, boolean ignoreWritability) { + ChunkPendingChanges changes; + int burst = 0; + while ((ignoreWritability || (burst ++ < MAX_CONCURRENT_PACKETS && this.isWritableToChannel(ctx))) && (changes = this.priorityQueue.peek()) != null) { + final PacketWrapper> wrapper = changes.producePacket(ctx); + if (wrapper != null) { + ctx.write(wrapper.msg(), wrapper.promise()); + this.packetsInProgress.incrementAndGet(); + wrapper.promise().addListener(future -> this.packetsInProgress.decrementAndGet()); + } else { + this.priorityQueue.dequeue(); + } + } +// if (!ctx.channel().isWritable()) { +// System.out.println(this.priorityQueue.size()); +// } + } + + private boolean isWritableToChannel(ChannelHandlerContext ctx) { + return ctx.channel().isWritable() && this.packetsInProgress.get() < MAX_CONCURRENT_PACKETS; + } + + private ChunkPendingChanges getPendingChanges(BlockPos pos) { + return this.getPendingChanges(ChunkSectionPos.getSectionCoord(pos.getX()), ChunkSectionPos.getSectionCoord(pos.getZ())); + } + + private ChunkPendingChanges getPendingChanges(int x, int z) { + final ChunkPendingChanges changes = this.chunks.computeIfAbsent(ChunkPos.toLong(x, z), ChunkPendingChanges::new); + if (!this.priorityQueue.contains(changes)) + this.priorityQueue.enqueue(changes, this.distanceToCenter(x, z)); + return changes; + } + + private boolean isWithinViewDistance(BlockPos pos) { + return this.isWithinViewDistance(ChunkSectionPos.getSectionCoord(pos.getX()), ChunkSectionPos.getSectionCoord(pos.getZ())); + } + + private boolean isWithinViewDistance(int x, int z) { + return this.distanceToCenter(x, z) <= this.viewDistance; + } + + private void handleChunkChanges() { + if (this.viewDistance >= PRIORITY_COUNT) { + if (issuedWarning.compareAndSet(false, true)) { + System.err.println("Packumulator Warning: ChunkUpdateConsolidator is not optimized to handle view distances >= 255"); + } + } + final ObjectBidirectionalIterator> iterator = this.chunks.long2ReferenceEntrySet().fastIterator(); + LongArrayList pendingRemovals = new LongArrayList(); + while (iterator.hasNext()) { + final Long2ReferenceMap.Entry entry = iterator.next(); + final int distance = distanceToCenter(ChunkPos.getPackedX(entry.getLongKey()), ChunkPos.getPackedZ(entry.getLongKey())); + if (distance > this.viewDistance) { + pendingRemovals.add(entry.getLongKey()); + } else { + this.priorityQueue.changePriority(entry.getValue(), distance); + } + } + for (long pos : pendingRemovals) { + this.write(this.ctx, new UnloadChunkS2CPacket(ChunkPos.getPackedX(pos), ChunkPos.getPackedZ(pos)), this.ctx.newPromise()); + } + } + + private int distanceToCenter(int x, int z) { + final int distance = Math.max(Math.abs(x - this.centerX), Math.abs(z - this.centerZ)); + return MathHelper.clamp(distance, 0, PRIORITY_COUNT - 1); + } + +} diff --git a/src/main/java/com/ishland/packumulator/common/s2c/package-info.java b/src/main/java/com/ishland/packumulator/common/s2c/package-info.java new file mode 100644 index 0000000..75da992 --- /dev/null +++ b/src/main/java/com/ishland/packumulator/common/s2c/package-info.java @@ -0,0 +1 @@ +package com.ishland.packumulator.common.s2c; \ No newline at end of file diff --git a/src/main/java/com/ishland/packumulator/common/structs/DynamicPriorityQueue.java b/src/main/java/com/ishland/packumulator/common/structs/DynamicPriorityQueue.java new file mode 100644 index 0000000..caaae85 --- /dev/null +++ b/src/main/java/com/ishland/packumulator/common/structs/DynamicPriorityQueue.java @@ -0,0 +1,97 @@ +package com.ishland.packumulator.common.structs; + +import it.unimi.dsi.fastutil.objects.Object2IntMap; +import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet; + +/** + * A priority queue with fixed number of priorities and allows changing priorities of elements. + * Not thread-safe. + * + * @param the type of elements held in this collection + */ +public class DynamicPriorityQueue { + + private final ObjectLinkedOpenHashSet[] priorities; + private final Object2IntMap priorityMap = new Object2IntOpenHashMap<>(); + + private int currentMinPriority = 0; + + public DynamicPriorityQueue(int priorityCount) { + //noinspection unchecked + this.priorities = new ObjectLinkedOpenHashSet[priorityCount]; + for (int i = 0; i < priorityCount; i++) { + this.priorities[i] = new ObjectLinkedOpenHashSet<>(); + } + } + + public void enqueue(E element, int priority) { + if (priority < 0 || priority >= priorities.length) + throw new IllegalArgumentException("Priority out of range"); + if (priorityMap.containsKey(element)) + throw new IllegalArgumentException("Element already in queue"); + + priorities[priority].add(element); + priorityMap.put(element, priority); + if (priority < currentMinPriority) + currentMinPriority = priority; + } + + public void changePriority(E element, int priority) { + if (priority < 0 || priority >= priorities.length) + throw new IllegalArgumentException("Priority out of range"); + if (!priorityMap.containsKey(element)) return; // ignored + + int oldPriority = priorityMap.getInt(element); + if (oldPriority == priority) return; // nothing to do + + priorities[oldPriority].remove(element); + priorities[priority].add(element); + priorityMap.put(element, priority); + + if (priority < currentMinPriority) currentMinPriority = priority; + } + + public E dequeue() { + while (currentMinPriority < priorities.length) { + ObjectLinkedOpenHashSet priority = this.priorities[currentMinPriority]; + if (priority.isEmpty()) { + currentMinPriority++; + continue; + } + E element = priority.removeFirst(); + priorityMap.removeInt(element); + return element; + } + return null; + } + + public E peek() { + while (currentMinPriority < priorities.length) { + ObjectLinkedOpenHashSet priority = this.priorities[currentMinPriority]; + if (priority.isEmpty()) { + currentMinPriority++; + continue; + } + return priority.first(); + } + return null; + } + + public boolean contains(E element) { + return priorityMap.containsKey(element); + } + + public void remove(E element) { + if (!priorityMap.containsKey(element)) + return; // ignore + int priority = priorityMap.getInt(element); + priorities[priority].remove(element); + priorityMap.removeInt(element); + } + + public int size() { + return priorityMap.size(); + } + +} diff --git a/src/main/java/com/ishland/packumulator/mixin/MixinClientConnection.java b/src/main/java/com/ishland/packumulator/mixin/MixinClientConnection.java new file mode 100644 index 0000000..8f0f719 --- /dev/null +++ b/src/main/java/com/ishland/packumulator/mixin/MixinClientConnection.java @@ -0,0 +1,22 @@ +package com.ishland.packumulator.mixin; + +import com.ishland.packumulator.common.s2c.chunkupdate.ChunkUpdateConsolidator; +import io.netty.channel.ChannelPipeline; +import io.netty.handler.flush.FlushConsolidationHandler; +import net.minecraft.network.ClientConnection; +import net.minecraft.network.NetworkSide; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(ClientConnection.class) +public class MixinClientConnection { + + @Inject(method = "addHandlers", at = @At("RETURN")) + private static void onAddHandlers(ChannelPipeline pipeline, NetworkSide side, CallbackInfo ci) { + pipeline.addLast("ChunkUpdateConsolidator", new ChunkUpdateConsolidator()); + pipeline.addLast(new FlushConsolidationHandler()); + } + +} diff --git a/src/main/java/com/ishland/packumulator/mixin/access/IChunkDeltaUpdateS2CPacket.java b/src/main/java/com/ishland/packumulator/mixin/access/IChunkDeltaUpdateS2CPacket.java new file mode 100644 index 0000000..27d1a5a --- /dev/null +++ b/src/main/java/com/ishland/packumulator/mixin/access/IChunkDeltaUpdateS2CPacket.java @@ -0,0 +1,24 @@ +package com.ishland.packumulator.mixin.access; + +import net.minecraft.block.BlockState; +import net.minecraft.network.packet.s2c.play.ChunkDeltaUpdateS2CPacket; +import net.minecraft.util.math.ChunkSectionPos; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(ChunkDeltaUpdateS2CPacket.class) +public interface IChunkDeltaUpdateS2CPacket { + + @Accessor + ChunkSectionPos getSectionPos(); + + @Mutable + @Accessor + void setPositions(short[] positions); + + @Mutable + @Accessor + void setBlockStates(BlockState[] blockStates); + +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..521e066 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,28 @@ +{ + "schemaVersion": 1, + "id": "packumulator", + "version": "${version}", + "name": "Packumulator", + "description": "", + "authors": [ + "ishland" + ], + "contact": { + "sources": "https://github.com/FabricMC/fabric-example-mod" + }, + "license": "MIT", + "environment": "*", + "entrypoints": { + "main": [ + "com.ishland.packumulator.TheMod" + ] + }, + "mixins": [ + "packumulator.mixins.json" + ], + "depends": { + "fabricloader": ">=0.14.21", + "minecraft": "~1.20.1", + "java": ">=17" + } +} \ No newline at end of file diff --git a/src/main/resources/packumulator.mixins.json b/src/main/resources/packumulator.mixins.json new file mode 100644 index 0000000..787fd73 --- /dev/null +++ b/src/main/resources/packumulator.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "package": "com.ishland.packumulator.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "MixinClientConnection", + "access.IChunkDeltaUpdateS2CPacket" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file