Skip to content

Commit f461be2

Browse files
ColoryrColoryr
committed
up 3.4.5
1 parent 6b73c41 commit f461be2

49 files changed

Lines changed: 2358 additions & 21 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/gradle.yml‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,29 @@ jobs:
280280
uses: actions/upload-artifact@v4
281281
with:
282282
name: "allmusic_server_fabric_1_21_5"
283-
path: build/libs/
283+
path: build/libs/
284+
build_fabric_1_21_6:
285+
runs-on: windows-latest
286+
permissions:
287+
contents: read
288+
steps:
289+
- uses: actions/checkout@v4
290+
- name: Set up JDK 21
291+
uses: actions/setup-java@v4
292+
with:
293+
java-version: '21'
294+
distribution: 'temurin'
295+
- name: Setup Gradle
296+
uses: gradle/actions/setup-gradle@v3 # v3.1.0
297+
- name: build
298+
shell: cmd
299+
run: |
300+
link.cmd && cd fabric_1_21_6 && gradlew build
301+
- name: update
302+
uses: actions/upload-artifact@v4
303+
with:
304+
name: "allmusic_server_fabric_1_21_6"
305+
path: build/libs/
284306
build_forge_1_7_10:
285307
runs-on: windows-latest
286308
permissions:
@@ -522,4 +544,26 @@ jobs:
522544
uses: actions/upload-artifact@v4
523545
with:
524546
name: "allmusic_server_neoforge_1_21_5"
547+
path: build/libs/
548+
build_neoforge_1_21_6:
549+
runs-on: windows-latest
550+
permissions:
551+
contents: read
552+
steps:
553+
- uses: actions/checkout@v4
554+
- name: Set up JDK 21
555+
uses: actions/setup-java@v4
556+
with:
557+
java-version: '21'
558+
distribution: 'temurin'
559+
- name: Setup Gradle
560+
uses: gradle/actions/setup-gradle@v3 # v3.1.0
561+
- name: build
562+
shell: cmd
563+
run: |
564+
link.cmd && cd neoforge_1_21_6 && gradlew build
565+
- name: update
566+
uses: actions/upload-artifact@v4
567+
with:
568+
name: "allmusic_server_neoforge_1_21_6"
525569
path: build/libs/

‎build.cmd‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,18 @@ set "PROJECTS[12]=fabric_1_20_6"
1818
set "PROJECTS[13]=fabric_1_21"
1919
set "PROJECTS[14]=fabric_1_21_4"
2020
set "PROJECTS[15]=fabric_1_21_5"
21-
set "PROJECTS[16]=neoforge_1_20_4"
22-
set "PROJECTS[17]=neoforge_1_20_6"
23-
set "PROJECTS[18]=neoforge_1_21"
24-
set "PROJECTS[19]=neoforge_1_21_4"
25-
set "PROJECTS[20]=neoforge_1_21_5"
26-
set "PROJECTS[21]=folia"
27-
set "PROJECTS[22]=server"
28-
set "PROJECTS[23]=server_top"
21+
set "PROJECTS[16]=fabric_1_21_6"
22+
set "PROJECTS[17]=neoforge_1_20_4"
23+
set "PROJECTS[18]=neoforge_1_20_6"
24+
set "PROJECTS[19]=neoforge_1_21"
25+
set "PROJECTS[20]=neoforge_1_21_4"
26+
set "PROJECTS[21]=neoforge_1_21_5"
27+
set "PROJECTS[22]=neoforge_1_21_6"
28+
set "PROJECTS[23]=folia"
29+
set "PROJECTS[24]=server"
30+
set "PROJECTS[25]=server_top"
2931

30-
set /a ARRAY_LENGTH=23
32+
set /a ARRAY_LENGTH=25
3133

3234
cls
3335

‎core/objs/config/SaveObj.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ public boolean check() {
3131
boolean save = false;
3232
if (list == null) {
3333
save = true;
34-
list = new PosObj(2, 74, HudDirType.TOP_LEFT, 0xffffff, true, true);
34+
list = new PosObj(2, 74, HudDirType.TOP_LEFT, 0xffffffff, true, true);
3535
}
3636
if (lyric == null) {
3737
save = true;
38-
lyric = new PosObj(74, 53, HudDirType.TOP_LEFT, 0xffffff, true, true);
38+
lyric = new PosObj(74, 53, HudDirType.TOP_LEFT, 0xffffffff, true, true);
3939
}
4040
if (info == null) {
4141
save = true;
42-
info = new PosObj(74, 2, HudDirType.TOP_LEFT, 0xffffff, true, true);
42+
info = new PosObj(74, 2, HudDirType.TOP_LEFT, 0xffffffff, true, true);
4343
}
4444
if (pic == null) {
4545
save = true;
@@ -50,9 +50,9 @@ public boolean check() {
5050

5151
public void init() {
5252
picRotateSpeed = 30;
53-
list = new PosObj(2, 74, HudDirType.TOP_LEFT, 0xffffff, true, true);
54-
lyric = new PosObj(74, 53, HudDirType.TOP_LEFT, 0xffffff, true, true);
55-
info = new PosObj(74, 2, HudDirType.TOP_LEFT, 0xffffff, true, true);
53+
list = new PosObj(2, 74, HudDirType.TOP_LEFT, 0xffffffff, true, true);
54+
lyric = new PosObj(74, 53, HudDirType.TOP_LEFT, 0xffffffff, true, true);
55+
info = new PosObj(74, 2, HudDirType.TOP_LEFT, 0xffffffff, true, true);
5656
pic = new PosObj(2, 2, HudDirType.TOP_LEFT, 70, true, true);
5757
}
5858
}

‎fabric_1_21_6/.gitignore‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# gradle
2+
3+
.gradle/
4+
build/
5+
out/
6+
classes/
7+
8+
# eclipse
9+
10+
*.launch
11+
12+
# idea
13+
14+
.idea/
15+
*.iml
16+
*.ipr
17+
*.iws
18+
19+
# vscode
20+
21+
.settings/
22+
.vscode/
23+
bin/
24+
.classpath
25+
.project
26+
27+
# macos
28+
29+
*.DS_Store
30+
31+
# fabric
32+
33+
run/
34+
35+
# java
36+
37+
hs_err_*.log
38+
replay_*.log
39+
*.hprof
40+
*.jfr

‎fabric_1_21_6/build.gradle‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
plugins {
2+
id 'fabric-loom' version '1.10-SNAPSHOT'
3+
id 'maven-publish'
4+
// id "org.jetbrains.kotlin.jvm" version "2.1.0"
5+
}
6+
7+
def getVersionFromFile() {
8+
def versionFile = file('../version')
9+
if (versionFile.exists()) {
10+
return versionFile.text.trim()
11+
} else {
12+
throw new GradleException("Version file not found: ${versionFile.absolutePath}")
13+
}
14+
}
15+
16+
version = getVersionFromFile()
17+
18+
group = project.maven_group
19+
20+
base {
21+
archivesName = project.archives_base_name
22+
}
23+
24+
repositories {
25+
// Add repositories to retrieve artifacts from in here.
26+
// You should only use this when depending on other mods because
27+
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
28+
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
29+
// for more information about repositories.
30+
}
31+
32+
dependencies {
33+
// To change the versions see the gradle.properties file
34+
minecraft "com.mojang:minecraft:${project.minecraft_version}"
35+
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
36+
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
37+
38+
// Fabric API. This is technically optional, but you probably want it anyway.
39+
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
40+
modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}"
41+
42+
include modImplementation('com.squareup.okio:okio-jvm:3.6.0')
43+
include modImplementation('com.squareup.okhttp3:okhttp:4.12.0')
44+
include modImplementation('org.xerial:sqlite-jdbc:3.48.0.0')
45+
}
46+
47+
processResources {
48+
inputs.property "version", project.version
49+
50+
filesMatching("fabric.mod.json") {
51+
expand "version": project.version
52+
}
53+
}
54+
55+
tasks.withType(JavaCompile).configureEach {
56+
it.options.release = 21
57+
}
58+
59+
//tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
60+
// kotlinOptions {
61+
// jvmTarget = 21
62+
// }
63+
//}
64+
65+
java {
66+
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
67+
// if it is present.
68+
// If you remove this line, sources will not be generated.
69+
withSourcesJar()
70+
71+
sourceCompatibility = JavaVersion.VERSION_21
72+
targetCompatibility = JavaVersion.VERSION_21
73+
}
74+
75+
jar {
76+
from("LICENSE") {
77+
rename { "${it}_${project.base.archivesName.get()}"}
78+
}
79+
}
80+
81+
// configure the maven publication
82+
publishing {
83+
publications {
84+
create("mavenJava", MavenPublication) {
85+
artifactId = project.archives_base_name
86+
from components.java
87+
}
88+
}
89+
90+
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
91+
repositories {
92+
// Add repositories to publish to here.
93+
// Notice: This block does NOT have the same function as the block in the top level.
94+
// The repositories here will be used for publishing your artifact, not for
95+
// retrieving dependencies.
96+
}
97+
}

‎fabric_1_21_6/gradle.properties‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Done to increase the memory available to gradle.
2+
org.gradle.jvmargs=-Xmx1G
3+
org.gradle.parallel=true
4+
5+
# Fabric Properties
6+
# check these on https://fabricmc.net/develop
7+
minecraft_version=1.21.6
8+
yarn_mappings=1.21.6+build.1
9+
loader_version=0.16.14
10+
fabric_kotlin_version=1.13.4+kotlin.2.2.0
11+
12+
# Mod Properties
13+
maven_group = com.coloryr.allmusic.server
14+
archives_base_name =[fabric-1.21.6]AllMusic_Server
15+
16+
# Dependencies
17+
fabric_version=0.128.1+1.21.6

‎fabric_1_21_6/gradle/wrapper/gradle-wrapper.jar‎

60.2 KB
Binary file not shown.

‎fabric_1_21_6/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
6+
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)