.gitignore is now working

.gitea/workflows/build.yml

@@ -1,53 +0,0 @@
-name: build
-on:
-  pull_request: {}
-  push: {}
-  workflow_dispatch: {}
-
-jobs:
-  build:
-    env:
-      RUN_NUMBER: ${{ gitea.run_number }}
-    strategy:
-      matrix:
-        java: [ '21' ]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Setup JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'oracle'
-          java-version: ${{ matrix.java }}
-          cache: 'gradle'
-
-      - name: Loom Cache
-        uses: actions/cache@v4
-        with:
-          path: "**/.gradle/loom-cache"
-          key: "${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}"
-          restore-keys: "${{ runner.os }}-gradle-"
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          gradle-home-cache-cleanup: true
-
-      - name: Validate Gradle Wrapper Integrity
-        uses: gradle/wrapper-validation-action@v2
-
-      - name: Build with Gradle
-        run: ./gradlew clean build --no-daemon
-
-      - name: Make release
-        uses: akkuman/gitea-release-action@v1
-        with:
-          name: DonatePay Integration v${{ gitea.run_number }}
-          tag_name: donpayintegplug-v${{ gitea.run_number }}
-          md5sum: true
-          sha256sum: true
-          files: |-
-            build/libs/**
-#            *.jar

build.gradle

@@ -1,17 +1,15 @@
 plugins {
-    alias libs.plugins.fabric.loom
+    id 'fabric-loom' version '1.7-SNAPSHOT'
-    alias libs.plugins.compression
     id 'maven-publish'
 }
 
+version = "${project.mod_version}-${project.minecraft_version}"
+group = project.maven_group
+
 base {
     archivesName = project.archives_base_name
 }
 
-String buildNumber = System.getenv("RUN_NUMBER")
-version = "${mod_version}+${libs.versions.minecraft.get()}" + (buildNumber != null ? "-${buildNumber}" : "")
-group = project.maven_group
-
 loom {
     splitEnvironmentSourceSets()
 
@@ -37,13 +35,12 @@ configurations {
 
 dependencies {
     // To change the versions see the gradle.properties file
-    minecraft libs.minecraft
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings variantOf(libs.yarn.mappings) { classifier 'v2' }
+    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-    modImplementation libs.fabric.loader
 
     // Fabric API. This is technically optional, but you probably want it anyway.
-    modImplementation libs.fabric.version
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     implementation group: 'org.yaml', name: 'snakeyaml', version: '2.3'
     includedJars group: 'org.yaml', name: 'snakeyaml', version: '2.3'
@@ -52,35 +49,39 @@ dependencies {
 }
 
 processResources {
-    // require dependencies to be the version compiled against or newer
+    inputs.property "version", project.version
-    Map<String, Object> properties = [
+    inputs.property "minecraft_version", project.minecraft_version
-            "version": version,
+    inputs.property "loader_version", project.loader_version
-            "minecraft_version": libs.versions.minecraft.get(),
+    filteringCharset "UTF-8"
-            "loader_version": libs.versions.fabric.loader.get(),
-    ]
-
-    inputs.properties(properties)
 
     filesMatching("fabric.mod.json") {
-        expand properties
+        expand "version": project.version,
+                "minecraft_version": project.minecraft_version,
+                "loader_version": project.loader_version
     }
-
 }
 
+def targetJavaVersion = 17
 tasks.withType(JavaCompile).configureEach {
+    // ensure that the encoding is set to UTF-8, no matter what the system default is
+    // this fixes some edge cases with special characters not displaying correctly
+    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    // If Javadoc is generated, this must be specified in that task too.
     it.options.encoding = "UTF-8"
-    it.options.release = 21
+    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
-}
+        it.options.release.set(targetJavaVersion)
-
+    }
-tasks.withType(Jar) {
-    exclude('META-INF/maven/**')
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
+    def javaVersion = JavaVersion.toVersion(targetJavaVersion)
-    targetCompatibility = JavaVersion.VERSION_21
+    if (JavaVersion.current() < javaVersion) {
-
+        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
-//    withSourcesJar()
+    }
+    // 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()
 }
 
 jar {
@@ -88,9 +89,24 @@ jar {
     from("LICENSE") {
         rename { "${it}_${project.archivesBaseName}" }
     }
-    from {
+    from configurations.includedJars.collect {
-        configurations.includedJars.collect {
+        it.isDirectory() ? it : zipTree(it)
-            it.isDirectory() ? it : zipTree(it)
+    }
-        }
+}
+// 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.
     }
 }

gradle.properties

@@ -1,9 +1,14 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
-
+# Fabric Properties
+# check these on https://modmuss50.me/fabric.html
+minecraft_version=1.20.1
+yarn_mappings=1.20.1+build.10
+loader_version=0.16.5
 # Mod Properties
-mod_version=1.0
+mod_version=1.0.0
 maven_group=ru.bitheaven
 archives_base_name=donpayinteg
-
+# Dependencies
-# Dependencies are managed at gradle/libs.versions.toml
+# check this on https://modmuss50.me/fabric.html
+fabric_version=0.92.2+1.20.1

gradle/libs.versions.toml

@@ -1,26 +0,0 @@
-# The latest versions are available at https://quiltmc.org/en/usage/latest-versions
-[versions]
-minecraft = "1.21.4"
-yarn_mappings="1.21.4+build.8"
-
-fabric_loom = "1.9-SNAPSHOT"
-# check these on https://modmuss50.me/fabric.html
-fabric_loader = "0.16.10"
-fabric_version = "0.115.0+1.21.4"
-
-compression = "1.+"
-
-[libraries]
-minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
-
-fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" }
-fabric_version = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_version" }
-yarn_mappings = { module = "net.fabricmc:yarn", version.ref = "yarn_mappings" }
-
-
-# If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example".
-[bundles]
-
-[plugins]
-fabric_loom = { id = "fabric-loom", version.ref = "fabric_loom" }
-compression = { id = "io.github.p03w.machete", version.ref = "compression" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1 @@
-distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

gradlew

@@ -1,252 +0,0 @@
-#!/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" "$@"

settings.gradle

@@ -4,7 +4,6 @@ pluginManagement {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
-        mavenCentral()
         gradlePluginPortal()
     }
 }

src/main/java/ru/bitheaven/donpayinteg/DonPayInteg.java

@@ -16,7 +16,7 @@ public class DonPayInteg implements ModInitializer {
     public static final String MOD_ID = "donpayinteg";
     public static final String NAME = "DonatePayIntegration";
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
-    public static List<String> commands = new ArrayList<>();
+    public static List<String> commands = new ArrayList<String>();
 
     @Override
     public void onInitialize() {
@@ -32,13 +32,13 @@ public class DonPayInteg implements ModInitializer {
 
         ServerTickEvents.START_SERVER_TICK.register((world) -> {
             if(!thread.get().isAlive()) {
-                if(i.getAndIncrement() % (20 * ConfigHandler.load().getReqCooldown()) == 0) {
+                if(i.getAndIncrement() % (20 * 15) == 0) {
                     thread.set(new DonateThread());
                     thread.get().start();
                 }
             }
 
-            if(j.getAndIncrement() % (20 * ConfigHandler.load().getCmdCooldown()) == 0) {
+            if(i.getAndIncrement() % (20 * 2) == 0) {
                 if (!commands.isEmpty()) {
                     world.getCommandManager().executeWithPrefix(world.getCommandSource(), commands.getFirst());
                     commands.removeFirst();

src/main/java/ru/bitheaven/donpayinteg/DonateThread.java

@@ -47,7 +47,7 @@ public class DonateThread extends Thread {
 
             lastDonate = objects.getInt("id");
 
-            DonPayInteg.commands.addLast(ConfigHandler.load().getMessageCmd().replace("{message}", msg.replace("{username}", objects.getJSONObject("vars").getString("name"))));
+            DonPayInteg.commands.addLast("title @a title \"" + msg.replace("{username}", objects.getJSONObject("vars").getString("name")) + "\"");
             DonPayInteg.commands.addLast(cmd.replace("{username}", objects.getJSONObject("vars").getString("name")));
 
             LOGGER.info("Exec donate #{}", lastDonate);

src/main/java/ru/bitheaven/donpayinteg/config/Config.java

@@ -1,12 +1,10 @@
 package ru.bitheaven.donpayinteg.config;
 
+import java.util.Arrays;
 import java.util.List;
 
 public class Config {
     private String donpayToken = "<YOUR_TOKEN>";
-    private String messageCmd = "title @a title \"{message}\"";
-    private int reqCooldown = 15;
-    private int cmdCooldown = 2;
     private int lastDonate = 0;
     private List<Action> actions = List.of(new Action());
 
@@ -34,29 +32,5 @@ public class Config {
     public void setActions(List<Action> actions) {
         this.actions = actions;
     }
-
-    public int getReqCooldown() {
-        return reqCooldown;
-    }
-
-    public void setReqCooldown(int reqCooldown) {
-        this.reqCooldown = reqCooldown;
-    }
-
-    public int getCmdCooldown() {
-        return cmdCooldown;
-    }
-
-    public void setCmdCooldown(int cmdCooldown) {
-        this.cmdCooldown = cmdCooldown;
-    }
-
-    public String getMessageCmd() {
-        return messageCmd;
-    }
-
-    public void setMessageCmd(String messageCmd) {
-        this.messageCmd = messageCmd;
-    }
 }