diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 00000000..f3d64e4b --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,371 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. +# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle + +name: Java CI with Gradle + +on: + push: + # Sequence of patterns matched against refs/heads + branches: + - 'releases/**' + # Sequence of patterns matched against refs/tags + tags: + - '*' + +jobs: + build_folia: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd folia && gradlew shadowJar + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_folia" + path: build/libs/ + build_bukkit: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd server && gradlew shadowJar + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_bukkit" + path: build/libs/ + build_bungeecord_velocity: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd server_top && gradlew shadowJar + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_bungeecord_velocity" + path: build/libs/ + build_fabric_1_16_5: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd fabric_1_16_5 && gradlew build + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_fabric_1_16_5" + path: build/libs/ + build_fabric_1_18_2: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd fabric_1_18_2 && gradlew build + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_fabric_1_18_2" + path: build/libs/ + build_fabric_1_19_2: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd fabric_1_19_2 && gradlew build + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_fabric_1_19_2" + path: build/libs/ + build_fabric_1_19_3: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd fabric_1_19_3 && gradlew build + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_fabric_1_19_3" + path: build/libs/ + build_fabric_1_20: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd fabric_1_20 && gradlew build + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_fabric_1_20" + path: build/libs/ + build_fabric_1_20_2: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd fabric_1_20_2 && gradlew build + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_fabric_1_20_2" + path: build/libs/ + build_forge_1_12_2: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd forge_1_12_2 && gradlew build + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_forge_1_12_2" + path: build/libs/ + build_forge_1_16_5: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd forge_1_16_5 && gradlew build + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_forge_1_16_5" + path: build/libs/ + build_forge_1_18_2: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd forge_1_18_2 && gradlew build + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_forge_1_18_2" + path: build/libs/ + build_forge_1_19_2: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd forge_1_19_2 && gradlew build + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_forge_1_19_2" + path: build/libs/ + build_forge_1_19_3: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd forge_1_19_3 && gradlew build + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_forge_1_19_3" + path: build/libs/ + build_forge_1_20: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd forge_1_20 && gradlew build + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_forge_1_20" + path: build/libs/ + build_forge_1_20_2: + runs-on: windows-latest + permissions: + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + - name: build + shell: cmd + run: | + link.cmd && cd forge_1_20_2 && gradlew build + - name: update + uses: actions/upload-artifact@v4 + with: + name: "allmusic_server_forge_1_20_2" + path: build/libs/ \ No newline at end of file diff --git a/.gitignore b/.gitignore index fd228e60..680627e6 100644 --- a/.gitignore +++ b/.gitignore @@ -25,5 +25,4 @@ run forge*changelog.txt lib -**/allmusic/core/ -**/resources/core/ \ No newline at end of file +**/allmusic/server/core/ \ No newline at end of file diff --git a/README.md b/README.md index 5519b34e..001d0f9f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # AllMusic3 -[AllMusic](https://github.com/Coloryr/AllMusic_Server)3.0版本 +[AllMusic](https://github.com/Coloryr/AllMusic3_Server)3.0版本 一个全服点歌插件 diff --git a/core/AllMusic.java b/core/AllMusic.java index ad510c90..a453a241 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -1,20 +1,20 @@ -package coloryr.allmusic.core; +package com.coloryr.allmusic.server.core; -import coloryr.allmusic.core.sql.DataSql; -import coloryr.allmusic.core.utils.HudUtils; -import coloryr.allmusic.core.music.api.APIMain; -import coloryr.allmusic.core.music.play.MusicSearch; -import coloryr.allmusic.core.music.play.PlayGo; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.objs.CookieObj; -import coloryr.allmusic.core.objs.config.ConfigObj; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.message.MessageObj; -import coloryr.allmusic.core.objs.music.SearchPageObj; -import coloryr.allmusic.core.side.IMyLogger; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.core.sql.IEconomy; -import coloryr.allmusic.core.utils.Logs; +import com.coloryr.allmusic.server.core.sql.DataSql; +import com.coloryr.allmusic.server.core.utils.HudUtils; +import com.coloryr.allmusic.server.core.music.api.APIMain; +import com.coloryr.allmusic.server.core.music.play.MusicSearch; +import com.coloryr.allmusic.server.core.music.play.PlayGo; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.objs.CookieObj; +import com.coloryr.allmusic.server.core.objs.config.ConfigObj; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.message.MessageObj; +import com.coloryr.allmusic.server.core.objs.music.SearchPageObj; +import com.coloryr.allmusic.server.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.sql.IEconomy; +import com.coloryr.allmusic.server.core.utils.Logs; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/core/AllMusicAPI.java b/core/AllMusicAPI.java index 8b6cd88f..425d5fe6 100644 --- a/core/AllMusicAPI.java +++ b/core/AllMusicAPI.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.core; +package com.coloryr.allmusic.server.core; -import coloryr.allmusic.core.objs.enums.HudType; -import coloryr.allmusic.core.objs.enums.ComType; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.objs.enums.ComType; public class AllMusicAPI { /** diff --git a/core/command/ACommand.java b/core/command/ACommand.java index 33d7dc61..55187d68 100644 --- a/core/command/ACommand.java +++ b/core/command/ACommand.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; import java.util.Collections; import java.util.List; diff --git a/core/command/AHudCommand.java b/core/command/AHudCommand.java index a783c412..07a7ed92 100644 --- a/core/command/AHudCommand.java +++ b/core/command/AHudCommand.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.objs.enums.HudType; public abstract class AHudCommand extends ACommand { protected final HudType type; diff --git a/core/command/CommandAddList.java b/core/command/CommandAddList.java index 5f6ccb8b..783fda39 100644 --- a/core/command/CommandAddList.java +++ b/core/command/CommandAddList.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.utils.Function; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.utils.Function; public class CommandAddList extends ACommand { @Override diff --git a/core/command/CommandBan.java b/core/command/CommandBan.java index e791addd..9e756df2 100644 --- a/core/command/CommandBan.java +++ b/core/command/CommandBan.java @@ -1,9 +1,9 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.utils.Function; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.utils.Function; import java.util.ArrayList; import java.util.Collections; diff --git a/core/command/CommandBanPlayer.java b/core/command/CommandBanPlayer.java index 8137b130..443c3074 100644 --- a/core/command/CommandBanPlayer.java +++ b/core/command/CommandBanPlayer.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; import java.util.Collections; import java.util.List; diff --git a/core/command/CommandCancel.java b/core/command/CommandCancel.java index e6917a94..a58f4171 100644 --- a/core/command/CommandCancel.java +++ b/core/command/CommandCancel.java @@ -1,8 +1,8 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import java.util.ArrayList; import java.util.Collections; diff --git a/core/command/CommandClearList.java b/core/command/CommandClearList.java index 4d0ad8c4..2b928fc8 100644 --- a/core/command/CommandClearList.java +++ b/core/command/CommandClearList.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; public class CommandClearList extends ACommand { @Override diff --git a/core/command/CommandCode.java b/core/command/CommandCode.java index abda859c..b82e4152 100644 --- a/core/command/CommandCode.java +++ b/core/command/CommandCode.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; public class CommandCode extends ACommand { @Override diff --git a/core/command/CommandDelete.java b/core/command/CommandDelete.java index c22216af..a56d47bc 100644 --- a/core/command/CommandDelete.java +++ b/core/command/CommandDelete.java @@ -1,8 +1,8 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.utils.Function; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.utils.Function; import java.util.ArrayList; import java.util.Collections; diff --git a/core/command/CommandEX.java b/core/command/CommandEX.java index 9fc81964..ed35ffe4 100644 --- a/core/command/CommandEX.java +++ b/core/command/CommandEX.java @@ -1,12 +1,12 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.MusicSearch; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.objs.SearchMusicObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SearchPageObj; -import coloryr.allmusic.core.utils.Function; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.MusicSearch; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.objs.SearchMusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SearchPageObj; +import com.coloryr.allmusic.server.core.utils.Function; import java.util.ArrayList; import java.util.HashMap; diff --git a/core/command/CommandHelp.java b/core/command/CommandHelp.java index d1abe46e..19b11a0e 100644 --- a/core/command/CommandHelp.java +++ b/core/command/CommandHelp.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; public class CommandHelp extends ACommand { @Override diff --git a/core/command/CommandHud.java b/core/command/CommandHud.java index 01355a87..868d40ed 100644 --- a/core/command/CommandHud.java +++ b/core/command/CommandHud.java @@ -1,8 +1,8 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.enums.HudType; -import coloryr.allmusic.core.utils.HudUtils; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.utils.HudUtils; import java.util.*; diff --git a/core/command/CommandHudSet.java b/core/command/CommandHudSet.java index 2d85a4fc..b985bba5 100644 --- a/core/command/CommandHudSet.java +++ b/core/command/CommandHudSet.java @@ -1,10 +1,10 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.enums.HudType; -import coloryr.allmusic.core.objs.enums.HudDirType; -import coloryr.allmusic.core.objs.hud.PosObj; -import coloryr.allmusic.core.utils.HudUtils; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.objs.enums.HudDirType; +import com.coloryr.allmusic.server.core.objs.hud.PosObj; +import com.coloryr.allmusic.server.core.utils.HudUtils; import java.util.*; @@ -23,6 +23,7 @@ public class CommandHudSet extends AHudCommand { commandList.put("speed", new PicRotateSpeed()); } else { commandList.put("color", new HudColor(type)); + commandList.put("shadow", new HudShadow(type)); } } @@ -152,6 +153,33 @@ public class CommandHudSet extends AHudCommand { } } + private static class HudShadow extends AHudCommand { + public HudShadow(HudType type) { + super(type); + } + + @Override + public void ex(Object sender, String name, String[] args) { + if (args.length == 3 || args.length == 4) { + AllMusic.side.sendMessage(sender, AllMusic.getMessage().hud.set3 + .replace("%Hud%", AllMusic.getMessage().hudList.getHud(type)) + .replace("%State%", HudUtils.setShadow(name, type, args.length == 4 ? args[3] : null) + ? AllMusic.getMessage().hudList.enable + : AllMusic.getMessage().hudList.disable)); + return; + } + AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.error); + } + + @Override + public List tab(String name, String[] args, int index) { + if (args.length == index + 1) { + return tf; + } + return Collections.emptyList(); + } + } + private static class PicSize extends ACommand { @Override public void ex(Object sender, String name, String[] args) { @@ -230,6 +258,7 @@ public class CommandHudSet extends AHudCommand { private static final List info = new ArrayList() {{ this.add("color"); + this.add("shadow"); }}; private static final List tf = new ArrayList() {{ diff --git a/core/command/CommandLastPage.java b/core/command/CommandLastPage.java index 61d0ff9e..1bac257c 100644 --- a/core/command/CommandLastPage.java +++ b/core/command/CommandLastPage.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.music.SearchPageObj; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.music.SearchPageObj; public class CommandLastPage extends ACommand { @Override diff --git a/core/command/CommandList.java b/core/command/CommandList.java index faeccd60..51e7a1fa 100644 --- a/core/command/CommandList.java +++ b/core/command/CommandList.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; public class CommandList extends ACommand { @Override diff --git a/core/command/CommandLogin.java b/core/command/CommandLogin.java index 8d0c4e40..c0e1e05c 100644 --- a/core/command/CommandLogin.java +++ b/core/command/CommandLogin.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; public class CommandLogin extends ACommand { @Override diff --git a/core/command/CommandMute.java b/core/command/CommandMute.java index 61864c60..0298611c 100644 --- a/core/command/CommandMute.java +++ b/core/command/CommandMute.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; public class CommandMute extends ACommand { @Override diff --git a/core/command/CommandNext.java b/core/command/CommandNext.java index 6afa1681..976cec38 100644 --- a/core/command/CommandNext.java +++ b/core/command/CommandNext.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; public class CommandNext extends ACommand { diff --git a/core/command/CommandNextPage.java b/core/command/CommandNextPage.java index edd9e571..84d50799 100644 --- a/core/command/CommandNextPage.java +++ b/core/command/CommandNextPage.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.music.SearchPageObj; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.music.SearchPageObj; public class CommandNextPage extends ACommand { @Override diff --git a/core/command/CommandPush.java b/core/command/CommandPush.java index 1def7671..6c9f6c40 100644 --- a/core/command/CommandPush.java +++ b/core/command/CommandPush.java @@ -1,8 +1,8 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import java.util.ArrayList; import java.util.Collections; diff --git a/core/command/CommandReload.java b/core/command/CommandReload.java index d558bd3b..5b0a06db 100644 --- a/core/command/CommandReload.java +++ b/core/command/CommandReload.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; public class CommandReload extends ACommand { @Override diff --git a/core/command/CommandSearch.java b/core/command/CommandSearch.java index 98cc3107..91f55110 100644 --- a/core/command/CommandSearch.java +++ b/core/command/CommandSearch.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; public class CommandSearch extends ACommand { @Override diff --git a/core/command/CommandSelect.java b/core/command/CommandSelect.java index e4a87952..3cf16bda 100644 --- a/core/command/CommandSelect.java +++ b/core/command/CommandSelect.java @@ -1,8 +1,8 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.music.SearchPageObj; -import coloryr.allmusic.core.utils.Function; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.music.SearchPageObj; +import com.coloryr.allmusic.server.core.utils.Function; import java.util.ArrayList; import java.util.Collections; diff --git a/core/command/CommandStop.java b/core/command/CommandStop.java index 72241f8d..326a37d4 100644 --- a/core/command/CommandStop.java +++ b/core/command/CommandStop.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.utils.HudUtils; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.utils.HudUtils; public class CommandStop extends ACommand { @Override diff --git a/core/command/CommandUrl.java b/core/command/CommandUrl.java index 2450b1e2..7990e6f7 100644 --- a/core/command/CommandUrl.java +++ b/core/command/CommandUrl.java @@ -1,8 +1,8 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; public class CommandUrl extends ACommand { @Override diff --git a/core/command/CommandVote.java b/core/command/CommandVote.java index 81d1504f..203bd7e0 100644 --- a/core/command/CommandVote.java +++ b/core/command/CommandVote.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; public class CommandVote extends ACommand { @Override diff --git a/core/command/ICommand.java b/core/command/ICommand.java index ebbce094..30a01eef 100644 --- a/core/command/ICommand.java +++ b/core/command/ICommand.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.command; +package com.coloryr.allmusic.server.core.command; import java.util.List; diff --git a/core/decoder/Bitstream.java b/core/decoder/Bitstream.java index 79de8f63..617e54ae 100644 --- a/core/decoder/Bitstream.java +++ b/core/decoder/Bitstream.java @@ -33,7 +33,7 @@ *---------------------------------------------------------------------- */ -package coloryr.allmusic.core.decoder; +package com.coloryr.allmusic.server.core.decoder; import java.io.*; diff --git a/core/decoder/BitstreamErrors.java b/core/decoder/BitstreamErrors.java index 57cd7049..f0fbc383 100644 --- a/core/decoder/BitstreamErrors.java +++ b/core/decoder/BitstreamErrors.java @@ -19,7 +19,7 @@ *---------------------------------------------------------------------- */ -package coloryr.allmusic.core.decoder; +package com.coloryr.allmusic.server.core.decoder; /** * This interface describes all error codes that can be thrown diff --git a/core/decoder/BitstreamException.java b/core/decoder/BitstreamException.java index c5ec3bca..ffc7bf3b 100644 --- a/core/decoder/BitstreamException.java +++ b/core/decoder/BitstreamException.java @@ -18,7 +18,7 @@ *---------------------------------------------------------------------- */ -package coloryr.allmusic.core.decoder; +package com.coloryr.allmusic.server.core.decoder; /** * Instances of BitstreamException are thrown diff --git a/core/decoder/Crc16.java b/core/decoder/Crc16.java index d3acaa67..88535fd1 100644 --- a/core/decoder/Crc16.java +++ b/core/decoder/Crc16.java @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *---------------------------------------------------------------------- */ -package coloryr.allmusic.core.decoder; +package com.coloryr.allmusic.server.core.decoder; /** * 16-Bit CRC checksum diff --git a/core/decoder/Header.java b/core/decoder/Header.java index 4aad9a05..26d723ee 100644 --- a/core/decoder/Header.java +++ b/core/decoder/Header.java @@ -29,7 +29,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *---------------------------------------------------------------------- */ -package coloryr.allmusic.core.decoder; +package com.coloryr.allmusic.server.core.decoder; /** * Class for extracting information from a frame header. diff --git a/core/decoder/JavaLayerErrors.java b/core/decoder/JavaLayerErrors.java index 42a81bdf..b5af9a71 100644 --- a/core/decoder/JavaLayerErrors.java +++ b/core/decoder/JavaLayerErrors.java @@ -18,7 +18,7 @@ *---------------------------------------------------------------------- */ -package coloryr.allmusic.core.decoder; +package com.coloryr.allmusic.server.core.decoder; /** * Exception erorr codes for components of the JavaLayer API. diff --git a/core/decoder/JavaLayerException.java b/core/decoder/JavaLayerException.java index d624c3e8..acee4ffe 100644 --- a/core/decoder/JavaLayerException.java +++ b/core/decoder/JavaLayerException.java @@ -18,7 +18,7 @@ *---------------------------------------------------------------------- */ -package coloryr.allmusic.core.decoder; +package com.coloryr.allmusic.server.core.decoder; import java.io.PrintStream; diff --git a/core/music/api/APIMain.java b/core/music/api/APIMain.java index 98b8a3c8..3ca6e6a6 100644 --- a/core/music/api/APIMain.java +++ b/core/music/api/APIMain.java @@ -1,22 +1,22 @@ -package coloryr.allmusic.core.music.api; +package com.coloryr.allmusic.server.core.music.api; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.objs.enums.EncryptType; -import coloryr.allmusic.core.music.play.LyricDo; -import coloryr.allmusic.core.music.play.LyricSave; -import coloryr.allmusic.core.objs.HttpResObj; -import coloryr.allmusic.core.objs.SearchMusicObj; -import coloryr.allmusic.core.objs.api.music.info.InfoObj; -import coloryr.allmusic.core.objs.api.music.list.DataObj; -import coloryr.allmusic.core.objs.api.music.lyric.WLyricObj; -import coloryr.allmusic.core.objs.api.music.search.SearchDataObj; -import coloryr.allmusic.core.objs.api.music.search.songs; -import coloryr.allmusic.core.objs.api.music.trialinfo.TrialInfoObj; -import coloryr.allmusic.core.objs.api.program.info.PrInfoObj; -import coloryr.allmusic.core.objs.music.SearchPageObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.utils.Logs; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.objs.enums.EncryptType; +import com.coloryr.allmusic.server.core.music.play.LyricDo; +import com.coloryr.allmusic.server.core.music.play.LyricSave; +import com.coloryr.allmusic.server.core.objs.HttpResObj; +import com.coloryr.allmusic.server.core.objs.SearchMusicObj; +import com.coloryr.allmusic.server.core.objs.api.music.info.InfoObj; +import com.coloryr.allmusic.server.core.objs.api.music.list.DataObj; +import com.coloryr.allmusic.server.core.objs.api.music.lyric.WLyricObj; +import com.coloryr.allmusic.server.core.objs.api.music.search.SearchDataObj; +import com.coloryr.allmusic.server.core.objs.api.music.search.songs; +import com.coloryr.allmusic.server.core.objs.api.music.trialinfo.TrialInfoObj; +import com.coloryr.allmusic.server.core.objs.api.program.info.PrInfoObj; +import com.coloryr.allmusic.server.core.objs.music.SearchPageObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.utils.Logs; import com.google.gson.JsonObject; import okhttp3.Cookie; diff --git a/core/music/api/CryptoUtil.java b/core/music/api/CryptoUtil.java index 2e7bb5d7..8ae671c3 100644 --- a/core/music/api/CryptoUtil.java +++ b/core/music/api/CryptoUtil.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.core.music.api; +package com.coloryr.allmusic.server.core.music.api; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.api.EncResObj; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.api.EncResObj; import com.google.gson.JsonObject; import javax.crypto.Cipher; diff --git a/core/music/api/HttpClientUtil.java b/core/music/api/HttpClientUtil.java index 45ad828b..c3e30026 100644 --- a/core/music/api/HttpClientUtil.java +++ b/core/music/api/HttpClientUtil.java @@ -1,9 +1,9 @@ -package coloryr.allmusic.core.music.api; +package com.coloryr.allmusic.server.core.music.api; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.enums.EncryptType; -import coloryr.allmusic.core.objs.HttpResObj; -import coloryr.allmusic.core.objs.api.EncResObj; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.enums.EncryptType; +import com.coloryr.allmusic.server.core.objs.HttpResObj; +import com.coloryr.allmusic.server.core.objs.api.EncResObj; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import okhttp3.*; diff --git a/core/music/api/MyCookieJar.java b/core/music/api/MyCookieJar.java index b9ebaa26..a5ba6b2b 100644 --- a/core/music/api/MyCookieJar.java +++ b/core/music/api/MyCookieJar.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.music.api; +package com.coloryr.allmusic.server.core.music.api; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; import okhttp3.Cookie; import okhttp3.CookieJar; import okhttp3.HttpUrl; diff --git a/core/music/play/LyricDo.java b/core/music/play/LyricDo.java index f38de2af..d0d1383f 100644 --- a/core/music/play/LyricDo.java +++ b/core/music/play/LyricDo.java @@ -1,9 +1,9 @@ -package coloryr.allmusic.core.music.play; +package com.coloryr.allmusic.server.core.music.play; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.api.music.lyric.WLyricObj; -import coloryr.allmusic.core.objs.music.LyricItemObj; -import coloryr.allmusic.core.utils.Function; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.api.music.lyric.WLyricObj; +import com.coloryr.allmusic.server.core.objs.music.LyricItemObj; +import com.coloryr.allmusic.server.core.utils.Function; import java.util.*; import java.util.regex.Matcher; diff --git a/core/music/play/LyricSave.java b/core/music/play/LyricSave.java index cb326a14..8e8daa18 100644 --- a/core/music/play/LyricSave.java +++ b/core/music/play/LyricSave.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.music.play; +package com.coloryr.allmusic.server.core.music.play; -import coloryr.allmusic.core.objs.music.LyricItemObj; +import com.coloryr.allmusic.server.core.objs.music.LyricItemObj; import java.util.*; diff --git a/core/music/play/MusicSearch.java b/core/music/play/MusicSearch.java index f5f75bd8..1bbf459b 100644 --- a/core/music/play/MusicSearch.java +++ b/core/music/play/MusicSearch.java @@ -1,9 +1,9 @@ -package coloryr.allmusic.core.music.play; +package com.coloryr.allmusic.server.core.music.play; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SearchPageObj; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SearchPageObj; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/core/music/play/PlayGo.java b/core/music/play/PlayGo.java index d7c6d002..acfcf2f5 100644 --- a/core/music/play/PlayGo.java +++ b/core/music/play/PlayGo.java @@ -1,9 +1,9 @@ -package coloryr.allmusic.core.music.play; +package com.coloryr.allmusic.server.core.music.play; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.utils.HudUtils; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.utils.HudUtils; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import java.util.List; import java.util.concurrent.Executors; diff --git a/core/music/play/PlayMusic.java b/core/music/play/PlayMusic.java index 74b9701d..31eeb1e0 100644 --- a/core/music/play/PlayMusic.java +++ b/core/music/play/PlayMusic.java @@ -1,12 +1,12 @@ -package coloryr.allmusic.core.music.play; +package com.coloryr.allmusic.server.core.music.play; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.decoder.Bitstream; -import coloryr.allmusic.core.decoder.Header; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.sql.DataSql; -import coloryr.allmusic.core.utils.Logs; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.decoder.Bitstream; +import com.coloryr.allmusic.server.core.decoder.Header; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.sql.DataSql; +import com.coloryr.allmusic.server.core.utils.Logs; import java.io.BufferedInputStream; import java.net.URL; diff --git a/core/music/play/TopLyricSave.java b/core/music/play/TopLyricSave.java index 553a86f3..a11e57e8 100644 --- a/core/music/play/TopLyricSave.java +++ b/core/music/play/TopLyricSave.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.music.play; +package com.coloryr.allmusic.server.core.music.play; public class TopLyricSave extends LyricSave { diff --git a/core/objs/CookieObj.java b/core/objs/CookieObj.java index 28d69bbd..4fc609e3 100644 --- a/core/objs/CookieObj.java +++ b/core/objs/CookieObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs; +package com.coloryr.allmusic.server.core.objs; import okhttp3.Cookie; diff --git a/core/objs/HttpResObj.java b/core/objs/HttpResObj.java index 103a44f7..161fc281 100644 --- a/core/objs/HttpResObj.java +++ b/core/objs/HttpResObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs; +package com.coloryr.allmusic.server.core.objs; public class HttpResObj { public final String data; diff --git a/core/objs/SearchMusicObj.java b/core/objs/SearchMusicObj.java index e0d70963..bae70f41 100644 --- a/core/objs/SearchMusicObj.java +++ b/core/objs/SearchMusicObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs; +package com.coloryr.allmusic.server.core.objs; public class SearchMusicObj { public final String id; diff --git a/core/objs/api/EncResObj.java b/core/objs/api/EncResObj.java index 7409dad0..cd46e1ca 100644 --- a/core/objs/api/EncResObj.java +++ b/core/objs/api/EncResObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.api; +package com.coloryr.allmusic.server.core.objs.api; public class EncResObj { public String params; diff --git a/core/objs/api/music/info/InfoObj.java b/core/objs/api/music/info/InfoObj.java index 67ad7a31..5cf45e6f 100644 --- a/core/objs/api/music/info/InfoObj.java +++ b/core/objs/api/music/info/InfoObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.api.music.info; +package com.coloryr.allmusic.server.core.objs.api.music.info; import java.util.List; diff --git a/core/objs/api/music/info/PlayObj.java b/core/objs/api/music/info/PlayObj.java index 3901e43f..f596ab27 100644 --- a/core/objs/api/music/info/PlayObj.java +++ b/core/objs/api/music/info/PlayObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.api.music.info; +package com.coloryr.allmusic.server.core.objs.api.music.info; import java.util.List; diff --git a/core/objs/api/music/list/DataObj.java b/core/objs/api/music/list/DataObj.java index 4620e9ca..6626a001 100644 --- a/core/objs/api/music/list/DataObj.java +++ b/core/objs/api/music/list/DataObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.api.music.list; +package com.coloryr.allmusic.server.core.objs.api.music.list; import java.util.ArrayList; import java.util.List; diff --git a/core/objs/api/music/lyric/WLyricObj.java b/core/objs/api/music/lyric/WLyricObj.java index 7822afd7..5d329f36 100644 --- a/core/objs/api/music/lyric/WLyricObj.java +++ b/core/objs/api/music/lyric/WLyricObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.api.music.lyric; +package com.coloryr.allmusic.server.core.objs.api.music.lyric; public class WLyricObj { private lrc lrc; diff --git a/core/objs/api/music/search/SearchDataObj.java b/core/objs/api/music/search/SearchDataObj.java index 89f269e7..ff1bc0b3 100644 --- a/core/objs/api/music/search/SearchDataObj.java +++ b/core/objs/api/music/search/SearchDataObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.api.music.search; +package com.coloryr.allmusic.server.core.objs.api.music.search; import java.util.List; diff --git a/core/objs/api/music/search/songs.java b/core/objs/api/music/search/songs.java index 8364dbd8..4c4d934f 100644 --- a/core/objs/api/music/search/songs.java +++ b/core/objs/api/music/search/songs.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.api.music.search; +package com.coloryr.allmusic.server.core.objs.api.music.search; import java.util.List; diff --git a/core/objs/api/music/trialinfo/TrialInfoObj.java b/core/objs/api/music/trialinfo/TrialInfoObj.java index 009f8bf2..69e2d177 100644 --- a/core/objs/api/music/trialinfo/TrialInfoObj.java +++ b/core/objs/api/music/trialinfo/TrialInfoObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.api.music.trialinfo; +package com.coloryr.allmusic.server.core.objs.api.music.trialinfo; import java.util.List; diff --git a/core/objs/api/music/trialinfo/freeTrialInfo.java b/core/objs/api/music/trialinfo/freeTrialInfo.java index 3753496b..a49472b5 100644 --- a/core/objs/api/music/trialinfo/freeTrialInfo.java +++ b/core/objs/api/music/trialinfo/freeTrialInfo.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.api.music.trialinfo; +package com.coloryr.allmusic.server.core.objs.api.music.trialinfo; public class freeTrialInfo { private int start; diff --git a/core/objs/api/program/info/PrInfoObj.java b/core/objs/api/program/info/PrInfoObj.java index e8692207..2748a148 100644 --- a/core/objs/api/program/info/PrInfoObj.java +++ b/core/objs/api/program/info/PrInfoObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.api.program.info; +package com.coloryr.allmusic.server.core.objs.api.program.info; public class PrInfoObj { diff --git a/core/objs/config/ConfigObj.java b/core/objs/config/ConfigObj.java index 9c85fe08..a606c618 100644 --- a/core/objs/config/ConfigObj.java +++ b/core/objs/config/ConfigObj.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.objs.config; +package com.coloryr.allmusic.server.core.objs.config; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; import java.util.HashSet; import java.util.Set; diff --git a/core/objs/config/EconomyObj.java b/core/objs/config/EconomyObj.java index 3a0a558c..8e5d079a 100644 --- a/core/objs/config/EconomyObj.java +++ b/core/objs/config/EconomyObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.config; +package com.coloryr.allmusic.server.core.objs.config; public class EconomyObj { public String mysqlUrl; diff --git a/core/objs/config/FunConfigObj.java b/core/objs/config/FunConfigObj.java index d6e1dfc8..2d84ca4d 100644 --- a/core/objs/config/FunConfigObj.java +++ b/core/objs/config/FunConfigObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.config; +package com.coloryr.allmusic.server.core.objs.config; public class FunConfigObj { public boolean rain; diff --git a/core/objs/config/SaveObj.java b/core/objs/config/SaveObj.java index 8e23c3ff..c52f28d1 100644 --- a/core/objs/config/SaveObj.java +++ b/core/objs/config/SaveObj.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.core.objs.config; +package com.coloryr.allmusic.server.core.objs.config; -import coloryr.allmusic.core.objs.enums.HudDirType; -import coloryr.allmusic.core.objs.hud.PosObj; +import com.coloryr.allmusic.server.core.objs.enums.HudDirType; +import com.coloryr.allmusic.server.core.objs.hud.PosObj; public class SaveObj { public PosObj list; diff --git a/core/objs/enums/ComType.java b/core/objs/enums/ComType.java index 7cb7cdd1..23b7e5ca 100644 --- a/core/objs/enums/ComType.java +++ b/core/objs/enums/ComType.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.enums; +package com.coloryr.allmusic.server.core.objs.enums; public enum ComType { LYRIC, INFO, LIST, PLAY, IMG, diff --git a/core/objs/enums/EncryptType.java b/core/objs/enums/EncryptType.java index 17e9a387..9222b55b 100644 --- a/core/objs/enums/EncryptType.java +++ b/core/objs/enums/EncryptType.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.enums; +package com.coloryr.allmusic.server.core.objs.enums; public enum EncryptType { WEAPI, EAPI, API diff --git a/core/objs/enums/HudDirType.java b/core/objs/enums/HudDirType.java index dc7a39b5..f3de59d7 100644 --- a/core/objs/enums/HudDirType.java +++ b/core/objs/enums/HudDirType.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.enums; +package com.coloryr.allmusic.server.core.objs.enums; public enum HudDirType { TOP_LEFT, TOP_CENTER, TOP_RIGHT, diff --git a/core/objs/enums/HudType.java b/core/objs/enums/HudType.java index 20f156cc..e178e4e8 100644 --- a/core/objs/enums/HudType.java +++ b/core/objs/enums/HudType.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.enums; +package com.coloryr.allmusic.server.core.objs.enums; public enum HudType { INFO, LIST, LYRIC, PIC diff --git a/core/objs/hud/PosObj.java b/core/objs/hud/PosObj.java index 26b70b57..a3883aa0 100644 --- a/core/objs/hud/PosObj.java +++ b/core/objs/hud/PosObj.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.objs.hud; +package com.coloryr.allmusic.server.core.objs.hud; -import coloryr.allmusic.core.objs.enums.HudDirType; +import com.coloryr.allmusic.server.core.objs.enums.HudDirType; public class PosObj { public int x; diff --git a/core/objs/message/AddMusicObj.java b/core/objs/message/AddMusicObj.java index 4e06377b..21dbaba6 100644 --- a/core/objs/message/AddMusicObj.java +++ b/core/objs/message/AddMusicObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class AddMusicObj { public String listFull; diff --git a/core/objs/message/CancelObj.java b/core/objs/message/CancelObj.java index 3df3f5d1..7d218755 100644 --- a/core/objs/message/CancelObj.java +++ b/core/objs/message/CancelObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class CancelObj { public String done; diff --git a/core/objs/message/ClickObj.java b/core/objs/message/ClickObj.java index cbf25213..13d6d208 100644 --- a/core/objs/message/ClickObj.java +++ b/core/objs/message/ClickObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class ClickObj { public String clickRun; diff --git a/core/objs/message/CommandObj.java b/core/objs/message/CommandObj.java index 537e75b0..7615a7e9 100644 --- a/core/objs/message/CommandObj.java +++ b/core/objs/message/CommandObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class CommandObj { public String error; diff --git a/core/objs/message/CostObj.java b/core/objs/message/CostObj.java index 62a9c1c8..aa7f69e1 100644 --- a/core/objs/message/CostObj.java +++ b/core/objs/message/CostObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class CostObj { public String search; diff --git a/core/objs/message/CustomObj.java b/core/objs/message/CustomObj.java index 35d2ad3d..448006d8 100644 --- a/core/objs/message/CustomObj.java +++ b/core/objs/message/CustomObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class CustomObj { public String info; diff --git a/core/objs/message/FunObj.java b/core/objs/message/FunObj.java index fa700099..cdc304d1 100644 --- a/core/objs/message/FunObj.java +++ b/core/objs/message/FunObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class FunObj { public String rain; diff --git a/core/objs/message/HelpAdminObj.java b/core/objs/message/HelpAdminObj.java index c4575312..c526a0bf 100644 --- a/core/objs/message/HelpAdminObj.java +++ b/core/objs/message/HelpAdminObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class HelpAdminObj { public String reload; diff --git a/core/objs/message/HelpNormalObj.java b/core/objs/message/HelpNormalObj.java index 5d30c84b..55b93d46 100644 --- a/core/objs/message/HelpNormalObj.java +++ b/core/objs/message/HelpNormalObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class HelpNormalObj { public String head; diff --git a/core/objs/message/HelpObj.java b/core/objs/message/HelpObj.java index 1f3fbf4c..9ec8902c 100644 --- a/core/objs/message/HelpObj.java +++ b/core/objs/message/HelpObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class HelpObj { public HelpNormalObj normal; diff --git a/core/objs/message/HudNameObj.java b/core/objs/message/HudNameObj.java index 76f93a34..449619fb 100644 --- a/core/objs/message/HudNameObj.java +++ b/core/objs/message/HudNameObj.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; -import coloryr.allmusic.core.objs.enums.HudType; -import coloryr.allmusic.core.objs.enums.HudDirType; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.objs.enums.HudDirType; public class HudNameObj { public String list; diff --git a/core/objs/message/HudObj.java b/core/objs/message/HudObj.java index 31c12157..631938c0 100644 --- a/core/objs/message/HudObj.java +++ b/core/objs/message/HudObj.java @@ -1,10 +1,11 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class HudObj { public String state; public String set; public String set1; public String set2; + public String set3; public String reset; public String emptyMusic; public String emptyList; @@ -26,6 +27,8 @@ public class HudObj { return true; if (set2 == null) return true; + if (set3 == null) + return true; if (reset == null) return true; if (emptyMusic == null) @@ -54,13 +57,14 @@ public class HudObj { set = "§d[AllMusic3]§e已设置[%Hud%]的坐标为[%x%, %y%]"; set1 = "§d[AllMusic3]§e已设置[%Hud%]的对齐方式为[%Dir%]"; set2 = "§d[AllMusic3]§e已设置[%Hud%]的颜色为[%Color%]"; + set3 = "§d[AllMusic3]§e已设置[%Hud%]的阴影为[%State%]"; reset = "§d[AllMusic3]§e界面[%Hud%]恢复至默认位置"; emptyMusic = "没有播放的音乐"; emptyList = "队列中无歌曲"; emptyLyric = "无歌词"; - picSize = "§d[AllMusic3]§e设置图片尺寸为%Size%"; - picRotate = "§d[AllMusic3]§e设置图片旋转为%State%"; - picSpeed = "§d[AllMusic3]§e设置图片旋转速度为%Size%"; + picSize = "§d[AllMusic3]§e设置图片尺寸为[%Size%]"; + picRotate = "§d[AllMusic3]§e设置图片旋转为[%State%]"; + picSpeed = "§d[AllMusic3]§e设置图片旋转速度为[%Size%]"; music = "%Name% %AllTime%/%NowTime%\n%Author%\n%Alia%\n%Al%\nby: %Player%"; lyric = "%Lyric%\n%Tlyric%"; ktv = "§e%KLyric%§f%Lyric%§r\n%Tlyric%"; diff --git a/core/objs/message/ListMusicObj.java b/core/objs/message/ListMusicObj.java index 0189ab78..e99c11f4 100644 --- a/core/objs/message/ListMusicObj.java +++ b/core/objs/message/ListMusicObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class ListMusicObj { public String head; diff --git a/core/objs/message/LyricObj.java b/core/objs/message/LyricObj.java index 6d76c6c8..d8f8f501 100644 --- a/core/objs/message/LyricObj.java +++ b/core/objs/message/LyricObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class LyricObj { public String data; diff --git a/core/objs/message/MessageObj.java b/core/objs/message/MessageObj.java index b4d15e3f..c94e8e6e 100644 --- a/core/objs/message/MessageObj.java +++ b/core/objs/message/MessageObj.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; public class MessageObj { public MusicPlayObj musicPlay; diff --git a/core/objs/message/MusicPlayObj.java b/core/objs/message/MusicPlayObj.java index ef011033..a16f12e6 100644 --- a/core/objs/message/MusicPlayObj.java +++ b/core/objs/message/MusicPlayObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class MusicPlayObj { public String stopPlaying; diff --git a/core/objs/message/PAPIObj.java b/core/objs/message/PAPIObj.java index 56a57309..21ac0887 100644 --- a/core/objs/message/PAPIObj.java +++ b/core/objs/message/PAPIObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class PAPIObj { public String emptyMusic; diff --git a/core/objs/message/PageObj.java b/core/objs/message/PageObj.java index 3e180f91..81aa225f 100644 --- a/core/objs/message/PageObj.java +++ b/core/objs/message/PageObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class PageObj { public String choice; diff --git a/core/objs/message/PushObj.java b/core/objs/message/PushObj.java index 36f83e43..5b5ed084 100644 --- a/core/objs/message/PushObj.java +++ b/core/objs/message/PushObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class PushObj { public String noPermission; diff --git a/core/objs/message/SearchObj.java b/core/objs/message/SearchObj.java index 5fe8eae0..fbc6da49 100644 --- a/core/objs/message/SearchObj.java +++ b/core/objs/message/SearchObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class SearchObj { public String noPer; diff --git a/core/objs/message/VoteObj.java b/core/objs/message/VoteObj.java index cfc23134..1840f638 100644 --- a/core/objs/message/VoteObj.java +++ b/core/objs/message/VoteObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.message; +package com.coloryr.allmusic.server.core.objs.message; public class VoteObj { public String noPermission; diff --git a/core/objs/music/LyricItemObj.java b/core/objs/music/LyricItemObj.java index 0fbbea3a..d8833513 100644 --- a/core/objs/music/LyricItemObj.java +++ b/core/objs/music/LyricItemObj.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.objs.music; +package com.coloryr.allmusic.server.core.objs.music; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; public class LyricItemObj { public String lyric; diff --git a/core/objs/music/MusicObj.java b/core/objs/music/MusicObj.java index 93ebb0a5..1eec7ef0 100644 --- a/core/objs/music/MusicObj.java +++ b/core/objs/music/MusicObj.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.objs.music; +package com.coloryr.allmusic.server.core.objs.music; public class MusicObj { /** diff --git a/core/objs/music/SearchPageObj.java b/core/objs/music/SearchPageObj.java index 0170c970..deb527b4 100644 --- a/core/objs/music/SearchPageObj.java +++ b/core/objs/music/SearchPageObj.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.objs.music; +package com.coloryr.allmusic.server.core.objs.music; -import coloryr.allmusic.core.objs.SearchMusicObj; +import com.coloryr.allmusic.server.core.objs.SearchMusicObj; import java.util.List; diff --git a/core/objs/music/SongInfoObj.java b/core/objs/music/SongInfoObj.java index c5115b85..abc85817 100644 --- a/core/objs/music/SongInfoObj.java +++ b/core/objs/music/SongInfoObj.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.core.objs.music; +package com.coloryr.allmusic.server.core.objs.music; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.api.music.trialinfo.freeTrialInfo; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.api.music.trialinfo.freeTrialInfo; public class SongInfoObj { /** diff --git a/core/objs/music/TopSongInfoObj.java b/core/objs/music/TopSongInfoObj.java index 7869fe4a..48084aa3 100644 --- a/core/objs/music/TopSongInfoObj.java +++ b/core/objs/music/TopSongInfoObj.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.objs.music; +package com.coloryr.allmusic.server.core.objs.music; -import coloryr.allmusic.core.objs.api.music.trialinfo.freeTrialInfo; +import com.coloryr.allmusic.server.core.objs.api.music.trialinfo.freeTrialInfo; public class TopSongInfoObj extends SongInfoObj { public TopSongInfoObj() { diff --git a/core/side/IMyLogger.java b/core/side/IMyLogger.java index 427829e4..ed347d04 100644 --- a/core/side/IMyLogger.java +++ b/core/side/IMyLogger.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.side; +package com.coloryr.allmusic.server.core.side; public interface IMyLogger { void warning(String data); diff --git a/core/side/ISide.java b/core/side/ISide.java index a5abaaea..25f51313 100644 --- a/core/side/ISide.java +++ b/core/side/ISide.java @@ -1,9 +1,9 @@ -package coloryr.allmusic.core.side; +package com.coloryr.allmusic.server.core.side; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.enums.HudType; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import java.util.List; diff --git a/core/sql/DataSql.java b/core/sql/DataSql.java index d88d4998..7b4436f6 100644 --- a/core/sql/DataSql.java +++ b/core/sql/DataSql.java @@ -1,11 +1,11 @@ -package coloryr.allmusic.core.sql; +package com.coloryr.allmusic.server.core.sql; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.objs.enums.HudDirType; -import coloryr.allmusic.core.utils.HudUtils; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.hud.PosObj; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.objs.enums.HudDirType; +import com.coloryr.allmusic.server.core.utils.HudUtils; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.hud.PosObj; import java.io.File; import java.sql.*; diff --git a/core/sql/IEconomy.java b/core/sql/IEconomy.java index 385d16f3..eb54c712 100644 --- a/core/sql/IEconomy.java +++ b/core/sql/IEconomy.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.sql; +package com.coloryr.allmusic.server.core.sql; public interface IEconomy { boolean check(String name, int cost); diff --git a/core/utils/Function.java b/core/utils/Function.java index f37aba59..4807ff18 100644 --- a/core/utils/Function.java +++ b/core/utils/Function.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.core.utils; +package com.coloryr.allmusic.server.core.utils; import java.util.regex.Pattern; diff --git a/core/utils/HudUtils.java b/core/utils/HudUtils.java index 8acdefc4..b5819b42 100644 --- a/core/utils/HudUtils.java +++ b/core/utils/HudUtils.java @@ -1,14 +1,14 @@ -package coloryr.allmusic.core.utils; +package com.coloryr.allmusic.server.core.utils; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.enums.HudType; -import coloryr.allmusic.core.music.play.LyricSave; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.enums.HudDirType; -import coloryr.allmusic.core.objs.hud.PosObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.sql.DataSql; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.music.play.LyricSave; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.enums.HudDirType; +import com.coloryr.allmusic.server.core.objs.hud.PosObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.sql.DataSql; import com.google.gson.Gson; import java.util.Locale; @@ -446,4 +446,57 @@ public class HudUtils { return true; } + + public static boolean setShadow(String name, HudType pos, String arg) { + SaveObj obj = get(name); + boolean res = false; + boolean value = false; + boolean have = false; + if (arg != null) { + try { + value = Boolean.parseBoolean(arg); + have = true; + } catch (Exception e) { + return false; + } + } + if (obj == null) { + obj = AllMusic.getConfig().defaultHud.copy(); + if (have) { + res = obj.info.shadow = obj.list.shadow = obj.lyric.shadow = obj.pic.shadow = value; + } else { + res = obj.info.shadow = obj.list.shadow = obj.lyric.shadow = obj.pic.shadow = true; + } + } else { + if (pos == null) { + if (have) { + res = obj.info.shadow = obj.list.shadow = obj.lyric.shadow = obj.pic.shadow = value; + } else if (obj.info.shadow && obj.list.shadow && obj.lyric.shadow && obj.pic.shadow) { + obj.info.shadow = obj.list.shadow = obj.lyric.shadow = obj.pic.shadow = false; + } else { + res = obj.info.shadow = obj.list.shadow = obj.lyric.shadow = obj.pic.shadow = true; + } + } else { + switch (pos) { + case INFO: + res = obj.info.shadow = have ? value : !obj.info.shadow; + break; + case LIST: + res = obj.list.shadow = have ? value : !obj.list.shadow; + break; + case LYRIC: + res = obj.lyric.shadow = have ? value : !obj.lyric.shadow; + break; + case PIC: + res = obj.pic.shadow = have ? value : !obj.pic.shadow; + break; + } + } + } + + addAndSave(name, obj); + HudUtils.sendHudPos(name); + + return res; + } } diff --git a/core/utils/Logs.java b/core/utils/Logs.java index 60bb3af5..eefd8992 100644 --- a/core/utils/Logs.java +++ b/core/utils/Logs.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.core.utils; +package com.coloryr.allmusic.server.core.utils; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; import java.io.File; import java.io.FileWriter; diff --git a/fabric_1_16_5/gradle.properties b/fabric_1_16_5/gradle.properties index 8141b53f..53c00566 100644 --- a/fabric_1_16_5/gradle.properties +++ b/fabric_1_16_5/gradle.properties @@ -10,8 +10,8 @@ loader_version=0.15.6 fabric_kotlin_version=1.9.1+kotlin.1.8.10 # Mod Properties -mod_version = 2.19.4 -maven_group = coloryr.allmusic +mod_version = 3.0.0 +maven_group = com.coloryr.allmusic.server archives_base_name =[Fabric1.16.5]AllMusic_Server # Dependencies diff --git a/fabric_1_16_5/src/main/java/coloryr/allmusic/AllMusicFabric.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java similarity index 81% rename from fabric_1_16_5/src/main/java/coloryr/allmusic/AllMusicFabric.java rename to fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index b4e9ba1d..1c5dd516 100644 --- a/fabric_1_16_5/src/main/java/coloryr/allmusic/AllMusicFabric.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -1,9 +1,9 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.side.fabric.CommandFabric; -import coloryr.allmusic.side.fabric.LogFabric; -import coloryr.allmusic.side.fabric.SideFabric; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.side.fabric.CommandFabric; +import com.coloryr.allmusic.server.side.fabric.LogFabric; +import com.coloryr.allmusic.server.side.fabric.SideFabric; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; @@ -37,9 +37,7 @@ public class AllMusicFabric implements ModInitializer { ServerLifecycleEvents.SERVER_STARTED.register((a)->{ server = a; - AllMusic.start(); - Tasks.init(); }); diff --git a/fabric_1_18_2/src/main/java/coloryr/allmusic/TaskItem.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/TaskItem.java similarity index 66% rename from fabric_1_18_2/src/main/java/coloryr/allmusic/TaskItem.java rename to fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/TaskItem.java index ed368410..40f9a5b9 100644 --- a/fabric_1_18_2/src/main/java/coloryr/allmusic/TaskItem.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/TaskItem.java @@ -1,4 +1,4 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; public class TaskItem { public int tick; diff --git a/fabric_1_20/src/main/java/coloryr/allmusic/Tasks.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java similarity index 55% rename from fabric_1_20/src/main/java/coloryr/allmusic/Tasks.java rename to fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java index 9092f53a..c70e7f5e 100644 --- a/fabric_1_20/src/main/java/coloryr/allmusic/Tasks.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -1,4 +1,4 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; import java.util.ArrayList; import java.util.List; @@ -12,20 +12,16 @@ public class Tasks { } public static void tick() { - synchronized (taskItems) { - for(var item : taskItems){ - item.tick--; - if (item.tick == 0) { - taskItems.remove(item); - item.run.run(); - } + for (var item : new ArrayList<>(taskItems)) { + item.tick--; + if (item.tick <= 0) { + taskItems.remove(item); + item.run.run(); } } } public static void add(TaskItem item) { - synchronized (taskItems) { - taskItems.add(item); - } + taskItems.add(item); } } diff --git a/fabric_1_16_5/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java similarity index 88% rename from fabric_1_16_5/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java rename to fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java index 99af0828..f2202533 100644 --- a/fabric_1_16_5/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.mixin; +package com.coloryr.allmusic.server.mixin; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; diff --git a/fabric_1_19_2/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java similarity index 89% rename from fabric_1_19_2/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java rename to fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index d8cf1f78..567dab29 100644 --- a/fabric_1_19_2/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.mixin; +package com.coloryr.allmusic.server.mixin; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java similarity index 89% rename from fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java rename to fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java index cc8c7df4..d113f897 100644 --- a/fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -1,8 +1,7 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.core.command.TabCommand; -import coloryr.allmusic.mixin.IGetCommandOutput; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.mixin.IGetCommandOutput; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; @@ -56,7 +55,7 @@ public class CommandFabric implements Command, Predicate results = TabCommand.getTabList(context.getSource().getName(), arg); + List results = CommandEX.getTabList(context.getSource().getName(), arg); for (String s : results) { builder.suggest(s); diff --git a/fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java similarity index 65% rename from fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java rename to fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index eee8a27b..8f380d52 100644 --- a/fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -1,10 +1,13 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.network.packet.s2c.play.TitleS2CPacket; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.ClickEvent; import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; import java.util.UUID; @@ -32,4 +35,16 @@ public class FabricApi { var pack = new TitleS2CPacket(TitleS2CPacket.Action.ACTIONBAR, new LiteralText(message)); player.networkHandler.sendPacket(pack); } + + public static void sendMessageBqRun(String message, String end, String command) { + LiteralText send = new LiteralText(message); + LiteralText endText = new LiteralText(end); + endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); + send.append(endText); + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { + player.sendMessage(send, false); + } + } + } } diff --git a/fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java similarity index 61% rename from fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java rename to fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java index 152f81c6..76eb6745 100644 --- a/fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogFabric implements IMyLogger { @Override diff --git a/fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java similarity index 62% rename from fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java rename to fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 9ac1f03e..bce6cad8 100644 --- a/fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -1,18 +1,18 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.TaskItem; -import coloryr.allmusic.Tasks; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.hud.HudUtils; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.side.ComType; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.side.fabric.event.MusicAddEvent; -import coloryr.allmusic.side.fabric.event.MusicPlayEvent; -import com.google.gson.Gson; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.TaskItem; +import com.coloryr.allmusic.server.Tasks; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.enums.ComType; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.utils.HudUtils; +import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; @@ -24,9 +24,10 @@ import net.minecraft.util.ActionResult; import java.io.File; import java.nio.charset.StandardCharsets; +import java.util.List; import java.util.UUID; -public class SideFabric extends ISide { +public class SideFabric extends ISide { @Override public void reload() { @@ -65,23 +66,21 @@ public class SideFabric extends ISide { public boolean needPlay() { int online = getAllPlayer(); for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + if (AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { online--; } } return online > 0; } - @Override - public void send(String data, String player) { - send(AllMusicFabric.server.getPlayerManager().getPlayer(player), data); - } - @Override protected void topSendStop() { try { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); @@ -95,7 +94,9 @@ public class SideFabric extends ISide { var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); if (player == null) return; - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); e.printStackTrace(); @@ -108,7 +109,13 @@ public class SideFabric extends ISide { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (AllMusic.isOK(player.getName().getString(), null, false)) continue; - send(player, ComType.play + url); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + + send(player, buf); + AllMusic.addNowPlayPlayer(player.getName().getString()); } } catch (Exception e) { @@ -125,7 +132,11 @@ public class SideFabric extends ISide { return; if (AllMusic.isOK(player, null, false)) return; - send(ComType.play + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); e.printStackTrace(); @@ -140,9 +151,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnablePic) + if (!obj.pic.enable) continue; - send(player, ComType.img + url); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); @@ -158,7 +174,11 @@ public class SideFabric extends ISide { return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.img + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); e.printStackTrace(); @@ -173,7 +193,11 @@ public class SideFabric extends ISide { return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.pos + pos, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.POS.ordinal()); + buf.writeInt(pos); + + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -188,9 +212,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableLyric) + if (!obj.lyric.enable) continue; - send(player, ComType.lyric + data); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LYRIC.ordinal()); + writeString(buf, data); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); @@ -206,9 +235,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableInfo) + if (!obj.info.enable) continue; - send(player, ComType.info + data); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.INFO.ordinal()); + writeString(buf, data); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); @@ -216,6 +250,59 @@ public class SideFabric extends ISide { } } + @Override + public void sendHudPos(String name) { + try { + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + SaveObj obj = HudUtils.get(name); + String data = AllMusic.gson.toJson(obj); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendHud(String name, HudType pos, String data) { + try { + if (pos == HudType.PIC) { + return; + } + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + + if (AllMusic.isOK(name, null, true)) + return; + + ByteBuf buf = Unpooled.buffer(); + switch (pos) { + case INFO: + buf.writeByte(ComType.INFO.ordinal()); + break; + case LIST: + buf.writeByte(ComType.LIST.ordinal()); + break; + case LYRIC: + buf.writeByte(ComType.LYRIC.ordinal()); + break; + } + writeString(buf, data); + + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + @Override public void sendHudList(String data) { try { @@ -224,9 +311,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableList) + if (!obj.list.enable) continue; - send(player, ComType.list + data); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LIST.ordinal()); + writeString(buf, data); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); @@ -240,8 +332,11 @@ public class SideFabric extends ISide { String Name = player.getName().getString(); try { SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, data); + String data = AllMusic.gson.toJson(obj); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); } catch (Exception e1) { AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); e1.printStackTrace(); @@ -264,9 +359,16 @@ public class SideFabric extends ISide { } @Override - public void clearHud(String player) { + public void clearHud(String name) { try { - send(ComType.clear, player); + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + + send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -277,7 +379,9 @@ public class SideFabric extends ISide { public void clearHud() { try { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, ComType.clear); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); @@ -287,27 +391,32 @@ public class SideFabric extends ISide { @Override public void bq(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendMessage(Text.of(data), false); } } } + @Override + public void bqRun(String message, String end, String command) { + FabricApi.sendMessageBqRun(message, end, command); + } + @Override public void bqt(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } var finalData = Text.of(data); runTask(() -> { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendMessage(finalData, false); } } @@ -360,19 +469,25 @@ public class SideFabric extends ISide { } - private void send(ServerPlayerEntity players, String data) { + @Override + public List getPlayerList() { + return List.of(); + } + + private void send(ServerPlayerEntity players, ByteBuf data) { if (players == null) return; try { - byte[] bytes = data.getBytes(StandardCharsets.UTF_8); - ByteBuf buf = Unpooled.buffer(bytes.length + 1); - buf.writeByte(666); - buf.writeBytes(bytes); - - runTask(() -> ServerPlayNetworking.send(players, AllMusicFabric.ID, new PacketByteBuf(buf))); + runTask(() -> ServerPlayNetworking.send(players, AllMusicFabric.ID, new PacketByteBuf(data))); } catch (Exception e) { AllMusic.log.warning("§c数据发送发生错误"); e.printStackTrace(); } } + + private void writeString(ByteBuf buf, String data) { + byte[] temp = data.getBytes(StandardCharsets.UTF_8); + buf.writeInt(temp.length) + .writeBytes(temp); + } } diff --git a/fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java similarity index 86% rename from fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java rename to fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java index e957ed73..708a509e 100644 --- a/fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.fabric.event; +package com.coloryr.allmusic.server.side.fabric.event; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java similarity index 84% rename from fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java rename to fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java index 73d256f9..45c91861 100644 --- a/fabric_1_16_5/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java +++ b/fabric_1_16_5/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.fabric.event; +package com.coloryr.allmusic.server.side.fabric.event; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; import net.minecraft.util.ActionResult; diff --git a/fabric_1_16_5/src/main/resources/allmusic_server.mixins.json b/fabric_1_16_5/src/main/resources/allmusic_server.mixins.json index c23fb3d3..6aef62a7 100644 --- a/fabric_1_16_5/src/main/resources/allmusic_server.mixins.json +++ b/fabric_1_16_5/src/main/resources/allmusic_server.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "coloryr.allmusic.mixin", + "package": "com.coloryr.allmusic.server.mixin", "compatibilityLevel": "JAVA_17", "server": [ diff --git a/fabric_1_16_5/src/main/resources/fabric.mod.json b/fabric_1_16_5/src/main/resources/fabric.mod.json index c58c83ba..3036060f 100644 --- a/fabric_1_16_5/src/main/resources/fabric.mod.json +++ b/fabric_1_16_5/src/main/resources/fabric.mod.json @@ -9,8 +9,8 @@ "Color_yr" ], "contact": { - "homepage": "https://github.com/Coloryr/AllMusic_Server", - "sources": "https://github.com/Coloryr/AllMusic_Server" + "homepage": "https://github.com/Coloryr/AllMusic3_Server", + "sources": "https://github.com/Coloryr/AllMusic3_Server" }, "license": "GPL-3.0", @@ -19,7 +19,7 @@ "environment": "*", "entrypoints": { "main": [ - "coloryr.allmusic.AllMusicFabric" + "com.coloryr.allmusic.server.AllMusicFabric" ] }, "mixins": [ @@ -32,6 +32,6 @@ "fabric-language-kotlin": ">=1.8.10" }, "suggests": { - "another-mod": "*" + } } \ No newline at end of file diff --git a/fabric_1_18_2/gradle.properties b/fabric_1_18_2/gradle.properties index 3116c675..f56b708e 100644 --- a/fabric_1_18_2/gradle.properties +++ b/fabric_1_18_2/gradle.properties @@ -10,8 +10,8 @@ loader_version=0.15.3 fabric_kotlin_version=1.9.1+kotlin.1.8.10 # Mod Properties -mod_version=2.19.4 -maven_group=coloryr.allmusic +mod_version=3.0.0 +maven_group=com.coloryr.allmusic.server archives_base_name=[Fabric1.18.2]AllMusic_Server # Dependencies diff --git a/fabric_1_18_2/src/main/java/coloryr/allmusic/Tasks.java b/fabric_1_18_2/src/main/java/coloryr/allmusic/Tasks.java deleted file mode 100644 index 243f6ffe..00000000 --- a/fabric_1_18_2/src/main/java/coloryr/allmusic/Tasks.java +++ /dev/null @@ -1,30 +0,0 @@ -package coloryr.allmusic; - -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; - -public class Tasks { - private static final List taskItems = new CopyOnWriteArrayList<>(); - - public static void init() { - AllMusicFabric.server.addServerGuiTickable(Tasks::tick); - } - - public static void tick() { - 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_18_2/src/main/java/coloryr/allmusic/AllMusicFabric.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java similarity index 79% rename from fabric_1_18_2/src/main/java/coloryr/allmusic/AllMusicFabric.java rename to fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index 437231e2..91ae60fa 100644 --- a/fabric_1_18_2/src/main/java/coloryr/allmusic/AllMusicFabric.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -1,10 +1,10 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.side.fabric.CommandFabric; -import coloryr.allmusic.side.fabric.LogFabric; -import coloryr.allmusic.side.fabric.SideFabric; -import coloryr.allmusic.side.fabric.event.MusicAddEvent; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.side.fabric.CommandFabric; +import com.coloryr.allmusic.server.side.fabric.LogFabric; +import com.coloryr.allmusic.server.side.fabric.SideFabric; +import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; diff --git a/fabric_1_16_5/src/main/java/coloryr/allmusic/TaskItem.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java similarity index 66% rename from fabric_1_16_5/src/main/java/coloryr/allmusic/TaskItem.java rename to fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java index ed368410..40f9a5b9 100644 --- a/fabric_1_16_5/src/main/java/coloryr/allmusic/TaskItem.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java @@ -1,4 +1,4 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; public class TaskItem { public int tick; diff --git a/fabric_1_16_5/src/main/java/coloryr/allmusic/Tasks.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/Tasks.java similarity index 55% rename from fabric_1_16_5/src/main/java/coloryr/allmusic/Tasks.java rename to fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/Tasks.java index 9092f53a..c70e7f5e 100644 --- a/fabric_1_16_5/src/main/java/coloryr/allmusic/Tasks.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -1,4 +1,4 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; import java.util.ArrayList; import java.util.List; @@ -12,20 +12,16 @@ public class Tasks { } public static void tick() { - synchronized (taskItems) { - for(var item : taskItems){ - item.tick--; - if (item.tick == 0) { - taskItems.remove(item); - item.run.run(); - } + for (var item : new ArrayList<>(taskItems)) { + item.tick--; + if (item.tick <= 0) { + taskItems.remove(item); + item.run.run(); } } } public static void add(TaskItem item) { - synchronized (taskItems) { - taskItems.add(item); - } + taskItems.add(item); } } diff --git a/fabric_1_19_3/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java similarity index 92% rename from fabric_1_19_3/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java rename to fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java index f5d40705..5c536b4c 100644 --- a/fabric_1_19_3/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.mixin; +package com.coloryr.allmusic.server.mixin; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; diff --git a/fabric_1_20/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java similarity index 85% rename from fabric_1_20/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java rename to fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index df712554..b7129f4a 100644 --- a/fabric_1_20/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.mixin; +package com.coloryr.allmusic.server.mixin; -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; diff --git a/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java similarity index 89% rename from fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java rename to fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java index cc8c7df4..d113f897 100644 --- a/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -1,8 +1,7 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.core.command.TabCommand; -import coloryr.allmusic.mixin.IGetCommandOutput; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.mixin.IGetCommandOutput; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; @@ -56,7 +55,7 @@ public class CommandFabric implements Command, Predicate results = TabCommand.getTabList(context.getSource().getName(), arg); + List results = CommandEX.getTabList(context.getSource().getName(), arg); for (String s : results) { builder.suggest(s); diff --git a/fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java similarity index 67% rename from fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java rename to fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index dc990850..a4d52e82 100644 --- a/fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -1,5 +1,7 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.network.ServerPlayerEntity; @@ -34,4 +36,16 @@ public class FabricApi { var pack = new OverlayMessageS2CPacket(new LiteralText(message)); player.networkHandler.sendPacket(pack); } + + public static void sendMessageBqRun(String message, String end, String command) { + LiteralText send = new LiteralText(message); + LiteralText endText = new LiteralText(end); + endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); + send.append(endText); + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { + player.sendMessage(send, false); + } + } + } } diff --git a/fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java similarity index 61% rename from fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java rename to fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java index 152f81c6..76eb6745 100644 --- a/fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogFabric implements IMyLogger { @Override diff --git a/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java new file mode 100644 index 00000000..bce6cad8 --- /dev/null +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -0,0 +1,493 @@ +package com.coloryr.allmusic.server.side.fabric; + +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.TaskItem; +import com.coloryr.allmusic.server.Tasks; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.enums.ComType; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.utils.HudUtils; +import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.server.command.CommandOutput; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; + +import java.io.File; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.UUID; + +public class SideFabric extends ISide { + + @Override + public void reload() { + String path = "allmusic/"; + new AllMusic().init(new File(path)); + } + + @Override + public int getAllPlayer() { + return AllMusicFabric.server.getCurrentPlayerCount(); + } + + @Override + public void runTask(Runnable run) { + AllMusicFabric.server.execute(run); + } + + @Override + public void runTask(Runnable run1, int delay) { + Tasks.add(new TaskItem() {{ + tick = delay; + run = run1; + }}); + } + + @Override + public boolean checkPermission(String player, String permission) { + var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); + if (player1 == null) + return false; + + return player1.hasPermissionLevel(2); + } + + @Override + public boolean needPlay() { + int online = getAllPlayer(); + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + if (AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { + online--; + } + } + return online > 0; + } + + @Override + protected void topSendStop() { + try { + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + + send(player, buf); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + + @Override + protected void topSendStop(String name) { + try { + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendMusic(String url) { + try { + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + if (AllMusic.isOK(player.getName().getString(), null, false)) + continue; + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + + send(player, buf); + + AllMusic.addNowPlayPlayer(player.getName().getString()); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); + e.printStackTrace(); + } + } + + @Override + protected void topSendMusic(String player, String url) { + try { + var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); + if (player1 == null) + return; + if (AllMusic.isOK(player, null, false)) + return; + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + + send(player1, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendPic(String url) { + try { + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + if (AllMusic.isOK(player.getName().getString(), null, true)) + continue; + String name = player.getName().getString(); + SaveObj obj = HudUtils.get(name); + if (!obj.pic.enable) + continue; + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + + send(player, buf); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendPic(String player, String url) { + try { + var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); + if (player1 == null) + return; + if (AllMusic.isOK(player1.getName().getString(), null, true)) + return; + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + + send(player1, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendPos(String player, int pos) { + try { + var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); + if (player1 == null) + return; + if (AllMusic.isOK(player1.getName().getString(), null, true)) + return; + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.POS.ordinal()); + buf.writeInt(pos); + + send(player1, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); + e.printStackTrace(); + } + } + + @Override + public void sendHudLyric(String data) { + try { + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + if (AllMusic.isOK(player.getName().getString(), null, true)) + continue; + String name = player.getName().getString(); + SaveObj obj = HudUtils.get(name); + if (!obj.lyric.enable) + continue; + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LYRIC.ordinal()); + writeString(buf, data); + + send(player, buf); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendHudInfo(String data) { + try { + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + if (AllMusic.isOK(player.getName().getString(), null, true)) + continue; + String name = player.getName().getString(); + SaveObj obj = HudUtils.get(name); + if (!obj.info.enable) + continue; + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.INFO.ordinal()); + writeString(buf, data); + + send(player, buf); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendHudPos(String name) { + try { + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + SaveObj obj = HudUtils.get(name); + String data = AllMusic.gson.toJson(obj); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendHud(String name, HudType pos, String data) { + try { + if (pos == HudType.PIC) { + return; + } + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + + if (AllMusic.isOK(name, null, true)) + return; + + ByteBuf buf = Unpooled.buffer(); + switch (pos) { + case INFO: + buf.writeByte(ComType.INFO.ordinal()); + break; + case LIST: + buf.writeByte(ComType.LIST.ordinal()); + break; + case LYRIC: + buf.writeByte(ComType.LYRIC.ordinal()); + break; + } + writeString(buf, data); + + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendHudList(String data) { + try { + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + if (AllMusic.isOK(player.getName().getString(), null, true)) + continue; + String name = player.getName().getString(); + SaveObj obj = HudUtils.get(name); + if (!obj.list.enable) + continue; + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LIST.ordinal()); + writeString(buf, data); + + send(player, buf); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendHudUtilsAll() { + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + String Name = player.getName().getString(); + try { + SaveObj obj = HudUtils.get(Name); + String data = AllMusic.gson.toJson(obj); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); + } catch (Exception e1) { + AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); + e1.printStackTrace(); + } + } + } + + @Override + public void sendBar(String data) { + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + try { + if (AllMusic.isOK(player.getName().getString(), null, true)) + continue; + FabricApi.sendBar(player, data); + } catch (Exception e1) { + AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); + e1.printStackTrace(); + } + } + } + + @Override + public void clearHud(String name) { + try { + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); + e.printStackTrace(); + } + } + + @Override + public void clearHud() { + try { + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player, buf); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); + e.printStackTrace(); + } + } + + @Override + public void bq(String data) { + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; + } + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { + player.sendMessage(Text.of(data), false); + } + } + } + + @Override + public void bqRun(String message, String end, String command) { + FabricApi.sendMessageBqRun(message, end, command); + } + + @Override + public void bqt(String data) { + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; + } + var finalData = Text.of(data); + runTask(() -> { + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { + player.sendMessage(finalData, false); + } + } + }); + } + + @Override + public void sendMessaget(Object obj, String message) { + runTask(() -> ((CommandOutput) obj).sendSystemMessage(Text.of(message), UUID.randomUUID())); + } + + @Override + public void sendMessage(Object obj, String message) { + CommandOutput sender = (CommandOutput) obj; + sender.sendSystemMessage(Text.of(message), UUID.randomUUID()); + } + + @Override + public void sendMessageRun(Object obj, String message, String end, String command) { + FabricApi.sendMessageRun(obj, message, end, command); + } + + @Override + public void sendMessageSuggest(Object obj, String message, String end, String command) { + FabricApi.sendMessageSuggest(obj, message, end, command); + } + + @Override + public boolean onMusicPlay(SongInfoObj obj) { + return MusicPlayEvent.EVENT.invoker().interact(obj) != ActionResult.PASS; + } + + @Override + public boolean onMusicAdd(Object obj, MusicObj music) { + return MusicAddEvent.EVENT.invoker().interact((ServerPlayerEntity) obj, music) != ActionResult.PASS; + } + + @Override + public void updateInfo() { + + } + + @Override + public void updateLyric() { + + } + + @Override + public void ping() { + + } + + @Override + public List getPlayerList() { + return List.of(); + } + + private void send(ServerPlayerEntity players, ByteBuf data) { + if (players == null) + return; + try { + runTask(() -> ServerPlayNetworking.send(players, AllMusicFabric.ID, new PacketByteBuf(data))); + } catch (Exception e) { + AllMusic.log.warning("§c数据发送发生错误"); + e.printStackTrace(); + } + } + + private void writeString(ByteBuf buf, String data) { + byte[] temp = data.getBytes(StandardCharsets.UTF_8); + buf.writeInt(temp.length) + .writeBytes(temp); + } +} diff --git a/fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java similarity index 86% rename from fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java rename to fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java index e957ed73..708a509e 100644 --- a/fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.fabric.event; +package com.coloryr.allmusic.server.side.fabric.event; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java similarity index 80% rename from fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java rename to fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java index 6ec2b072..13df4838 100644 --- a/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java +++ b/fabric_1_18_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.fabric.event; +package com.coloryr.allmusic.server.side.fabric.event; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/fabric_1_18_2/src/main/resources/allmusic_server.mixins.json b/fabric_1_18_2/src/main/resources/allmusic_server.mixins.json index c23fb3d3..6aef62a7 100644 --- a/fabric_1_18_2/src/main/resources/allmusic_server.mixins.json +++ b/fabric_1_18_2/src/main/resources/allmusic_server.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "coloryr.allmusic.mixin", + "package": "com.coloryr.allmusic.server.mixin", "compatibilityLevel": "JAVA_17", "server": [ diff --git a/fabric_1_18_2/src/main/resources/assets/allmusic_server/icon.png b/fabric_1_18_2/src/main/resources/assets/allmusic_server/icon.png index 047b91f2..b2b5fa79 100644 Binary files a/fabric_1_18_2/src/main/resources/assets/allmusic_server/icon.png and b/fabric_1_18_2/src/main/resources/assets/allmusic_server/icon.png differ diff --git a/fabric_1_18_2/src/main/resources/fabric.mod.json b/fabric_1_18_2/src/main/resources/fabric.mod.json index 2407764d..d2d9fea7 100644 --- a/fabric_1_18_2/src/main/resources/fabric.mod.json +++ b/fabric_1_18_2/src/main/resources/fabric.mod.json @@ -9,8 +9,8 @@ "Color_yr" ], "contact": { - "homepage": "https://github.com/Coloryr/AllMusic_Server", - "sources": "https://github.com/Coloryr/AllMusic_Server" + "homepage": "https://github.com/Coloryr/AllMusic3_Server", + "sources": "https://github.com/Coloryr/AllMusic3_Server" }, "license": "GPL-3.0", @@ -18,7 +18,7 @@ "environment": "*", "entrypoints": { "main": [ - "coloryr.allmusic.AllMusicFabric" + "com.coloryr.allmusic.server.AllMusicFabric" ] }, "mixins": [ @@ -32,6 +32,6 @@ "fabric-language-kotlin": ">=1.8.10" }, "suggests": { - "another-mod": "*" + } } \ No newline at end of file diff --git a/fabric_1_19_2/gradle.properties b/fabric_1_19_2/gradle.properties index 3abf8c57..b391902b 100644 --- a/fabric_1_19_2/gradle.properties +++ b/fabric_1_19_2/gradle.properties @@ -10,8 +10,8 @@ loader_version=0.15.3 fabric_kotlin_version=1.9.1+kotlin.1.8.10 # Mod Properties -mod_version = 2.19.4 -maven_group = coloryr.allmusic +mod_version = 3.0.0 +maven_group = com.coloryr.allmusic.server archives_base_name =[Fabric1.19.2]AllMusic_Server # Dependencies diff --git a/fabric_1_20/src/main/java/coloryr/allmusic/AllMusicFabric.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java similarity index 79% rename from fabric_1_20/src/main/java/coloryr/allmusic/AllMusicFabric.java rename to fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index 4002b6cb..25ae145d 100644 --- a/fabric_1_20/src/main/java/coloryr/allmusic/AllMusicFabric.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -1,10 +1,10 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.side.fabric.CommandFabric; -import coloryr.allmusic.side.fabric.LogFabric; -import coloryr.allmusic.side.fabric.SideFabric; -import coloryr.allmusic.side.fabric.event.MusicAddEvent; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.side.fabric.CommandFabric; +import com.coloryr.allmusic.server.side.fabric.LogFabric; +import com.coloryr.allmusic.server.side.fabric.SideFabric; +import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; diff --git a/fabric_1_19_2/src/main/java/coloryr/allmusic/TaskItem.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java similarity index 66% rename from fabric_1_19_2/src/main/java/coloryr/allmusic/TaskItem.java rename to fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java index ed368410..40f9a5b9 100644 --- a/fabric_1_19_2/src/main/java/coloryr/allmusic/TaskItem.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java @@ -1,4 +1,4 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; public class TaskItem { public int tick; diff --git a/fabric_1_19_3/src/main/java/coloryr/allmusic/Tasks.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/Tasks.java similarity index 55% rename from fabric_1_19_3/src/main/java/coloryr/allmusic/Tasks.java rename to fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/Tasks.java index 9092f53a..c70e7f5e 100644 --- a/fabric_1_19_3/src/main/java/coloryr/allmusic/Tasks.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -1,4 +1,4 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; import java.util.ArrayList; import java.util.List; @@ -12,20 +12,16 @@ public class Tasks { } public static void tick() { - synchronized (taskItems) { - for(var item : taskItems){ - item.tick--; - if (item.tick == 0) { - taskItems.remove(item); - item.run.run(); - } + for (var item : new ArrayList<>(taskItems)) { + item.tick--; + if (item.tick <= 0) { + taskItems.remove(item); + item.run.run(); } } } public static void add(TaskItem item) { - synchronized (taskItems) { - taskItems.add(item); - } + taskItems.add(item); } } diff --git a/fabric_1_19_2/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java similarity index 92% rename from fabric_1_19_2/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java rename to fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java index f5d40705..5c536b4c 100644 --- a/fabric_1_19_2/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.mixin; +package com.coloryr.allmusic.server.mixin; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; diff --git a/fabric_1_16_5/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java similarity index 89% rename from fabric_1_16_5/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java rename to fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index d8cf1f78..567dab29 100644 --- a/fabric_1_16_5/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.mixin; +package com.coloryr.allmusic.server.mixin; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java similarity index 89% rename from fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java rename to fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java index cc8c7df4..d113f897 100644 --- a/fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -1,8 +1,7 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.core.command.TabCommand; -import coloryr.allmusic.mixin.IGetCommandOutput; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.mixin.IGetCommandOutput; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; @@ -56,7 +55,7 @@ public class CommandFabric implements Command, Predicate results = TabCommand.getTabList(context.getSource().getName(), arg); + List results = CommandEX.getTabList(context.getSource().getName(), arg); for (String s : results) { builder.suggest(s); diff --git a/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java similarity index 64% rename from fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java rename to fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index ff89d9f2..8cd973eb 100644 --- a/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -1,5 +1,7 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.network.ServerPlayerEntity; @@ -31,4 +33,16 @@ public class FabricApi { var pack = new OverlayMessageS2CPacket(Text.literal(message)); player.networkHandler.sendPacket(pack); } + + public static void sendMessageBqRun(String message, String end, String command) { + MutableText send = Text.literal(message); + MutableText endText = Text.literal(end); + endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); + send.append(endText); + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { + player.sendMessage(send, false); + } + } + } } diff --git a/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java similarity index 61% rename from fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java rename to fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java index 152f81c6..76eb6745 100644 --- a/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogFabric implements IMyLogger { @Override diff --git a/fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java similarity index 60% rename from fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java rename to fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 81f9c7b5..2c01d0f8 100644 --- a/fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -1,35 +1,33 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.TaskItem; -import coloryr.allmusic.Tasks; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.hud.HudUtils; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.side.ComType; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.side.fabric.event.MusicAddEvent; -import coloryr.allmusic.side.fabric.event.MusicPlayEvent; -import com.google.gson.Gson; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.TaskItem; +import com.coloryr.allmusic.server.Tasks; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.enums.ComType; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.utils.HudUtils; +import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.network.PacketByteBuf; import net.minecraft.server.command.CommandOutput; -import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import java.io.File; import java.nio.charset.StandardCharsets; -import java.util.Locale; +import java.util.List; import java.util.UUID; -public class SideFabric extends ISide { +public class SideFabric extends ISide { @Override public void reload() { @@ -68,23 +66,21 @@ public class SideFabric extends ISide { public boolean needPlay() { int online = getAllPlayer(); for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + if (AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { online--; } } return online > 0; } - @Override - public void send(String data, String player) { - send(AllMusicFabric.server.getPlayerManager().getPlayer(player), data); - } - @Override protected void topSendStop() { try { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); @@ -98,7 +94,9 @@ public class SideFabric extends ISide { var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); if (player == null) return; - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); e.printStackTrace(); @@ -111,7 +109,13 @@ public class SideFabric extends ISide { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (AllMusic.isOK(player.getName().getString(), null, false)) continue; - send(player, ComType.play + url); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + + send(player, buf); + AllMusic.addNowPlayPlayer(player.getName().getString()); } } catch (Exception e) { @@ -128,7 +132,11 @@ public class SideFabric extends ISide { return; if (AllMusic.isOK(player, null, false)) return; - send(ComType.play + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); e.printStackTrace(); @@ -143,9 +151,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnablePic) + if (!obj.pic.enable) continue; - send(player, ComType.img + url); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); @@ -161,7 +174,11 @@ public class SideFabric extends ISide { return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.img + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); e.printStackTrace(); @@ -176,7 +193,11 @@ public class SideFabric extends ISide { return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.pos + pos, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.POS.ordinal()); + buf.writeInt(pos); + + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -191,9 +212,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableLyric) + if (!obj.lyric.enable) continue; - send(player, ComType.lyric + data); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LYRIC.ordinal()); + writeString(buf, data); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); @@ -209,9 +235,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableInfo) + if (!obj.info.enable) continue; - send(player, ComType.info + data); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.INFO.ordinal()); + writeString(buf, data); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); @@ -219,6 +250,59 @@ public class SideFabric extends ISide { } } + @Override + public void sendHudPos(String name) { + try { + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + SaveObj obj = HudUtils.get(name); + String data = AllMusic.gson.toJson(obj); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendHud(String name, HudType pos, String data) { + try { + if (pos == HudType.PIC) { + return; + } + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + + if (AllMusic.isOK(name, null, true)) + return; + + ByteBuf buf = Unpooled.buffer(); + switch (pos) { + case INFO: + buf.writeByte(ComType.INFO.ordinal()); + break; + case LIST: + buf.writeByte(ComType.LIST.ordinal()); + break; + case LYRIC: + buf.writeByte(ComType.LYRIC.ordinal()); + break; + } + writeString(buf, data); + + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + @Override public void sendHudList(String data) { try { @@ -227,9 +311,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableList) + if (!obj.list.enable) continue; - send(player, ComType.list + data); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LIST.ordinal()); + writeString(buf, data); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); @@ -243,8 +332,11 @@ public class SideFabric extends ISide { String Name = player.getName().getString(); try { SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, data); + String data = AllMusic.gson.toJson(obj); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); } catch (Exception e1) { AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); e1.printStackTrace(); @@ -267,9 +359,16 @@ public class SideFabric extends ISide { } @Override - public void clearHud(String player) { + public void clearHud(String name) { try { - send(ComType.clear, player); + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + + send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -280,7 +379,9 @@ public class SideFabric extends ISide { public void clearHud() { try { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, ComType.clear); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); @@ -290,27 +391,32 @@ public class SideFabric extends ISide { @Override public void bq(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { - player.sendMessage(new LiteralText(data), false); + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { + player.sendMessage(Text.of(data), false); } } } + @Override + public void bqRun(String message, String end, String command) { + FabricApi.sendMessageBqRun(message, end, command); + } + @Override public void bqt(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } - var finalData = new LiteralText(data); + var finalData = Text.of(data); runTask(() -> { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { player.sendMessage(finalData, false); } } @@ -319,13 +425,13 @@ public class SideFabric extends ISide { @Override public void sendMessaget(Object obj, String message) { - runTask(() -> ((CommandOutput) obj).sendSystemMessage(new LiteralText(message), UUID.randomUUID())); + runTask(() -> ((CommandOutput) obj).sendMessage(Text.of(message))); } @Override public void sendMessage(Object obj, String message) { CommandOutput sender = (CommandOutput) obj; - sender.sendSystemMessage(new LiteralText(message), UUID.randomUUID()); + sender.sendMessage(Text.of(message)); } @Override @@ -363,19 +469,25 @@ public class SideFabric extends ISide { } - private void send(ServerPlayerEntity players, String data) { + @Override + public List getPlayerList() { + return List.of(); + } + + private void send(ServerPlayerEntity players, ByteBuf data) { if (players == null) return; try { - byte[] bytes = data.getBytes(StandardCharsets.UTF_8); - ByteBuf buf = Unpooled.buffer(bytes.length + 1); - buf.writeByte(666); - buf.writeBytes(bytes); - - runTask(() -> ServerPlayNetworking.send(players, AllMusicFabric.ID, new PacketByteBuf(buf))); + runTask(() -> ServerPlayNetworking.send(players, AllMusicFabric.ID, new PacketByteBuf(data))); } catch (Exception e) { AllMusic.log.warning("§c数据发送发生错误"); e.printStackTrace(); } } + + private void writeString(ByteBuf buf, String data) { + byte[] temp = data.getBytes(StandardCharsets.UTF_8); + buf.writeInt(temp.length) + .writeBytes(temp); + } } diff --git a/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java similarity index 86% rename from fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java rename to fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java index e957ed73..708a509e 100644 --- a/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.fabric.event; +package com.coloryr.allmusic.server.side.fabric.event; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java similarity index 80% rename from fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java rename to fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java index 6ec2b072..13df4838 100644 --- a/fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java +++ b/fabric_1_19_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.fabric.event; +package com.coloryr.allmusic.server.side.fabric.event; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/fabric_1_19_2/src/main/resources/allmusic_server.mixins.json b/fabric_1_19_2/src/main/resources/allmusic_server.mixins.json index c23fb3d3..6aef62a7 100644 --- a/fabric_1_19_2/src/main/resources/allmusic_server.mixins.json +++ b/fabric_1_19_2/src/main/resources/allmusic_server.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "coloryr.allmusic.mixin", + "package": "com.coloryr.allmusic.server.mixin", "compatibilityLevel": "JAVA_17", "server": [ 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 dd05b278..6c72f556 100644 --- a/fabric_1_19_2/src/main/resources/fabric.mod.json +++ b/fabric_1_19_2/src/main/resources/fabric.mod.json @@ -9,8 +9,8 @@ "Color_yr" ], "contact": { - "homepage": "https://github.com/Coloryr/AllMusic_Server", - "sources": "https://github.com/Coloryr/AllMusic_Server" + "homepage": "https://github.com/Coloryr/AllMusic3_Server", + "sources": "https://github.com/Coloryr/AllMusic3_Server" }, "license": "GPL-3.0", @@ -18,7 +18,7 @@ "environment": "*", "entrypoints": { "main": [ - "coloryr.allmusic.AllMusicFabric" + "com.coloryr.allmusic.server.AllMusicFabric" ] }, "mixins": [ @@ -32,6 +32,6 @@ "fabric-language-kotlin": ">=1.8.10" }, "suggests": { - "another-mod": "*" + } } \ No newline at end of file diff --git a/fabric_1_19_3/gradle.properties b/fabric_1_19_3/gradle.properties index 9f979c6b..a1746ece 100644 --- a/fabric_1_19_3/gradle.properties +++ b/fabric_1_19_3/gradle.properties @@ -9,8 +9,8 @@ yarn_mappings=1.19.3+build.5 loader_version=0.15.3 # Mod Properties -mod_version = 2.19.4 -maven_group = coloryr.allmusic +mod_version = 3.0.0 +maven_group = com.coloryr.allmusic.server archives_base_name =[Fabric1.19.3]AllMusic_Server # Dependencies diff --git a/fabric_1_20_2/src/main/java/coloryr/allmusic/AllMusicFabric.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java similarity index 79% rename from fabric_1_20_2/src/main/java/coloryr/allmusic/AllMusicFabric.java rename to fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index 4002b6cb..25ae145d 100644 --- a/fabric_1_20_2/src/main/java/coloryr/allmusic/AllMusicFabric.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -1,10 +1,10 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.side.fabric.CommandFabric; -import coloryr.allmusic.side.fabric.LogFabric; -import coloryr.allmusic.side.fabric.SideFabric; -import coloryr.allmusic.side.fabric.event.MusicAddEvent; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.side.fabric.CommandFabric; +import com.coloryr.allmusic.server.side.fabric.LogFabric; +import com.coloryr.allmusic.server.side.fabric.SideFabric; +import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; diff --git a/fabric_1_19_3/src/main/java/coloryr/allmusic/TaskItem.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/TaskItem.java similarity index 66% rename from fabric_1_19_3/src/main/java/coloryr/allmusic/TaskItem.java rename to fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/TaskItem.java index ed368410..40f9a5b9 100644 --- a/fabric_1_19_3/src/main/java/coloryr/allmusic/TaskItem.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/TaskItem.java @@ -1,4 +1,4 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; public class TaskItem { public int tick; diff --git a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/Tasks.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/Tasks.java new file mode 100644 index 00000000..c70e7f5e --- /dev/null +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -0,0 +1,27 @@ +package com.coloryr.allmusic.server; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; + +public class Tasks { + private static final List taskItems = new CopyOnWriteArrayList<>(); + + public static void init() { + AllMusicFabric.server.addServerGuiTickable(Tasks::tick); + } + + public static void tick() { + for (var item : new ArrayList<>(taskItems)) { + item.tick--; + if (item.tick <= 0) { + taskItems.remove(item); + item.run.run(); + } + } + } + + public static void add(TaskItem item) { + taskItems.add(item); + } +} diff --git a/fabric_1_18_2/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java similarity index 92% rename from fabric_1_18_2/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java rename to fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java index f5d40705..5c536b4c 100644 --- a/fabric_1_18_2/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.mixin; +package com.coloryr.allmusic.server.mixin; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; diff --git a/fabric_1_19_3/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java similarity index 85% rename from fabric_1_19_3/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java rename to fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index df712554..b7129f4a 100644 --- a/fabric_1_19_3/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.mixin; +package com.coloryr.allmusic.server.mixin; -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; diff --git a/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java new file mode 100644 index 00000000..d113f897 --- /dev/null +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -0,0 +1,66 @@ +package com.coloryr.allmusic.server.side.fabric; + +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.mixin.IGetCommandOutput; +import com.mojang.brigadier.Command; +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.suggestion.SuggestionProvider; +import com.mojang.brigadier.suggestion.Suggestions; +import com.mojang.brigadier.suggestion.SuggestionsBuilder; +import net.minecraft.server.command.CommandManager; +import net.minecraft.server.command.ServerCommandSource; + +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.function.Predicate; + +public class CommandFabric implements Command, Predicate, SuggestionProvider { + public static CommandFabric instance = new CommandFabric(); + + public void register(CommandDispatcher dispatcher) { + dispatcher.register(((CommandManager.literal("music").requires(this)).executes(this)) + .then(CommandManager.argument("args", StringArgumentType.greedyString()) + .suggests(this).executes(this))); + } + + @Override + public int run(CommandContext context) { + var item = context.getSource(); + var source = ((IGetCommandOutput) item).getOutput(); + + var input = context.getInput(); + var temp = input.split(" "); + var arg = new String[temp.length - 1]; + System.arraycopy(temp, 1, arg, 0, arg.length); + + CommandEX.ex(source, context.getSource().getName(), arg); + + return 0; + } + + @Override + public boolean test(ServerCommandSource stack) { + return true; + } + + @Override + public CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var input = context.getInput(); + var temp = input.split(" "); + var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; + System.arraycopy(temp, 1, arg, 0, temp.length - 1); + + if (input.endsWith(" ")) + builder = builder.createOffset(builder.getInput().lastIndexOf(32) + 1); + + List results = CommandEX.getTabList(context.getSource().getName(), arg); + + for (String s : results) { + builder.suggest(s); + } + + return builder.buildFuture(); + } +} \ No newline at end of file diff --git a/fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java similarity index 64% rename from fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java rename to fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index ff89d9f2..8cd973eb 100644 --- a/fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -1,5 +1,7 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.network.ServerPlayerEntity; @@ -31,4 +33,16 @@ public class FabricApi { var pack = new OverlayMessageS2CPacket(Text.literal(message)); player.networkHandler.sendPacket(pack); } + + public static void sendMessageBqRun(String message, String end, String command) { + MutableText send = Text.literal(message); + MutableText endText = Text.literal(end); + endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); + send.append(endText); + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { + player.sendMessage(send, false); + } + } + } } diff --git a/fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java similarity index 61% rename from fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java rename to fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java index 152f81c6..76eb6745 100644 --- a/fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogFabric implements IMyLogger { @Override diff --git a/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java similarity index 60% rename from fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java rename to fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 2b9a0a66..2c01d0f8 100644 --- a/fabric_1_19_2/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -1,18 +1,18 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.TaskItem; -import coloryr.allmusic.Tasks; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.hud.HudUtils; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.side.ComType; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.side.fabric.event.MusicAddEvent; -import coloryr.allmusic.side.fabric.event.MusicPlayEvent; -import com.google.gson.Gson; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.TaskItem; +import com.coloryr.allmusic.server.Tasks; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.enums.ComType; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.utils.HudUtils; +import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; @@ -24,6 +24,8 @@ import net.minecraft.util.ActionResult; import java.io.File; import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.UUID; public class SideFabric extends ISide { @@ -64,23 +66,21 @@ public class SideFabric extends ISide { public boolean needPlay() { int online = getAllPlayer(); for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + if (AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { online--; } } return online > 0; } - @Override - public void send(String data, String player) { - send(AllMusicFabric.server.getPlayerManager().getPlayer(player), data); - } - @Override protected void topSendStop() { try { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); @@ -94,7 +94,9 @@ public class SideFabric extends ISide { var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); if (player == null) return; - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); e.printStackTrace(); @@ -107,7 +109,13 @@ public class SideFabric extends ISide { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (AllMusic.isOK(player.getName().getString(), null, false)) continue; - send(player, ComType.play + url); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + + send(player, buf); + AllMusic.addNowPlayPlayer(player.getName().getString()); } } catch (Exception e) { @@ -124,7 +132,11 @@ public class SideFabric extends ISide { return; if (AllMusic.isOK(player, null, false)) return; - send(ComType.play + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); e.printStackTrace(); @@ -139,9 +151,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnablePic) + if (!obj.pic.enable) continue; - send(player, ComType.img + url); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); @@ -157,7 +174,11 @@ public class SideFabric extends ISide { return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.img + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); e.printStackTrace(); @@ -172,7 +193,11 @@ public class SideFabric extends ISide { return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.pos + pos, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.POS.ordinal()); + buf.writeInt(pos); + + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -187,9 +212,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableLyric) + if (!obj.lyric.enable) continue; - send(player, ComType.lyric + data); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LYRIC.ordinal()); + writeString(buf, data); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); @@ -205,9 +235,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableInfo) + if (!obj.info.enable) continue; - send(player, ComType.info + data); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.INFO.ordinal()); + writeString(buf, data); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); @@ -215,6 +250,59 @@ public class SideFabric extends ISide { } } + @Override + public void sendHudPos(String name) { + try { + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + SaveObj obj = HudUtils.get(name); + String data = AllMusic.gson.toJson(obj); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendHud(String name, HudType pos, String data) { + try { + if (pos == HudType.PIC) { + return; + } + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + + if (AllMusic.isOK(name, null, true)) + return; + + ByteBuf buf = Unpooled.buffer(); + switch (pos) { + case INFO: + buf.writeByte(ComType.INFO.ordinal()); + break; + case LIST: + buf.writeByte(ComType.LIST.ordinal()); + break; + case LYRIC: + buf.writeByte(ComType.LYRIC.ordinal()); + break; + } + writeString(buf, data); + + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + @Override public void sendHudList(String data) { try { @@ -223,9 +311,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableList) + if (!obj.list.enable) continue; - send(player, ComType.list + data); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LIST.ordinal()); + writeString(buf, data); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); @@ -239,8 +332,11 @@ public class SideFabric extends ISide { String Name = player.getName().getString(); try { SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, data); + String data = AllMusic.gson.toJson(obj); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); } catch (Exception e1) { AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); e1.printStackTrace(); @@ -263,9 +359,16 @@ public class SideFabric extends ISide { } @Override - public void clearHud(String player) { + public void clearHud(String name) { try { - send(ComType.clear, player); + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + + send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -276,7 +379,9 @@ public class SideFabric extends ISide { public void clearHud() { try { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, ComType.clear); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); @@ -286,28 +391,33 @@ public class SideFabric extends ISide { @Override public void bq(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { - player.sendMessage(Text.literal(data)); + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { + player.sendMessage(Text.of(data), false); } } } + @Override + public void bqRun(String message, String end, String command) { + FabricApi.sendMessageBqRun(message, end, command); + } + @Override public void bqt(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } - var finalData = Text.literal(data); + var finalData = Text.of(data); runTask(() -> { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { - player.sendMessage(finalData); + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { + player.sendMessage(finalData, false); } } }); @@ -315,13 +425,13 @@ public class SideFabric extends ISide { @Override public void sendMessaget(Object obj, String message) { - runTask(() -> ((CommandOutput) obj).sendMessage(Text.literal(message))); + runTask(() -> ((CommandOutput) obj).sendMessage(Text.of(message))); } @Override public void sendMessage(Object obj, String message) { CommandOutput sender = (CommandOutput) obj; - sender.sendMessage(Text.literal(message)); + sender.sendMessage(Text.of(message)); } @Override @@ -359,19 +469,25 @@ public class SideFabric extends ISide { } - private void send(ServerPlayerEntity players, String data) { + @Override + public List getPlayerList() { + return List.of(); + } + + private void send(ServerPlayerEntity players, ByteBuf data) { if (players == null) return; try { - byte[] bytes = data.getBytes(StandardCharsets.UTF_8); - ByteBuf buf = Unpooled.buffer(bytes.length + 1); - buf.writeByte(666); - buf.writeBytes(bytes); - - runTask(() -> ServerPlayNetworking.send(players, AllMusicFabric.ID, new PacketByteBuf(buf))); + runTask(() -> ServerPlayNetworking.send(players, AllMusicFabric.ID, new PacketByteBuf(data))); } catch (Exception e) { AllMusic.log.warning("§c数据发送发生错误"); e.printStackTrace(); } } + + private void writeString(ByteBuf buf, String data) { + byte[] temp = data.getBytes(StandardCharsets.UTF_8); + buf.writeInt(temp.length) + .writeBytes(temp); + } } diff --git a/fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java similarity index 86% rename from fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java rename to fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java index e957ed73..708a509e 100644 --- a/fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.fabric.event; +package com.coloryr.allmusic.server.side.fabric.event; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java similarity index 80% rename from fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java rename to fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java index 6ec2b072..13df4838 100644 --- a/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java +++ b/fabric_1_19_3/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.fabric.event; +package com.coloryr.allmusic.server.side.fabric.event; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/fabric_1_19_3/src/main/resources/allmusic_server.mixins.json b/fabric_1_19_3/src/main/resources/allmusic_server.mixins.json index c23fb3d3..6aef62a7 100644 --- a/fabric_1_19_3/src/main/resources/allmusic_server.mixins.json +++ b/fabric_1_19_3/src/main/resources/allmusic_server.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "coloryr.allmusic.mixin", + "package": "com.coloryr.allmusic.server.mixin", "compatibilityLevel": "JAVA_17", "server": [ diff --git a/fabric_1_19_3/src/main/resources/config.json b/fabric_1_19_3/src/main/resources/config.json deleted file mode 100644 index ec568863..00000000 --- a/fabric_1_19_3/src/main/resources/config.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "MaxList": 10, - "MinVote": 3, - "Delay": 0, - "KDelay": 0, - "Admin": ["CONSOLE","Color_yr"], - "LoginUser": "", - "NoMusicServer": [], - "NoMusicPlayer": [], - "BanMusic": [], - "PlayList": [], - "PlayListSwitch": true, - "PlayListRandom": true, - "SendLyric": true, - "NeedPermission": false, - "DefaultAddMusic": 0, - "TopPAPI": false, - "MessageLimit": false, - "MessageLimitSize": 40, - "MutePlayMessage": false, - "MuteAddMessage": false, - "ShowInBar": false, - "DefaultHud": { - "List": { - "x": 2, - "y": 74 - }, - "Lyric": { - "x": 74, - "y": 53 - }, - "Info": { - "x": 74, - "y": 2 - }, - "Pic": { - "x": 2, - "y": 2 - }, - "PicRotateSpeed": 10, - "EnablePicRotate": true, - "EnableList": true, - "EnableLyric": true, - "EnableInfo": true, - "EnablePic": true - }, - "Economys": { - "MysqlUrl": "jdbc:mysql://localhost:3306/minecraft?autoReconnect=true&autoReconnectForPools=true", - "Vault": true - }, - "UseCost": false, - "SearchCost": 20, - "AddMusicCost": 10, - "MaxMusicTime": 600, - "KtvMode": true, - "MusicBR": "320000", - "FunConfig": { - "Rain": true, - "RainRate": 10 - }, - "Version": "103" -} \ No newline at end of file diff --git a/fabric_1_19_3/src/main/resources/fabric.mod.json b/fabric_1_19_3/src/main/resources/fabric.mod.json index 84a0d780..05d671e8 100644 --- a/fabric_1_19_3/src/main/resources/fabric.mod.json +++ b/fabric_1_19_3/src/main/resources/fabric.mod.json @@ -9,8 +9,8 @@ "Color_yr" ], "contact": { - "homepage": "https://github.com/Coloryr/AllMusic_Server", - "sources": "https://github.com/Coloryr/AllMusic_Server" + "homepage": "https://github.com/Coloryr/AllMusic3_Server", + "sources": "https://github.com/Coloryr/AllMusic3_Server" }, "license": "GPL-3.0", @@ -19,7 +19,7 @@ "environment": "*", "entrypoints": { "main": [ - "coloryr.allmusic.AllMusicFabric" + "com.coloryr.allmusic.server.AllMusicFabric" ] }, "mixins": [ @@ -34,6 +34,6 @@ "fabric-language-kotlin": ">=1.9.1+kotlin.1.8.10" }, "suggests": { - "another-mod": "*" + } } diff --git a/fabric_1_19_3/src/main/resources/message.json b/fabric_1_19_3/src/main/resources/message.json deleted file mode 100644 index 6a435a90..00000000 --- a/fabric_1_19_3/src/main/resources/message.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "MusicPlay": { - "StopPlay": "§d[AllMusic]§e已停止你的音乐播放", - "NoMusic": "§d[AllMusic]§e无正在播放的歌曲", - "Play": "§d[AllMusic]§e正在播放：%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia% | by: %PlayerName%", - "NoPlay": "§d[AllMusic]§e队列中无歌曲", - "ListMusic": { - "Head": "§d[AllMusic]§e队列中有歌曲数：&Count&", - "Item": "§e%index%->%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia%", - "Get": "§d[AllMusic]§e歌曲列表%ListName%获取成功" - }, - "NoCanPlay": "§d[AllMusic]§c无法播放歌曲%MusicID%可能该歌曲为VIP歌曲", - "NoPlayMusic": "§d[AllMusic]§e你不会再收到点歌了！想要再次参与点歌就点一首歌或者参与切歌投票吧！", - "Switch": "§d[AllMusic]§e切换到玩家歌曲", - "AddMusic": "§d[AllMusic]§e音乐列表添加%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia%", - "CheckMusic": "§d[AllMusic]§2正在解析歌曲%MusicID%", - "MusicInfo": "%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia% | by: %PlayerName%", - "Trail": "§d[AllMusic]§e该音乐为试听音乐", - "Cancel": "§d[AllMusic]§e播放被取消" - }, - "AddMusic": { - "ListFull": "§d[AllMusic]§c错误，队列已满", - "BanMusic": "§d[AllMusic]§c错误，这首歌被禁点了", - "ExistMusic": "§d[AllMusic]§c错误，这首歌已经存在了", - "Success": "§d[AllMusic]§e点歌成功", - "NoPlayer": "§d[AllMusic]§c没有播放的玩家", - "NoID": "§d[AllMusic]§c错误，请输入歌曲数字ID", - "Cancel": "§d[AllMusic]§e点歌被取消", - "TimeOut": "§d[AllMusic]§e点歌被取消，音乐长度过长" - }, - "Page": { - "Choice": "§e%index%->%MusicName% | %MusicAuthor% | %MusicAl%", - "Next": "§e[§n点我下一页§r§e]", - "Last": "§e[§n点我上一页§r§e]" - }, - "Lyric": { - "Data": "%Lyric%", - "TData": "%Lyric%(%TLyric%)" - }, - "Vote": { - "NoPermission": "§d[AllMusic]§c你没有权限切歌", - "DoVote": "§d[AllMusic]§e已发起切歌投票", - "BQ": "§d[AllMusic]§e%PlayerName%发起了切歌投票，30秒后结束，输入/music vote 同意切歌。", - "Agree": "§d[AllMusic]§e你同意切歌", - "BQAgree": "§d[AllMusic]§e%PlayerName%同意切歌，共有%Count%名玩家同意切歌。", - "ARAgree": "§d[AllMusic]§e你已申请切歌", - "TimeOut": "§d[AllMusic]§e切歌时间结束", - "Do": "§d[AllMusic]§e已切歌" - }, - "Search": { - "StartSearch": "§d[AllMusic]§e正在排队搜歌", - "NoPer": "§d[AllMusic]§c你没有权限搜歌", - "CantSearch": "§d[AllMusic]§c无法搜索歌曲：%Music%", - "Res": "§d[AllMusic]§e搜索结果", - "NoSearch": "§d[AllMusic]§c你没有搜索音乐", - "ErrorNum": "§d[AllMusic]§c请输入正确的序号", - "Chose": "§d[AllMusic]§e你选择了序号%Num%", - "CantNext": "§d[AllMusic]§c无法下一页", - "CantLast": "§d[AllMusic]§c无法上一页" - }, - "Hud": { - "State": "§d[AllMusic]§e设置信息位置：%Hud%，状态：%State%", - "Set": "§d[AllMusic]§e已设置%Hud%的坐标为%x%, %y%", - "Reset": "§d[AllMusic]§eHud恢复至默认位置", - "NoMusic": "没有播放的音乐", - "NoList": "队列中无歌曲", - "NoLyric": "无歌词", - "PicSize": "§d[ALLMusic]§e设置图片尺寸为%Size%", - "PicRotate": "§d[AllMusic]§2设置图片旋转为%State%", - "PicRotateSpeed": "§d[AllMusic]§2设置图片旋转速度为%Size%", - "Music": "%Name% %AllTime%/%NowTime%\n%Author%\n%Alia%\n%Al%\nby: %Player%", - "Lyric": "%Lyric%\n%Tlyric%", - "Ktv": "§e%KLyric%§f%Lyric%§r\n%Tlyric%", - "List": "播放列表里面有%Size%首歌\n%List%" - }, - "Command": { - "Error": "§d[AllMusic]§c参数错误，请输入/music help获取帮助", - "NoPer": "§d[AllMusic]§c你没有权限点歌" - }, - "HudList": { - "List": "待播放列表", - "Lyric": "歌词", - "Info": "歌曲信息", - "Pic": "图片", - "All": "所有位置", - "PicRoute": "图片旋转", - "PicRouteSpeed": "图片旋转速度" - }, - "Custom": { - "Info": "自定义音乐" - }, - "PAPI": { - "NoMusic": "没有播放的音乐" - }, - "Cost": { - "Search": "§d[AllMusic]§e你搜歌花费了%Cost%", - "AddMusic": "§d[AllMusic]§e你点歌花费了%Cost%", - "NoMoney": "§d[AllMusic]§c你没有足够的钱", - "CostFail": "§d[ALLMusic]§c扣钱过程中错误" - }, - "Click": { - "This": "§b[§n点我选择§r§b]", - "Check": "§b[§n点我查看§r§b]" - }, - "Help": { - "Normal": { - "Head": "§d[AllMusic]§e帮助手册", - "Base": "§d[AllMusic]§e使用/music [音乐ID] 来点歌", - "Stop": "§d[AllMusic]§e使用/music stop 停止播放歌曲", - "List": "§d[AllMusic]§e使用/music list 查看歌曲队列", - "Vote": "§d[AllMusic]§e使用/music vote 投票切歌", - "NoMusic": "§d[AllMusic]§e使用/music nomusic 不再参与点歌", - "Search": "§d[AllMusic]§e使用/music search [歌名] 搜索歌曲", - "Select": "§d[AllMusic]§e使用/music select [序列] 选择歌曲", - "Hud1": "§d[AllMusic]§e使用/music hud enable [位置] 启用关闭Hud", - "Hud2": "§d[AllMusic]§e使用/music hud [位置] [x] [y] 设置某个Hud的位置", - "Hud3": "§d[AllMusic]§e使用/music hud picsize [尺寸] 设置图片尺寸", - "Hud4": "§d[AllMusic]§e使用/music hud picrotate [开关] 设置图片旋转模式", - "Hud5": "§d[AllMusic]§e使用/music hud picrotatespeed [数值] 设置图片旋转速度" - }, - "Admin": { - "Reload": "§d[AllMusic]§e使用/music reload 重读配置文件", - "Next": "§d[AllMusic]§e使用/music next 强制切歌", - "Ban": "§d[AllMusic]§e使用/music ban [ID] 禁止点这首歌", - "Url": "§d[AllMusic]§e使用/music url [url] 播放一首自定义歌曲", - "Delete": "§d[AllMusic]§e使用/music delete [序号] 删除队列中的歌曲", - "AddList": "§d[AllMusic]§e使用/music addlist [歌单ID] 添加歌单到空闲列表", - "ClearList": "§d[AllMusic]§e使用/music clearlist 清空空闲歌单", - "Login": "§d[AllMusic]§e使用/music login 重新登录账户" - } - }, - "Fun": { - "Rain": "§d[AllMusic]§e天空开始变得湿润" - }, - "Version": "103" -} \ No newline at end of file diff --git a/fabric_1_20/gradle.properties b/fabric_1_20/gradle.properties index 8f46e216..684e012e 100644 --- a/fabric_1_20/gradle.properties +++ b/fabric_1_20/gradle.properties @@ -9,8 +9,8 @@ yarn_mappings=1.20+build.1 loader_version=0.15.3 # Mod Properties -mod_version = 2.19.4 -maven_group = coloryr.allmusic +mod_version = 3.0.0 +maven_group = com.coloryr.allmusic.server archives_base_name =[Fabric1.20]AllMusic_Server # Dependencies diff --git a/fabric_1_20/src/main/java/coloryr/allmusic/TaskItem.java b/fabric_1_20/src/main/java/coloryr/allmusic/TaskItem.java deleted file mode 100644 index ed368410..00000000 --- a/fabric_1_20/src/main/java/coloryr/allmusic/TaskItem.java +++ /dev/null @@ -1,6 +0,0 @@ -package coloryr.allmusic; - -public class TaskItem { - public int tick; - public Runnable run; -} diff --git a/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java b/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java deleted file mode 100644 index cc8c7df4..00000000 --- a/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java +++ /dev/null @@ -1,67 +0,0 @@ -package coloryr.allmusic.side.fabric; - -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.core.command.TabCommand; -import coloryr.allmusic.mixin.IGetCommandOutput; -import com.mojang.brigadier.Command; -import com.mojang.brigadier.CommandDispatcher; -import com.mojang.brigadier.arguments.StringArgumentType; -import com.mojang.brigadier.context.CommandContext; -import com.mojang.brigadier.suggestion.SuggestionProvider; -import com.mojang.brigadier.suggestion.Suggestions; -import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import net.minecraft.server.command.CommandManager; -import net.minecraft.server.command.ServerCommandSource; - -import java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.function.Predicate; - -public class CommandFabric implements Command, Predicate, SuggestionProvider { - public static CommandFabric instance = new CommandFabric(); - - public void register(CommandDispatcher dispatcher) { - dispatcher.register(((CommandManager.literal("music").requires(this)).executes(this)) - .then(CommandManager.argument("args", StringArgumentType.greedyString()) - .suggests(this).executes(this))); - } - - @Override - public int run(CommandContext context) { - var item = context.getSource(); - var source = ((IGetCommandOutput) item).getOutput(); - - var input = context.getInput(); - var temp = input.split(" "); - var arg = new String[temp.length - 1]; - System.arraycopy(temp, 1, arg, 0, arg.length); - - CommandEX.ex(source, context.getSource().getName(), arg); - - return 0; - } - - @Override - public boolean test(ServerCommandSource stack) { - return true; - } - - @Override - public CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) { - var input = context.getInput(); - var temp = input.split(" "); - var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; - System.arraycopy(temp, 1, arg, 0, temp.length - 1); - - if (input.endsWith(" ")) - builder = builder.createOffset(builder.getInput().lastIndexOf(32) + 1); - - List results = TabCommand.getTabList(context.getSource().getName(), arg); - - for (String s : results) { - builder.suggest(s); - } - - return builder.buildFuture(); - } -} \ No newline at end of file diff --git a/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java b/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java deleted file mode 100644 index 152f81c6..00000000 --- a/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java +++ /dev/null @@ -1,16 +0,0 @@ -package coloryr.allmusic.side.fabric; - -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.core.side.IMyLogger; - -public class LogFabric implements IMyLogger { - @Override - public void warning(String data) { - AllMusicFabric.LOGGER.warn(data); - } - - @Override - public void info(String data) { - AllMusicFabric.LOGGER.info(data); - } -} diff --git a/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java b/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java deleted file mode 100644 index 2b9a0a66..00000000 --- a/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java +++ /dev/null @@ -1,377 +0,0 @@ -package coloryr.allmusic.side.fabric; - -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.TaskItem; -import coloryr.allmusic.Tasks; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.hud.HudUtils; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.side.ComType; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.side.fabric.event.MusicAddEvent; -import coloryr.allmusic.side.fabric.event.MusicPlayEvent; -import com.google.gson.Gson; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.server.command.CommandOutput; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.Text; -import net.minecraft.util.ActionResult; - -import java.io.File; -import java.nio.charset.StandardCharsets; - -public class SideFabric extends ISide { - - @Override - public void reload() { - String path = "allmusic/"; - new AllMusic().init(new File(path)); - } - - @Override - public int getAllPlayer() { - return AllMusicFabric.server.getCurrentPlayerCount(); - } - - @Override - public void runTask(Runnable run) { - AllMusicFabric.server.execute(run); - } - - @Override - public void runTask(Runnable run1, int delay) { - Tasks.add(new TaskItem() {{ - tick = delay; - run = run1; - }}); - } - - @Override - public boolean checkPermission(String player, String permission) { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return false; - - return player1.hasPermissionLevel(2); - } - - @Override - public boolean needPlay() { - int online = getAllPlayer(); - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { - online--; - } - } - return online > 0; - } - - @Override - public void send(String data, String player) { - send(AllMusicFabric.server.getPlayerManager().getPlayer(player), data); - } - - @Override - protected void topSendStop() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, ComType.stop); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void topSendStop(String name) { - try { - var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); - if (player == null) - return; - send(player, ComType.stop); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendMusic(String url) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isOK(player.getName().getString(), null, false)) - continue; - send(player, ComType.play + url); - AllMusic.addNowPlayPlayer(player.getName().getString()); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - protected void topSendMusic(String player, String url) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isOK(player, null, false)) - return; - send(ComType.play + url, player); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String url) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isOK(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.EnablePic) - continue; - send(player, ComType.img + url); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPic(String player, String url) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isOK(player1.getName().getString(), null, true)) - return; - send(ComType.img + url, player); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendPos(String player, int pos) { - try { - var player1 = AllMusicFabric.server.getPlayerManager().getPlayer(player); - if (player1 == null) - return; - if (AllMusic.isOK(player1.getName().getString(), null, true)) - return; - send(ComType.pos + pos, player); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudLyric(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isOK(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.EnableLyric) - continue; - send(player, ComType.lyric + data); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudInfo(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isOK(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.EnableInfo) - continue; - send(player, ComType.info + data); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudList(String data) { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.isOK(player.getName().getString(), null, true)) - continue; - String name = player.getName().getString(); - SaveObj obj = HudUtils.get(name); - if (!obj.EnableList) - continue; - send(player, ComType.list + data); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); - e.printStackTrace(); - } - } - - @Override - public void sendHudUtilsAll() { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - String Name = player.getName().getString(); - try { - SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void sendBar(String data) { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - try { - if (AllMusic.isOK(player.getName().getString(), null, true)) - continue; - FabricApi.sendBar(player, data); - } catch (Exception e1) { - AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); - e1.printStackTrace(); - } - } - } - - @Override - public void clearHud(String player) { - try { - send(ComType.clear, player); - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void clearHud() { - try { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, ComType.clear); - } - } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); - e.printStackTrace(); - } - } - - @Override - public void bq(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; - } - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { - player.sendMessage(Text.literal(data)); - } - } - } - - @Override - public void bqt(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; - } - var finalData = Text.literal(data); - runTask(() -> { - for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { - player.sendMessage(finalData); - } - } - }); - } - - @Override - public void sendMessaget(Object obj, String message) { - runTask(() -> ((CommandOutput) obj).sendMessage(Text.literal(message))); - } - - @Override - public void sendMessage(Object obj, String message) { - CommandOutput sender = (CommandOutput) obj; - sender.sendMessage(Text.literal(message)); - } - - @Override - public void sendMessageRun(Object obj, String message, String end, String command) { - FabricApi.sendMessageRun(obj, message, end, command); - } - - @Override - public void sendMessageSuggest(Object obj, String message, String end, String command) { - FabricApi.sendMessageSuggest(obj, message, end, command); - } - - @Override - public boolean onMusicPlay(SongInfoObj obj) { - return MusicPlayEvent.EVENT.invoker().interact(obj) != ActionResult.PASS; - } - - @Override - public boolean onMusicAdd(Object obj, MusicObj music) { - return MusicAddEvent.EVENT.invoker().interact((ServerPlayerEntity) obj, music) != ActionResult.PASS; - } - - @Override - public void updateInfo() { - - } - - @Override - public void updateLyric() { - - } - - @Override - public void ping() { - - } - - private void send(ServerPlayerEntity players, String data) { - if (players == null) - return; - try { - byte[] bytes = data.getBytes(StandardCharsets.UTF_8); - ByteBuf buf = Unpooled.buffer(bytes.length + 1); - buf.writeByte(666); - buf.writeBytes(bytes); - - runTask(() -> ServerPlayNetworking.send(players, AllMusicFabric.ID, new PacketByteBuf(buf))); - } catch (Exception e) { - AllMusic.log.warning("§c数据发送发生错误"); - e.printStackTrace(); - } - } -} diff --git a/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java b/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java deleted file mode 100644 index e957ed73..00000000 --- a/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java +++ /dev/null @@ -1,24 +0,0 @@ -package coloryr.allmusic.side.fabric.event; - -import coloryr.allmusic.core.objs.music.MusicObj; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.util.ActionResult; - -public interface MusicAddEvent { - Event EVENT = EventFactory.createArrayBacked(MusicAddEvent.class, - (listeners) -> (player, music) -> { - for (MusicAddEvent listener : listeners) { - ActionResult result = listener.interact(player, music); - - if (result != ActionResult.PASS) { - return result; - } - } - - return ActionResult.PASS; - }); - - ActionResult interact(ServerPlayerEntity player, MusicObj music); -} diff --git a/fabric_1_19_2/src/main/java/coloryr/allmusic/AllMusicFabric.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java similarity index 79% rename from fabric_1_19_2/src/main/java/coloryr/allmusic/AllMusicFabric.java rename to fabric_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index 4002b6cb..25ae145d 100644 --- a/fabric_1_19_2/src/main/java/coloryr/allmusic/AllMusicFabric.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -1,10 +1,10 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.side.fabric.CommandFabric; -import coloryr.allmusic.side.fabric.LogFabric; -import coloryr.allmusic.side.fabric.SideFabric; -import coloryr.allmusic.side.fabric.event.MusicAddEvent; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.side.fabric.CommandFabric; +import com.coloryr.allmusic.server.side.fabric.LogFabric; +import com.coloryr.allmusic.server.side.fabric.SideFabric; +import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/TaskItem.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/TaskItem.java new file mode 100644 index 00000000..40f9a5b9 --- /dev/null +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/TaskItem.java @@ -0,0 +1,6 @@ +package com.coloryr.allmusic.server; + +public class TaskItem { + public int tick; + public Runnable run; +} diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/Tasks.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/Tasks.java new file mode 100644 index 00000000..c70e7f5e --- /dev/null +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -0,0 +1,27 @@ +package com.coloryr.allmusic.server; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; + +public class Tasks { + private static final List taskItems = new CopyOnWriteArrayList<>(); + + public static void init() { + AllMusicFabric.server.addServerGuiTickable(Tasks::tick); + } + + public static void tick() { + for (var item : new ArrayList<>(taskItems)) { + item.tick--; + if (item.tick <= 0) { + taskItems.remove(item); + item.run.run(); + } + } + } + + public static void add(TaskItem item) { + taskItems.add(item); + } +} diff --git a/fabric_1_20/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java similarity index 92% rename from fabric_1_20/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java rename to fabric_1_20/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java index f5d40705..5c536b4c 100644 --- a/fabric_1_20/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.mixin; +package com.coloryr.allmusic.server.mixin; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.command.ServerCommandSource; diff --git a/fabric_1_18_2/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java similarity index 85% rename from fabric_1_18_2/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java rename to fabric_1_20/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index df712554..b7129f4a 100644 --- a/fabric_1_18_2/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.mixin; +package com.coloryr.allmusic.server.mixin; -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java new file mode 100644 index 00000000..d113f897 --- /dev/null +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -0,0 +1,66 @@ +package com.coloryr.allmusic.server.side.fabric; + +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.mixin.IGetCommandOutput; +import com.mojang.brigadier.Command; +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.suggestion.SuggestionProvider; +import com.mojang.brigadier.suggestion.Suggestions; +import com.mojang.brigadier.suggestion.SuggestionsBuilder; +import net.minecraft.server.command.CommandManager; +import net.minecraft.server.command.ServerCommandSource; + +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.function.Predicate; + +public class CommandFabric implements Command, Predicate, SuggestionProvider { + public static CommandFabric instance = new CommandFabric(); + + public void register(CommandDispatcher dispatcher) { + dispatcher.register(((CommandManager.literal("music").requires(this)).executes(this)) + .then(CommandManager.argument("args", StringArgumentType.greedyString()) + .suggests(this).executes(this))); + } + + @Override + public int run(CommandContext context) { + var item = context.getSource(); + var source = ((IGetCommandOutput) item).getOutput(); + + var input = context.getInput(); + var temp = input.split(" "); + var arg = new String[temp.length - 1]; + System.arraycopy(temp, 1, arg, 0, arg.length); + + CommandEX.ex(source, context.getSource().getName(), arg); + + return 0; + } + + @Override + public boolean test(ServerCommandSource stack) { + return true; + } + + @Override + public CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var input = context.getInput(); + var temp = input.split(" "); + var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; + System.arraycopy(temp, 1, arg, 0, temp.length - 1); + + if (input.endsWith(" ")) + builder = builder.createOffset(builder.getInput().lastIndexOf(32) + 1); + + List results = CommandEX.getTabList(context.getSource().getName(), arg); + + for (String s : results) { + builder.suggest(s); + } + + return builder.buildFuture(); + } +} \ No newline at end of file diff --git a/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java similarity index 64% rename from fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java rename to fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index ff89d9f2..8cd973eb 100644 --- a/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -1,5 +1,7 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.network.ServerPlayerEntity; @@ -31,4 +33,16 @@ public class FabricApi { var pack = new OverlayMessageS2CPacket(Text.literal(message)); player.networkHandler.sendPacket(pack); } + + public static void sendMessageBqRun(String message, String end, String command) { + MutableText send = Text.literal(message); + MutableText endText = Text.literal(end); + endText.setStyle(endText.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); + send.append(endText); + for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { + player.sendMessage(send, false); + } + } + } } diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java new file mode 100644 index 00000000..76eb6745 --- /dev/null +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java @@ -0,0 +1,16 @@ +package com.coloryr.allmusic.server.side.fabric; + +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.side.IMyLogger; + +public class LogFabric implements IMyLogger { + @Override + public void warning(String data) { + AllMusicFabric.LOGGER.warn(data); + } + + @Override + public void info(String data) { + AllMusicFabric.LOGGER.info(data); + } +} diff --git a/fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java similarity index 60% rename from fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java rename to fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 2b9a0a66..2c01d0f8 100644 --- a/fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -1,18 +1,18 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.TaskItem; -import coloryr.allmusic.Tasks; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.hud.HudUtils; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.side.ComType; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.side.fabric.event.MusicAddEvent; -import coloryr.allmusic.side.fabric.event.MusicPlayEvent; -import com.google.gson.Gson; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.TaskItem; +import com.coloryr.allmusic.server.Tasks; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.enums.ComType; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.utils.HudUtils; +import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; @@ -24,6 +24,8 @@ import net.minecraft.util.ActionResult; import java.io.File; import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.UUID; public class SideFabric extends ISide { @@ -64,23 +66,21 @@ public class SideFabric extends ISide { public boolean needPlay() { int online = getAllPlayer(); for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + if (AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { online--; } } return online > 0; } - @Override - public void send(String data, String player) { - send(AllMusicFabric.server.getPlayerManager().getPlayer(player), data); - } - @Override protected void topSendStop() { try { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); @@ -94,7 +94,9 @@ public class SideFabric extends ISide { var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); if (player == null) return; - send(player, ComType.stop); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); + send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); e.printStackTrace(); @@ -107,7 +109,13 @@ public class SideFabric extends ISide { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { if (AllMusic.isOK(player.getName().getString(), null, false)) continue; - send(player, ComType.play + url); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + + send(player, buf); + AllMusic.addNowPlayPlayer(player.getName().getString()); } } catch (Exception e) { @@ -124,7 +132,11 @@ public class SideFabric extends ISide { return; if (AllMusic.isOK(player, null, false)) return; - send(ComType.play + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); + writeString(buf, url); + + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); e.printStackTrace(); @@ -139,9 +151,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnablePic) + if (!obj.pic.enable) continue; - send(player, ComType.img + url); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); @@ -157,7 +174,11 @@ public class SideFabric extends ISide { return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.img + url, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); + writeString(buf, url); + + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); e.printStackTrace(); @@ -172,7 +193,11 @@ public class SideFabric extends ISide { return; if (AllMusic.isOK(player1.getName().getString(), null, true)) return; - send(ComType.pos + pos, player); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.POS.ordinal()); + buf.writeInt(pos); + + send(player1, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -187,9 +212,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableLyric) + if (!obj.lyric.enable) continue; - send(player, ComType.lyric + data); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LYRIC.ordinal()); + writeString(buf, data); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); @@ -205,9 +235,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableInfo) + if (!obj.info.enable) continue; - send(player, ComType.info + data); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.INFO.ordinal()); + writeString(buf, data); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); @@ -215,6 +250,59 @@ public class SideFabric extends ISide { } } + @Override + public void sendHudPos(String name) { + try { + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + SaveObj obj = HudUtils.get(name); + String data = AllMusic.gson.toJson(obj); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendHud(String name, HudType pos, String data) { + try { + if (pos == HudType.PIC) { + return; + } + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + + if (AllMusic.isOK(name, null, true)) + return; + + ByteBuf buf = Unpooled.buffer(); + switch (pos) { + case INFO: + buf.writeByte(ComType.INFO.ordinal()); + break; + case LIST: + buf.writeByte(ComType.LIST.ordinal()); + break; + case LYRIC: + buf.writeByte(ComType.LYRIC.ordinal()); + break; + } + writeString(buf, data); + + send(player, buf); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + @Override public void sendHudList(String data) { try { @@ -223,9 +311,14 @@ public class SideFabric extends ISide { continue; String name = player.getName().getString(); SaveObj obj = HudUtils.get(name); - if (!obj.EnableList) + if (!obj.list.enable) continue; - send(player, ComType.list + data); + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LIST.ordinal()); + writeString(buf, data); + + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); @@ -239,8 +332,11 @@ public class SideFabric extends ISide { String Name = player.getName().getString(); try { SaveObj obj = HudUtils.get(Name); - String data = new Gson().toJson(obj); - send(player, data); + String data = AllMusic.gson.toJson(obj); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); + writeString(buf, data); + send(player, buf); } catch (Exception e1) { AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); e1.printStackTrace(); @@ -263,9 +359,16 @@ public class SideFabric extends ISide { } @Override - public void clearHud(String player) { + public void clearHud(String name) { try { - send(ComType.clear, player); + var player = AllMusicFabric.server.getPlayerManager().getPlayer(name); + if (player == null) + return; + + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + + send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); e.printStackTrace(); @@ -276,7 +379,9 @@ public class SideFabric extends ISide { public void clearHud() { try { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - send(player, ComType.clear); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); + send(player, buf); } } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); @@ -286,28 +391,33 @@ public class SideFabric extends ISide { @Override public void bq(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { - player.sendMessage(Text.literal(data)); + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { + player.sendMessage(Text.of(data), false); } } } + @Override + public void bqRun(String message, String end, String command) { + FabricApi.sendMessageBqRun(message, end, command); + } + @Override public void bqt(String data) { - if (AllMusic.getConfig().MessageLimit - && data.length() > AllMusic.getConfig().MessageLimitSize) { - data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + if (AllMusic.getConfig().messageLimit + && data.length() > AllMusic.getConfig().messageLimitSize) { + data = data.substring(0, AllMusic.getConfig().messageLimitSize - 1) + "..."; } - var finalData = Text.literal(data); + var finalData = Text.of(data); runTask(() -> { for (var player : AllMusicFabric.server.getPlayerManager().getPlayerList()) { - if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { - player.sendMessage(finalData); + if (!AllMusic.getConfig().mutePlayer.contains(player.getName().getString())) { + player.sendMessage(finalData, false); } } }); @@ -315,13 +425,13 @@ public class SideFabric extends ISide { @Override public void sendMessaget(Object obj, String message) { - runTask(() -> ((CommandOutput) obj).sendMessage(Text.literal(message))); + runTask(() -> ((CommandOutput) obj).sendMessage(Text.of(message))); } @Override public void sendMessage(Object obj, String message) { CommandOutput sender = (CommandOutput) obj; - sender.sendMessage(Text.literal(message)); + sender.sendMessage(Text.of(message)); } @Override @@ -359,19 +469,25 @@ public class SideFabric extends ISide { } - private void send(ServerPlayerEntity players, String data) { + @Override + public List getPlayerList() { + return List.of(); + } + + private void send(ServerPlayerEntity players, ByteBuf data) { if (players == null) return; try { - byte[] bytes = data.getBytes(StandardCharsets.UTF_8); - ByteBuf buf = Unpooled.buffer(bytes.length + 1); - buf.writeByte(666); - buf.writeBytes(bytes); - - runTask(() -> ServerPlayNetworking.send(players, AllMusicFabric.ID, new PacketByteBuf(buf))); + runTask(() -> ServerPlayNetworking.send(players, AllMusicFabric.ID, new PacketByteBuf(data))); } catch (Exception e) { AllMusic.log.warning("§c数据发送发生错误"); e.printStackTrace(); } } + + private void writeString(ByteBuf buf, String data) { + byte[] temp = data.getBytes(StandardCharsets.UTF_8); + buf.writeInt(temp.length) + .writeBytes(temp); + } } diff --git a/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java new file mode 100644 index 00000000..708a509e --- /dev/null +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java @@ -0,0 +1,24 @@ +package com.coloryr.allmusic.server.side.fabric.event; + +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.ActionResult; + +public interface MusicAddEvent { + Event EVENT = EventFactory.createArrayBacked(MusicAddEvent.class, + (listeners) -> (player, music) -> { + for (MusicAddEvent listener : listeners) { + ActionResult result = listener.interact(player, music); + + if (result != ActionResult.PASS) { + return result; + } + } + + return ActionResult.PASS; + }); + + ActionResult interact(ServerPlayerEntity player, MusicObj music); +} diff --git a/fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java similarity index 80% rename from fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java rename to fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java index 6ec2b072..13df4838 100644 --- a/fabric_1_19_3/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java +++ b/fabric_1_20/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.fabric.event; +package com.coloryr.allmusic.server.side.fabric.event; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/fabric_1_20/src/main/resources/allmusic_server.mixins.json b/fabric_1_20/src/main/resources/allmusic_server.mixins.json index c23fb3d3..6aef62a7 100644 --- a/fabric_1_20/src/main/resources/allmusic_server.mixins.json +++ b/fabric_1_20/src/main/resources/allmusic_server.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "coloryr.allmusic.mixin", + "package": "com.coloryr.allmusic.server.mixin", "compatibilityLevel": "JAVA_17", "server": [ diff --git a/fabric_1_20/src/main/resources/fabric.mod.json b/fabric_1_20/src/main/resources/fabric.mod.json index b4ec6d28..f73fa298 100644 --- a/fabric_1_20/src/main/resources/fabric.mod.json +++ b/fabric_1_20/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "allmusic_server", - "version": "2.18.8", + "version": "3.0.0", "name": "AllMusic Server", "description": "AllMusic Server Mod", @@ -9,8 +9,8 @@ "Color_yr" ], "contact": { - "homepage": "https://github.com/Coloryr/AllMusic_Server", - "sources": "https://github.com/Coloryr/AllMusic_Server" + "homepage": "https://github.com/Coloryr/AllMusic3_Server", + "sources": "https://github.com/Coloryr/AllMusic3_Server" }, "license": "GPL-3.0", @@ -19,7 +19,7 @@ "environment": "*", "entrypoints": { "main": [ - "coloryr.allmusic.AllMusicFabric" + "com.coloryr.allmusic.server.AllMusicFabric" ] }, "mixins": [ @@ -34,6 +34,6 @@ "fabric-language-kotlin": ">=1.9.1+kotlin.1.8.10" }, "suggests": { - "another-mod": "*" + } } diff --git a/fabric_1_20_2/gradle.properties b/fabric_1_20_2/gradle.properties index 47a99a73..21b773f7 100644 --- a/fabric_1_20_2/gradle.properties +++ b/fabric_1_20_2/gradle.properties @@ -9,8 +9,8 @@ yarn_mappings=1.20.2+build.4 loader_version=0.15.0 # Mod Properties -mod_version = 2.19.4 -maven_group = coloryr.allmusic +mod_version = 3.0.0 +maven_group = com.coloryr.allmusic.server archives_base_name =[Fabric1.20.2]AllMusic_Server # Dependencies diff --git a/fabric_1_20_2/src/main/java/coloryr/allmusic/TaskItem.java b/fabric_1_20_2/src/main/java/coloryr/allmusic/TaskItem.java deleted file mode 100644 index ed368410..00000000 --- a/fabric_1_20_2/src/main/java/coloryr/allmusic/TaskItem.java +++ /dev/null @@ -1,6 +0,0 @@ -package coloryr.allmusic; - -public class TaskItem { - public int tick; - public Runnable run; -} diff --git a/fabric_1_20_2/src/main/java/coloryr/allmusic/Tasks.java b/fabric_1_20_2/src/main/java/coloryr/allmusic/Tasks.java deleted file mode 100644 index 9092f53a..00000000 --- a/fabric_1_20_2/src/main/java/coloryr/allmusic/Tasks.java +++ /dev/null @@ -1,31 +0,0 @@ -package coloryr.allmusic; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; - -public class Tasks { - private static final List taskItems = new CopyOnWriteArrayList<>(); - - public static void init() { - AllMusicFabric.server.addServerGuiTickable(Tasks::tick); - } - - public static void tick() { - 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_20_2/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java b/fabric_1_20_2/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java deleted file mode 100644 index f5d40705..00000000 --- a/fabric_1_20_2/src/main/java/coloryr/allmusic/mixin/IGetCommandOutput.java +++ /dev/null @@ -1,17 +0,0 @@ -package coloryr.allmusic.mixin; - -import net.minecraft.server.command.CommandOutput; -import net.minecraft.server.command.ServerCommandSource; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.injection.Constant; -import org.spongepowered.asm.mixin.injection.ModifyConstant; - -@Mixin(ServerCommandSource.class) -public interface IGetCommandOutput { - @Accessor(value = "output") - CommandOutput getOutput(); -} - diff --git a/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java b/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java deleted file mode 100644 index cc8c7df4..00000000 --- a/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java +++ /dev/null @@ -1,67 +0,0 @@ -package coloryr.allmusic.side.fabric; - -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.core.command.TabCommand; -import coloryr.allmusic.mixin.IGetCommandOutput; -import com.mojang.brigadier.Command; -import com.mojang.brigadier.CommandDispatcher; -import com.mojang.brigadier.arguments.StringArgumentType; -import com.mojang.brigadier.context.CommandContext; -import com.mojang.brigadier.suggestion.SuggestionProvider; -import com.mojang.brigadier.suggestion.Suggestions; -import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import net.minecraft.server.command.CommandManager; -import net.minecraft.server.command.ServerCommandSource; - -import java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.function.Predicate; - -public class CommandFabric implements Command, Predicate, SuggestionProvider { - public static CommandFabric instance = new CommandFabric(); - - public void register(CommandDispatcher dispatcher) { - dispatcher.register(((CommandManager.literal("music").requires(this)).executes(this)) - .then(CommandManager.argument("args", StringArgumentType.greedyString()) - .suggests(this).executes(this))); - } - - @Override - public int run(CommandContext context) { - var item = context.getSource(); - var source = ((IGetCommandOutput) item).getOutput(); - - var input = context.getInput(); - var temp = input.split(" "); - var arg = new String[temp.length - 1]; - System.arraycopy(temp, 1, arg, 0, arg.length); - - CommandEX.ex(source, context.getSource().getName(), arg); - - return 0; - } - - @Override - public boolean test(ServerCommandSource stack) { - return true; - } - - @Override - public CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) { - var input = context.getInput(); - var temp = input.split(" "); - var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; - System.arraycopy(temp, 1, arg, 0, temp.length - 1); - - if (input.endsWith(" ")) - builder = builder.createOffset(builder.getInput().lastIndexOf(32) + 1); - - List results = TabCommand.getTabList(context.getSource().getName(), arg); - - for (String s : results) { - builder.suggest(s); - } - - return builder.buildFuture(); - } -} \ No newline at end of file diff --git a/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java b/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java deleted file mode 100644 index 152f81c6..00000000 --- a/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/LogFabric.java +++ /dev/null @@ -1,16 +0,0 @@ -package coloryr.allmusic.side.fabric; - -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.core.side.IMyLogger; - -public class LogFabric implements IMyLogger { - @Override - public void warning(String data) { - AllMusicFabric.LOGGER.warn(data); - } - - @Override - public void info(String data) { - AllMusicFabric.LOGGER.info(data); - } -} diff --git a/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java b/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java deleted file mode 100644 index e957ed73..00000000 --- a/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicAddEvent.java +++ /dev/null @@ -1,24 +0,0 @@ -package coloryr.allmusic.side.fabric.event; - -import coloryr.allmusic.core.objs.music.MusicObj; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.util.ActionResult; - -public interface MusicAddEvent { - Event EVENT = EventFactory.createArrayBacked(MusicAddEvent.class, - (listeners) -> (player, music) -> { - for (MusicAddEvent listener : listeners) { - ActionResult result = listener.interact(player, music); - - if (result != ActionResult.PASS) { - return result; - } - } - - return ActionResult.PASS; - }); - - ActionResult interact(ServerPlayerEntity player, MusicObj music); -} diff --git a/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java b/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java deleted file mode 100644 index 6ec2b072..00000000 --- a/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/event/MusicPlayEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -package coloryr.allmusic.side.fabric.event; - -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.util.ActionResult; - -public interface MusicPlayEvent { - Event EVENT = EventFactory.createArrayBacked(MusicPlayEvent.class, - (listeners) -> (music) -> { - for (MusicPlayEvent listener : listeners) { - ActionResult result = listener.interact(music); - - if (result != ActionResult.PASS) { - return result; - } - } - - return ActionResult.PASS; - }); - - ActionResult interact(SongInfoObj music); -} diff --git a/fabric_1_19_3/src/main/java/coloryr/allmusic/AllMusicFabric.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java similarity index 79% rename from fabric_1_19_3/src/main/java/coloryr/allmusic/AllMusicFabric.java rename to fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java index 4002b6cb..25ae145d 100644 --- a/fabric_1_19_3/src/main/java/coloryr/allmusic/AllMusicFabric.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/AllMusicFabric.java @@ -1,10 +1,10 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.side.fabric.CommandFabric; -import coloryr.allmusic.side.fabric.LogFabric; -import coloryr.allmusic.side.fabric.SideFabric; -import coloryr.allmusic.side.fabric.event.MusicAddEvent; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.side.fabric.CommandFabric; +import com.coloryr.allmusic.server.side.fabric.LogFabric; +import com.coloryr.allmusic.server.side.fabric.SideFabric; +import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java new file mode 100644 index 00000000..40f9a5b9 --- /dev/null +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java @@ -0,0 +1,6 @@ +package com.coloryr.allmusic.server; + +public class TaskItem { + public int tick; + public Runnable run; +} diff --git a/fabric_1_19_2/src/main/java/coloryr/allmusic/Tasks.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/Tasks.java similarity index 95% rename from fabric_1_19_2/src/main/java/coloryr/allmusic/Tasks.java rename to fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/Tasks.java index 9092f53a..3d1d0b6a 100644 --- a/fabric_1_19_2/src/main/java/coloryr/allmusic/Tasks.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -1,4 +1,4 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; import java.util.ArrayList; import java.util.List; diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java new file mode 100644 index 00000000..5c536b4c --- /dev/null +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/mixin/IGetCommandOutput.java @@ -0,0 +1,17 @@ +package com.coloryr.allmusic.server.mixin; + +import net.minecraft.server.command.CommandOutput; +import net.minecraft.server.command.ServerCommandSource; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +@Mixin(ServerCommandSource.class) +public interface IGetCommandOutput { + @Accessor(value = "output") + CommandOutput getOutput(); +} + diff --git a/fabric_1_20_2/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java similarity index 86% rename from fabric_1_20_2/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java rename to fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java index 7fe57e5c..6414d848 100644 --- a/fabric_1_20_2/src/main/java/coloryr/allmusic/mixin/ServerPlayerMixin.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/mixin/ServerPlayerMixin.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.mixin; +package com.coloryr.allmusic.server.mixin; -import coloryr.allmusic.AllMusicFabric; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.AllMusic; import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.network.ClientConnection; import net.minecraft.server.PlayerManager; diff --git a/fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java similarity index 91% rename from fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java rename to fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java index cc8c7df4..9144cf98 100644 --- a/fabric_1_18_2/src/main/java/coloryr/allmusic/side/fabric/CommandFabric.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/CommandFabric.java @@ -1,8 +1,8 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.core.command.TabCommand; -import coloryr.allmusic.mixin.IGetCommandOutput; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.core.command.TabCommand; +import com.coloryr.allmusic.server.mixin.IGetCommandOutput; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; diff --git a/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java similarity index 96% rename from fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java rename to fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java index ff89d9f2..f2db5189 100644 --- a/fabric_1_20/src/main/java/coloryr/allmusic/side/fabric/FabricApi.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/FabricApi.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; import net.minecraft.server.command.CommandOutput; diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java new file mode 100644 index 00000000..76eb6745 --- /dev/null +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/LogFabric.java @@ -0,0 +1,16 @@ +package com.coloryr.allmusic.server.side.fabric; + +import com.coloryr.allmusic.server.AllMusicFabric; +import com.coloryr.allmusic.server.core.side.IMyLogger; + +public class LogFabric implements IMyLogger { + @Override + public void warning(String data) { + AllMusicFabric.LOGGER.warn(data); + } + + @Override + public void info(String data) { + AllMusicFabric.LOGGER.info(data); + } +} diff --git a/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java similarity index 95% rename from fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java rename to fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java index 2b9a0a66..0a497a46 100644 --- a/fabric_1_20_2/src/main/java/coloryr/allmusic/side/fabric/SideFabric.java +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/SideFabric.java @@ -1,17 +1,17 @@ -package coloryr.allmusic.side.fabric; +package com.coloryr.allmusic.server.side.fabric; -import coloryr.allmusic.AllMusicFabric; +import com.coloryr.allmusic.server.AllMusicFabric; import coloryr.allmusic.TaskItem; import coloryr.allmusic.Tasks; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.hud.HudUtils; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.side.ComType; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.side.fabric.event.MusicAddEvent; -import coloryr.allmusic.side.fabric.event.MusicPlayEvent; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.hud.HudUtils; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ComType; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.side.fabric.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.fabric.event.MusicPlayEvent; import com.google.gson.Gson; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java new file mode 100644 index 00000000..708a509e --- /dev/null +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicAddEvent.java @@ -0,0 +1,24 @@ +package com.coloryr.allmusic.server.side.fabric.event; + +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.ActionResult; + +public interface MusicAddEvent { + Event EVENT = EventFactory.createArrayBacked(MusicAddEvent.class, + (listeners) -> (player, music) -> { + for (MusicAddEvent listener : listeners) { + ActionResult result = listener.interact(player, music); + + if (result != ActionResult.PASS) { + return result; + } + } + + return ActionResult.PASS; + }); + + ActionResult interact(ServerPlayerEntity player, MusicObj music); +} diff --git a/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java new file mode 100644 index 00000000..13df4838 --- /dev/null +++ b/fabric_1_20_2/src/main/java/com/coloryr/allmusic/server/side/fabric/event/MusicPlayEvent.java @@ -0,0 +1,25 @@ +package com.coloryr.allmusic.server.side.fabric.event; + +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.ActionResult; + +public interface MusicPlayEvent { + Event EVENT = EventFactory.createArrayBacked(MusicPlayEvent.class, + (listeners) -> (music) -> { + for (MusicPlayEvent listener : listeners) { + ActionResult result = listener.interact(music); + + if (result != ActionResult.PASS) { + return result; + } + } + + return ActionResult.PASS; + }); + + ActionResult interact(SongInfoObj music); +} diff --git a/fabric_1_20_2/src/main/resources/allmusic_server.mixins.json b/fabric_1_20_2/src/main/resources/allmusic_server.mixins.json index c23fb3d3..6aef62a7 100644 --- a/fabric_1_20_2/src/main/resources/allmusic_server.mixins.json +++ b/fabric_1_20_2/src/main/resources/allmusic_server.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "coloryr.allmusic.mixin", + "package": "com.coloryr.allmusic.server.mixin", "compatibilityLevel": "JAVA_17", "server": [ diff --git a/fabric_1_20_2/src/main/resources/fabric.mod.json b/fabric_1_20_2/src/main/resources/fabric.mod.json index b5c7f929..a1c84ee6 100644 --- a/fabric_1_20_2/src/main/resources/fabric.mod.json +++ b/fabric_1_20_2/src/main/resources/fabric.mod.json @@ -9,17 +9,17 @@ "Color_yr" ], "contact": { - "homepage": "https://github.com/Coloryr/AllMusic_Server", - "sources": "https://github.com/Coloryr/AllMusic_Server" + "homepage": "https://github.com/Coloryr/AllMusic3_Server", + "sources": "https://github.com/Coloryr/AllMusic3_Server" }, - "license": "CC0-1.0", + "license": "GPL-3.0", "icon": "assets/allmusic_server/icon.png", "environment": "*", "entrypoints": { "main": [ - "coloryr.allmusic.AllMusicFabric" + "com.coloryr.allmusic.server.AllMusicFabric" ] }, "mixins": [ @@ -34,6 +34,6 @@ "fabric-language-kotlin": ">=1.9.1+kotlin.1.8.10" }, "suggests": { - "another-mod": "*" + } } diff --git a/folia/build.gradle b/folia/build.gradle index 6c62b08c..75c731d7 100644 --- a/folia/build.gradle +++ b/folia/build.gradle @@ -3,7 +3,7 @@ plugins { id 'maven-publish' id 'com.github.johnrengelman.shadow' version '7.1.2' } -version = "2.19.4" +version = "3.0.0" repositories { mavenCentral() @@ -38,6 +38,7 @@ dependencies { //implementation "org.apache.commons:commons-dbcp2:2.9.0" //implementation 'mysql:mysql-connector-java:8.0.31' + compileOnly 'io.netty:netty-all:4.1.109.Final' compileOnly 'dev.folia:folia-api:1.20.4-R0.1-SNAPSHOT' compileOnly "com.github.MilkBowl:VaultAPI:1.7.1" compileOnly 'me.clip:placeholderapi:2.10.10' @@ -49,11 +50,11 @@ dependencies { } shadowJar { - relocate 'okhttp3', 'coloryr.allmusic.lib.okhttp3' - relocate 'okio', 'coloryr.allmusic.lib.okio' - relocate 'kotlin', 'coloryr.allmusic.lib.kotlin' - relocate 'org.intellij', 'coloryr.allmusic.lib.org.intellij' - relocate 'org.jetbrains', 'coloryr.allmusic.lib.org.jetbrains' + relocate 'okhttp3', 'com.coloryr.allmusic.server.lib.okhttp3' + relocate 'okio', 'com.coloryr.allmusic.server.lib.okio' + relocate 'kotlin', 'com.coloryr.allmusic.server.lib.kotlin' + relocate 'org.intellij', 'com.coloryr.allmusic.server.lib.org.intellij' + relocate 'org.jetbrains', 'com.coloryr.allmusic.server.lib.org.jetbrains' } tasks.withType(JavaCompile).configureEach { diff --git a/folia/src/main/java/coloryr/allmusic/AllMusicFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/AllMusicFolia.java similarity index 87% rename from folia/src/main/java/coloryr/allmusic/AllMusicFolia.java rename to folia/src/main/java/com/coloryr/allmusic/server/AllMusicFolia.java index 3e439754..e8265083 100644 --- a/folia/src/main/java/coloryr/allmusic/AllMusicFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/AllMusicFolia.java @@ -1,12 +1,12 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.music.play.TopLyricSave; -import coloryr.allmusic.core.objs.music.TopSongInfoObj; -import coloryr.allmusic.side.folia.*; -import coloryr.allmusic.side.folia.hooks.AllMusicPAPI; -import coloryr.allmusic.side.folia.hooks.VaultHook; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.music.play.TopLyricSave; +import com.coloryr.allmusic.server.core.objs.music.TopSongInfoObj; +import com.coloryr.allmusic.server.side.folia.*; +import com.coloryr.allmusic.server.side.folia.hooks.AllMusicPAPI; +import com.coloryr.allmusic.server.side.folia.hooks.VaultHook; import org.bukkit.Bukkit; import org.bukkit.command.PluginCommand; import org.bukkit.plugin.Plugin; diff --git a/folia/src/main/java/coloryr/allmusic/bstats/MetricsBase.java b/folia/src/main/java/com/coloryr/allmusic/server/bstats/MetricsBase.java similarity index 100% rename from folia/src/main/java/coloryr/allmusic/bstats/MetricsBase.java rename to folia/src/main/java/com/coloryr/allmusic/server/bstats/MetricsBase.java diff --git a/folia/src/main/java/coloryr/allmusic/bstats/charts/AdvancedBarChart.java b/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedBarChart.java similarity index 100% rename from folia/src/main/java/coloryr/allmusic/bstats/charts/AdvancedBarChart.java rename to folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedBarChart.java diff --git a/folia/src/main/java/coloryr/allmusic/bstats/charts/AdvancedPie.java b/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedPie.java similarity index 100% rename from folia/src/main/java/coloryr/allmusic/bstats/charts/AdvancedPie.java rename to folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedPie.java diff --git a/folia/src/main/java/coloryr/allmusic/bstats/charts/CustomChart.java b/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/CustomChart.java similarity index 100% rename from folia/src/main/java/coloryr/allmusic/bstats/charts/CustomChart.java rename to folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/CustomChart.java diff --git a/folia/src/main/java/coloryr/allmusic/bstats/charts/DrilldownPie.java b/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/DrilldownPie.java similarity index 100% rename from folia/src/main/java/coloryr/allmusic/bstats/charts/DrilldownPie.java rename to folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/DrilldownPie.java diff --git a/folia/src/main/java/coloryr/allmusic/bstats/charts/MultiLineChart.java b/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/MultiLineChart.java similarity index 100% rename from folia/src/main/java/coloryr/allmusic/bstats/charts/MultiLineChart.java rename to folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/MultiLineChart.java diff --git a/folia/src/main/java/coloryr/allmusic/bstats/charts/SimpleBarChart.java b/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimpleBarChart.java similarity index 100% rename from folia/src/main/java/coloryr/allmusic/bstats/charts/SimpleBarChart.java rename to folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimpleBarChart.java diff --git a/folia/src/main/java/coloryr/allmusic/bstats/charts/SimplePie.java b/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimplePie.java similarity index 100% rename from folia/src/main/java/coloryr/allmusic/bstats/charts/SimplePie.java rename to folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimplePie.java diff --git a/folia/src/main/java/coloryr/allmusic/bstats/charts/SingleLineChart.java b/folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SingleLineChart.java similarity index 100% rename from folia/src/main/java/coloryr/allmusic/bstats/charts/SingleLineChart.java rename to folia/src/main/java/com/coloryr/allmusic/server/bstats/charts/SingleLineChart.java diff --git a/folia/src/main/java/coloryr/allmusic/bstats/config/MetricsConfig.java b/folia/src/main/java/com/coloryr/allmusic/server/bstats/config/MetricsConfig.java similarity index 100% rename from folia/src/main/java/coloryr/allmusic/bstats/config/MetricsConfig.java rename to folia/src/main/java/com/coloryr/allmusic/server/bstats/config/MetricsConfig.java diff --git a/folia/src/main/java/coloryr/allmusic/bstats/json/JsonObjectBuilder.java b/folia/src/main/java/com/coloryr/allmusic/server/bstats/json/JsonObjectBuilder.java similarity index 100% rename from folia/src/main/java/coloryr/allmusic/bstats/json/JsonObjectBuilder.java rename to folia/src/main/java/com/coloryr/allmusic/server/bstats/json/JsonObjectBuilder.java diff --git a/folia/src/main/java/coloryr/allmusic/side/folia/CommandFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/CommandFolia.java similarity index 88% rename from folia/src/main/java/coloryr/allmusic/side/folia/CommandFolia.java rename to folia/src/main/java/com/coloryr/allmusic/server/side/folia/CommandFolia.java index 24aeb152..4912c9a0 100644 --- a/folia/src/main/java/coloryr/allmusic/side/folia/CommandFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/CommandFolia.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.folia; +package com.coloryr.allmusic.server.side.folia; -import coloryr.allmusic.core.command.CommandEX; +import com.coloryr.allmusic.server.core.command.CommandEX; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/folia/src/main/java/coloryr/allmusic/side/folia/FunCore.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/FunCore.java similarity index 88% rename from folia/src/main/java/coloryr/allmusic/side/folia/FunCore.java rename to folia/src/main/java/com/coloryr/allmusic/server/side/folia/FunCore.java index 629e060d..be644542 100644 --- a/folia/src/main/java/coloryr/allmusic/side/folia/FunCore.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/FunCore.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.folia; +package com.coloryr.allmusic.server.side.folia; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; import org.bukkit.Bukkit; import org.bukkit.World; diff --git a/folia/src/main/java/coloryr/allmusic/side/folia/ListenerFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/ListenerFolia.java similarity index 83% rename from folia/src/main/java/coloryr/allmusic/side/folia/ListenerFolia.java rename to folia/src/main/java/com/coloryr/allmusic/server/side/folia/ListenerFolia.java index 8b3fb363..f6d3fdd9 100644 --- a/folia/src/main/java/coloryr/allmusic/side/folia/ListenerFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/ListenerFolia.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.folia; +package com.coloryr.allmusic.server.side.folia; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; diff --git a/folia/src/main/java/coloryr/allmusic/side/folia/LogFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/LogFolia.java similarity index 77% rename from folia/src/main/java/coloryr/allmusic/side/folia/LogFolia.java rename to folia/src/main/java/com/coloryr/allmusic/server/side/folia/LogFolia.java index d4f820e6..e66717fb 100644 --- a/folia/src/main/java/coloryr/allmusic/side/folia/LogFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/LogFolia.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.folia; +package com.coloryr.allmusic.server.side.folia; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IMyLogger; import java.util.logging.Logger; diff --git a/folia/src/main/java/coloryr/allmusic/side/folia/MetricsFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/MetricsFolia.java similarity index 99% rename from folia/src/main/java/coloryr/allmusic/side/folia/MetricsFolia.java rename to folia/src/main/java/com/coloryr/allmusic/server/side/folia/MetricsFolia.java index a1ba95b3..387abe21 100644 --- a/folia/src/main/java/coloryr/allmusic/side/folia/MetricsFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/MetricsFolia.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.side.folia; +package com.coloryr.allmusic.server.side.folia; import coloryr.allmusic.bstats.MetricsBase; import coloryr.allmusic.bstats.charts.CustomChart; diff --git a/folia/src/main/java/coloryr/allmusic/side/folia/PluginMessage.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/PluginMessage.java similarity index 89% rename from folia/src/main/java/coloryr/allmusic/side/folia/PluginMessage.java rename to folia/src/main/java/com/coloryr/allmusic/server/side/folia/PluginMessage.java index e62ef59b..3fa546b9 100644 --- a/folia/src/main/java/coloryr/allmusic/side/folia/PluginMessage.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/PluginMessage.java @@ -1,10 +1,10 @@ -package coloryr.allmusic.side.folia; +package com.coloryr.allmusic.server.side.folia; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.AllMusicFolia; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.music.play.TopLyricSave; -import coloryr.allmusic.core.objs.music.TopSongInfoObj; +import com.coloryr.allmusic.server.AllMusicFolia; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.music.play.TopLyricSave; +import com.coloryr.allmusic.server.core.objs.music.TopSongInfoObj; import com.google.common.collect.Iterables; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; diff --git a/folia/src/main/java/coloryr/allmusic/side/folia/SideFolia.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java similarity index 75% rename from folia/src/main/java/coloryr/allmusic/side/folia/SideFolia.java rename to folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java index d80333af..542bdb8a 100644 --- a/folia/src/main/java/coloryr/allmusic/side/folia/SideFolia.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/SideFolia.java @@ -1,18 +1,20 @@ -package coloryr.allmusic.side.folia; +package com.coloryr.allmusic.server.side.folia; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.AllMusicFolia; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.enums.ComType; -import coloryr.allmusic.core.objs.enums.HudType; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.core.utils.HudUtils; -import coloryr.allmusic.side.folia.event.MusicAddEvent; -import coloryr.allmusic.side.folia.event.MusicPlayEvent; -import coloryr.allmusic.side.folia.hooks.CitizensNPC; -import coloryr.allmusic.side.folia.hooks.SpigotApi; +import com.coloryr.allmusic.server.AllMusicFolia; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.enums.ComType; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.utils.HudUtils; +import com.coloryr.allmusic.server.side.folia.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.folia.event.MusicPlayEvent; +import com.coloryr.allmusic.server.side.folia.hooks.CitizensNPC; +import com.coloryr.allmusic.server.side.folia.hooks.SpigotApi; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; import io.papermc.paper.threadedregions.scheduler.ScheduledTask; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -24,52 +26,6 @@ import java.nio.charset.StandardCharsets; import java.util.List; public class SideFolia extends ISide { - private static Class ByteBufC; - private static Class UnpooledC; - private static Method bufferM; - private static Method writeByteM; - private static Method writeIntM; - private static Method writeBytesM; - private static Method arrayM; - - static { - try { - ByteBufC = Class.forName("net.minecraft.util.io.netty.buffer.ByteBuf"); - } catch (Exception e) { - try { - ByteBufC = Class.forName("io.netty.buffer.ByteBuf"); - } catch (Exception e1) { - e1.printStackTrace(); - } - } - if (ByteBufC != null) { - try { - arrayM = ByteBufC.getMethod("array"); - writeByteM = ByteBufC.getMethod("writeByte", int.class); - writeIntM = ByteBufC.getMethod("writeInt", int.class); - writeBytesM = ByteBufC.getMethod("writeBytes", byte[].class); - } catch (NoSuchMethodException e1) { - e1.printStackTrace(); - } - } - try { - UnpooledC = Class.forName("net.minecraft.util.io.netty.buffer.Unpooled"); - } catch (Exception e) { - try { - UnpooledC = Class.forName("io.netty.buffer.Unpooled"); - } catch (Exception e1) { - e1.printStackTrace(); - } - } - if (UnpooledC != null) { - try { - bufferM = UnpooledC.getMethod("buffer"); - } catch (Exception e1) { - e1.printStackTrace(); - } - } - } - @Override public int getAllPlayer() { return Bukkit.getOnlinePlayers().size(); @@ -86,8 +42,8 @@ public class SideFolia extends ISide { if (!obj.lyric.enable) continue; - Object buf = bufferM.invoke(null); - writeByteM.invoke(buf, ComType.LYRIC.ordinal()); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LYRIC.ordinal()); writeString(buf, data); send(player, buf); @@ -109,8 +65,8 @@ public class SideFolia extends ISide { if (!obj.info.enable) continue; - Object buf = bufferM.invoke(null); - writeByteM.invoke(buf, ComType.INFO.ordinal()); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.INFO.ordinal()); writeString(buf, data); send(player, buf); @@ -132,13 +88,13 @@ public class SideFolia extends ISide { SaveObj obj = HudUtils.get(name); String data = AllMusic.gson.toJson(obj); - Object buf = bufferM.invoke(null); - writeByteM.invoke(buf, ComType.HUD.ordinal()); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); writeString(buf, data); send(player, buf); } catch (Exception e) { - AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); + AllMusic.log.warning("§d[AllMusic]§c界面位置发送出错"); e.printStackTrace(); } } @@ -156,16 +112,16 @@ public class SideFolia extends ISide { if (AllMusic.isOK(name, null, true)) return; - Object buf = bufferM.invoke(null); + ByteBuf buf = Unpooled.buffer(); switch (pos) { case INFO: - writeByteM.invoke(buf, ComType.INFO.ordinal()); + buf.writeByte(ComType.INFO.ordinal()); break; case LIST: - writeByteM.invoke(buf, ComType.LIST.ordinal()); + buf.writeByte(ComType.LIST.ordinal()); break; case LYRIC: - writeByteM.invoke(buf, ComType.LYRIC.ordinal()); + buf.writeByte(ComType.LYRIC.ordinal()); break; } writeString(buf, data); @@ -188,8 +144,8 @@ public class SideFolia extends ISide { if (!obj.list.enable) continue; - Object buf = bufferM.invoke(null); - writeByteM.invoke(buf, ComType.LIST.ordinal()); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.LIST.ordinal()); writeString(buf, data); send(player, buf); @@ -207,12 +163,11 @@ public class SideFolia extends ISide { try { SaveObj obj = HudUtils.get(Name); String data = AllMusic.gson.toJson(obj); - Object buf = bufferM.invoke(null); - writeByteM.invoke(buf, ComType.HUD.ordinal()); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.HUD.ordinal()); writeString(buf, data); send(player, buf); - } catch (Exception e1) { AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); e1.printStackTrace(); @@ -245,8 +200,8 @@ public class SideFolia extends ISide { if (AllMusic.isOK(player.getName(), null, false)) continue; - Object buf = bufferM.invoke(null); - writeByteM.invoke(buf, ComType.PLAY.ordinal()); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); writeString(buf, url); send(player, buf); @@ -266,8 +221,8 @@ public class SideFolia extends ISide { return; if (AllMusic.isOK(player, null, false)) return; - Object buf = bufferM.invoke(null); - writeByteM.invoke(buf, ComType.PLAY.ordinal()); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.PLAY.ordinal()); writeString(buf, url); send(player1, buf); @@ -288,8 +243,8 @@ public class SideFolia extends ISide { if (!obj.pic.enable) continue; - Object buf = bufferM.invoke(null); - writeByteM.invoke(buf, ComType.IMG.ordinal()); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); writeString(buf, url); send(player, buf); @@ -308,8 +263,8 @@ public class SideFolia extends ISide { return; if (AllMusic.isOK(player1.getName(), null, true)) return; - Object buf = bufferM.invoke(null); - writeByteM.invoke(buf, ComType.IMG.ordinal()); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.IMG.ordinal()); writeString(buf, url); send(player1, buf); @@ -327,9 +282,9 @@ public class SideFolia extends ISide { return; if (AllMusic.isOK(player1.getName(), null, true)) return; - Object buf = bufferM.invoke(null); - writeByteM.invoke(buf, ComType.POS.ordinal()); - writeIntM.invoke(buf, pos); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.POS.ordinal()); + buf.writeInt(pos); send(player1, buf); } catch (Exception e) { @@ -342,8 +297,8 @@ public class SideFolia extends ISide { protected void topSendStop() { try { for (Player player : Bukkit.getOnlinePlayers()) { - Object buf = bufferM.invoke(null); - writeByteM.invoke(buf, ComType.STOP.ordinal()); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); send(player, buf); } @@ -360,8 +315,8 @@ public class SideFolia extends ISide { if (player == null) return; - Object buf = bufferM.invoke(null); - writeByteM.invoke(buf, ComType.STOP.ordinal()); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.STOP.ordinal()); send(player, buf); } catch (Exception e) { AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); @@ -376,8 +331,8 @@ public class SideFolia extends ISide { if (player == null) return; - Object buf = bufferM.invoke(null); - writeByteM.invoke(buf, ComType.CLEAR.ordinal()); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); send(player, buf); } catch (Exception e) { @@ -390,8 +345,8 @@ public class SideFolia extends ISide { public void clearHud() { try { for (Player player : Bukkit.getOnlinePlayers()) { - Object buf = bufferM.invoke(null); - writeByteM.invoke(buf, ComType.CLEAR.ordinal()); + ByteBuf buf = Unpooled.buffer(); + buf.writeByte(ComType.CLEAR.ordinal()); send(player, buf); } @@ -563,19 +518,13 @@ public class SideFolia extends ISide { return event.isCancel(); } - private void send(Player players, Object data) { + private void send(Player players, ByteBuf data) { if (players == null) return; try { if (AllMusic.isRun) { runTask(() -> - { - try { - players.sendPluginMessage(AllMusicFolia.plugin, AllMusic.channel, (byte[]) arrayM.invoke(data)); - } catch (IllegalAccessException | InvocationTargetException e) { - e.printStackTrace(); - } - }); + players.sendPluginMessage(AllMusicFolia.plugin, AllMusic.channel, data.array())); } } catch (Exception e) { AllMusic.log.warning("§c数据发送发生错误"); @@ -583,9 +532,9 @@ public class SideFolia extends ISide { } } - private void writeString(Object buf, String data) throws InvocationTargetException, IllegalAccessException { + private void writeString(ByteBuf buf, String data) { byte[] temp = data.getBytes(StandardCharsets.UTF_8); - writeIntM.invoke(buf, temp.length); - writeBytesM.invoke(buf, temp); + buf.writeInt(temp.length) + .writeBytes(temp); } } diff --git a/folia/src/main/java/coloryr/allmusic/side/folia/event/MusicAddEvent.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/event/MusicAddEvent.java similarity index 89% rename from folia/src/main/java/coloryr/allmusic/side/folia/event/MusicAddEvent.java rename to folia/src/main/java/com/coloryr/allmusic/server/side/folia/event/MusicAddEvent.java index 8d2bca12..51f06106 100644 --- a/folia/src/main/java/coloryr/allmusic/side/folia/event/MusicAddEvent.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.folia.event; +package com.coloryr.allmusic.server.side.folia.event; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import org.bukkit.command.CommandSender; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/folia/src/main/java/coloryr/allmusic/side/folia/event/MusicPlayEvent.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/event/MusicPlayEvent.java similarity index 86% rename from folia/src/main/java/coloryr/allmusic/side/folia/event/MusicPlayEvent.java rename to folia/src/main/java/com/coloryr/allmusic/server/side/folia/event/MusicPlayEvent.java index b4df5f81..ccd3acde 100644 --- a/folia/src/main/java/coloryr/allmusic/side/folia/event/MusicPlayEvent.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/event/MusicPlayEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.folia.event; +package com.coloryr.allmusic.server.side.folia.event; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; diff --git a/folia/src/main/java/coloryr/allmusic/side/folia/hooks/AllMusicPAPI.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/AllMusicPAPI.java similarity index 96% rename from folia/src/main/java/coloryr/allmusic/side/folia/hooks/AllMusicPAPI.java rename to folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/AllMusicPAPI.java index 111791cf..f9d94eb5 100644 --- a/folia/src/main/java/coloryr/allmusic/side/folia/hooks/AllMusicPAPI.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/AllMusicPAPI.java @@ -1,8 +1,8 @@ -package coloryr.allmusic.side.folia.hooks; +package com.coloryr.allmusic.server.side.folia.hooks; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.side.folia.PluginMessage; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.side.folia.PluginMessage; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; diff --git a/folia/src/main/java/coloryr/allmusic/side/folia/hooks/CitizensNPC.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/CitizensNPC.java similarity index 74% rename from folia/src/main/java/coloryr/allmusic/side/folia/hooks/CitizensNPC.java rename to folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/CitizensNPC.java index a6114282..be0d76ed 100644 --- a/folia/src/main/java/coloryr/allmusic/side/folia/hooks/CitizensNPC.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/CitizensNPC.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.side.folia.hooks; +package com.coloryr.allmusic.server.side.folia.hooks; import org.bukkit.entity.Entity; diff --git a/folia/src/main/java/coloryr/allmusic/side/folia/hooks/SpigotApi.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/SpigotApi.java similarity index 94% rename from folia/src/main/java/coloryr/allmusic/side/folia/hooks/SpigotApi.java rename to folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/SpigotApi.java index e8e1a14f..0d74c897 100644 --- a/folia/src/main/java/coloryr/allmusic/side/folia/hooks/SpigotApi.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/SpigotApi.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.folia.hooks; +package com.coloryr.allmusic.server.side.folia.hooks; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.TextComponent; diff --git a/folia/src/main/java/coloryr/allmusic/side/folia/hooks/VaultHook.java b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/VaultHook.java similarity index 90% rename from folia/src/main/java/coloryr/allmusic/side/folia/hooks/VaultHook.java rename to folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/VaultHook.java index ae59f65b..87838333 100644 --- a/folia/src/main/java/coloryr/allmusic/side/folia/hooks/VaultHook.java +++ b/folia/src/main/java/com/coloryr/allmusic/server/side/folia/hooks/VaultHook.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.folia.hooks; +package com.coloryr.allmusic.server.side.folia.hooks; -import coloryr.allmusic.core.sql.IEconomy; +import com.coloryr.allmusic.server.core.sql.IEconomy; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.EconomyResponse; import org.bukkit.Bukkit; diff --git a/folia/src/main/resources/plugin.yml b/folia/src/main/resources/plugin.yml index c74bcb88..e35a36ef 100644 --- a/folia/src/main/resources/plugin.yml +++ b/folia/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: AllMusic3 -main: coloryr.allmusic.AllMusicFolia +main: com.coloryr.allmusic.server.AllMusicFolia author: Color_yr version: 3.0.0 folia-supported: true diff --git a/folia/src/test/java/RunTest.java b/folia/src/test/java/RunTest.java index 69920753..d5214985 100644 --- a/folia/src/test/java/RunTest.java +++ b/folia/src/test/java/RunTest.java @@ -1,8 +1,8 @@ -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.CookieObj; -import coloryr.allmusic.core.objs.music.LyricItemObj; -import coloryr.allmusic.core.music.play.LyricSave; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.CookieObj; +import com.coloryr.allmusic.server.core.objs.music.LyricItemObj; +import com.coloryr.allmusic.server.core.music.play.LyricSave; +import com.coloryr.allmusic.server.core.side.IMyLogger; public class RunTest implements IMyLogger { public static void main(String[] arg) { diff --git a/forge_1_12_2/build.gradle b/forge_1_12_2/build.gradle index d7698194..4fd85768 100644 --- a/forge_1_12_2/build.gradle +++ b/forge_1_12_2/build.gradle @@ -16,8 +16,8 @@ plugins { apply plugin: 'net.minecraftforge.gradle' //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. -version = '2.19.4' -group = "com.coloryr.allmusic" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +version = '3.0.0' +group = "com.coloryr.allmusic.server" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "[Forge1.12.2]AllMusic_Server" sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' @@ -109,11 +109,11 @@ dependencies { jar.finalizedBy('reobfJar') shadowJar { -// relocate 'okhttp3', 'coloryr.allmusic.lib.okhttp3' -// relocate 'okio', 'coloryr.allmusic.lib.okio' -// relocate 'kotlin', 'coloryr.allmusic.lib.kotlin' -// relocate 'org.intellij', 'coloryr.allmusic.lib.org.intellij' -// relocate 'org.jetbrains', 'coloryr.allmusic.lib.org.jetbrains' +// relocate 'okhttp3', 'com.coloryr.allmusic.server.lib.okhttp3' +// relocate 'okio', 'com.coloryr.allmusic.server.lib.okio' +// relocate 'kotlin', 'com.coloryr.allmusic.server.lib.kotlin' +// relocate 'org.intellij', 'com.coloryr.allmusic.server.lib.org.intellij' +// relocate 'org.jetbrains', 'com.coloryr.allmusic.server.lib.org.jetbrains' configurations = [project.configurations.shadow] archiveClassifier.set('') dependencies { diff --git a/forge_1_12_2/src/main/java/coloryr/allmusic/TaskItem.java b/forge_1_12_2/src/main/java/coloryr/allmusic/TaskItem.java deleted file mode 100644 index ed368410..00000000 --- a/forge_1_12_2/src/main/java/coloryr/allmusic/TaskItem.java +++ /dev/null @@ -1,6 +0,0 @@ -package coloryr.allmusic; - -public class TaskItem { - public int tick; - public Runnable run; -} diff --git a/forge_1_12_2/src/main/java/coloryr/allmusic/AllMusicForge.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java similarity index 95% rename from forge_1_12_2/src/main/java/coloryr/allmusic/AllMusicForge.java rename to forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index 3444aaeb..01402b5c 100644 --- a/forge_1_12_2/src/main/java/coloryr/allmusic/AllMusicForge.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -1,7 +1,7 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.side.forge.*; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.side.forge.*; import net.minecraft.command.ServerCommandManager; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.MinecraftForge; diff --git a/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java new file mode 100644 index 00000000..40f9a5b9 --- /dev/null +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java @@ -0,0 +1,6 @@ +package com.coloryr.allmusic.server; + +public class TaskItem { + public int tick; + public Runnable run; +} diff --git a/forge_1_12_2/src/main/java/coloryr/allmusic/Tasks.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/Tasks.java similarity index 95% rename from forge_1_12_2/src/main/java/coloryr/allmusic/Tasks.java rename to forge_1_12_2/src/main/java/com/coloryr/allmusic/server/Tasks.java index 5bc0c6ea..e3593188 100644 --- a/forge_1_12_2/src/main/java/coloryr/allmusic/Tasks.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -1,4 +1,4 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; import java.util.ArrayList; import java.util.Iterator; diff --git a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/CommandForge.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java similarity index 86% rename from forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/CommandForge.java rename to forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 2681a013..0ed060d3 100644 --- a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/CommandForge.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.core.command.TabCommand; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.core.command.TabCommand; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; diff --git a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java similarity index 96% rename from forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java rename to forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index 825b1307..68e91f64 100644 --- a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/LogForge.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java similarity index 73% rename from forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/LogForge.java rename to forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java index 4c2705ea..ca84f904 100644 --- a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/LogForge.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import coloryr.allmusic.AllMusicForge; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogForge implements IMyLogger { @Override diff --git a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/PacketMessage.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/PacketMessage.java similarity index 91% rename from forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/PacketMessage.java rename to forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/PacketMessage.java index 221a51da..36a3cdbe 100644 --- a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/PacketMessage.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/PacketMessage.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; diff --git a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/PacketMessageHandler.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/PacketMessageHandler.java similarity index 89% rename from forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/PacketMessageHandler.java rename to forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/PacketMessageHandler.java index c0016d3f..7c8b90b0 100644 --- a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/PacketMessageHandler.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/PacketMessageHandler.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; diff --git a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/SideForge.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java similarity index 95% rename from forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/SideForge.java rename to forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 39329707..ad15abff 100644 --- a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/SideForge.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -1,17 +1,17 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import coloryr.allmusic.AllMusicForge; import coloryr.allmusic.TaskItem; import coloryr.allmusic.Tasks; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.hud.HudUtils; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.side.ComType; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.side.forge.event.MusicAddEvent; -import coloryr.allmusic.side.forge.event.MusicPlayEvent; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.hud.HudUtils; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ComType; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; import com.google.gson.Gson; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java similarity index 84% rename from forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java rename to forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java index e9947be6..18d6776e 100644 --- a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.forge.event; +package com.coloryr.allmusic.server.side.forge.event; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import net.minecraft.command.ICommandSender; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; diff --git a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java similarity index 75% rename from forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java rename to forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java index 27396307..cf778676 100644 --- a/forge_1_12_2/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java +++ b/forge_1_12_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.forge.event; +package com.coloryr.allmusic.server.side.forge.event; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; diff --git a/forge_1_12_2/src/main/resources/mcmod.info b/forge_1_12_2/src/main/resources/mcmod.info index 29380b4c..42e39518 100644 --- a/forge_1_12_2/src/main/resources/mcmod.info +++ b/forge_1_12_2/src/main/resources/mcmod.info @@ -1,11 +1,11 @@ [ { "modid": "allmusic_server", - "name": "AllMusic_Server", - "description": "allmusic server", - "version": "2.19.4", + "name": "AllMusic Server", + "description": "AllMusic Server Mod", + "version": "3.0.0", "mcversion": "1.12.2", - "url": "https://github.com/Coloryr/AllMusic_Server", + "url": "https://github.com/Coloryr/AllMusic3_Server", "updateUrl": "", "authorList": [ "Color_yr" diff --git a/forge_1_16_5/build.gradle b/forge_1_16_5/build.gradle index 1525cd55..5d3c362a 100644 --- a/forge_1_16_5/build.gradle +++ b/forge_1_16_5/build.gradle @@ -19,8 +19,8 @@ apply plugin: 'eclipse' apply plugin: 'maven-publish' apply plugin: 'kotlin' -version = '2.19.4' -group = 'coloryr.allmusic' // http://maven.apache.org/guides/mini/guide-naming-conventions.html +version = '3.0.0' +group = 'com.coloryr.allmusic.server' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = '[Forge1.16.5]AllMusic_Server' tasks.withType(JavaCompile).configureEach { @@ -163,11 +163,11 @@ dependencies { } shadowJar { -// relocate 'okhttp3', 'coloryr.allmusic.lib.okhttp3' -// relocate 'okio', 'coloryr.allmusic.lib.okio' -// relocate 'kotlin', 'coloryr.allmusic.lib.kotlin' -// relocate 'org.intellij', 'coloryr.allmusic.lib.org.intellij' -// relocate 'org.jetbrains', 'coloryr.allmusic.lib.org.jetbrains' +// relocate 'okhttp3', 'com.coloryr.allmusic.server.lib.okhttp3' +// relocate 'okio', 'com.coloryr.allmusic.server.lib.okio' +// relocate 'kotlin', 'com.coloryr.allmusic.server.lib.kotlin' +// relocate 'org.intellij', 'com.coloryr.allmusic.server.lib.org.intellij' +// relocate 'org.jetbrains', 'com.coloryr.allmusic.server.lib.org.jetbrains' configurations = [project.configurations.shadow] archiveClassifier.set('') dependencies { diff --git a/forge_1_16_5/src/main/java/coloryr/allmusic/TaskItem.java b/forge_1_16_5/src/main/java/coloryr/allmusic/TaskItem.java deleted file mode 100644 index ed368410..00000000 --- a/forge_1_16_5/src/main/java/coloryr/allmusic/TaskItem.java +++ /dev/null @@ -1,6 +0,0 @@ -package coloryr.allmusic; - -public class TaskItem { - public int tick; - public Runnable run; -} diff --git a/forge_1_16_5/src/main/java/coloryr/allmusic/AllMusicForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java similarity index 93% rename from forge_1_16_5/src/main/java/coloryr/allmusic/AllMusicForge.java rename to forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index da7ea1d4..2d4f4b78 100644 --- a/forge_1_16_5/src/main/java/coloryr/allmusic/AllMusicForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -1,9 +1,9 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.side.forge.CommandForge; -import coloryr.allmusic.side.forge.LogForge; -import coloryr.allmusic.side.forge.SideForge; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.side.forge.CommandForge; +import com.coloryr.allmusic.server.side.forge.LogForge; +import com.coloryr.allmusic.server.side.forge.SideForge; import com.mojang.brigadier.CommandDispatcher; import net.minecraft.command.CommandSource; import net.minecraft.network.PacketBuffer; diff --git a/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/TaskItem.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/TaskItem.java new file mode 100644 index 00000000..40f9a5b9 --- /dev/null +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/TaskItem.java @@ -0,0 +1,6 @@ +package com.coloryr.allmusic.server; + +public class TaskItem { + public int tick; + public Runnable run; +} diff --git a/forge_1_16_5/src/main/java/coloryr/allmusic/Tasks.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java similarity index 95% rename from forge_1_16_5/src/main/java/coloryr/allmusic/Tasks.java rename to forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java index 51e87255..78e2b5ec 100644 --- a/forge_1_16_5/src/main/java/coloryr/allmusic/Tasks.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -1,4 +1,4 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; import java.util.ArrayList; import java.util.Iterator; diff --git a/forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/CommandForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java similarity index 93% rename from forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/CommandForge.java rename to forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 7b920c73..47d5a9a9 100644 --- a/forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/CommandForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.core.command.TabCommand; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.core.command.TabCommand; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; diff --git a/forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java similarity index 96% rename from forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java rename to forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index 8907f209..b59c3584 100644 --- a/forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import net.minecraft.command.CommandSource; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/LogForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java similarity index 73% rename from forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/LogForge.java rename to forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java index 4c2705ea..ca84f904 100644 --- a/forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/LogForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import coloryr.allmusic.AllMusicForge; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogForge implements IMyLogger { @Override diff --git a/forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/SideForge.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java similarity index 95% rename from forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/SideForge.java rename to forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index ac000635..3e648e70 100644 --- a/forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/SideForge.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -1,17 +1,17 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import coloryr.allmusic.AllMusicForge; import coloryr.allmusic.TaskItem; import coloryr.allmusic.Tasks; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.hud.HudUtils; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.side.ComType; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.side.forge.event.MusicAddEvent; -import coloryr.allmusic.side.forge.event.MusicPlayEvent; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.hud.HudUtils; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ComType; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; import com.google.gson.Gson; import net.minecraft.command.CommandSource; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java similarity index 85% rename from forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java rename to forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java index bda17448..790e9929 100644 --- a/forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.forge.event; +package com.coloryr.allmusic.server.side.forge.event; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import net.minecraft.command.CommandSource; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraftforge.eventbus.api.Cancelable; diff --git a/forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java similarity index 74% rename from forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java rename to forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java index 4b455faa..f7642926 100644 --- a/forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java +++ b/forge_1_16_5/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.forge.event; +package com.coloryr.allmusic.server.side.forge.event; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; diff --git a/forge_1_16_5/src/main/resources/META-INF/mods.toml b/forge_1_16_5/src/main/resources/META-INF/mods.toml index b143216e..9deba86f 100644 --- a/forge_1_16_5/src/main/resources/META-INF/mods.toml +++ b/forge_1_16_5/src/main/resources/META-INF/mods.toml @@ -9,7 +9,7 @@ modLoader="javafml" #mandatory loaderVersion="[36,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. -license="All rights reserved" +license="GPL-3.0" # A URL to refer people to when problems occur with this mod #issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional # A list of mods - how many allowed here is determined by the individual mod loader diff --git a/forge_1_18_2/build.gradle b/forge_1_18_2/build.gradle index a7ced3bc..007f55bc 100644 --- a/forge_1_18_2/build.gradle +++ b/forge_1_18_2/build.gradle @@ -19,8 +19,8 @@ plugins { apply plugin: 'net.minecraftforge.gradle' -version = '2.19.4' -group = 'coloryr.allmusic' // http://maven.apache.org/guides/mini/guide-naming-conventions.html +version = '3.0.0' +group = 'com.coloryr.allmusic.server' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = '[Forge1.18.2]AllMusic_Server' // Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. @@ -180,11 +180,11 @@ dependencies { } shadowJar { -// relocate 'okhttp3', 'coloryr.allmusic.lib.okhttp3' -// relocate 'okio', 'coloryr.allmusic.lib.okio' -// relocate 'kotlin', 'coloryr.allmusic.lib.kotlin' -// relocate 'org.intellij', 'coloryr.allmusic.lib.org.intellij' -// relocate 'org.jetbrains', 'coloryr.allmusic.lib.org.jetbrains' +// relocate 'okhttp3', 'com.coloryr.allmusic.server.lib.okhttp3' +// relocate 'okio', 'com.coloryr.allmusic.server.lib.okio' +// relocate 'kotlin', 'com.coloryr.allmusic.server.lib.kotlin' +// relocate 'org.intellij', 'com.coloryr.allmusic.server.lib.org.intellij' +// relocate 'org.jetbrains', 'com.coloryr.allmusic.server.lib.org.jetbrains' configurations = [project.configurations.shadow] archiveClassifier.set('') dependencies { diff --git a/forge_1_18_2/src/main/java/coloryr/allmusic/TaskItem.java b/forge_1_18_2/src/main/java/coloryr/allmusic/TaskItem.java deleted file mode 100644 index ed368410..00000000 --- a/forge_1_18_2/src/main/java/coloryr/allmusic/TaskItem.java +++ /dev/null @@ -1,6 +0,0 @@ -package coloryr.allmusic; - -public class TaskItem { - public int tick; - public Runnable run; -} diff --git a/forge_1_18_2/src/main/java/coloryr/allmusic/AllMusicForge.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java similarity index 93% rename from forge_1_18_2/src/main/java/coloryr/allmusic/AllMusicForge.java rename to forge_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index d0200d16..19d13210 100644 --- a/forge_1_18_2/src/main/java/coloryr/allmusic/AllMusicForge.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -1,10 +1,10 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.side.forge.CommandForge; -import coloryr.allmusic.side.forge.LogForge; -import coloryr.allmusic.side.forge.SideForge; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.side.forge.CommandForge; +import com.coloryr.allmusic.server.side.forge.LogForge; +import com.coloryr.allmusic.server.side.forge.SideForge; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.ParseResults; import com.mojang.brigadier.arguments.StringArgumentType; diff --git a/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java new file mode 100644 index 00000000..40f9a5b9 --- /dev/null +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java @@ -0,0 +1,6 @@ +package com.coloryr.allmusic.server; + +public class TaskItem { + public int tick; + public Runnable run; +} diff --git a/forge_1_18_2/src/main/java/coloryr/allmusic/Tasks.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/Tasks.java similarity index 95% rename from forge_1_18_2/src/main/java/coloryr/allmusic/Tasks.java rename to forge_1_18_2/src/main/java/com/coloryr/allmusic/server/Tasks.java index 9c7a9260..67fed8ab 100644 --- a/forge_1_18_2/src/main/java/coloryr/allmusic/Tasks.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -1,4 +1,4 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; import java.util.ArrayList; import java.util.List; diff --git a/forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/CommandForge.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java similarity index 93% rename from forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/CommandForge.java rename to forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 773a7d16..897aa4d0 100644 --- a/forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/CommandForge.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.core.command.TabCommand; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.core.command.TabCommand; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; diff --git a/forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java similarity index 96% rename from forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java rename to forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index bd454d4c..c8de9098 100644 --- a/forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import net.minecraft.commands.CommandSource; import net.minecraft.commands.arguments.ComponentArgument; diff --git a/forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/LogForge.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java similarity index 73% rename from forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/LogForge.java rename to forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java index 4c2705ea..ca84f904 100644 --- a/forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/LogForge.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import coloryr.allmusic.AllMusicForge; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogForge implements IMyLogger { @Override diff --git a/forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/SideForge.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java similarity index 95% rename from forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/SideForge.java rename to forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index f9c1844f..29957839 100644 --- a/forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/SideForge.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -1,17 +1,17 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import coloryr.allmusic.AllMusicForge; import coloryr.allmusic.TaskItem; import coloryr.allmusic.Tasks; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.hud.HudUtils; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.side.ComType; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.side.forge.event.MusicAddEvent; -import coloryr.allmusic.side.forge.event.MusicPlayEvent; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.hud.HudUtils; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ComType; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; import com.google.gson.Gson; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java similarity index 83% rename from forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java rename to forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java index eeb0addf..10eb2df8 100644 --- a/forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.forge.event; +package com.coloryr.allmusic.server.side.forge.event; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; diff --git a/forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java similarity index 74% rename from forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java rename to forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java index 4b455faa..f7642926 100644 --- a/forge_1_16_5/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java +++ b/forge_1_18_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.forge.event; +package com.coloryr.allmusic.server.side.forge.event; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; diff --git a/forge_1_18_2/src/main/resources/META-INF/mods.toml b/forge_1_18_2/src/main/resources/META-INF/mods.toml index 12f0a2ff..dd4792aa 100644 --- a/forge_1_18_2/src/main/resources/META-INF/mods.toml +++ b/forge_1_18_2/src/main/resources/META-INF/mods.toml @@ -9,7 +9,7 @@ modLoader="javafml" #mandatory loaderVersion="[40,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. -license="All rights reserved" +license="GPL-3.0" # A URL to refer people to when problems occur with this mod #issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional # A list of mods - how many allowed here is determined by the individual mod loader diff --git a/forge_1_19_2/build.gradle b/forge_1_19_2/build.gradle index 8da5e36e..3c4b19eb 100644 --- a/forge_1_19_2/build.gradle +++ b/forge_1_19_2/build.gradle @@ -7,8 +7,8 @@ plugins { id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.21' } -version = '2.19.4' -group = 'coloryr.allmusic' // http://maven.apache.org/guides/mini/guide-naming-conventions.html +version = '3.0.0' +group = 'com.coloryr.allmusic.server' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = '[Forge1.19.2]AllMusic_Server' // Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. @@ -163,11 +163,11 @@ dependencies { } shadowJar { -// relocate 'okhttp3', 'coloryr.allmusic.lib.okhttp3' -// relocate 'okio', 'coloryr.allmusic.lib.okio' -// relocate 'kotlin', 'coloryr.allmusic.lib.kotlin' -// relocate 'org.intellij', 'coloryr.allmusic.lib.org.intellij' -// relocate 'org.jetbrains', 'coloryr.allmusic.lib.org.jetbrains' +// relocate 'okhttp3', 'com.coloryr.allmusic.server.lib.okhttp3' +// relocate 'okio', 'com.coloryr.allmusic.server.lib.okio' +// relocate 'kotlin', 'com.coloryr.allmusic.server.lib.kotlin' +// relocate 'org.intellij', 'com.coloryr.allmusic.server.lib.org.intellij' +// relocate 'org.jetbrains', 'com.coloryr.allmusic.server.lib.org.jetbrains' configurations = [project.configurations.shadow] archiveClassifier.set('') dependencies { diff --git a/forge_1_19_2/src/main/java/coloryr/allmusic/TaskItem.java b/forge_1_19_2/src/main/java/coloryr/allmusic/TaskItem.java deleted file mode 100644 index ed368410..00000000 --- a/forge_1_19_2/src/main/java/coloryr/allmusic/TaskItem.java +++ /dev/null @@ -1,6 +0,0 @@ -package coloryr.allmusic; - -public class TaskItem { - public int tick; - public Runnable run; -} diff --git a/forge_1_19_2/src/main/java/coloryr/allmusic/AllMusicForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java similarity index 94% rename from forge_1_19_2/src/main/java/coloryr/allmusic/AllMusicForge.java rename to forge_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index d5cf25c5..61e3e226 100644 --- a/forge_1_19_2/src/main/java/coloryr/allmusic/AllMusicForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -1,10 +1,10 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.side.forge.CommandForge; -import coloryr.allmusic.side.forge.LogForge; -import coloryr.allmusic.side.forge.SideForge; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.side.forge.CommandForge; +import com.coloryr.allmusic.server.side.forge.LogForge; +import com.coloryr.allmusic.server.side.forge.SideForge; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.ParseResults; import com.mojang.brigadier.arguments.StringArgumentType; diff --git a/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java new file mode 100644 index 00000000..40f9a5b9 --- /dev/null +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java @@ -0,0 +1,6 @@ +package com.coloryr.allmusic.server; + +public class TaskItem { + public int tick; + public Runnable run; +} diff --git a/forge_1_19_3/src/main/java/coloryr/allmusic/Tasks.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/Tasks.java similarity index 95% rename from forge_1_19_3/src/main/java/coloryr/allmusic/Tasks.java rename to forge_1_19_2/src/main/java/com/coloryr/allmusic/server/Tasks.java index 49af25f1..816c6205 100644 --- a/forge_1_19_3/src/main/java/coloryr/allmusic/Tasks.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -1,4 +1,4 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; import java.util.ArrayList; import java.util.List; diff --git a/forge_1_20/src/main/java/coloryr/allmusic/side/forge/CommandForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java similarity index 93% rename from forge_1_20/src/main/java/coloryr/allmusic/side/forge/CommandForge.java rename to forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 83e10e03..19c9c946 100644 --- a/forge_1_20/src/main/java/coloryr/allmusic/side/forge/CommandForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.core.command.TabCommand; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.core.command.TabCommand; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; diff --git a/forge_1_20/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java similarity index 97% rename from forge_1_20/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java rename to forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index 84672f39..de0525b4 100644 --- a/forge_1_20/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import net.minecraft.commands.CommandSource; import net.minecraft.commands.arguments.ComponentArgument; diff --git a/forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/LogForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java similarity index 73% rename from forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/LogForge.java rename to forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java index 4c2705ea..ca84f904 100644 --- a/forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/LogForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import coloryr.allmusic.AllMusicForge; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IMyLogger; public class LogForge implements IMyLogger { @Override diff --git a/forge_1_20/src/main/java/coloryr/allmusic/side/forge/SideForge.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java similarity index 95% rename from forge_1_20/src/main/java/coloryr/allmusic/side/forge/SideForge.java rename to forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 66ac770d..3a020a09 100644 --- a/forge_1_20/src/main/java/coloryr/allmusic/side/forge/SideForge.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -1,17 +1,17 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import coloryr.allmusic.AllMusicForge; import coloryr.allmusic.TaskItem; import coloryr.allmusic.Tasks; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.hud.HudUtils; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.side.ComType; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.side.forge.event.MusicAddEvent; -import coloryr.allmusic.side.forge.event.MusicPlayEvent; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.hud.HudUtils; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ComType; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; import com.google.gson.Gson; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/forge_1_20/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java similarity index 83% rename from forge_1_20/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java rename to forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java index eeb0addf..10eb2df8 100644 --- a/forge_1_20/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.forge.event; +package com.coloryr.allmusic.server.side.forge.event; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; diff --git a/forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java similarity index 74% rename from forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java rename to forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java index 4b455faa..f7642926 100644 --- a/forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java +++ b/forge_1_19_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.forge.event; +package com.coloryr.allmusic.server.side.forge.event; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; diff --git a/forge_1_19_3/build.gradle b/forge_1_19_3/build.gradle index 1efb6858..cd09384e 100644 --- a/forge_1_19_3/build.gradle +++ b/forge_1_19_3/build.gradle @@ -7,8 +7,8 @@ plugins { id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.0' } -version = '2.19.4' -group = 'coloryr.allmusic' // http://maven.apache.org/guides/mini/guide-naming-conventions.html +version = '3.0.0' +group = 'com.coloryr.allmusic.server' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = '[Forge1.19.3]AllMusic_Server' // Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. @@ -159,11 +159,11 @@ dependencies { } shadowJar { -// relocate 'okhttp3', 'coloryr.allmusic.lib.okhttp3' -// relocate 'okio', 'coloryr.allmusic.lib.okio' -// relocate 'kotlin', 'coloryr.allmusic.lib.kotlin' -// relocate 'org.intellij', 'coloryr.allmusic.lib.org.intellij' -// relocate 'org.jetbrains', 'coloryr.allmusic.lib.org.jetbrains' +// relocate 'okhttp3', 'com.coloryr.allmusic.server.lib.okhttp3' +// relocate 'okio', 'com.coloryr.allmusic.server.lib.okio' +// relocate 'kotlin', 'com.coloryr.allmusic.server.lib.kotlin' +// relocate 'org.intellij', 'com.coloryr.allmusic.server.lib.org.intellij' +// relocate 'org.jetbrains', 'com.coloryr.allmusic.server.lib.org.jetbrains' configurations = [project.configurations.shadow] archiveClassifier.set('') dependencies { diff --git a/forge_1_19_3/gradle.properties b/forge_1_19_3/gradle.properties index 0b9e19da..c246cb7d 100644 --- a/forge_1_19_3/gradle.properties +++ b/forge_1_19_3/gradle.properties @@ -44,18 +44,18 @@ file_name = [Forge1.19.3]AllMusic_Server # Must match the String constant located in the main mod class annotated with @Mod. mod_id=allmusic_server # The human-readable display name for the mod. -mod_name=AllMusic_Server +mod_name=AllMusic Server # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. -mod_license=GPl-3.0 +mod_license=GPL-3.0 # The mod version. See https://semver.org/ -mod_version=2.19.4 +mod_version=3.0.0 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html -mod_group_id=coloryr.allmusic_server +mod_group_id=com.coloryr.allmusic.server # The authors of the mod. This is a simple text string that is used for display purposes in the mod list. -mod_authors=Coloryr +mod_authors=Color_yr # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. -mod_description=AllMusic +mod_description=AllMusic Server Mod kff_version=4.3.0 \ No newline at end of file diff --git a/forge_1_19_3/src/main/java/coloryr/allmusic/TaskItem.java b/forge_1_19_3/src/main/java/coloryr/allmusic/TaskItem.java deleted file mode 100644 index ed368410..00000000 --- a/forge_1_19_3/src/main/java/coloryr/allmusic/TaskItem.java +++ /dev/null @@ -1,6 +0,0 @@ -package coloryr.allmusic; - -public class TaskItem { - public int tick; - public Runnable run; -} diff --git a/forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/LogForge.java b/forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/LogForge.java deleted file mode 100644 index 4c2705ea..00000000 --- a/forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/LogForge.java +++ /dev/null @@ -1,16 +0,0 @@ -package coloryr.allmusic.side.forge; - -import coloryr.allmusic.AllMusicForge; -import coloryr.allmusic.core.side.IMyLogger; - -public class LogForge implements IMyLogger { - @Override - public void warning(String data) { - AllMusicForge.LOGGER.warn(data); - } - - @Override - public void info(String data) { - AllMusicForge.LOGGER.info(data); - } -} diff --git a/forge_1_19_3/src/main/java/coloryr/allmusic/AllMusicForge.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java similarity index 94% rename from forge_1_19_3/src/main/java/coloryr/allmusic/AllMusicForge.java rename to forge_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index 4e335b9e..bfeee8c0 100644 --- a/forge_1_19_3/src/main/java/coloryr/allmusic/AllMusicForge.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -1,10 +1,10 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.side.forge.CommandForge; -import coloryr.allmusic.side.forge.LogForge; -import coloryr.allmusic.side.forge.SideForge; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.side.forge.CommandForge; +import com.coloryr.allmusic.server.side.forge.LogForge; +import com.coloryr.allmusic.server.side.forge.SideForge; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.ParseResults; import com.mojang.brigadier.arguments.StringArgumentType; diff --git a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/TaskItem.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/TaskItem.java new file mode 100644 index 00000000..40f9a5b9 --- /dev/null +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/TaskItem.java @@ -0,0 +1,6 @@ +package com.coloryr.allmusic.server; + +public class TaskItem { + public int tick; + public Runnable run; +} diff --git a/forge_1_20/src/main/java/coloryr/allmusic/Tasks.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/Tasks.java similarity index 95% rename from forge_1_20/src/main/java/coloryr/allmusic/Tasks.java rename to forge_1_19_3/src/main/java/com/coloryr/allmusic/server/Tasks.java index 49af25f1..816c6205 100644 --- a/forge_1_20/src/main/java/coloryr/allmusic/Tasks.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -1,4 +1,4 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; import java.util.ArrayList; import java.util.List; diff --git a/forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/CommandForge.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java similarity index 93% rename from forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/CommandForge.java rename to forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 83e10e03..19c9c946 100644 --- a/forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/CommandForge.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.core.command.TabCommand; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.core.command.TabCommand; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; diff --git a/forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java similarity index 97% rename from forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java rename to forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index 84672f39..de0525b4 100644 --- a/forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import net.minecraft.commands.CommandSource; import net.minecraft.commands.arguments.ComponentArgument; diff --git a/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java new file mode 100644 index 00000000..ca84f904 --- /dev/null +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java @@ -0,0 +1,16 @@ +package com.coloryr.allmusic.server.side.forge; + +import coloryr.allmusic.AllMusicForge; +import com.coloryr.allmusic.server.core.side.IMyLogger; + +public class LogForge implements IMyLogger { + @Override + public void warning(String data) { + AllMusicForge.LOGGER.warn(data); + } + + @Override + public void info(String data) { + AllMusicForge.LOGGER.info(data); + } +} diff --git a/forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/SideForge.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java similarity index 95% rename from forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/SideForge.java rename to forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 66ac770d..3a020a09 100644 --- a/forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/SideForge.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -1,17 +1,17 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import coloryr.allmusic.AllMusicForge; import coloryr.allmusic.TaskItem; import coloryr.allmusic.Tasks; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.hud.HudUtils; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.side.ComType; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.side.forge.event.MusicAddEvent; -import coloryr.allmusic.side.forge.event.MusicPlayEvent; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.hud.HudUtils; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ComType; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; import com.google.gson.Gson; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java similarity index 83% rename from forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java rename to forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java index eeb0addf..10eb2df8 100644 --- a/forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.forge.event; +package com.coloryr.allmusic.server.side.forge.event; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; diff --git a/forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java similarity index 74% rename from forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java rename to forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java index 4b455faa..f7642926 100644 --- a/forge_1_18_2/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java +++ b/forge_1_19_3/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.forge.event; +package com.coloryr.allmusic.server.side.forge.event; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; diff --git a/forge_1_20/build.gradle b/forge_1_20/build.gradle index a66421b5..d8c6d717 100644 --- a/forge_1_20/build.gradle +++ b/forge_1_20/build.gradle @@ -254,11 +254,11 @@ tasks.withType(JavaCompile).configureEach { shadowJar { -// relocate 'okhttp3', 'coloryr.allmusic.lib.okhttp3' -// relocate 'okio', 'coloryr.allmusic.lib.okio' -// relocate 'kotlin', 'coloryr.allmusic.lib.kotlin' -// relocate 'org.intellij', 'coloryr.allmusic.lib.org.intellij' -// relocate 'org.jetbrains', 'coloryr.allmusic.lib.org.jetbrains' +// relocate 'okhttp3', 'com.coloryr.allmusic.server.lib.okhttp3' +// relocate 'okio', 'com.coloryr.allmusic.server.lib.okio' +// relocate 'kotlin', 'com.coloryr.allmusic.server.lib.kotlin' +// relocate 'org.intellij', 'com.coloryr.allmusic.server.lib.org.intellij' +// relocate 'org.jetbrains', 'com.coloryr.allmusic.server.lib.org.jetbrains' configurations = [project.configurations.shadow] archiveClassifier.set('') dependencies { diff --git a/forge_1_20/gradle.properties b/forge_1_20/gradle.properties index 266ea523..166b139d 100644 --- a/forge_1_20/gradle.properties +++ b/forge_1_20/gradle.properties @@ -44,18 +44,18 @@ file_name = [Forge1.20]AllMusic_Server # Must match the String constant located in the main mod class annotated with @Mod. mod_id=allmusic_server # The human-readable display name for the mod. -mod_name=AllMusic_Server +mod_name=AllMusic Server # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPl-3.0 # The mod version. See https://semver.org/ -mod_version=2.19.4 +mod_version=3.0.0 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html -mod_group_id=coloryr.allmusic_server +mod_group_id=com.coloryr.allmusic.server # The authors of the mod. This is a simple text string that is used for display purposes in the mod list. -mod_authors=Coloryr +mod_authors=Color_yr # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. -mod_description=AllMusic +mod_description=AllMusic Server Mod kff_version=4.3.0 \ No newline at end of file diff --git a/forge_1_20/src/main/java/coloryr/allmusic/TaskItem.java b/forge_1_20/src/main/java/coloryr/allmusic/TaskItem.java deleted file mode 100644 index ed368410..00000000 --- a/forge_1_20/src/main/java/coloryr/allmusic/TaskItem.java +++ /dev/null @@ -1,6 +0,0 @@ -package coloryr.allmusic; - -public class TaskItem { - public int tick; - public Runnable run; -} diff --git a/forge_1_20/src/main/java/coloryr/allmusic/side/forge/LogForge.java b/forge_1_20/src/main/java/coloryr/allmusic/side/forge/LogForge.java deleted file mode 100644 index 4c2705ea..00000000 --- a/forge_1_20/src/main/java/coloryr/allmusic/side/forge/LogForge.java +++ /dev/null @@ -1,16 +0,0 @@ -package coloryr.allmusic.side.forge; - -import coloryr.allmusic.AllMusicForge; -import coloryr.allmusic.core.side.IMyLogger; - -public class LogForge implements IMyLogger { - @Override - public void warning(String data) { - AllMusicForge.LOGGER.warn(data); - } - - @Override - public void info(String data) { - AllMusicForge.LOGGER.info(data); - } -} diff --git a/forge_1_20/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java b/forge_1_20/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java deleted file mode 100644 index 4b455faa..00000000 --- a/forge_1_20/src/main/java/coloryr/allmusic/side/forge/event/MusicPlayEvent.java +++ /dev/null @@ -1,18 +0,0 @@ -package coloryr.allmusic.side.forge.event; - -import coloryr.allmusic.core.objs.music.SongInfoObj; -import net.minecraftforge.eventbus.api.Cancelable; -import net.minecraftforge.eventbus.api.Event; - -@Cancelable -public class MusicPlayEvent extends Event { - private final SongInfoObj music; - - public MusicPlayEvent(SongInfoObj music) { - this.music = music; - } - - public SongInfoObj getMusic() { - return music; - } -} diff --git a/forge_1_20/src/main/java/coloryr/allmusic/AllMusicForge.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java similarity index 94% rename from forge_1_20/src/main/java/coloryr/allmusic/AllMusicForge.java rename to forge_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java index 1ca50820..255a4e7e 100644 --- a/forge_1_20/src/main/java/coloryr/allmusic/AllMusicForge.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -1,10 +1,10 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.side.forge.CommandForge; -import coloryr.allmusic.side.forge.LogForge; -import coloryr.allmusic.side.forge.SideForge; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.side.forge.CommandForge; +import com.coloryr.allmusic.server.side.forge.LogForge; +import com.coloryr.allmusic.server.side.forge.SideForge; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.ParseResults; import com.mojang.brigadier.arguments.StringArgumentType; diff --git a/forge_1_20/src/main/java/com/coloryr/allmusic/server/TaskItem.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/TaskItem.java new file mode 100644 index 00000000..40f9a5b9 --- /dev/null +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/TaskItem.java @@ -0,0 +1,6 @@ +package com.coloryr.allmusic.server; + +public class TaskItem { + public int tick; + public Runnable run; +} diff --git a/forge_1_19_2/src/main/java/coloryr/allmusic/Tasks.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/Tasks.java similarity index 95% rename from forge_1_19_2/src/main/java/coloryr/allmusic/Tasks.java rename to forge_1_20/src/main/java/com/coloryr/allmusic/server/Tasks.java index 49af25f1..816c6205 100644 --- a/forge_1_19_2/src/main/java/coloryr/allmusic/Tasks.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -1,4 +1,4 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; import java.util.ArrayList; import java.util.List; diff --git a/forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/CommandForge.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java similarity index 93% rename from forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/CommandForge.java rename to forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java index 83e10e03..19c9c946 100644 --- a/forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/CommandForge.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; -import coloryr.allmusic.core.command.CommandEX; -import coloryr.allmusic.core.command.TabCommand; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.core.command.TabCommand; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; diff --git a/forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java similarity index 97% rename from forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java rename to forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java index 84672f39..de0525b4 100644 --- a/forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/ForgeApi.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import net.minecraft.commands.CommandSource; import net.minecraft.commands.arguments.ComponentArgument; diff --git a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java new file mode 100644 index 00000000..ca84f904 --- /dev/null +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java @@ -0,0 +1,16 @@ +package com.coloryr.allmusic.server.side.forge; + +import coloryr.allmusic.AllMusicForge; +import com.coloryr.allmusic.server.core.side.IMyLogger; + +public class LogForge implements IMyLogger { + @Override + public void warning(String data) { + AllMusicForge.LOGGER.warn(data); + } + + @Override + public void info(String data) { + AllMusicForge.LOGGER.info(data); + } +} diff --git a/forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/SideForge.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java similarity index 95% rename from forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/SideForge.java rename to forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java index 66ac770d..3a020a09 100644 --- a/forge_1_19_2/src/main/java/coloryr/allmusic/side/forge/SideForge.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -1,17 +1,17 @@ -package coloryr.allmusic.side.forge; +package com.coloryr.allmusic.server.side.forge; import coloryr.allmusic.AllMusicForge; import coloryr.allmusic.TaskItem; import coloryr.allmusic.Tasks; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.hud.HudUtils; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.side.ComType; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.side.forge.event.MusicAddEvent; -import coloryr.allmusic.side.forge.event.MusicPlayEvent; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.hud.HudUtils; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ComType; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; import com.google.gson.Gson; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java similarity index 83% rename from forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java rename to forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java index eeb0addf..10eb2df8 100644 --- a/forge_1_19_3/src/main/java/coloryr/allmusic/side/forge/event/MusicAddEvent.java +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.forge.event; +package com.coloryr.allmusic.server.side.forge.event; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; diff --git a/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java new file mode 100644 index 00000000..f7642926 --- /dev/null +++ b/forge_1_20/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java @@ -0,0 +1,18 @@ +package com.coloryr.allmusic.server.side.forge.event; + +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import net.minecraftforge.eventbus.api.Cancelable; +import net.minecraftforge.eventbus.api.Event; + +@Cancelable +public class MusicPlayEvent extends Event { + private final SongInfoObj music; + + public MusicPlayEvent(SongInfoObj music) { + this.music = music; + } + + public SongInfoObj getMusic() { + return music; + } +} diff --git a/forge_1_20_2/.gitattributes b/forge_1_20_2/.gitattributes new file mode 100644 index 00000000..f811f6ae --- /dev/null +++ b/forge_1_20_2/.gitattributes @@ -0,0 +1,5 @@ +# Disable autocrlf on generated files, they always generate with LF +# Add any extra files or paths here to make git stop saying they +# are changed when only line endings change. +src/generated/**/.cache/cache text eol=lf +src/generated/**/*.json text eol=lf diff --git a/forge_1_20_2/.gitignore b/forge_1_20_2/.gitignore new file mode 100644 index 00000000..12f86447 --- /dev/null +++ b/forge_1_20_2/.gitignore @@ -0,0 +1,25 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run + +# Files from Forge MDK +forge*changelog.txt diff --git a/forge_1_20_2/CREDITS.txt b/forge_1_20_2/CREDITS.txt new file mode 100644 index 00000000..a70c53d5 --- /dev/null +++ b/forge_1_20_2/CREDITS.txt @@ -0,0 +1,65 @@ +Minecraft Forge: Credits/Thank You + +Forge is a set of tools and modifications to the Minecraft base game code to assist +mod developers in creating new and exciting content. It has been in development for +several years now, but I would like to take this time thank a few people who have +helped it along it's way. + +First, the people who originally created the Forge projects way back in Minecraft +alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance +of me taking over the project, who knows what Minecraft modding would be today. + +Secondly, someone who has worked with me, and developed some of the core features +that allow modding to be as functional, and as simple as it is, cpw. For developing +FML, which stabelized the client and server modding ecosystem. As well as the base +loading system that allows us to modify Minecraft's code as elegently as possible. + +Mezz, who has stepped up as the issue and pull request manager. Helping to keep me +sane as well as guiding the community into creating better additions to Forge. + +Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which +I am a part}. For creating some of the core tools needed to make Minecraft modding +both possible, and as stable as can be. + On that note, here is some specific information of the MCP data we use: + * Minecraft Coder Pack (MCP) * + Forge Mod Loader and Minecraft Forge have permission to distribute and automatically + download components of MCP and distribute MCP data files. This permission is not + transitive and others wishing to redistribute the Minecraft Forge source independently + should seek permission of MCP or remove the MCP data files and request their users + to download MCP separately. + +And lastly, the countless community members who have spent time submitting bug reports, +pull requests, and just helping out the community in general. Thank you. + +--LexManos + +========================================================================= + +This is Forge Mod Loader. + +You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml + +This minecraft mod is a clean open source implementation of a mod loader for minecraft servers +and minecraft clients. + +The code is authored by cpw. + +It began by partially implementing an API defined by the client side ModLoader, authored by Risugami. +http://www.minecraftforum.net/topic/75440- +This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader. + +It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge. +http://www.minecraftforge.net/ + +Additionally, it contains an implementation of topological sort based on that +published at http://keithschwarz.com/interesting/code/?dir=topological-sort + +It also contains code from the Maven project for performing versioned dependency +resolution. http://maven.apache.org/ + +It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/ +with credit to it's authors. + +Forge Mod Loader downloads components from the Minecraft Coder Pack +(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team. + diff --git a/forge_1_20_2/LICENSE.txt b/forge_1_20_2/LICENSE.txt new file mode 100644 index 00000000..b0cbe2b3 --- /dev/null +++ b/forge_1_20_2/LICENSE.txt @@ -0,0 +1,520 @@ +Unless noted below, Minecraft Forge, Forge Mod Loader, and all +parts herein are licensed under the terms of the LGPL 2.1 found +here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and +copied below. + +Homepage: http://minecraftforge.net/ + https://github.com/MinecraftForge/MinecraftForge + + +A note on authorship: +All source artifacts are property of their original author, with +the exclusion of the contents of the patches directory and others +copied from it from time to time. Authorship of the contents of +the patches directory is retained by the Minecraft Forge project. +This is because the patches are partially machine generated +artifacts, and are changed heavily due to the way forge works. +Individual attribution within them is impossible. + +Consent: +All contributions to Forge must consent to the release of any +patch content to the Forge project. + +A note on infectivity: +The LGPL is chosen specifically so that projects may depend on Forge +features without being infected with its license. That is the +purpose of the LGPL. Mods and others using this code via ordinary +Java mechanics for referencing libraries are specifically not bound +by Forge's license for the Mod code. + + +=== MCP Data === +This software includes data from the Minecraft Coder Pack (MCP), with kind permission +from them. The license to MCP data is not transitive - distribution of this data by +third parties requires independent licensing from the MCP team. This data is not +redistributable without permission from the MCP team. + +=== Sharing === +I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of +the minecraft modding community. All contributions to these parts should be licensed under the same additional grant. + +-- Runtime patcher -- +License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher +and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses) + +-- ASM transformers -- +License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories) +under any alternative open source license as classified by the OSI (http://opensource.org/licenses) + +========================================================================= +This software includes portions from the Apache Maven project at +http://maven.apache.org/ specifically the ComparableVersion.java code. It is +included based on guidelines at +http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html +with notices intact. The only change is a non-functional change of package name. + +This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating +binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/ +authored by genman, heikok, pivot. +The only changes are to replace some Trove collection types with standard Java collections, and repackaged. +========================================================================= + + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/forge_1_20_2/README.txt b/forge_1_20_2/README.txt new file mode 100644 index 00000000..867e97e4 --- /dev/null +++ b/forge_1_20_2/README.txt @@ -0,0 +1,46 @@ + +Source installation information for modders +------------------------------------------- +This code follows the Minecraft Forge installation methodology. It will apply +some small patches to the vanilla MCP source code, giving you and it access +to some of the data and functions you need to build a successful mod. + +Note also that the patches are built against "un-renamed" MCP source code (aka +SRG Names) - this means that you will not be able to read them directly against +normal code. + +Setup Process: +============================== + +Step 1: Open your command-line and browse to the folder where you extracted the zip file. + +Step 2: You're left with a choice. +If you prefer to use Eclipse: +1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux) +2. Open Eclipse, Import > Existing Gradle Project > Select Folder + or run `gradlew eclipse` to generate the project. + +If you prefer to use IntelliJ: +1. Open IDEA, and import project. +2. Select your build.gradle file and have it import. +3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux) +4. Refresh the Gradle Project in IDEA if required. + +If at any point you are missing libraries in your IDE, or you've run into problems you can +run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything +{this does not affect your code} and then start the process again. + +Mapping Names: +============================= +By default, the MDK is configured to use the official mapping names from Mojang for methods and fields +in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this +license, if you do not agree with it you can change your mapping names to other crowdsourced names in your +build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here: +https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md + +Additional Resources: +========================= +Community Documentation: https://mcforge.readthedocs.io/en/latest/gettingstarted/ +LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0 +Forge Forum: https://forums.minecraftforge.net/ +Forge Discord: https://discord.gg/UvedJ9m diff --git a/forge_1_20_2/build.gradle b/forge_1_20_2/build.gradle new file mode 100644 index 00000000..d8c6d717 --- /dev/null +++ b/forge_1_20_2/build.gradle @@ -0,0 +1,275 @@ +plugins { + id 'eclipse' + id 'idea' + id 'maven-publish' + id 'net.minecraftforge.gradle' version '5.+' + id 'com.github.johnrengelman.shadow' version '7.1.2' + id 'org.jetbrains.kotlin.jvm' version '1.8.22' + id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.22' +} + +apply plugin: 'com.github.johnrengelman.shadow' + +version = mod_version +group = mod_group_id + +base { + archivesName = file_name +} + +// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. +java.toolchain.languageVersion = JavaLanguageVersion.of(17) + +println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" +minecraft { + // The mappings can be changed at any time and must be in the following format. + // Channel: Version: + // official MCVersion Official field/method names from Mojang mapping files + // parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official + // + // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. + // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md + // + // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge + // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started + // + // Use non-default mappings at your own risk. They may not always work. + // Simply re-run your setup task after changing the mappings to update your workspace. + mappings channel: mapping_channel, version: mapping_version + + // When true, this property will have all Eclipse run configurations run the "prepareX" task for the given run configuration before launching the game. + // In most cases, it is not necessary to enable. + // enableEclipsePrepareRuns = true + + // When true, this property will have all IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game. + // In most cases, it is not necessary to enable. + // enableIdeaPrepareRuns = true + + // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game. + // It is REQUIRED to be set to true for this template to function. + // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html + //copyIdeResources = true + + // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations. + // The folder name can be set on a run configuration using the "folderName" property. + // By default, the folder name of a run configuration is the name of the Gradle project containing it. + // generateRunFolders = true + + // This property enables access transformers for use in development. + // They will be applied to the Minecraft artifact. + // The access transformer file can be anywhere in the project. + // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge. + // This default location is a best practice to automatically put the file in the right place in the final jar. + // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information. + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. + runs { + client { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + // The markers can be added/remove as needed separated by commas. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + property 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + property 'forge.logging.console.level', 'debug' + + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', mod_id + + mods { + "${mod_id}" { + source sourceSets.main + } + } + } + + server { + workingDirectory project.file('run') + + property 'forge.logging.markers', 'REGISTRIES' + + property 'forge.logging.console.level', 'debug' + + property 'forge.enabledGameTestNamespaces', mod_id + + mods { + "${mod_id}" { + source sourceSets.main + } + } + } + + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + gameTestServer { + workingDirectory project.file('run') + + property 'forge.logging.markers', 'REGISTRIES' + + property 'forge.logging.console.level', 'debug' + + property 'forge.enabledGameTestNamespaces', mod_id + + mods { + "${mod_id}" { + source sourceSets.main + } + } + } + + data { + workingDirectory project.file('run') + + property 'forge.logging.markers', 'REGISTRIES' + + property 'forge.logging.console.level', 'debug' + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + + mods { + "${mod_id}" { + source sourceSets.main + } + } + } + } +} + +// Include resources generated by data generators. +sourceSets.main.resources { srcDir 'src/generated/resources' } + +repositories { + // Put repositories for dependencies here + // ForgeGradle automatically adds the Forge maven and Maven Central for you + + // If you have mod jar dependencies in ./libs, you can declare them as a repository like so. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver + // flatDir { + // dir 'libs' + // } + + maven { + name = 'Kotlin for Forge' + url = 'https://thedarkcolour.github.io/KotlinForForge/' + } +} + +dependencies { + // Specify the version of Minecraft to use. + // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact. + // The "userdev" classifier will be requested and setup by ForgeGradle. + // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], + // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. + minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + + // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings + // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime + // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}") + // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}") + // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}") + + implementation "thedarkcolour:kotlinforforge:$kff_version" + + shadow 'com.squareup.okhttp3:okhttp:4.10.0' + shadow 'org.xerial:sqlite-jdbc:3.42.0.0' + + // Example mod dependency using a mod jar from ./libs with a flat dir repository + // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar + // The group id is ignored when searching -- in this case, it is "blank" + // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}") + + // For more info: + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html +} + +// This block of code expands all declared replace properties in the specified resource targets. +// A missing property will result in an error. Properties are expanded using ${} Groovy notation. +// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. +// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html +def resourceTargets = ['META-INF/mods.toml', 'pack.mcmeta'] +def replaceProperties = [ + minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, + forge_version: forge_version, forge_version_range: forge_version_range, + loader_version_range: loader_version_range, + mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, + mod_authors: mod_authors, mod_description: mod_description +] +processResources { + inputs.properties replaceProperties + replaceProperties.put 'project', project + + filesMatching(resourceTargets) { + expand replaceProperties + } +} + +// Example for how to get properties into the manifest for reading at runtime. +jar { + manifest { + attributes([ + "Specification-Title" : mod_id, + "Specification-Vendor" : mod_authors, + "Specification-Version" : "1", // We are version 1 of ourselves + "Implementation-Title" : project.name, + "Implementation-Version" : project.jar.archiveVersion, + "Implementation-Vendor" : mod_authors, + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } +} + +// Example configuration to allow publishing using the maven-publish plugin +// This is the preferred method to reobfuscate your jar file +jar.finalizedBy('reobfJar') +// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing +// publish.dependsOn('reobfJar') + +publishing { + publications { + mavenJava(MavenPublication) { + artifact jar + } + } + repositories { + maven { + url "file://${project.projectDir}/mcmodsrepo" + } + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} + + +shadowJar { +// relocate 'okhttp3', 'com.coloryr.allmusic.server.lib.okhttp3' +// relocate 'okio', 'com.coloryr.allmusic.server.lib.okio' +// relocate 'kotlin', 'com.coloryr.allmusic.server.lib.kotlin' +// relocate 'org.intellij', 'com.coloryr.allmusic.server.lib.org.intellij' +// relocate 'org.jetbrains', 'com.coloryr.allmusic.server.lib.org.jetbrains' + configurations = [project.configurations.shadow] + archiveClassifier.set('') + dependencies { + include(dependency('com.squareup.okhttp3:okhttp:4.10.0')) + include(dependency('com.squareup.okio:okio-jvm:3.0.0')) + include(dependency('org.xerial:sqlite-jdbc:3.42.0.0')) + } +} + +reobf { + shadowJar {} +} + +jar.finalizedBy('reobfJar') diff --git a/forge_1_20_2/changelog.txt b/forge_1_20_2/changelog.txt new file mode 100644 index 00000000..ca82056a --- /dev/null +++ b/forge_1_20_2/changelog.txt @@ -0,0 +1,650 @@ +1.19.x Changelog +44.1 +==== + - 44.1.20 Document RegisterParticleProvidersEvent's APIs (#9346) + - 44.1.19 Fix incorrect ListTag.getLongArray result (MC-260378) (#9351) + - 44.1.18 Fix missing patch that left TagBuilder#replace unused (#9354) + - 44.1.17 Add 2 new RenderLevelStageEvent.Stage for After Entities and After Block Entities (#9259) + - 44.1.16 Cleanup StemBlock Patch (#9337) + - 44.1.15 Cleanup ItemProperties patch (#9332) + - 44.1.14 Make IForgeIntrinsicHolderTagAppender methods properly chainable (#9331) + - 44.1.13 Fix in custom fluids not respecting max height correctly. (#9319) + - 44.1.12 Fix inconsistent vaporization in BucketItem & FluidType (#9269) + - 44.1.11 Fix reloading event firing during server shutdown and add explicit unloading event instead (#9016) + - 44.1.10 Homogenize and/or holdersets when serializing to prevent serializing to NBT from crashing (#9048) Fixes #9043 + - 44.1.9 [1.19.x] Fix `ForgeSlider` not respecting custom height (#9237) + - 44.1.8 Fix stepsound for blocks in the inside_step_sound_blocks tag. (#9318) + - 44.1.7 Fix missing hanging sign material for modded wood type (#9303) + - 44.1.6 Fire TickEvent.LevelTickEvent on ClientLevel tick (#9299) + - 44.1.5 Add ClientChatReceivedEvent for system messages (#9284) + - 44.1.4 PR Action update (#9274) + - 44.1.3 fix HangingSignEditScreen crash when using custom wood types using modid (#9294) + - 44.1.2 Bump SecureJarHandler version, to help identify invalid mods. + - 44.1.1 [1.19.3] Hotfix missing null check in createUnbakedItemElements (#9285) + - 44.1.0 Mark 1.19.3 Recommended Build + +44.0 +==== + - 44.0.49 [1.19.3] Allow Item and Elements models to specify static color, sky light, and block light values. (#9106) + - 44.0.48 Fix StemBlock not checking canSustainPlant for the correct block, it now checks for Melons/Pumpkins instead of the stem itself. (#9270) + - 44.0.47 Add github shared actions for automation purposes. (#9251) + - 44.0.46 Add translate key for Forge pack.mcmeta description (#9260) + - 44.0.45 Fix broken link for update checker docs in mdk (#9271) + - 44.0.44 Remove duplicate updateNeighbourForOutputSignal call Fixes #9169 (#9234) + - 44.0.43 Add helper methods to access the set of loaded sprite locations (#9223) + - 44.0.42 Disable guiLight3d for generated item models (#9230) + - 44.0.41 Remove resource caching (#9254) + - 44.0.40 Add TradeWithVillagerEvent (#9244) + - 44.0.39 Update link for Parchment "Getting Started" (#9243) + - 44.0.38 Allows DatapackBuiltinEntriesProvider to datagen LevelStems (#9247) + - 44.0.37 Add a method to LootContext.Builder that allows changing the queried loot table id (#9084) + - 44.0.36 [1.19.3] Fix Datagen Tests and Providers (#9212) + - 44.0.35 Fix concrete powder not being hydrated by singular water sources (#9236) + - 44.0.34 [1.19.3] Fix LootTableLoadEvent not getting fired (#9239) + - 44.0.33 Allow using custom factories in button builders (#9238) + - 44.0.32 Fix logspam when a root resource is requested from DelegatingPackResources, fixes #9197 (#9227) + - 44.0.31 [1.19.3] Fix `retrieveRegistryLookup` attempting to get the registry lookup from a `HolderGetter` (#9225) + - 44.0.30 [1.19.3] Add ability to datagen forge specific values in pack.mcmeta (#9221) + Co-authored-by: sciwhiz12 + - 44.0.29 Add block atlas config to register forge:white texture (#9187) + - 44.0.28 Fix ExtendedButton not being highlighted when focused (#9144) + - 44.0.27 Separate checkAndFix from the check* tasks. (#9213) + - 44.0.26 Fix forge resources overriding vanilla ones (#9222) + - 44.0.25 Fix tooltip customization not working for creative inventory (#9218) + - 44.0.24 Fix glowing item frame entity's texture (#9126) + Fixes #9123 + - 44.0.23 Fix datapack registries not being synced to clients (#9219) + - 44.0.22 Fix creatives tabs rendering overlapping tabs if the selected tab isn't on the current page. (#9214) + - 44.0.21 Fix `SidedInvWrapper` not accounting for vanilla stacking special cases in brewing stands and furnaces (#9189) + - 44.0.20 Update to the latest JarJar. (#9217) + - 44.0.19 Specify NetworkHooks#getEntitySpawningPacket Generic Return Type (#9220) + - 44.0.18 Fix using a DeferredRegister on a non-forge wrapped registry. Closes #9199 + - 44.0.17 Add support for custom CreativeModeTab implementations (#9210) + - 44.0.16 Simplify tree grower patches (#9209) + - 44.0.15 Replace AdvancementProvider patch with Forge helper (#9188) + - 44.0.14 Allow using `PackOutput`s in Forge-added datagen classes (#9182) + - 44.0.13 Add simpleBlockWithItem for data gens (#9170) + - 44.0.12 Fix running test mods (#9211) + - 44.0.11 [1.19.3] Fix models nested in custom geometries not resolving parents (#9200) + - 44.0.10 Fix OBJ Loader caches not being thread-safe. (#9204) + - 44.0.9 [1.19.3] Add event before baked models are cached by the BlockModelShaper (#9190) + - 44.0.8 Fix compatibility checker task configuration (#9202) + - 44.0.7 Fix chat offset (#9184) + - 44.0.6 Redesign CreativeTab collection event to be a lot more straight forward. (#9198) + - 44.0.5 Move ICondition patch placement to before MC throws an error. + Disable the explicitly erroring test biome modifier. + - 44.0.4 Fix BlockStateProvider not waiting for models before finishing. (#9196) Fixes #9195: + - 44.0.3 Fix tooltips not rendering on screens. Closes #9191 + - 44.0.2 Fix merged mod resource pack not returning all resources with the same name when asked. Closes #9194 + - 44.0.1 Fix searching using the wrong prefix for items or tags. Fixes #9176 Fixes #9179 (#9177) + - 44.0.0 Forge 1.19.3 + Created a CreativeModeTabEvent to register creative mode tabs and populate entries per tab + Moved datapack registries to DataPackRegistryEvent.NewRegistry event instead of tying them to ForgeRegistry + Made it easier for mods to datagen datapack builtin entries with DatapackBuiltinEntriesProvider + Provided access to lookupProvider for datagen + Updated dependencies to match versions used by vanilla and update JarJar to 0.3.18 + Added a test mod for the new CreativeModeTabEvent + Throws better error message for Forge registries in tag datagen + Deleted ForgeRegistryTagsProvider + Updated ClientChatReceivedEvent and ServerChatEvent for Mojang changes + Added patches for both sign related methods in ModelLayers + Changed RegisterShadersEvent to use ResourceProvider + Migrated old Mojang math types to JOML + Co-authored-by: Marc Hermans + Co-authored-by: LexManos + Co-authored-by: sciwhiz12 + Co-authored-by: coehlrich + +43.2 +==== + - 43.2.0 43.2 Recommended Build. + +43.1 +==== + - 43.1.65 Allow discovering services from the mods folder that use java's modular definition. (#9143) + - 43.1.64 Make Datapack Registries support ICondition(s) (#9113) + - 43.1.63 Enable additional build types to handle pull request validation. (#9159) + - 43.1.62 Check source permission level before selector permission (#9147) + In some situations, such as execution of a function by an advancement as + part of its reward, a command source stack may have a backing source of + a ServerPlayer which may lack the entity selector permission and have an + explicit permission level that should allow the use of entity selectors, + through CommandSourceStack#withPermission. + We now check if the permission level of the command source stack is + sufficient for entity selectors _before_ checking if the source is a + player and if they have the requisite permission. + This means that an operator permission level of 2 will always override + the Forge entity selector permission. + Fixes #9137 + - 43.1.61 Fix fires spreading too/igniting custom portal frames. (#9142) + - 43.1.60 Add supplier to FlowerBlock so it works with custom MobEffects (#9139) + - 43.1.59 Fix some logical bugs related to the Grindstone Event (#9089) + - 43.1.58 Call baked model's `getModelData` before `getRenderTypes` (#9163) + - 43.1.57 Make Util.memoize thread-safe (#9155) + - 43.1.56 Rendering tweaks and fixes: Part 4 (#9065) + - 43.1.55 Fix `Transformation` loading `PoseStack` (#9083) + - 43.1.54 Add simple block appearance API (#9066) + - 43.1.53 Fix invalidated modded packets when on LAN (#9157) + - 43.1.52 Improve extensibility of DetectorRailBlock and PoweredRailBlock (#9130) + - 43.1.51 Fix launch handler minecraft classpath locator (#9120) + - 43.1.50 Add HitResult to `EntityTeleportEvent$EnderPearl` (#9135) + - 43.1.49 Throw aggregate exception for erroneous registry event dispatch (#9111) + This means that exceptions occurring during the dispatch of the registry + events, such as those from the suppliers of RegistryObjects, properly + cause a crash rather than merely being logged and allowing the game to + reach the main menu. + Fixes #8720 + - 43.1.48 Add missing semi-colon near the Dist import statement in example mod. + - 43.1.47 Fix ClientModEvents example not subscribing to client-sided events (#9097) + - 43.1.46 Use GitHub action to lock issues with the `spam` label (#9087) + - 43.1.45 Remove structures slave map to Feature registry (#9091) + - 43.1.44 Improve logging of missing or unsupported dependencies (#9104) + - 43.1.43 [1.19.x] Fix ValueSpec caching the return value incorrectly (#9046) + - 43.1.42 [1.19.x] Add event for registering spawn placements, and modifying existing (#9024) + - 43.1.41 [1.19.x] Add event for items being stacked or swapped in a GUI. (#9050) + - 43.1.40 [1.19.x] Fix PlayerInteractEvent.EntityInteractSpecific not cancelling on a server (#9079) + - 43.1.39 Fix canceling phantom spawns preventing any further attempts that tick. (#9041) + - 43.1.38 Rename fluid type milk translation keys (#9077) + - 43.1.37 Fix minecart speed with water (#9076) + - 43.1.36 Add a cancellable event that gets fired when a Totem of Undying is used (#9069) + - 43.1.35 Fix performance issue and logging when resource caching is enabled (#9029) + - 43.1.34 Fix NPE when feeding wolves and cats (#9074) + - 43.1.33 Fix logically breaking change to ForgeConfigSpec.Builder#comment where modders could not add a empty line to the start of comments. (#9061) + - 43.1.32 Fix ServiceLoader bug + - 43.1.31 Fix ClientChatReceivedEvent for system messages + - 43.1.30 Make ForgeConfigSpec$Builder.comment able to be called multiple times for the same entry. (#9056) + - 43.1.29 Fix control modifier for mac with `KeyMapping`s using Alt instead of Super (#9057) + - 43.1.28 Fix is_desert tag not being applied correctly. (#9051) + - 43.1.27 Fix mob griefing event for SmallFireballs not using owner entity. (#9038) + - 43.1.26 Fix minecarts on rails not properly slowing down in water (#9033) + - 43.1.25 Change codestyle for BookShelves tag. Closes #9027 + Add IS_CAVE tag Closes #8885 + Add IS_DESERT tag Closes #8979 + Simplify Mangrove Swamp tags Closes #8980 + - 43.1.24 Allow faces of an "elements" model to have disabled ambient occlusion (#9019) + - 43.1.23 [1.19.x] Recipe ID-based grouping between modded and vanilla recipes. (#8876) + - 43.1.22 Update fence_gates/wooden (#8936) + - 43.1.21 [1.19.x] Added event for growing fungus (#8981) + - 43.1.20 Added Bookshelves block tag (#8991) + - 43.1.19 Create a Forge EntityType Tag for Bosses (#9017) + - 43.1.18 Allow mods to specify shader import namespace (#9021) + - 43.1.17 Grindstone Events (#8934) + One to modify the output, and one to modify the input. + - 43.1.16 Fix the serialized names of the enum (#9014) + - 43.1.15 Fix `tryEmptyContainerAndStow` duping fluids with stackable containers (#9004) + - 43.1.14 Add mod mismatch event (#8989) + - 43.1.13 [1.19.x] add methods with more context to tree growers (#8956) + - 43.1.12 [1.19.X] Adding more precise events for Advancements (#8360) + - 43.1.11 Default IItemHandler capability for shulker box itemstacks (#8827) + Co-authored-by: LexManos + - 43.1.10 [1.19] Add hook for items to remain in the hotbar when picking blocks/entities (#8872) + - 43.1.9 [1.19.x] Block Model Builder Root Transform Support (#8860) + Co-authored-by: sciwhiz12 + - 43.1.8 [1.19.x] Make LivingSetAttackTargetEvent compatible with the Brain/Behavior system. (Port of PR #8918) (#8954) + - 43.1.7 [1.19.x] Add IForgeBlock#onTreeGrow to replace IForgeBlock#onPlantGrow from 1.16 (#8999) + - 43.1.6 [1.19.x] Moved Player.resetAttackStrengthTicker() to the end of Player.attack() (#9000) + - 43.1.5 fix misplaced patch in sapling block (#9005) + - 43.1.4 Fix failed entity interactions consuming the click. (#9007) + - 43.1.3 Fix entity selector permission check to check original source (#8995) + Permission checks should be against the command source and not the + target entity, as is done in vanilla. + Fixes #8994 + - 43.1.2 Hotfix for 1.19.2 item animation bug (#8987) + * [HOT FIX]: Fixes #8985 by no-oping for vanilla models instead of throwing error + - 43.1.1 Add ability to Auto register capabilities via annotation (#8972) + - 43.1.0 1.19.2 RB + +43.0 +==== + - 43.0.22 Added ItemDecorator API (#8794) + - 43.0.21 [1.19.x] Custom usage animations for items (#8932) + - 43.0.20 Allow registering custom `ColorResolver`s (#8880) + - 43.0.19 [1.19] Allow custom outline rendering on EntityRenderers and BlockEntityRenderers (#8938) + - 43.0.18 Redirect checks for entity selector use to a permission (#8947) + This allows greater flexibility for configuring servers with + operator-like permissions to user groups through the permissions API and + their permissions handler of choice without needing to grant the + vanilla operator permission to any player. + The new permission is "forge:use_entity_selectors", which is granted by + default to players with permission level 2 (GAMEMASTERS) and above. + The hook falls back to checking the permission level if the source of + the command is not a ServerPlayer, such as for command blocks and + functions. + - 43.0.17 Allow FakePlayer to report its position (#8963) + - 43.0.16 Add alternate version of renderEntityInInventory to allow for directly specifying the angles (#8961) + - 43.0.15 Add cancellable ToastAddEvent (#8952) + - 43.0.14 Modify ScreenEvent.RenderInventoryMobEffects to allow moving the effect stack left or right (#8951) + - 43.0.13 Fix Enchantment#doPostHurt and Enchantment#doPostAttack being called twice for players. Fixes MC-248272 (#8948) + - 43.0.12 Remove reflective implementation of ICustomPacket. (#8973) + Make vanilla custom packets able to be sent multiple times. Closes #8969 + - 43.0.11 Filter name spaces to directories only. Closes #8413 + - 43.0.10 Fix a corner case where the UMLB can not extract a version from a library. (#8967) + - 43.0.9 Fix worlds with removed dimension types unable to load. (#8959) Closes #8800 + - 43.0.8 Fix issue where unknown chunk generators would cause DFU to fail. (#8957) + - 43.0.7 Fix comments and documentation that were missed during the review of #8712 (#8945) + - 43.0.6 Make AnvilUpdateEvent fire even if the second input is empty, which means it fires even if only changing the item name. (#8905) + - 43.0.5 Fix `LivingEntity#isBlocking` to use `ToolActions#SHIELD_BLOCK` instead of `UseAnim#BLOCK` (#8933) + - 43.0.4 Add Custom HolderSet Types allowing for logical combining of sets. (#8928) + - 43.0.3 Add values to VersionSupportMatrix to support loading mods that restrict versions to 1.19.1 on 1.19.2 (#8946) + - 43.0.2 Fix certain particles not updating their bounding box when their position changes (#8925) + - 43.0.1 Update EventBus to address concurrency issue in ModLauncher Factory. Closes #8924 + - 43.0.0 1.19.2 + +42.0 +==== + - 42.0.9 Remove calls to getStepHeight in Player#maybeBackOffFromEdge (#8927) + - 42.0.8 Add forge tags for tools and armors, these DO NOT replace ToolActions, and are designed just for Recipes. (#8914) + - 42.0.7 Add Biomes.BEACH to Tags (#8892) + - 42.0.6 Let NetworkInstance.isRemotePresent check minecraft:register for channel IDs. (#8921) + - 42.0.5 Add an event for when the chunk ticket level is updated (#8909) + - 42.0.4 Re-add PotentialSpawns event (#8712) + - 42.0.3 Fix misplaced patch in ItemEntityRenderer breaking ItemEntityRenderer#shouldBob() (#8919) + - 42.0.2 [1.19] [HotFix] Fix the dedicated server not having access to the JiJ filesystems. (#8931) + - 42.0.1 Match Mojang's action bar fix for MC-72687 (#8917) + - 42.0.0 Forge 1.19.1 + Load natives from classpath + Make command argument types a forge registry + Add `EntityMobGriefingEvent` to `Allay#wantsToPickUp` + Overhaul `ServerChatEvent` to use `ChatDecorator` system + Remove `ClientChatEvent#setMessage` for now + Gradle 7.5 + +41.1 +==== + - 41.1.0 Mark 1.19 RB + +41.0 +==== + - 41.0.113 Allow faces of an "elements" model to be made emissive (#8890) + - 41.0.112 Fix invalid channel names sent from the server causing the network thread to error. (#8902) + - 41.0.111 Fix PlayerEvent.BreakSpeed using magic block position to signify invalid position. Closes #8906 + - 41.0.110 Fix cases where URIs would not work properly with JarInJar (#8900) + - 41.0.109 Add new hook to allow modification of lightmap via Dimension special effects (#8863) + - 41.0.108 Fix Forge's packet handling on play messages. (#8875) + - 41.0.107 Add API for tab list header/footer (#8803) + - 41.0.106 Allow modded blocks overriding canStickTo prevent sticking to vanilla blocks/other modded blocks (#8837) + - 41.0.105 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 3 (#8864) + Fix weighted baked models not respecting children render types + Allow fluid container model to use base texture as particle + Fix inverted behavior in composite model building. Fixes #8871 + - 41.0.104 Fix crossbows not firing ArrowLooseEvent (#8887) + - 41.0.103 Add User-Agent header to requests made by the update checker (#8881) + Format: Java-http-client/ MinecraftForge/ / + - 41.0.102 Output the full path in a crash report so it is easier to find the outer mod when a crash in Jar-In-Jar occurs. (#8856) + - 41.0.101 Clean up the pick item ("middle mouse click") patches (#8870) + - 41.0.100 [1.19.x] Hotfix for test mods while the refactor is ongoing + - 41.0.99 add event to SugarCaneBlock (#8877) + - 41.0.98 Fix Global Loot Modifiers not using Dispatch Codec (#8859) + - 41.0.97 Allow block render types to be set in datagen (#8852) + - 41.0.96 Fix renderBreakingTexture not using the target's model data (#8849) + - 41.0.95 Multiple tweaks and fixes to the recent changes in the client refactor PR: Part 2 (#8854) + * Add getter for the component names in an unbaked geometry + * Fix render type hint not being copied in BlockGeometryBakingContext + * Ensure BlockRenderDispatches's renderSingleBlock uses the correct buffer + - 41.0.94 [1.19.x] Apply general renames, A SRG is provided for modders. (#8840) + See https://gist.github.com/SizableShrimp/882a671ff74256d150776da08c89ef72 + - 41.0.93 Fix mob block breaking AI not working correctly when chunk 0,0 is unloaded. Closes #8853 + - 41.0.92 Fix crash when breaking blocks with multipart models and remove caching. Closes #8850 + - 41.0.91 Fixed `CompositeModel.Baked.Builder.build()` passing arguments in the wrong order (#8846) + - 41.0.90 Make cutout mipmaps explicitly opt-in for item/entity rendering (#8845) + * Make cutout mipmaps explicitly opt-in for item/entity rendering + * Default render type domain to "minecraft" in model datagens + - 41.0.89 Fixed multipart block models not using the new model driven render type system. (#8844) + - 41.0.88 Update to the latest JarJar to fix a collision issue where multiple jars could provide an exact match. (#8847) + - 41.0.87 Add FML config to disable DFU optimizations client-side. (#8842) + * Add client-side command line argument to disable DFU optimizations. + * Switch to using FMLConfig value instead. + - 41.0.86 [1.19] Fixed broken BufferBuilder.putBulkData(ByteBuffer) added by Forge (#8819) + * Fixes BufferBuilder.putBulkData(ByteBuffer) + * use nextElementByte + * Fixed merge conflict + - 41.0.85 [1.19.x] Fix shulker boxes allowing input of items, that return false for Item#canFitInsideContainerItems, through hoppers. (#8823) + * Make ShulkerBoxBlockEntity#canPlaceItemThroughFace delegate to Item#canFitInsideContainerItems. + * Switch to using Or and add comment. + * Switch Or to And. + - 41.0.84 [1.19.x] Added RenderLevelStageEvent to replace RenderLevelLastEvent (#8820) + * Ported RenderLevelStageEvent from 1.18.2 + * Updated to fix merge conflicts + - 41.0.83 [1.19.x] Fix door datagenerator (#8821) + * Fix door datagenerator + Fix datagenerator for door blocks. Successor to #8687, addresses comments made there about statement complexity. + * Fix extra space around parameter + Fix extra space before comma around a parameter. + - 41.0.82 Create PieceBeardifierModifier to re-enable piecewise beardifier definitions (#8798) + - 41.0.81 Allow blocks to provide a dynamic MaterialColor for display on maps (#8812) + - 41.0.80 [1.19.x] BiomeTags Fixes/Improvements (#8711) + * dimension specific tag fix + * remove forge:is_beach cause vanilla has it already + * remove forge tags for new 1.19 vanilla tags (savanna, beach, overworld, end) + Co-authored-by: Flemmli97 + - 41.0.79 1.19 - Remove GlobalLootModifierSerializer and move to Codecs (#8721) + * convert GLM serializer class to codec + * cleanup + * GLM list needs to be sorted + * datagen + * simplify serialization + * fix test mods (oops) + * properly use suppliers for codec as they are registry obj + - 41.0.78 Implement item hooks for potions and enchantments (#8718) + * Implement item hooks for potions and enchantments + * code style fixes + - 41.0.77 Re-apply missing patch to ServerLevel.EntityCallbacks#onTrackingEnd() (#8828) + - 41.0.76 Double Bar Rendering fixed (#8806) (#8807) + * Double Bar Rendering fixed (#8806) + * Added requested changes by sciwhiz12 + - 41.0.75 Multiple tweaks and fixes to the recent changes in the client refactor PR (#8836) + * Add an easy way to get the NamedGuiOverlay from a vanilla overlay + * Fix static member ordering crash in UnitTextureAtlasSprite + * Allow boss bar rendering to be cancelled + * Make fluid container datagen use the new name + - 41.0.74 Add FogMode to ViewportEvent.RenderFog (#8825) + - 41.0.73 Provide additional context to the getFieldOfView event (#8830) + - 41.0.72 Pass renderType to IForgeBakedModel.useAmbientOcclusion (#8834) + - 41.0.71 Load custom ITransformationServices from the classpath in dev (#8818) + * Add a classpath transformer discoverer to load custom transformation services from the classpath + * Update ClasspathTransformerDiscoverer to 1.18 + * Update license year + * Update license header + * Fix the other license headers + * Update ClasspathTransformerDiscoverer to 1.19 + - 41.0.70 Handle modded packets on the network thread (#8703) + * Handle modded packets on the network thread + - On the server we simply need to remove the call to + ensureRunningOnSameThread. + - On the client side, we now handle the packet at the very start of the + call. We make sure we're running from a network thread to prevent + calling the handling code twice. + While this does mean we no longer call .release(), in practice this + doesn't cause any leaks as ClientboundCustomPayloadPacket releases + for us. + * Clarify behaviour a little in the documentation + * Javadoc formatting + * Add a helper method for handling packets on the main thread + Also rename the network thread one. Should make it clearer the expected + behaviour of the two, and make it clearer there's a potentially breaking + change. + * Add back consumer() methods + Also document EventNetworkChannel, to clarify the thread behaviour + there. + * Add since = "1.19" to deprecated annotations + - 41.0.69 Cache resource listing calls in resource packs (#8829) + * Make the resource lookups cached. + * Include configurability and handle patch cleanup. + * Document and comment the cache manager. + * Make thread selection configurable. + * Implement a configurable loading mechanic that falls back to default behaviour when the config is not bound yet. + * Use boolean supplier and fix wildcard import. + * Clean up the VPR since this is more elegant. + * Clean up the VPR since this is more elegant. + * Address review comments. + * Address more review comments. + * Fix formatting on `getSource` + * Address comments by ichtt + * Adapt to pups requests. + * Stupid idea. + * Attempt this again with a copy on write list. + * Fix a concurrency and loading issue. + * Fix #8813 + Checks if the paths are valid resource paths. + * Move the new methods on vanilla Patch. + - 41.0.68 Update SJH and JIJ + - 41.0.67 Fix #8833 (#8835) + - 41.0.66 Fix backwards fabulous check in SimpleBakedModel (#8832) + Yet another blunder we missed during the review of #8786. + - 41.0.65 Make texture atlas in StandaloneGeometryBakingContext configurable (#8831) + - 41.0.64 [1.19.X] Client code cleanup, updates, and other refactors (#8786) + * Revert "Allow safely registering RenderType predicates at any time (#8685)" + This reverts commit be7275443fd939db9c58bcad47079c3767789ac1. + * Renderable API refactors + - Rename "render values" to "context" + - Rename SimpleRenderable to CompositeRenderable to better reflect its use + - Remove IMultipartRenderValues since it doesn't have any real use + - Add extensive customization options to BakedModelRenderable + * ClientRegistry and MinecraftForgeClient refactors + - Add sprite loader manager and registration event + - Add spectator shader manager and registration event + - Add client tooltip factory manager and registration event + - Add recipe book manager and registration event + - Add key mapping registration event + - Remove ClientRegistry, as everything has been moved out of it + - Remove registration methods from MinecraftForgeClient, as they have dedicated events now + * Dimension special effects refactors + - Fold handlers into an extension class and remove public mutable fields + - Add dimension special effects manager and registration event + * HUD overlay refactors + - Rename to IGuiOverlay match vanilla (instead of Ingame) + - Add overlay manager and registration event + - Move vanilla overlays to a standalone enum + * Model loader refactors + - Rename IModelLoader to IGeometryLoader + - Add loader manager and registration event + - Fold all model events into one + - Move registration of additionally loaded models to an event + - Remove ForgeModelBakery and related classes as they served no purpose anymore + * Render properties refactors + - Rename all render properties to client extensions and relocate accordingly + - Move lookups to the respective interfaces + * Model data refactors + - Convert model data to a final class backed by an immutable map and document mutability requirements. This addresses several thread-safety issues in the current implementation which could result in race conditions + - Transfer ownership of the data manager to the client level. This addresses several issues that arise when multiple levels are used at once + * GUI and widget refactors + - Move all widgets to the correct package + - Rename GuiUtils and children to match vanilla naming + * New vertex pipeline API + - Move to vanilla's VertexConsumer + - Roll back recent PR making VertexConsumer format-aware. This is the opposite of what vanilla does, and should not be relevant with the updated lighting pipeline + * Lighting pipeline refactors + - Move to dedicated lighting package + - Separate flat and smooth lighters + - Convert from a vertex pipeline transformer to a pure vertex source (input is baked quads) + * Model geometry API refactors + - Rename IModelGeometry to IUnbakedGeometry + - Rename IModelConfiguration to IGeometryBakingContext + - Rename other elements to match vanilla naming + - Remove current changes to ModelState, as they do not belong there. Transforms should be specified through vanilla's system. ModelState is intended to transfer state from the blockstate JSON + - Remove multipart geometries and geometry parts. After some discussion, these should not be exposed. Instead, geometries should be baked with only the necessary parts enabled + * Make render types a first-class citizen in baked models + - Add named render types (block + entity + fabulous entity) + - Add named render type manager + registration event + - Make BakedModel aware of render types and transfer control over which ones are used to it instead of ItemBlockRenderTypes (fallback) + - (additional) Add concatenated list view. A wrapper for multiple lists that iterates through them in order without the cost of merging them. Useful for merging lists of baked quads + * General event refactors + - Several renames to either match vanilla or improve clarity + - Relocate client chat event dispatching out of common code + * Forge model type refactors + - Rename SeparatePerspectiveModel to SeparateTransformsModel + - Rename ItemModelMesherForge to ForgeItemModelShaper + - Rename DynamicBucketModel to DynamicFluidContainerModel + - Prefix all OBJ-related classes with "Obj" and decouple parsing from construction + - Extract ElementsModel from model loader registry + - Add EmptyModel (baked, unbaked and loader) + - Refactor CompositeModel to take over ItemMultiLayerBakedModel + - Remove FluidModel as it's not used and isn't compatible with the new fluid rendering in modern versions + - Move model loader registration to a proper event handler + - Update names of several JSON fields (backwards-compatible) + - Update datagens to match + * Miscellaneous changes and overlapping patches + - Dispatch all new registration events + - Convert ExtendedServerListData to a record + - Add/remove hooks from ForgeHooksClient as necessary + * Update test mods + * Fix VertexConsumerWrapper returning parent instead of itself + * Additional event cleanup pass + As discussed on Discord: + - Remove "@hidden" and "@see " javadoc annotations from all client events and replace them with @ApiStatus.Internal annotation + - Make all events that shouldn't be fired directly into abstract classes with protected constructors + - Another styling pass, just in case (caught some missed classes) + * Add proper deprecation javadocs and de-dupe some vertex consumer code + * Replace sets of chunk render types with a faster BitSet-backed collection + This largely addresses potential performance concerns that using a plain HashSet might involve by making lookups and iteration as linear as they can likely be (aside from using a plain byte/int/long for bit storage). Further performance concerns related to the implementation may be addressed separately, as all the implementation details are hidden from the end user + * Requested changes + - Remove MinecraftForgeClient and move members to Minecraft, IForgeMinecraft and StencilManager + - Allow non-default elements to be passed into VertexConsumer and add support to derived classes + - Move array instantiation out of quad processing in lighting pipeline + - Fix flipped fluid container model + - Set default UV1 to the correct values in the remapping pipeline + - Minor documentation changes + * Add/update EXC entries and fix AT comment + * Add test mod as per Orion's request + * Additional requested changes + * Allow custom model types to request the particle texture to be loaded + * Even more requested changes + * Improve generics in ConcatenatedListView and add missing fallbacks + * Fix fluid render types being bound to the fluid and not its holder + * Remove non-contractual nullability in ChunkRenderTypeSet and add isEmpty + Additionally, introduce chunk render type checks in ItemBlockRenderTypes + Co-authored-by: Dennis C + - 41.0.63 Implement full support for IPv6 (#8742) + - 41.0.62 Fix certain user-configured options being overwritten incorrectly due to validators. (#8780) + - 41.0.61 Allow safely registering RenderType predicates at any time (#8685) + - 41.0.60 Fix crash after loading error due to fluid texture gathering and config lookup (#8802) + - 41.0.59 Remove the configuration option for handling empty tags in ingredients. (#8799) + Now empty tags are considered broken in all states. + - 41.0.58 Fix MC-105317 Structure blocks do not rotate entities correctly when loading (#8792) + - 41.0.57 Fire ChunkWatchEvents after sending packets (#8747) + - 41.0.56 Add item handler capability to chest boats (#8787) + - 41.0.55 Add getter for correct BiomeSpecialEffectsBuilder to BiomeInfo$Builder (#8781) + - 41.0.54 Fix BlockToolModificationEvent missing cancelable annotation (#8778) + - 41.0.53 Fix ticking chunk tickets from forge's chunk manager not causing chunks to fully tick (#8775) + - 41.0.52 Fix default audio device config loading string comparison issue (#8767) + - 41.0.51 Fix missed vanilla method overrides in ForgeRegistry (#8766) + - 41.0.50 Add MinecraftServer reference to ServerTickEvent (#8765) + - 41.0.49 Fix TagsProviders for datapack registries not recognizing existing files (#8761) + - 41.0.48 Add callback after a BlockState was changed and the neighbors were updated (#8686) + - 41.0.47 Add biome tag entries for 1.19 biomes (#8684) + - 41.0.46 Make fishing rods use tool actions for relevant logic (#8681) + - 41.0.45 Update BootstrapLauncher to 1.1.1 and remove the forced + merge of text2speech since new BSL does it. + - 41.0.44 Merge text2speech libs together so the natives are part of the jar + - 41.0.43 Make Forge ConfigValues implement Supplier. (#8776) + - 41.0.42 Fix merge derp in AbstractModProvider and logic derp in ModDiscoverer + - 41.0.41 Add "send to mods in order" method to ModList and use it (#8759) + * Add "send to mods in order" method to ModList and use it in RegistryEvents and DataGen.. + * Also preserve order in runAll + * Do better comparator thanks @pupnewfster + * postEvent as well. + - 41.0.40 Update SJH to 2.0.2.. (#8774) + * Update SJH to 2.0.3.. + - 41.0.39 Sanity check the version specified in the mod file (#8749) + * Sanity check the version specified in the mod file to + make sure it's compatible with JPMS standards for + version strings. + Closes #8748 + Requires SPI 6 + - 41.0.38 Fix SP-Devtime world loading crash due to missing server configs (#8757) + - 41.0.37 Remove ForgeWorldPreset and related code (#8756) + Vanilla has a working replacement. + - 41.0.36 Change ConfigValue#get() to throw if called before config loaded (#8236) + This prevents silent issues where a mod gets the value of the setting + before configs are loaded, which means the default value is always + returned. + As there may be situations where the getting the config setting before + configs are loaded is needed, and it is not preferable to hardcode the + default value, the original behavior is made available through #getRaw. + Implements and closes #7716 + * Remove getRaw() method + This is effectively replaced with the expression `spec.isLoaded() ? + configValue.get() : configValue.getDefault()`. + * Remove forceSystemNanoTime config setting + As implemented, it never had any effect as any place where the config + value would be queried happens before the configs are loaded. + - 41.0.35 Fix EnumArgument to use enum names for suggestions (#8728) + Previously, the suggestions used the string representation of the enum + through Enum#toString, which can differ from the name of the enum as + required by Enum#valueOf, causing invalid suggestions (both in gui and + through the error message). + - 41.0.34 Jar-In-Jar (#8715) + - 41.0.33 [1.19] Fix data-gen output path of custom data-pack registries (#8724) + - 41.0.32 Fix player dive and surface animations in custom fluids (#8738) + - 41.0.31 [1.19.x] Affect ItemEntity Motion in Custom Fluids (#8737) + - 41.0.30 [1.19] Add support for items to add enchantments without setting them in NBT (#8719) + - 41.0.29 [1.19.x] Add stock biome modifier types for adding features and spawns (#8697) + - 41.0.28 [1.19.x] Fluid API Overhaul (#8695) + - 41.0.27 Replace StructureSpawnListGatherEvent with StructureModifiers (#8717) + - 41.0.26 Use stack sensitive translation key by default for FluidAttributes. (#8707) + - 41.0.25 Delete LootItemRandomChanceCondition which added looting bonus enchantment incorrectly. (#8733) + - 41.0.24 Update EventBus to 6.0, ModLauncher to 10.0.1 and BootstrapLauncher to 1.1 (#8725) + - 41.0.23 Replace support bot with support action (#8700) + - 41.0.22 Fix Reach Distance / Attack Range being clamped at 6.0 (#8699) + - 41.0.21 [1.19.x] Fix mods' worldgen data not being loaded when creating new singleplayer worlds (#8693) + - 41.0.20 [1.19.x] Fix experimental confirmation screen (#8727) + - 41.0.19 Move is_mountain to forge's tag instead of vanilla's (#8726) + - 41.0.18 [1.19.x] Add CommandBuildContext to Register Command Events (#8716) + - 41.0.17 Only rewrite datagen cache when needed (#8709) + - 41.0.16 Implement a simple feature system for Forge (#8670) + * Implement a simple feature system for Forge. Allows mods to demand certain features are available in the loading system. An example for java_version is provided, but not expected to be used widely. This is more targeted to properties of the display, such as GL version and glsl profile. + Requires https://github.com/MinecraftForge/ForgeSPI/pull/13 to be merged first in ForgeSPI, and the SPI to be updated appropriately in build.gradle files. + * rebase onto 1.19 and add in SPI update + - 41.0.15 displayTest option in mods.toml (#8656) + * displayTest option in mods.toml + * "MATCH_VERSION" (or none) is existing match version string behaviour + * "IGNORE_SERVER_VERSION" accepts anything and sends special SERVERONLY string + * "IGNORE_ALL_VERSION" accepts anything and sends an empty string + * "NONE" allows the mod to supply their own displaytest using the IExtensionPoint mechanism. + * Update display test with feedback and added the mods.toml discussion in mdk. + - 41.0.14 Update forgeSPI to v5 (#8696) + - 41.0.13 Make IVertexConsumers such as the lighting pipeline, be aware of which format they are dealing with. (#8692) + Also fix Lighting pipeline ignoring the overlay coords from the block renderer. + - 41.0.12 Fixed misaligned patch to invalidateCaps in Entity (#8705) + - 41.0.11 Fix readAdditionalLevelSaveData (#8704) + - 41.0.10 Fixes setPos to syncPacketPositionCodec (#8702) + - 41.0.9 Fix wrong param passed to PlayLevelSoundEvent.AtEntity (#8688) + - 41.0.8 Override initialize in SlotItemHandler, so it uses the itemhandler instead of container (#8679) + - 41.0.7 Update MDK for 1.19 changes (#8675) + - 41.0.6 Add helper to RecipeType, and fix eclipse compiler error in test class. + - 41.0.5 Update modlauncher to latest (#8691) + - 41.0.4 Fix getting entity data serializer id crashing due to improper port to new registry system (#8678) + - 41.0.3 Fire registry events in the order vanilla registers to registries (#8677) + Custom registries are still fired in alphabetical order, after all vanilla registries. + Move forge's data_serializers registry to forge namespace. + - 41.0.2 Add method with pre/post wrap to allow setting/clearing mod context. (#8682) + Fixes ActiveContainer in ModContext not being present in registry events. Closes #8680 + - 41.0.1 Fix the Curlie oopsie + - 41.0.0 Forge 1.19 + * Bump pack.mcmeta formats + * 1.19 biome modifiers + * Mark ClientPlayerNetworkEvent.LoggedOutEvent's getters as nullable + * Add docs and package-info to client extension interfaces package + * Move RenderBlockOverlayEvent hooks to ForgeHooksClient + * Add package-infos to client events package + * Rename SoundLoadEvent to SoundEngineLoadEvent + This reduces confusion from consumers which may think the + name SoundLoadEvent refers to an individual sound being loaded rather + than the sound engine. + * Document and change SoundLoadEvent to fire on mod bus + Previously, it fired on both the mod bus and the Forge bus, which is + confusing for consumers. + * Delete SoundSetupEvent + Looking at its original implementation shows that there isn't an + appropriate place in the new sound code to reinsert the event, and the + place of 'sound engine/manager initialization event' is taken already by SoundLoadEvent. + * Perform some cleanup on client events + - Removed nullable annotations from ClientPlayerNetworkEvent + - Renamed #getPartialTicks methods to #getPartialTick, to be consistent + with vanilla's naming of the partial tick + - Cleanup documentation to remove line breaks, use the + spelling 'cancelled' over + 'canceled', and improve docs on existing and + new methods. + * Remove EntityEvent.CanUpdate + Closes MinecraftForge/MinecraftForge#6394 + * Switch to Jetbrains nullability annotations + * New PlayLevelSoundEvent; replaces old PlaySoundAtEntityEvent + * Remove ForgeWorldPresetScreens + * Remove IForgeRegistryEntry + * Remove use of List in FML's CompletableFutures + * Add docs to mod loading stages, stages, and phases + * Gradle 7.4.2 + * Use SLF4J in FMLLoader and other subprojects + * Switch dynamic versions in subprojects to pinned ones + * Switch ForgeRoot and MDK to FG plugin markers + * Configure Forge javadoc task + The task now uses a custom stylesheet with MCForge elements, and + configured to combine the generation from the four FML subprojects + (fmlloader, fmlcore, javafmllanguage, mclanguage) and the Forge project + into the javadoc output. + * Update docs/md files, for 1.19 update and the move away from IRC to Discord. + * Make "Potentially dangerous alternative prefix" a debug warning, not info. + Co-authored-by: Curle + Co-authored-by: sciwhiz12 + diff --git a/forge_1_20_2/gradle.properties b/forge_1_20_2/gradle.properties new file mode 100644 index 00000000..be31025f --- /dev/null +++ b/forge_1_20_2/gradle.properties @@ -0,0 +1,61 @@ +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +# This is required to provide enough memory for the Minecraft decompilation process. +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false + +## Environment Properties + +# The Minecraft version must agree with the Forge version to get a valid artifact +minecraft_version=1.20.2 +# The Minecraft version range can use any release version of Minecraft as bounds. +# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly +# as they do not follow standard versioning conventions. +minecraft_version_range=[1.20.2,1.21) +# The Forge version must agree with the Minecraft version to get a valid artifact +forge_version=48.1.0 +# The Forge version range can use any version of Forge as bounds or match the loader version range +forge_version_range=[48,) +# The loader version range can only use the major version of Forge/FML as bounds +loader_version_range=[48,) +# The mapping channel to use for mappings. +# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"]. +# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin. +# +# | Channel | Version | | +# |-----------|----------------------|--------------------------------------------------------------------------------| +# | official | MCVersion | Official field/method names from Mojang mapping files | +# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official | +# +# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. +# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md +# +# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge. +# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started +mapping_channel=official +# The mapping version to query from the mapping channel. +# This must match the format required by the mapping channel. +mapping_version=1.20.2 + +## Mod Properties + +file_name = [Forge1.20.2]AllMusic_Server + +# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} +# Must match the String constant located in the main mod class annotated with @Mod. +mod_id=allmusic_server +# The human-readable display name for the mod. +mod_name=AllMusic Server +# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. +mod_license=GPl-3.0 +# The mod version. See https://semver.org/ +mod_version=3.0.0 +# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. +# This should match the base package used for the mod sources. +# See https://maven.apache.org/guides/mini/guide-naming-conventions.html +mod_group_id=com.coloryr.allmusic.server +# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. +mod_authors=Color_yr +# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. +mod_description=AllMusic Server Mod + +kff_version=4.10.0 \ No newline at end of file diff --git a/forge_1_20_2/gradle/wrapper/gradle-wrapper.jar b/forge_1_20_2/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..249e5832 Binary files /dev/null and b/forge_1_20_2/gradle/wrapper/gradle-wrapper.jar differ diff --git a/forge_1_20_2/gradle/wrapper/gradle-wrapper.properties b/forge_1_20_2/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..aba097b0 --- /dev/null +++ b/forge_1_20_2/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/forge_1_20_2/gradlew b/forge_1_20_2/gradlew new file mode 100644 index 00000000..a69d9cb6 --- /dev/null +++ b/forge_1_20_2/gradlew @@ -0,0 +1,240 @@ +#!/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. +# + +############################################################################## +# +# 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/master/subprojects/plugins/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 + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# 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"' + +# 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 + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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 + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +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/forge_1_20_2/gradlew.bat b/forge_1_20_2/gradlew.bat new file mode 100644 index 00000000..f127cfd4 --- /dev/null +++ b/forge_1_20_2/gradlew.bat @@ -0,0 +1,91 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/forge_1_20_2/settings.gradle b/forge_1_20_2/settings.gradle new file mode 100644 index 00000000..fae5fc6f --- /dev/null +++ b/forge_1_20_2/settings.gradle @@ -0,0 +1,20 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } + maven { + name = "Sponge Maven Repository" + url = "https://repo.spongepowered.org/repository/maven-public/" + } + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' +} + + +rootProject.name = 'AllMusic_Server' \ No newline at end of file diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java new file mode 100644 index 00000000..255a4e7e --- /dev/null +++ b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/AllMusicForge.java @@ -0,0 +1,136 @@ +package com.coloryr.allmusic.server; + +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.side.forge.CommandForge; +import com.coloryr.allmusic.server.side.forge.LogForge; +import com.coloryr.allmusic.server.side.forge.SideForge; +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.ParseResults; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.logging.LogUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.commands.CommandSource; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; +import net.minecraft.commands.arguments.ComponentArgument; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.common.ForgeConfigSpec; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.CommandEvent; +import net.minecraftforge.event.RegisterCommandsEvent; +import net.minecraftforge.event.entity.player.PlayerEvent; +import net.minecraftforge.event.server.ServerStartingEvent; +import net.minecraftforge.event.server.ServerStoppingEvent; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.NetworkRegistry; +import net.minecraftforge.network.simple.SimpleChannel; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; +import net.minecraftforge.server.command.ForgeCommand; +import org.slf4j.Logger; + +import java.io.File; +import java.nio.charset.StandardCharsets; +import java.util.Locale; +import java.util.function.Supplier; + +import static net.minecraftforge.server.command.ForgeCommand.*; + +// The value here should match an entry in the META-INF/mods.toml file +@Mod(AllMusicForge.MODID) +public class AllMusicForge { + public static MinecraftServer server; + public static final SimpleChannel channel = NetworkRegistry.newSimpleChannel(new ResourceLocation("allmusic", "channel"), + () -> "1.0", s -> true, s -> true); + + // Define mod id in a common place for everything to reference + public static final String MODID = "allmusic_server"; + // Directly reference a slf4j logger + public static final Logger LOGGER = LogUtils.getLogger(); + // Create a Deferred Register to hold Blocks which will all be registered under the "examplemod" namespace + + public AllMusicForge() { + IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); + + // Register the commonSetup method for modloading + modEventBus.addListener(this::commonSetup); + + // Register ourselves for server and other game events we are interested in + MinecraftForge.EVENT_BUS.register(this); + } + + private void commonSetup(final FMLCommonSetupEvent event) { + channel.registerMessage(666, String.class, this::enc, this::dec, this::proc); + + String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); + + AllMusic.log = new LogForge(); + AllMusic.side = new SideForge(); + + new AllMusic().init(new File(path)); + } + + private void enc(String str, FriendlyByteBuf buffer) { + buffer.writeBytes(str.getBytes(StandardCharsets.UTF_8)); + } + + private String dec(FriendlyByteBuf buffer) { + return buffer.toString(StandardCharsets.UTF_8); + } + + private void proc(String str, Supplier supplier) { + NetworkEvent.Context context = supplier.get(); + context.setPacketHandled(true); + } + + @SubscribeEvent + public void onRegisterCommands(RegisterCommandsEvent event) { + CommandDispatcher dispatcher = event.getDispatcher(); + CommandForge.instance.register(dispatcher); + } + + // You can use SubscribeEvent and let the Event Bus discover methods to call + @SubscribeEvent + public void onServerStarting(ServerStartingEvent event) { + server = event.getServer(); + + AllMusic.start(); + Tasks.init(); + + + } + + @SubscribeEvent + public void onServerStopping(ServerStoppingEvent event) { + AllMusic.stop(); + } + + @SubscribeEvent + public void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { + AllMusic.removeNowPlayPlayer(event.getEntity().getName().getString()); + } + + @SubscribeEvent + public void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { + AllMusic.joinPlay(event.getEntity().getName().getString()); + } +} diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java new file mode 100644 index 00000000..40f9a5b9 --- /dev/null +++ b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/TaskItem.java @@ -0,0 +1,6 @@ +package com.coloryr.allmusic.server; + +public class TaskItem { + public int tick; + public Runnable run; +} diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/Tasks.java b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/Tasks.java new file mode 100644 index 00000000..816c6205 --- /dev/null +++ b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/Tasks.java @@ -0,0 +1,33 @@ +package com.coloryr.allmusic.server; + +import java.util.ArrayList; +import java.util.List; +import java.util.Queue; +import java.util.concurrent.ConcurrentLinkedDeque; +import java.util.concurrent.CopyOnWriteArrayList; + +public class Tasks { + private static final List taskItems = new CopyOnWriteArrayList<>(); + + public static void init() { + AllMusicForge.server.addTickable(Tasks::tick); + } + + public static void tick() { + synchronized (taskItems) { + for(TaskItem 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/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java new file mode 100644 index 00000000..19c9c946 --- /dev/null +++ b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/CommandForge.java @@ -0,0 +1,67 @@ +package com.coloryr.allmusic.server.side.forge; + +import com.coloryr.allmusic.server.core.command.CommandEX; +import com.coloryr.allmusic.server.core.command.TabCommand; +import com.mojang.brigadier.Command; +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.suggestion.SuggestionProvider; +import com.mojang.brigadier.suggestion.Suggestions; +import com.mojang.brigadier.suggestion.SuggestionsBuilder; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; + +import java.util.Iterator; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.function.Predicate; + +public class CommandForge implements Command, Predicate, SuggestionProvider { + public static CommandForge instance = new CommandForge(); + + public void register(CommandDispatcher dispatcher) { + dispatcher.register(((Commands.literal("music").requires(this)).executes(this)) + .then(Commands.argument("args", StringArgumentType.greedyString()) + .suggests(this).executes(this))); + } + + @Override + public int run(CommandContext context) { + var item = context.getSource(); + var source = item.source; + + var input = context.getInput(); + var temp = input.split(" "); + var arg = new String[temp.length - 1]; + System.arraycopy(temp, 1, arg, 0, arg.length); + + CommandEX.ex(source, context.getSource().getTextName(), arg); + + return 0; + } + + @Override + public boolean test(CommandSourceStack stack) { + return true; + } + + @Override + public CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) { + var input = context.getInput(); + var temp = input.split(" "); + var arg = new String[input.endsWith(" ") ? temp.length : temp.length - 1]; + System.arraycopy(temp, 1, arg, 0, temp.length - 1); + + if (input.endsWith(" ")) + builder = builder.createOffset(builder.getInput().lastIndexOf(32) + 1); + + List results = TabCommand.getTabList(context.getSource().getTextName(), arg); + + for (String s : results) { + builder.suggest(s); + } + + return builder.buildFuture(); + } +} diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java new file mode 100644 index 00000000..de0525b4 --- /dev/null +++ b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/ForgeApi.java @@ -0,0 +1,36 @@ +package com.coloryr.allmusic.server.side.forge; + +import net.minecraft.commands.CommandSource; +import net.minecraft.commands.arguments.ComponentArgument; +import net.minecraft.commands.arguments.EntityArgument; +import net.minecraft.network.chat.ClickEvent; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.ComponentUtils; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket; +import net.minecraft.server.level.ServerPlayer; + +public class ForgeApi { + public static void sendMessageRun(Object obj, String message, String end, String command) { + CommandSource sender = (CommandSource) obj; + MutableComponent send = Component.literal(message); + MutableComponent endtext = Component.literal(end); + endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command))); + send.append(endtext); + sender.sendSystemMessage(send); + } + + public static void sendMessageSuggest(Object obj, String message, String end, String command) { + CommandSource sender = (CommandSource) obj; + MutableComponent send = Component.literal(message); + MutableComponent endtext = Component.literal(end); + endtext.setStyle(endtext.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, command))); + send.append(endtext); + sender.sendSystemMessage(send); + } + + public static void sendBar(ServerPlayer player, String message) { + var pack = new ClientboundSetActionBarTextPacket(Component.literal(message)); + player.connection.send(pack); + } +} diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java new file mode 100644 index 00000000..ca84f904 --- /dev/null +++ b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/LogForge.java @@ -0,0 +1,16 @@ +package com.coloryr.allmusic.server.side.forge; + +import coloryr.allmusic.AllMusicForge; +import com.coloryr.allmusic.server.core.side.IMyLogger; + +public class LogForge implements IMyLogger { + @Override + public void warning(String data) { + AllMusicForge.LOGGER.warn(data); + } + + @Override + public void info(String data) { + AllMusicForge.LOGGER.info(data); + } +} diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java new file mode 100644 index 00000000..3a020a09 --- /dev/null +++ b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/SideForge.java @@ -0,0 +1,383 @@ +package com.coloryr.allmusic.server.side.forge; + +import coloryr.allmusic.AllMusicForge; +import coloryr.allmusic.TaskItem; +import coloryr.allmusic.Tasks; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.hud.HudUtils; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ComType; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.side.forge.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.forge.event.MusicPlayEvent; +import com.google.gson.Gson; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import net.minecraft.commands.CommandSource; +import net.minecraft.network.chat.Component; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Player; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.network.PacketDistributor; + +import java.io.File; +import java.nio.charset.StandardCharsets; +import java.util.Locale; + +public class SideForge extends ISide { + + @Override + public void reload() { + String path = String.format(Locale.ROOT, "config/%s/", "AllMusic"); + new AllMusic().init(new File(path)); + } + + @Override + public int getAllPlayer() { + return AllMusicForge.server.getPlayerCount(); + } + + @Override + public void runTask(Runnable run) { + AllMusicForge.server.execute(run); + } + + @Override + public void runTask(Runnable run1, int delay) { + Tasks.add(new TaskItem() {{ + tick = delay; + run = run1; + }}); + } + + @Override + public boolean checkPermission(String player, String permission) { + var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + if (player1 == null) + return false; + + return player1.hasPermissions(2); + } + + @Override + public boolean needPlay() { + int online = getAllPlayer(); + for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + online--; + } + } + return online > 0; + } + + @Override + public void send(String data, String player) { + send(AllMusicForge.server.getPlayerList().getPlayerByName(player), data); + } + + @Override + protected void topSendStop() { + try { + for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + send(player, ComType.stop); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + + @Override + protected void topSendStop(String name) { + try { + var player = AllMusicForge.server.getPlayerList().getPlayerByName(name); + if (player == null) + return; + send(player, ComType.stop); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c停止指令发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendMusic(String url) { + try { + for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (AllMusic.isOK(player.getName().getString(), null, false)) + continue; + send(player, ComType.play + url); + AllMusic.addNowPlayPlayer(player.getName().getString()); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); + e.printStackTrace(); + } + } + + @Override + protected void topSendMusic(String player, String url) { + try { + var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + if (player1 == null) + return; + if (AllMusic.isOK(player, null, false)) + return; + send(ComType.play + url, player); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌曲指令发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendPic(String url) { + try { + for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (AllMusic.isOK(player.getName().getString(), null, true)) + continue; + String name = player.getName().getString(); + SaveObj obj = HudUtils.get(name); + if (!obj.EnablePic) + continue; + send(player, ComType.img + url); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendPic(String player, String url) { + try { + var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + if (player1 == null) + return; + if (AllMusic.isOK(player1.getName().getString(), null, true)) + return; + send(ComType.img + url, player); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c图片指令发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendPos(String player, int pos) { + try { + var player1 = AllMusicForge.server.getPlayerList().getPlayerByName(player); + if (player1 == null) + return; + if (AllMusic.isOK(player1.getName().getString(), null, true)) + return; + send(ComType.pos + pos, player); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); + e.printStackTrace(); + } + } + + @Override + public void sendHudLyric(String data) { + try { + for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (AllMusic.isOK(player.getName().getString(), null, true)) + continue; + String name = player.getName().getString(); + SaveObj obj = HudUtils.get(name); + if (!obj.EnableLyric) + continue; + send(player, ComType.lyric + data); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌词发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendHudInfo(String data) { + try { + for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (AllMusic.isOK(player.getName().getString(), null, true)) + continue; + String name = player.getName().getString(); + SaveObj obj = HudUtils.get(name); + if (!obj.EnableInfo) + continue; + send(player, ComType.info + data); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌词信息发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendHudList(String data) { + try { + for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (AllMusic.isOK(player.getName().getString(), null, true)) + continue; + String name = player.getName().getString(); + SaveObj obj = HudUtils.get(name); + if (!obj.EnableList) + continue; + send(player, ComType.list + data); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c歌曲列表发送出错"); + e.printStackTrace(); + } + } + + @Override + public void sendHudUtilsAll() { + for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + String Name = player.getName().getString(); + try { + SaveObj obj = HudUtils.get(Name); + String data = new Gson().toJson(obj); + send(player, data); + } catch (Exception e1) { + AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); + e1.printStackTrace(); + } + } + } + + @Override + public void sendBar(String data) { + for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + try { + if (AllMusic.isOK(player.getName().getString(), null, true)) + continue; + ForgeApi.sendBar(player, data); + } catch (Exception e1) { + AllMusic.log.warning("§d[AllMusic]§c数据发送发生错误"); + e1.printStackTrace(); + } + } + } + + @Override + public void clearHud(String player) { + try { + send(ComType.clear, player); + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); + e.printStackTrace(); + } + } + + @Override + public void clearHud() { + try { + for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + send(player, ComType.clear); + } + } catch (Exception e) { + AllMusic.log.warning("§d[AllMusic]§c清空Hud发生出错"); + e.printStackTrace(); + } + } + + @Override + public void bq(String data) { + if (AllMusic.getConfig().MessageLimit + && data.length() > AllMusic.getConfig().MessageLimitSize) { + data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + } + for (var player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + player.sendSystemMessage(Component.literal(data)); + } + } + } + + @Override + public void bqt(String data) { + if (AllMusic.getConfig().MessageLimit + && data.length() > AllMusic.getConfig().MessageLimitSize) { + data = data.substring(0, AllMusic.getConfig().MessageLimitSize - 1) + "..."; + } + var finalData = Component.literal(data); + runTask(() -> { + for (Player player : AllMusicForge.server.getPlayerList().getPlayers()) { + if (!AllMusic.getConfig().NoMusicPlayer.contains(player.getName().getString())) { + player.sendSystemMessage(finalData); + } + } + }); + } + + @Override + public void sendMessaget(Object obj, String message) { + runTask(() -> ((CommandSource) obj).sendSystemMessage(Component.literal(message))); + } + + @Override + public void sendMessage(Object obj, String message) { + CommandSource sender = (CommandSource) obj; + sender.sendSystemMessage(Component.literal(message)); + } + + @Override + public void sendMessageRun(Object obj, String message, String end, String command) { + ForgeApi.sendMessageRun(obj, message, end, command); + } + + @Override + public void sendMessageSuggest(Object obj, String message, String end, String command) { + ForgeApi.sendMessageSuggest(obj, message, end, command); + } + + @Override + public boolean onMusicPlay(SongInfoObj obj) { + MusicPlayEvent event = new MusicPlayEvent(obj); + return MinecraftForge.EVENT_BUS.post(event); + } + + @Override + public boolean onMusicAdd(Object obj, MusicObj music) { + MusicAddEvent event = new MusicAddEvent(music, (ServerPlayer) obj); + return MinecraftForge.EVENT_BUS.post(event); + } + + @Override + public void updateInfo() { + + } + + @Override + public void updateLyric() { + + } + + @Override + public void ping() { + + } + + private void send(ServerPlayer players, String data) { + if (players == null) + return; + try { +// byte[] bytes = data.getBytes(StandardCharsets.UTF_8); +// ByteBuf buf = Unpooled.buffer(bytes.length + 1); +// buf.writeByte(666); +// buf.writeBytes(bytes); + + runTask(() -> AllMusicForge.channel.send(PacketDistributor.PLAYER.with( + () -> players + ), data)); + } catch (Exception e) { + AllMusic.log.warning("§c数据发送发生错误"); + e.printStackTrace(); + } + } +} diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java new file mode 100644 index 00000000..10eb2df8 --- /dev/null +++ b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicAddEvent.java @@ -0,0 +1,31 @@ +package com.coloryr.allmusic.server.side.forge.event; + +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import net.minecraft.server.level.ServerPlayer; +import net.minecraftforge.eventbus.api.Cancelable; +import net.minecraftforge.eventbus.api.Event; + +@Cancelable +public class MusicAddEvent extends Event { + /** + * 添加的音乐 + */ + private final MusicObj music; + /** + * 添加者 + */ + private final ServerPlayer player; + + public MusicAddEvent(MusicObj id, ServerPlayer player) { + this.music = id; + this.player = player; + } + + public ServerPlayer getPlayer() { + return player; + } + + public MusicObj getMusic() { + return music; + } +} diff --git a/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java new file mode 100644 index 00000000..f7642926 --- /dev/null +++ b/forge_1_20_2/src/main/java/com/coloryr/allmusic/server/side/forge/event/MusicPlayEvent.java @@ -0,0 +1,18 @@ +package com.coloryr.allmusic.server.side.forge.event; + +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import net.minecraftforge.eventbus.api.Cancelable; +import net.minecraftforge.eventbus.api.Event; + +@Cancelable +public class MusicPlayEvent extends Event { + private final SongInfoObj music; + + public MusicPlayEvent(SongInfoObj music) { + this.music = music; + } + + public SongInfoObj getMusic() { + return music; + } +} diff --git a/forge_1_20_2/src/main/resources/META-INF/mods.toml b/forge_1_20_2/src/main/resources/META-INF/mods.toml new file mode 100644 index 00000000..b119e9a6 --- /dev/null +++ b/forge_1_20_2/src/main/resources/META-INF/mods.toml @@ -0,0 +1,71 @@ +# This is an example mods.toml file. It contains the data relating to the loading mods. +# There are several mandatory fields (#mandatory), and many more that are optional (#optional). +# The overall format is standard TOML format, v0.5.0. +# Note that there are a couple of TOML lists in this file. +# Find more information on toml format here: https://github.com/toml-lang/toml +# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml +modLoader="javafml" #mandatory +# A version range to match for said mod loader - for regular FML @Mod it will be the forge version +loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. +# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. +license="${mod_license}" +# A URL to refer people to when problems occur with this mod +#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional +# A list of mods - how many allowed here is determined by the individual mod loader +[[mods]] #mandatory +# The modid of the mod +modId="${mod_id}" #mandatory +# The version number of the mod +version="${mod_version}" #mandatory +# A display name for the mod +displayName="${mod_name}" #mandatory +# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ +#updateJSONURL="https://change.me.example.invalid/updates.json" #optional +# A URL for the "homepage" for this mod, displayed in the mod UI +#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional +# A file name (in the root of the mod JAR) containing a logo for display +#logoFile="examplemod.png" #optional +# A text field displayed in the mod UI +#credits="" #optional +# A text field displayed in the mod UI +authors="${mod_authors}" #optional +# Display Test controls the display for your mod in the server connection screen +# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod. +# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod. +# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component. +# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value. +# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself. +#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional) + +# The description text for the mod (multi line!) (#mandatory) +description='''${mod_description}''' +# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. +[[dependencies.${mod_id}]] #optional +# the modid of the dependency +modId="forge" #mandatory +# Does this dependency have to exist - if not, ordering below must be specified +mandatory=true #mandatory +# The version range of the dependency +versionRange="${forge_version_range}" #mandatory +# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory +# BEFORE - This mod is loaded BEFORE the dependency +# AFTER - This mod is loaded AFTER the dependency +ordering="NONE" +# Side this dependency is applied on - BOTH, CLIENT, or SERVER +side="BOTH" +# Here's another dependency +[[dependencies.${mod_id}]] +modId="minecraft" +mandatory=true +# This version range declares a minimum of the current minecraft version up to but not including the next major version +versionRange="${minecraft_version_range}" +ordering="NONE" +side="BOTH" +[[dependencies.${mod_id}]] +modId="kotlinforforge" +mandatory=true +# This version range declares a minimum of the current minecraft version up to but not including the next major version +versionRange="[4,)" +ordering="NONE" +side="BOTH" diff --git a/forge_1_20_2/src/main/resources/icon.png b/forge_1_20_2/src/main/resources/icon.png new file mode 100644 index 00000000..b2b5fa79 Binary files /dev/null and b/forge_1_20_2/src/main/resources/icon.png differ diff --git a/forge_1_20_2/src/main/resources/pack.mcmeta b/forge_1_20_2/src/main/resources/pack.mcmeta new file mode 100644 index 00000000..add527bc --- /dev/null +++ b/forge_1_20_2/src/main/resources/pack.mcmeta @@ -0,0 +1,8 @@ +{ + "pack": { + "description": { + "text": "${mod_id} resources" + }, + "pack_format": 15 + } +} \ No newline at end of file diff --git a/link.cmd b/link.cmd index 80412815..63712af9 100644 --- a/link.cmd +++ b/link.cmd @@ -1,61 +1,17 @@ -mklink /j "folia/src/main/java/coloryr/allmusic/core" "core" -mklink /j "server_top/src/main/java/coloryr/allmusic/core" "core" -mklink /j "server/src/main/java/coloryr/allmusic/core" "core" -mklink /j "forge_1_20/src/main/java/coloryr/allmusic/core" "core" -mklink /j "forge_1_19_3/src/main/java/coloryr/allmusic/core" "core" -mklink /j "forge_1_19_2/src/main/java/coloryr/allmusic/core" "core" -mklink /j "forge_1_18_2/src/main/java/coloryr/allmusic/core" "core" -mklink /j "forge_1_16_5/src/main/java/coloryr/allmusic/core" "core" -mklink /j "forge_1_12_2/src/main/java/coloryr/allmusic/core" "core" -mklink /j "fabric_1_20_2/src/main/java/coloryr/allmusic/core" "core" -mklink /j "fabric_1_20/src/main/java/coloryr/allmusic/core" "core" -mklink /j "fabric_1_19_3/src/main/java/coloryr/allmusic/core" "core" -mklink /j "fabric_1_19_2/src/main/java/coloryr/allmusic/core" "core" -mklink /j "fabric_1_18_2/src/main/java/coloryr/allmusic/core" "core" -mklink /j "fabric_1_16_5/src/main/java/coloryr/allmusic/core" "core" +@echo off -@REM mklink /j "folia/src/main/resources/core" "resources" -@REM mklink /j "server_top/src/main/resources/core" "resources" -@REM mklink /j "server/src/main/resources/core" "resources" -@REM mklink /j "forge_1_20/src/main/resources/core" "resources" -@REM mklink /j "forge_1_19_3/src/main/resources/core" "resources" -@REM mklink /j "forge_1_19_2/src/main/resources/core" "resources" -@REM mklink /j "forge_1_18_2/src/main/resources/core" "resources" -@REM mklink /j "forge_1_16_5/src/main/resources/core" "resources" -@REM mklink /j "fabric_1_20/src/main/resources/core" "resources" -@REM mklink /j "fabric_1_19_3/src/main/resources/core" "resources" -@REM mklink /j "fabric_1_19_2/src/main/resources/core" "resources" -@REM mklink /j "fabric_1_18_2/src/main/resources/core" "resources" -@REM mklink /j "fabric_1_16_5/src/main/resources/core" "resources" +mkdir "build" +mkdir ".gradle" -mklink /j "folia/build" "build" -mklink /j "server_top/build" "build" -mklink /j "server/build" "build" -mklink /j "forge_1_20/build" "build" -mklink /j "forge_1_19_3/build" "build" -mklink /j "forge_1_19_2/build" "build" -mklink /j "forge_1_18_2/build" "build" -mklink /j "forge_1_16_5/build" "build" -mklink /j "forge_1_12_2/build" "build" -mklink /j "fabric_1_20_2/build" "build" -mklink /j "fabric_1_20/build" "build" -mklink /j "fabric_1_19_3/build" "build" -mklink /j "fabric_1_19_2/build" "build" -mklink /j "fabric_1_18_2/build" "build" -mklink /j "fabric_1_16_5/build" "build" +setlocal enabledelayedexpansion -mklink /j "folia/.gradle" ".gradle" -mklink /j "server_top/.gradle" ".gradle" -mklink /j "server/.gradle" ".gradle" -mklink /j "forge_1_20/.gradle" ".gradle" -mklink /j "forge_1_19_3/.gradle" ".gradle" -mklink /j "forge_1_19_2/.gradle" ".gradle" -mklink /j "forge_1_18_2/.gradle" ".gradle" -mklink /j "forge_1_16_5/.gradle" ".gradle" -mklink /j "forge_1_12_2/.gradle" ".gradle" -mklink /j "fabric_1_20_2/.gradle" ".gradle" -mklink /j "fabric_1_20/.gradle" ".gradle" -mklink /j "fabric_1_19_3/.gradle" ".gradle" -mklink /j "fabric_1_19_2/.gradle" ".gradle" -mklink /j "fabric_1_18_2/.gradle" ".gradle" -mklink /j "fabric_1_16_5/.gradle" ".gradle" \ No newline at end of file +set array=folia server_top server forge_1_20 forge_1_19_3 ^ +forge_1_19_2 forge_1_18_2 forge_1_16_5 forge_1_12_2 ^ +fabric_1_20_2 fabric_1_20 fabric_1_19_3 fabric_1_19_2 fabric_1_18_2 ^ +fabric_1_16_5 + +for %%i in (%array%) do ( + if not exist "%%i\src\main\java\com\coloryr\allmusic\server\core" mklink /j "%%i\src\main\java\com\coloryr\allmusic\server\core" "core" + if not exist "%%i\build" mklink /j "%%i\build" "build" + if not exist "%%i\.gradle" mklink /j "%%i\.gradle" ".gradle" +) \ No newline at end of file diff --git a/remove.cmd b/remove.cmd index 2f813ce2..371b44aa 100644 --- a/remove.cmd +++ b/remove.cmd @@ -1,61 +1,19 @@ -rmdir "folia/src/main/java/coloryr/allmusic/core" -rmdir "server/src/main/java/coloryr/allmusic/core" -rmdir "server_top/src/main/java/coloryr/allmusic/core" -rmdir "forge_1_20/src/main/java/coloryr/allmusic/core" -rmdir "forge_1_19_3/src/main/java/coloryr/allmusic/core" -rmdir "forge_1_19_2/src/main/java/coloryr/allmusic/core" -rmdir "forge_1_18_2/src/main/java/coloryr/allmusic/core" -rmdir "forge_1_16_5/src/main/java/coloryr/allmusic/core" -rmdir "forge_1_12_2/src/main/java/coloryr/allmusic/core" -rmdir "fabric_1_20_2/src/main/java/coloryr/allmusic/core" -rmdir "fabric_1_20/src/main/java/coloryr/allmusic/core" -rmdir "fabric_1_19_3/src/main/java/coloryr/allmusic/core" -rmdir "fabric_1_19_2/src/main/java/coloryr/allmusic/core" -rmdir "fabric_1_18_2/src/main/java/coloryr/allmusic/core" -rmdir "fabric_1_16_5/src/main/java/coloryr/allmusic/core" +@echo off -@REM rmdir /s /q "folia/src/main/resources/core" -@REM rmdir /s /q "server/src/main/resources/core" -@REM rmdir /s /q "server_top/src/main/resources/core" -@REM rmdir /s /q "forge_1_20/src/main/resources/core" -@REM rmdir /s /q "forge_1_19_3/src/main/resources/core" -@REM rmdir /s /q "forge_1_19_2/src/main/resources/core" -@REM rmdir /s /q "forge_1_18_2/src/main/resources/core" -@REM rmdir /s /q "forge_1_16_5/src/main/resources/core" -@REM rmdir /s /q "fabric_1_20/src/main/resources/core" -@REM rmdir /s /q "fabric_1_19_3/src/main/resources/core" -@REM rmdir /s /q "fabric_1_19_2/src/main/resources/core" -@REM rmdir /s /q "fabric_1_18_2/src/main/resources/core" -@REM rmdir /s /q "fabric_1_16_5/src/main/resources/core" +mkdir "build" +mkdir ".gradle" -rmdir /s /q "folia/build" -rmdir /s /q "server/build" -rmdir /s /q "server_top/build" -rmdir /s /q "forge_1_20/build" -rmdir /s /q "forge_1_19_3/build" -rmdir /s /q "forge_1_19_2/build" -rmdir /s /q "forge_1_18_2/build" -rmdir /s /q "forge_1_16_5/build" -rmdir /s /q "forge_1_12_2/build" -rmdir /s /q "fabric_1_20_2/build" -rmdir /s /q "fabric_1_20/build" -rmdir /s /q "fabric_1_19_3/build" -rmdir /s /q "fabric_1_19_2/build" -rmdir /s /q "fabric_1_18_2/build" -rmdir /s /q "fabric_1_16_5/build" +setlocal enabledelayedexpansion -rmdir /s /q "folia/.gradle" -rmdir /s /q "server/.gradle" -rmdir /s /q "server_top/.gradle" -rmdir /s /q "forge_1_20/.gradle" -rmdir /s /q "forge_1_19_3/.gradle" -rmdir /s /q "forge_1_19_2/.gradle" -rmdir /s /q "forge_1_18_2/.gradle" -rmdir /s /q "forge_1_16_5/.gradle" -rmdir /s /q "forge_1_12_2/.gradle" -rmdir /s /q "fabric_1_20_2/.gradle" -rmdir /s /q "fabric_1_20/.gradle" -rmdir /s /q "fabric_1_19_3/.gradle" -rmdir /s /q "fabric_1_19_2/.gradle" -rmdir /s /q "fabric_1_18_2/.gradle" -rmdir /s /q "fabric_1_16_5/.gradle" \ No newline at end of file +set array=folia server_top server forge_1_20 forge_1_19_3 ^ +forge_1_19_2 forge_1_18_2 forge_1_16_5 forge_1_12_2 ^ +fabric_1_20_2 fabric_1_20 fabric_1_19_3 fabric_1_19_2 fabric_1_18_2 ^ +fabric_1_16_5 + +for %%i in (%array%) do ( + if exist "%%i\src\main\java\com\coloryr\allmusic\server\core" rmdir "%%i\src\main\java\com\coloryr\allmusic\server\core" "core" + if exist "%%i\build" rmdir /s /q "%%i\build" "build" + if exist "%%i\.gradle" rmdir /s /q "%%i\.gradle" ".gradle" +) + +endlocal \ No newline at end of file diff --git a/resources/config.json b/resources/config.json deleted file mode 100644 index 5ddcaea5..00000000 --- a/resources/config.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "MaxList": 10, - "MinVote": 3, - "VoteTime" : 30, - "Delay": 0, - "KDelay": 0, - "Admin": ["CONSOLE","Color_yr"], - "LoginUser": "", - "NoMusicServer": [], - "NoMusicPlayer": [], - "BanMusic": [], - "PlayList": [], - "PlayListSwitch": true, - "PlayListRandom": true, - "SendLyric": true, - "NeedPermission": false, - "DefaultAddMusic": 0, - "TopPAPI": false, - "MessageLimit": false, - "MessageLimitSize": 40, - "MutePlayMessage": false, - "MuteAddMessage": false, - "ShowInBar": false, - "DefaultHud": { - "List": { - "x": 2, - "y": 74 - }, - "Lyric": { - "x": 74, - "y": 53 - }, - "Info": { - "x": 74, - "y": 2 - }, - "Pic": { - "x": 2, - "y": 2 - }, - "PicRotateSpeed": 10, - "EnablePicRotate": true, - "EnableList": true, - "EnableLyric": true, - "EnableInfo": true, - "EnablePic": true - }, - "Economys": { - "MysqlUrl": "jdbc:mysql://localhost:3306/minecraft?autoReconnect=true&autoReconnectForPools=true", - "Vault": true - }, - "UseCost": false, - "SearchCost": 20, - "AddMusicCost": 10, - "MaxMusicTime": 600, - "KtvMode": true, - "MusicBR": "320000", - "FunConfig": { - "Rain": true, - "RainRate": 10 - }, - "Version": "104" -} \ No newline at end of file diff --git a/resources/message.json b/resources/message.json deleted file mode 100644 index 5017cc3f..00000000 --- a/resources/message.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "MusicPlay": { - "StopPlay": "§d[AllMusic]§e已停止你的音乐播放", - "NoMusic": "§d[AllMusic]§e无正在播放的歌曲", - "Play": "§d[AllMusic]§e正在播放：%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia% | by: %PlayerName%", - "NoPlay": "§d[AllMusic]§e队列中无歌曲", - "ListMusic": { - "Head": "§d[AllMusic]§e队列中有歌曲数：%Count%", - "Item": "§e%Index%->%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia%", - "Get": "§d[AllMusic]§e歌曲列表%ListName%获取成功" - }, - "NoCanPlay": "§d[AllMusic]§c无法播放歌曲%MusicID%可能该歌曲为VIP歌曲", - "NoPlayMusic": "§d[AllMusic]§e你不会再收到点歌了！想要再次参与点歌就点一首歌或者参与切歌投票吧！", - "Switch": "§d[AllMusic]§e切换到玩家歌曲", - "AddMusic": "§d[AllMusic]§e音乐列表添加%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia%", - "CheckMusic": "§d[AllMusic]§2正在解析歌曲%MusicID%", - "MusicInfo": "%MusicName% | %MusicAuthor% | %MusicAl% | %MusicAlia% | by: %PlayerName%", - "Trail": "§d[AllMusic]§e该音乐为试听音乐", - "Cancel": "§d[AllMusic]§e播放被取消" - }, - "AddMusic": { - "ListFull": "§d[AllMusic]§c错误，队列已满", - "BanMusic": "§d[AllMusic]§c错误，这首歌被禁点了", - "ExistMusic": "§d[AllMusic]§c错误，这首歌已经存在了", - "Success": "§d[AllMusic]§e点歌成功", - "NoPlayer": "§d[AllMusic]§c没有播放的玩家", - "NoID": "§d[AllMusic]§c错误，请输入歌曲数字ID", - "Cancel": "§d[AllMusic]§e点歌被取消", - "TimeOut": "§d[AllMusic]§e点歌被取消，音乐长度过长" - }, - "Page": { - "Choice": "§e%Index%->%MusicName% | %MusicAuthor% | %MusicAl%", - "Next": "§e[§n点我下一页§r§e]", - "Last": "§e[§n点我上一页§r§e]" - }, - "Lyric": { - "Data": "%Lyric%", - "TData": "%Lyric%(%TLyric%)", - "Empty1": "没有歌词", - "Empty2": "没有翻译歌词", - "Empty3": "没有KTV歌词" - }, - "Vote": { - "NoPermission": "§d[AllMusic]§c你没有权限切歌", - "DoVote": "§d[AllMusic]§e已发起切歌投票", - "BQ": "§d[AllMusic]§e%PlayerName%发起了切歌投票，30秒后结束，输入/music vote 同意切歌。", - "Agree": "§d[AllMusic]§e你同意切歌", - "BQAgree": "§d[AllMusic]§e%PlayerName%同意切歌，共有%Count%名玩家同意切歌。", - "ARAgree": "§d[AllMusic]§e你已申请切歌", - "TimeOut": "§d[AllMusic]§e切歌时间结束", - "Do": "§d[AllMusic]§e已切歌" - }, - "Search": { - "StartSearch": "§d[AllMusic]§e正在排队搜歌", - "NoPer": "§d[AllMusic]§c你没有权限搜歌", - "CantSearch": "§d[AllMusic]§c无法搜索歌曲：%Music%", - "Res": "§d[AllMusic]§e搜索结果", - "NoSearch": "§d[AllMusic]§c你没有搜索音乐", - "ErrorNum": "§d[AllMusic]§c请输入正确的序号", - "Chose": "§d[AllMusic]§e你选择了序号%Num%", - "CantNext": "§d[AllMusic]§c无法下一页", - "CantLast": "§d[AllMusic]§c无法上一页" - }, - "Hud": { - "State": "§d[AllMusic]§e设置信息位置：%Hud%，状态：%State%", - "Set": "§d[AllMusic]§e已设置%Hud%的坐标为%x%, %y%", - "Reset": "§d[AllMusic]§eHud恢复至默认位置", - "NoMusic": "没有播放的音乐", - "NoList": "队列中无歌曲", - "NoLyric": "无歌词", - "PicSize": "§d[ALLMusic]§e设置图片尺寸为%Size%", - "PicRotate": "§d[AllMusic]§e设置图片旋转为%State%", - "PicRotateSpeed": "§d[AllMusic]§e设置图片旋转速度为%Size%", - "Music": "%Name% %AllTime%/%NowTime%\n%Author%\n%Alia%\n%Al%\nby: %Player%", - "Lyric": "%Lyric%\n%Tlyric%", - "Ktv": "§e%KLyric%§f%Lyric%§r\n%Tlyric%", - "List": "播放列表里面有%Size%首歌\n%List%" - }, - "Command": { - "Error": "§d[AllMusic]§c参数错误，请输入/music help获取帮助", - "NoPer": "§d[AllMusic]§c你没有权限点歌" - }, - "HudList": { - "List": "待播放列表", - "Lyric": "歌词", - "Info": "歌曲信息", - "Pic": "图片", - "All": "所有位置", - "PicRoute": "图片旋转", - "PicRouteSpeed": "图片旋转速度" - }, - "Custom": { - "Info": "自定义音乐" - }, - "PAPI": { - "NoMusic": "没有播放的音乐" - }, - "Cost": { - "Search": "§d[AllMusic]§e你搜歌花费了%Cost%", - "AddMusic": "§d[AllMusic]§e你点歌花费了%Cost%", - "NoMoney": "§d[AllMusic]§c你没有足够的钱", - "CostFail": "§d[ALLMusic]§c扣钱过程中错误" - }, - "Click": { - "This": "§b[§n点我选择§r§b]", - "Check": "§b[§n点我查看§r§b]" - }, - "Help": { - "Normal": { - "Head": "§d[AllMusic]§e帮助手册", - "Base": "§d[AllMusic]§e使用/music [音乐ID] 来点歌", - "Stop": "§d[AllMusic]§e使用/music stop 停止播放歌曲", - "List": "§d[AllMusic]§e使用/music list 查看歌曲队列", - "Vote": "§d[AllMusic]§e使用/music vote 投票切歌", - "NoMusic": "§d[AllMusic]§e使用/music nomusic 不再参与点歌", - "Search": "§d[AllMusic]§e使用/music search [歌名] 搜索歌曲", - "Select": "§d[AllMusic]§e使用/music select [序列] 选择歌曲", - "Hud1": "§d[AllMusic]§e使用/music hud enable [位置] 启用关闭Hud", - "Hud2": "§d[AllMusic]§e使用/music hud [位置] [x] [y] 设置某个Hud的位置", - "Hud3": "§d[AllMusic]§e使用/music hud picsize [尺寸] 设置图片尺寸", - "Hud4": "§d[AllMusic]§e使用/music hud picrotate [开关] 设置图片旋转模式", - "Hud5": "§d[AllMusic]§e使用/music hud picrotatespeed [数值] 设置图片旋转速度" - }, - "Admin": { - "Reload": "§d[AllMusic]§e使用/music reload 重读配置文件", - "Next": "§d[AllMusic]§e使用/music next 强制切歌", - "Ban": "§d[AllMusic]§e使用/music ban [ID] 禁止点这首歌", - "Url": "§d[AllMusic]§e使用/music url [url] 播放一首自定义歌曲", - "Delete": "§d[AllMusic]§e使用/music delete [序号] 删除队列中的歌曲", - "AddList": "§d[AllMusic]§e使用/music addlist [歌单ID] 添加歌单到空闲列表", - "ClearList": "§d[AllMusic]§e使用/music clearlist 清空空闲歌单", - "Login": "§d[AllMusic]§e使用/music login [验证码] 登录账户", - "Code": "§d[AllMusic]§e使用/music code 获取短信验证码" - } - }, - "Fun": { - "Rain": "§d[AllMusic]§e天空开始变得湿润" - }, - "Version": "105" -} \ No newline at end of file diff --git a/server/build.gradle b/server/build.gradle index 781dd28e..7944732e 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -50,12 +50,12 @@ dependencies { } shadowJar { - relocate 'okhttp3', 'coloryr.allmusic.lib.okhttp3' - relocate 'okio', 'coloryr.allmusic.lib.okio' - relocate 'kotlin', 'coloryr.allmusic.lib.kotlin' - relocate 'org.intellij', 'coloryr.allmusic.lib.org.intellij' - relocate 'org.jetbrains', 'coloryr.allmusic.lib.org.jetbrains' - relocate 'com.google.gson', 'coloryr.allmusic.lib.com.google.gson' + relocate 'okhttp3', 'com.coloryr.allmusic.server.lib.okhttp3' + relocate 'okio', 'com.coloryr.allmusic.server.lib.okio' + relocate 'kotlin', 'com.coloryr.allmusic.server.lib.kotlin' + relocate 'org.intellij', 'com.coloryr.allmusic.server.lib.org.intellij' + relocate 'org.jetbrains', 'com.coloryr.allmusic.server.lib.org.jetbrains' + relocate 'com.google.gson', 'com.coloryr.allmusic.server.lib.com.google.gson' } tasks.withType(JavaCompile) { diff --git a/server/src/main/java/coloryr/allmusic/AllMusicBukkit.java b/server/src/main/java/com/coloryr/allmusic/server/AllMusicBukkit.java similarity index 87% rename from server/src/main/java/coloryr/allmusic/AllMusicBukkit.java rename to server/src/main/java/com/coloryr/allmusic/server/AllMusicBukkit.java index 642d2d5b..6568f477 100644 --- a/server/src/main/java/coloryr/allmusic/AllMusicBukkit.java +++ b/server/src/main/java/com/coloryr/allmusic/server/AllMusicBukkit.java @@ -1,12 +1,12 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.music.play.TopLyricSave; -import coloryr.allmusic.core.objs.music.TopSongInfoObj; -import coloryr.allmusic.side.bukkit.*; -import coloryr.allmusic.side.bukkit.hooks.AllMusicPAPI; -import coloryr.allmusic.side.bukkit.hooks.VaultHook; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.music.play.TopLyricSave; +import com.coloryr.allmusic.server.core.objs.music.TopSongInfoObj; +import com.coloryr.allmusic.server.side.bukkit.*; +import com.coloryr.allmusic.server.side.bukkit.hooks.AllMusicPAPI; +import com.coloryr.allmusic.server.side.bukkit.hooks.VaultHook; import org.bukkit.Bukkit; import org.bukkit.command.PluginCommand; import org.bukkit.plugin.Plugin; diff --git a/server_top/src/main/java/coloryr/allmusic/bstats/MetricsBase.java b/server/src/main/java/com/coloryr/allmusic/server/bstats/MetricsBase.java similarity index 98% rename from server_top/src/main/java/coloryr/allmusic/bstats/MetricsBase.java rename to server/src/main/java/com/coloryr/allmusic/server/bstats/MetricsBase.java index df382d86..45fde185 100644 --- a/server_top/src/main/java/coloryr/allmusic/bstats/MetricsBase.java +++ b/server/src/main/java/com/coloryr/allmusic/server/bstats/MetricsBase.java @@ -1,7 +1,7 @@ -package coloryr.allmusic.bstats; +package com.coloryr.allmusic.server.bstats; -import coloryr.allmusic.bstats.charts.CustomChart; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.charts.CustomChart; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import javax.net.ssl.HttpsURLConnection; import java.io.*; diff --git a/server_top/src/main/java/coloryr/allmusic/bstats/charts/AdvancedBarChart.java b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedBarChart.java similarity index 92% rename from server_top/src/main/java/coloryr/allmusic/bstats/charts/AdvancedBarChart.java rename to server/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedBarChart.java index 376dcbbf..c36e776e 100644 --- a/server_top/src/main/java/coloryr/allmusic/bstats/charts/AdvancedBarChart.java +++ b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedBarChart.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.Map; import java.util.concurrent.Callable; diff --git a/server_top/src/main/java/coloryr/allmusic/bstats/charts/AdvancedPie.java b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedPie.java similarity index 92% rename from server_top/src/main/java/coloryr/allmusic/bstats/charts/AdvancedPie.java rename to server/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedPie.java index 90e33c55..0fb00fef 100644 --- a/server_top/src/main/java/coloryr/allmusic/bstats/charts/AdvancedPie.java +++ b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedPie.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.Map; import java.util.concurrent.Callable; diff --git a/server_top/src/main/java/coloryr/allmusic/bstats/charts/CustomChart.java b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/CustomChart.java similarity index 90% rename from server_top/src/main/java/coloryr/allmusic/bstats/charts/CustomChart.java rename to server/src/main/java/com/coloryr/allmusic/server/bstats/charts/CustomChart.java index b73d8cee..e1595e0c 100644 --- a/server_top/src/main/java/coloryr/allmusic/bstats/charts/CustomChart.java +++ b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/CustomChart.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.function.BiConsumer; diff --git a/server_top/src/main/java/coloryr/allmusic/bstats/charts/DrilldownPie.java b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/DrilldownPie.java similarity index 93% rename from server_top/src/main/java/coloryr/allmusic/bstats/charts/DrilldownPie.java rename to server/src/main/java/com/coloryr/allmusic/server/bstats/charts/DrilldownPie.java index 7d2d87e2..43dbfaa3 100644 --- a/server_top/src/main/java/coloryr/allmusic/bstats/charts/DrilldownPie.java +++ b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/DrilldownPie.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.Map; import java.util.concurrent.Callable; diff --git a/server_top/src/main/java/coloryr/allmusic/bstats/charts/MultiLineChart.java b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/MultiLineChart.java similarity index 92% rename from server_top/src/main/java/coloryr/allmusic/bstats/charts/MultiLineChart.java rename to server/src/main/java/com/coloryr/allmusic/server/bstats/charts/MultiLineChart.java index 63d0f74d..fac5d969 100644 --- a/server_top/src/main/java/coloryr/allmusic/bstats/charts/MultiLineChart.java +++ b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/MultiLineChart.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.Map; import java.util.concurrent.Callable; diff --git a/server_top/src/main/java/coloryr/allmusic/bstats/charts/SimpleBarChart.java b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimpleBarChart.java similarity index 90% rename from server_top/src/main/java/coloryr/allmusic/bstats/charts/SimpleBarChart.java rename to server/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimpleBarChart.java index 934de4df..184b5546 100644 --- a/server_top/src/main/java/coloryr/allmusic/bstats/charts/SimpleBarChart.java +++ b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimpleBarChart.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.Map; import java.util.concurrent.Callable; diff --git a/server_top/src/main/java/coloryr/allmusic/bstats/charts/SimplePie.java b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimplePie.java similarity index 87% rename from server_top/src/main/java/coloryr/allmusic/bstats/charts/SimplePie.java rename to server/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimplePie.java index b7db8a8b..41923e63 100644 --- a/server_top/src/main/java/coloryr/allmusic/bstats/charts/SimplePie.java +++ b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimplePie.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.concurrent.Callable; diff --git a/server_top/src/main/java/coloryr/allmusic/bstats/charts/SingleLineChart.java b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/SingleLineChart.java similarity index 87% rename from server_top/src/main/java/coloryr/allmusic/bstats/charts/SingleLineChart.java rename to server/src/main/java/com/coloryr/allmusic/server/bstats/charts/SingleLineChart.java index 6c23c33d..ea4ae553 100644 --- a/server_top/src/main/java/coloryr/allmusic/bstats/charts/SingleLineChart.java +++ b/server/src/main/java/com/coloryr/allmusic/server/bstats/charts/SingleLineChart.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.bstats.charts; +package com.coloryr.allmusic.server.bstats.charts; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import java.util.concurrent.Callable; diff --git a/server_top/src/main/java/coloryr/allmusic/bstats/config/MetricsConfig.java b/server/src/main/java/com/coloryr/allmusic/server/bstats/config/MetricsConfig.java similarity index 99% rename from server_top/src/main/java/coloryr/allmusic/bstats/config/MetricsConfig.java rename to server/src/main/java/com/coloryr/allmusic/server/bstats/config/MetricsConfig.java index a0b08fd1..148c5c3a 100644 --- a/server_top/src/main/java/coloryr/allmusic/bstats/config/MetricsConfig.java +++ b/server/src/main/java/com/coloryr/allmusic/server/bstats/config/MetricsConfig.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.bstats.config; +package com.coloryr.allmusic.server.bstats.config; import java.io.*; import java.util.ArrayList; diff --git a/server_top/src/main/java/coloryr/allmusic/bstats/json/JsonObjectBuilder.java b/server/src/main/java/com/coloryr/allmusic/server/bstats/json/JsonObjectBuilder.java similarity index 99% rename from server_top/src/main/java/coloryr/allmusic/bstats/json/JsonObjectBuilder.java rename to server/src/main/java/com/coloryr/allmusic/server/bstats/json/JsonObjectBuilder.java index aa6b16d1..17130eb7 100644 --- a/server_top/src/main/java/coloryr/allmusic/bstats/json/JsonObjectBuilder.java +++ b/server/src/main/java/com/coloryr/allmusic/server/bstats/json/JsonObjectBuilder.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.bstats.json; +package com.coloryr.allmusic.server.bstats.json; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/server/src/main/java/coloryr/allmusic/side/bukkit/CommandBukkit.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/CommandBukkit.java similarity index 89% rename from server/src/main/java/coloryr/allmusic/side/bukkit/CommandBukkit.java rename to server/src/main/java/com/coloryr/allmusic/server/side/bukkit/CommandBukkit.java index 3be8d883..fe3a57de 100644 --- a/server/src/main/java/coloryr/allmusic/side/bukkit/CommandBukkit.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/CommandBukkit.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.bukkit; +package com.coloryr.allmusic.server.side.bukkit; -import coloryr.allmusic.core.command.CommandEX; +import com.coloryr.allmusic.server.core.command.CommandEX; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/server/src/main/java/coloryr/allmusic/side/bukkit/FunCore.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/FunCore.java similarity index 87% rename from server/src/main/java/coloryr/allmusic/side/bukkit/FunCore.java rename to server/src/main/java/com/coloryr/allmusic/server/side/bukkit/FunCore.java index 16b47a95..ac0eb795 100644 --- a/server/src/main/java/coloryr/allmusic/side/bukkit/FunCore.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/FunCore.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.bukkit; +package com.coloryr.allmusic.server.side.bukkit; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; import org.bukkit.Bukkit; import org.bukkit.World; diff --git a/server/src/main/java/coloryr/allmusic/side/bukkit/ListenerBukkit.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/ListenerBukkit.java similarity index 83% rename from server/src/main/java/coloryr/allmusic/side/bukkit/ListenerBukkit.java rename to server/src/main/java/com/coloryr/allmusic/server/side/bukkit/ListenerBukkit.java index 64caff86..4329b782 100644 --- a/server/src/main/java/coloryr/allmusic/side/bukkit/ListenerBukkit.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/ListenerBukkit.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.bukkit; +package com.coloryr.allmusic.server.side.bukkit; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; diff --git a/server/src/main/java/coloryr/allmusic/side/bukkit/LogBukkit.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/LogBukkit.java similarity index 77% rename from server/src/main/java/coloryr/allmusic/side/bukkit/LogBukkit.java rename to server/src/main/java/com/coloryr/allmusic/server/side/bukkit/LogBukkit.java index db24e863..129b6de5 100644 --- a/server/src/main/java/coloryr/allmusic/side/bukkit/LogBukkit.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/LogBukkit.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.bukkit; +package com.coloryr.allmusic.server.side.bukkit; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IMyLogger; import java.util.logging.Logger; diff --git a/server/src/main/java/coloryr/allmusic/side/bukkit/MetricsBukkit.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/MetricsBukkit.java similarity index 95% rename from server/src/main/java/coloryr/allmusic/side/bukkit/MetricsBukkit.java rename to server/src/main/java/com/coloryr/allmusic/server/side/bukkit/MetricsBukkit.java index b477ed5f..3db03990 100644 --- a/server/src/main/java/coloryr/allmusic/side/bukkit/MetricsBukkit.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/MetricsBukkit.java @@ -1,8 +1,8 @@ -package coloryr.allmusic.side.bukkit; +package com.coloryr.allmusic.server.side.bukkit; -import coloryr.allmusic.bstats.MetricsBase; -import coloryr.allmusic.bstats.charts.CustomChart; -import coloryr.allmusic.bstats.json.JsonObjectBuilder; +import com.coloryr.allmusic.server.bstats.MetricsBase; +import com.coloryr.allmusic.server.bstats.charts.CustomChart; +import com.coloryr.allmusic.server.bstats.json.JsonObjectBuilder; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; diff --git a/server/src/main/java/coloryr/allmusic/side/bukkit/PluginMessage.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/PluginMessage.java similarity index 92% rename from server/src/main/java/coloryr/allmusic/side/bukkit/PluginMessage.java rename to server/src/main/java/com/coloryr/allmusic/server/side/bukkit/PluginMessage.java index 9cfcdf8c..53b48869 100644 --- a/server/src/main/java/coloryr/allmusic/side/bukkit/PluginMessage.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/PluginMessage.java @@ -1,10 +1,10 @@ -package coloryr.allmusic.side.bukkit; +package com.coloryr.allmusic.server.side.bukkit; -import coloryr.allmusic.AllMusicBukkit; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.music.play.TopLyricSave; -import coloryr.allmusic.core.objs.music.TopSongInfoObj; +import com.coloryr.allmusic.server.AllMusicBukkit; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.music.play.TopLyricSave; +import com.coloryr.allmusic.server.core.objs.music.TopSongInfoObj; import com.google.common.collect.Iterables; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; diff --git a/server/src/main/java/coloryr/allmusic/side/bukkit/SideBukkit.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java similarity index 95% rename from server/src/main/java/coloryr/allmusic/side/bukkit/SideBukkit.java rename to server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java index 0628844f..15d9e820 100644 --- a/server/src/main/java/coloryr/allmusic/side/bukkit/SideBukkit.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/SideBukkit.java @@ -1,18 +1,18 @@ -package coloryr.allmusic.side.bukkit; +package com.coloryr.allmusic.server.side.bukkit; -import coloryr.allmusic.AllMusicBukkit; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.enums.ComType; -import coloryr.allmusic.core.objs.enums.HudType; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.core.utils.HudUtils; -import coloryr.allmusic.side.bukkit.event.MusicAddEvent; -import coloryr.allmusic.side.bukkit.event.MusicPlayEvent; -import coloryr.allmusic.side.bukkit.hooks.CitizensNPC; -import coloryr.allmusic.side.bukkit.hooks.SpigotApi; +import com.coloryr.allmusic.server.AllMusicBukkit; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.enums.ComType; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.utils.HudUtils; +import com.coloryr.allmusic.server.side.bukkit.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.bukkit.event.MusicPlayEvent; +import com.coloryr.allmusic.server.side.bukkit.hooks.CitizensNPC; +import com.coloryr.allmusic.server.side.bukkit.hooks.SpigotApi; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/server/src/main/java/coloryr/allmusic/side/bukkit/event/MusicAddEvent.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/event/MusicAddEvent.java similarity index 90% rename from server/src/main/java/coloryr/allmusic/side/bukkit/event/MusicAddEvent.java rename to server/src/main/java/com/coloryr/allmusic/server/side/bukkit/event/MusicAddEvent.java index 3e39cd90..ee4e0501 100644 --- a/server/src/main/java/coloryr/allmusic/side/bukkit/event/MusicAddEvent.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.bukkit.event; +package com.coloryr.allmusic.server.side.bukkit.event; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import org.bukkit.command.CommandSender; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/server/src/main/java/coloryr/allmusic/side/bukkit/event/MusicPlayEvent.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/event/MusicPlayEvent.java similarity index 87% rename from server/src/main/java/coloryr/allmusic/side/bukkit/event/MusicPlayEvent.java rename to server/src/main/java/com/coloryr/allmusic/server/side/bukkit/event/MusicPlayEvent.java index ec7cd95f..0436c409 100644 --- a/server/src/main/java/coloryr/allmusic/side/bukkit/event/MusicPlayEvent.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/event/MusicPlayEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.bukkit.event; +package com.coloryr.allmusic.server.side.bukkit.event; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/coloryr/allmusic/side/bukkit/hooks/AllMusicPAPI.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java similarity index 96% rename from server/src/main/java/coloryr/allmusic/side/bukkit/hooks/AllMusicPAPI.java rename to server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java index 40a52d5c..64a1a743 100644 --- a/server/src/main/java/coloryr/allmusic/side/bukkit/hooks/AllMusicPAPI.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/AllMusicPAPI.java @@ -1,8 +1,8 @@ -package coloryr.allmusic.side.bukkit.hooks; +package com.coloryr.allmusic.server.side.bukkit.hooks; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.side.bukkit.PluginMessage; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.side.bukkit.PluginMessage; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.OfflinePlayer; import org.bukkit.entity.Player; diff --git a/server/src/main/java/coloryr/allmusic/side/bukkit/hooks/CitizensNPC.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/CitizensNPC.java similarity index 74% rename from server/src/main/java/coloryr/allmusic/side/bukkit/hooks/CitizensNPC.java rename to server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/CitizensNPC.java index b1351daf..5fdc8137 100644 --- a/server/src/main/java/coloryr/allmusic/side/bukkit/hooks/CitizensNPC.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/CitizensNPC.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.side.bukkit.hooks; +package com.coloryr.allmusic.server.side.bukkit.hooks; import org.bukkit.entity.Entity; diff --git a/server/src/main/java/coloryr/allmusic/side/bukkit/hooks/SpigotApi.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/SpigotApi.java similarity index 94% rename from server/src/main/java/coloryr/allmusic/side/bukkit/hooks/SpigotApi.java rename to server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/SpigotApi.java index 74e90b2a..ce82bdff 100644 --- a/server/src/main/java/coloryr/allmusic/side/bukkit/hooks/SpigotApi.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/SpigotApi.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.bukkit.hooks; +package com.coloryr.allmusic.server.side.bukkit.hooks; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.TextComponent; diff --git a/server/src/main/java/coloryr/allmusic/side/bukkit/hooks/VaultHook.java b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/VaultHook.java similarity index 90% rename from server/src/main/java/coloryr/allmusic/side/bukkit/hooks/VaultHook.java rename to server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/VaultHook.java index abc63408..f4cbc6e8 100644 --- a/server/src/main/java/coloryr/allmusic/side/bukkit/hooks/VaultHook.java +++ b/server/src/main/java/com/coloryr/allmusic/server/side/bukkit/hooks/VaultHook.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.bukkit.hooks; +package com.coloryr.allmusic.server.side.bukkit.hooks; -import coloryr.allmusic.core.sql.IEconomy; +import com.coloryr.allmusic.server.core.sql.IEconomy; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.EconomyResponse; import org.bukkit.Bukkit; diff --git a/server/src/main/resources/plugin.yml b/server/src/main/resources/plugin.yml index 2d2bd46f..9cd57141 100644 --- a/server/src/main/resources/plugin.yml +++ b/server/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: AllMusic3 -main: coloryr.allmusic.AllMusicBukkit +main: com.coloryr.allmusic.server.AllMusicBukkit author: Color_yr version: 3.0.0 softdepend: [PlaceholderAPI, Vault, Essentials, CMI] diff --git a/server/src/test/java/RunTest.java b/server/src/test/java/RunTest.java index 69920753..d5214985 100644 --- a/server/src/test/java/RunTest.java +++ b/server/src/test/java/RunTest.java @@ -1,8 +1,8 @@ -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.CookieObj; -import coloryr.allmusic.core.objs.music.LyricItemObj; -import coloryr.allmusic.core.music.play.LyricSave; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.CookieObj; +import com.coloryr.allmusic.server.core.objs.music.LyricItemObj; +import com.coloryr.allmusic.server.core.music.play.LyricSave; +import com.coloryr.allmusic.server.core.side.IMyLogger; public class RunTest implements IMyLogger { public static void main(String[] arg) { diff --git a/server_top/build.gradle b/server_top/build.gradle index 3fd82083..829b1046 100644 --- a/server_top/build.gradle +++ b/server_top/build.gradle @@ -50,12 +50,12 @@ dependencies { } shadowJar { - relocate 'okhttp3', 'coloryr.allmusic.lib.okhttp3' - relocate 'okio', 'coloryr.allmusic.lib.okio' - relocate 'kotlin', 'coloryr.allmusic.lib.kotlin' - relocate 'org.intellij', 'coloryr.allmusic.lib.org.intellij' - relocate 'org.jetbrains', 'coloryr.allmusic.lib.org.jetbrains' - relocate 'com.google.gson', 'coloryr.allmusic.lib.com.google.gson' + relocate 'okhttp3', 'com.coloryr.allmusic.server.lib.okhttp3' + relocate 'okio', 'com.coloryr.allmusic.server.lib.okio' + relocate 'kotlin', 'com.coloryr.allmusic.server.lib.kotlin' + relocate 'org.intellij', 'com.coloryr.allmusic.server.lib.org.intellij' + relocate 'org.jetbrains', 'com.coloryr.allmusic.server.lib.org.jetbrains' + relocate 'com.google.gson', 'com.coloryr.allmusic.server.lib.com.google.gson' } tasks.withType(JavaCompile) { diff --git a/server_top/src/main/java/coloryr/allmusic/AllMusicBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/AllMusicBC.java similarity index 86% rename from server_top/src/main/java/coloryr/allmusic/AllMusicBC.java rename to server_top/src/main/java/com/coloryr/allmusic/server/AllMusicBC.java index 2be5f030..f070be69 100644 --- a/server_top/src/main/java/coloryr/allmusic/AllMusicBC.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/AllMusicBC.java @@ -1,7 +1,7 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.side.bc.*; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.side.bc.*; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.Plugin; diff --git a/server_top/src/main/java/coloryr/allmusic/AllMusicVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/AllMusicVelocity.java similarity index 94% rename from server_top/src/main/java/coloryr/allmusic/AllMusicVelocity.java rename to server_top/src/main/java/com/coloryr/allmusic/server/AllMusicVelocity.java index 8817ad1f..266ec2bf 100644 --- a/server_top/src/main/java/coloryr/allmusic/AllMusicVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/AllMusicVelocity.java @@ -1,7 +1,7 @@ -package coloryr.allmusic; +package com.coloryr.allmusic.server; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.side.velocity.*; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.side.velocity.*; import com.google.inject.Inject; import com.velocitypowered.api.command.CommandMeta; import com.velocitypowered.api.event.Subscribe; diff --git a/server/src/main/java/coloryr/allmusic/bstats/MetricsBase.java b/server_top/src/main/java/com/coloryr/allmusic/server/bstats/MetricsBase.java similarity index 100% rename from server/src/main/java/coloryr/allmusic/bstats/MetricsBase.java rename to server_top/src/main/java/com/coloryr/allmusic/server/bstats/MetricsBase.java diff --git a/server/src/main/java/coloryr/allmusic/bstats/charts/AdvancedBarChart.java b/server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedBarChart.java similarity index 100% rename from server/src/main/java/coloryr/allmusic/bstats/charts/AdvancedBarChart.java rename to server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedBarChart.java diff --git a/server/src/main/java/coloryr/allmusic/bstats/charts/AdvancedPie.java b/server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedPie.java similarity index 100% rename from server/src/main/java/coloryr/allmusic/bstats/charts/AdvancedPie.java rename to server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/AdvancedPie.java diff --git a/server/src/main/java/coloryr/allmusic/bstats/charts/CustomChart.java b/server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/CustomChart.java similarity index 100% rename from server/src/main/java/coloryr/allmusic/bstats/charts/CustomChart.java rename to server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/CustomChart.java diff --git a/server/src/main/java/coloryr/allmusic/bstats/charts/DrilldownPie.java b/server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/DrilldownPie.java similarity index 100% rename from server/src/main/java/coloryr/allmusic/bstats/charts/DrilldownPie.java rename to server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/DrilldownPie.java diff --git a/server/src/main/java/coloryr/allmusic/bstats/charts/MultiLineChart.java b/server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/MultiLineChart.java similarity index 100% rename from server/src/main/java/coloryr/allmusic/bstats/charts/MultiLineChart.java rename to server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/MultiLineChart.java diff --git a/server/src/main/java/coloryr/allmusic/bstats/charts/SimpleBarChart.java b/server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimpleBarChart.java similarity index 100% rename from server/src/main/java/coloryr/allmusic/bstats/charts/SimpleBarChart.java rename to server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimpleBarChart.java diff --git a/server/src/main/java/coloryr/allmusic/bstats/charts/SimplePie.java b/server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimplePie.java similarity index 100% rename from server/src/main/java/coloryr/allmusic/bstats/charts/SimplePie.java rename to server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/SimplePie.java diff --git a/server/src/main/java/coloryr/allmusic/bstats/charts/SingleLineChart.java b/server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/SingleLineChart.java similarity index 100% rename from server/src/main/java/coloryr/allmusic/bstats/charts/SingleLineChart.java rename to server_top/src/main/java/com/coloryr/allmusic/server/bstats/charts/SingleLineChart.java diff --git a/server/src/main/java/coloryr/allmusic/bstats/config/MetricsConfig.java b/server_top/src/main/java/com/coloryr/allmusic/server/bstats/config/MetricsConfig.java similarity index 100% rename from server/src/main/java/coloryr/allmusic/bstats/config/MetricsConfig.java rename to server_top/src/main/java/com/coloryr/allmusic/server/bstats/config/MetricsConfig.java diff --git a/server/src/main/java/coloryr/allmusic/bstats/json/JsonObjectBuilder.java b/server_top/src/main/java/com/coloryr/allmusic/server/bstats/json/JsonObjectBuilder.java similarity index 100% rename from server/src/main/java/coloryr/allmusic/bstats/json/JsonObjectBuilder.java rename to server_top/src/main/java/com/coloryr/allmusic/server/bstats/json/JsonObjectBuilder.java diff --git a/server_top/src/main/java/coloryr/allmusic/side/bc/CommandBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/CommandBC.java similarity index 83% rename from server_top/src/main/java/coloryr/allmusic/side/bc/CommandBC.java rename to server_top/src/main/java/com/coloryr/allmusic/server/side/bc/CommandBC.java index a039d715..a7b12fcb 100644 --- a/server_top/src/main/java/coloryr/allmusic/side/bc/CommandBC.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/CommandBC.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.bc; +package com.coloryr.allmusic.server.side.bc; -import coloryr.allmusic.core.command.CommandEX; +import com.coloryr.allmusic.server.core.command.CommandEX; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.TabExecutor; diff --git a/server_top/src/main/java/coloryr/allmusic/side/bc/ListenerBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/ListenerBC.java similarity index 95% rename from server_top/src/main/java/coloryr/allmusic/side/bc/ListenerBC.java rename to server_top/src/main/java/com/coloryr/allmusic/server/side/bc/ListenerBC.java index 6d72c4ff..46c11e3a 100644 --- a/server_top/src/main/java/coloryr/allmusic/side/bc/ListenerBC.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/ListenerBC.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.bc; +package com.coloryr.allmusic.server.side.bc; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; import net.md_5.bungee.api.connection.Server; diff --git a/server_top/src/main/java/coloryr/allmusic/side/bc/LogBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/LogBC.java similarity index 77% rename from server_top/src/main/java/coloryr/allmusic/side/bc/LogBC.java rename to server_top/src/main/java/com/coloryr/allmusic/server/side/bc/LogBC.java index 3bf0479c..5050c88c 100644 --- a/server_top/src/main/java/coloryr/allmusic/side/bc/LogBC.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/LogBC.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.bc; +package com.coloryr.allmusic.server.side.bc; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IMyLogger; import java.util.logging.Logger; diff --git a/server_top/src/main/java/coloryr/allmusic/side/bc/MetricsBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/MetricsBC.java similarity index 99% rename from server_top/src/main/java/coloryr/allmusic/side/bc/MetricsBC.java rename to server_top/src/main/java/com/coloryr/allmusic/server/side/bc/MetricsBC.java index 0e2869dd..8df7acf1 100644 --- a/server_top/src/main/java/coloryr/allmusic/side/bc/MetricsBC.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/MetricsBC.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.side.bc; +package com.coloryr.allmusic.server.side.bc; import coloryr.allmusic.bstats.MetricsBase; import coloryr.allmusic.bstats.charts.CustomChart; diff --git a/server_top/src/main/java/coloryr/allmusic/side/bc/SideBC.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java similarity index 96% rename from server_top/src/main/java/coloryr/allmusic/side/bc/SideBC.java rename to server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java index e27c5046..e8580d06 100644 --- a/server_top/src/main/java/coloryr/allmusic/side/bc/SideBC.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/SideBC.java @@ -1,18 +1,18 @@ -package coloryr.allmusic.side.bc; +package com.coloryr.allmusic.server.side.bc; -import coloryr.allmusic.AllMusicBC; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.enums.HudType; -import coloryr.allmusic.core.utils.HudUtils; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.objs.enums.ComType; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.core.sql.IEconomy; -import coloryr.allmusic.side.bc.event.MusicAddEvent; -import coloryr.allmusic.side.bc.event.MusicPlayEvent; +import com.coloryr.allmusic.server.AllMusicBC; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.utils.HudUtils; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.enums.ComType; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.sql.IEconomy; +import com.coloryr.allmusic.server.side.bc.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.bc.event.MusicPlayEvent; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import io.netty.buffer.ByteBuf; diff --git a/server_top/src/main/java/coloryr/allmusic/side/bc/event/MusicAddEvent.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/event/MusicAddEvent.java similarity index 87% rename from server_top/src/main/java/coloryr/allmusic/side/bc/event/MusicAddEvent.java rename to server_top/src/main/java/com/coloryr/allmusic/server/side/bc/event/MusicAddEvent.java index 909df61f..633f6baf 100644 --- a/server_top/src/main/java/coloryr/allmusic/side/bc/event/MusicAddEvent.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.bc.event; +package com.coloryr.allmusic.server.side.bc.event; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.plugin.Event; diff --git a/server_top/src/main/java/coloryr/allmusic/side/bc/event/MusicPlayEvent.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/event/MusicPlayEvent.java similarity index 82% rename from server_top/src/main/java/coloryr/allmusic/side/bc/event/MusicPlayEvent.java rename to server_top/src/main/java/com/coloryr/allmusic/server/side/bc/event/MusicPlayEvent.java index b93ed3a0..1ba94eb3 100644 --- a/server_top/src/main/java/coloryr/allmusic/side/bc/event/MusicPlayEvent.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/bc/event/MusicPlayEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.bc.event; +package com.coloryr.allmusic.server.side.bc.event; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; import net.md_5.bungee.api.plugin.Event; /** diff --git a/server_top/src/main/java/coloryr/allmusic/side/velocity/CommandVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/CommandVelocity.java similarity index 91% rename from server_top/src/main/java/coloryr/allmusic/side/velocity/CommandVelocity.java rename to server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/CommandVelocity.java index 29488075..adcae403 100644 --- a/server_top/src/main/java/coloryr/allmusic/side/velocity/CommandVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/CommandVelocity.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.velocity; +package com.coloryr.allmusic.server.side.velocity; -import coloryr.allmusic.core.command.CommandEX; +import com.coloryr.allmusic.server.core.command.CommandEX; import com.google.common.collect.ImmutableList; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.SimpleCommand; diff --git a/server_top/src/main/java/coloryr/allmusic/side/velocity/ListenerVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java similarity index 95% rename from server_top/src/main/java/coloryr/allmusic/side/velocity/ListenerVelocity.java rename to server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java index 8c8161fd..ecd78569 100644 --- a/server_top/src/main/java/coloryr/allmusic/side/velocity/ListenerVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/ListenerVelocity.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.velocity; +package com.coloryr.allmusic.server.side.velocity; -import coloryr.allmusic.core.AllMusic; +import com.coloryr.allmusic.server.core.AllMusic; import com.google.common.io.ByteArrayDataInput; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.DisconnectEvent; diff --git a/server_top/src/main/java/coloryr/allmusic/side/velocity/LogVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/LogVelocity.java similarity index 76% rename from server_top/src/main/java/coloryr/allmusic/side/velocity/LogVelocity.java rename to server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/LogVelocity.java index d31da995..5e1d28e9 100644 --- a/server_top/src/main/java/coloryr/allmusic/side/velocity/LogVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/LogVelocity.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.velocity; +package com.coloryr.allmusic.server.side.velocity; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.side.IMyLogger; import org.slf4j.Logger; public class LogVelocity implements IMyLogger { diff --git a/server_top/src/main/java/coloryr/allmusic/side/velocity/MetricsVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/MetricsVelocity.java similarity index 99% rename from server_top/src/main/java/coloryr/allmusic/side/velocity/MetricsVelocity.java rename to server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/MetricsVelocity.java index 67549ce5..cdacfb61 100644 --- a/server_top/src/main/java/coloryr/allmusic/side/velocity/MetricsVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/MetricsVelocity.java @@ -1,4 +1,4 @@ -package coloryr.allmusic.side.velocity; +package com.coloryr.allmusic.server.side.velocity; import coloryr.allmusic.bstats.MetricsBase; import coloryr.allmusic.bstats.charts.CustomChart; diff --git a/server_top/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java similarity index 96% rename from server_top/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java rename to server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java index 80c55815..3cd1a5e0 100644 --- a/server_top/src/main/java/coloryr/allmusic/side/velocity/SideVelocity.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/SideVelocity.java @@ -1,18 +1,18 @@ -package coloryr.allmusic.side.velocity; +package com.coloryr.allmusic.server.side.velocity; -import coloryr.allmusic.AllMusicVelocity; -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.enums.HudType; -import coloryr.allmusic.core.utils.HudUtils; -import coloryr.allmusic.core.music.play.PlayMusic; -import coloryr.allmusic.core.objs.config.SaveObj; -import coloryr.allmusic.core.objs.music.MusicObj; -import coloryr.allmusic.core.objs.music.SongInfoObj; -import coloryr.allmusic.core.objs.enums.ComType; -import coloryr.allmusic.core.side.ISide; -import coloryr.allmusic.core.sql.IEconomy; -import coloryr.allmusic.side.velocity.event.MusicAddEvent; -import coloryr.allmusic.side.velocity.event.MusicPlayEvent; +import com.coloryr.allmusic.server.AllMusicVelocity; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.enums.HudType; +import com.coloryr.allmusic.server.core.utils.HudUtils; +import com.coloryr.allmusic.server.core.music.play.PlayMusic; +import com.coloryr.allmusic.server.core.objs.config.SaveObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.enums.ComType; +import com.coloryr.allmusic.server.core.side.ISide; +import com.coloryr.allmusic.server.core.sql.IEconomy; +import com.coloryr.allmusic.server.side.velocity.event.MusicAddEvent; +import com.coloryr.allmusic.server.side.velocity.event.MusicPlayEvent; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import com.velocitypowered.api.command.CommandSource; diff --git a/server_top/src/main/java/coloryr/allmusic/side/velocity/event/MusicAddEvent.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/event/MusicAddEvent.java similarity index 86% rename from server_top/src/main/java/coloryr/allmusic/side/velocity/event/MusicAddEvent.java rename to server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/event/MusicAddEvent.java index 8822bc6c..ad404a82 100644 --- a/server_top/src/main/java/coloryr/allmusic/side/velocity/event/MusicAddEvent.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/event/MusicAddEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.velocity.event; +package com.coloryr.allmusic.server.side.velocity.event; -import coloryr.allmusic.core.objs.music.MusicObj; +import com.coloryr.allmusic.server.core.objs.music.MusicObj; import com.velocitypowered.api.command.CommandSource; /** diff --git a/server_top/src/main/java/coloryr/allmusic/side/velocity/event/MusicPlayEvent.java b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/event/MusicPlayEvent.java similarity index 80% rename from server_top/src/main/java/coloryr/allmusic/side/velocity/event/MusicPlayEvent.java rename to server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/event/MusicPlayEvent.java index 68d58865..ab34b68a 100644 --- a/server_top/src/main/java/coloryr/allmusic/side/velocity/event/MusicPlayEvent.java +++ b/server_top/src/main/java/com/coloryr/allmusic/server/side/velocity/event/MusicPlayEvent.java @@ -1,6 +1,6 @@ -package coloryr.allmusic.side.velocity.event; +package com.coloryr.allmusic.server.side.velocity.event; -import coloryr.allmusic.core.objs.music.SongInfoObj; +import com.coloryr.allmusic.server.core.objs.music.SongInfoObj; /** * 音乐播发事件 diff --git a/server_top/src/main/resources/bungee.yml b/server_top/src/main/resources/bungee.yml index e360357c..b1fe146a 100644 --- a/server_top/src/main/resources/bungee.yml +++ b/server_top/src/main/resources/bungee.yml @@ -1,4 +1,4 @@ name: AllMusic3 -main: coloryr.allmusic.AllMusicBC +main: com.coloryr.allmusic.server.AllMusicBC author: Color_yr version: 3.0.0 diff --git a/server_top/src/test/java/RunTest.java b/server_top/src/test/java/RunTest.java index 69920753..d5214985 100644 --- a/server_top/src/test/java/RunTest.java +++ b/server_top/src/test/java/RunTest.java @@ -1,8 +1,8 @@ -import coloryr.allmusic.core.AllMusic; -import coloryr.allmusic.core.objs.CookieObj; -import coloryr.allmusic.core.objs.music.LyricItemObj; -import coloryr.allmusic.core.music.play.LyricSave; -import coloryr.allmusic.core.side.IMyLogger; +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.CookieObj; +import com.coloryr.allmusic.server.core.objs.music.LyricItemObj; +import com.coloryr.allmusic.server.core.music.play.LyricSave; +import com.coloryr.allmusic.server.core.side.IMyLogger; public class RunTest implements IMyLogger { public static void main(String[] arg) {