GH-424 Update example. Fix also legacy simple schematic generator. (#424

)
Rollczi · Sep 8, 2024 · 0990398 · 0990398
1 parent c20b5c0
commit 0990398
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/examples/bukkit/build.gradle.kts b/examples/bukkit/build.gradle.kts
@@ -31,17 +31,22 @@ bukkit {
     version = "${project.version}"
 }
 
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+}
+
 tasks.shadowJar {
     archiveFileName.set("$pluginName v${project.version}.jar")
 
     listOf(
         "panda.std",
-//        "dev.rollczi.litecommands",
+        "dev.rollczi.litecommands",
     ).forEach { relocate(it, "$packageName.libs.$it") }
 }
 
 tasks.withType<JavaCompile> {
     options.compilerArgs.add("-parameters")
+    options.release = 17
 }
 
 sourceSets.test {
@@ -51,5 +56,4 @@ sourceSets.test {
 
 tasks.runServer {
     minecraftVersion("1.21")
-    jvmArgs(listOf("-XX:+AllowEnhancedClassRedefinition"))
 }
diff --git a/litecommands-core/src/dev/rollczi/litecommands/schematic/SimpleSchematicGenerator.java b/litecommands-core/src/dev/rollczi/litecommands/schematic/SimpleSchematicGenerator.java
@@ -48,7 +48,7 @@ protected Stream<String> generateRaw(SchematicInput<SENDER> schematicInput) {
 
         Stream<String> routeScheme = generateRoute(schematicInput, schematicInput.getLastRoute(), base);
 
-        if (executor != null) {
+        if (executor != null && isVisible(schematicInput, executor)) {
             Stream<String> executorScheme = Stream.of(base + generateExecutor(schematicInput, executor));
             return Stream.concat(routeScheme, executorScheme);
         }