Moved GlitchCore code

Glitchfiend · Dec 30, 2023 · dc19970 · dc19970
1 parent b54bedf
commit dc19970
Show file tree

Hide file tree

Showing 59 changed files with 282 additions and 1,571 deletions.
diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
@@ -23,21 +23,21 @@ jobs:
         settings-path: ${{ github.workspace }} # location for the settings.xml file
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
-    - name: Publish
-      run: ./gradlew publish
-      env:
-        MAVEN_USER: ${{ secrets.MAVEN_USER }}
-        MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-        BUILD_NUMBER: ${{ github.run_number }}
-    - name: CurseForge Publish
-      run: ./gradlew curseforge -PcurseApiKey=${CURSE_API_KEY}
-      env:
-        CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
-        BUILD_NUMBER: ${{ github.run_number }}
-      continue-on-error: true
-    - name: Modrinth Publish
-      run: ./gradlew modrinth -PmodrinthToken=${MODRINTH_TOKEN}
-      env:
-        MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-        BUILD_NUMBER: ${{ github.run_number }}
-      continue-on-error: true
+#    - name: Publish
+#      run: ./gradlew publish
+#      env:
+#        MAVEN_USER: ${{ secrets.MAVEN_USER }}
+#        MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+#        BUILD_NUMBER: ${{ github.run_number }}
+#    - name: CurseForge Publish
+#      run: ./gradlew curseforge -PcurseApiKey=${CURSE_API_KEY}
+#      env:
+#        CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
+#        BUILD_NUMBER: ${{ github.run_number }}
+#      continue-on-error: true
+#    - name: Modrinth Publish
+#      run: ./gradlew modrinth -PmodrinthToken=${MODRINTH_TOKEN}
+#      env:
+#        MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+#        BUILD_NUMBER: ${{ github.run_number }}
+#      continue-on-error: true
diff --git a/build.gradle b/build.gradle
@@ -51,6 +51,10 @@ subprojects {
             name = 'Sponge / Mixin'
             url = 'https://repo.spongepowered.org/repository/maven-public/'
         }
+        maven {
+            name = 'Forge'
+            url = "https://maven.minecraftforge.net"
+        }
     }
 
     tasks.withType(JavaCompile).configureEach {
@@ -60,7 +64,10 @@ subprojects {
 
     processResources {
         var expandProps = [
-            minecraft_version   : minecraft_version, forge_version: forge_version, forge_version_range: forge_version_range, forge_loader_version_range: forge_loader_version_range,
+            minecraft_version   : minecraft_version,
+            forge_version       : forge_version, forge_version_range: forge_version_range, forge_loader_version_range: forge_loader_version_range,
+            neoforge_version    : neoforge_version, neoforge_version_range: neoforge_version_range, neoforge_loader_version_range: neoforge_loader_version_range,
+            glitchcore_version  : glitchcore_version,
             mod_id              : mod_id, mod_name: mod_name, mod_display_name: mod_display_name, mod_version: mod_version,
             mod_authors         : mod_authors, mod_description: mod_description,
             mod_issues_url      : mod_issues_url, mod_page_url: mod_page_url, mod_git_url: mod_git_url,
@@ -80,51 +87,53 @@ subprojects {
         enabled = false
     }
 
-    publishing {
-        publications {
-            mavenJava(MavenPublication) {
-                artifact jar
-                groupId project.group
-                artifactId project.archivesBaseName
-                version project.version
+    afterEvaluate {
+        publishing {
+            publications {
+                mavenJava(MavenPublication) {
+                    artifact jar
+                    groupId project.group
+                    artifactId project.archivesBaseName
+                    version project.version
 
-                pom {
-                    name = project.archivesBaseName
-                    description = project.mod_description
-                    url = project.mod_git_url
-                    scm {
+                    pom {
+                        name = project.archivesBaseName
+                        description = project.mod_description
                         url = project.mod_git_url
-                        connection = project.mod_scm_url
-                        developerConnection = project.mod_scm_url
-                    }
-                    issueManagement {
-                        system = 'github'
-                        url = project.mod_issues_url
-                    }
-                    licenses {
-                        license {
-                            name = project.mod_license
+                        scm {
+                            url = project.mod_git_url
+                            connection = project.mod_scm_url
+                            developerConnection = project.mod_scm_url
                         }
-                    }
-                    developers {
-                        developer {
-                            id = 'adubbz'
-                            name = 'Adubbz'
+                        issueManagement {
+                            system = 'github'
+                            url = project.mod_issues_url
+                        }
+                        licenses {
+                            license {
+                                name = project.mod_license
+                            }
                         }
-                        developer {
-                            id = 'forstride'
-                            name = 'Forstride'
+                        developers {
+                            developer {
+                                id = 'adubbz'
+                                name = 'Adubbz'
+                            }
+                            developer {
+                                id = 'forstride'
+                                name = 'Forstride'
+                            }
                         }
                     }
                 }
             }
-        }
-        repositories {
-            maven {
-                url = "https://maven.minecraftforge.net/releases/"
-                credentials {
-                    username = System.getenv("MAVEN_USER")
-                    password = System.getenv("MAVEN_PASSWORD")
+            repositories {
+                maven {
+                    url = "https://maven.minecraftforge.net/releases/"
+                    credentials {
+                        username = System.getenv("MAVEN_USER")
+                        password = System.getenv("MAVEN_PASSWORD")
+                    }
                 }
             }
         }

diff --git a/common/build.gradle b/common/build.gradle
@@ -19,4 +19,5 @@ dependencies {
     compileOnly("com.electronwill.night-config:toml:${nightconfig_version}")
     compileOnly("com.electronwill.night-config:core:${nightconfig_version}")
     compileOnly("net.jodah:typetools:0.6.3")
+    compileOnly 'com.github.glitchfiend:GlitchCore-common:' + minecraft_version + '-' + glitchcore_version
 }
diff --git a/common/src/main/java/glitchcore/config/Config.java b/common/src/main/java/glitchcore/config/Config.java
diff --git a/common/src/main/java/glitchcore/core/GlitchCore.java b/common/src/main/java/glitchcore/core/GlitchCore.java
diff --git a/common/src/main/java/glitchcore/event/Event.java b/common/src/main/java/glitchcore/event/Event.java
diff --git a/common/src/main/java/glitchcore/event/EventManager.java b/common/src/main/java/glitchcore/event/EventManager.java
diff --git a/common/src/main/java/glitchcore/event/LivingEntityUseItemEvent.java b/common/src/main/java/glitchcore/event/LivingEntityUseItemEvent.java