mirrors/Terra
1
0 Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-10-25 13:30:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

update ConfigPack#getVersion to use Strata version

Browse Source
This commit is contained in:
dfsek committed 2021-12-16 22:52:36 -07:00
1 parent 8773c414c5
commit bcdfb42fa1
4 files changed
+8 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java
+2 -1
View File
@@ -7,6 +7,7 @@
package com.dfsek.terra.api.config; package com.dfsek.terra.api.config;
import ca.solostudios.strata.version.Version;
import ca.solostudios.strata.version.VersionRange; import ca.solostudios.strata.version.VersionRange;
import java.lang.reflect.Type; import java.lang.reflect.Type;
@@ -49,7 +50,7 @@ public interface ConfigPack extends LoaderRegistrar, LoaderHolder, RegistryHolde
String getAuthor(); String getAuthor();
String getVersion(); Version getVersion();
<T> ConfigPack registerShortcut(Type clazz, String shortcut, ShortcutLoader<T> loader); <T> ConfigPack registerShortcut(Type clazz, String shortcut, ShortcutLoader<T> loader);
common/implementation/base/src/main/java/com/dfsek/terra/commands/PacksCommand.java
+1 -1
View File
@@ -41,6 +41,6 @@ public class PacksCommand implements CommandTemplate {
sender.sendMessage("No packs installed"); sender.sendMessage("No packs installed");
return; return;
} }
registry.entries().forEach(configPack -> sender.sendMessage(" - " + configPack.getID() + "@" + configPack.getVersion())); registry.entries().forEach(configPack -> sender.sendMessage(" - " + configPack.getID() + "@" + configPack.getVersion().getFormatted()));
} }
} }
common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
+2 -1
View File
@@ -17,6 +17,7 @@
package com.dfsek.terra.config.pack; package com.dfsek.terra.config.pack;
import ca.solostudios.strata.version.Version;
import ca.solostudios.strata.version.VersionRange; import ca.solostudios.strata.version.VersionRange;
import com.dfsek.tectonic.api.TypeRegistry; import com.dfsek.tectonic.api.TypeRegistry;
import com.dfsek.tectonic.api.config.Configuration; import com.dfsek.tectonic.api.config.Configuration;
@@ -319,7 +320,7 @@ public class ConfigPackImpl implements ConfigPack {
} }
@Override @Override
public String getVersion() { public Version getVersion() {
return template.getVersion(); return template.getVersion();
} }
common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java
+3 -3
View File
@@ -17,6 +17,7 @@
package com.dfsek.terra.config.pack; package com.dfsek.terra.config.pack;
import ca.solostudios.strata.version.Version;
import com.dfsek.tectonic.api.config.template.ConfigTemplate; import com.dfsek.tectonic.api.config.template.ConfigTemplate;
import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Default;
import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.annotations.Value;
@@ -79,8 +80,7 @@ public class ConfigPackTemplate implements ConfigTemplate {
private @Meta List<@Meta GenerationStage> stages; private @Meta List<@Meta GenerationStage> stages;
@Value("version") @Value("version")
@Default private Version version;
private String version = "0.1.0";
@Value("disable.carvers") @Value("disable.carvers")
@Default @Default
@@ -153,7 +153,7 @@ public class ConfigPackTemplate implements ConfigTemplate {
return stages; return stages;
} }
public String getVersion() { public Version getVersion() {
return version; return version;
} }