Skip to content

Commit 8348971

Browse files
fix: plugin yml
1 parent 7cddcec commit 8348971

File tree

5 files changed

+9
-41
lines changed

5 files changed

+9
-41
lines changed

playground/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@ plugin {
1515
enabled = true
1616
main = "studio.o7.playground.PlaygroundPlugin"
1717
apiVersion = ApiVersion.PAPER_1_21_8
18+
19+
libraries.addAll(listOf(
20+
"fastutil:fastutil:5.0.9"
21+
))
1822
}
Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package studio.o7.playground;
22

3+
import it.unimi.dsi.fastutil.objects.ObjectArraySet;
34
import lombok.extern.slf4j.Slf4j;
45
import org.bukkit.plugin.java.JavaPlugin;
56

@@ -8,28 +9,10 @@ public class PlaygroundPlugin extends JavaPlugin {
89

910
@Override
1011
public void onEnable() {
11-
if (true)
12-
getLogger().info("hey");
12+
var set = new ObjectArraySet<>();
1313

14-
try {
15-
getLogger().info("err");
16-
} catch (Exception _) {
17-
getSLF4JLogger().error("Error");
18-
}
14+
set.add("test");
1915

20-
String[] x = {
21-
"test",
22-
"test"
23-
};
24-
25-
switch ("test") {
26-
case "hey" -> {
27-
getSLF4JLogger().error("Hey");
28-
}
29-
case "sdfgfg" -> getSLF4JLogger().error("test");
30-
default -> {
31-
getSLF4JLogger().error("ho");
32-
}
33-
}
16+
getLogger().info(set.toString());
3417
}
3518
}

src/main/java/studio/o7/remora/plugin/PaperPlugins.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,6 @@ public void configureProject(@NonNull Logger logger, @NonNull Project project) {
7878

7979
builder.main(pluginMain);
8080

81-
82-
// Set bootstrapper
83-
var pluginBootstrapper = extension.getBootstrapper().orElse("").get();
84-
if (!pluginBootstrapper.isBlank()) builder.bootstrapper(pluginBootstrapper);
85-
86-
87-
// Set loader
88-
var pluginLoader = extension.getLoader().orElse("").get();
89-
if (!pluginLoader.isBlank()) builder.loader(pluginLoader);
90-
91-
9281
// Set load
9382
var load = extension.getLoad().orElse(Load.POST_WORLD).get();
9483
builder.load(load.name().replace("_", ""));
@@ -123,7 +112,7 @@ public void configureProject(@NonNull Logger logger, @NonNull Project project) {
123112
var generateYaml = project.getTasks().register("generatePaperPluginYaml", task -> {
124113
task.getInputs().property("pluginConfig", hash);
125114

126-
var outputFile = outputDir.map(dir -> new File(dir.getAsFile(), "paper-plugin.yml"));
115+
var outputFile = outputDir.map(dir -> new File(dir.getAsFile(), "plugin.yml"));
127116
task.getOutputs().file(outputFile);
128117

129118
task.doLast(_ -> {

src/main/java/studio/o7/remora/plugin/PluginConfig.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ public final class PluginConfig {
2222
private final String name;
2323
private final String main;
2424
@Default private final String version = "0.0.0";
25-
@Default private final String bootstrapper = null;
26-
@Default private final String loader = null;
2725
@Default private final String description = "Build with o7studios Remora";
2826
@Default private final String website = null;
2927
@Default private final String apiVersion = ApiVersion.PAPER_1_21_8.getApiVersion();
@@ -41,8 +39,6 @@ public void writeYaml(OutputStream out) throws IOException {
4139
data.put("name", name);
4240
data.put("version", version);
4341
data.put("main", main);
44-
if (bootstrapper != null) data.put("bootstrapper", bootstrapper);
45-
if (loader != null) data.put("loader", loader);
4642
if (description != null) data.put("description", description);
4743
if (website != null) data.put("website", website);
4844
if (apiVersion != null) data.put("api-version", apiVersion);

src/main/java/studio/o7/remora/plugin/PluginExtension.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ public interface PluginExtension {
1313

1414
Property<@NotNull ApiVersion> getApiVersion();
1515

16-
Property<@Nullable String> getBootstrapper();
17-
18-
Property<@Nullable String> getLoader();
19-
2016
Property<@Nullable Load> getLoad();
2117

2218
ListProperty<@NotNull String> getLibraries();

0 commit comments

Comments
 (0)