commit b4bf12e04f5b9674d2a16d7a0d2c56f04f2da501 Author: denis Date: Sat Jan 24 21:46:14 2026 +0200 Initial useful commit diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..097f9f9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..8fc3827 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,30 @@ +# 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: + runs-on: ubuntu-24.04 + steps: + - name: checkout repository + uses: actions/checkout@v4 + - name: validate gradle wrapper + uses: gradle/actions/wrapper-validation@v4 + - name: setup jdk + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'microsoft' + - name: make gradle wrapper executable + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + uses: actions/upload-artifact@v4 + 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/README.md b/README.md new file mode 100644 index 0000000..3348f9a --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# Useful Mod \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..4db12ee --- /dev/null +++ b/build.gradle @@ -0,0 +1,86 @@ +plugins { + id 'net.fabricmc.fabric-loom-remap' version "${loom_version}" + 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. +} + +loom { + splitEnvironmentSourceSets() + + mods { + "useful" { + sourceSet sourceSets.main + sourceSet sourceSets.client + } + } + +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings loom.officialMojangMappings() + 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}" + +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": inputs.properties.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 21 +} + +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_21 + targetCompatibility = JavaVersion.VERSION_21 +} + +jar { + inputs.property "archivesName", project.base.archivesName +} + +// configure the maven publication +publishing { + publications { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + 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. + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..147378b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,20 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349 +org.gradle.configuration-cache=false + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.21.11 +loader_version=0.18.2 +loom_version=1.14-SNAPSHOT + +# Mod Properties +mod_version=1.0.0 +maven_group=de.qilk +archives_base_name=usefulmod + +# Dependencies +fabric_version=0.139.4+1.21.11 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f8e1ee3 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..23449a2 --- /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-9.2.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..adff685 --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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/platforms/jvm/plugins-application/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##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || 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 + + + +# 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=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=SC2039,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" ) + + 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 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" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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..c4bdd3a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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. 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 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +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 + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +: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..75c4d72 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/client/java/de/qilk/UsefulModClient.java b/src/client/java/de/qilk/UsefulModClient.java new file mode 100644 index 0000000..a661c33 --- /dev/null +++ b/src/client/java/de/qilk/UsefulModClient.java @@ -0,0 +1,35 @@ +package de.qilk; + +import com.mojang.brigadier.LiteralMessage; +import com.mojang.brigadier.arguments.*; +import com.mojang.brigadier.exceptions.*; +import de.qilk.util.MiniCommandCorePlaceBlock; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; +import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; + +public class UsefulModClient implements ClientModInitializer { + + private final MiniCommandCorePlaceBlock MiniCommandCore = new MiniCommandCorePlaceBlock(Minecraft.getInstance()); + + @Override + public void onInitializeClient() { + // This entrypoint is suitable for setting up client-specific logic, such as rendering. + final SimpleCommandExceptionType MiniCoreCommandException = new SimpleCommandExceptionType(new LiteralMessage("Couldn't run the command. Make sure you're in Creative mode, have Operator permissions and you are not above/below the max/min world height.")); + ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> { + dispatcher.register(ClientCommandManager.literal("minicore") + .then(ClientCommandManager.argument("command", StringArgumentType.greedyString()) + .executes(context -> { + final String command = StringArgumentType.getString(context, "command"); + final BlockPos blockPos = MiniCommandCore.run(command); + if(blockPos == null) throw MiniCoreCommandException.create(); + return 1; + }) + ) + ); + }); + } +} \ No newline at end of file diff --git a/src/client/java/de/qilk/mixin/client/ChatScreenMixin.java b/src/client/java/de/qilk/mixin/client/ChatScreenMixin.java new file mode 100644 index 0000000..9796b59 --- /dev/null +++ b/src/client/java/de/qilk/mixin/client/ChatScreenMixin.java @@ -0,0 +1,40 @@ +package de.qilk.mixin.client; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.client.gui.screens.ChatScreen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(ChatScreen.class) +public abstract class ChatScreenMixin { + @Shadow + protected EditBox input; + + + @Inject(method = "init", at = @At("RETURN")) + private void init(final CallbackInfo ci) { + input.setMaxLength(Integer.MAX_VALUE); + } + + @Inject(method = "handleChatInput", at = @At("HEAD"), cancellable = true) + private void handleChatInput(final String msg, final boolean addToRecent, final CallbackInfo ci) { + final Minecraft client = Minecraft.getInstance(); + + if (addToRecent) { + client.gui.getChat().addRecentChat(msg); + } + + if (client.player == null) return; + + if (msg.startsWith("/")) { + client.player.connection.sendCommand(msg.substring(1)); + } else { + client.player.connection.sendChat(msg); + } + ci.cancel(); + } +} \ No newline at end of file diff --git a/src/client/java/de/qilk/mixin/client/ClientLevelAccessor.java b/src/client/java/de/qilk/mixin/client/ClientLevelAccessor.java new file mode 100644 index 0000000..727c701 --- /dev/null +++ b/src/client/java/de/qilk/mixin/client/ClientLevelAccessor.java @@ -0,0 +1,12 @@ +package de.qilk.mixin.client; + +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.multiplayer.prediction.BlockStatePredictionHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(ClientLevel.class) +public interface ClientLevelAccessor { + @Accessor(value = "blockStatePredictionHandler") + BlockStatePredictionHandler getBlockStatePredictionHandler (); +} \ No newline at end of file diff --git a/src/client/java/de/qilk/mixin/client/ConnectionMixin.java b/src/client/java/de/qilk/mixin/client/ConnectionMixin.java new file mode 100644 index 0000000..60f30f3 --- /dev/null +++ b/src/client/java/de/qilk/mixin/client/ConnectionMixin.java @@ -0,0 +1,34 @@ +package de.qilk.mixin.client; + +import net.minecraft.network.Connection; +import net.minecraft.network.PacketListener; +import net.minecraft.network.protocol.Packet; +import net.minecraft.network.protocol.game.ClientboundLevelParticlesPacket; +import org.jetbrains.annotations.NotNull; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + + +@Mixin(Connection.class) +public class ConnectionMixin { + @Unique + private static final double MAX_PARTICLES_PER_PACKET = 1000; + + @Inject(method = "genericsFtw", at = @At("HEAD"), cancellable = true) + private static void genericsFtw( + final Packet<@NotNull T> packet, + final PacketListener packetListener, + final CallbackInfo ci + ) { + + if ( + packet instanceof final ClientboundLevelParticlesPacket t_packet + && t_packet.getCount() > MAX_PARTICLES_PER_PACKET + ) { + ci.cancel(); + } + } +} \ No newline at end of file diff --git a/src/client/java/de/qilk/mixin/client/StringUtilMixin.java b/src/client/java/de/qilk/mixin/client/StringUtilMixin.java new file mode 100644 index 0000000..363acdf --- /dev/null +++ b/src/client/java/de/qilk/mixin/client/StringUtilMixin.java @@ -0,0 +1,15 @@ +package de.qilk.mixin.client; + +import net.minecraft.util.StringUtil; +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.CallbackInfoReturnable; + +@Mixin(StringUtil.class) +public class StringUtilMixin { + @Inject(method = "isAllowedChatCharacter", at = @At("RETURN"), cancellable = true) + private static void isAllowedChatCharacter (final int ch, final CallbackInfoReturnable cir) { + cir.setReturnValue(true); + } +} \ No newline at end of file diff --git a/src/client/java/de/qilk/mixin/client/TranslatableContentsMixin.java b/src/client/java/de/qilk/mixin/client/TranslatableContentsMixin.java new file mode 100644 index 0000000..ac033d7 --- /dev/null +++ b/src/client/java/de/qilk/mixin/client/TranslatableContentsMixin.java @@ -0,0 +1,70 @@ +package de.qilk.mixin.client; + +//import net.minecraft.server.MinecraftServer; +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; +import com.llamalad7.mixinextras.sugar.Local; +import com.mojang.serialization.Codec; +import de.qilk.util.DepthAwareCodec; +import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; +import net.minecraft.locale.Language; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.FormattedText; +import net.minecraft.network.chat.contents.TranslatableContents; +import net.minecraft.network.chat.contents.TranslatableFormatException; +import org.jetbrains.annotations.Nullable; +import org.objectweb.asm.Opcodes; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(TranslatableContents.class) +public abstract class TranslatableContentsMixin { + @Shadow + private @Nullable Language decomposedWith; + + @Unique + private static final int MAX_TRANSLATE_DEPTH = 4; + + @Unique + private static final int MAX_STRING_REFERENCES = 4; + @Unique + private static final int MAX_COMPONENT_REFERENCES = 2; + + @Unique + private final ThreadLocal references = + ThreadLocal.withInitial(() -> new Int2IntOpenHashMap(4)); + + @ModifyExpressionValue(method = "", + at = @At(value = "FIELD", target = "Lnet/minecraft/network/chat/ComponentSerialization;CODEC" + + ":Lcom/mojang/serialization/Codec;", opcode = Opcodes.GETSTATIC)) + private static Codec clinit$CODEC(final Codec original) { + return new DepthAwareCodec<>(original, MAX_TRANSLATE_DEPTH); + } + + @Inject(method = "decompose", at = @At(value = "TAIL")) + private void decomposeTemplate(final CallbackInfo ci, final @Local Language language) { + if (language != this.decomposedWith) references.remove(); // Free up Int2IntOpenHashMap to save memory + } + + @Inject(method = "getArgument", at = @At(value = "RETURN", ordinal = 0)) + private void getArgument$component(final int i, final CallbackInfoReturnable cir) { + final int refCount = references.get().compute(i, (k, v) -> v == null ? 1 : v + 1); + if (refCount > MAX_COMPONENT_REFERENCES) { + throw new TranslatableFormatException((TranslatableContents) (Object) this, + "Argument " + i + " referenced too many times"); + } + } + + @Inject(method = "getArgument", at = @At(value = "RETURN", ordinal = 1)) + private void getArgument$string(final int i, final CallbackInfoReturnable cir) { + final int refCount = references.get().compute(i, (k, v) -> v == null ? 1 : v + 1); + if (refCount > MAX_STRING_REFERENCES) { + throw new TranslatableFormatException((TranslatableContents) (Object) this, + "Argument " + i + " referenced too many times"); + } + } +} \ No newline at end of file diff --git a/src/client/java/de/qilk/util/MiniCommandCorePlaceBlock.java b/src/client/java/de/qilk/util/MiniCommandCorePlaceBlock.java new file mode 100644 index 0000000..c935179 --- /dev/null +++ b/src/client/java/de/qilk/util/MiniCommandCorePlaceBlock.java @@ -0,0 +1,217 @@ +package de.qilk.util; + +import net.minecraft.client.Minecraft; +import de.qilk.mixin.client.ClientLevelAccessor; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.client.multiplayer.MultiPlayerGameMode; +import net.minecraft.client.multiplayer.prediction.BlockStatePredictionHandler; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.component.DataComponentMap; +import net.minecraft.core.component.DataComponents; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.Connection; +import net.minecraft.network.protocol.game.*; +import net.minecraft.tags.BlockTags; +import net.minecraft.util.Tuple; +import net.minecraft.util.Util; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.item.component.TypedEntityData; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.CommandBlock; +import net.minecraft.world.level.block.FallingBlock; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.CommandBlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.Property; +import net.minecraft.world.level.dimension.DimensionType; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.Vec3; +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; + + +public class MiniCommandCorePlaceBlock { + final Minecraft client; + + public MiniCommandCorePlaceBlock(final Minecraft client) { + this.client = client; + } + + public BlockPos run(final String command) { + final ClientPacketListener networkHandler = client.getConnection(); + if (networkHandler == null) return null; + + final Connection connection = networkHandler.getConnection(); + + final LocalPlayer player = client.player; + final ClientLevel world = client.level; + + if (player == null || world == null || !player.hasInfiniteMaterials()) return null; + + final DimensionType dimensionType = world.dimensionType(); + + final MultiPlayerGameMode interactionManager = client.gameMode; + if (interactionManager == null) return null; + + final Tuple<@NotNull BlockPos, @NotNull BlockState> pair = findBlockLocation(); + + if ( + pair == null + || pair.getA().getY() < dimensionType.minY() + || pair.getA().getY() > dimensionType.height() + dimensionType.minY() + ) { + return null; + } + + final BlockPos position = pair.getA(); + final BlockState oldBlockState = pair.getB(); + + final int freeHotBarSlot = player.getInventory().getFreeSlot(); + if (freeHotBarSlot == -1 || freeHotBarSlot > 8) { + return null; + } + final int slot = 36 + freeHotBarSlot; + + final int oldSelectedSlot = player.getInventory().getSelectedSlot(); + final ItemStack oldStack = player.getInventory().getItem(slot).copy(); + + final ItemStack commandBlock = new ItemStack(Items.COMMAND_BLOCK); + + connection.send(new ServerboundSetCreativeModeSlotPacket(slot, commandBlock)); + + if (oldSelectedSlot != freeHotBarSlot) { + connection.send(new ServerboundSetCarriedItemPacket(freeHotBarSlot)); + } + + try (final BlockStatePredictionHandler pendingUpdateManager = ((ClientLevelAccessor) world).getBlockStatePredictionHandler()) { + connection.send( + new ServerboundPlayerActionPacket( + ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, + position, + Direction.UP, + pendingUpdateManager.startPredicting().currentSequence() + ) + ); + connection.send( + new ServerboundUseItemOnPacket( + InteractionHand.MAIN_HAND, + BlockHitResult.miss( + new Vec3(position), + Direction.UP, + position + ), + pendingUpdateManager.startPredicting().currentSequence() + ) + ); + _run(command, position); + + CompletableFuture.delayedExecutor(1, TimeUnit.SECONDS).execute(() -> { + _run("setblock ~ ~ ~ " + _blockStateToStringWithProperties(oldBlockState), position); + }); + } + + if (oldSelectedSlot != freeHotBarSlot) { + connection.send(new ServerboundSetCarriedItemPacket(oldSelectedSlot)); + } + connection.send(new ServerboundSetCreativeModeSlotPacket(slot, oldStack)); + + return position; + } + + private Tuple<@NotNull BlockPos, @NotNull BlockState> findBlockLocation() { + final LocalPlayer player = client.player; + if (player == null) return null; + final BlockPos position = player.blockPosition(); + final AABB boundingBox = player.getBoundingBox(); + boundingBox.inflate(1.0); + for (int x = position.getX() - 2; x <= position.getX() + 2; x++) { + for (int y = position.getY() - 2; y <= position.getY() + 2; y++) { + for (int z = position.getZ() - 2; z <= position.getZ() + 2; z++) { + final BlockPos blockPos = new BlockPos(x, y, z); + if (!player.isWithinBlockInteractionRange(blockPos, 1.0)) continue; + if (boundingBox.intersects(new Vec3(blockPos), new Vec3(blockPos))) continue; + try (final Level level = player.level()) { + final BlockState blockState = level.getBlockState(blockPos); + if (blockState.getBlock() instanceof FallingBlock + || blockState.getBlock() instanceof CommandBlock) + continue; + final boolean replaceable = blockState.is(BlockTags.REPLACEABLE); + if ( + !replaceable + && !blockState.is(BlockTags.MINEABLE_WITH_AXE) + && !blockState.is(BlockTags.MINEABLE_WITH_HOE) + && !blockState.is(BlockTags.MINEABLE_WITH_SHOVEL) + && !blockState.is(BlockTags.MINEABLE_WITH_PICKAXE) + ) { + continue; + } + return new Tuple<>(blockPos, blockState); + } catch (final IOException ignored) { + } + } + } + } + + return null; + } + + public void _run(final String command, final BlockPos blockPos) { + if (command.length() > 32767) return; + + final ClientPacketListener networkHandler = client.getConnection(); + if (networkHandler == null) return; + + final Connection connection = networkHandler.getConnection(); + + connection.send( + new ServerboundSetCommandBlockPacket( + blockPos, + "", + CommandBlockEntity.Mode.REDSTONE, + false, + false, + false + ) + ); + + connection.send( + new ServerboundSetCommandBlockPacket( + blockPos, + command, + CommandBlockEntity.Mode.REDSTONE, + false, + false, + true + ) + ); + } + public String _blockStateToStringWithProperties(BlockState blockState) { + final StringBuilder blockString = new StringBuilder(BuiltInRegistries.BLOCK.getKey(blockState.getBlock()).toString()); + if (!blockState.getProperties().isEmpty()) { + blockString.append('['); + + for (final Property property : blockState.getProperties()) { + blockString.append(property.getName()) + .append('=') + .append(Util.getPropertyName(property, property.getPossibleValues().getLast())) // water[level=15] instead of water[level=0,level=1,....,level=15] + .append(','); + } + + blockString.deleteCharAt(blockString.length() - 1); + + blockString.append(']'); + } + return blockString.toString(); + } +} diff --git a/src/client/resources/useful.client.mixins.json b/src/client/resources/useful.client.mixins.json new file mode 100644 index 0000000..da7dc57 --- /dev/null +++ b/src/client/resources/useful.client.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "package": "de.qilk.mixin.client", + "compatibilityLevel": "JAVA_21", + "client": [ + "TranslatableContentsMixin", + "ConnectionMixin", + "ChatScreenMixin", + "StringUtilMixin", + + "ClientLevelAccessor" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/src/main/java/de/qilk/UsefulMod.java b/src/main/java/de/qilk/UsefulMod.java new file mode 100644 index 0000000..193885f --- /dev/null +++ b/src/main/java/de/qilk/UsefulMod.java @@ -0,0 +1,24 @@ +package de.qilk; + +import net.fabricmc.api.ModInitializer; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class UsefulMod implements ModInitializer { + public static final String MOD_ID = "useful"; + + // This logger is used to write text to the console and the log file. + // It is considered best practice to use your mod id as the logger's name. + // That way, it's clear which mod wrote info, warnings, and errors. + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); + + @Override + public void onInitialize() { + // This code runs as soon as Minecraft is in a mod-load-ready state. + // However, some things (like resources) may still be uninitialized. + // Proceed with mild caution. + + LOGGER.info("Useful Mod!"); + } +} \ No newline at end of file diff --git a/src/main/java/de/qilk/mixin/ServerCommonPacketListenerImplMixin.java b/src/main/java/de/qilk/mixin/ServerCommonPacketListenerImplMixin.java new file mode 100644 index 0000000..e1fd3f2 --- /dev/null +++ b/src/main/java/de/qilk/mixin/ServerCommonPacketListenerImplMixin.java @@ -0,0 +1,45 @@ +package de.qilk.mixin; + + +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import io.netty.channel.ChannelFutureListener; +import net.minecraft.network.protocol.Packet; +import net.minecraft.network.protocol.game.*; +import net.minecraft.server.network.ServerCommonPacketListenerImpl; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; + +import java.util.Set; + +@Mixin(ServerCommonPacketListenerImpl.class) +public abstract class ServerCommonPacketListenerImplMixin { + @Unique + private static final ChannelFutureListener EMPTY_FUTURE_LISTENER = channelFuture -> {}; + + @Unique + private static final Set>> FAIL_IGNORED_PACKETS = Set.of( + ClientboundSetTitleTextPacket.class, ClientboundSetSubtitleTextPacket.class, + ClientboundSetActionBarTextPacket.class, ClientboundSetPlayerTeamPacket.class, + ClientboundBossEventPacket.class, ClientboundSetObjectivePacket.class, + ClientboundLevelParticlesPacket.class, ClientboundSetEntityDataPacket.class, + ClientboundContainerSetContentPacket.class, ClientboundContainerSetSlotPacket.class, + ClientboundLevelChunkWithLightPacket.class, ClientboundBlockEntityDataPacket.class + ); + + @WrapOperation(method = "send(Lnet/minecraft/network/protocol/Packet;)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerCommonPacketListenerImpl;send" + + "(Lnet/minecraft/network/protocol/Packet;Lio/netty/channel/ChannelFutureListener;)V")) + private void send$send(final ServerCommonPacketListenerImpl instance, final Packet packet, + final @Nullable ChannelFutureListener channelFutureListener, + final Operation original) { + if (!FAIL_IGNORED_PACKETS.contains(packet.getClass()) || channelFutureListener != null) { + original.call(instance, packet, channelFutureListener); + return; + } + + original.call(instance, packet, EMPTY_FUTURE_LISTENER); + } +} \ No newline at end of file diff --git a/src/main/java/de/qilk/mixin/TranslatableContentsMixin.java b/src/main/java/de/qilk/mixin/TranslatableContentsMixin.java new file mode 100644 index 0000000..b6ed2fc --- /dev/null +++ b/src/main/java/de/qilk/mixin/TranslatableContentsMixin.java @@ -0,0 +1,70 @@ +package de.qilk.mixin; + +//import net.minecraft.server.MinecraftServer; +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; +import com.llamalad7.mixinextras.sugar.Local; +import com.mojang.serialization.Codec; +import de.qilk.util.DepthAwareCodec; +import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; +import net.minecraft.locale.Language; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.FormattedText; +import net.minecraft.network.chat.contents.TranslatableContents; +import net.minecraft.network.chat.contents.TranslatableFormatException; +import org.jetbrains.annotations.Nullable; +import org.objectweb.asm.Opcodes; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(TranslatableContents.class) +public abstract class TranslatableContentsMixin { + @Shadow + private @Nullable Language decomposedWith; + + @Unique + private static final int MAX_TRANSLATE_DEPTH = 4; + + @Unique + private static final int MAX_STRING_REFERENCES = 4; + @Unique + private static final int MAX_COMPONENT_REFERENCES = 2; + + @Unique + private final ThreadLocal references = + ThreadLocal.withInitial(() -> new Int2IntOpenHashMap(4)); + + @ModifyExpressionValue(method = "", + at = @At(value = "FIELD", target = "Lnet/minecraft/network/chat/ComponentSerialization;CODEC" + + ":Lcom/mojang/serialization/Codec;", opcode = Opcodes.GETSTATIC)) + private static Codec clinit$CODEC(final Codec original) { + return new DepthAwareCodec<>(original, MAX_TRANSLATE_DEPTH); + } + + @Inject(method = "decompose", at = @At(value = "TAIL")) + private void decomposeTemplate(final CallbackInfo ci, final @Local Language language) { + if (language != this.decomposedWith) references.remove(); // Free up Int2IntOpenHashMap to save memory + } + + @Inject(method = "getArgument", at = @At(value = "RETURN", ordinal = 0)) + private void getArgument$component(final int i, final CallbackInfoReturnable cir) { + final int refCount = references.get().compute(i, (k, v) -> v == null ? 1 : v + 1); + if (refCount > MAX_COMPONENT_REFERENCES) { + throw new TranslatableFormatException((TranslatableContents) (Object) this, + "Argument " + i + " referenced too many times"); + } + } + + @Inject(method = "getArgument", at = @At(value = "RETURN", ordinal = 1)) + private void getArgument$string(final int i, final CallbackInfoReturnable cir) { + final int refCount = references.get().compute(i, (k, v) -> v == null ? 1 : v + 1); + if (refCount > MAX_STRING_REFERENCES) { + throw new TranslatableFormatException((TranslatableContents) (Object) this, + "Argument " + i + " referenced too many times"); + } + } +} \ No newline at end of file diff --git a/src/main/java/de/qilk/util/DepthAwareCodec.java b/src/main/java/de/qilk/util/DepthAwareCodec.java new file mode 100644 index 0000000..517b8ff --- /dev/null +++ b/src/main/java/de/qilk/util/DepthAwareCodec.java @@ -0,0 +1,41 @@ +package de.qilk.util; + +import com.mojang.datafixers.util.Pair; +import com.mojang.serialization.Codec; +import com.mojang.serialization.DataResult; +import com.mojang.serialization.DynamicOps; + +public final class DepthAwareCodec implements Codec { + private final ThreadLocal depth = ThreadLocal.withInitial(() -> 0); + + private final Codec codec; + private final int maxDepth; + + public DepthAwareCodec(final Codec codec, final int maxDepth) { + this.codec = codec; + this.maxDepth = maxDepth; + } + + @Override + public DataResult encode(final T input, final DynamicOps ops, final S prefix) { + return codec.encode(input, ops, prefix); + } + + @Override + public DataResult> decode(final DynamicOps ops, final S input) { + final int newDepth = depth.get() + 1; + if (newDepth > this.maxDepth) return DataResult.error(() -> "Depth limit exceeded"); + depth.set(newDepth); + + try { + return codec.decode(ops, input); + } finally { + depth.set(depth.get() - 1); + } + } + + @Override + public String toString() { + return codec.toString(); + } +} \ No newline at end of file diff --git a/src/main/resources/assets/useful/icon.png b/src/main/resources/assets/useful/icon.png new file mode 100644 index 0000000..c963c22 Binary files /dev/null and b/src/main/resources/assets/useful/icon.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..e113d25 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,41 @@ +{ + "schemaVersion": 1, + "id": "useful", + "version": "${version}", + "name": "UsefulMod", + "description": "It's a mod of use.", + "authors": [ + "denis" + ], + "contact": { + "homepage": "https://git.qilk.de/denis/UsefulMod", + "sources": "https://git.qilk.de/denis/UsefulMod" + }, + "license": "CC0-1.0", + "icon": "assets/useful/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "de.qilk.UsefulMod" + ], + "client": [ + "de.qilk.UsefulModClient" + ] + }, + "mixins": [ + "useful.mixins.json", + { + "config": "useful.client.mixins.json", + "environment": "client" + } + ], + "depends": { + "fabricloader": ">=0.18.2", + "minecraft": "~1.21.11", + "java": ">=21", + "fabric-api": "*" + }, + "suggests": { + "another-mod": "*" + } +} \ No newline at end of file diff --git a/src/main/resources/useful.mixins.json b/src/main/resources/useful.mixins.json new file mode 100644 index 0000000..5f12c9d --- /dev/null +++ b/src/main/resources/useful.mixins.json @@ -0,0 +1,15 @@ +{ + "required": true, + "package": "de.qilk.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "TranslatableContentsMixin", + "ServerCommonPacketListenerImplMixin" + ], + "injectors": { + "defaultRequire": 1 + }, + "overwrites": { + "requireAnnotations": true + } +} \ No newline at end of file