diff --git a/.travis.yml b/.travis.yml index 992ff97c3..be52b35a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,11 @@ language: scala scala: 2.11.1 -jdk: - - oraclejdk7 - - openjdk7 - -branches: - only: master +jdk: openjdk7 +notifications: + email: false env: global: TERM=dumb + install: ./gradlew setupCIWorkspace script: ./gradlew build \ No newline at end of file diff --git a/src/main/scala/li/cil/oc/OpenComputers.scala b/src/main/scala/li/cil/oc/OpenComputers.scala index 52767afff..a71bb7bde 100644 --- a/src/main/scala/li/cil/oc/OpenComputers.scala +++ b/src/main/scala/li/cil/oc/OpenComputers.scala @@ -16,7 +16,7 @@ import li.cil.oc.server.{CommandHandler, PacketHandler => ServerPacketHandler} import scala.collection.convert.WrapAsScala._ @Mod(modid = OpenComputers.ID, name = OpenComputers.Name, - version = OpenComputers.Version, /* certificateFingerprint = OpenComputers.Fingerprint, */ + version = OpenComputers.Version, modLanguage = "scala", useMetadata = true) @NetworkMod(clientSideRequired = true, serverSideRequired = false, clientPacketHandlerSpec = new SidedPacketHandler( @@ -30,18 +30,11 @@ object OpenComputers { final val Version = "@VERSION@" - final val Fingerprint = "@FINGERPRINT@" - var log = Logger.getLogger("OpenComputers") @SidedProxy(clientSide = "li.cil.oc.client.Proxy", serverSide = "li.cil.oc.server.Proxy") var proxy: Proxy = null - var tampered: Option[FMLFingerprintViolationEvent] = None - - // @EventHandler - // def invalidFingerprint(e: FMLFingerprintViolationEvent) = tampered = Some(e) - @EventHandler def preInit(e: FMLPreInitializationEvent) { proxy.preInit(e) diff --git a/src/main/scala/li/cil/oc/common/EventHandler.scala b/src/main/scala/li/cil/oc/common/EventHandler.scala index fc5f2a63f..9a823d6b7 100644 --- a/src/main/scala/li/cil/oc/common/EventHandler.scala +++ b/src/main/scala/li/cil/oc/common/EventHandler.scala @@ -104,10 +104,6 @@ object EventHandler extends ITickHandler with IConnectionHandler with ICraftingH if (!Settings.get.pureIgnorePower && Settings.get.ignorePower) { p.sendChatToPlayer(Localization.Chat.WarningPower) } - OpenComputers.tampered match { - case Some(event) => p.sendChatToPlayer(Localization.Chat.WarningFingerprint(event)) - case _ => - } ServerPacketSender.sendPetVisibility(None, Some(p)) // Do update check in local games and for OPs. if (!MinecraftServer.getServer.isDedicatedServer || MinecraftServer.getServer.getConfigurationManager.isPlayerOpped(p.getCommandSenderName)) {