GeyserMC-Mirror/Thunder
1
0
Fork 0
mirror of https://github.com/GeyserMC/PackConverter.git synced 2026-01-03 14:12:17 +00:00
Code Issues Releases Activity

Split action listeners based on conversion data

Browse Source
This commit is contained in:
RednedEpic
2023-06-03 20:30:41 -05:00
parent e207218644
commit 27faec4fe9
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
converter/src/main/java/org/geysermc/pack/converter/PackConverter.java
View File

@@ -47,6 +47,7 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
@@ -54,7 +55,7 @@ public class PackConverter {
private Path input;
private Path output;
private final List<ActionListener<?>> actionListeners = new ArrayList<>();
private final Map<Class<?>, List<ActionListener<?>>> actionListeners = new IdentityHashMap<>();
@Getter
private final Map<String, Int2ObjectMap<String>> customModelData = new HashMap<>();
@@ -96,13 +97,16 @@ public class PackConverter {
return this;
}
public PackConverter actionListeners(@NotNull ActionListener<?>... actionListeners) {
this.actionListeners.addAll(List.of(actionListeners));
public <T extends ConversionData> PackConverter actionListeners(@NotNull Class<T> clazz, @NotNull ActionListener<T>... actionListeners) {
this.actionListeners.put(clazz, List.of(actionListeners));
return this;
}
public PackConverter actionListeners(@NotNull List<ActionListener<?>> actionListeners) {
this.actionListeners.addAll(actionListeners);
public <T extends ConversionData> PackConverter actionListeners(@NotNull Map<Class<T>, List<ActionListener<T>>> actionListeners) {
for (Map.Entry<Class<T>, List<ActionListener<T>>> entry : actionListeners.entrySet()) {
this.actionListeners.put(entry.getKey(), (List) entry.getValue());
}
return this;
}
@@ -138,10 +142,11 @@ public class PackConverter {
ConversionData data = converter.createConversionData(this, input, this.tmpDir);
PackConversionContext<?> context = new PackConversionContext<>(data, this, javaResourcePack, bedrockResourcePack, this.logListener);
List<ActionListener<?>> actionListeners = this.actionListeners.getOrDefault(data.getClass(), List.of());
try {
this.actionListeners.forEach(actionListener -> actionListener.preConvert((PackConversionContext) context));
actionListeners.forEach(actionListener -> actionListener.preConvert((PackConversionContext) context));
converter.convert(context);
this.actionListeners.forEach(actionListener -> actionListener.postConvert((PackConversionContext) context));
actionListeners.forEach(actionListener -> actionListener.postConvert((PackConversionContext) context));
} catch (Throwable t) {
this.logListener.error("Error converting pack!", t);
errors++;