Skip to content

Commit ea62b81

Browse files
MrNavaStarMrNavaStar
authored
Merge pull request #150 from MrNavaStar/the-great-seperation
The Great Separation
2 parents 18ec547 + ea05b20 commit ea62b81

File tree

35 files changed

+87
-1107
lines changed

35 files changed

+87
-1107
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ jobs:
1717
run: |
1818
sed -i 's/debug-build/${{ github.event.release.tag_name }}/g' gradle.properties
1919
sed -i 's/debug-build/${{ github.event.release.tag_name }}/g' common/src/main/java/me/mrnavastar/protoweaver/core/util/ProtoConstants.java
20-
sed -i 's/debug-build/${{ github.event.release.tag_name }}/g' fabric/src/main/resources/fabric.mod.json
21-
sed -i 's/0.debug-build/${{ github.event.release.tag_name }}/g' forge/src/main/resources/META-INF/mods.toml
22-
sed -i 's/0.debug-build/${{ github.event.release.tag_name }}/g' neoforge/src/main/resources/META-INF/neoforge.mods.toml
23-
sed -i 's/debug-build/${{ github.event.release.tag_name }}/g' paper/src/main/resources/plugin.yml
24-
sed -i 's/debug-build/${{ github.event.release.tag_name }}/g' proxy/src/main/resources/bungee.yml
2520
2621
- name: Build
2722
run: ./gradlew build
@@ -30,71 +25,4 @@ jobs:
3025
run: ./gradlew publish
3126
env:
3227
MAVEN_NAME: ${{ secrets.MAVEN_NAME }}
33-
MAVEN_SECRET: ${{ secrets.MAVEN_SECRET }}
34-
35-
- name: Upload Fabric
36-
uses: Kir-Antipov/mc-publish@v3.3.0
37-
with:
38-
modrinth-id: 6nKmUVc7
39-
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
40-
modrinth-featured: true
41-
files: ${{ github.workspace }}/fabric/build/libs/protoweaver-${{ github.event.release.tag_name }}-fabric.jar
42-
java: 21
43-
loaders: |
44-
fabric
45-
quilt
46-
game-versions: |
47-
>=1.14
48-
49-
- name: Upload Forge
50-
uses: Kir-Antipov/mc-publish@v3.3.0
51-
with:
52-
modrinth-id: 6nKmUVc7
53-
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
54-
modrinth-featured: true
55-
files: ${{ github.workspace }}/forge/build/libs/protoweaver-${{ github.event.release.tag_name }}-forge.jar
56-
java: 21
57-
loaders: forge
58-
game-versions: |
59-
>=1.15
60-
61-
- name: Upload NeoForge
62-
uses: Kir-Antipov/mc-publish@v3.3.0
63-
with:
64-
modrinth-id: 6nKmUVc7
65-
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
66-
modrinth-featured: true
67-
files: ${{ github.workspace }}/neoforge/build/libs/protoweaver-${{ github.event.release.tag_name }}-neoforge.jar
68-
java: 21
69-
loaders: neoforge
70-
game-versions: |
71-
>=1.20.2
72-
73-
- name: Upload Paper
74-
uses: Kir-Antipov/mc-publish@v3.3.0
75-
with:
76-
modrinth-id: 6nKmUVc7
77-
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
78-
modrinth-featured: true
79-
files: ${{ github.workspace }}/paper/build/libs/protoweaver-${{ github.event.release.tag_name }}-paper.jar
80-
java: 21
81-
loaders: |
82-
paper
83-
folia
84-
purpur
85-
game-versions: |
86-
>=1.14
87-
88-
- name: Upload Proxy
89-
uses: Kir-Antipov/mc-publish@v3.3.0
90-
with:
91-
modrinth-id: 6nKmUVc7
92-
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
93-
modrinth-featured: true
94-
files: ${{ github.workspace }}/proxy/build/libs/protoweaver-${{ github.event.release.tag_name }}-proxy.jar
95-
java: 21
96-
loaders: |
97-
velocity
98-
waterfall
99-
game-versions: |
100-
>=1.14
28+
MAVEN_SECRET: ${{ secrets.MAVEN_SECRET }}

‎.gitignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
/common/build/
88
protoweaver_hosts
99

10-
/loader-common/build/
11-
/loader-common/.architectury-transformer/
12-
/loader-common/.gradle/
10+
/server/build/
11+
/server/.architectury-transformer/
12+
/server/.gradle/
1313

1414
/fabric/build/
1515
/fabric/.architectury-transformer/

‎build.gradle‎

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,15 @@
11
plugins {
2-
id "io.github.goooler.shadow" version "8.1.8"
3-
id "io.freefair.lombok" version "9.1.0"
4-
id "architectury-plugin" version "3.4-SNAPSHOT"
5-
id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
2+
id "com.gradleup.shadow" version "9.3.1"
3+
id "io.freefair.lombok" version "9.2.0"
64
id "maven-publish"
75
}
86

97
allprojects {
10-
apply plugin: "architectury-plugin"
11-
128
version = project.project_version
139
group = project.maven_group
1410

15-
architectury {
16-
compileOnly()
17-
}
18-
1911
repositories {
2012
mavenCentral()
21-
maven { url "https://maven.minecraftforge.net/" } // Forge
22-
maven { url "https://repo.papermc.io/repository/maven-public/" } // Paper + Velocity
23-
maven { url "https://api.modrinth.com/maven/" } // Modrinth
2413
}
2514

2615
tasks.withType(JavaCompile).tap {
@@ -49,7 +38,7 @@ subprojects {
4938
}
5039

5140
tasks.register('jarSources', Jar) {
52-
archiveBaseName.set("protoweaver")
41+
archiveBaseName.set(project.name)
5342
archiveClassifier.set("sources")
5443
exclude {
5544
sourceSets.main.allSource.contains it.file
@@ -59,24 +48,22 @@ subprojects {
5948

6049
jar.finalizedBy(jarSources)
6150

62-
if (project.path != ':loader-common') {
63-
publishing {
64-
repositories {
65-
maven {
66-
url "https://maven.mrnavastar.me/releases"
67-
credentials {
68-
username = System.getenv("MAVEN_NAME")
69-
password = System.getenv("MAVEN_SECRET")
70-
}
51+
publishing {
52+
repositories {
53+
maven {
54+
url "https://maven.mrnavastar.me/releases"
55+
credentials {
56+
username = System.getenv("MAVEN_NAME")
57+
password = System.getenv("MAVEN_SECRET")
7158
}
7259
}
73-
publications {
74-
mavenJava(MavenPublication) {
75-
groupId = "me.mrnavastar.protoweaver"
76-
artifactId = project.name
77-
from components.java
78-
artifact tasks.jarSources
79-
}
60+
}
61+
publications {
62+
mavenJava(MavenPublication) {
63+
groupId = "me.mrnavastar.protoweaver"
64+
artifactId = project.name
65+
from components.java
66+
artifact tasks.jarSources
8067
}
8168
}
8269
}

‎client/build.gradle‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
apply plugin: "io.github.goooler.shadow"
1+
apply plugin: "com.gradleup.shadow"
22

33
dependencies {
4-
shadow compileOnly(project(path: ':common', configuration: 'default'))
5-
shadow compileOnly("org.apache.fory:fory-core:${project.fory_version}")
6-
shadow compileOnly("io.netty:netty-buffer:${project.netty_version}")
7-
shadow compileOnly("io.netty:netty-transport:${project.netty_version}")
8-
shadow compileOnly("io.netty:netty-handler:${project.netty_version}")
9-
shadow compileOnly("me.mrnavastar:r:${project.r_version}")
4+
shadow implementation(project(path: ':common', configuration: 'default'))
5+
6+
shadow "org.apache.fory:fory-core:${project.fory_version}"
7+
shadow "io.netty:netty-buffer:${project.netty_version}"
8+
shadow "io.netty:netty-transport:${project.netty_version}"
9+
shadow "io.netty:netty-handler:${project.netty_version}"
10+
shadow "me.mrnavastar:r:${project.r_version}"
1011
}
1112

1213
shadowJar {
@@ -17,7 +18,7 @@ shadowJar {
1718
mergeServiceFiles()
1819
}
1920

20-
relocate "org.apache.fury", "me.mrnavastar.protoweaver.libs.org.apache.fury"
21+
relocate "org.apache.fory", "me.mrnavastar.protoweaver.libs.org.apache.fory"
2122
relocate "com.google", "me.mrnavastar.protoweaver.libs.com.google"
2223
relocate 'io.netty', 'me.mrnavastar.protoweaver.libs.io.netty'
2324
relocate 'me.mrnavastar.r', 'me.mrnavastar.protoweaver.libs.me.mrnavastar.r'

‎fabric/build.gradle‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎fabric/src/main/java/me/mrnavastar/protoweaver/loader/Fabric.java‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎fabric/src/main/resources/fabric.mod.json‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)