diff --git a/.gitignore b/.gitignore index 6fa8deb6..abec899b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,31 +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 + +### 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 0b1f8bd1..ad2f4612 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -![MassiveCore Logotype](https://raw.github.com/MassiveCraft/MassiveCore/master/media/logo300.png)
+![MassiveCore Logotype](https://www.massivecraft.com/wp-content/uploads/2012/11/massivecraft-logotype-plugin-massivecore-2000.jpg)
https://www.massivecraft.com/massivecore 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/media/logo.png b/media/logo.png deleted file mode 100644 index 9d7f428e..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 737f6888..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 9d7f428e..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 bf323f52..00000000 Binary files a/media/spigot-resource.png and /dev/null differ diff --git a/plugin.yml b/plugin.yml index e3fdef0c..5e18afe9 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,9 +1,9 @@ -main: com.massivecraft.massivecore.MassiveCore -name: MassiveCore -version: 2.8.21 -website: https://www.massivecraft.com/massivecore +main: ${project.groupId}.${project.name} +name: ${project.name} +version: ${project.version} +website: ${project.url} +description: ${project.description} authors: [Cayorion] -description: §eMassiveCore is a plugin that contains libraries and features that other plugins make use of. §aCayorion §efrom the minecraft server §aMassiveCraft §eis the lead programmer. Feel free to visit us at §bhttps://www.massivecraft.com load: startup permissions: # -------------------------------------------- # diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..014ea4a5 --- /dev/null +++ b/pom.xml @@ -0,0 +1,56 @@ + + 4.0.0 + + + + com.massivecraft.massivesuper + MassiveSuper + 2.8.22-SNAPSHOT + ../MassiveSuper + + + + com.massivecraft.massivecore + MassiveCore + jar + + + ${project.artifactId} + ${massiveColorInfo}${project.name} is a plugin that contains libraries and features that other plugins make use of. ${massiveDescriptionSuffix} + ${massiveBaseUrl}/massivecore + + + + + + org.spigotmc + spigot-api + + + + net.milkbowl.vault + Vault + + + + + + + + + + ${project.basedir} + true + + *.yml + + + + + ${project.build.sourceDirectory} + false + + + + + diff --git a/src/com/massivecraft/massivecore/ConfServer.java b/src/com/massivecraft/massivecore/ConfServer.java index 2f5d5806..4d1f659a 100644 --- a/src/com/massivecraft/massivecore/ConfServer.java +++ b/src/com/massivecraft/massivecore/ConfServer.java @@ -25,8 +25,8 @@ public class ConfServer extends SimpleConfig public static Map alias2uri = MUtil.map( "default", "flatfile", - "flatfile", "flatfile://mstore", - "mongodb", "mongodb://localhost:27017/mstore" + "flatfile", "flatfile://mstore", + "mongodb", "mongodb://localhost:27017/mstore" ); } diff --git a/src/com/massivecraft/massivecore/MassiveCore.java b/src/com/massivecraft/massivecore/MassiveCore.java index f5d02490..6f461f2e 100644 --- a/src/com/massivecraft/massivecore/MassiveCore.java +++ b/src/com/massivecraft/massivecore/MassiveCore.java @@ -7,6 +7,7 @@ import java.util.Random; import java.util.Set; import java.util.UUID; +import com.massivecraft.massivecore.mixin.*; import org.bukkit.Bukkit; import org.bukkit.Sound; import org.bukkit.inventory.Inventory; @@ -66,22 +67,6 @@ import com.massivecraft.massivecore.engine.EngineMassiveCoreWorldNameSet; import com.massivecraft.massivecore.integration.vault.IntegrationVault; import com.massivecraft.massivecore.item.DataBannerPattern; import com.massivecraft.massivecore.item.WriterItemStack; -import com.massivecraft.massivecore.mixin.MixinActionbar; -import com.massivecraft.massivecore.mixin.MixinActual; -import com.massivecraft.massivecore.mixin.MixinCommand; -import com.massivecraft.massivecore.mixin.MixinDisplayName; -import com.massivecraft.massivecore.mixin.MixinEvent; -import com.massivecraft.massivecore.mixin.MixinGamemode; -import com.massivecraft.massivecore.mixin.MixinInventory; -import com.massivecraft.massivecore.mixin.MixinKick; -import com.massivecraft.massivecore.mixin.MixinMessage; -import com.massivecraft.massivecore.mixin.MixinModification; -import com.massivecraft.massivecore.mixin.MixinPlayed; -import com.massivecraft.massivecore.mixin.MixinSenderPs; -import com.massivecraft.massivecore.mixin.MixinTeleport; -import com.massivecraft.massivecore.mixin.MixinTitle; -import com.massivecraft.massivecore.mixin.MixinVisibility; -import com.massivecraft.massivecore.mixin.MixinWorld; import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.mson.MsonEvent; import com.massivecraft.massivecore.nms.NmsBasics; @@ -315,6 +300,7 @@ public class MassiveCore extends MassivePlugin MixinGamemode.class, MixinInventory.class, MixinKick.class, + MixinMassiveCraftPremium.class, MixinMessage.class, MixinModification.class, MixinPlayed.class, diff --git a/src/com/massivecraft/massivecore/collections/MassiveMap.java b/src/com/massivecraft/massivecore/collections/MassiveMap.java index 58f8a5ed..05ef2f9e 100644 --- a/src/com/massivecraft/massivecore/collections/MassiveMap.java +++ b/src/com/massivecraft/massivecore/collections/MassiveMap.java @@ -23,17 +23,17 @@ public class MassiveMap extends LinkedHashMap public MassiveMap(int initialCapacity, float loadFactor) { - super(initialCapacity, loadFactor); + super(initialCapacity, loadFactor); } public MassiveMap(int initialCapacity) { - super(initialCapacity); + super(initialCapacity); } public MassiveMap() { - super(); + super(); } @SuppressWarnings("unchecked") @@ -45,7 +45,7 @@ public class MassiveMap extends LinkedHashMap public MassiveMap(int initialCapacity, float loadFactor, boolean accessOrder) { - super(initialCapacity, loadFactor, accessOrder); + super(initialCapacity, loadFactor, accessOrder); } // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/collections/MassiveMapDef.java b/src/com/massivecraft/massivecore/collections/MassiveMapDef.java index 29f50286..9a005e2f 100644 --- a/src/com/massivecraft/massivecore/collections/MassiveMapDef.java +++ b/src/com/massivecraft/massivecore/collections/MassiveMapDef.java @@ -20,17 +20,17 @@ public class MassiveMapDef extends MassiveMap implements Def public MassiveMapDef(int initialCapacity, float loadFactor) { - super(initialCapacity, loadFactor); + super(initialCapacity, loadFactor); } public MassiveMapDef(int initialCapacity) { - super(initialCapacity); + super(initialCapacity); } public MassiveMapDef() { - super(); + super(); } public MassiveMapDef(Map m) @@ -40,7 +40,7 @@ public class MassiveMapDef extends MassiveMap implements Def public MassiveMapDef(int initialCapacity, float loadFactor, boolean accessOrder) { - super(initialCapacity, loadFactor, accessOrder); + super(initialCapacity, loadFactor, accessOrder); } public MassiveMapDef(K key1, V value1, Object... objects) diff --git a/src/com/massivecraft/massivecore/command/MassiveCommandHelp.java b/src/com/massivecraft/massivecore/command/MassiveCommandHelp.java index 28607cb9..eb8edeb1 100644 --- a/src/com/massivecraft/massivecore/command/MassiveCommandHelp.java +++ b/src/com/massivecraft/massivecore/command/MassiveCommandHelp.java @@ -16,10 +16,10 @@ public class MassiveCommandHelp extends MassiveCommand // -------------------------------------------- // // INSTANCE & CONSTRUCT // -------------------------------------------- // - + protected static MassiveCommandHelp i = new MassiveCommandHelp(); public static MassiveCommandHelp get() { return i; } - public MassiveCommandHelp() + public MassiveCommandHelp() { // Aliases this.addAliases("?", "h", "help"); @@ -67,13 +67,13 @@ public class MassiveCommandHelp extends MassiveCommand { boolean visible = super.isVisibleTo(sender); if ( ! (this.hasParent() && visible)) return visible; - + int visibleSiblingCount = 0; for (MassiveCommand sibling : this.getParent().getChildren()) { if (sibling instanceof MassiveCommandHelp) continue; if (sibling.isVisibleTo(sender)) visibleSiblingCount++; - } + } int pageHeight = (sender instanceof Player) ? Txt.PAGEHEIGHT_PLAYER : Txt.PAGEHEIGHT_CONSOLE; return visibleSiblingCount > pageHeight; diff --git a/src/com/massivecraft/massivecore/command/type/TypeAbstractSelect.java b/src/com/massivecraft/massivecore/command/type/TypeAbstractSelect.java index b92fbd6a..c6f55f13 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeAbstractSelect.java +++ b/src/com/massivecraft/massivecore/command/type/TypeAbstractSelect.java @@ -24,7 +24,7 @@ public abstract class TypeAbstractSelect extends TypeAbstract implements A // ABSTRACT // -------------------------------------------- // - public abstract T select(String str, CommandSender sender) throws MassiveException; + public abstract T select(String str, CommandSender sender) throws MassiveException; public boolean canList(CommandSender sender) { return true; } @@ -44,7 +44,7 @@ public abstract class TypeAbstractSelect extends TypeAbstract implements A @Override public T read(String arg, CommandSender sender) throws MassiveException { - T result = this.select(arg, sender); + T result = this.select(arg, sender); if (result != null) return result; MassiveException exception = createExceptionForInvalidArg(arg, sender); diff --git a/src/com/massivecraft/massivecore/command/type/container/TypeList.java b/src/com/massivecraft/massivecore/command/type/container/TypeList.java index 0ab1805f..b65ea462 100644 --- a/src/com/massivecraft/massivecore/command/type/container/TypeList.java +++ b/src/com/massivecraft/massivecore/command/type/container/TypeList.java @@ -4,8 +4,8 @@ import java.util.List; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.type.Type; - -public class TypeList extends TypeContainer, E> + +public class TypeList extends TypeContainer, E> { // -------------------------------------------- // // INSTANCE & CONSTRUCT @@ -30,5 +30,5 @@ public class TypeList extends TypeContainer, E> { return new MassiveList(); } - + } diff --git a/src/com/massivecraft/massivecore/command/type/container/TypeSet.java b/src/com/massivecraft/massivecore/command/type/container/TypeSet.java index e72334d5..a9da7ee5 100644 --- a/src/com/massivecraft/massivecore/command/type/container/TypeSet.java +++ b/src/com/massivecraft/massivecore/command/type/container/TypeSet.java @@ -4,8 +4,8 @@ import java.util.Set; import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.command.type.Type; - -public class TypeSet extends TypeContainer, E> + +public class TypeSet extends TypeContainer, E> { // -------------------------------------------- // // INSTANCE & CONSTRUCT diff --git a/src/com/massivecraft/massivecore/command/type/primitive/TypeString.java b/src/com/massivecraft/massivecore/command/type/primitive/TypeString.java index 548643ed..526c1627 100644 --- a/src/com/massivecraft/massivecore/command/type/primitive/TypeString.java +++ b/src/com/massivecraft/massivecore/command/type/primitive/TypeString.java @@ -1,5 +1,5 @@ package com.massivecraft.massivecore.command.type.primitive; - + import java.util.Collection; import java.util.Collections; @@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender; import com.massivecraft.massivecore.command.type.TypeAbstract; -public class TypeString extends TypeAbstract +public class TypeString extends TypeAbstract { // -------------------------------------------- // // INSTANCE & CONSTRUCT diff --git a/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java b/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java index bf932bc5..5faed104 100644 --- a/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java +++ b/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java @@ -116,8 +116,8 @@ public abstract class TypeSenderIdAbstract extends TypeAbstract if (ret == null) { - // No alternatives found - throw new MassiveException().addMessage(this.getErrorMessageForArg(arg)); + // No alternatives found + throw new MassiveException().addMessage(this.getErrorMessageForArg(arg)); } // Return Ret diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreGank.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreGank.java index 838daa9f..7da4a512 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreGank.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreGank.java @@ -92,8 +92,8 @@ public class EngineMassiveCoreGank extends Engine // -------------------------------------------- // @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onEntityDamage(EntityDamageByEntityEvent event) - { + public void onEntityDamage(EntityDamageByEntityEvent event) + { // If an entity ... Entity entity = event.getEntity(); @@ -123,6 +123,6 @@ public class EngineMassiveCoreGank extends Engine // ... and set. playerDamages.put(player, playerDamage); - } + } } diff --git a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreSponsor.java b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreSponsor.java index d95577af..4884655e 100644 --- a/src/com/massivecraft/massivecore/engine/EngineMassiveCoreSponsor.java +++ b/src/com/massivecraft/massivecore/engine/EngineMassiveCoreSponsor.java @@ -159,10 +159,10 @@ public class EngineMassiveCoreSponsor extends Engine // -------------------------------------------- // @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onPlayerJoin(PlayerJoinEvent event) - { + public void onPlayerJoin(PlayerJoinEvent event) + { Player player = event.getPlayer(); this.inform(player); - } + } } diff --git a/src/com/massivecraft/massivecore/mixin/MixinMassiveCraftPremium.java b/src/com/massivecraft/massivecore/mixin/MixinMassiveCraftPremium.java new file mode 100644 index 00000000..c2510dc9 --- /dev/null +++ b/src/com/massivecraft/massivecore/mixin/MixinMassiveCraftPremium.java @@ -0,0 +1,22 @@ +package com.massivecraft.massivecore.mixin; + +public class MixinMassiveCraftPremium extends Mixin +{ + // -------------------------------------------- // + // INSTANCE & CONSTRUCT + // -------------------------------------------- // + + private static MixinMassiveCraftPremium d = new MixinMassiveCraftPremium(); + private static MixinMassiveCraftPremium i = d; + public static MixinMassiveCraftPremium get() { return i; } + + // -------------------------------------------- // + // METHODS + // -------------------------------------------- // + + public boolean isPremium(Object senderObject) + { + return false; + } + +} diff --git a/src/com/massivecraft/massivecore/predicate/PredicateElementGarbage.java b/src/com/massivecraft/massivecore/predicate/PredicateElementGarbage.java index 336bee28..1d3b07d8 100644 --- a/src/com/massivecraft/massivecore/predicate/PredicateElementGarbage.java +++ b/src/com/massivecraft/massivecore/predicate/PredicateElementGarbage.java @@ -5,8 +5,8 @@ import java.util.regex.Pattern; public class PredicateElementGarbage extends PredicateElementRegexes { // -------------------------------------------- // - // INSTANCE & CONSTRUCT - // -------------------------------------------- // + // INSTANCE & CONSTRUCT + // -------------------------------------------- // private static PredicateElementGarbage i = new PredicateElementGarbage(); public static PredicateElementGarbage get() { return i; } diff --git a/src/com/massivecraft/massivecore/predicate/PredicateElementRegexes.java b/src/com/massivecraft/massivecore/predicate/PredicateElementRegexes.java index b8a4a63d..fa295650 100644 --- a/src/com/massivecraft/massivecore/predicate/PredicateElementRegexes.java +++ b/src/com/massivecraft/massivecore/predicate/PredicateElementRegexes.java @@ -11,8 +11,8 @@ import com.massivecraft.massivecore.collections.MassiveList; public class PredicateElementRegexes implements Predicate { // -------------------------------------------- // - // FIELDS - // -------------------------------------------- // + // FIELDS + // -------------------------------------------- // private List patterns = Collections.emptyList(); public List getPatterns() { return this.patterns; } @@ -20,8 +20,8 @@ public class PredicateElementRegexes implements Predicate public void setPatterns(Iterable regexes) { this.setPatterns(asPatterns(regexes));} // -------------------------------------------- // - // CONSTRUCT - // -------------------------------------------- // + // CONSTRUCT + // -------------------------------------------- // public PredicateElementRegexes(String... regexes) { @@ -29,8 +29,8 @@ public class PredicateElementRegexes implements Predicate } // -------------------------------------------- // - // OVERRIDE - // -------------------------------------------- // + // OVERRIDE + // -------------------------------------------- // @Override public boolean apply(StackTraceElement element) @@ -45,8 +45,8 @@ public class PredicateElementRegexes implements Predicate } // -------------------------------------------- // - // UTIL - // -------------------------------------------- // + // UTIL + // -------------------------------------------- // protected List asPatterns(Iterable regexes) { diff --git a/src/com/massivecraft/massivecore/predicate/PredicateElementSignificant.java b/src/com/massivecraft/massivecore/predicate/PredicateElementSignificant.java index f264757b..40999036 100644 --- a/src/com/massivecraft/massivecore/predicate/PredicateElementSignificant.java +++ b/src/com/massivecraft/massivecore/predicate/PredicateElementSignificant.java @@ -5,8 +5,8 @@ import java.util.regex.Pattern; public class PredicateElementSignificant extends PredicateElementRegexes { // -------------------------------------------- // - // INSTANCE & CONSTRUCT - // -------------------------------------------- // + // INSTANCE & CONSTRUCT + // -------------------------------------------- // private static PredicateElementSignificant i = new PredicateElementSignificant(); public static PredicateElementSignificant get() { return i; } diff --git a/src/com/massivecraft/massivecore/store/Coll.java b/src/com/massivecraft/massivecore/store/Coll.java index 68acd534..e665bbf4 100644 --- a/src/com/massivecraft/massivecore/store/Coll.java +++ b/src/com/massivecraft/massivecore/store/Coll.java @@ -1135,5 +1135,5 @@ public class Coll> extends CollAbstract { return this.getByName(str) != null; } - + } diff --git a/src/com/massivecraft/massivecore/util/MUtil.java b/src/com/massivecraft/massivecore/util/MUtil.java index f188199b..478a1b03 100644 --- a/src/com/massivecraft/massivecore/util/MUtil.java +++ b/src/com/massivecraft/massivecore/util/MUtil.java @@ -347,11 +347,11 @@ public class MUtil String ret = address.toString(); String[] parts = ret.split("/"); - - ret = parts[1]; - parts = ret.split(":"); - - ret = parts[0]; + + ret = parts[1]; + parts = ret.split(":"); + + ret = parts[0]; return ret; } @@ -367,8 +367,8 @@ public class MUtil String ret = address.toString(); String[] parts = ret.split("/"); - - ret = parts[1]; + + ret = parts[1]; return ret; } @@ -1882,11 +1882,11 @@ public class MUtil public static double round(double value, int places) { - if (places < 0) throw new IllegalArgumentException(); + if (places < 0) throw new IllegalArgumentException(); - BigDecimal bd = new BigDecimal(value); - bd = bd.setScale(places, RoundingMode.HALF_UP); - return bd.doubleValue(); + BigDecimal bd = new BigDecimal(value); + bd = bd.setScale(places, RoundingMode.HALF_UP); + return bd.doubleValue(); } // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/util/SignUtil.java b/src/com/massivecraft/massivecore/util/SignUtil.java index 3deccb38..de1df3a1 100644 --- a/src/com/massivecraft/massivecore/util/SignUtil.java +++ b/src/com/massivecraft/massivecore/util/SignUtil.java @@ -110,7 +110,7 @@ public class SignUtil // Returns true if the result is a special sign of with the specified title. public static boolean handleSpecialPermissionFix(SignChangeEvent event, String title, String permissionId) - { + { if (event == null) throw new NullPointerException("event"); if (title == null) throw new NullPointerException("title"); if (permissionId == null) throw new NullPointerException("permissionId"); @@ -135,7 +135,7 @@ public class SignUtil // ... and fix the first line. event.setLine(0, getSpecialLine(title)); return true; - } + } // -------------------------------------------- // // SPECIAL PILLAR diff --git a/src/com/massivecraft/massivecore/util/TimeUnit.java b/src/com/massivecraft/massivecore/util/TimeUnit.java index 3e374d50..49a71fab 100644 --- a/src/com/massivecraft/massivecore/util/TimeUnit.java +++ b/src/com/massivecraft/massivecore/util/TimeUnit.java @@ -169,7 +169,7 @@ public class TimeUnit implements Comparable @Override public final int hashCode() { - return (int)(this.millis^(this.millis>>>32)); + return (int)(this.millis^(this.millis>>>32)); } } diff --git a/src/com/massivecraft/massivecore/util/WebUtil.java b/src/com/massivecraft/massivecore/util/WebUtil.java index cd4ce9d6..9633c67c 100644 --- a/src/com/massivecraft/massivecore/util/WebUtil.java +++ b/src/com/massivecraft/massivecore/util/WebUtil.java @@ -186,8 +186,8 @@ public class WebUtil { if ( ! (connection instanceof HttpsURLConnection)) return; HttpsURLConnection httpsConnection = (HttpsURLConnection) connection; - httpsConnection.setSSLSocketFactory(TRUSTING_SOCKET_FACTORY); - httpsConnection.setHostnameVerifier(TRUSTING_HOSTNAME_VERIFIER); + httpsConnection.setSSLSocketFactory(TRUSTING_SOCKET_FACTORY); + httpsConnection.setHostnameVerifier(TRUSTING_HOSTNAME_VERIFIER); } }