1.19 (#3)

* update * Check private type arguments, add versions.toml Co-authored-by: 0ffz <[email protected]>
MineInAbyss · Jun 21, 2022 · d8e4975 · d8e4975
1 parent c817f69
commit d8e4975
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 33 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
 
 repositories {
     mavenCentral()
+    mavenLocal()
     google()
 }
 
@@ -19,14 +20,15 @@ allprojects {
     version = rootProject.version
 
     repositories {
+        mavenLocal()
         maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
         maven("https://repo.dmulloy2.net/nexus/repository/public/")//ProtocolLib
         maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
     }
 
     dependencies {
         compileOnly(kotlin("stdlib-jdk8"))
-        compileOnly("com.comphenix.protocol:ProtocolLib:4.7.0") {
+        compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT") {
             // this dep wasn"t being resolved.
             exclude(group = "com.comphenix.executors")
         }

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
-version=0.3
+version=0.4
 group=com.mineinabyss
 kotlinVersion=1.6.10
-serverVersion=1.18.2-R0.1-SNAPSHOT
-idofrontVersion=0.9.88
+serverVersion=1.19-R0.1-SNAPSHOT
+idofrontVersion=0.11.95
 publishComponentName=java
diff --git a/gradle/mylibs.versions.toml b/gradle/mylibs.versions.toml
@@ -0,0 +1,6 @@
+[versions]
+
+[libraries]
+kotlinpoet = "com.squareup:kotlinpoet:1.10.1"
+reflections = "org.reflections:reflections:0.9.12"
+minecraft-plugin-protocollib = "com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT"
diff --git a/protocolburrito-generator/build.gradle.kts b/protocolburrito-generator/build.gradle.kts
@@ -4,29 +4,25 @@ val serverVersion: String by project
 
 plugins {
     kotlin("jvm")
-    id("io.papermc.paperweight.userdev")
+    id("com.mineinabyss.conventions.nms")
 }
 
 repositories {
     mavenCentral()
+    mavenLocal()
     google()
-    maven("https://papermc.io/repo/repository/maven-public/")
 }
 
 dependencies {
-    paperDevBundle(serverVersion)
     implementation(kotlin("reflect"))
-    implementation("io.papermc.paper:paper-server:userdev-1.18.2-R0.1-SNAPSHOT")
-    implementation("com.comphenix.protocol:ProtocolLib:4.7.0")
-    implementation("com.nfeld.jsonpathkt:jsonpathkt:2.0.0")
-    implementation("com.squareup:kotlinpoet:1.10.1")
+    implementation("io.papermc.paper:paper-server:userdev-$serverVersion")
+    implementation(mylibs.minecraft.plugin.protocollib)
+    implementation(mylibs.kotlinpoet)
+    implementation(mylibs.reflections)
     implementation(project(":protocolburrito-api"))
-
-//    implementation("com.google.devtools.ksp:symbol-processing-api:1.6.10-1.0.2")
-//    compileOnly("com.google.auto.service:auto-service:1.0")
-    implementation("org.reflections:reflections:0.9.12")
     implementation(kotlin("reflect"))
 }
+
 configurations {
     remove(findByName("reobf"))
 }
@@ -43,8 +39,3 @@ tasks {
         dependsOn(generateBurrito)
     }
 }
-//sourceSets.main {
-//    java.srcDirs("src/main/kotlin")
-//}
-
-
diff --git a/...or/src/main/kotlin/com/mineinabyss/protocolburrito/generation/ProtocolWrapperGenerator.kt b/...or/src/main/kotlin/com/mineinabyss/protocolburrito/generation/ProtocolWrapperGenerator.kt
@@ -18,10 +18,6 @@ import kotlin.reflect.full.declaredMemberProperties
 import kotlin.reflect.jvm.jvmErasure
 import kotlin.reflect.typeOf
 
-//val SERVER_VERSION = "1.17"
-//val PROJECT_ROOT = File("")//File(AnnotationProcessor.generatedDir)//.parentFile.parentFile.parentFile.parentFile.parentFile
-//val SERVER_PATH = File(PROJECT_ROOT, "minecraft-data/data/pc/$SERVER_VERSION/")
-//val MAPPINGS = File(PROJECT_ROOT, "mappings/server.txt")
 val OUTPUT_DIR = File("build/generated/burrito/main/")
 
 fun generateProtocolExtensions() {
@@ -32,6 +28,7 @@ fun generateProtocolExtensions() {
             val type = field.returnType
             if (field.visibility == KVisibility.PUBLIC) return@mapNotNull null
             if (field.returnType.jvmErasure.visibility != KVisibility.PUBLIC) return@mapNotNull null
+            if (field.returnType.arguments.any { it.type?.jvmErasure?.visibility != KVisibility.PUBLIC }) return@mapNotNull null
             val index = indices.getOrPut(type) { AtomicInteger(0) }
             PropertySpec.builder(field.name, type.asTypeName().copy(annotations = listOf())) //.let {
                 .getter(

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,9 +6,10 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         mavenCentral()
+        mavenLocal()
         google()
         maven("https://repo.mineinabyss.com/releases")
-        maven("https://papermc.io/repo/repository/maven-public/")
+        maven("https://repo.papermc.io/repository/maven-public/")
     }
 
     plugins {
@@ -17,25 +18,23 @@ pluginManagement {
         kotlin("plugin.serialization") version kotlinVersion
     }
 
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id.startsWith("com.mineinabyss.conventions"))
-                useVersion(idofrontVersion)
-        }
+    resolutionStrategy.eachPlugin {
+        if (requested.id.id.startsWith("com.mineinabyss.conventions"))
+            useVersion(idofrontVersion)
     }
 }
 
 dependencyResolutionManagement {
     val idofrontVersion: String by settings
 
     repositories {
+        mavenLocal()
         maven("https://repo.mineinabyss.com/releases")
     }
 
     versionCatalogs {
-        create("libs") {
-            from("com.mineinabyss:catalog:$idofrontVersion")
-        }
+        create("libs").from("com.mineinabyss:catalog:$idofrontVersion")
+        create("mylibs").from(files("gradle/mylibs.versions.toml"))
     }
 }