X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=c1628eb8d7b56df7b53d177a4b93a548d32b4669;hp=61bd6ce455654d8ba4e3dcbcc5c8e5534a1f19c1;hb=e347c497255e7f5911039e4a3273aa2a367e6805;hpb=66313c70788a32a0940d3c22e70853906bbb427d

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 61bd6ce..c1628eb 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -54,7 +54,6 @@ import com.google.inject.spi.TypeListener;
 import freenet.client.async.PersistenceDisabledException;
 import freenet.l10n.BaseL10n.LANGUAGE;
 import freenet.l10n.PluginL10n;
-import freenet.node.Node;
 import freenet.pluginmanager.FredPlugin;
 import freenet.pluginmanager.FredPluginBaseL10n;
 import freenet.pluginmanager.FredPluginFCP;
@@ -115,13 +114,10 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 		});
 	}
 
-	/** The version. */
-	private static final Version VERSION = new Version(0, 9, 6);
-
 	/** The current year at time of release. */
-	private static final int YEAR = 2016;
+	private static final int YEAR = 2017;
 	private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
-	private static final int LATEST_EDITION = 73;
+	private static final int LATEST_EDITION = 76;
 
 	/** The logger. */
 	private static final Logger logger = getLogger(SonePlugin.class.getName());
@@ -176,7 +172,8 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	}
 
 	public static String getPluginVersion() {
-		return VERSION.toString();
+		net.pterodactylus.sone.main.Version version = VersionParserKt.getParsedVersion();
+		return (version == null) ? "unknown" : version.getNice();
 	}
 
 	public static int getYear() {
@@ -238,15 +235,8 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 		final EventBus eventBus = new EventBus();
 
 		/* Freenet injector configuration. */
-		AbstractModule freenetModule = new AbstractModule() {
+		FreenetModule freenetModule =  new FreenetModule(pluginRespirator);
 
-			@Override
-			@SuppressWarnings("synthetic-access")
-			protected void configure() {
-				bind(PluginRespirator.class).toInstance(SonePlugin.this.pluginRespirator);
-				bind(Node.class).toInstance(SonePlugin.this.pluginRespirator.getNode());
-			}
-		};
 		/* Sone injector configuration. */
 		AbstractModule soneModule = new AbstractModule() {
 
@@ -258,7 +248,10 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 				bind(Context.class).toInstance(context);
 				bind(getOptionalContextTypeLiteral()).toInstance(of(context));
 				bind(SonePlugin.class).toInstance(SonePlugin.this);
-				bind(Version.class).toInstance(VERSION);
+				bind(Version.class).toInstance(Version.parse(getVersion()));
+				bind(PluginVersion.class).toInstance(new PluginVersion(getVersion()));
+				bind(PluginYear.class).toInstance(new PluginYear(getYear()));
+				bind(PluginHomepage.class).toInstance(new PluginHomepage(getHomepage()));
 				if (startConfiguration.getBooleanValue("Developer.LoadFromFilesystem").getValue(false)) {
 					String path = startConfiguration.getStringValue("Developer.FilesystemPath").getValue(null);
 					if (path != null) {
@@ -409,7 +402,49 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	 */
 	@Override
 	public String getVersion() {
-		return VERSION.toString();
+		return getPluginVersion();
+	}
+
+	public static class PluginVersion {
+
+		private final String version;
+
+		public PluginVersion(String version) {
+			this.version = version;
+		}
+
+		public String getVersion() {
+			return version;
+		}
+
+	}
+
+	public static class PluginYear {
+
+		private final int year;
+
+		public PluginYear(int year) {
+			this.year = year;
+		}
+
+		public int getYear() {
+			return year;
+		}
+
+	}
+
+	public static class PluginHomepage {
+
+		private final String homepage;
+
+		public PluginHomepage(String homepage) {
+			this.homepage = homepage;
+		}
+
+		public String getHomepage() {
+			return homepage;
+		}
+
 	}
 
 }