From 70d5de3186af26f008f3ba41009e68fa634b14f1 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 8 Feb 2021 21:49:58 +0800 Subject: [PATCH] Migrate to my maven + make NetworkChannel side-agnostic --- .github/workflows/publish.yml | 9 ++--- .github/workflows/snapshot.yml | 7 ++-- build.gradle | 19 +-------- common/build.gradle | 14 ++++++- .../networking/NetworkChannel.java | 39 +++++++++++++------ fabric/build.gradle | 12 ++++++ forge/build.gradle | 14 ++++++- 7 files changed, 73 insertions(+), 41 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9b45669a..f59b91c4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,11 +19,10 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - - name: Upload to Bintray - run: ./gradlew bintrayUpload curseforgePublish --stacktrace + - name: Upload to Maven + run: ./gradlew publish curseforgePublish --stacktrace if: | !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.pull_request.title, '[ci skip]') env: - BINTRAY_USER: shedaniel - BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} - curse_api_key: ${{ secrets.CURSE_API_KEY }} \ No newline at end of file + MAVEN_PASS: ${{ secrets.MAVEN_PASS }} + curse_api_key: ${{ secrets.CURSE_API_KEY }} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 23deb1db..e5689d22 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -19,11 +19,10 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - - name: Upload to Bintray - run: ./gradlew bintrayUpload --stacktrace + - name: Upload to Maven + run: ./gradlew publish --stacktrace if: | !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.pull_request.title, '[ci skip]') env: - BINTRAY_USER: shedaniel - BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} + MAVEN_PASS: ${{ secrets.MAVEN_PASS }} PR_NUM: ${{github.event.number}} diff --git a/build.gradle b/build.gradle index 8f417041..4fcac77a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,6 @@ plugins { id "architectury-plugin" version "2.0.65" id "forgified-fabric-loom" version "0.6.54" apply false id "org.cadixdev.licenser" version "0.5.0" - id "com.jfrog.bintray" version "1.8.4" id "com.matthewprenger.cursegradle" version "1.4.0" apply false id "maven-publish" } @@ -100,20 +99,4 @@ allprojects { task licenseFormatAll subprojects { p -> licenseFormatAll.dependsOn("${p.path}:licenseFormat") } -bintray { - user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') - key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_KEY') - publications = ["mavenCommon", "mavenFabric", "mavenForge"] - publish = true - pkg { - repo = "cloth" - name = "architectury" - userOrg = "shedaniel" - licenses = ["Apache-2.0"] - version { - vcsUrl = "https://github.com/shedaniel/architectury.git" - } - } -} - -task curseforgePublish \ No newline at end of file +task curseforgePublish diff --git a/common/build.gradle b/common/build.gradle index c45ed292..6afb50d7 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -42,4 +42,16 @@ publishing { artifact javadocsJar } } -} \ No newline at end of file + + repositories { + if (System.getenv("MAVEN_PASS") != null) { + maven { + url = "https://deploy.shedaniel.me/" + credentials { + username = "shedaniel" + password = System.getenv("MAVEN_PASS") + } + } + } + } +} diff --git a/common/src/main/java/me/shedaniel/architectury/networking/NetworkChannel.java b/common/src/main/java/me/shedaniel/architectury/networking/NetworkChannel.java index 73fdc088..a38d23f1 100644 --- a/common/src/main/java/me/shedaniel/architectury/networking/NetworkChannel.java +++ b/common/src/main/java/me/shedaniel/architectury/networking/NetworkChannel.java @@ -58,10 +58,12 @@ public final class NetworkChannel { return new NetworkChannel(id); } + @Deprecated public void register(NetworkManager.Side side, Class type, BiConsumer encoder, Function decoder, BiConsumer> messageConsumer) { - register(Optional.ofNullable(side), type, encoder, decoder, messageConsumer); + register(Optional.empty(), type, encoder, decoder, messageConsumer); } + @Deprecated public void register(Optional side, Class type, BiConsumer encoder, Function decoder, BiConsumer> messageConsumer) { for (int i = 0; true; i++) { if (!takenIds.contains(i)) { @@ -71,27 +73,40 @@ public final class NetworkChannel { } } + public void register(Class type, BiConsumer encoder, Function decoder, BiConsumer> messageConsumer) { + for (int i = 0; true; i++) { + if (!takenIds.contains(i)) { + register(i, type, encoder, decoder, messageConsumer); + break; + } + } + } + + public void register(int id, Class type, BiConsumer encoder, Function decoder, BiConsumer> messageConsumer) { + register(Optional.empty(), id, type, encoder, decoder, messageConsumer); + } + + @Deprecated public void register(NetworkManager.Side side, int id, Class type, BiConsumer encoder, Function decoder, BiConsumer> messageConsumer) { register(Optional.ofNullable(side), id, type, encoder, decoder, messageConsumer); } + @Deprecated public void register(Optional side, int id, Class type, BiConsumer encoder, Function decoder, BiConsumer> messageConsumer) { takenIds.add(id); ResourceLocation messageId = new ResourceLocation(this.id.getNamespace(), this.id.getPath() + "_" + id); - if (!side.isPresent() || side.get() == NetworkManager.s2c()) { - if (Platform.getEnvironment() == Env.CLIENT) { - NetworkManager.registerReceiver(NetworkManager.s2c(), messageId, (buf, context) -> { - messageConsumer.accept(decoder.apply(buf), () -> context); - }); - } - encoders.put(NetworkManager.s2c(), type, Pair.of(messageId, encoder)); - } - if (!side.isPresent() || side.get() == NetworkManager.c2s()) { - NetworkManager.registerReceiver(NetworkManager.c2s(), messageId, (buf, context) -> { + + if (Platform.getEnvironment() == Env.CLIENT) { + NetworkManager.registerReceiver(NetworkManager.s2c(), messageId, (buf, context) -> { messageConsumer.accept(decoder.apply(buf), () -> context); }); - encoders.put(NetworkManager.c2s(), type, Pair.of(messageId, encoder)); } + encoders.put(NetworkManager.s2c(), type, Pair.of(messageId, encoder)); + + NetworkManager.registerReceiver(NetworkManager.c2s(), messageId, (buf, context) -> { + messageConsumer.accept(decoder.apply(buf), () -> context); + }); + encoders.put(NetworkManager.c2s(), type, Pair.of(messageId, encoder)); } private Pair encode(NetworkManager.Side side, T message) { diff --git a/fabric/build.gradle b/fabric/build.gradle index d1c637cb..8c1f49a6 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -74,6 +74,18 @@ publishing { } } } + + repositories { + if (System.getenv("MAVEN_PASS") != null) { + maven { + url = "https://deploy.shedaniel.me/" + credentials { + username = "shedaniel" + password = System.getenv("MAVEN_PASS") + } + } + } + } } curseforge { diff --git a/forge/build.gradle b/forge/build.gradle index cfe8a840..4b219c52 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -69,6 +69,18 @@ publishing { } } } + + repositories { + if (System.getenv("MAVEN_PASS") != null) { + maven { + url = "https://deploy.shedaniel.me/" + credentials { + username = "shedaniel" + password = System.getenv("MAVEN_PASS") + } + } + } + } } curseforge { @@ -97,4 +109,4 @@ curseforge { } } -rootProject.tasks.getByName("curseforgePublish").dependsOn tasks.getByName("curseforge") \ No newline at end of file +rootProject.tasks.getByName("curseforgePublish").dependsOn tasks.getByName("curseforge")