From f33ec41d0d4b8a30f4298d58be2335c92d3a2d9a Mon Sep 17 00:00:00 2001 From: BitHeaven Date: Sun, 29 Sep 2024 13:48:50 +0500 Subject: [PATCH] Worked patch on 1.20.1 --- build.gradle | 12 +++++++----- .../java/ru/bitheaven/donpayinteg/DonPayInteg.java | 6 +++--- .../java/ru/bitheaven/donpayinteg/DonateThread.java | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 8504a68..9123f0f 100644 --- a/build.gradle +++ b/build.gradle @@ -42,8 +42,8 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. 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' + implementation group: 'org.yaml', name: 'snakeyaml', version: '2.0' + includedJars group: 'org.yaml', name: 'snakeyaml', version: '2.0' implementation group: 'org.json', name: 'json', version: '20240303' includedJars group: 'org.json', name: 'json', version: '20240303' } @@ -85,12 +85,14 @@ java { } jar { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE from("LICENSE") { rename { "${it}_${project.archivesBaseName}" } } - from configurations.includedJars.collect { - it.isDirectory() ? it : zipTree(it) + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + from { + configurations.includedJars.collect { + it.isDirectory() ? it : zipTree(it) + } } } // configure the maven publication diff --git a/src/main/java/ru/bitheaven/donpayinteg/DonPayInteg.java b/src/main/java/ru/bitheaven/donpayinteg/DonPayInteg.java index 6815155..1008813 100644 --- a/src/main/java/ru/bitheaven/donpayinteg/DonPayInteg.java +++ b/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 commands = new ArrayList(); + public static List commands = new ArrayList<>(); @Override public void onInitialize() { @@ -40,8 +40,8 @@ public class DonPayInteg implements ModInitializer { if(j.getAndIncrement() % (20 * 2) == 0) { if (!commands.isEmpty()) { - world.getCommandManager().executeWithPrefix(world.getCommandSource(), commands.getFirst()); - commands.removeFirst(); + world.getCommandManager().executeWithPrefix(world.getCommandSource(), commands.get(0)); + commands.remove(0); } } }); diff --git a/src/main/java/ru/bitheaven/donpayinteg/DonateThread.java b/src/main/java/ru/bitheaven/donpayinteg/DonateThread.java index 557817d..ab880fb 100644 --- a/src/main/java/ru/bitheaven/donpayinteg/DonateThread.java +++ b/src/main/java/ru/bitheaven/donpayinteg/DonateThread.java @@ -47,8 +47,8 @@ public class DonateThread extends Thread { lastDonate = objects.getInt("id"); - 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"))); + DonPayInteg.commands.add("title @a title \"" + msg.replace("{username}", objects.getJSONObject("vars").getString("name")) + "\""); + DonPayInteg.commands.add(cmd.replace("{username}", objects.getJSONObject("vars").getString("name"))); LOGGER.info("Exec donate #{}", lastDonate); Config config = ConfigHandler.load();