From cf303690f4b3d4d685bbf8d318b8a4a888e8657d Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Sat, 18 Mar 2023 11:29:21 +0800 Subject: [PATCH] up --- fabric_1_19_2/gradle.properties | 2 +- .../src/main/java/coloryr/allmusic/Tasks.java | 23 ++++++++++++------ .../allmusic/side/fabric/SideFabric.java | 2 +- ...ixins.json => allmusic_server.mixins.json} | 6 ++--- .../{allmusic => allmusic_server}/icon.png | Bin .../src/main/resources/fabric.mod.json | 8 +++--- .../src/main/java/coloryr/allmusic/Tasks.java | 2 +- 7 files changed, 25 insertions(+), 18 deletions(-) rename fabric_1_19_2/src/main/resources/{allmusic.mixins.json => allmusic_server.mixins.json} (100%) rename fabric_1_19_2/src/main/resources/assets/{allmusic => allmusic_server}/icon.png (100%) diff --git a/fabric_1_19_2/gradle.properties b/fabric_1_19_2/gradle.properties index bbd55a15..47336831 100644 --- a/fabric_1_19_2/gradle.properties +++ b/fabric_1_19_2/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.14.14 fabric_kotlin_version=1.9.1+kotlin.1.8.10 # Mod Properties -mod_version = 2.18.5 +mod_version = 2.18.6 maven_group = coloryr.allmusic archives_base_name =[Fabric1.19.2]AllMusic_Server diff --git a/fabric_1_19_2/src/main/java/coloryr/allmusic/Tasks.java b/fabric_1_19_2/src/main/java/coloryr/allmusic/Tasks.java index 0b75435c..9092f53a 100644 --- a/fabric_1_19_2/src/main/java/coloryr/allmusic/Tasks.java +++ b/fabric_1_19_2/src/main/java/coloryr/allmusic/Tasks.java @@ -2,23 +2,30 @@ package coloryr.allmusic; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; public class Tasks { - public static List taskItems = new ArrayList<>(); + private static final List taskItems = new CopyOnWriteArrayList<>(); public static void init() { AllMusicFabric.server.addServerGuiTickable(Tasks::tick); } public static void tick() { - var li = taskItems.iterator(); - while (li.hasNext()) { - var item = li.next(); - item.tick--; - if (item.tick == 0) { - li.remove(); - item.run.run(); + synchronized (taskItems) { + for(var item : taskItems){ + item.tick--; + if (item.tick == 0) { + taskItems.remove(item); + item.run.run(); + } } } } + + public static void add(TaskItem item) { + synchronized (taskItems) { + taskItems.add(item); + } + } } diff --git a/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java b/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java index 0e9db2b8..fe7b8ab8 100644 --- a/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java +++ b/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java @@ -47,7 +47,7 @@ public class SideFabric extends ISide { @Override public void runTask(Runnable run1, int delay) { - Tasks.taskItems.add(new TaskItem() {{ + Tasks.add(new TaskItem() {{ tick = delay; run = run1; }}); diff --git a/fabric_1_19_2/src/main/resources/allmusic.mixins.json b/fabric_1_19_2/src/main/resources/allmusic_server.mixins.json similarity index 100% rename from fabric_1_19_2/src/main/resources/allmusic.mixins.json rename to fabric_1_19_2/src/main/resources/allmusic_server.mixins.json index 58ef0c56..c23fb3d3 100644 --- a/fabric_1_19_2/src/main/resources/allmusic.mixins.json +++ b/fabric_1_19_2/src/main/resources/allmusic_server.mixins.json @@ -4,11 +4,11 @@ "package": "coloryr.allmusic.mixin", "compatibilityLevel": "JAVA_17", "server": [ - "IGetCommandOutput", - "ServerPlayerMixin" + ], "mixins": [ - + "IGetCommandOutput", + "ServerPlayerMixin" ], "injectors": { "defaultRequire": 1 diff --git a/fabric_1_19_2/src/main/resources/assets/allmusic/icon.png b/fabric_1_19_2/src/main/resources/assets/allmusic_server/icon.png similarity index 100% rename from fabric_1_19_2/src/main/resources/assets/allmusic/icon.png rename to fabric_1_19_2/src/main/resources/assets/allmusic_server/icon.png diff --git a/fabric_1_19_2/src/main/resources/fabric.mod.json b/fabric_1_19_2/src/main/resources/fabric.mod.json index e8248586..92ba1e7b 100644 --- a/fabric_1_19_2/src/main/resources/fabric.mod.json +++ b/fabric_1_19_2/src/main/resources/fabric.mod.json @@ -1,9 +1,9 @@ { "schemaVersion": 1, - "id": "allmusic", + "id": "allmusic_server", "version": "${version}", - "name": "AllMusic", + "name": "AllMusic Server", "description": "AllMusic Server Mod", "authors": [ "Color_yr" @@ -14,7 +14,7 @@ }, "license": "CC0-1.0", - "icon": "assets/allmusic/icon.png", + "icon": "assets/allmusic_server/icon.png", "environment": "*", "entrypoints": { "main": [ @@ -22,7 +22,7 @@ ] }, "mixins": [ - "allmusic.mixins.json" + "allmusic_server.mixins.json" ], "depends": { "fabricloader": ">=0.14.14", diff --git a/forge_1_19_3/src/main/java/coloryr/allmusic/Tasks.java b/forge_1_19_3/src/main/java/coloryr/allmusic/Tasks.java index e6f2a78d..6bcedd92 100644 --- a/forge_1_19_3/src/main/java/coloryr/allmusic/Tasks.java +++ b/forge_1_19_3/src/main/java/coloryr/allmusic/Tasks.java @@ -7,7 +7,7 @@ import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.CopyOnWriteArrayList; public class Tasks { - private static final List taskItems = new CopyOnWriteArrayList<>(); + private static final List taskItems = new ArrayList<>(); public static void init() { AllMusicForge.server.addTickable(Tasks::tick);