AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-08-03 19:17:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Florian Nücke 2014-09-14 01:46:37 +02:00
parent 1a2badf6eb
commit de192111d4
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -1,13 +1,11 @@
language: scala language: scala
scala: 2.11.1 scala: 2.11.1
jdk: jdk: openjdk7
- oraclejdk7
- openjdk7
branches:
only: master
notifications:
email: false
env: env:
global: TERM=dumb global: TERM=dumb
install: ./gradlew setupCIWorkspace install: ./gradlew setupCIWorkspace
script: ./gradlew build script: ./gradlew build

9
src/main/scala/li/cil/oc/OpenComputers.scala
View File

@ -16,7 +16,7 @@ import li.cil.oc.server.{CommandHandler, PacketHandler => ServerPacketHandler}
import scala.collection.convert.WrapAsScala._ import scala.collection.convert.WrapAsScala._
@Mod(modid = OpenComputers.ID, name = OpenComputers.Name, @Mod(modid = OpenComputers.ID, name = OpenComputers.Name,
version = OpenComputers.Version, /* certificateFingerprint = OpenComputers.Fingerprint, */ version = OpenComputers.Version,
modLanguage = "scala", useMetadata = true) modLanguage = "scala", useMetadata = true)
@NetworkMod(clientSideRequired = true, serverSideRequired = false, @NetworkMod(clientSideRequired = true, serverSideRequired = false,
clientPacketHandlerSpec = new SidedPacketHandler( clientPacketHandlerSpec = new SidedPacketHandler(
@ -30,18 +30,11 @@ object OpenComputers {
final val Version = "@VERSION@" final val Version = "@VERSION@"
final val Fingerprint = "@FINGERPRINT@"
var log = Logger.getLogger("OpenComputers") var log = Logger.getLogger("OpenComputers")
@SidedProxy(clientSide = "li.cil.oc.client.Proxy", serverSide = "li.cil.oc.server.Proxy") @SidedProxy(clientSide = "li.cil.oc.client.Proxy", serverSide = "li.cil.oc.server.Proxy")
var proxy: Proxy = null var proxy: Proxy = null
var tampered: Option[FMLFingerprintViolationEvent] = None
// @EventHandler
// def invalidFingerprint(e: FMLFingerprintViolationEvent) = tampered = Some(e)
@EventHandler @EventHandler
def preInit(e: FMLPreInitializationEvent) { def preInit(e: FMLPreInitializationEvent) {
proxy.preInit(e) proxy.preInit(e)

4
src/main/scala/li/cil/oc/common/EventHandler.scala
View File

@ -104,10 +104,6 @@ object EventHandler extends ITickHandler with IConnectionHandler with ICraftingH
if (!Settings.get.pureIgnorePower && Settings.get.ignorePower) { if (!Settings.get.pureIgnorePower && Settings.get.ignorePower) {
p.sendChatToPlayer(Localization.Chat.WarningPower) p.sendChatToPlayer(Localization.Chat.WarningPower)
} }
OpenComputers.tampered match {
case Some(event) => p.sendChatToPlayer(Localization.Chat.WarningFingerprint(event))
case _ =>
}
ServerPacketSender.sendPetVisibility(None, Some(p)) ServerPacketSender.sendPetVisibility(None, Some(p))
// Do update check in local games and for OPs. // Do update check in local games and for OPs.
if (!MinecraftServer.getServer.isDedicatedServer || MinecraftServer.getServer.getConfigurationManager.isPlayerOpped(p.getCommandSenderName)) { if (!MinecraftServer.getServer.isDedicatedServer || MinecraftServer.getServer.getConfigurationManager.isPlayerOpped(p.getCommandSenderName)) {