X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=14c67af202677f024cc98d213fa7972640f2c24e;hb=4f209f3ef43d19ed071699723c9b69332754ebf6;hp=e76c6ef37c8eb6e16e9bba6c5d2719df3406fbde;hpb=b739f34bb13029472389137f4cb3632ddec6c57c;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index e76c6ef..14c67af 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,11 +114,8 @@ 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;
 
@@ -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,7 @@ 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()));
@@ -412,7 +402,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	 */
 	@Override
 	public String getVersion() {
-		return VERSION.toString();
+		return getPluginVersion();
 	}
 
 	public static class PluginVersion {