From b8b23103ab56946dbd2fdae933b82ad56e836d17 Mon Sep 17 00:00:00 2001 From: someone5678 <59456192+someone5678@users.noreply.github.com> Date: Thu, 30 Jan 2025 22:44:43 +0900 Subject: [PATCH 1/3] Revert "Merge pull request #3 from fewwan/crowdin-fix" This reverts commit 1cb473704c972bd14fc7994f356a0198336a5319, reversing changes made to f6f0bf22ddde1f821a23a9125ea0668c4a8db54c. --- .gitignore | 40 ------------------- .../antighost/mixin/CTResourcePackMixin.java | 20 ---------- src/main/resources/antighost.mixins.json | 11 ----- src/main/resources/fabric.mod.json | 1 - 4 files changed, 72 deletions(-) delete mode 100644 .gitignore delete mode 100644 src/main/java/de/guntram/mcmod/antighost/mixin/CTResourcePackMixin.java delete mode 100644 src/main/resources/antighost.mixins.json diff --git a/.gitignore b/.gitignore deleted file mode 100644 index c476faf..0000000 --- a/.gitignore +++ /dev/null @@ -1,40 +0,0 @@ -# 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/src/main/java/de/guntram/mcmod/antighost/mixin/CTResourcePackMixin.java b/src/main/java/de/guntram/mcmod/antighost/mixin/CTResourcePackMixin.java deleted file mode 100644 index 6e7d693..0000000 --- a/src/main/java/de/guntram/mcmod/antighost/mixin/CTResourcePackMixin.java +++ /dev/null @@ -1,20 +0,0 @@ -package de.guntram.mcmod.antighost.mixin; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -import de.guntram.mcmod.crowdintranslate.CTResourcePack; - -import net.minecraft.util.Identifier; - - -@Mixin(CTResourcePack.class) -public class CTResourcePackMixin { - @Overwrite - private static Identifier fromPath(String path) { - if (path.startsWith("assets/")) - path = path.substring("assets/".length()); - String[] split = path.split("/", 2); - return Identifier.of(split[0], split[1]); - } -} \ No newline at end of file diff --git a/src/main/resources/antighost.mixins.json b/src/main/resources/antighost.mixins.json deleted file mode 100644 index d66229d..0000000 --- a/src/main/resources/antighost.mixins.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "required": true, - "package": "de.guntram.mcmod.antighost.mixin", - "compatibilityLevel": "JAVA_21", - "mixins": [ - "CTResourcePackMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 455bb1f..cd902ca 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -6,7 +6,6 @@ "entrypoints": { "client": [ "de.guntram.mcmod.antighost.AntiGhost" ] }, - "mixins": [ "antighost.mixins.json" ], "custom": { "modupdater": { "strategy": "json", From 6d2cc548068b963ccd7984fd4dd08e9273afa427 Mon Sep 17 00:00:00 2001 From: someone5678 <59456192+someone5678@users.noreply.github.com> Date: Thu, 30 Jan 2025 22:46:19 +0900 Subject: [PATCH 2/3] Remove deprecated crowdin mod integration CrowdinTranslate mod also archived and no longer maintained. And now it causes fatal crashes. Fixes crashes by removing integration entirely. Ref: https://github.com/gbl/CrowdinTranslate Change-Id: I7e151034def3b8d5d4cd19f408a3aa5afb1cef14 --- Versionfiles/mcversion-1.21.4.properties | 3 +- Versionfiles/mcversion-1.21.properties | 3 +- build.gradle | 26 -- gradlew | 252 ++++++++++++++++++ .../de/guntram/mcmod/antighost/AntiGhost.java | 2 - src/main/resources/fabric.mod.json | 3 - 6 files changed, 254 insertions(+), 35 deletions(-) create mode 100755 gradlew diff --git a/Versionfiles/mcversion-1.21.4.properties b/Versionfiles/mcversion-1.21.4.properties index fda448d..f182ca7 100644 --- a/Versionfiles/mcversion-1.21.4.properties +++ b/Versionfiles/mcversion-1.21.4.properties @@ -8,5 +8,4 @@ fabric_versiononly=0.113.0 modmenu_version=12.0.0 -gbfabrictools_version=1.4+1.20 -crowdintranslate_version=1.4+1.19.3 \ No newline at end of file +gbfabrictools_version=1.4+1.20 \ No newline at end of file diff --git a/Versionfiles/mcversion-1.21.properties b/Versionfiles/mcversion-1.21.properties index 0d7cbc0..2154806 100644 --- a/Versionfiles/mcversion-1.21.properties +++ b/Versionfiles/mcversion-1.21.properties @@ -8,5 +8,4 @@ fabric_versiononly=0.100.4 modmenu_version=10.0.0-beta.1 -gbfabrictools_version=1.4+1.20 -crowdintranslate_version=1.4+1.19.3 \ No newline at end of file +gbfabrictools_version=1.4+1.20 \ No newline at end of file diff --git a/build.gradle b/build.gradle index 975d7ac..532a6d4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,33 +1,13 @@ -buildscript { - dependencies { - classpath 'de.guntram.mcmod:crowdin-translate:1.4+1.19-pre2' - } - repositories { - maven { - name = 'CrowdinTranslate source' - url = "https://minecraft.guntram.de/maven/" - } - } -} - plugins { id 'fabric-loom' version '1.9-SNAPSHOT' id "com.modrinth.minotaur" version "2.+" id "com.matthewprenger.cursegradle" version "1.4.0" } -apply plugin: 'de.guntram.mcmod.crowdin-translate' -crowdintranslate.crowdinProjectName = 'antighost' -crowdintranslate.minecraftProjectName = 'antighost' -crowdintranslate.verbose = false - repositories { maven { url = "https://maven.fabricmc.net" } - maven { - url = "https://minecraft.guntram.de/maven/" - } maven { url = "https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/" } @@ -61,8 +41,6 @@ dependencies { mappings "net.fabricmc:yarn:${Versions['yarn_mappings']}:v2" modImplementation "net.fabricmc:fabric-loader:${Versions['loader_version']}" modImplementation "net.fabricmc.fabric-api:fabric-api:${Versions['fabric_version']}" - modImplementation "de.guntram.mcmod:crowdin-translate:${Versions['crowdintranslate_version']}" - include "de.guntram.mcmod:crowdin-translate:${Versions['crowdintranslate_version']}" } java { @@ -72,7 +50,3 @@ java { jar { from "LICENSE" } - -processResources { - dependsOn downloadTranslations -} \ No newline at end of file diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/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. +# +# 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 +' "$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 + +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=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" ) + 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, 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" \ + -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/src/main/java/de/guntram/mcmod/antighost/AntiGhost.java b/src/main/java/de/guntram/mcmod/antighost/AntiGhost.java index ce85c57..c0d53b8 100644 --- a/src/main/java/de/guntram/mcmod/antighost/AntiGhost.java +++ b/src/main/java/de/guntram/mcmod/antighost/AntiGhost.java @@ -1,7 +1,6 @@ package de.guntram.mcmod.antighost; import com.mojang.brigadier.arguments.IntegerArgumentType; -import de.guntram.mcmod.crowdintranslate.CrowdinTranslate; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; @@ -38,7 +37,6 @@ public void onInitializeClient() { loadConfig(); final String category = "key.categories.antighost"; requestBlocksKey = new KeyBinding("key.antighost.reveal", GLFW_KEY_G, category); - CrowdinTranslate.downloadTranslations(MOD_ID); KeyBindingHelper.registerKeyBinding(requestBlocksKey); ClientTickEvents.END_CLIENT_TICK.register(e -> keyPressed()); ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index cd902ca..b3dd0b0 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -3,9 +3,6 @@ "id": "antighost", "version": "${version}", "environment": "client", - "entrypoints": { - "client": [ "de.guntram.mcmod.antighost.AntiGhost" ] - }, "custom": { "modupdater": { "strategy": "json", From aa561667d99b583b983f2ebfe8568a47282ade92 Mon Sep 17 00:00:00 2001 From: someone5678 <59456192+someone5678@users.noreply.github.com> Date: Thu, 30 Jan 2025 22:48:54 +0900 Subject: [PATCH 3/3] Add .gitignore Change-Id: I0f3becd353e8147e1ecd800a7620a597846aa88b --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..151fdd4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +build +.gradle \ No newline at end of file