mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-04 00:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

dont retain references to config packs

Browse Source
This commit is contained in:
dfsek 2021-12-28 23:22:19 -07:00
parent f07519565b
commit f6ee8a3a1d
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java
View File

@ -20,6 +20,9 @@ package com.dfsek.terra.fabric;
import ca.solostudios.strata.Versions; import ca.solostudios.strata.Versions;
import ca.solostudios.strata.version.Version; import ca.solostudios.strata.version.Version;
import com.dfsek.tectonic.api.exception.ConfigException; import com.dfsek.tectonic.api.exception.ConfigException;
import com.dfsek.terra.api.registry.key.RegistryKey;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -44,7 +47,6 @@ public final class FabricAddon implements BaseAddon {
private static final Version VERSION = Versions.getVersion(1, 0, 0); private static final Version VERSION = Versions.getVersion(1, 0, 0);
private static final Logger logger = LoggerFactory.getLogger(FabricAddon.class); private static final Logger logger = LoggerFactory.getLogger(FabricAddon.class);
private final PlatformImpl terraFabricPlugin; private final PlatformImpl terraFabricPlugin;
private final Map<ConfigPack, Mutable<PreLoadCompatibilityOptions, PostLoadCompatibilityOptions>> templates = new HashMap<>();
public FabricAddon(PlatformImpl terraFabricPlugin) { public FabricAddon(PlatformImpl terraFabricPlugin) {
this.terraFabricPlugin = terraFabricPlugin; this.terraFabricPlugin = terraFabricPlugin;
@ -57,8 +59,7 @@ public final class FabricAddon implements BaseAddon {
.register(this, ConfigPackPreLoadEvent.class) .register(this, ConfigPackPreLoadEvent.class)
.then(event -> { .then(event -> {
try { try {
PreLoadCompatibilityOptions template = event.loadTemplate(new PreLoadCompatibilityOptions()); event.getPack().getContext().put(event.loadTemplate(new PreLoadCompatibilityOptions()));
templates.put(event.getPack(), Mutable.of(template, null));
} catch(ConfigException e) { } catch(ConfigException e) {
logger.error("Error loading config template", e); logger.error("Error loading config template", e);
} }
@ -70,7 +71,7 @@ public final class FabricAddon implements BaseAddon {
.register(this, ConfigPackPostLoadEvent.class) .register(this, ConfigPackPostLoadEvent.class)
.then(event -> { .then(event -> {
try { try {
templates.get(event.getPack()).setRight(event.loadTemplate(new PostLoadCompatibilityOptions())); event.getPack().getContext().put(event.loadTemplate(new PostLoadCompatibilityOptions()));
} catch(ConfigException e) { } catch(ConfigException e) {
logger.error("Error loading config template", e); logger.error("Error loading config template", e);
} }
@ -99,11 +100,6 @@ public final class FabricAddon implements BaseAddon {
return VERSION; return VERSION;
} }
public Map<ConfigPack, Mutable<PreLoadCompatibilityOptions, PostLoadCompatibilityOptions>> getTemplates() {
return templates;
}
@Override @Override
public String getID() { public String getID() {
return "terra-fabric"; return "terra-fabric";