convert Input to abstract class, interface was causing binary compatibility issues

Mumfrey
1 parent 91f621ae
Showing 6 changed files with 40 additions and 4 deletions
java/client/com/mumfrey/liteloader/client/Translator.java
java/client/com/mumfrey/liteloader/util/InputManager.java
java/common/com/mumfrey/liteloader/api/TranslationProvider.java
java/common/com/mumfrey/liteloader/core/LiteLoaderEventBroker.java
java/common/com/mumfrey/liteloader/core/PlayerEventState.java
java/common/com/mumfrey/liteloader/util/Input.java
@@ -16,4 +16,13 @@ public class Translator implements TranslationProvider
 		return I18n.format(key, args);
 	}
+	/* (non-Javadoc)
+	 * @see com.mumfrey.liteloader.api.TranslationProvider#translate(java.lang.String, java.lang.String, java.lang.Object[])
+	 */
+	@Override
+	public String translate(String locale, String key, Object... args)
+	{
+		// TODO doesn't currently honour the contract of TranslationProvider::translate, should return null if translation is missing
+		return I18n.format(key, args);
+	}
 }
@@ -37,7 +37,7 @@ import com.mumfrey.liteloader.util.jinput.ComponentRegistry;
  *
  * @author Adam Mummery-Smith
  */
-public final class InputManager implements Input
+public final class InputManager extends Input
 {
 	private GameEngine<?, ?> engine;
@@ -11,4 +11,9 @@ public interface TranslationProvider extends CustomisationProvider
 	 * Translate the supplied key or return NULL if the provider has no translation for the specified key
 	 */
 	public abstract String translate(String key, Object... args);
+	
+	/**
+	 * Translate the supplied key to the specified locale, or return NULL if the provider has no translation for this key
+	 */
+	public abstract String translate(String locale, String key, Object... args);
 }
@@ -469,10 +469,12 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
 	void onPlayerSettingsReceived(EntityPlayerMP player, C15PacketClientSettings packet)
 	{
-		this.getPlayerState(player).setTraceDistance(PrivateFields.viewDistance.get(packet));
+		PlayerEventState playerState = this.getPlayerState(player);
+		playerState.setTraceDistance(PrivateFields.viewDistance.get(packet));
+		playerState.setLocale(packet.getLang());
 	}
-	protected PlayerEventState getPlayerState(EntityPlayerMP player)
+	public PlayerEventState getPlayerState(EntityPlayerMP player)
 	{
 		PlayerEventState playerState = this.playerStates.get(player.getUniqueID());
 		if (playerState == null)
@@ -28,6 +28,8 @@ public class PlayerEventState implements IEventState
 	private boolean rightClick;
 	private MovingObjectPosition hit;
+	
+	private String locale = "en_US";
 	public PlayerEventState(EntityPlayerMP player, LiteLoaderEventBroker<?, ?> broker)
 	{
@@ -39,6 +41,24 @@ public class PlayerEventState implements IEventState
 	{
 		this.traceDistance = renderDistance * 16.0;
 	}
+	
+	public double getTraceDistance()
+	{
+		return this.traceDistance;
+	}
+
+	public void setLocale(String lang)
+	{
+		if (lang.matches("^[a-z]{2}_[A-Z]{2}$"))
+		{
+			this.locale = lang;
+		}
+	}
+
+	public String getLocale()
+	{
+		return this.locale;
+	}
 	public EntityPlayerMP getPlayer()
 	{
@@ -5,7 +5,7 @@ import net.minecraft.client.settings.KeyBinding;
 import com.mumfrey.liteloader.api.CoreProvider;
 import com.mumfrey.liteloader.util.jinput.ComponentRegistry;
-public interface Input extends CoreProvider
+public abstract class Input implements CoreProvider
 {
 	/**
 	 * Register a key for a mod