Migrate to my maven + make NetworkChannel side-agnostic

.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 }}
+          MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
+          curse_api_key: ${{ secrets.CURSE_API_KEY }}

.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}}

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
+task curseforgePublish

common/build.gradle

@@ -42,4 +42,16 @@ publishing {
             artifact javadocsJar
         }
     }
-}
+
+    repositories {
+        if (System.getenv("MAVEN_PASS") != null) {
+            maven {
+                url = "https://deploy.shedaniel.me/"
+                credentials {
+                    username = "shedaniel"
+                    password = System.getenv("MAVEN_PASS")
+                }
+            }
+        }
+    }
+}

common/src/main/java/me/shedaniel/architectury/networking/NetworkChannel.java

@@ -58,10 +58,12 @@ public final class NetworkChannel {
         return new NetworkChannel(id);
     }
     
+    @Deprecated
     public <T> void register(NetworkManager.Side side, Class<T> type, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, BiConsumer<T, Supplier<PacketContext>> messageConsumer) {
-        register(Optional.ofNullable(side), type, encoder, decoder, messageConsumer);
+        register(Optional.empty(), type, encoder, decoder, messageConsumer);
     }
     
+    @Deprecated
     public <T> void register(Optional<NetworkManager.Side> side, Class<T> type, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, BiConsumer<T, Supplier<PacketContext>> messageConsumer) {
         for (int i = 0; true; i++) {
             if (!takenIds.contains(i)) {
@@ -71,27 +73,40 @@ public final class NetworkChannel {
         }
     }
     
+    public <T> void register(Class<T> type, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, BiConsumer<T, Supplier<PacketContext>> messageConsumer) {
+        for (int i = 0; true; i++) {
+            if (!takenIds.contains(i)) {
+                register(i, type, encoder, decoder, messageConsumer);
+                break;
+            }
+        }
+    }
+    
+    public <T> void register(int id, Class<T> type, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, BiConsumer<T, Supplier<PacketContext>> messageConsumer) {
+        register(Optional.empty(), id, type, encoder, decoder, messageConsumer);
+    }
+    
+    @Deprecated
     public <T> void register(NetworkManager.Side side, int id, Class<T> type, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, BiConsumer<T, Supplier<PacketContext>> messageConsumer) {
         register(Optional.ofNullable(side), id, type, encoder, decoder, messageConsumer);
     }
     
+    @Deprecated
     public <T> void register(Optional<NetworkManager.Side> side, int id, Class<T> type, BiConsumer<T, FriendlyByteBuf> encoder, Function<FriendlyByteBuf, T> decoder, BiConsumer<T, Supplier<PacketContext>> 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 <T> Pair<ResourceLocation, FriendlyByteBuf> encode(NetworkManager.Side side, T message) {

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 {

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")
+rootProject.tasks.getByName("curseforgePublish").dependsOn tasks.getByName("curseforge")