Merge pull request #3 from way-zer/fix-jitpack

修复内容包在Jitpack上的maven发布

README.md

@@ -1,3 +1,5 @@
+[![Build](https://github.com/way-zer/MindustryContents/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/way-zer/MindustryContents/actions/workflows/build.yml)
+[![](https://jitpack.io/v/way-zer/MindustryContents.svg)](https://jitpack.io/#way-zer/MindustryContents)
 # MindustryContentsLoader
 一个`内容包`加载器的像素工厂MOD  
 A Mindustry MOD to dynamicly load `Contents Pack`
@@ -15,6 +17,20 @@ A group of ContentList code, NO member, ONLY functionn `load` to assign new inst
 例子参见[洪水模式内容包](./contents/flood)  
 For example, see [flood ContentPack](./contents/flood)
 
+### maven引用 import from maven
+供插件或其他项目引用  
+For plugin or other projects to import.
+```groovy
+repositories {
+    maven { url 'https://jitpack.io' }
+}
+dependencies {
+    implementation 'cf.wayzer.MindustryContents:CONTENT_TYPE:VERSION'
+}
+```
+* VERSION: 编译版本号 build version
+* CONTENT_TYPE: 内容包类型(如flood) name of `Contents Pack`(ex `flood`)
+
 ## 安装 Setup
 安装Release中的MOD即可(多人游戏兼容)  
 Install mod in Release(multiplayer compatible)

build.gradle.kts

@@ -2,5 +2,5 @@ plugins {
     kotlin("jvm") version "1.6.10"
 }
 
-group = "cf.wayzer.mindustryContents"
+group = "cf.wayzer.MindustryContents"
 version = System.getenv().getOrDefault("VERSION", "1.0-SNAPSHOT")

contents/build.gradle.kts

@@ -19,7 +19,7 @@ subprojects {
         compileOnly("com.github.Anuken.Mindustry:core:v135")
     }
 
-    publishing{
+    publishing {
         publications {
             create<MavenPublication>("maven") {
                 groupId = rootProject.group.toString()

contents/origin/README

@@ -0,0 +1,2 @@
+使用游戏原版,无源代码
+No Source, using game original contents.

loaderMod/src/main/kotlin/cf/wayzer/contentsMod/Contents.kt

@@ -8,17 +8,26 @@ import mindustry.ctype.ContentType
 
 @Suppress("MemberVisibilityCanBePrivate")
 object Contents {
-    fun flood():String{
+    fun flood(): String {
         ContentsLoader.overwriteContents(ContentType.block, Blocks())
         ContentsLoader.overwriteContents(ContentType.bullet, Bullets())
         ContentsLoader.overwriteContents(ContentType.unit, UnitTypes())
         return "OK"
     }
 
-    fun loadType(type: String) = when(type.lowercase()){
-        "flood"-> flood()
+    fun origin(): String {
+        MyContentLoader.contents.forEach {
+            it.content = it.default
+        }
+        return "OK"
+    }
+
+    fun loadType(type: String) = when (type.lowercase()) {
+        "flood" -> flood()
+        "origin" -> origin()
         else -> {
             Log.infoTag("ContentsLoader", "Unknown contents type $type")
+            origin()
             "NOTFOUND"
         }
     }

loaderMod/src/main/kotlin/cf/wayzer/contentsMod/ContentsLoader.kt

@@ -16,7 +16,7 @@ class ContentsLoader : Mod() {
     override fun init() {
         Events.on(ResetEvent::class.java) {
             //fastPath
-            if (MyContentLoader.contents.all { it.content == it.lastContent }) {
+            if (MyContentLoader.contents.all { it.content eq it.lastContent }) {
                 MyContentLoader.contents.forEach { it.content = it.default }
                 return@on
             }
@@ -45,6 +45,10 @@ class ContentsLoader : Mod() {
 
     @Suppress("unused", "MemberVisibilityCanBePrivate")
     companion object API {
+        infix fun ContentList.eq(contentList: ContentList?): Boolean {
+            return javaClass == contentList?.javaClass
+        }
+
         fun maskChanged(type: ContentType) {
             val c = MyContentLoader.contentMap[type] ?: throw IllegalArgumentException("Not Support Overwrite ContentType")
             c.maskChanged()

settings.gradle.kts

@@ -1,4 +1,5 @@
 rootProject.name = "MindustryContents"
 include("contents")
 include("contents:flood")
+include("contents:origin")
 include("loaderMod")