Compare commits

..

No commits in common. "7290d25869e60effb76fbb186fdcb2842b7d70b7" and "b50e01f79f1e662a074db88ed3ca785f1bf3732e" have entirely different histories.

5 changed files with 11 additions and 13 deletions

View File

@ -89,10 +89,8 @@ jar {
from("LICENSE") { from("LICENSE") {
rename { "${it}_${project.archivesBaseName}" } 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 // configure the maven publication

View File

@ -2,8 +2,8 @@
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://modmuss50.me/fabric.html # check these on https://modmuss50.me/fabric.html
minecraft_version=1.19.2 minecraft_version=1.21.1
yarn_mappings=1.19.2+build.28 yarn_mappings=1.21.1+build.3
loader_version=0.16.5 loader_version=0.16.5
# Mod Properties # Mod Properties
mod_version=1.0.1 mod_version=1.0.1
@ -11,4 +11,4 @@ maven_group=ru.bitheaven
archives_base_name=donpayinteg archives_base_name=donpayinteg
# Dependencies # Dependencies
# check this on https://modmuss50.me/fabric.html # check this on https://modmuss50.me/fabric.html
fabric_version=0.77.0+1.19.2 fabric_version=0.105.0+1.21.1

View File

@ -40,8 +40,8 @@ public class DonPayInteg implements ModInitializer {
if(j.getAndIncrement() % (20 * 2) == 0) { if(j.getAndIncrement() % (20 * 2) == 0) {
if (!commands.isEmpty()) { if (!commands.isEmpty()) {
world.getCommandManager().executeWithPrefix(world.getCommandSource(), commands.get(0)); world.getCommandManager().executeWithPrefix(world.getCommandSource(), commands.getFirst());
commands.remove(0); commands.removeFirst();
} }
} }
}); });

View File

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

View File

@ -4,9 +4,9 @@ import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.arguments.StringArgumentType;
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.CommandManager;
import net.minecraft.text.Text;
import ru.bitheaven.donpayinteg.config.Config; import ru.bitheaven.donpayinteg.config.Config;
import ru.bitheaven.donpayinteg.config.ConfigHandler; import ru.bitheaven.donpayinteg.config.ConfigHandler;
import net.minecraft.text.Text;
public class DPI { public class DPI {
public DPI() { public DPI() {
@ -25,7 +25,7 @@ public class DPI {
config.setDonpayToken(token); config.setDonpayToken(token);
ConfigHandler.save(config); ConfigHandler.save(config);
context.getSource().sendFeedback(Text.literal("DonatePay token set!"), false); context.getSource().sendFeedback(() -> Text.literal("DonatePay token set!"), false);
return 1; return 1;
}))) })))