diff --git a/.gitignore b/.gitignore index 1b3e1bae..abec899b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,34 +1,260 @@ -# Eclipse -/.classpath -/.project -/.settings -/*.jardesc +#################### Misc #################### +# Home made stuff not present in the gitignore project. +# Manually forged MassiveCraft stuff. -# IntelliJ +# Eclipse jar description files +*.jardesc + +# IntelliJ missing files *.iml *.ipr + +# Just because we had it in our old gitignore. +manifest.mf + +#################### Language #################### +# Language general ignores. + +### Maven +# https://github.com/github/gitignore/blob/master/Maven.gitignore +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties + +#################### IDE #################### +# IDE general ignores. + +### Eclipse +# https://github.com/github/gitignore/blob/master/Global/Eclipse.gitignore + +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +# Eclipse Core +.project + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +### JetBrains +# https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff: +.idea/workspace.xml +.idea/tasks.xml +.idea/dictionaries +.idea/vcs.xml +.idea/jsLibraryMappings.xml + +# Sensitive or high-churn files: +.idea/dataSources.ids +.idea/dataSources.xml +.idea/dataSources.local.xml +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml + +# Gradle: +.idea/gradle.xml +.idea/libraries + +# Mongo Explorer plugin: +.idea/mongoSettings.xml + +## File-based project format: *.iws -.idea/ -# NetBeans -/nbproject +## Plugin-specific files: -# vim -.*.sw[a-p] +# IntelliJ +/out/ -# Maven -/build.xml -/target -/dependency-reduced-pom.xml +# mpeltonen/sbt-idea plugin +.idea_modules/ -# various other potential build files -/build -/bin -/dist -/manifest.mf +# JIRA plugin +atlassian-ide-plugin.xml -# Mac Filesystem Dust -.DS_Store +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties -# Windows Filesystem Dust +### NetBeans +# https://github.com/github/gitignore/blob/master/Global/NetBeans.gitignore +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ + +### SublimeText +# https://github.com/github/gitignore/blob/master/Global/SublimeText.gitignore +# cache files for sublime text +*.tmlanguage.cache +*.tmPreferences.cache +*.stTheme.cache + +# workspace files are user-specific +*.sublime-workspace + +# project files should be checked into the repository, unless a significant +# proportion of contributors will probably not be using SublimeText +# *.sublime-project + +# sftp configuration file +sftp-config.json + +# Package control specific files +Package Control.last-run +Package Control.ca-list +Package Control.ca-bundle +Package Control.system-ca-bundle +Package Control.cache/ +Package Control.ca-certs/ +bh_unicode_properties.cache + +# Sublime-github package stores a github token in this file +# https://packagecontrol.io/packages/sublime-github +GitHub.sublime-settings + +### Vim +# https://github.com/github/gitignore/blob/master/Global/Vim.gitignore +# swap +[._]*.s[a-w][a-z] +[._]s[a-w][a-z] +# session +Session.vim +# temporary +.netrwhist +*~ +# auto-generated tag files +tags + +#################### OS #################### +# Operating system general ignores. + +### https://github.com/github/gitignore/blob/master/Global/macOS.gitignore + +*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### https://github.com/github/gitignore/blob/master/Global/Linux.gitignore + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +### https://github.com/github/gitignore/blob/master/Global/Windows.gitignore + +# Windows image file caches Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +#################### OTHER #################### +# Other general ignores. + +### Dropbox +# https://github.com/github/gitignore/blob/master/Global/Dropbox.gitignore +# Dropbox settings and caches +.dropbox +.dropbox.attr +.dropbox.cache diff --git a/README.md b/README.md index 55545a68..64329543 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -![Factions Logotype](https://raw.github.com/MassiveCraft/Factions/master/media/logo300.png)
+![Factions Logotype](https://www.massivecraft.com/wp-content/uploads/2011/07/massivecraft-logotype-plugin-factions-2000.jpg)
https://www.massivecraft.com/factions diff --git a/lib/HeroChat-5.6.7.jar b/lib/HeroChat-5.6.7.jar deleted file mode 100644 index eaf0abd1..00000000 Binary files a/lib/HeroChat-5.6.7.jar and /dev/null differ diff --git a/lib/LWC-4.4.0.jar b/lib/LWC-4.4.0.jar deleted file mode 100644 index ada1677f..00000000 Binary files a/lib/LWC-4.4.0.jar and /dev/null differ diff --git a/lib/Vault-1.5.2.jar b/lib/Vault-1.5.2.jar deleted file mode 100644 index 85adf982..00000000 Binary files a/lib/Vault-1.5.2.jar and /dev/null differ diff --git a/lib/WorldEdit-6.1.jar b/lib/WorldEdit-6.1.jar deleted file mode 100644 index 753c4f2e..00000000 Binary files a/lib/WorldEdit-6.1.jar and /dev/null differ diff --git a/lib/WorldGuard-6.1.jar b/lib/WorldGuard-6.1.jar deleted file mode 100644 index 7824963f..00000000 Binary files a/lib/WorldGuard-6.1.jar and /dev/null differ diff --git a/media/logo.png b/media/logo.png deleted file mode 100644 index 08853d25..00000000 Binary files a/media/logo.png and /dev/null differ diff --git a/media/logo300.png b/media/logo300.png deleted file mode 100644 index 3332c10e..00000000 Binary files a/media/logo300.png and /dev/null differ diff --git a/media/logo600.png b/media/logo600.png deleted file mode 100644 index 86b5ac7c..00000000 Binary files a/media/logo600.png and /dev/null differ diff --git a/media/spigot-resource.png b/media/spigot-resource.png deleted file mode 100644 index c31d94ea..00000000 Binary files a/media/spigot-resource.png and /dev/null differ diff --git a/plugin.yml b/plugin.yml index e9580530..6b2f6a9d 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,9 +1,9 @@ -main: com.massivecraft.factions.Factions -name: Factions -version: 2.8.21 -website: https://www.massivecraft.com/factions +main: ${project.groupId}.${project.name} +name: ${project.name} +version: ${project.version} +website: ${project.url} +description: ${project.description} authors: [Cayorion, Madus, Ulumulu1510, MarkehMe, Brettflan] -description: §eFactions allows the players to team up and claim land as their own and start wars with other factions. This way we hope to inspire politics, intrigue, and team spirit. §aCayorion §efrom the minecraft server §aMassiveCraft §eis the lead Factions programmer. Feel free to visit us at §bhttps://www.massivecraft.com depend: [MassiveCore] softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, AuthMe, Vault, Spout, WorldEdit, WorldGuard, AuthDB, CaptureThePoints, CombatTag] permissions: diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..b0d69fd5 --- /dev/null +++ b/pom.xml @@ -0,0 +1,81 @@ + + 4.0.0 + + + + com.massivecraft.massivesuper + MassiveSuper + 2.8.22-SNAPSHOT + ../MassiveSuper + + + + com.massivecraft.factions + Factions + jar + + + ${project.artifactId} + ${massiveColorInfo}${project.name} allows the players to team up and claim land as their own and start wars with other factions. This way we hope to inspire politics, intrigue, and team spirit. ${massiveDescriptionSuffix} + ${massiveBaseUrl}/factions + + + + + + org.spigotmc + spigot-api + + + + com.massivecraft.massivecore + MassiveCore + + + + com.sk89q.worldedit + worldedit-bukkit + + + + com.sk89q.worldguard + worldguard-legacy + + + + net.milkbowl.vault + Vault + + + + com.dthielke.herochat + Herochat + + + + com.griefcraft + lwc + + + + + + + + + + ${project.basedir} + true + + *.yml + + + + + ${project.build.sourceDirectory} + false + + + + + diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java index a8ea4fac..62b7f236 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java @@ -124,7 +124,7 @@ public class CmdFactionsJoin extends FactionsCommand // Apply mplayer.resetFactionData(); mplayer.setFaction(faction); - + faction.setInvited(mplayer, false); // Derplog diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRank.java b/src/com/massivecraft/factions/cmd/CmdFactionsRank.java index ebe2cf0b..f73fdce8 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsRank.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsRank.java @@ -261,7 +261,7 @@ public class CmdFactionsRank extends FactionsCommand } else { - // Derp is a member in Faction + // Derp is a member in Faction msg("%s %s %s %s %s %s.", targetName, isAre, theAan, rankName, ofIn, factionName); } } diff --git a/src/com/massivecraft/factions/engine/EngineExploit.java b/src/com/massivecraft/factions/engine/EngineExploit.java index fb27499f..637ff94c 100644 --- a/src/com/massivecraft/factions/engine/EngineExploit.java +++ b/src/com/massivecraft/factions/engine/EngineExploit.java @@ -74,7 +74,7 @@ public class EngineExploit extends Engine ((mat == Material.THIN_GLASS || mat == Material.IRON_FENCE) && clippingThrough(target, from, 0.65)) || ((mat == Material.FENCE || mat == Material.NETHER_FENCE) && clippingThrough(target, from, 0.45)) ) - { + { event.setTo(from); return; } diff --git a/src/com/massivecraft/factions/event/EventFactionsMembershipChange.java b/src/com/massivecraft/factions/event/EventFactionsMembershipChange.java index bb3b0c75..2675d14b 100644 --- a/src/com/massivecraft/factions/event/EventFactionsMembershipChange.java +++ b/src/com/massivecraft/factions/event/EventFactionsMembershipChange.java @@ -55,19 +55,19 @@ public class EventFactionsMembershipChange extends EventFactionsAbstractSender public enum MembershipChangeReason { // Join - JOIN (true), - CREATE (false), + JOIN (true), + CREATE (false), // Leader is not used, but temporarily kept to avoid other plugins crashing @Deprecated - LEADER (true), - RANK (true), + LEADER (true), + RANK (true), // Leave - LEAVE (true), + LEAVE (true), //JOINOTHER (true), - KICK (true), - DISBAND (false), - //RESET (false), + KICK (true), + DISBAND (false), + //RESET (false), ; private final boolean cancellable; diff --git a/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java index 49804bc7..0db3f5d5 100644 --- a/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java +++ b/src/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java @@ -93,7 +93,7 @@ public abstract class ChannelFactionsAbstract implements Channel } } - return true; + return true; } @Override