Skip to content

Commit bed19ac

Browse files
committed
Register converters directly from library.
1 parent b80829f commit bed19ac

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.byteskript</groupId>
88
<artifactId>byteskript</artifactId>
9-
<version>1.0.29</version>
9+
<version>1.0.30</version>
1010
<name>ByteSkript</name>
1111
<description>A compiled JVM implementation of the Skript language.</description>
1212

src/main/java/org/byteskript/skript/compiler/structure/MonitorTree.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ public class MonitorTree extends ProgrammaticSplitTree {
1919
private final MultiLabel end;
2020
public int slot;
2121
protected boolean closed;
22-
private boolean open;
23-
private Label top;
2422

2523
public MonitorTree(SectionMeta owner) {
2624
this.owner = owner;

src/main/java/org/byteskript/skript/runtime/Skript.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,10 @@ else if (t == 5 || t == 6) {
548548
""")
549549
@GenerateExample
550550
public boolean registerLibrary(Library library) {
551+
for (final Map.Entry<Converter.Data, Converter<?, ?>> entry : library.getConverters().entrySet()) {
552+
final Converter.Data data = entry.getKey();
553+
this.registerConverter((Class<Object>) data.from(), (Class<Object>) data.to(), (Converter<Object, Object>) entry.getValue());
554+
}
551555
return compiler.addLibrary(library);
552556
}
553557

@@ -556,6 +560,10 @@ public boolean registerLibrary(Library library) {
556560
""")
557561
@GenerateExample
558562
public boolean unregisterLibrary(Library library) {
563+
for (final Map.Entry<Converter.Data, Converter<?, ?>> entry : library.getConverters().entrySet()) {
564+
final Converter.Data data = entry.getKey();
565+
this.unregisterConverter(data.from(), data.to());
566+
}
559567
return compiler.removeLibrary(library);
560568
}
561569

src/main/java/org/byteskript/skript/runtime/internal/ConsoleColour.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public enum ConsoleColour {
3030

3131
@Override
3232
public String toString() {
33+
if ("true".equals(System.getProperty("byteskript.no_colours"))) return "";
3334
if (System.console() == null || System.getenv().get("TERM") != null) {
3435
return code;
3536
} else {

0 commit comments

Comments
 (0)