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

Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Browse Source 
Conflicts:
	src/main/scala/li/cil/oc/OpenComputers.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
This commit is contained in:
Florian Nücke 2014-09-14 01:47:43 +02:00
commit a3394d24bb
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml Normal file
View File

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

2
build.gradle
View File

@ -86,8 +86,6 @@ minecraft {
replaceIn "li/cil/oc/OpenComputers.scala" replaceIn "li/cil/oc/OpenComputers.scala"
replace "@VERSION@", project.simpleVersion replace "@VERSION@", project.simpleVersion
if (project.hasProperty("keystore_fingerprint"))
replace "@FINGERPRINT@", keystore_fingerprint
} }
processResources { processResources {

0
gradlew vendored Normal file → Executable file
View File

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

@ -13,7 +13,7 @@ import org.apache.logging.log4j.LogManager
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)
object OpenComputers { object OpenComputers {
final val ID = "OpenComputers" final val ID = "OpenComputers"
@ -22,8 +22,6 @@ object OpenComputers {
final val Version = "@VERSION@" final val Version = "@VERSION@"
final val Fingerprint = "@FINGERPRINT@"
var log = LogManager.getLogger("OpenComputers") var log = LogManager.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")
@ -31,11 +29,6 @@ object OpenComputers {
var channel: FMLEventChannel = _ var channel: FMLEventChannel = _
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

@ -97,10 +97,6 @@ object EventHandler {
if (!Settings.get.pureIgnorePower && Settings.get.ignorePower) { if (!Settings.get.pureIgnorePower && Settings.get.ignorePower) {
player.addChatMessage(Localization.Chat.WarningPower) player.addChatMessage(Localization.Chat.WarningPower)
} }
OpenComputers.tampered match {
case Some(event) => player.addChatMessage(Localization.Chat.WarningFingerprint(event))
case _ =>
}
ServerPacketSender.sendPetVisibility(None, Some(player)) ServerPacketSender.sendPetVisibility(None, Some(player))
// Do update check in local games and for OPs. // Do update check in local games and for OPs.
if (!Mods.VersionChecker.isAvailable && (!MinecraftServer.getServer.isDedicatedServer || MinecraftServer.getServer.getConfigurationManager.func_152596_g(player.getGameProfile))) { if (!Mods.VersionChecker.isAvailable && (!MinecraftServer.getServer.isDedicatedServer || MinecraftServer.getServer.getConfigurationManager.func_152596_g(player.getGameProfile))) {