Skip to content

Commit 12cdb5a

Browse files
committed
feat: plugin.yml for plugins
1 parent b3f378e commit 12cdb5a

File tree

7 files changed

+40
-4
lines changed

7 files changed

+40
-4
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ yarn_mappings=1.21.1+build.3
88
loader_version=0.16.7
99

1010
# Mod Properties
11-
version=2.2.0
11+
version=2.2.1
1212
group=net.mcbrawls.inject
1313
id=inject

paper/build.gradle.kts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ plugins {
77

88
fun prop(name: String) = project.rootProject.property(name) as String
99

10+
val isPublishing = gradle.startParameter.taskNames.any { it.contains("publish") }
11+
1012
group = prop("group")
1113
version = prop("version")
1214

@@ -71,6 +73,18 @@ tasks {
7173
}
7274
}
7375

76+
tasks.processResources {
77+
inputs.property("version", project.version)
78+
79+
filesMatching("plugin.yml") {
80+
if (isPublishing) {
81+
exclude()
82+
} else {
83+
expand("version" to project.version)
84+
}
85+
}
86+
}
87+
7488
runPaper {
7589
disablePluginJarDetection()
7690
}

paper/src/main/java/net/mcbrawls/inject/paper/InjectPaper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
import net.kyori.adventure.key.Key;
55
import net.mcbrawls.inject.api.InjectPlatform;
66
import net.mcbrawls.inject.api.Injector;
7+
import org.bukkit.plugin.java.JavaPlugin;
78
import org.slf4j.Logger;
89
import org.slf4j.LoggerFactory;
910

1011
import java.util.ArrayList;
1112
import java.util.List;
1213

13-
public class InjectPaper implements InjectPlatform {
14+
public class InjectPaper extends JavaPlugin implements InjectPlatform {
1415
private static final Logger LOGGER = LoggerFactory.getLogger("inject");
1516
public static InjectPaper INSTANCE = new InjectPaper();
1617
private static final List<Injector> injectors = new ArrayList<>();
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
name: Inject
2+
main: net.mcbrawls.inject.paper.InjectPaper
3+
version: ${version}

spigot/build.gradle.kts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ plugins {
88

99
fun prop(name: String) = project.rootProject.property(name) as String
1010

11+
val isPublishing = gradle.startParameter.taskNames.any { it.contains("publish") }
12+
1113
group = prop("group")
1214
version = prop("version")
1315

@@ -61,6 +63,18 @@ tasks {
6163
}
6264
}
6365

66+
tasks.processResources {
67+
inputs.property("version", project.version)
68+
69+
filesMatching("plugin.yml") {
70+
if (isPublishing) {
71+
exclude()
72+
} else {
73+
expand("version" to project.version)
74+
}
75+
}
76+
}
77+
6478
publishing {
6579
publications {
6680
create<MavenPublication>("mavenJava") {

spigot/src/main/java/net/mcbrawls/inject/spigot/InjectSpigot.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
import net.mcbrawls.inject.api.InjectPlatform;
44
import net.mcbrawls.inject.api.Injector;
55
import net.mcbrawls.inject.spigot.interceptor.ClientConnectionInterceptor;
6+
import org.bukkit.plugin.java.JavaPlugin;
67

78
import java.util.ArrayList;
89
import java.util.List;
910
import java.util.logging.Logger;
1011

11-
public class InjectSpigot implements InjectPlatform {
12+
public class InjectSpigot extends JavaPlugin implements InjectPlatform {
1213
private static final Logger LOGGER = Logger.getLogger("inject");
1314
public static InjectSpigot INSTANCE = new InjectSpigot();
1415
private static final List<Injector> injectors = new ArrayList<>();
@@ -45,4 +46,4 @@ public void registerInjector(Injector injector) {
4546
LOGGER.info("Inject initialized");
4647
}
4748
}
48-
}
49+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
name: Inject
2+
main: net.mcbrawls.inject.spigot.InjectSpigot
3+
version: ${version}

0 commit comments

Comments
 (0)