mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-08-03 19:17:27 -04:00
Cleanup.
This commit is contained in:
parent
1a2badf6eb
commit
de192111d4
10
.travis.yml
10
.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
|
@ -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)
|
||||
|
@ -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)) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user